add setting to disable mark as read confirmation (#1110)

2026-03-21 21:37:29 +00:00 · 2023-08-03 08:46:43 +02:00
parent da6f2050f9
commit cb779ec494
37 changed files with 179 additions and 8 deletions
--- a/commafeed-client/src/app/slices/user.ts
+++ b/commafeed-client/src/app/slices/user.ts
@@ -91,6 +91,17 @@ export const changeAlwaysScrollToEntry = createAsyncThunk<
    if (!settings) return
    client.user.saveSettings({ ...settings, alwaysScrollToEntry })
 })
+export const changeMarkAllAsReadConfirmation = createAsyncThunk<
+    void,
+    boolean,
+    {
+        state: RootState
+    }
+>("settings/markAllAsReadConfirmation", (markAllAsReadConfirmation, thunkApi) => {
+    const { settings } = thunkApi.getState().user
+    if (!settings) return
+    client.user.saveSettings({ ...settings, markAllAsReadConfirmation })
+})
 export const changeSharingSetting = createAsyncThunk<
    void,
    { site: keyof SharingSettings; value: boolean },
@@ -151,6 +162,10 @@ export const userSlice = createSlice({
            if (!state.settings) return
            state.settings.alwaysScrollToEntry = action.meta.arg
        })
+        builder.addCase(changeMarkAllAsReadConfirmation.pending, (state, action) => {
+            if (!state.settings) return
+            state.settings.markAllAsReadConfirmation = action.meta.arg
+        })
        builder.addCase(changeSharingSetting.pending, (state, action) => {
            if (!state.settings) return
            state.settings.sharingSettings[action.meta.arg.site] = action.meta.arg.value
@@ -162,6 +177,7 @@ export const userSlice = createSlice({
                changeShowRead.fulfilled,
                changeScrollMarks.fulfilled,
                changeAlwaysScrollToEntry.fulfilled,
+                changeMarkAllAsReadConfirmation.fulfilled,
                changeSharingSetting.fulfilled
            ),
            () => {
--- a/commafeed-client/src/app/types.ts
+++ b/commafeed-client/src/app/types.ts
@@ -202,6 +202,7 @@ export interface Settings {
    customJs?: string
    scrollSpeed: number
    alwaysScrollToEntry: boolean
+    markAllAsReadConfirmation: boolean
    sharingSettings: SharingSettings
 }

--- a/commafeed-client/src/components/header/MarkAllAsReadButton.tsx
+++ b/commafeed-client/src/components/header/MarkAllAsReadButton.tsx
@@ -13,8 +13,27 @@ export function MarkAllAsReadButton(props: { iconSize: number }) {
    const source = useAppSelector(state => state.entries.source)
    const sourceLabel = useAppSelector(state => state.entries.sourceLabel)
    const entriesTimestamp = useAppSelector(state => state.entries.timestamp) ?? Date.now()
+    const markAllAsReadConfirmation = useAppSelector(state => state.user.settings?.markAllAsReadConfirmation)
    const dispatch = useAppDispatch()

+    const buttonClicked = () => {
+        if (markAllAsReadConfirmation) {
+            setThreshold(0)
+            setOpened(true)
+        } else {
+            dispatch(
+                markAllEntries({
+                    sourceType: source.type,
+                    req: {
+                        id: source.id,
+                        read: true,
+                        olderThan: entriesTimestamp,
+                    },
+                })
+            )
+        }
+    }
+
    return (
        <>
            <Modal opened={opened} onClose={() => setOpened(false)} title={<Trans>Mark all entries as read</Trans>}>
@@ -70,14 +89,7 @@ export function MarkAllAsReadButton(props: { iconSize: number }) {
                    </Group>
                </Stack>
            </Modal>
-            <ActionButton
-                icon={<TbChecks size={props.iconSize} />}
-                label={<Trans>Mark all as read</Trans>}
-                onClick={() => {
-                    setThreshold(0)
-                    setOpened(true)
-                }}
-            />
+            <ActionButton icon={<TbChecks size={props.iconSize} />} label={<Trans>Mark all as read</Trans>} onClick={buttonClicked} />
        </>
    )
 }
--- a/commafeed-client/src/components/settings/DisplaySettings.tsx
+++ b/commafeed-client/src/components/settings/DisplaySettings.tsx
@@ -4,6 +4,7 @@ import { Constants } from "app/constants"
 import {
    changeAlwaysScrollToEntry,
    changeLanguage,
+    changeMarkAllAsReadConfirmation,
    changeScrollMarks,
    changeScrollSpeed,
    changeSharingSetting,
@@ -19,6 +20,7 @@ export function DisplaySettings() {
    const showRead = useAppSelector(state => state.user.settings?.showRead)
    const scrollMarks = useAppSelector(state => state.user.settings?.scrollMarks)
    const alwaysScrollToEntry = useAppSelector(state => state.user.settings?.alwaysScrollToEntry)
+    const markAllAsReadConfirmation = useAppSelector(state => state.user.settings?.markAllAsReadConfirmation)
    const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
    const dispatch = useAppDispatch()

@@ -58,6 +60,12 @@ export function DisplaySettings() {
                onChange={e => dispatch(changeScrollMarks(e.currentTarget.checked))}
            />

+            <Switch
+                label={<Trans>Show confirmation when marking all entries as read</Trans>}
+                checked={markAllAsReadConfirmation}
+                onChange={e => dispatch(changeMarkAllAsReadConfirmation(e.currentTarget.checked))}
+            />
+
            <Divider label={<Trans>Sharing sites</Trans>} labelPosition="center" />

            <SimpleGrid cols={2}>
--- a/commafeed-client/src/locales/ar/messages.po
+++ b/commafeed-client/src/locales/ar/messages.po
@@ -727,6 +727,10 @@ msgstr "مشاركة المواقع"
 msgid "Shift"
 msgstr "الحلقة"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/ca/messages.po
+++ b/commafeed-client/src/locales/ca/messages.po
@@ -727,6 +727,10 @@ msgstr "Compartir llocs"
 msgid "Shift"
 msgstr "canvi"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/cs/messages.po
+++ b/commafeed-client/src/locales/cs/messages.po
@@ -727,6 +727,10 @@ msgstr "Stránky pro sdílení"
 msgid "Shift"
 msgstr "Směna"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/cy/messages.po
+++ b/commafeed-client/src/locales/cy/messages.po
@@ -727,6 +727,10 @@ msgstr "Rhannu gwefannau"
 msgid "Shift"
 msgstr "shifft"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/da/messages.po
+++ b/commafeed-client/src/locales/da/messages.po
@@ -727,6 +727,10 @@ msgstr "Delingssider"
 msgid "Shift"
 msgstr "Skift"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/de/messages.po
+++ b/commafeed-client/src/locales/de/messages.po
@@ -727,6 +727,10 @@ msgstr "Seiten teilen"
 msgid "Shift"
 msgstr "Verschiebung"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/en/messages.po
+++ b/commafeed-client/src/locales/en/messages.po
@@ -727,6 +727,10 @@ msgstr "Sharing sites"
 msgid "Shift"
 msgstr "Shift"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr "Show confirmation when marking all entries as read"
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr "Show entry menu (desktop)"
--- a/commafeed-client/src/locales/es/messages.po
+++ b/commafeed-client/src/locales/es/messages.po
@@ -727,6 +727,10 @@ msgstr "Compartir sitios"
 msgid "Shift"
 msgstr "Cambio"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/fa/messages.po
+++ b/commafeed-client/src/locales/fa/messages.po
@@ -727,6 +727,10 @@ msgstr "اشتراک گذاری سایت ها"
 msgid "Shift"
 msgstr "شیفت"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/fi/messages.po
+++ b/commafeed-client/src/locales/fi/messages.po
@@ -727,6 +727,10 @@ msgstr "Sivustojen jakaminen"
 msgid "Shift"
 msgstr "Vaihto"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/fr/messages.po
+++ b/commafeed-client/src/locales/fr/messages.po
@@ -727,6 +727,10 @@ msgstr "Sites de partage"
 msgid "Shift"
 msgstr "Maj"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr "Afficher les options de l'entrée (ordinateur)"
--- a/commafeed-client/src/locales/gl/messages.po
+++ b/commafeed-client/src/locales/gl/messages.po
@@ -727,6 +727,10 @@ msgstr "Compartir sitios"
 msgid "Shift"
 msgstr "quendas"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/hu/messages.po
+++ b/commafeed-client/src/locales/hu/messages.po
@@ -727,6 +727,10 @@ msgstr "Webhelyek megosztása"
 msgid "Shift"
 msgstr ""

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/id/messages.po
+++ b/commafeed-client/src/locales/id/messages.po
@@ -727,6 +727,10 @@ msgstr "Berbagi situs"
 msgid "Shift"
 msgstr "Pergeseran"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/it/messages.po
+++ b/commafeed-client/src/locales/it/messages.po
@@ -727,6 +727,10 @@ msgstr "Condivisione di siti"
 msgid "Shift"
 msgstr "Cambio"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/ja/messages.po
+++ b/commafeed-client/src/locales/ja/messages.po
@@ -727,6 +727,10 @@ msgstr "共有サイト"
 msgid "Shift"
 msgstr "シフト"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/ko/messages.po
+++ b/commafeed-client/src/locales/ko/messages.po
@@ -727,6 +727,10 @@ msgstr "사이트 공유"
 msgid "Shift"
 msgstr "시프트"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/ms/messages.po
+++ b/commafeed-client/src/locales/ms/messages.po
@@ -727,6 +727,10 @@ msgstr "Berkongsi tapak"
 msgid "Shift"
 msgstr "Anjakan"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/nb/messages.po
+++ b/commafeed-client/src/locales/nb/messages.po
@@ -727,6 +727,10 @@ msgstr "Delingssider"
 msgid "Shift"
 msgstr "Skift"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/nl/messages.po
+++ b/commafeed-client/src/locales/nl/messages.po
@@ -727,6 +727,10 @@ msgstr "Sites delen"
 msgid "Shift"
 msgstr ""

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/nn/messages.po
+++ b/commafeed-client/src/locales/nn/messages.po
@@ -727,6 +727,10 @@ msgstr "Delingssider"
 msgid "Shift"
 msgstr "Skift"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/pl/messages.po
+++ b/commafeed-client/src/locales/pl/messages.po
@@ -727,6 +727,10 @@ msgstr "Udostępnianie witryn"
 msgid "Shift"
 msgstr "zmiana"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/pt/messages.po
+++ b/commafeed-client/src/locales/pt/messages.po
@@ -727,6 +727,10 @@ msgstr "Compartilhando sites"
 msgid "Shift"
 msgstr "Mudar"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/ru/messages.po
+++ b/commafeed-client/src/locales/ru/messages.po
@@ -727,6 +727,10 @@ msgstr "Обмен сайтами"
 msgid "Shift"
 msgstr "Сдвиг"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/sk/messages.po
+++ b/commafeed-client/src/locales/sk/messages.po
@@ -727,6 +727,10 @@ msgstr "Zdieľanie stránok"
 msgid "Shift"
 msgstr "Smena"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/sv/messages.po
+++ b/commafeed-client/src/locales/sv/messages.po
@@ -727,6 +727,10 @@ msgstr "Delningssajter"
 msgid "Shift"
 msgstr "Skift"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/tr/messages.po
+++ b/commafeed-client/src/locales/tr/messages.po
@@ -727,6 +727,10 @@ msgstr "Siteleri paylaşma"
 msgid "Shift"
 msgstr "Vardiya"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-client/src/locales/zh/messages.po
+++ b/commafeed-client/src/locales/zh/messages.po
@@ -727,6 +727,10 @@ msgstr "共享站点"
 msgid "Shift"
 msgstr "换档"

+#: src/components/settings/DisplaySettings.tsx
+msgid "Show confirmation when marking all entries as read"
+msgstr ""
+
 #: src/components/KeyboardShortcutsHelp.tsx
 msgid "Show entry menu (desktop)"
 msgstr ""
--- a/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java
+++ b/commafeed-server/src/main/java/com/commafeed/backend/model/UserSettings.java
@@ -66,6 +66,7 @@ public class UserSettings extends AbstractModel {
 	private int scrollSpeed;

 	private boolean alwaysScrollToEntry;
+	private boolean markAllAsReadConfirmation;

 	private boolean email;
 	private boolean gmail;
--- a/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/model/Settings.java
@@ -38,6 +38,9 @@ public class Settings implements Serializable {
 	@ApiModelProperty(value = "always scroll selected entry to the top of the page, even if it fits entirely on screen", required = true)
 	private boolean alwaysScrollToEntry;

+	@ApiModelProperty(value = "ask for confirmation when marking all entries as read", required = true)
+	private boolean markAllAsReadConfirmation;
+
 	@ApiModelProperty(value = "sharing settings", required = true)
 	private SharingSettings sharingSettings = new SharingSettings();

--- a/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java
+++ b/commafeed-server/src/main/java/com/commafeed/frontend/resource/UserREST.java
@@ -104,6 +104,7 @@ public class UserREST {
 			s.setLanguage(settings.getLanguage());
 			s.setScrollSpeed(settings.getScrollSpeed());
 			s.setAlwaysScrollToEntry(settings.isAlwaysScrollToEntry());
+			s.setMarkAllAsReadConfirmation(settings.isMarkAllAsReadConfirmation());
 		} else {
 			s.setReadingMode(ReadingMode.unread.name());
 			s.setReadingOrder(ReadingOrder.desc.name());
@@ -122,6 +123,7 @@ public class UserREST {
 			s.setLanguage("en");
 			s.setScrollSpeed(400);
 			s.setAlwaysScrollToEntry(false);
+			s.setMarkAllAsReadConfirmation(true);
 		}
 		return Response.ok(s).build();
 	}
@@ -148,6 +150,7 @@ public class UserREST {
 		s.setLanguage(settings.getLanguage());
 		s.setScrollSpeed(settings.getScrollSpeed());
 		s.setAlwaysScrollToEntry(settings.isAlwaysScrollToEntry());
+		s.setMarkAllAsReadConfirmation(settings.isMarkAllAsReadConfirmation());

 		s.setEmail(settings.getSharingSettings().isEmail());
 		s.setGmail(settings.getSharingSettings().isGmail());
--- a/commafeed-server/src/main/resources/changelogs/db.changelog-3.9.xml
+++ b/commafeed-server/src/main/resources/changelogs/db.changelog-3.9.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+				   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+	<changeSet id="mark-all-as-read-confirmation" author="athou">
+		<addColumn tableName="USERSETTINGS">
+			<column name="markAllAsReadConfirmation" type="BOOLEAN" defaultValueBoolean="true">
+				<constraints nullable="false" />
+			</column>
+		</addColumn>
+	</changeSet>
+
+</databaseChangeLog>
--- a/commafeed-server/src/main/resources/migrations.xml
+++ b/commafeed-server/src/main/resources/migrations.xml
@@ -21,5 +21,6 @@
 	<include file="changelogs/db.changelog-3.5.xml" />
 	<include file="changelogs/db.changelog-3.6.xml" />
 	<include file="changelogs/db.changelog-3.8.xml" />
+	<include file="changelogs/db.changelog-3.9.xml" />

 </databaseChangeLog>