fix: use correct update mode setting, name update mode enum same as backend

Signed-off-by: Wolfgang <github@linux-dude.de>

Author: wofferl

src/components/modals/FeedInfoTable.vue

@@ -75,16 +75,16 @@
 					</tr>
 					<tr>
 						<td>
-							<FileDocumentRefresh />
+							<FileDocumentCheck />
 						</td>
 						<td>
-							{{ t('news', 'Mark as unread on update') }}
+							{{ t('news', 'Keep read status on update') }}
 						</td>
 						<td>
-							<FileDocumentCheck />
+							<FileDocumentRefresh />
 						</td>
 						<td>
-							{{ t('news', 'Keep read status on update') }}
+							{{ t('news', 'Mark as unread on update') }}
 						</td>
 					</tr>
 					<tr>
@@ -222,19 +222,19 @@
 									</template>
 								</NcActionButton>
 								<NcActionButton
-									v-if="feed.updateMode === FEED_UPDATE_MODE.UNREAD"
+									v-if="feed.updateMode === FEED_UPDATE_MODE.NORMAL"
 									:title="t('news', 'Disable marking items as unread on update')"
 									data-test="disableMarkUnread"
-									@click="setUpdateMode(feed, FEED_UPDATE_MODE.IGNORE)">
+									@click="setUpdateMode(feed, FEED_UPDATE_MODE.SILENT)">
 									<template #icon>
 										<FileDocumentRefresh />
 									</template>
 								</NcActionButton>
 								<NcActionButton
-									v-if="feed.updateMode === FEED_UPDATE_MODE.IGNORE"
+									v-if="feed.updateMode === FEED_UPDATE_MODE.SILENT"
 									:title="t('news', 'Enable marking items as unread on update')"
 									data-test="enableMarkUnread"
-									@click="setUpdateMode(feed, FEED_UPDATE_MODE.UNREAD)">
+									@click="setUpdateMode(feed, FEED_UPDATE_MODE.NORMAL)">
 									<template #icon>
 										<FileDocumentCheck />
 									</template>

src/dataservices/feed.service.ts

@@ -59,7 +59,7 @@ export class FeedService {
 	 * @param param0.pinned {Boolean} should be pinned (true) or not pinned (flse)
 	 * @param param0.ordering {FEED_ORDER} sets feed order (0 = NEWEST, 1 = OLDEST, 2 = DEFAULT)
 	 * @param param0.fullTextEnabled {Boolean} should be full text be enabled (true) or not (flse)
-	 * @param param0.updateMode {FEED_UPDATE_MODE} sets updateMode (0 = UNREAD, 1 = IGNORE)
+	 * @param param0.updateMode {FEED_UPDATE_MODE} sets updateMode (0 = SILENT, 1 = NORMAL)
 	 * @param param0.preventUpdate {boolean} enable/disable feed sync
 	 * @param param0.title {String} title of feed to display
 	 * @return Null value is returned on success

src/enums/index.ts

@@ -11,8 +11,8 @@ export enum FEED_ORDER {
 }
 
 export enum FEED_UPDATE_MODE {
-	UNREAD = 0,
-	IGNORE = 1,
+	SILENT = 0,
+	NORMAL = 1,
 }
 
 export enum SPLIT_MODE {

tests/javascript/unit/components/modals/FeedInfoTable.spec.ts

@@ -19,7 +19,7 @@ describe('FeedInfoTable.vue', () => {
 		nextUpdateTime: 1,
 		articlesPerUpdate: 150,
 		updateErrorCount: 20,
-		updateMode: FEED_UPDATE_MODE.UNREAD,
+		updateMode: FEED_UPDATE_MODE.NORMAL,
 		fullTextEnabled: false,
 		preventUpdate: true,
 	}, {
@@ -30,7 +30,7 @@ describe('FeedInfoTable.vue', () => {
 		nextUpdateTime: 4,
 		articlesPerUpdate: 50,
 		updateErrorCount: 40,
-		updateMode: FEED_UPDATE_MODE.IGNORE,
+		updateMode: FEED_UPDATE_MODE.SILENT,
 		fullTextEnabled: true,
 		preventUpdate: false,
 	}, {
@@ -41,7 +41,7 @@ describe('FeedInfoTable.vue', () => {
 		nextUpdateTime: 8,
 		articlesPerUpdate: 20,
 		updateErrorCount: 0,
-		updateMode: FEED_UPDATE_MODE.UNREAD,
+		updateMode: FEED_UPDATE_MODE.NORMAL,
 		fullTextEnabled: true,
 		preventUpdate: true,
 	}]
@@ -325,7 +325,7 @@ describe('FeedInfoTable.vue', () => {
 			expect(store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_SET_PREVENT_UPDATE, { feed: feeds[1], preventUpdate: true })
 		})
 
-		it('should dispatch setUpdateMode on click with FEED_UPDATE_MODE.IGNORE', async () => {
+		it('should dispatch setUpdateMode on click with FEED_UPDATE_MODE.SILENT', async () => {
 			const actions = wrapper.findAllComponents({ name: 'NcActions' })
 				.find((ncactions) => ncactions.attributes('data-test') === 'feedOptions-1')
 
@@ -334,7 +334,7 @@ describe('FeedInfoTable.vue', () => {
 			expect(button).toBeTruthy()
 			await button.trigger('click')
 
-			expect(store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_SET_UPDATE_MODE, { feed: feeds[0], updateMode: FEED_UPDATE_MODE.IGNORE })
+			expect(store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_SET_UPDATE_MODE, { feed: feeds[0], updateMode: FEED_UPDATE_MODE.SILENT })
 		})
 
 		it('should dispatch setUpdateMode on click with FEED_UPDATE_MODE.NORMAL', async () => {
@@ -346,7 +346,7 @@ describe('FeedInfoTable.vue', () => {
 			expect(button).toBeTruthy()
 			await button.trigger('click')
 
-			expect(store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_SET_UPDATE_MODE, { feed: feeds[1], updateMode: FEED_UPDATE_MODE.UNREAD })
+			expect(store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_SET_UPDATE_MODE, { feed: feeds[1], updateMode: FEED_UPDATE_MODE.NORMAL })
 		})
 
 		it('should dispatch setFullText on click with fullTextEnabled true', async () => {

tests/javascript/unit/store/feed.spec.ts

@@ -162,9 +162,9 @@ describe('feed.ts', () => {
 			it('should call FeedService.updateFeed and commit updated `updateMode` property to state', async () => {
 				FeedService.updateFeed = vi.fn()
 				const commit = vi.fn()
-				await actions[FEED_ACTION_TYPES.FEED_SET_UPDATE_MODE]({ commit }, { feed: { id: 1 }, updateMode: FEED_UPDATE_MODE.IGNORE })
-				expect(FeedService.updateFeed).toBeCalledWith({ feedId: 1, updateMode: FEED_UPDATE_MODE.IGNORE })
-				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.UPDATE_FEED, { id: 1, updateMode: FEED_UPDATE_MODE.IGNORE })
+				await actions[FEED_ACTION_TYPES.FEED_SET_UPDATE_MODE]({ commit }, { feed: { id: 1 }, updateMode: FEED_UPDATE_MODE.SILENT })
+				expect(FeedService.updateFeed).toBeCalledWith({ feedId: 1, updateMode: FEED_UPDATE_MODE.SILENT })
+				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.UPDATE_FEED, { id: 1, updateMode: FEED_UPDATE_MODE.SILENT })
 			})
 		})