fossar · jtojnar · Dec 29, 2024 · Jul 30, 2023 · May 31, 2024 · Jul 28, 2023
diff --git a/client/js/helpers/i18n.js b/client/js/helpers/i18n.js
@@ -9,14 +9,14 @@ import React from 'react';
 export function i18nFormat(translated, params) {
     let formatted = '';
 
-    let curChar = undefined;
+    let curChar;
     let buffer = '';
 
     let state = 'out';
-    let placeholder = undefined;
-    let plural = undefined;
-    let pluralKeyword = undefined;
-    let pluralValue = undefined;
+    let placeholder;
+    let plural;
+    let pluralKeyword;
+    let pluralValue;
 
     for (let i = 0, len = translated.length; i < len; i++) {
         curChar = translated.charAt(i);

diff --git a/client/js/selfoss-db-offline.js b/client/js/selfoss-db-offline.js
@@ -3,6 +3,8 @@ import { OfflineStorageNotAvailableError } from './errors';
 import Dexie from 'dexie';
 import { FilterType } from './Filter';
 
+const ENTRY_STATUS_NAMES = ['unread', 'starred'];
+
 selfoss.dbOffline = {
     /** @var Date the datetime of the newest garbage collected entry, i.e. deleted because not of interest. */
     newestGCedEntry: null,
@@ -58,8 +60,7 @@ selfoss.dbOffline = {
         return selfoss.dbOffline
             ._tr(
                 'r',
-                selfoss.db.storage.entries,
-                selfoss.db.storage.stamps,
+                [selfoss.db.storage.entries, selfoss.db.storage.stamps],
                 () => {
                     selfoss.dbOffline._memLastItemId();
                     selfoss.db.storage.stamps.get(
@@ -161,8 +162,7 @@ selfoss.dbOffline = {
     storeEntries(entries) {
         return selfoss.dbOffline._tr(
             'rw',
-            selfoss.db.storage.entries,
-            selfoss.db.storage.stamps,
+            [selfoss.db.storage.entries, selfoss.db.storage.stamps],
             () => {
                 selfoss.dbOffline.GCEntries();
 
@@ -253,7 +253,7 @@ selfoss.dbOffline = {
     },
 
     storeStats(stats) {
-        return selfoss.dbOffline._tr('rw', selfoss.db.storage.stats, () => {
+        return selfoss.dbOffline._tr('rw', [selfoss.db.storage.stats], () => {
             for (const [name, value] of Object.entries(stats)) {
                 selfoss.db.storage.stats.put({
                     name,
@@ -264,7 +264,7 @@ selfoss.dbOffline = {
     },
 
     storeLastUpdate(lastUpdate) {
-        return selfoss.dbOffline._tr('rw', selfoss.db.storage.stamps, () => {
+        return selfoss.dbOffline._tr('rw', [selfoss.db.storage.stamps], () => {
             if (lastUpdate) {
                 selfoss.db.storage.stamps.put({
                     name: 'lastItemsUpdate',
@@ -277,7 +277,7 @@ selfoss.dbOffline = {
     getEntries(fetchParams) {
         let hasMore = false;
         return selfoss.dbOffline
-            ._tr('r', selfoss.db.storage.entries, () => {
+            ._tr('r', [selfoss.db.storage.entries], () => {
                 let howMany = 0;
 
                 const ascOrder =
@@ -361,7 +361,7 @@ selfoss.dbOffline = {
     },
 
     reloadOnlineStats() {
-        return selfoss.dbOffline._tr('r', selfoss.db.storage.stats, () => {
+        return selfoss.dbOffline._tr('r', [selfoss.db.storage.stats], () => {
             selfoss.db.storage.stats.toArray((stats) => {
                 const newStats = {};
                 stats.forEach((stat) => {
@@ -377,7 +377,7 @@ selfoss.dbOffline = {
     },
 
     refreshStats() {
-        return selfoss.dbOffline._tr('r', selfoss.db.storage.entries, () => {
+        return selfoss.dbOffline._tr('r', [selfoss.db.storage.entries], () => {
             const offlineCounts = { newest: 0, unread: 0, starred: 0 };
 
             // IDBKeyRange does not support boolean indexes, so we need to
@@ -411,15 +411,15 @@ selfoss.dbOffline = {
             datetime: d,
         }));
 
-        return selfoss.dbOffline._tr('rw', selfoss.db.storage.statusq, () => {
+        return selfoss.dbOffline._tr('rw', [selfoss.db.storage.statusq], () => {
             selfoss.db.storage.statusq.bulkAdd(newQueuedStatuses);
         });
     },
 
     enqueueStatus(entryId, statusName, statusValue) {
         return selfoss.dbOffline.enqueueStatuses([
             {
-                entryId: entryId,
+                entryId,
                 name: statusName,
                 value: statusValue,
             },
@@ -454,17 +454,19 @@ selfoss.dbOffline = {
         return selfoss.dbOffline
             ._tr(
                 'rw',
-                selfoss.db.storage.entries,
-                selfoss.db.storage.stats,
-                selfoss.db.storage.statusq,
+                [
+                    selfoss.db.storage.entries,
+                    selfoss.db.storage.stats,
+                    selfoss.db.storage.statusq,
+                ],
                 () => {
                     const statsDiff = {};
 
                     // update entries statuses
                     itemStatuses.forEach((itemStatus) => {
                         const newStatus = {};
 
-                        selfoss.db.entryStatusNames.forEach((statusName) => {
+                        ENTRY_STATUS_NAMES.forEach((statusName) => {
                             if (statusName in itemStatus) {
                                 statsDiff[statusName] = 0;
                                 newStatus[statusName] = itemStatus[statusName];
@@ -521,7 +523,7 @@ selfoss.dbOffline = {
     entriesMark(itemIds, unread) {
         selfoss.dbOnline.statsDirty = true;
         const newStatuses = itemIds.map((itemId) => {
-            return { id: itemId, unread: unread };
+            return { id: itemId, unread };
         });
         return selfoss.dbOffline.storeEntryStatuses(newStatuses);
     },
@@ -534,7 +536,7 @@ selfoss.dbOffline = {
         return selfoss.dbOffline.storeEntryStatuses([
             {
                 id: itemId,
-                starred: starred,
+                starred,
             },
         ]);
     },

diff --git a/client/js/selfoss-db.js b/client/js/selfoss-db.js
@@ -21,7 +21,6 @@ selfoss.db = {
     enableOffline: new ValueListenable(
         window.localStorage.getItem('enableOffline') === 'true',
     ),
-    entryStatusNames: ['unread', 'starred'],
     userWaiting: true,
 
     /**

diff --git a/client/js/templates/App.jsx b/client/js/templates/App.jsx
@@ -422,7 +422,7 @@ EntriesFilter.propTypes = {
     unreadItemsCount: PropTypes.number.isRequired,
 };
 
-export default class App extends React.Component {
+export class App extends React.Component {
     constructor(props) {
         super(props);
         this.state = {

diff --git a/client/js/templates/EntriesPage.jsx b/client/js/templates/EntriesPage.jsx
@@ -435,7 +435,7 @@ export function EntriesPage({
     }
 
     return (
-        <React.Fragment>
+        <>
             {currentSource !== null && allowedToUpdate && isOnline ? (
                 <button
                     type="button"
@@ -514,7 +514,7 @@ export function EntriesPage({
                     </button>
                 ) : null}
             </div>
-        </React.Fragment>
+        </>
     );
 }
 
@@ -725,14 +725,10 @@ class StateHolder extends React.Component {
     refreshEntryStatuses(entryStatuses) {
         this.state.entries.forEach((entry) => {
             const { id } = entry;
-            let newStatus = false;
-            entryStatuses.some((entryStatus) => {
-                if (entryStatus.id == id) {
-                    newStatus = entryStatus;
-                }
-                return newStatus;
-            });
-            if (newStatus) {
+            const newStatus = entryStatuses.find(
+                (entryStatus) => entryStatus.id == id,
+            );
+            if (newStatus !== null) {
                 this.starEntryInView(id, newStatus.starred);
                 this.markEntryInView(id, newStatus.unread);
             }

diff --git a/client/js/templates/HashPassword.jsx b/client/js/templates/HashPassword.jsx
@@ -36,7 +36,7 @@ export default function HashPassword({ setTitle }) {
                         return;
                     }
                     setError(error);
-                    setState(LoadingState.ERROR);
+                    setState(LoadingState.FAILURE);
                 });
         },
         [navigate, passwordEntry.value],
@@ -58,7 +58,7 @@ export default function HashPassword({ setTitle }) {
                     <input type="text" value={hashedPassword} readOnly />
                 </label>
             </p>
-        ) : state === LoadingState.ERROR ? (
+        ) : state === LoadingState.FAILURE ? (
             <p className="error">
                 Unexpected happened.
                 <details>

diff --git a/client/js/templates/Item.jsx b/client/js/templates/Item.jsx
@@ -535,10 +535,10 @@ export default function Item({
 
             {/* author */}
             {author !== null ? (
-                <React.Fragment>
+                <>
                     <span className="entry-author">{author}</span>
                     <span className="entry-separator">•</span>
-                </React.Fragment>
+                </>
             ) : null}
 
             {/* datetime */}
@@ -557,7 +557,7 @@ export default function Item({
 
             {/* read time */}
             {configuration.readingSpeed !== null ? (
-                <React.Fragment>
+                <>
                     <span className="entry-separator">•</span>
                     <span className="entry-readtime">
                         {_('article_reading_time', [
@@ -566,7 +566,7 @@ export default function Item({
                             ),
                         ])}
                     </span>
-                </React.Fragment>
+                </>
             ) : null}
 
             {/* thumbnail */}

diff --git a/client/js/templates/LoginForm.jsx b/client/js/templates/LoginForm.jsx
@@ -100,11 +100,11 @@ export default function LoginForm({ offlineEnabled }) {
     const _ = useContext(LocalizationContext);
 
     return (
-        <React.Fragment>
+        <>
             {loading ? <SpinnerBig label={_('login_in_progress')} /> : null}
             <form
                 action=""
-                className={classNames({ loading: loading })}
+                className={classNames({ loading })}
                 method="post"
                 onSubmit={formOnSubmit}
             >
@@ -165,7 +165,7 @@ export default function LoginForm({ offlineEnabled }) {
                     </li>
                 </ul>
             </form>
-        </React.Fragment>
+        </>
     );
 }
 

diff --git a/client/js/templates/NavSources.jsx b/client/js/templates/NavSources.jsx
@@ -130,7 +130,7 @@ export default function NavSources({
     const _ = useContext(LocalizationContext);
 
     return (
-        <React.Fragment>
+        <>
             <h2>
                 <button
                     type="button"
@@ -170,7 +170,7 @@ export default function NavSources({
                     ))}
                 </ul>
             </Collapse>
-        </React.Fragment>
+        </>
     );
 }
 

diff --git a/client/js/templates/NavTags.jsx b/client/js/templates/NavTags.jsx
@@ -61,13 +61,13 @@ function Tag({ tag, active, collapseNav }) {
                 {tag === null ? (
                     _('alltags')
                 ) : (
-                    <React.Fragment>
+                    <>
                         <span className="tag">{unescape(tag.tag)}</span>
                         <span className="unread">
                             {tag.unread > 0 ? tag.unread : ''}
                         </span>
                         <ColorChooser tag={tag} onChange={colorChanged} />
-                    </React.Fragment>
+                    </>
                 )}
             </Link>
         </li>
@@ -103,7 +103,7 @@ export default function NavTags({ setNavExpanded, tags }) {
     const _ = useContext(LocalizationContext);
 
     return (
-        <React.Fragment>
+        <>
             <h2>
                 <button
                     type="button"
@@ -145,7 +145,7 @@ export default function NavTags({ setNavExpanded, tags }) {
                     ))}
                 </ul>
             </Collapse>
-        </React.Fragment>
+        </>
     );
 }
 

diff --git a/client/js/templates/Navigation.jsx b/client/js/templates/Navigation.jsx
@@ -38,7 +38,7 @@ export default function Navigation({
     const canWrite = useAllowedToWrite();
 
     return (
-        <React.Fragment>
+        <>
             <div id="nav-logo"></div>
             {canWrite && (
                 <button
@@ -113,7 +113,7 @@ export default function Navigation({
             />
 
             <NavToolBar reloadAll={reloadAll} setNavExpanded={setNavExpanded} />
-        </React.Fragment>
+        </>
     );
 }
 

diff --git a/client/js/templates/OpmlImport.jsx b/client/js/templates/OpmlImport.jsx
@@ -38,7 +38,7 @@ export default function OpmlImport({ setTitle }) {
                             </p>,
                         );
                     } else if (response.status === 202) {
-                        setState(LoadingState.ERROR);
+                        setState(LoadingState.FAILURE);
                         setMessage(
                             <p className="msg error">
                                 The following feeds could not be imported:
@@ -51,7 +51,7 @@ export default function OpmlImport({ setTitle }) {
                             </p>,
                         );
                     } else if (response.status === 400) {
-                        setState(LoadingState.ERROR);
+                        setState(LoadingState.FAILURE);
                         setMessage(
                             <p className="msg error">
                                 There was a problem importing your OPML file:
@@ -80,7 +80,7 @@ export default function OpmlImport({ setTitle }) {
                         });
                         return;
                     } else {
-                        setState(LoadingState.ERROR);
+                        setState(LoadingState.FAILURE);
                         setMessage(
                             <div className="msg error">
                                 Unexpected error occurred.