From e4ca4ec96166794252b525307e05051db6f09981 Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Wed, 6 Sep 2023 22:00:06 -0700
Subject: [PATCH 01/11] start hooking up actions to backend

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 src/App.vue                               |   3 +
 src/components/Sidebar.vue                |  12 ++-
 src/components/SidebarFeedLinkActions.vue | 116 ++++++++++++++++++++++
 src/dataservices/feed.service.ts          |  25 +++++
 src/dataservices/item.service.ts          |   2 +-
 src/store/feed.ts                         |  42 ++++++++
 src/store/item.ts                         |  37 +++++--
 src/types/MutationTypes.ts                |   5 +
 8 files changed, 227 insertions(+), 15 deletions(-)
 create mode 100644 src/components/SidebarFeedLinkActions.vue

diff --git a/src/App.vue b/src/App.vue
index 930c8b048..79a14d71e 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -22,8 +22,11 @@ export default Vue.extend({
 		NcAppContent,
 	},
 	async created() {
+		// fetch folders and feeds to build side bar
 		await this.$store.dispatch(ACTIONS.FETCH_FOLDERS)
 		await this.$store.dispatch(ACTIONS.FETCH_FEEDS)
+		// fetch starred to get starred count
+		await this.$store.dispatch(ACTIONS.FETCH_STARRED)
 	},
 })
 </script>
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 4c04195fc..411b92cb0 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -4,7 +4,7 @@
 		<NcAppNavigationNew :text="t('news', 'Subscribe')"
 			button-id="new-feed-button"
 			button-class="icon-add"
-			:icon="true"
+			:icon="''"
 			@click="showShowAddFeed()">
 			<template #icon>
 				<PlusIcon />
@@ -12,7 +12,7 @@
 		</NcAppNavigationNew>
 		<template #list>
 			<NcAppNavigationNewItem :title="t('news', 'New folder')"
-				:icon="true"
+				:icon="''"
 				@new-item="newFolder">
 				<template #icon>
 					<FolderPlusIcon />
@@ -51,14 +51,14 @@
 			<NcAppNavigationItem v-for="topLevelItem in topLevelNav"
 				:key="topLevelItem.name || topLevelItem.title"
 				:title="topLevelItem.name || topLevelItem.title"
-				:icon="true"
+				:icon="''"
 				:to="isFolder(topLevelItem) ? { name: ROUTES.FOLDER, params: { folderId: topLevelItem.id.toString() }} : { name: ROUTES.FEED, params: { feedId: topLevelItem.id.toString() } }"
 				:allow-collapse="true">
 				<template #default>
 					<NcAppNavigationItem v-for="feed in topLevelItem.feeds"
 						:key="feed.name"
 						:title="feed.title"
-						:icon="true"
+						:icon="''"
 						:to="{ name: ROUTES.FEED, params: { feedId: feed.id } }">
 						<template #icon>
 							<RssIcon v-if="!feed.faviconLink" />
@@ -131,7 +131,9 @@
 					</NcCounterBubble>
 				</template>
 				<template #actions>
-					<NcActionButton icon="icon-checkmark" @click="alert('TODO: Mark read')">
+					<SidebarFeedLinkActions v-if="topLevelItem.name === undefined" :feed="topLevelItem" />
+
+					<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-checkmark" @click="alert('TODO: Mark read')">
 						{{ t("news", "Mark read") }}
 					</NcActionButton>
 					<NcActionButton icon="icon-rename" @click="alert('TODO: Rename')">
diff --git a/src/components/SidebarFeedLinkActions.vue b/src/components/SidebarFeedLinkActions.vue
new file mode 100644
index 000000000..759e0655a
--- /dev/null
+++ b/src/components/SidebarFeedLinkActions.vue
@@ -0,0 +1,116 @@
+<template>
+	<span>
+		<NcActionButton icon="icon-checkmark"
+			@click="markRead">
+			{{ t("news", "Mark read") }}
+		</NcActionButton>
+		<NcActionButton v-if="feed.pinned"
+			icon="icon-pinned"
+			@click="alert('TODO: Unpin from top')">
+			{{ t("news", "Unpin from top") }}
+		</NcActionButton>
+		<NcActionButton v-if="!feed.pinned"
+			icon="icon-pinned"
+			@click="alert('TODO: Pin to top')">
+			{{ t("news", "Pin to top") }}
+		</NcActionButton>
+		<NcActionButton v-if="feed.ordering === FEED_ORDER.NEWEST"
+			icon="icon-caret-dark"
+			@click="alert('TODO: Newest First')">
+			{{ t("news", "Newest first") }}
+		</NcActionButton>
+		<NcActionButton v-if="feed.ordering === FEED_ORDER.OLDEST"
+			icon="icon-caret-dark"
+			@click="alert('TODO: Oldest first')">
+			{{ t("news", "Oldest first") }}
+		</NcActionButton>
+		<NcActionButton v-if="feed.ordering === FEED_ORDER.DEFAULT"
+			icon="icon-caret-dark"
+			@click="alert('TODO: Default Order')">
+			{{ t("news", "Default order") }}
+		</NcActionButton>
+		<NcActionButton v-if="!feed.enableFullText"
+			icon="icon-full-text-disabled"
+			@click="alert('TODO: Enable Full Text')">
+			{{ t("news", "Enable full text") }}
+		</NcActionButton>
+		<NcActionButton v-if="feed.enableFullText"
+			icon="icon-full-text-enabled"
+			@click="alert('TODO: DIsable Full Text')">
+			{{ t("news", "Disable full text") }}
+		</NcActionButton>
+		<NcActionButton v-if="feed.updateMode === FEED_UPDATE_MODE.UNRAD"
+			icon="icon-updatemode-default"
+			@click="alert('TODO: Unread Updated')">
+			{{ t("news", "Unread updated") }}
+		</NcActionButton>
+		<NcActionButton v-if="feed.updateMode === FEED_UPDATE_MODE.IGNORE"
+			icon="icon-updatemode-unread"
+			@click="alert('TOODO: Ignore UPdated')">
+			{{ t("news", "Ignore updated") }}
+		</NcActionButton>
+		<NcActionButton icon="icon-rss"
+			@click="alert('TODO: Open Feed URL')">
+			{{ t("news", "Open feed URL") }}
+		</NcActionButton>
+		<NcActionButton icon="icon-icon-rename"
+			@click="alert('TODO: Rename')">
+			{{ t("news", "Rename") }}
+		</NcActionButton>
+		<NcActionButton icon="icon-delete"
+			@click="alert('TODO: Delete Feed')">
+			{{ t("news", "Delete") }}
+		</NcActionButton>
+	</span>
+</template>
+
+<script lang="ts">
+
+import { mapState } from 'vuex'
+import Vue from 'vue'
+
+import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+
+import { FEED_ORDER, FEED_UPDATE_MODE } from '../dataservices/feed.service'
+
+import { ACTIONS } from '../store'
+
+// import { Feed } from '../types/Feed'
+
+// TODO?
+const SidebarFeedLinkState = { }
+
+export default Vue.extend({
+	components: {
+		NcActionButton,
+	},
+	props: {
+		feed: {
+			type: Object,
+			required: true,
+		},
+	},
+	data: () => {
+		return {
+			FEED_ORDER,
+			FEED_UPDATE_MODE,
+		}
+	},
+
+	computed: {
+		...mapState(SidebarFeedLinkState),
+	},
+	created() {
+		// TODO: init?
+	},
+	methods: {
+		alert(msg: string) {
+			window.alert(msg)
+		},
+		markRead() {
+			this.$store.dispatch(ACTIONS.FEED_MARK_READ, { feed: this.feed })
+		},
+	},
+})
+
+</script>
diff --git a/src/dataservices/feed.service.ts b/src/dataservices/feed.service.ts
index f5ac032b5..aa8dc215c 100644
--- a/src/dataservices/feed.service.ts
+++ b/src/dataservices/feed.service.ts
@@ -3,6 +3,17 @@ import axios from '@nextcloud/axios'
 
 import { API_ROUTES } from '../types/ApiRoutes'
 
+export const FEED_ORDER = {
+	OLDEST: 1,
+	NEWEST: 0,
+	DEFAULT: 2,
+}
+
+export const FEED_UPDATE_MODE = {
+	IGNORE: 1,
+	UNREAD: 0,
+}
+
 export class FeedService {
 
 	/**
@@ -36,4 +47,18 @@ export class FeedService {
 		})
 	}
 
+	/**
+	 * Marks all items in feed, started with highestReadId
+	 *
+	 * @param param0
+	 * @param param0.feedId {Number} ID number of feed to mark items as read
+	 * @param param0.highestItemId {Number} ID number of the (most recent?) feed item to mark as read (all older items will be marked as read)
+	 * @return {AxiosResponse} Updated feed info (unreadCount = 0) stored in data.feeds[0] property
+	 */
+	static markRead({ feedId, highestItemId }: { feedId: number, highestItemId: number }): Promise<AxiosResponse> {
+		return axios.post(API_ROUTES.FEED + `/${feedId}/read`, {
+			highestItemId,
+		})
+	}
+
 }
diff --git a/src/dataservices/item.service.ts b/src/dataservices/item.service.ts
index 98b9d9eb3..6763b07ea 100644
--- a/src/dataservices/item.service.ts
+++ b/src/dataservices/item.service.ts
@@ -85,7 +85,7 @@ export class ItemService {
 	 * @param start (id of last unread item loaded)
 	 * @return {AxiosResponse} response object containing backend request response
 	 */
-	static async fetchFeedItems(feedId: number, start: number): Promise<AxiosResponse> {
+	static async fetchFeedItems(feedId: number, start?: number): Promise<AxiosResponse> {
 		return await axios.get(API_ROUTES.ITEMS, {
 			params: {
 				limit: 40,
diff --git a/src/store/feed.ts b/src/store/feed.ts
index b66fff376..08f834cf2 100644
--- a/src/store/feed.ts
+++ b/src/store/feed.ts
@@ -1,12 +1,16 @@
+import _ from 'lodash'
+
 import { ActionParams, AppState } from '../store'
 import { Feed } from '../types/Feed'
 import { FOLDER_MUTATION_TYPES, FEED_MUTATION_TYPES, FEED_ITEM_MUTATION_TYPES } from '../types/MutationTypes'
 import { FolderService } from '../dataservices/folder.service'
 import { FeedService } from '../dataservices/feed.service'
+import { ItemService } from '../dataservices/item.service'
 
 export const FEED_ACTION_TYPES = {
 	ADD_FEED: 'ADD_FEED',
 	FETCH_FEEDS: 'FETCH_FEEDS',
+	FEED_MARK_READ: 'FEED_MARK_READ',
 }
 
 const state = {
@@ -69,6 +73,12 @@ export const actions = {
 
 		}
 	},
+	async [FEED_ACTION_TYPES.FEED_MARK_READ]({ commit }: ActionParams, { feed }: { feed: Feed }) {
+		const response = await ItemService.fetchFeedItems(feed.id as number)
+		await FeedService.markRead({ feedId: feed.id as number, highestItemId: response.data.items[0].id })
+
+		commit(FEED_MUTATION_TYPES.SET_FEED_ALL_READ, feed.id)
+	},
 }
 
 export const mutations = {
@@ -80,6 +90,38 @@ export const mutations = {
 	[FEED_MUTATION_TYPES.ADD_FEED](state: AppState, feed: Feed) {
 		state.feeds.push(feed)
 	},
+	[FEED_MUTATION_TYPES.UPDATE_FEED](state: AppState, newFeed: Feed) {
+		const feed = state.feeds.find((feed: Feed) => {
+			return feed.id === newFeed.id
+		})
+		_.assign(feed, newFeed)
+	},
+	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state: AppState, feedId: number) {
+		const priorFeed = state.feeds.find((stateFeed: Feed) => {
+			return stateFeed.id === feedId
+		})
+		if (priorFeed) {
+			const priorUnread = priorFeed?.unreadCount
+			_.assign(priorFeed, { unreadCount: 0 })
+			state.unreadCount -= priorUnread
+		}
+	},
+	[FEED_MUTATION_TYPES.INCREASE_FEED_UNREAD_COUNT](state: AppState, feedId: number) {
+		const feed = state.feeds.find((feed: Feed) => {
+			return feed.id === feedId
+		})
+		if (feed) {
+			_.assign(feed, { unreadCount: feed.unreadCount + 1 })
+		}
+	},
+	[FEED_MUTATION_TYPES.DECREASE_FEED_UNREAD_COUNT](state: AppState, feedId: number) {
+		const feed = state.feeds.find((feed: Feed) => {
+			return feed.id === feedId
+		})
+		if (feed) {
+			_.assign(feed, { unreadCount: feed.unreadCount - 1 })
+		}
+	},
 }
 
 export default {
diff --git a/src/store/item.ts b/src/store/item.ts
index 4f73bff55..6c91b0755 100644
--- a/src/store/item.ts
+++ b/src/store/item.ts
@@ -1,5 +1,5 @@
 import { ActionParams } from '../store'
-import { FEED_ITEM_MUTATION_TYPES } from '../types/MutationTypes'
+import { FEED_ITEM_MUTATION_TYPES, FEED_MUTATION_TYPES } from '../types/MutationTypes'
 
 import { FeedItem } from '../types/FeedItem'
 import { ItemService } from '../dataservices/item.service'
@@ -100,8 +100,10 @@ export const actions = {
 			commit(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: 'all', loaded: true })
 		}
 
-		const lastItem = response?.data.items[response?.data.items.length - 1].id
-		commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'all', lastItem })
+		if (response?.data.items.length > 0) {
+			const lastItem = response?.data.items[response?.data.items.length - 1].id
+			commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'all', lastItem })
+		}
 		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'all', fetching: false })
 	},
 
@@ -125,8 +127,10 @@ export const actions = {
 		if (response?.data.items.length < 40) {
 			commit(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: 'starred', loaded: true })
 		}
-		const lastItem = response?.data.items[response?.data.items.length - 1].id
-		commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'starred', lastItem })
+		if (response?.data.items.length > 0) {
+			const lastItem = response?.data.items[response?.data.items.length - 1].id
+			commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'starred', lastItem })
+		}
 		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'starred', fetching: false })
 	},
 
@@ -147,8 +151,10 @@ export const actions = {
 		if (response?.data.items.length < 40) {
 			commit(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: 'feed-' + feedId, loaded: true })
 		}
-		const lastItem = response?.data.items[response?.data.items.length - 1].id
-		commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'feed-' + feedId, lastItem })
+		if (response?.data.items.length > 0) {
+			const lastItem = response?.data.items[response?.data.items.length - 1].id
+			commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'feed-' + feedId, lastItem })
+		}
 		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'feed-' + feedId, fetching: false })
 	},
 
@@ -169,8 +175,10 @@ export const actions = {
 		if (response?.data.items.length < 40) {
 			commit(FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED, { key: 'folder-' + folderId, loaded: true })
 		}
-		const lastItem = response?.data.items[response?.data.items.length - 1].id
-		commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'folder-' + folderId, lastItem })
+		if (response?.data.items.length > 0) {
+			const lastItem = response?.data.items[response?.data.items.length - 1].id
+			commit(FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED, { key: 'folder-' + folderId, lastItem })
+		}
 		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'folder-' + folderId, fetching: false })
 	},
 
@@ -187,6 +195,8 @@ export const actions = {
 
 		if (item.unread) {
 			commit(FEED_ITEM_MUTATION_TYPES.SET_UNREAD_COUNT, state.unreadCount - 1)
+
+			commit(FEED_MUTATION_TYPES.DECREASE_FEED_UNREAD_COUNT, item.feedId)
 		}
 		item.unread = false
 		commit(FEED_ITEM_MUTATION_TYPES.UPDATE_ITEM, { item })
@@ -205,6 +215,8 @@ export const actions = {
 
 		if (!item.unread) {
 			commit(FEED_ITEM_MUTATION_TYPES.SET_UNREAD_COUNT, state.unreadCount + 1)
+
+			commit(FEED_MUTATION_TYPES.INCREASE_FEED_UNREAD_COUNT, item.feedId)
 		}
 		item.unread = true
 		commit(FEED_ITEM_MUTATION_TYPES.UPDATE_ITEM, { item })
@@ -275,6 +287,13 @@ export const mutations = {
 	[FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED](state: ItemState, { lastItem, key }: { lastItem: number; key: string; }) {
 		state.lastItemLoaded[key] = lastItem
 	},
+	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state: ItemState, feedId: number) {
+		state.allItems.forEach((item: FeedItem) => {
+			if (item.feedId === feedId) {
+				item.unread = false
+			}
+		})
+	},
 }
 
 export default {
diff --git a/src/types/MutationTypes.ts b/src/types/MutationTypes.ts
index 859c47f04..9947b7d11 100644
--- a/src/types/MutationTypes.ts
+++ b/src/types/MutationTypes.ts
@@ -1,6 +1,11 @@
 export const FEED_MUTATION_TYPES = {
 	ADD_FEED: 'ADD_FEED',
 	SET_FEEDS: 'SET_FEEDS',
+	UPDATE_FEED: 'UPDATE_FEED',
+
+	SET_FEED_ALL_READ: 'SET_FEED_ALL_READ',
+	INCREASE_FEED_UNREAD_COUNT: 'INCREASE_FEED_UNREAD_COUNT',
+	DECREASE_FEED_UNREAD_COUNT: 'DECREASE_FEED_UNREAD_COUNT',
 }
 
 export const FOLDER_MUTATION_TYPES = {

From f8a8d21774b719c455d7d7e15cee83bdb799fa34 Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Thu, 14 Sep 2023 13:14:13 -0700
Subject: [PATCH 02/11] adding pinned feeds

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 src/components/Sidebar.vue                | 60 ++++-------------------
 src/components/SidebarFeedLinkActions.vue | 20 ++++++--
 src/dataservices/feed.service.ts          | 14 ++++++
 src/store/feed.ts                         |  7 +++
 src/types/Feed.ts                         |  1 +
 5 files changed, 47 insertions(+), 55 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 411b92cb0..1835b395c 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -66,54 +66,7 @@
 						</template>
 
 						<template #actions>
-							<NcActionButton icon="icon-checkmark"
-								@click="alert('TODO: Mark read')">
-								{{ t("news", "Mark read") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-pinned"
-								@click="alert('TODO: Unpin from top')">
-								{{ t("news", "Unpin from top") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-caret-dark"
-								@click="alert('TODO: Newest First')">
-								{{ t("news", "Newest first") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-caret-dark"
-								@click="alert('TODO: Oldest first')">
-								{{ t("news", "Oldest first") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-caret-dark"
-								@click="alert('TODO: Default Order')">
-								{{ t("news", "Default order") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-full-text-disabled"
-								@click="alert('TODO: Enable Full Text')">
-								{{ t("news", "Enable full text") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-full-text-enabled"
-								@click="alert('TODO: DIsable Full Text')">
-								{{ t("news", "Disable full text") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-updatemode-default"
-								@click="alert('TODO: Unread Updated')">
-								{{ t("news", "Unread updated") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-updatemode-unread"
-								@click="alert('TOODO: Ignore UPdated')">
-								{{ t("news", "Ignore updated") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-icon-rss"
-								@click="alert('TODO: Open Feed URL')">
-								{{ t("news", "Open feed URL") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-icon-rename"
-								@click="alert('TODO: Rename')">
-								{{ t("news", "Rename") }}
-							</NcActionButton>
-							<NcActionButton icon="icon-delete"
-								@click="alert('TODO: Delete Feed')">
-								{{ t("news", "Delete") }}
-							</NcActionButton>
+							<SidebarFeedLinkActions :feed-id="feed.id" />
 						</template>
 					</NcAppNavigationItem>
 				</template>
@@ -131,7 +84,7 @@
 					</NcCounterBubble>
 				</template>
 				<template #actions>
-					<SidebarFeedLinkActions v-if="topLevelItem.name === undefined" :feed="topLevelItem" />
+					<SidebarFeedLinkActions v-if="topLevelItem.name === undefined" :feed-id="topLevelItem.id" />
 
 					<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-checkmark" @click="alert('TODO: Mark read')">
 						{{ t("news", "Mark read") }}
@@ -195,7 +148,14 @@ const SideBarState = {
 		})
 		navItems = navItems.concat(state.folders)
 
-		return navItems
+		return navItems.sort((item, item2) => {
+			if ((item as Feed).pinned && !(item2 as Feed).pinned) {
+				return -1
+			} else if ((item2 as Feed).pinned && !(item as Feed).pinned) {
+				return 1
+			}
+			return 0
+		})
 	},
 }
 
diff --git a/src/components/SidebarFeedLinkActions.vue b/src/components/SidebarFeedLinkActions.vue
index 759e0655a..639bd9954 100644
--- a/src/components/SidebarFeedLinkActions.vue
+++ b/src/components/SidebarFeedLinkActions.vue
@@ -1,17 +1,18 @@
 <template>
 	<span>
-		<NcActionButton icon="icon-checkmark"
+		<NcActionButton v-if="feed.unreadCount > 0"
+			icon="icon-checkmark"
 			@click="markRead">
 			{{ t("news", "Mark read") }}
 		</NcActionButton>
 		<NcActionButton v-if="feed.pinned"
 			icon="icon-pinned"
-			@click="alert('TODO: Unpin from top')">
+			@click="setPinned(false)">
 			{{ t("news", "Unpin from top") }}
 		</NcActionButton>
 		<NcActionButton v-if="!feed.pinned"
 			icon="icon-pinned"
-			@click="alert('TODO: Pin to top')">
+			@click="setPinned(true)">
 			{{ t("news", "Pin to top") }}
 		</NcActionButton>
 		<NcActionButton v-if="feed.ordering === FEED_ORDER.NEWEST"
@@ -74,6 +75,7 @@ import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import { FEED_ORDER, FEED_UPDATE_MODE } from '../dataservices/feed.service'
 
 import { ACTIONS } from '../store'
+import { Feed } from '../types/Feed'
 
 // import { Feed } from '../types/Feed'
 
@@ -85,8 +87,8 @@ export default Vue.extend({
 		NcActionButton,
 	},
 	props: {
-		feed: {
-			type: Object,
+		feedId: {
+			type: Number,
 			required: true,
 		},
 	},
@@ -99,6 +101,11 @@ export default Vue.extend({
 
 	computed: {
 		...mapState(SidebarFeedLinkState),
+		feed(): Feed {
+			return this.$store.getters.feeds.find((feed: Feed) => {
+				return feed.id === this.feedId
+			})
+		},
 	},
 	created() {
 		// TODO: init?
@@ -110,6 +117,9 @@ export default Vue.extend({
 		markRead() {
 			this.$store.dispatch(ACTIONS.FEED_MARK_READ, { feed: this.feed })
 		},
+		setPinned(pinned: boolean) {
+			this.$store.dispatch(ACTIONS.FEED_SET_PINNED, { feed: this.feed, pinned })
+		},
 	},
 })
 
diff --git a/src/dataservices/feed.service.ts b/src/dataservices/feed.service.ts
index aa8dc215c..8b2d2e7c9 100644
--- a/src/dataservices/feed.service.ts
+++ b/src/dataservices/feed.service.ts
@@ -61,4 +61,18 @@ export class FeedService {
 		})
 	}
 
+	/**
+	 * Update a feeds properties
+	 *
+	 * @param param0
+	 * @param param0.feedId {Number} ID number of feed to mark items as read
+	 * @param param0.pinned {Boolean} should be pinned (true) or not pinned (flse)
+	 * @return {AxiosResponse} Updated feed info based on parameters provided
+	 */
+	static updateFeed({ feedId, pinned }: { feedId: number, pinned?: boolean }): Promise<AxiosResponse> {
+		return axios.patch(API_ROUTES.FEED + `/${feedId}`, {
+			pinned,
+		})
+	}
+
 }
diff --git a/src/store/feed.ts b/src/store/feed.ts
index 08f834cf2..adbc9eabf 100644
--- a/src/store/feed.ts
+++ b/src/store/feed.ts
@@ -11,6 +11,7 @@ export const FEED_ACTION_TYPES = {
 	ADD_FEED: 'ADD_FEED',
 	FETCH_FEEDS: 'FETCH_FEEDS',
 	FEED_MARK_READ: 'FEED_MARK_READ',
+	FEED_SET_PINNED: 'FEED_SET_PINNED',
 }
 
 const state = {
@@ -79,6 +80,12 @@ export const actions = {
 
 		commit(FEED_MUTATION_TYPES.SET_FEED_ALL_READ, feed.id)
 	},
+
+	async [FEED_ACTION_TYPES.FEED_SET_PINNED]({ commit }: ActionParams, { feed, pinned }: { feed: Feed, pinned: boolean }) {
+		await FeedService.updateFeed({ feedId: feed.id as number, pinned })
+
+		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, pinned })
+	},
 }
 
 export const mutations = {
diff --git a/src/types/Feed.ts b/src/types/Feed.ts
index 87de97965..d7221c452 100644
--- a/src/types/Feed.ts
+++ b/src/types/Feed.ts
@@ -6,4 +6,5 @@ export type Feed = {
   autoDiscover?: boolean;
   faviconLink?: string;
   id?: number;
+  pinned: boolean;
 }

From 9d645df807471d16a38230a74a55f7da99442872 Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Thu, 14 Sep 2023 13:56:55 -0700
Subject: [PATCH 03/11] 3 more feed actions

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 src/components/SidebarFeedLinkActions.vue | 33 ++++++++++++++---------
 src/dataservices/feed.service.ts          | 24 ++++++++++-------
 src/store/feed.ts                         | 24 ++++++++++++++++-
 src/types/Feed.ts                         |  5 ++++
 4 files changed, 64 insertions(+), 22 deletions(-)

diff --git a/src/components/SidebarFeedLinkActions.vue b/src/components/SidebarFeedLinkActions.vue
index 639bd9954..ccb18165e 100644
--- a/src/components/SidebarFeedLinkActions.vue
+++ b/src/components/SidebarFeedLinkActions.vue
@@ -17,37 +17,37 @@
 		</NcActionButton>
 		<NcActionButton v-if="feed.ordering === FEED_ORDER.NEWEST"
 			icon="icon-caret-dark"
-			@click="alert('TODO: Newest First')">
+			@click="setOrdering(FEED_ORDER.OLDEST)">
 			{{ t("news", "Newest first") }}
 		</NcActionButton>
-		<NcActionButton v-if="feed.ordering === FEED_ORDER.OLDEST"
+		<NcActionButton v-else-if="feed.ordering === FEED_ORDER.OLDEST"
 			icon="icon-caret-dark"
-			@click="alert('TODO: Oldest first')">
+			@click="setOrdering(FEED_ORDER.DEFAULT)">
 			{{ t("news", "Oldest first") }}
 		</NcActionButton>
-		<NcActionButton v-if="feed.ordering === FEED_ORDER.DEFAULT"
+		<NcActionButton v-else
 			icon="icon-caret-dark"
-			@click="alert('TODO: Default Order')">
+			@click="setOrdering(FEED_ORDER.NEWEST)">
 			{{ t("news", "Default order") }}
 		</NcActionButton>
-		<NcActionButton v-if="!feed.enableFullText"
+		<NcActionButton v-if="!feed.fullTextEnabled"
 			icon="icon-full-text-disabled"
-			@click="alert('TODO: Enable Full Text')">
+			@click="setFullText(true)">
 			{{ t("news", "Enable full text") }}
 		</NcActionButton>
-		<NcActionButton v-if="feed.enableFullText"
+		<NcActionButton v-if="feed.fullTextEnabled"
 			icon="icon-full-text-enabled"
-			@click="alert('TODO: DIsable Full Text')">
+			@click="setFullText(false)">
 			{{ t("news", "Disable full text") }}
 		</NcActionButton>
-		<NcActionButton v-if="feed.updateMode === FEED_UPDATE_MODE.UNRAD"
+		<NcActionButton v-if="feed.updateMode === FEED_UPDATE_MODE.UNREAD"
 			icon="icon-updatemode-default"
-			@click="alert('TODO: Unread Updated')">
+			@click="setUpdateMode(FEED_UPDATE_MODE.IGNORE)">
 			{{ t("news", "Unread updated") }}
 		</NcActionButton>
 		<NcActionButton v-if="feed.updateMode === FEED_UPDATE_MODE.IGNORE"
 			icon="icon-updatemode-unread"
-			@click="alert('TOODO: Ignore UPdated')">
+			@click="setUpdateMode(FEED_UPDATE_MODE.UNREAD)">
 			{{ t("news", "Ignore updated") }}
 		</NcActionButton>
 		<NcActionButton icon="icon-rss"
@@ -120,6 +120,15 @@ export default Vue.extend({
 		setPinned(pinned: boolean) {
 			this.$store.dispatch(ACTIONS.FEED_SET_PINNED, { feed: this.feed, pinned })
 		},
+		setOrdering(ordering: FEED_ORDER) {
+			this.$store.dispatch(ACTIONS.FEED_SET_ORDERING, { feed: this.feed, ordering })
+		},
+		setFullText(fullTextEnabled: boolean) {
+			this.$store.dispatch(ACTIONS.FEED_SET_FULL_TEXT, { feed: this.feed, fullTextEnabled })
+		},
+		setUpdateMode(updateMode: FEED_UPDATE_MODE) {
+			this.$store.dispatch(ACTIONS.FEED_SET_UPDATE_MODE, { feed: this.feed, updateMode })
+		},
 	},
 })
 
diff --git a/src/dataservices/feed.service.ts b/src/dataservices/feed.service.ts
index 8b2d2e7c9..f28320d55 100644
--- a/src/dataservices/feed.service.ts
+++ b/src/dataservices/feed.service.ts
@@ -3,15 +3,15 @@ import axios from '@nextcloud/axios'
 
 import { API_ROUTES } from '../types/ApiRoutes'
 
-export const FEED_ORDER = {
-	OLDEST: 1,
-	NEWEST: 0,
-	DEFAULT: 2,
+export enum FEED_ORDER {
+	OLDEST = 1,
+	NEWEST = 0,
+	DEFAULT = 2,
 }
 
-export const FEED_UPDATE_MODE = {
-	IGNORE: 1,
-	UNREAD: 0,
+export enum FEED_UPDATE_MODE {
+	IGNORE = 1,
+	UNREAD = 0,
 }
 
 export class FeedService {
@@ -67,11 +67,17 @@ export class FeedService {
 	 * @param param0
 	 * @param param0.feedId {Number} ID number of feed to mark items as read
 	 * @param param0.pinned {Boolean} should be pinned (true) or not pinned (flse)
-	 * @return {AxiosResponse} Updated feed info based on parameters provided
+	 * @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)
+	 * @return {AxiosResponse} Null value is returned on success
 	 */
-	static updateFeed({ feedId, pinned }: { feedId: number, pinned?: boolean }): Promise<AxiosResponse> {
+	static updateFeed({ feedId, pinned, ordering, fullTextEnabled, updateMode }: { feedId: number, pinned?: boolean, ordering?: FEED_ORDER, fullTextEnabled?: boolean, updateMode?: FEED_UPDATE_MODE }): Promise<AxiosResponse> {
 		return axios.patch(API_ROUTES.FEED + `/${feedId}`, {
 			pinned,
+			ordering,
+			fullTextEnabled,
+			updateMode,
 		})
 	}
 
diff --git a/src/store/feed.ts b/src/store/feed.ts
index adbc9eabf..b6031e4e6 100644
--- a/src/store/feed.ts
+++ b/src/store/feed.ts
@@ -4,7 +4,7 @@ import { ActionParams, AppState } from '../store'
 import { Feed } from '../types/Feed'
 import { FOLDER_MUTATION_TYPES, FEED_MUTATION_TYPES, FEED_ITEM_MUTATION_TYPES } from '../types/MutationTypes'
 import { FolderService } from '../dataservices/folder.service'
-import { FeedService } from '../dataservices/feed.service'
+import { FEED_ORDER, FEED_UPDATE_MODE, FeedService } from '../dataservices/feed.service'
 import { ItemService } from '../dataservices/item.service'
 
 export const FEED_ACTION_TYPES = {
@@ -12,6 +12,9 @@ export const FEED_ACTION_TYPES = {
 	FETCH_FEEDS: 'FETCH_FEEDS',
 	FEED_MARK_READ: 'FEED_MARK_READ',
 	FEED_SET_PINNED: 'FEED_SET_PINNED',
+	FEED_SET_ORDERING: 'FEED_SET_ORDERING',
+	FEED_SET_FULL_TEXT: 'FEED_SET_FULL_TEXT',
+	FEED_SET_UPDATE_MODE: 'FEED_SET_UPDATE_MODE',
 }
 
 const state = {
@@ -75,6 +78,7 @@ export const actions = {
 		}
 	},
 	async [FEED_ACTION_TYPES.FEED_MARK_READ]({ commit }: ActionParams, { feed }: { feed: Feed }) {
+		// want to fetch feed so that we can retrieve the "highestItemId"
 		const response = await ItemService.fetchFeedItems(feed.id as number)
 		await FeedService.markRead({ feedId: feed.id as number, highestItemId: response.data.items[0].id })
 
@@ -86,6 +90,24 @@ export const actions = {
 
 		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, pinned })
 	},
+
+	async [FEED_ACTION_TYPES.FEED_SET_ORDERING]({ commit }: ActionParams, { feed, ordering }: { feed: Feed, ordering: FEED_ORDER }) {
+		await FeedService.updateFeed({ feedId: feed.id as number, ordering })
+
+		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, ordering })
+	},
+
+	async [FEED_ACTION_TYPES.FEED_SET_FULL_TEXT]({ commit }: ActionParams, { feed, fullTextEnabled }: { feed: Feed, fullTextEnabled: boolean }) {
+		await FeedService.updateFeed({ feedId: feed.id as number, fullTextEnabled })
+
+		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, fullTextEnabled })
+	},
+
+	async [FEED_ACTION_TYPES.FEED_SET_UPDATE_MODE]({ commit }: ActionParams, { feed, updateMode }: { feed: Feed, updateMode: FEED_UPDATE_MODE }) {
+		await FeedService.updateFeed({ feedId: feed.id as number, updateMode })
+
+		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, updateMode })
+	},
 }
 
 export const mutations = {
diff --git a/src/types/Feed.ts b/src/types/Feed.ts
index d7221c452..f9544c2b0 100644
--- a/src/types/Feed.ts
+++ b/src/types/Feed.ts
@@ -1,3 +1,5 @@
+import { FEED_ORDER, FEED_UPDATE_MODE } from '../dataservices/feed.service'
+
 export type Feed = {
   folderId?: number;
   unreadCount: number;
@@ -7,4 +9,7 @@ export type Feed = {
   faviconLink?: string;
   id?: number;
   pinned: boolean;
+  ordering: FEED_ORDER;
+  fullTextEnabled: boolean;
+  updateMode: FEED_UPDATE_MODE
 }

From edf56013dfd4d297b49c4ef5a0eeb2b24d1bca52 Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Thu, 14 Sep 2023 16:50:04 -0700
Subject: [PATCH 04/11] remaining feed actions

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 src/components/Sidebar.vue                | 12 +++---
 src/components/SidebarFeedLinkActions.vue | 46 +++++++++++++++--------
 src/dataservices/feed.service.ts          | 17 ++++++++-
 src/shims-vue.d.ts                        |  2 +-
 src/store/feed.ts                         | 21 +++++++++++
 src/types/Feed.ts                         |  3 +-
 src/types/MutationTypes.ts                |  2 +
 7 files changed, 77 insertions(+), 26 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 1835b395c..95cf27002 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -19,7 +19,7 @@
 				</template>
 			</NcAppNavigationNewItem>
 
-			<NcAppNavigationItem :title="t('news', 'Unread articles')" icon="icon-rss" :to="{ name: ROUTES.UNREAD }">
+			<NcAppNavigationItem :name="t('news', 'Unread articles')" icon="icon-rss" :to="{ name: ROUTES.UNREAD }">
 				<template #actions>
 					<NcActionButton icon="icon-checkmark" @click="alert('TODO: Mark Read')">
 						t('news','Mark read')
@@ -32,7 +32,7 @@
 					<NcCounterBubble>{{ items.unreadCount }}</NcCounterBubble>
 				</template>
 			</NcAppNavigationItem>
-			<NcAppNavigationItem :title="t('news', 'All articles')" icon="icon-rss" :to="{ name: ROUTES.ALL }">
+			<NcAppNavigationItem :name="t('news', 'All articles')" icon="icon-rss" :to="{ name: ROUTES.ALL }">
 				<template #actions>
 					<ActionButton icon="icon-checkmark" @click="alert('TODO: Edit')">
 						t('news','Mark read')
@@ -42,7 +42,7 @@
 					<RssIcon />
 				</template>
 			</NcAppNavigationItem>
-			<NcAppNavigationItem :title="t('news', 'Starred')" icon="icon-starred" :to="{ name: ROUTES.STARRED }">
+			<NcAppNavigationItem :name="t('news', 'Starred')" icon="icon-starred" :to="{ name: ROUTES.STARRED }">
 				<template #counter>
 					<NcCounterBubble>{{ items.starredCount }}</NcCounterBubble>
 				</template>
@@ -50,14 +50,14 @@
 
 			<NcAppNavigationItem v-for="topLevelItem in topLevelNav"
 				:key="topLevelItem.name || topLevelItem.title"
-				:title="topLevelItem.name || topLevelItem.title"
+				:name="topLevelItem.name || topLevelItem.title"
 				:icon="''"
 				:to="isFolder(topLevelItem) ? { name: ROUTES.FOLDER, params: { folderId: topLevelItem.id.toString() }} : { name: ROUTES.FEED, params: { feedId: topLevelItem.id.toString() } }"
 				:allow-collapse="true">
 				<template #default>
 					<NcAppNavigationItem v-for="feed in topLevelItem.feeds"
 						:key="feed.name"
-						:title="feed.title"
+						:name="feed.title"
 						:icon="''"
 						:to="{ name: ROUTES.FEED, params: { feedId: feed.id } }">
 						<template #icon>
@@ -98,7 +98,7 @@
 				</template>
 			</NcAppNavigationItem>
 
-			<NcAppNavigationItem :title="t('news', 'Explore')"
+			<NcAppNavigationItem :name="t('news', 'Explore')"
 				icon="true"
 				:to="{ name: ROUTES.EXPLORE }">
 				<template #counter>
diff --git a/src/components/SidebarFeedLinkActions.vue b/src/components/SidebarFeedLinkActions.vue
index ccb18165e..e9f8bd521 100644
--- a/src/components/SidebarFeedLinkActions.vue
+++ b/src/components/SidebarFeedLinkActions.vue
@@ -50,18 +50,21 @@
 			@click="setUpdateMode(FEED_UPDATE_MODE.UNREAD)">
 			{{ t("news", "Ignore updated") }}
 		</NcActionButton>
-		<NcActionButton icon="icon-rss"
-			@click="alert('TODO: Open Feed URL')">
-			{{ t("news", "Open feed URL") }}
-		</NcActionButton>
-		<NcActionButton icon="icon-icon-rename"
-			@click="alert('TODO: Rename')">
+		<NcActionButton icon="icon-rename"
+			@click="rename()">
 			{{ t("news", "Rename") }}
 		</NcActionButton>
 		<NcActionButton icon="icon-delete"
-			@click="alert('TODO: Delete Feed')">
+			@click="deleteFeed()">
 			{{ t("news", "Delete") }}
 		</NcActionButton>
+		<NcAppNavigationItem :title="t('news', 'Open Feed URL')"
+			:href="feed.location">
+			<template #icon>
+				<RssIcon />
+			</template>
+		</NcAppNavigationItem>
+
 	</span>
 </template>
 
@@ -71,20 +74,20 @@ import { mapState } from 'vuex'
 import Vue from 'vue'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem.js'
 
 import { FEED_ORDER, FEED_UPDATE_MODE } from '../dataservices/feed.service'
 
+import RssIcon from 'vue-material-design-icons/Rss.vue'
+
 import { ACTIONS } from '../store'
 import { Feed } from '../types/Feed'
 
-// import { Feed } from '../types/Feed'
-
-// TODO?
-const SidebarFeedLinkState = { }
-
 export default Vue.extend({
 	components: {
 		NcActionButton,
+		NcAppNavigationItem,
+		RssIcon,
 	},
 	props: {
 		feedId: {
@@ -100,16 +103,12 @@ export default Vue.extend({
 	},
 
 	computed: {
-		...mapState(SidebarFeedLinkState),
 		feed(): Feed {
 			return this.$store.getters.feeds.find((feed: Feed) => {
 				return feed.id === this.feedId
 			})
 		},
 	},
-	created() {
-		// TODO: init?
-	},
 	methods: {
 		alert(msg: string) {
 			window.alert(msg)
@@ -129,6 +128,21 @@ export default Vue.extend({
 		setUpdateMode(updateMode: FEED_UPDATE_MODE) {
 			this.$store.dispatch(ACTIONS.FEED_SET_UPDATE_MODE, { feed: this.feed, updateMode })
 		},
+		rename() {
+			const title = window.prompt(t('news', 'Rename Feed'), this.feed.title)
+
+			// null on escape
+			if (title !== null) {
+				this.$store.dispatch(ACTIONS.FEED_SET_TITLE, { feed: this.feed, title })
+			}
+		},
+		deleteFeed() {
+			const shouldDelete = window.confirm(t('news', 'Are you sure you want to delete?'))
+
+			if (shouldDelete) {
+				this.$store.dispatch(ACTIONS.FEED_DELETE, { feed: this.feed })
+			}
+		},
 	},
 })
 
diff --git a/src/dataservices/feed.service.ts b/src/dataservices/feed.service.ts
index f28320d55..0871fb7f3 100644
--- a/src/dataservices/feed.service.ts
+++ b/src/dataservices/feed.service.ts
@@ -65,20 +65,33 @@ export class FeedService {
 	 * Update a feeds properties
 	 *
 	 * @param param0
-	 * @param param0.feedId {Number} ID number of feed to mark items as read
+	 * @param param0.feedId {Number} ID number of feed to update
 	 * @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.title {String} title of feed to display
 	 * @return {AxiosResponse} Null value is returned on success
 	 */
-	static updateFeed({ feedId, pinned, ordering, fullTextEnabled, updateMode }: { feedId: number, pinned?: boolean, ordering?: FEED_ORDER, fullTextEnabled?: boolean, updateMode?: FEED_UPDATE_MODE }): Promise<AxiosResponse> {
+	static updateFeed({ feedId, pinned, ordering, fullTextEnabled, updateMode, title }: { feedId: number, pinned?: boolean, ordering?: FEED_ORDER, fullTextEnabled?: boolean, updateMode?: FEED_UPDATE_MODE, title?: string }): Promise<AxiosResponse> {
 		return axios.patch(API_ROUTES.FEED + `/${feedId}`, {
 			pinned,
 			ordering,
 			fullTextEnabled,
 			updateMode,
+			title,
 		})
 	}
 
+	/**
+	 * Deletes a feed
+	 *
+	 * @param param0
+	 * @param param0.feedId {Number} ID number of feed to delete
+	 * @return {AxiosResponse} Null value is returned on success
+	 */
+	static deleteFeed({ feedId }: { feedId: number }): Promise<AxiosResponse> {
+		return axios.delete(API_ROUTES.FEED + `/${feedId}`)
+	}
+
 }
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
index 6ea357570..e22ed2261 100644
--- a/src/shims-vue.d.ts
+++ b/src/shims-vue.d.ts
@@ -12,4 +12,4 @@ declare module '@nextcloud/vue/dist/Components/*' {
 };
 
 // Necessary to access translate in typescript components
-function t(app, key) { }
\ No newline at end of file
+function t(app, key): string { }
\ No newline at end of file
diff --git a/src/store/feed.ts b/src/store/feed.ts
index b6031e4e6..d4bdd6bcc 100644
--- a/src/store/feed.ts
+++ b/src/store/feed.ts
@@ -11,10 +11,14 @@ export const FEED_ACTION_TYPES = {
 	ADD_FEED: 'ADD_FEED',
 	FETCH_FEEDS: 'FETCH_FEEDS',
 	FEED_MARK_READ: 'FEED_MARK_READ',
+
 	FEED_SET_PINNED: 'FEED_SET_PINNED',
 	FEED_SET_ORDERING: 'FEED_SET_ORDERING',
 	FEED_SET_FULL_TEXT: 'FEED_SET_FULL_TEXT',
 	FEED_SET_UPDATE_MODE: 'FEED_SET_UPDATE_MODE',
+	FEED_SET_TITLE: 'FEED_SET_TITLE',
+
+	FEED_DELETE: 'FEED_DELETE',
 }
 
 const state = {
@@ -108,6 +112,18 @@ export const actions = {
 
 		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, updateMode })
 	},
+
+	async [FEED_ACTION_TYPES.FEED_SET_TITLE]({ commit }: ActionParams, { feed, title }: { feed: Feed, title: string }) {
+		await FeedService.updateFeed({ feedId: feed.id as number, title })
+
+		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, title })
+	},
+
+	async [FEED_ACTION_TYPES.FEED_DELETE]({ commit }: ActionParams, { feed }: { feed: Feed }) {
+		await FeedService.deleteFeed({ feedId: feed.id as number })
+
+		commit(FEED_MUTATION_TYPES.FEED_DELETE, feed.id)
+	},
 }
 
 export const mutations = {
@@ -151,6 +167,11 @@ export const mutations = {
 			_.assign(feed, { unreadCount: feed.unreadCount - 1 })
 		}
 	},
+	[FEED_MUTATION_TYPES.FEED_DELETE](state: AppState, feedId: number) {
+		state.feeds = state.feeds.filter((feed: Feed) => {
+			return feed.id !== feedId
+		})
+	},
 }
 
 export default {
diff --git a/src/types/Feed.ts b/src/types/Feed.ts
index f9544c2b0..5a7ff98f4 100644
--- a/src/types/Feed.ts
+++ b/src/types/Feed.ts
@@ -11,5 +11,6 @@ export type Feed = {
   pinned: boolean;
   ordering: FEED_ORDER;
   fullTextEnabled: boolean;
-  updateMode: FEED_UPDATE_MODE
+  updateMode: FEED_UPDATE_MODE;
+  location: string;
 }
diff --git a/src/types/MutationTypes.ts b/src/types/MutationTypes.ts
index 9947b7d11..dba5a7274 100644
--- a/src/types/MutationTypes.ts
+++ b/src/types/MutationTypes.ts
@@ -6,6 +6,8 @@ export const FEED_MUTATION_TYPES = {
 	SET_FEED_ALL_READ: 'SET_FEED_ALL_READ',
 	INCREASE_FEED_UNREAD_COUNT: 'INCREASE_FEED_UNREAD_COUNT',
 	DECREASE_FEED_UNREAD_COUNT: 'DECREASE_FEED_UNREAD_COUNT',
+
+	FEED_DELETE: 'FEED_DELETE',
 }
 
 export const FOLDER_MUTATION_TYPES = {

From a23bf812e354cfcd252e5ab723d372a8a3f0a7b2 Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Fri, 15 Sep 2023 14:29:17 -0700
Subject: [PATCH 05/11] all sidebar actions working

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 src/components/Sidebar.vue         | 36 +++++++++++++++++++++--------
 src/dataservices/folder.service.ts | 14 +++++++++++
 src/store/feed.ts                  | 37 +++++++++++++++++++-----------
 src/store/folder.ts                | 35 ++++++++++++++++++++++++++--
 src/store/index.ts                 |  6 ++---
 src/store/item.ts                  | 16 ++++++++-----
 src/types/MutationTypes.ts         |  6 +++--
 7 files changed, 114 insertions(+), 36 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 95cf27002..5277efae5 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -21,8 +21,8 @@
 
 			<NcAppNavigationItem :name="t('news', 'Unread articles')" icon="icon-rss" :to="{ name: ROUTES.UNREAD }">
 				<template #actions>
-					<NcActionButton icon="icon-checkmark" @click="alert('TODO: Mark Read')">
-						t('news','Mark read')
+					<NcActionButton icon="icon-checkmark" @click="markAllRead()">
+						{{ t('news','Mark read') }}
 					</NcActionButton>
 				</template>
 				<template #icon>
@@ -33,11 +33,6 @@
 				</template>
 			</NcAppNavigationItem>
 			<NcAppNavigationItem :name="t('news', 'All articles')" icon="icon-rss" :to="{ name: ROUTES.ALL }">
-				<template #actions>
-					<ActionButton icon="icon-checkmark" @click="alert('TODO: Edit')">
-						t('news','Mark read')
-					</ActionButton>
-				</template>
 				<template #icon>
 					<RssIcon />
 				</template>
@@ -59,7 +54,7 @@
 						:key="feed.name"
 						:name="feed.title"
 						:icon="''"
-						:to="{ name: ROUTES.FEED, params: { feedId: feed.id } }">
+						:to="{ name: ROUTES.FEED, params: { feedId: feed.id.toString() } }">
 						<template #icon>
 							<RssIcon v-if="!feed.faviconLink" />
 							<span v-if="feed.faviconLink" style="width: 16px; height: 16px; background-size: contain;" :style="{ 'backgroundImage': 'url(' + feed.faviconLink + ')' }" />
@@ -86,10 +81,10 @@
 				<template #actions>
 					<SidebarFeedLinkActions v-if="topLevelItem.name === undefined" :feed-id="topLevelItem.id" />
 
-					<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-checkmark" @click="alert('TODO: Mark read')">
+					<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-checkmark" @click="markFolderRead(topLevelItem)">
 						{{ t("news", "Mark read") }}
 					</NcActionButton>
-					<NcActionButton icon="icon-rename" @click="alert('TODO: Rename')">
+					<NcActionButton v-if="topLevelItem.name !== undefined" icon="icon-rename" @click="renameFolder(topLevelItem)">
 						{{ t("news", "Rename") }}
 					</NcActionButton>
 					<NcActionButton icon="icon-delete" @click="deleteFolder(topLevelItem)">
@@ -191,6 +186,27 @@ export default Vue.extend({
 			const folder = { name: folderName }
 			this.$store.dispatch(ACTIONS.ADD_FOLDERS, { folder })
 		},
+		markAllRead() {
+			this.$store.getters.feeds.forEach((feed: Feed) => {
+				this.$store.dispatch(ACTIONS.FEED_MARK_READ, { feed })
+			})
+		},
+		markFolderRead(folder: Folder) {
+			const feeds = this.$store.getters.feeds.filter((feed: Feed) => {
+				return feed.folderId === folder.id
+			})
+			feeds.forEach((feed: Feed) => {
+				this.$store.dispatch(ACTIONS.FEED_MARK_READ, { feed })
+			})
+		},
+		renameFolder(folder: Folder) {
+			const name = window.prompt(t('news', 'Rename Folder'), folder.name)
+
+			// null on escape
+			if (name !== null) {
+				this.$store.dispatch(ACTIONS.FOLDER_SET_NAME, { folder, name })
+			}
+		},
 		deleteFolder(folder: Folder) {
 			this.$store.dispatch(ACTIONS.DELETE_FOLDER, { folder })
 		},
diff --git a/src/dataservices/folder.service.ts b/src/dataservices/folder.service.ts
index 45db7d271..7f1e42aa7 100644
--- a/src/dataservices/folder.service.ts
+++ b/src/dataservices/folder.service.ts
@@ -25,6 +25,20 @@ export class FolderService {
 		return axios.post(API_ROUTES.FOLDER, { folderName: name })
 	}
 
+	/**
+	 * Update a folder name
+	 *
+	 * @param param0
+	 * @param param0.id {Number} ID number of folder to update
+	 * @param param0.name {String} name to set for folder
+	 * @return {AxiosResponse} Null value is returned on success
+	 */
+	static renameFolder({ id, name }: { id: number, name?: string }): Promise<AxiosResponse> {
+		return axios.post(API_ROUTES.FOLDER + `/${id}/rename`, {
+			folderName: name,
+		})
+	}
+
 	/**
 	 * Deletes a folder in the Nextcloud News backend (by id number)
 	 *
diff --git a/src/store/feed.ts b/src/store/feed.ts
index d4bdd6bcc..ad8b30fad 100644
--- a/src/store/feed.ts
+++ b/src/store/feed.ts
@@ -18,6 +18,8 @@ export const FEED_ACTION_TYPES = {
 	FEED_SET_UPDATE_MODE: 'FEED_SET_UPDATE_MODE',
 	FEED_SET_TITLE: 'FEED_SET_TITLE',
 
+	MODIFY_FEED_UNREAD_COUNT: 'MODIFY_FEED_UNREAD_COUNT',
+
 	FEED_DELETE: 'FEED_DELETE',
 }
 
@@ -86,7 +88,11 @@ export const actions = {
 		const response = await ItemService.fetchFeedItems(feed.id as number)
 		await FeedService.markRead({ feedId: feed.id as number, highestItemId: response.data.items[0].id })
 
-		commit(FEED_MUTATION_TYPES.SET_FEED_ALL_READ, feed.id)
+		if (feed.folderId) {
+			commit(FOLDER_MUTATION_TYPES.MODIFY_FOLDER_UNREAD_COUNT, { folderId: feed.folderId, delta: -feed.unreadCount })
+		}
+
+		commit(FEED_MUTATION_TYPES.SET_FEED_ALL_READ, feed)
 	},
 
 	async [FEED_ACTION_TYPES.FEED_SET_PINNED]({ commit }: ActionParams, { feed, pinned }: { feed: Feed, pinned: boolean }) {
@@ -124,6 +130,19 @@ export const actions = {
 
 		commit(FEED_MUTATION_TYPES.FEED_DELETE, feed.id)
 	},
+
+	async [FEED_ACTION_TYPES.MODIFY_FEED_UNREAD_COUNT]({ commit, state }: ActionParams, { feedId, delta }: { feedId: number, delta: number }) {
+		commit(FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT, { feedId, delta })
+
+		const feed = state.feeds.find((feed: Feed) => {
+			return feed.id === feedId
+		})
+
+		if (feed?.folderId) {
+			commit(FOLDER_MUTATION_TYPES.MODIFY_FOLDER_UNREAD_COUNT, { folderId: feed?.folderId, delta })
+		}
+
+	},
 }
 
 export const mutations = {
@@ -141,9 +160,9 @@ export const mutations = {
 		})
 		_.assign(feed, newFeed)
 	},
-	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state: AppState, feedId: number) {
+	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state: AppState, feed: Feed) {
 		const priorFeed = state.feeds.find((stateFeed: Feed) => {
-			return stateFeed.id === feedId
+			return stateFeed.id === feed.id
 		})
 		if (priorFeed) {
 			const priorUnread = priorFeed?.unreadCount
@@ -151,20 +170,12 @@ export const mutations = {
 			state.unreadCount -= priorUnread
 		}
 	},
-	[FEED_MUTATION_TYPES.INCREASE_FEED_UNREAD_COUNT](state: AppState, feedId: number) {
-		const feed = state.feeds.find((feed: Feed) => {
-			return feed.id === feedId
-		})
-		if (feed) {
-			_.assign(feed, { unreadCount: feed.unreadCount + 1 })
-		}
-	},
-	[FEED_MUTATION_TYPES.DECREASE_FEED_UNREAD_COUNT](state: AppState, feedId: number) {
+	[FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT](state: AppState, { feedId, delta }: { feedId: number, delta: number }) {
 		const feed = state.feeds.find((feed: Feed) => {
 			return feed.id === feedId
 		})
 		if (feed) {
-			_.assign(feed, { unreadCount: feed.unreadCount - 1 })
+			_.assign(feed, { unreadCount: feed.unreadCount + delta })
 		}
 	},
 	[FEED_MUTATION_TYPES.FEED_DELETE](state: AppState, feedId: number) {
diff --git a/src/store/folder.ts b/src/store/folder.ts
index 760ff39c6..ca4b3d4e7 100644
--- a/src/store/folder.ts
+++ b/src/store/folder.ts
@@ -1,3 +1,5 @@
+import _ from 'lodash'
+
 import { AppState, ActionParams } from '../store'
 import { Folder } from '../types/Folder'
 import { Feed } from '../types/Feed'
@@ -8,6 +10,8 @@ export const FOLDER_ACTION_TYPES = {
 	FETCH_FOLDERS: 'FETCH_FOLDERS',
 	ADD_FOLDERS: 'ADD_FOLDER',
 	DELETE_FOLDER: 'DELETE_FOLDER',
+
+	FOLDER_SET_NAME: 'FOLDER_SET_NAME',
 }
 
 const state = {
@@ -26,11 +30,11 @@ export const actions = {
 
 		commit(FOLDER_MUTATION_TYPES.SET_FOLDERS, folders.data.folders)
 	},
-	async [FOLDER_ACTION_TYPES.ADD_FOLDERS]({ commit }: ActionParams, { folder }: { folder: Folder}) {
+	async [FOLDER_ACTION_TYPES.ADD_FOLDERS]({ commit }: ActionParams, { folder }: { folder: Folder }) {
 		const response = await FolderService.createFolder({ name: folder.name })
 		commit(FOLDER_MUTATION_TYPES.SET_FOLDERS, response.data.folders)
 	},
-	async [FOLDER_ACTION_TYPES.DELETE_FOLDER]({ commit }: ActionParams, { folder }: { folder: Folder}) {
+	async [FOLDER_ACTION_TYPES.DELETE_FOLDER]({ commit }: ActionParams, { folder }: { folder: Folder }) {
 		/**
 		 * TODO: look into reversiblyDelete?
       this.getByFolderId(folderId).forEach(function (feed) {
@@ -40,6 +44,10 @@ export const actions = {
 		await FolderService.deleteFolder({ id: folder.id })
 		commit(FOLDER_MUTATION_TYPES.DELETE_FOLDER, folder)
 	},
+	async [FOLDER_ACTION_TYPES.FOLDER_SET_NAME]({ commit }: ActionParams, { folder, name }: { folder: Folder, name: string }) {
+		await FolderService.renameFolder({ id: folder.id, name })
+		commit(FOLDER_MUTATION_TYPES.UPDATE_FOLDER, { id: folder.id, name })
+	},
 }
 
 export const mutations = {
@@ -70,6 +78,29 @@ export const mutations = {
 			folder.feedCount += feed.unreadCount
 		}
 	},
+	[FOLDER_MUTATION_TYPES.UPDATE_FOLDER](state: AppState, newFolder: Folder) {
+		const folder = state.folders.find((f: Folder) => { return f.id === newFolder.id })
+		if (folder) {
+			_.assign(folder, newFolder)
+		}
+	},
+
+	[FOLDER_MUTATION_TYPES.MODIFY_FOLDER_UNREAD_COUNT](state: AppState, { folderId, delta }: {folderId: number; delta: number }) {
+		const folder = state.folders.find((f: Folder) => { return f.id === folderId })
+		if (folder) {
+			folder.feedCount += delta
+		}
+	},
+
+	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state: AppState, feed: Feed) {
+		const folder = state.folders.find((folder: Folder) => {
+			return folder.id === feed.folderId
+		})
+
+		if (folder) {
+			folder.feedCount -= feed.unreadCount
+		}
+	},
 }
 
 export default {
diff --git a/src/store/index.ts b/src/store/index.ts
index 489cceac4..aee0d7441 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -17,14 +17,14 @@ export const ACTIONS = {
 	...FEED_ITEM_ACTION_TYPES,
 }
 
-type Func = (name: string, value: unknown) => void;
-export type ActionParams = { commit: Func };
-
 export type AppState = {
   feeds: Feed[];
   folders: Folder[];
 } & ItemState;
 
+type Func = (name: string, value: unknown) => void;
+export type ActionParams = { commit: Func; dispatch: Func; state: AppState };
+
 export default {
 	modules: {
 		feeds,
diff --git a/src/store/item.ts b/src/store/item.ts
index 6c91b0755..07e79a39d 100644
--- a/src/store/item.ts
+++ b/src/store/item.ts
@@ -2,7 +2,9 @@ import { ActionParams } from '../store'
 import { FEED_ITEM_MUTATION_TYPES, FEED_MUTATION_TYPES } from '../types/MutationTypes'
 
 import { FeedItem } from '../types/FeedItem'
+import { Feed } from '../types/Feed'
 import { ItemService } from '../dataservices/item.service'
+import { FEED_ACTION_TYPES } from './feed'
 
 export const FEED_ITEM_ACTION_TYPES = {
 	FETCH_STARRED: 'FETCH_STARRED',
@@ -187,16 +189,17 @@ export const actions = {
 	 *
 	 * @param param0 ActionParams
 	 * @param param0.commit
+	 * @param param0.dispatch
 	 * @param param1 ActionArgs
 	 * @param param1.item
 	 */
-	[FEED_ITEM_ACTION_TYPES.MARK_READ]({ commit }: ActionParams, { item }: { item: FeedItem }) {
+	[FEED_ITEM_ACTION_TYPES.MARK_READ]({ commit, dispatch }: ActionParams, { item }: { item: FeedItem }) {
 		ItemService.markRead(item, true)
 
 		if (item.unread) {
 			commit(FEED_ITEM_MUTATION_TYPES.SET_UNREAD_COUNT, state.unreadCount - 1)
 
-			commit(FEED_MUTATION_TYPES.DECREASE_FEED_UNREAD_COUNT, item.feedId)
+			dispatch(FEED_ACTION_TYPES.MODIFY_FEED_UNREAD_COUNT, { feedId: item.feedId, delta: -1 })
 		}
 		item.unread = false
 		commit(FEED_ITEM_MUTATION_TYPES.UPDATE_ITEM, { item })
@@ -207,16 +210,17 @@ export const actions = {
 	 *
 	 * @param param0 ActionParams
 	 * @param param0.commit
+	 * @param param0.dispatch
 	 * @param param1 ActionArgs
 	 * @param param1.item
 	 */
-	[FEED_ITEM_ACTION_TYPES.MARK_UNREAD]({ commit }: ActionParams, { item }: { item: FeedItem}) {
+	[FEED_ITEM_ACTION_TYPES.MARK_UNREAD]({ commit, dispatch }: ActionParams, { item }: { item: FeedItem}) {
 		ItemService.markRead(item, false)
 
 		if (!item.unread) {
 			commit(FEED_ITEM_MUTATION_TYPES.SET_UNREAD_COUNT, state.unreadCount + 1)
 
-			commit(FEED_MUTATION_TYPES.INCREASE_FEED_UNREAD_COUNT, item.feedId)
+			dispatch(FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT, { feedId: item.feedId, delta: +1 })
 		}
 		item.unread = true
 		commit(FEED_ITEM_MUTATION_TYPES.UPDATE_ITEM, { item })
@@ -287,9 +291,9 @@ export const mutations = {
 	[FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED](state: ItemState, { lastItem, key }: { lastItem: number; key: string; }) {
 		state.lastItemLoaded[key] = lastItem
 	},
-	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state: ItemState, feedId: number) {
+	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state: ItemState, feed: Feed) {
 		state.allItems.forEach((item: FeedItem) => {
-			if (item.feedId === feedId) {
+			if (item.feedId === feed.id) {
 				item.unread = false
 			}
 		})
diff --git a/src/types/MutationTypes.ts b/src/types/MutationTypes.ts
index dba5a7274..6da393c6a 100644
--- a/src/types/MutationTypes.ts
+++ b/src/types/MutationTypes.ts
@@ -4,8 +4,7 @@ export const FEED_MUTATION_TYPES = {
 	UPDATE_FEED: 'UPDATE_FEED',
 
 	SET_FEED_ALL_READ: 'SET_FEED_ALL_READ',
-	INCREASE_FEED_UNREAD_COUNT: 'INCREASE_FEED_UNREAD_COUNT',
-	DECREASE_FEED_UNREAD_COUNT: 'DECREASE_FEED_UNREAD_COUNT',
+	MODIFY_FEED_UNREAD_COUNT: 'MODIFY_FEED_UNREAD_COUNT',
 
 	FEED_DELETE: 'FEED_DELETE',
 }
@@ -13,6 +12,9 @@ export const FEED_MUTATION_TYPES = {
 export const FOLDER_MUTATION_TYPES = {
 	SET_FOLDERS: 'SET_FOLDERS',
 	DELETE_FOLDER: 'DELETE_FOLDER',
+	UPDATE_FOLDER: 'UPDATE_FOLDER',
+
+	MODIFY_FOLDER_UNREAD_COUNT: 'MODIFY_FOLDER_UNREAD_COUNT',
 }
 
 export const FEED_ITEM_MUTATION_TYPES = {

From 99d8af8db9df2aed266476b5b1be2e43afc2029d Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Fri, 15 Sep 2023 15:08:28 -0700
Subject: [PATCH 06/11] confirm mark all read and feed counter inside folder

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 src/components/Sidebar.vue | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 5277efae5..a7ab51dfd 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -59,6 +59,11 @@
 							<RssIcon v-if="!feed.faviconLink" />
 							<span v-if="feed.faviconLink" style="width: 16px; height: 16px; background-size: contain;" :style="{ 'backgroundImage': 'url(' + feed.faviconLink + ')' }" />
 						</template>
+						<template #counter>
+							<NcCounterBubble v-if="feed.unreadCount > 0">
+								{{ feed.unreadCount }}
+							</NcCounterBubble>
+						</template>
 
 						<template #actions>
 							<SidebarFeedLinkActions :feed-id="feed.id" />
@@ -187,17 +192,25 @@ export default Vue.extend({
 			this.$store.dispatch(ACTIONS.ADD_FOLDERS, { folder })
 		},
 		markAllRead() {
-			this.$store.getters.feeds.forEach((feed: Feed) => {
-				this.$store.dispatch(ACTIONS.FEED_MARK_READ, { feed })
-			})
+			const shouldMarkRead = window.confirm(t('news', 'Are you sure you want to mark all read?'))
+
+			if (shouldMarkRead) {
+				this.$store.getters.feeds.forEach((feed: Feed) => {
+					this.$store.dispatch(ACTIONS.FEED_MARK_READ, { feed })
+				})
+			}
 		},
 		markFolderRead(folder: Folder) {
-			const feeds = this.$store.getters.feeds.filter((feed: Feed) => {
-				return feed.folderId === folder.id
-			})
-			feeds.forEach((feed: Feed) => {
-				this.$store.dispatch(ACTIONS.FEED_MARK_READ, { feed })
-			})
+			const shouldMarkRead = window.confirm(t('news', 'Are you sure you want to mark all read?'))
+
+			if (shouldMarkRead) {
+				const feeds = this.$store.getters.feeds.filter((feed: Feed) => {
+					return feed.folderId === folder.id
+				})
+				feeds.forEach((feed: Feed) => {
+					this.$store.dispatch(ACTIONS.FEED_MARK_READ, { feed })
+				})
+			}
 		},
 		renameFolder(folder: Folder) {
 			const name = window.prompt(t('news', 'Rename Folder'), folder.name)

From 7f2ccbeb581b16b36960e0b58e3dbe26769f160b Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Fri, 15 Sep 2023 16:02:29 -0700
Subject: [PATCH 07/11] start on tests

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 .eslintrc.js                               |  6 ++
 src/components/Sidebar.vue                 |  3 +-
 src/components/SidebarFeedLinkActions.vue  |  2 +-
 src/store/feed.ts                          | 73 ++++++++++++++----
 src/store/folder.ts                        | 54 ++++++++++---
 src/store/item.ts                          | 88 ++++++++++++++++++----
 tests/javascript/unit/store/feed.spec.ts   |  8 +-
 tests/javascript/unit/store/folder.spec.ts |  4 +-
 tests/javascript/unit/store/item.spec.ts   | 26 +++++--
 9 files changed, 211 insertions(+), 53 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index 1021c7404..48070d761 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -42,5 +42,11 @@ module.exports = {
 				'@typescript-eslint/no-explicit-any': 'off',
 			},
 		},
+		{
+			files: ['src/store/*.ts'],
+			rules: {
+				'function-paren-newline': ['error', 'multiline'],
+			},
+		},
 	 ],
 }
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index a7ab51dfd..3ffb8c0ca 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -148,6 +148,7 @@ const SideBarState = {
 		})
 		navItems = navItems.concat(state.folders)
 
+		// bring pinned items to the top
 		return navItems.sort((item, item2) => {
 			if ((item as Feed).pinned && !(item2 as Feed).pinned) {
 				return -1
@@ -215,7 +216,7 @@ export default Vue.extend({
 		renameFolder(folder: Folder) {
 			const name = window.prompt(t('news', 'Rename Folder'), folder.name)
 
-			// null on escape
+			// null when user presses escape (do nothing)
 			if (name !== null) {
 				this.$store.dispatch(ACTIONS.FOLDER_SET_NAME, { folder, name })
 			}
diff --git a/src/components/SidebarFeedLinkActions.vue b/src/components/SidebarFeedLinkActions.vue
index e9f8bd521..444254cc4 100644
--- a/src/components/SidebarFeedLinkActions.vue
+++ b/src/components/SidebarFeedLinkActions.vue
@@ -131,7 +131,7 @@ export default Vue.extend({
 		rename() {
 			const title = window.prompt(t('news', 'Rename Feed'), this.feed.title)
 
-			// null on escape
+			// null when user presses escape (do nothing)
 			if (title !== null) {
 				this.$store.dispatch(ACTIONS.FEED_SET_TITLE, { feed: this.feed, title })
 			}
diff --git a/src/store/feed.ts b/src/store/feed.ts
index ad8b30fad..9fea76a72 100644
--- a/src/store/feed.ts
+++ b/src/store/feed.ts
@@ -42,6 +42,7 @@ export const actions = {
 			return total + feed.unreadCount
 		}, 0)))
 	},
+
 	async [FEED_ACTION_TYPES.ADD_FEED](
 		{ commit }: ActionParams,
 		{ feedReq }: {
@@ -80,9 +81,9 @@ export const actions = {
 		} catch (e) {
 			// TODO: show error to user if failure
 			console.log(e)
-
 		}
 	},
+
 	async [FEED_ACTION_TYPES.FEED_MARK_READ]({ commit }: ActionParams, { feed }: { feed: Feed }) {
 		// want to fetch feed so that we can retrieve the "highestItemId"
 		const response = await ItemService.fetchFeedItems(feed.id as number)
@@ -95,43 +96,64 @@ export const actions = {
 		commit(FEED_MUTATION_TYPES.SET_FEED_ALL_READ, feed)
 	},
 
-	async [FEED_ACTION_TYPES.FEED_SET_PINNED]({ commit }: ActionParams, { feed, pinned }: { feed: Feed, pinned: boolean }) {
+	async [FEED_ACTION_TYPES.FEED_SET_PINNED](
+		{ commit }: ActionParams,
+		{ feed, pinned }: { feed: Feed, pinned: boolean },
+	) {
 		await FeedService.updateFeed({ feedId: feed.id as number, pinned })
 
 		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, pinned })
 	},
 
-	async [FEED_ACTION_TYPES.FEED_SET_ORDERING]({ commit }: ActionParams, { feed, ordering }: { feed: Feed, ordering: FEED_ORDER }) {
+	async [FEED_ACTION_TYPES.FEED_SET_ORDERING](
+		{ commit }: ActionParams,
+		{ feed, ordering }: { feed: Feed, ordering: FEED_ORDER },
+	) {
 		await FeedService.updateFeed({ feedId: feed.id as number, ordering })
 
 		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, ordering })
 	},
 
-	async [FEED_ACTION_TYPES.FEED_SET_FULL_TEXT]({ commit }: ActionParams, { feed, fullTextEnabled }: { feed: Feed, fullTextEnabled: boolean }) {
+	async [FEED_ACTION_TYPES.FEED_SET_FULL_TEXT](
+		{ commit }: ActionParams,
+		{ feed, fullTextEnabled }: { feed: Feed, fullTextEnabled: boolean },
+	) {
 		await FeedService.updateFeed({ feedId: feed.id as number, fullTextEnabled })
 
 		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, fullTextEnabled })
 	},
 
-	async [FEED_ACTION_TYPES.FEED_SET_UPDATE_MODE]({ commit }: ActionParams, { feed, updateMode }: { feed: Feed, updateMode: FEED_UPDATE_MODE }) {
+	async [FEED_ACTION_TYPES.FEED_SET_UPDATE_MODE](
+		{ commit }: ActionParams,
+		 { feed, updateMode }: { feed: Feed, updateMode: FEED_UPDATE_MODE },
+	) {
 		await FeedService.updateFeed({ feedId: feed.id as number, updateMode })
 
 		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, updateMode })
 	},
 
-	async [FEED_ACTION_TYPES.FEED_SET_TITLE]({ commit }: ActionParams, { feed, title }: { feed: Feed, title: string }) {
+	async [FEED_ACTION_TYPES.FEED_SET_TITLE](
+		{ commit }: ActionParams,
+		{ feed, title }: { feed: Feed, title: string },
+	) {
 		await FeedService.updateFeed({ feedId: feed.id as number, title })
 
 		commit(FEED_MUTATION_TYPES.UPDATE_FEED, { id: feed.id, title })
 	},
 
-	async [FEED_ACTION_TYPES.FEED_DELETE]({ commit }: ActionParams, { feed }: { feed: Feed }) {
+	async [FEED_ACTION_TYPES.FEED_DELETE](
+		{ commit }: ActionParams,
+		{ feed }: { feed: Feed },
+	) {
 		await FeedService.deleteFeed({ feedId: feed.id as number })
 
 		commit(FEED_MUTATION_TYPES.FEED_DELETE, feed.id)
 	},
 
-	async [FEED_ACTION_TYPES.MODIFY_FEED_UNREAD_COUNT]({ commit, state }: ActionParams, { feedId, delta }: { feedId: number, delta: number }) {
+	async [FEED_ACTION_TYPES.MODIFY_FEED_UNREAD_COUNT](
+		{ commit, state }: ActionParams,
+		 { feedId, delta }: { feedId: number, delta: number },
+	) {
 		commit(FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT, { feedId, delta })
 
 		const feed = state.feeds.find((feed: Feed) => {
@@ -146,21 +168,36 @@ export const actions = {
 }
 
 export const mutations = {
-	[FEED_MUTATION_TYPES.SET_FEEDS](state: AppState, feeds: Feed[]) {
+	[FEED_MUTATION_TYPES.SET_FEEDS](
+		state: AppState,
+		feeds: Feed[],
+	) {
 		feeds.forEach(it => {
 			state.feeds.push(it)
 		})
 	},
-	[FEED_MUTATION_TYPES.ADD_FEED](state: AppState, feed: Feed) {
+
+	[FEED_MUTATION_TYPES.ADD_FEED](
+		state: AppState,
+		 feed: Feed,
+	) {
 		state.feeds.push(feed)
 	},
-	[FEED_MUTATION_TYPES.UPDATE_FEED](state: AppState, newFeed: Feed) {
+
+	[FEED_MUTATION_TYPES.UPDATE_FEED](
+		state: AppState,
+		 newFeed: Feed,
+	) {
 		const feed = state.feeds.find((feed: Feed) => {
 			return feed.id === newFeed.id
 		})
 		_.assign(feed, newFeed)
 	},
-	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state: AppState, feed: Feed) {
+
+	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](
+		state: AppState,
+		feed: Feed,
+	) {
 		const priorFeed = state.feeds.find((stateFeed: Feed) => {
 			return stateFeed.id === feed.id
 		})
@@ -170,7 +207,11 @@ export const mutations = {
 			state.unreadCount -= priorUnread
 		}
 	},
-	[FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT](state: AppState, { feedId, delta }: { feedId: number, delta: number }) {
+
+	[FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT](
+		state: AppState,
+		{ feedId, delta }: { feedId: number, delta: number },
+	) {
 		const feed = state.feeds.find((feed: Feed) => {
 			return feed.id === feedId
 		})
@@ -178,7 +219,11 @@ export const mutations = {
 			_.assign(feed, { unreadCount: feed.unreadCount + delta })
 		}
 	},
-	[FEED_MUTATION_TYPES.FEED_DELETE](state: AppState, feedId: number) {
+
+	[FEED_MUTATION_TYPES.FEED_DELETE](
+		state: AppState,
+		feedId: number,
+	) {
 		state.feeds = state.feeds.filter((feed: Feed) => {
 			return feed.id !== feedId
 		})
diff --git a/src/store/folder.ts b/src/store/folder.ts
index ca4b3d4e7..33604d4f1 100644
--- a/src/store/folder.ts
+++ b/src/store/folder.ts
@@ -30,11 +30,17 @@ export const actions = {
 
 		commit(FOLDER_MUTATION_TYPES.SET_FOLDERS, folders.data.folders)
 	},
-	async [FOLDER_ACTION_TYPES.ADD_FOLDERS]({ commit }: ActionParams, { folder }: { folder: Folder }) {
+	async [FOLDER_ACTION_TYPES.ADD_FOLDERS](
+		{ commit }: ActionParams,
+		{ folder }: { folder: Folder },
+	) {
 		const response = await FolderService.createFolder({ name: folder.name })
 		commit(FOLDER_MUTATION_TYPES.SET_FOLDERS, response.data.folders)
 	},
-	async [FOLDER_ACTION_TYPES.DELETE_FOLDER]({ commit }: ActionParams, { folder }: { folder: Folder }) {
+	async [FOLDER_ACTION_TYPES.DELETE_FOLDER](
+		{ commit }: ActionParams,
+		{ folder }: { folder: Folder },
+	) {
 		/**
 		 * TODO: look into reversiblyDelete?
       this.getByFolderId(folderId).forEach(function (feed) {
@@ -44,25 +50,39 @@ export const actions = {
 		await FolderService.deleteFolder({ id: folder.id })
 		commit(FOLDER_MUTATION_TYPES.DELETE_FOLDER, folder)
 	},
-	async [FOLDER_ACTION_TYPES.FOLDER_SET_NAME]({ commit }: ActionParams, { folder, name }: { folder: Folder, name: string }) {
+	async [FOLDER_ACTION_TYPES.FOLDER_SET_NAME](
+		{ commit }: ActionParams,
+		{ folder, name }: { folder: Folder, name: string },
+	) {
 		await FolderService.renameFolder({ id: folder.id, name })
 		commit(FOLDER_MUTATION_TYPES.UPDATE_FOLDER, { id: folder.id, name })
 	},
 }
 
 export const mutations = {
-	[FOLDER_MUTATION_TYPES.SET_FOLDERS](state: AppState, folders: Folder[]) {
+	[FOLDER_MUTATION_TYPES.SET_FOLDERS](
+		state: AppState,
+		folders: Folder[],
+	) {
 		folders.forEach(it => {
 			it.feedCount = 0
 			it.feeds = []
 			state.folders.push(it)
 		})
 	},
-	[FOLDER_MUTATION_TYPES.DELETE_FOLDER](state: AppState, folder: Folder) {
+
+	[FOLDER_MUTATION_TYPES.DELETE_FOLDER](
+		state: AppState,
+		folder: Folder,
+	) {
 		const index = state.folders.indexOf(folder)
 		state.folders.splice(index, 1)
 	},
-	[FEED_MUTATION_TYPES.SET_FEEDS](state: AppState, feeds: Feed[]) {
+
+	[FEED_MUTATION_TYPES.SET_FEEDS](
+		state: AppState,
+		feeds: Feed[],
+	) {
 		feeds.forEach(it => {
 			const folder = state.folders.find((folder: Folder) => { return folder.id === it.folderId })
 			if (folder) {
@@ -71,28 +91,42 @@ export const mutations = {
 			}
 		})
 	},
-	[FEED_MUTATION_TYPES.ADD_FEED](state: AppState, feed: Feed) {
+
+	[FEED_MUTATION_TYPES.ADD_FEED](
+		state: AppState,
+		feed: Feed,
+	) {
 		const folder = state.folders.find((folder: Folder) => { return folder.id === feed.folderId })
 		if (folder) {
 			folder.feeds.push(feed)
 			folder.feedCount += feed.unreadCount
 		}
 	},
-	[FOLDER_MUTATION_TYPES.UPDATE_FOLDER](state: AppState, newFolder: Folder) {
+
+	[FOLDER_MUTATION_TYPES.UPDATE_FOLDER](
+		state: AppState,
+		newFolder: Folder,
+	) {
 		const folder = state.folders.find((f: Folder) => { return f.id === newFolder.id })
 		if (folder) {
 			_.assign(folder, newFolder)
 		}
 	},
 
-	[FOLDER_MUTATION_TYPES.MODIFY_FOLDER_UNREAD_COUNT](state: AppState, { folderId, delta }: {folderId: number; delta: number }) {
+	[FOLDER_MUTATION_TYPES.MODIFY_FOLDER_UNREAD_COUNT](
+		state: AppState,
+		{ folderId, delta }: {folderId: number; delta: number },
+	) {
 		const folder = state.folders.find((f: Folder) => { return f.id === folderId })
 		if (folder) {
 			folder.feedCount += delta
 		}
 	},
 
-	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state: AppState, feed: Feed) {
+	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](
+		state: AppState,
+		feed: Feed,
+	) {
 		const folder = state.folders.find((folder: Folder) => {
 			return folder.id === feed.folderId
 		})
diff --git a/src/store/item.ts b/src/store/item.ts
index 07e79a39d..14ae20658 100644
--- a/src/store/item.ts
+++ b/src/store/item.ts
@@ -67,7 +67,10 @@ export const actions = {
 	 * @param param1 ActionArgs
 	 * @param param1.start
 	 */
-	async [FEED_ITEM_ACTION_TYPES.FETCH_UNREAD]({ commit }: ActionParams, { start }: { start: number } = { start: 0 }) {
+	async [FEED_ITEM_ACTION_TYPES.FETCH_UNREAD](
+		{ commit }: ActionParams,
+		{ start }: { start: number } = { start: 0 },
+	) {
 		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'unread', fetching: true })
 
 		const response = await ItemService.debounceFetchUnread(start || state.lastItemLoaded.unread)
@@ -91,7 +94,10 @@ export const actions = {
 	 * @param param1 ActionArgs
 	 * @param param1.start
 	 */
-	async [FEED_ITEM_ACTION_TYPES.FETCH_ITEMS]({ commit }: ActionParams, { start }: { start: number } = { start: 0 }) {
+	async [FEED_ITEM_ACTION_TYPES.FETCH_ITEMS](
+		{ commit }: ActionParams,
+		{ start }: { start: number } = { start: 0 },
+	) {
 		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'all', fetching: true })
 
 		const response = await ItemService.debounceFetchAll(start || state.lastItemLoaded.all)
@@ -117,7 +123,10 @@ export const actions = {
 	 * @param param1 ActionArgs
 	 * @param param1.start
 	 */
-	async [FEED_ITEM_ACTION_TYPES.FETCH_STARRED]({ commit }: ActionParams, { start }: { start: number } = { start: 0 }) {
+	async [FEED_ITEM_ACTION_TYPES.FETCH_STARRED](
+		{ commit }: ActionParams,
+		{ start }: { start: number } = { start: 0 },
+	) {
 		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'starred', fetching: true })
 		const response = await ItemService.debounceFetchStarred(start || state.lastItemLoaded.starred)
 
@@ -145,7 +154,10 @@ export const actions = {
 	 * @param param1.start
 	 * @param param1.feedId
 	 */
-	async [FEED_ITEM_ACTION_TYPES.FETCH_FEED_ITEMS]({ commit }: ActionParams, { feedId, start }: { feedId: number; start: number }) {
+	async [FEED_ITEM_ACTION_TYPES.FETCH_FEED_ITEMS](
+		{ commit }: ActionParams,
+		{ feedId, start }: { feedId: number; start: number },
+	) {
 		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'feed-' + feedId, fetching: true })
 		const response = await ItemService.debounceFetchFeedItems(feedId, start || state.lastItemLoaded['feed-' + feedId])
 
@@ -169,7 +181,10 @@ export const actions = {
 	 * @param param1.start
 	 * @param param1.folderId
 	 */
-	async [FEED_ITEM_ACTION_TYPES.FETCH_FOLDER_FEED_ITEMS]({ commit }: ActionParams, { folderId, start }: { folderId: number; start: number }) {
+	async [FEED_ITEM_ACTION_TYPES.FETCH_FOLDER_FEED_ITEMS](
+		{ commit }: ActionParams,
+		{ folderId, start }: { folderId: number; start: number },
+	) {
 		commit(FEED_ITEM_MUTATION_TYPES.SET_FETCHING, { key: 'folder-' + folderId, fetching: true })
 		const response = await ItemService.debounceFetchFolderFeedItems(folderId, start || state.lastItemLoaded['folder-' + folderId])
 
@@ -193,7 +208,10 @@ export const actions = {
 	 * @param param1 ActionArgs
 	 * @param param1.item
 	 */
-	[FEED_ITEM_ACTION_TYPES.MARK_READ]({ commit, dispatch }: ActionParams, { item }: { item: FeedItem }) {
+	[FEED_ITEM_ACTION_TYPES.MARK_READ](
+		{ commit, dispatch }: ActionParams,
+		{ item }: { item: FeedItem },
+	) {
 		ItemService.markRead(item, true)
 
 		if (item.unread) {
@@ -214,7 +232,10 @@ export const actions = {
 	 * @param param1 ActionArgs
 	 * @param param1.item
 	 */
-	[FEED_ITEM_ACTION_TYPES.MARK_UNREAD]({ commit, dispatch }: ActionParams, { item }: { item: FeedItem}) {
+	[FEED_ITEM_ACTION_TYPES.MARK_UNREAD](
+		{ commit, dispatch }: ActionParams,
+		{ item }: { item: FeedItem},
+	) {
 		ItemService.markRead(item, false)
 
 		if (!item.unread) {
@@ -234,7 +255,10 @@ export const actions = {
 	 * @param param1 ActionArgs
 	 * @param param1.item
 	 */
-	[FEED_ITEM_ACTION_TYPES.STAR_ITEM]({ commit }: ActionParams, { item }: { item: FeedItem}) {
+	[FEED_ITEM_ACTION_TYPES.STAR_ITEM](
+		{ commit }: ActionParams,
+		{ item }: { item: FeedItem},
+	) {
 		ItemService.markStarred(item, true)
 
 		item.starred = true
@@ -250,7 +274,10 @@ export const actions = {
 	 * @param param1 ActionArgs
 	 * @param param1.item
 	 */
-	[FEED_ITEM_ACTION_TYPES.UNSTAR_ITEM]({ commit }: ActionParams, { item }: { item: FeedItem}) {
+	[FEED_ITEM_ACTION_TYPES.UNSTAR_ITEM](
+		{ commit }: ActionParams,
+		{ item }: { item: FeedItem},
+	) {
 		ItemService.markStarred(item, false)
 
 		item.starred = false
@@ -263,6 +290,7 @@ export const mutations = {
 	[FEED_ITEM_MUTATION_TYPES.SET_SELECTED_ITEM](state: ItemState, { id }: { id: string }) {
 		state.selectedId = id
 	},
+
 	[FEED_ITEM_MUTATION_TYPES.SET_ITEMS](state: ItemState, items: FeedItem[]) {
 		if (items) {
 			items.forEach(it => {
@@ -272,26 +300,54 @@ export const mutations = {
 			})
 		}
 	},
-	[FEED_ITEM_MUTATION_TYPES.SET_STARRED_COUNT](state: ItemState, count: number) {
+
+	[FEED_ITEM_MUTATION_TYPES.SET_STARRED_COUNT](
+		state: ItemState,
+		count: number,
+	) {
 		state.starredCount = count
 	},
-	[FEED_ITEM_MUTATION_TYPES.SET_UNREAD_COUNT](state: ItemState, count: number) {
+
+	[FEED_ITEM_MUTATION_TYPES.SET_UNREAD_COUNT](
+		state: ItemState,
+		count: number,
+	) {
 		state.unreadCount = count
 	},
-	[FEED_ITEM_MUTATION_TYPES.UPDATE_ITEM](state: ItemState, { item }: { item: FeedItem }) {
+
+	[FEED_ITEM_MUTATION_TYPES.UPDATE_ITEM](
+		state: ItemState,
+		{ item }: { item: FeedItem },
+	) {
 		const idx = state.allItems.findIndex((it) => it.id === item.id)
 		state.allItems.splice(idx, 1, item)
 	},
-	[FEED_ITEM_MUTATION_TYPES.SET_FETCHING](state: ItemState, { fetching, key }: { fetching: boolean; key: string; }) {
+
+	[FEED_ITEM_MUTATION_TYPES.SET_FETCHING](
+		state: ItemState,
+		{ fetching, key }: { fetching: boolean; key: string; },
+	) {
 		state.fetchingItems[key] = fetching
 	},
-	[FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED](state: ItemState, { loaded, key }: { loaded: boolean; key: string; }) {
+
+	[FEED_ITEM_MUTATION_TYPES.SET_ALL_LOADED](
+		state: ItemState,
+		{ loaded, key }: { loaded: boolean; key: string; },
+	) {
 		state.allItemsLoaded[key] = loaded
 	},
-	[FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED](state: ItemState, { lastItem, key }: { lastItem: number; key: string; }) {
+
+	[FEED_ITEM_MUTATION_TYPES.SET_LAST_ITEM_LOADED](
+		state: ItemState,
+		{ lastItem, key }: { lastItem: number; key: string; },
+	) {
 		state.lastItemLoaded[key] = lastItem
 	},
-	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state: ItemState, feed: Feed) {
+
+	[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](
+		state: ItemState,
+		feed: Feed,
+	) {
 		state.allItems.forEach((item: FeedItem) => {
 			if (item.feedId === feed.id) {
 				item.unread = false
diff --git a/tests/javascript/unit/store/feed.spec.ts b/tests/javascript/unit/store/feed.spec.ts
index 451d04d7a..db4431b20 100644
--- a/tests/javascript/unit/store/feed.spec.ts
+++ b/tests/javascript/unit/store/feed.spec.ts
@@ -22,20 +22,20 @@ describe('feed.ts', () => {
 		})
 
 		describe('ADD_FEED', () => {
-			it('should call FeedService.addF and commit feed to state', async () => {
+			it('should call FeedService.addFeed and commit feed to state', async () => {
 				FeedService.addFeed = jest.fn();
 				(FeedService.addFeed as any).mockResolvedValue({ data: { feeds: [] } })
 				const commit = jest.fn()
-				await actions[FEED_ACTION_TYPES.ADD_FEED]({ commit }, { feedReq: { url: '' } })
+				await actions[FEED_ACTION_TYPES.ADD_FEED]({ commit } as any, { feedReq: { url: '' } } as any)
 				expect(FeedService.addFeed).toBeCalled()
 				expect(commit).toBeCalled()
 			})
 
-			it('should call FeedService.addF and not call commit if error', async () => {
+			it('should call FeedService.addFeed and not call commit if error', async () => {
 				FeedService.addFeed = jest.fn();
 				(FeedService.addFeed as any).mockRejectedValue()
 				const commit = jest.fn()
-				await actions[FEED_ACTION_TYPES.ADD_FEED]({ commit }, { feedReq: { url: '' } })
+				await actions[FEED_ACTION_TYPES.ADD_FEED]({ commit } as any, { feedReq: { url: '' } } as any)
 				expect(FeedService.addFeed).toBeCalled()
 
 				expect(commit).not.toBeCalled()
diff --git a/tests/javascript/unit/store/folder.spec.ts b/tests/javascript/unit/store/folder.spec.ts
index 8fd2ad34f..796908587 100644
--- a/tests/javascript/unit/store/folder.spec.ts
+++ b/tests/javascript/unit/store/folder.spec.ts
@@ -28,7 +28,7 @@ describe('folder.ts', () => {
 			const folder = {} as Folder
 			const commit = jest.fn()
 
-		  await actions[FOLDER_ACTION_TYPES.ADD_FOLDERS]({ commit }, { folder })
+		  await actions[FOLDER_ACTION_TYPES.ADD_FOLDERS]({ commit } as any, { folder })
 			expect(FolderService.createFolder).toBeCalled()
 			expect(commit).toBeCalled()
 		})
@@ -40,7 +40,7 @@ describe('folder.ts', () => {
 			const folder = {} as Folder
 			const commit = jest.fn()
 
-		  await actions[FOLDER_ACTION_TYPES.DELETE_FOLDER]({ commit }, { folder })
+		  await actions[FOLDER_ACTION_TYPES.DELETE_FOLDER]({ commit } as any, { folder })
 			expect(FolderService.deleteFolder).toBeCalled()
 			expect(commit).toBeCalled()
 		})
diff --git a/tests/javascript/unit/store/item.spec.ts b/tests/javascript/unit/store/item.spec.ts
index 8d22d69a1..b0c5fa412 100644
--- a/tests/javascript/unit/store/item.spec.ts
+++ b/tests/javascript/unit/store/item.spec.ts
@@ -1,7 +1,7 @@
 import { AppState } from '../../../../src/store'
 import { FEED_ITEM_ACTION_TYPES, mutations, actions } from '../../../../src/store/item'
 
-import { FEED_ITEM_MUTATION_TYPES } from '../../../../src/types/MutationTypes'
+import { FEED_ITEM_MUTATION_TYPES, FEED_MUTATION_TYPES } from '../../../../src/types/MutationTypes'
 import { ItemService } from '../../../../src/dataservices/item.service'
 
 describe('item.ts', () => {
@@ -68,27 +68,31 @@ describe('item.ts', () => {
 		})
 
 		it('MARK_READ should call GET and commit returned feeds to state', async () => {
-			const item = { id: 1 }
+			const item = { id: 1, feedId: 123, unread: true }
 			const commit = jest.fn()
+			const dispatch = jest.fn()
 			const serviceMock = jest.fn()
 			ItemService.markRead = serviceMock
 
-			await (actions[FEED_ITEM_ACTION_TYPES.MARK_READ] as any)({ commit }, { item })
+			await (actions[FEED_ITEM_ACTION_TYPES.MARK_READ] as any)({ commit, dispatch }, { item })
 
 			expect(serviceMock).toBeCalledWith(item, true)
 			expect(commit).toBeCalled()
+			expect(dispatch).toBeCalledWith(FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT, { feedId: 123, delta: -1 })
 		})
 
 		it('MARK_UNREAD should call GET and commit returned feeds to state', async () => {
-			const item = { id: 1 }
+			const item = { id: 1, feedId: 123 }
 			const commit = jest.fn()
+			const dispatch = jest.fn()
 			const serviceMock = jest.fn()
 			ItemService.markRead = serviceMock
 
-			await (actions[FEED_ITEM_ACTION_TYPES.MARK_UNREAD] as any)({ commit }, { item })
+			await (actions[FEED_ITEM_ACTION_TYPES.MARK_UNREAD] as any)({ commit, dispatch }, { item })
 
 			expect(serviceMock).toBeCalledWith(item, false)
 			expect(commit).toBeCalledWith(FEED_ITEM_MUTATION_TYPES.UPDATE_ITEM, { item })
+			expect(dispatch).toBeCalledWith(FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT, { feedId: 123, delta: 1 })
 		})
 
 		it('STAR_ITEM should call GET and commit returned feeds to state', async () => {
@@ -213,5 +217,17 @@ describe('item.ts', () => {
 				expect(state.allItemsLoaded.starred).toEqual(false)
 			})
 		})
+
+		describe('SET_FEED_ALL_READ', () => {
+			it('should set allItems with feedId as read', () => {
+				const state = { allItems: [{ id: 1, feedId: 123, unread: true }, { id: 2, feedId: 345, unread: true }] } as any
+
+				(mutations[FEED_MUTATION_TYPES.SET_FEED_ALL_READ] as any)(state, { id: 123 })
+				expect(state.allItems[0].unread).toEqual(false);
+
+				(mutations[FEED_MUTATION_TYPES.SET_FEED_ALL_READ] as any)(state, { id: 345 })
+				expect(state.allItems[1].unread).toEqual(false)
+			})
+		})
 	})
 })

From b3c9d6cda9c7892128205652dd1f3bec3c92b57e Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Sat, 16 Sep 2023 14:00:27 -0700
Subject: [PATCH 08/11] store tests

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 src/store/folder.ts                        |  10 +-
 tests/javascript/unit/store/feed.spec.ts   | 150 ++++++++++++++++++++-
 tests/javascript/unit/store/folder.spec.ts |  36 ++++-
 3 files changed, 184 insertions(+), 12 deletions(-)

diff --git a/src/store/folder.ts b/src/store/folder.ts
index 33604d4f1..680eab097 100644
--- a/src/store/folder.ts
+++ b/src/store/folder.ts
@@ -41,12 +41,6 @@ export const actions = {
 		{ commit }: ActionParams,
 		{ folder }: { folder: Folder },
 	) {
-		/**
-		 * TODO: look into reversiblyDelete?
-      this.getByFolderId(folderId).forEach(function (feed) {
-          promises.push(self.reversiblyDelete(feed.id, false, true));
-      });
-		 */
 		await FolderService.deleteFolder({ id: folder.id })
 		commit(FOLDER_MUTATION_TYPES.DELETE_FOLDER, folder)
 	},
@@ -127,9 +121,7 @@ export const mutations = {
 		state: AppState,
 		feed: Feed,
 	) {
-		const folder = state.folders.find((folder: Folder) => {
-			return folder.id === feed.folderId
-		})
+		const folder = state.folders.find((folder: Folder) => { return folder.id === feed.folderId })
 
 		if (folder) {
 			folder.feedCount -= feed.unreadCount
diff --git a/tests/javascript/unit/store/feed.spec.ts b/tests/javascript/unit/store/feed.spec.ts
index db4431b20..ede4307d1 100644
--- a/tests/javascript/unit/store/feed.spec.ts
+++ b/tests/javascript/unit/store/feed.spec.ts
@@ -1,9 +1,10 @@
 import { Feed } from '../../../../src/types/Feed'
 import { AppState } from '../../../../src/store'
 import { FEED_ACTION_TYPES, mutations, actions } from '../../../../src/store/feed'
-import { FeedService } from '../../../../src/dataservices/feed.service'
+import { FEED_ORDER, FEED_UPDATE_MODE, FeedService } from '../../../../src/dataservices/feed.service'
 
-import { FEED_ITEM_MUTATION_TYPES, FEED_MUTATION_TYPES } from '../../../../src/types/MutationTypes'
+import { FEED_ITEM_MUTATION_TYPES, FEED_MUTATION_TYPES, FOLDER_MUTATION_TYPES } from '../../../../src/types/MutationTypes'
+import { ItemService } from '../../../../src/dataservices/item.service'
 
 describe('feed.ts', () => {
 	'use strict'
@@ -42,6 +43,113 @@ describe('feed.ts', () => {
 			})
 		})
 
+		describe('FEED_MARK_READ', () => {
+			it('should call FeedService.markRead and commit all items read to state', async () => {
+				ItemService.fetchFeedItems = jest.fn();
+				(ItemService.fetchFeedItems as any).mockResolvedValue({ data: { items: [{ id: 123 }] } })
+				FeedService.markRead = jest.fn()
+				const commit = jest.fn()
+				const feed = { id: 1, title: 'feed' }
+
+				await (actions[FEED_ACTION_TYPES.FEED_MARK_READ] as any)({ commit }, { feed })
+				expect(FeedService.markRead).toBeCalled()
+				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.SET_FEED_ALL_READ, feed)
+			})
+
+			it('should commit MODIFY_FOLDER_UNREAD_COUNT with feed unreadCount if folderId exists on feed ', async () => {
+				ItemService.fetchFeedItems = jest.fn();
+				(ItemService.fetchFeedItems as any).mockResolvedValue({ data: { items: [{ id: 123 }] } })
+				FeedService.markRead = jest.fn()
+				const commit = jest.fn()
+				const feed = { id: 1, title: 'feed', folderId: 234, unreadCount: 2 }
+
+				await (actions[FEED_ACTION_TYPES.FEED_MARK_READ] as any)({ commit }, { feed })
+				expect(FeedService.markRead).toBeCalled()
+				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.SET_FEED_ALL_READ, feed)
+				expect(commit).toBeCalledWith(FOLDER_MUTATION_TYPES.MODIFY_FOLDER_UNREAD_COUNT, { folderId: 234, delta: -2 })
+			})
+		})
+
+		describe('FEED_SET_PINNED', () => {
+			it('should call FeedService.updateFeed and commit updated `pinned` property to state', async () => {
+				FeedService.updateFeed = jest.fn()
+				const commit = jest.fn()
+				await (actions[FEED_ACTION_TYPES.FEED_SET_PINNED] as any)({ commit }, { feed: { id: 1 }, pinned: true })
+				expect(FeedService.updateFeed).toBeCalledWith({ feedId: 1, pinned: true })
+				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.UPDATE_FEED, { id: 1, pinned: true })
+			})
+		})
+
+		describe('FEED_SET_ORDERING', () => {
+			it('should call FeedService.updateFeed and commit updated `ordering` property to state', async () => {
+				FeedService.updateFeed = jest.fn()
+				const commit = jest.fn()
+				await (actions[FEED_ACTION_TYPES.FEED_SET_ORDERING] as any)({ commit }, { feed: { id: 1 }, ordering: FEED_ORDER.DEFAULT })
+				expect(FeedService.updateFeed).toBeCalledWith({ feedId: 1, ordering: FEED_ORDER.DEFAULT })
+				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.UPDATE_FEED, { id: 1, ordering: FEED_ORDER.DEFAULT })
+			})
+		})
+
+		describe('FEED_SET_FULL_TEXT', () => {
+			it('should call FeedService.updateFeed and commit updated `fullTextEnabled` property to state', async () => {
+				FeedService.updateFeed = jest.fn()
+				const commit = jest.fn()
+				await (actions[FEED_ACTION_TYPES.FEED_SET_FULL_TEXT] as any)({ commit }, { feed: { id: 1 }, fullTextEnabled: true })
+				expect(FeedService.updateFeed).toBeCalledWith({ feedId: 1, fullTextEnabled: true })
+				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.UPDATE_FEED, { id: 1, fullTextEnabled: true })
+			})
+		})
+
+		describe('FEED_SET_UPDATE_MODE', () => {
+			it('should call FeedService.updateFeed and commit updated `updateMode` property to state', async () => {
+				FeedService.updateFeed = jest.fn()
+				const commit = jest.fn()
+				await (actions[FEED_ACTION_TYPES.FEED_SET_UPDATE_MODE] as any)({ 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 })
+			})
+		})
+
+		describe('FEED_SET_TITLE', () => {
+			it('should call FeedService.updateFeed and commit updated `title` property to state', async () => {
+				FeedService.updateFeed = jest.fn()
+				const commit = jest.fn()
+				await (actions[FEED_ACTION_TYPES.FEED_SET_TITLE] as any)({ commit }, { feed: { id: 1 }, title: 'newTitle' })
+				expect(FeedService.updateFeed).toBeCalledWith({ feedId: 1, title: 'newTitle' })
+				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.UPDATE_FEED, { id: 1, title: 'newTitle' })
+			})
+		})
+
+		describe('FEED_DELETE', () => {
+			it('should call FeedService.deleteFeed and commit to state', async () => {
+				FeedService.deleteFeed = jest.fn()
+				const commit = jest.fn()
+				await (actions[FEED_ACTION_TYPES.FEED_DELETE] as any)({ commit }, { feed: { id: 1 } })
+				expect(FeedService.deleteFeed).toBeCalledWith({ feedId: 1 })
+				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.FEED_DELETE, 1)
+			})
+		})
+
+		describe('MODIFY_FEED_UNREAD_COUNT', () => {
+			const state = {
+				feeds: [{ id: 1 }],
+			}
+			it('should commit to state', async () => {
+				const commit = jest.fn()
+				await (actions[FEED_ACTION_TYPES.MODIFY_FEED_UNREAD_COUNT] as any)({ commit, state }, { feedId: 1, delta: -2 })
+				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT, { feedId: 1, delta: -2 })
+			})
+
+			it('should commit folder to state if feed has folderId', async () => {
+				const state = {
+					feeds: [{ id: 1, folderId: 234 }],
+				}
+				const commit = jest.fn()
+				await (actions[FEED_ACTION_TYPES.MODIFY_FEED_UNREAD_COUNT] as any)({ commit, state }, { feedId: 1, delta: -2 })
+				expect(commit).toBeCalledWith(FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT, { feedId: 1, delta: -2 })
+				expect(commit).toBeCalledWith(FOLDER_MUTATION_TYPES.MODIFY_FOLDER_UNREAD_COUNT, { folderId: 234, delta: -2 })
+			})
+		})
 	})
 
 	describe('mutations', () => {
@@ -71,5 +179,43 @@ describe('feed.ts', () => {
 				expect(state.feeds[0]).toEqual(feed)
 			})
 		})
+
+		describe('UPDATE_FEED', () => {
+			it('should update a feed in the state', () => {
+				const state = { feeds: [{ title: 'oldName', id: 1 }] as Feed[], folders: [] as any[] } as AppState
+				const feed = { title: 'test', id: 1 } as any
+
+				mutations[FEED_MUTATION_TYPES.UPDATE_FEED](state, feed)
+				expect(state.feeds[0].title).toEqual('test')
+			})
+		})
+
+		describe('SET_FEED_ALL_READ', () => {
+			it('should update a feed unreadCount to 0 in the state', () => {
+				const state = { feeds: [{ title: 'oldName', id: 1, unreadCount: 4 }] as Feed[], folders: [] as any[] } as AppState
+				const feed = { title: 'test', id: 1 } as any
+
+				mutations[FEED_MUTATION_TYPES.SET_FEED_ALL_READ](state, feed)
+				expect(state.feeds[0].unreadCount).toEqual(0)
+			})
+		})
+
+		describe('MODIFY_FEED_UNREAD_COUNT', () => {
+			it('should update a feed unreadCount to 0 in the state', () => {
+				const state = { feeds: [{ title: 'oldName', id: 1, unreadCount: 4 }] as Feed[], folders: [] as any[] } as AppState
+
+				mutations[FEED_MUTATION_TYPES.MODIFY_FEED_UNREAD_COUNT](state, { feedId: 1, delta: -1 } as any)
+				expect(state.feeds[0].unreadCount).toEqual(3)
+			})
+		})
+
+		describe('FEED_DELETE', () => {
+			it('should update a feed unreadCount to 0 in the state', () => {
+				const state = { feeds: [{ title: 'oldName', id: 1, unreadCount: 4 }] as Feed[], folders: [] as any[] } as AppState
+
+				mutations[FEED_MUTATION_TYPES.FEED_DELETE](state, 1 as any)
+				expect(state.feeds.length).toEqual(0)
+			})
+		})
 	})
 })
diff --git a/tests/javascript/unit/store/folder.spec.ts b/tests/javascript/unit/store/folder.spec.ts
index 796908587..8150ed28f 100644
--- a/tests/javascript/unit/store/folder.spec.ts
+++ b/tests/javascript/unit/store/folder.spec.ts
@@ -1,7 +1,7 @@
 import { Folder } from '../../../../src/types/Folder'
 import { AppState } from '../../../../src/store'
 import { FOLDER_ACTION_TYPES, mutations, actions } from '../../../../src/store/folder'
-import { FOLDER_MUTATION_TYPES } from '../../../../src/types/MutationTypes'
+import { FEED_MUTATION_TYPES, FOLDER_MUTATION_TYPES } from '../../../../src/types/MutationTypes'
 import { FolderService } from '../../../../src/dataservices/folder.service'
 
 jest.mock('@nextcloud/router')
@@ -44,6 +44,18 @@ describe('folder.ts', () => {
 			expect(FolderService.deleteFolder).toBeCalled()
 			expect(commit).toBeCalled()
 		})
+
+		it('FOLDER_SET_NAME should call FolderService.renameFolder and then commit deleted folder to state', async () => {
+			FolderService.renameFolder = jest.fn();
+			(FolderService.renameFolder as any).mockResolvedValue()
+
+			const folder = {} as Folder
+			const commit = jest.fn()
+
+		  await actions[FOLDER_ACTION_TYPES.FOLDER_SET_NAME]({ commit } as any, { folder, name: 'newName' } as any)
+			expect(FolderService.renameFolder).toBeCalledWith({ id: folder.id, name: 'newName' })
+			expect(commit).toBeCalled()
+		})
 	})
 
 	describe('mutations', () => {
@@ -68,5 +80,27 @@ describe('folder.ts', () => {
 			(mutations[FOLDER_MUTATION_TYPES.DELETE_FOLDER] as any)(state, folders)
 			expect(state.folders.length).toEqual(0)
 		})
+
+		it('UPDATE_FOLDER should update the folder  properties in the state', () => {
+			const state = { folders: [{ name: 'test', id: 123 }] as Folder[] } as AppState
+			const newFolder = { id: 123, name: 'newName' };
+
+			(mutations[FOLDER_MUTATION_TYPES.UPDATE_FOLDER] as any)(state, newFolder)
+			expect(state.folders[0].name).toEqual('newName')
+		})
+
+		it('MODIFY_FOLDER_UNREAD_COUNT should update the folder feedCount in the state based on the delta', () => {
+			const state = { folders: [{ name: 'test', id: 123, feedCount: 10 }] as Folder[] } as AppState
+
+			(mutations[FOLDER_MUTATION_TYPES.MODIFY_FOLDER_UNREAD_COUNT] as any)(state, { folderId: 123, delta: -3 })
+			expect(state.folders[0].feedCount).toEqual(7)
+		})
+
+		it('SET_FEED_ALL_READ should update the folder feedCount in the state based on the feed unreadCount', () => {
+			const state = { folders: [{ name: 'test', id: 123, feedCount: 10 }] as Folder[] } as AppState
+
+			(mutations[FEED_MUTATION_TYPES.SET_FEED_ALL_READ] as any)(state, { id: 1, folderId: 123, unreadCount: 2 })
+			expect(state.folders[0].feedCount).toEqual(8)
+		})
 	})
 })

From 34b0787f4df42f0ee98301bbaee2ac70aefcb8c5 Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Sat, 16 Sep 2023 15:44:44 -0700
Subject: [PATCH 09/11] finish unit tests

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 .../unit/components/Sidebar.spec.ts           | 49 +++++++++-
 .../components/SidebarFeedLinkActions.spec.ts | 95 +++++++++++++++++++
 .../unit/services/feed.service.spec.ts        | 35 +++++++
 .../unit/services/folder.service.spec.ts      | 17 +++-
 4 files changed, 193 insertions(+), 3 deletions(-)
 create mode 100644 tests/javascript/unit/components/SidebarFeedLinkActions.spec.ts

diff --git a/tests/javascript/unit/components/Sidebar.spec.ts b/tests/javascript/unit/components/Sidebar.spec.ts
index 1eee5486a..9b28ab8a0 100644
--- a/tests/javascript/unit/components/Sidebar.spec.ts
+++ b/tests/javascript/unit/components/Sidebar.spec.ts
@@ -8,6 +8,12 @@ describe('Sidebar.vue', () => {
 
 	let wrapper: Wrapper<AppSidebar>
 
+	const feeds = [{
+		id: 1, title: 'first',
+	}, {
+		id: 2, title: 'second', folderId: 123,
+	}]
+
 	beforeAll(() => {
 		const localVue = createLocalVue()
 		wrapper = shallowMount(AppSidebar, {
@@ -15,15 +21,22 @@ describe('Sidebar.vue', () => {
 			mocks: {
 				$store: {
 					state: {
-						feeds: [],
+						feeds,
 						folders: [],
 					},
+					getters: {
+						feeds,
+					},
 					dispatch: jest.fn(),
 				},
 			},
 		})
 	})
 
+	beforeEach(() => {
+		(wrapper.vm as any).$store.dispatch.mockReset()
+	})
+
 	it('should initialize without showing AddFeed Component', () => {
 		expect((wrapper.vm as any).$data.showAddFeed).toBeFalsy()
 	})
@@ -51,6 +64,25 @@ describe('Sidebar.vue', () => {
 			(wrapper.vm as any).closeShowAddFeed()
 			expect(wrapper.vm.$data.showAddFeed).toBeFalsy()
 		})
+
+		it('should call mark feed read for all feeds in state', () => {
+			window.confirm = jest.fn().mockReturnValue(true);
+			(wrapper.vm as any).markAllRead()
+			expect((wrapper.vm as any).$store.dispatch).toHaveBeenCalledTimes(2)
+		})
+
+		it('should call mark feed read for all feeds in state with matching folderId', () => {
+			window.confirm = jest.fn().mockReturnValue(true);
+			(wrapper.vm as any).markFolderRead({ id: 123 })
+			expect((wrapper.vm as any).$store.dispatch).toHaveBeenCalledTimes(1)
+		})
+
+		it('should call disptch rename folder with response from user', () => {
+			const name = 'new name'
+			window.prompt = jest.fn().mockReturnValue(name);
+			(wrapper.vm as any).renameFolder({ id: 123 })
+			expect((wrapper.vm as any).$store.dispatch).toHaveBeenCalledWith(ACTIONS.FOLDER_SET_NAME, { folder: { id: 123 }, name })
+		})
 	})
 
 	describe('SideBarState', () => {
@@ -126,6 +158,21 @@ describe('Sidebar.vue', () => {
 
 			expect(topLevelNav).toEqual([feeds[0], ...folders])
 		})
+
+		it('should set pinned feeds at beginning top level nav with feeds and folders', () => {
+			const feeds: any[] = [{ name: 'feed1', id: 1 }, { name: 'feed2', id: 2, folderId: 123 }, { name: 'feed3', id: 3, pinned: true }]
+			const folders: any[] = [{ name: 'abc', id: 123 }, { name: 'xyz', id: 234 }]
+			const topLevelNav = (wrapper.vm.$options.computed?.topLevelNav as any).call({
+				$store: {
+					getters: {
+						feeds,
+						folders,
+					},
+				},
+			})
+
+			expect(topLevelNav[0].name).toEqual('feed3')
+		})
 	})
 
 	// TODO: More Template Testing with https://test-utils.vuejs.org/guide/essentials/a-crash-course.html#adding-a-new-todo
diff --git a/tests/javascript/unit/components/SidebarFeedLinkActions.spec.ts b/tests/javascript/unit/components/SidebarFeedLinkActions.spec.ts
new file mode 100644
index 000000000..1a4ee6358
--- /dev/null
+++ b/tests/javascript/unit/components/SidebarFeedLinkActions.spec.ts
@@ -0,0 +1,95 @@
+import { ACTIONS } from '../../../../src/store'
+import { Wrapper, shallowMount, createLocalVue } from '@vue/test-utils'
+
+import SidebarFeedLinkActions from '../../../../src/components/SidebarFeedLinkActions.vue'
+import { FEED_UPDATE_MODE, FEED_ORDER } from '../../../../src/dataservices/feed.service'
+
+describe('SidebarFeedLinkActions.vue', () => {
+	'use strict'
+
+	let wrapper: Wrapper<SidebarFeedLinkActions>
+
+	const feeds = [{
+		id: 1, title: 'first',
+	}, {
+		id: 2, title: 'second', folderId: 123,
+	}]
+
+	beforeAll(() => {
+		const localVue = createLocalVue()
+		wrapper = shallowMount(SidebarFeedLinkActions, {
+			localVue,
+			propsData: {
+				feedId: 1,
+			},
+			mocks: {
+				$store: {
+					state: {
+						feeds,
+						folders: [],
+					},
+					getters: {
+						feeds,
+					},
+					dispatch: jest.fn(),
+				},
+			},
+		})
+	})
+
+	beforeEach(() => {
+		(wrapper.vm as any).$store.dispatch.mockReset()
+	})
+
+	describe('User Actions', () => {
+		it('should dispatch message to store with feed object', () => {
+			(wrapper.vm as any).markRead()
+
+			expect((wrapper.vm as any).$store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_MARK_READ, { feed: feeds[0] })
+		})
+
+		it('should dispatch message to store with feed object and pinned', () => {
+			(wrapper.vm as any).setPinned(true)
+
+			expect((wrapper.vm as any).$store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_SET_PINNED, { feed: feeds[0], pinned: true })
+		})
+
+		it('should dispatch message to store with feed object and fullTextEnabled', () => {
+			(wrapper.vm as any).setOrdering(FEED_ORDER.NEWEST)
+
+			expect((wrapper.vm as any).$store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_SET_ORDERING, { feed: feeds[0], ordering: FEED_ORDER.NEWEST })
+		})
+
+		it('should dispatch message to store with feed object and fullTextEnabled', () => {
+			(wrapper.vm as any).setFullText(true)
+
+			expect((wrapper.vm as any).$store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_SET_FULL_TEXT, { feed: feeds[0], fullTextEnabled: true })
+		})
+
+		it('should dispatch message to store with feed object and new updateMode', () => {
+			(wrapper.vm as any).setUpdateMode(FEED_UPDATE_MODE.IGNORE)
+
+			expect((wrapper.vm as any).$store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_SET_UPDATE_MODE, { feed: feeds[0], updateMode: FEED_UPDATE_MODE.IGNORE })
+		})
+
+		it('should dispatch message to store with feed object on rename feed', () => {
+			window.prompt = jest.fn().mockReturnValue('test');
+
+			(wrapper.vm as any).rename()
+
+			expect((wrapper.vm as any).$store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_SET_TITLE, { feed: feeds[0], title: 'test' })
+		})
+
+		it('should dispatch message to store with feed object on delete feed', () => {
+			window.confirm = jest.fn().mockReturnValue(true);
+
+			(wrapper.vm as any).deleteFeed()
+
+			expect((wrapper.vm as any).$store.dispatch).toHaveBeenCalledWith(ACTIONS.FEED_DELETE, { feed: feeds[0] })
+		})
+	})
+
+	afterEach(() => {
+		jest.clearAllMocks()
+	})
+})
diff --git a/tests/javascript/unit/services/feed.service.spec.ts b/tests/javascript/unit/services/feed.service.spec.ts
index 5f0c058cd..a40d296e5 100644
--- a/tests/javascript/unit/services/feed.service.spec.ts
+++ b/tests/javascript/unit/services/feed.service.spec.ts
@@ -31,4 +31,39 @@ describe('feed.service.ts', () => {
 			expect(args[1].url).toEqual('http://example.com')
 		})
 	})
+
+	describe('markRead', () => {
+		it('should call POST with item id + read in URL and highestItemId param', async () => {
+			await FeedService.markRead({ feedId: 1, highestItemId: 234 })
+
+			expect(axios.post).toBeCalled()
+			const args = (axios.post as any).mock.calls[0]
+
+			expect(args[0]).toContain('1/read')
+			expect(args[1].highestItemId).toEqual(234)
+		})
+	})
+
+	describe('updateFeed', () => {
+		it('should call PATCH with item id in URL and title param', async () => {
+			await FeedService.updateFeed({ feedId: 1, title: 'abc' })
+
+			expect(axios.patch).toBeCalled()
+			const args = (axios.patch as any).mock.calls[0]
+
+			expect(args[0]).toContain('1')
+			expect(args[1].title).toEqual('abc')
+		})
+	})
+
+	describe('deleteFeed', () => {
+		it('should call DELETE with item id in URL ', async () => {
+			await FeedService.deleteFeed({ feedId: 1 })
+
+			expect(axios.delete).toBeCalled()
+			const args = (axios.delete as any).mock.calls[0]
+
+			expect(args[0]).toContain('1')
+		})
+	})
 })
diff --git a/tests/javascript/unit/services/folder.service.spec.ts b/tests/javascript/unit/services/folder.service.spec.ts
index 6577df2c8..19b601ee4 100644
--- a/tests/javascript/unit/services/folder.service.spec.ts
+++ b/tests/javascript/unit/services/folder.service.spec.ts
@@ -8,7 +8,8 @@ describe('folder.service.ts', () => {
 
 	beforeEach(() => {
 		(axios.get as any).mockReset();
-		(axios.post as any).mockReset()
+		(axios.post as any).mockReset();
+		(axios.delete as any).mockReset()
 	})
 
 	describe('fetchAllFolders', () => {
@@ -22,7 +23,7 @@ describe('folder.service.ts', () => {
 	})
 
 	describe('createFolder', () => {
-		it('should call POST with item id in URL and read param', async () => {
+		it('should call POST with folderName param', async () => {
 			await FolderService.createFolder({ name: 'abc' })
 
 			expect(axios.post).toBeCalled()
@@ -32,6 +33,18 @@ describe('folder.service.ts', () => {
 		})
 	})
 
+	describe('renameFolder', () => {
+		it('should call POST with item id in URL and folderName param', async () => {
+			await FolderService.renameFolder({ id: 123, name: 'abc' })
+
+			expect(axios.post).toBeCalled()
+			const args = (axios.post as any).mock.calls[0]
+
+			expect(args[0]).toContain('123/rename')
+			expect(args[1].folderName).toEqual('abc')
+		})
+	})
+
 	describe('deleteFolder', () => {
 		it('should call POST with item id in URL and read param', async () => {
 			await FolderService.deleteFolder({ id: 123 })

From f182d0abf6d8a1b77855e144975c4df8b666c71a Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Sat, 16 Sep 2023 15:45:17 -0700
Subject: [PATCH 10/11] add all icons

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 package.json                              |  2 +-
 src/components/Sidebar.vue                |  3 --
 src/components/SidebarFeedLinkActions.vue | 56 +++++++++++++++++++++--
 3 files changed, 52 insertions(+), 9 deletions(-)

diff --git a/package.json b/package.json
index ad25bc7d3..8a51d1c5b 100644
--- a/package.json
+++ b/package.json
@@ -141,7 +141,7 @@
     "moduleNameMapper": {
       "^@/(.*)$": "<rootDir>/src/$1",
       "^Components/(.*)$": "<rootDir>/src/components/$1",
-      "^.+\\.(css|less)$": "<rootDir>/tests/javascript/helpers/CSSStub.js"
+      "^.+\\.(css|less|svg)$": "<rootDir>/tests/javascript/helpers/CSSStub.js"
     },
     "testEnvironment": "jsdom",
     "transform": {
diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 3ffb8c0ca..392c0ccfb 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -230,9 +230,6 @@ export default Vue.extend({
 		closeShowAddFeed() {
 			this.showAddFeed = false
 		},
-		alert(msg: string) {
-			window.alert(msg)
-		},
 		isFolder(item: Feed | Folder) {
 			return (item as Folder).name !== undefined
 		},
diff --git a/src/components/SidebarFeedLinkActions.vue b/src/components/SidebarFeedLinkActions.vue
index 444254cc4..8ae1e258b 100644
--- a/src/components/SidebarFeedLinkActions.vue
+++ b/src/components/SidebarFeedLinkActions.vue
@@ -8,11 +8,17 @@
 		<NcActionButton v-if="feed.pinned"
 			icon="icon-pinned"
 			@click="setPinned(false)">
+			<template #icon>
+				<PinOffIcon />
+			</template>
 			{{ t("news", "Unpin from top") }}
 		</NcActionButton>
 		<NcActionButton v-if="!feed.pinned"
 			icon="icon-pinned"
 			@click="setPinned(true)">
+			<template #icon>
+				<PinIcon />
+			</template>
 			{{ t("news", "Pin to top") }}
 		</NcActionButton>
 		<NcActionButton v-if="feed.ordering === FEED_ORDER.NEWEST"
@@ -21,7 +27,7 @@
 			{{ t("news", "Newest first") }}
 		</NcActionButton>
 		<NcActionButton v-else-if="feed.ordering === FEED_ORDER.OLDEST"
-			icon="icon-caret-dark"
+			icon="icon-caret-dark feed-reverse-ordering"
 			@click="setOrdering(FEED_ORDER.DEFAULT)">
 			{{ t("news", "Oldest first") }}
 		</NcActionButton>
@@ -33,21 +39,37 @@
 		<NcActionButton v-if="!feed.fullTextEnabled"
 			icon="icon-full-text-disabled"
 			@click="setFullText(true)">
+			<template #icon>
+				<TextShortIcon />
+			</template>
 			{{ t("news", "Enable full text") }}
 		</NcActionButton>
 		<NcActionButton v-if="feed.fullTextEnabled"
 			icon="icon-full-text-enabled"
 			@click="setFullText(false)">
+			<template #icon>
+				<TextLongIcon />
+			</template>
 			{{ t("news", "Disable full text") }}
 		</NcActionButton>
 		<NcActionButton v-if="feed.updateMode === FEED_UPDATE_MODE.UNREAD"
 			icon="icon-updatemode-default"
 			@click="setUpdateMode(FEED_UPDATE_MODE.IGNORE)">
+			<template #icon>
+				<span class="custom-icon">
+					<img :src="UnreadSvg">
+				</span>
+			</template>
 			{{ t("news", "Unread updated") }}
 		</NcActionButton>
 		<NcActionButton v-if="feed.updateMode === FEED_UPDATE_MODE.IGNORE"
 			icon="icon-updatemode-unread"
 			@click="setUpdateMode(FEED_UPDATE_MODE.UNREAD)">
+			<template #icon>
+				<span class="custom-icon">
+					<img :src="IgnoreSvg">
+				</span>
+			</template>
 			{{ t("news", "Ignore updated") }}
 		</NcActionButton>
 		<NcActionButton icon="icon-rename"
@@ -70,7 +92,6 @@
 
 <script lang="ts">
 
-import { mapState } from 'vuex'
 import Vue from 'vue'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
@@ -79,15 +100,25 @@ import NcAppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationI
 import { FEED_ORDER, FEED_UPDATE_MODE } from '../dataservices/feed.service'
 
 import RssIcon from 'vue-material-design-icons/Rss.vue'
+import PinIcon from 'vue-material-design-icons/Pin.vue'
+import PinOffIcon from 'vue-material-design-icons/PinOff.vue'
+import TextShortIcon from 'vue-material-design-icons/TextShort.vue'
+import TextLongIcon from 'vue-material-design-icons/TextLong.vue'
 
 import { ACTIONS } from '../store'
 import { Feed } from '../types/Feed'
+const UnreadSvg = require('../../img/updatemodeunread.svg')
+const IgnoreSvg = require('../../img/updatemodedefault.svg')
 
 export default Vue.extend({
 	components: {
 		NcActionButton,
 		NcAppNavigationItem,
 		RssIcon,
+		PinIcon,
+		PinOffIcon,
+		TextShortIcon,
+		TextLongIcon,
 	},
 	props: {
 		feedId: {
@@ -99,6 +130,8 @@ export default Vue.extend({
 		return {
 			FEED_ORDER,
 			FEED_UPDATE_MODE,
+			UnreadSvg,
+			IgnoreSvg,
 		}
 	},
 
@@ -110,9 +143,6 @@ export default Vue.extend({
 		},
 	},
 	methods: {
-		alert(msg: string) {
-			window.alert(msg)
-		},
 		markRead() {
 			this.$store.dispatch(ACTIONS.FEED_MARK_READ, { feed: this.feed })
 		},
@@ -147,3 +177,19 @@ export default Vue.extend({
 })
 
 </script>
+
+<style>
+.custom-icon {
+	width: 44px;
+	height: 44px;
+	display: flex;
+	align-self: center;
+	justify-self: center;
+	align-items: center;
+	justify-content: center;
+}
+
+.feed-reverse-ordering {
+	transform: rotate(180deg);
+}
+</style>

From b983c09edbfc53eed437bba732e80a8aec43956c Mon Sep 17 00:00:00 2001
From: Devlin Junker <devlin.junker@gmail.com>
Date: Mon, 18 Sep 2023 12:23:48 -0700
Subject: [PATCH 11/11] ignore vue files for stylelint (probably need to remove
 old css files soon)

Signed-off-by: Devlin Junker <devlin.junker@gmail.com>
---
 stylelint.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/stylelint.config.js b/stylelint.config.js
index 429fe944b..6745dbdb3 100644
--- a/stylelint.config.js
+++ b/stylelint.config.js
@@ -1,5 +1,6 @@
 const stylelintConfig = require('@nextcloud/stylelint-config')
 
 stylelintConfig.rules.indentation = 4
+stylelintConfig.ignoreFiles.push('**/*.vue')
 
 module.exports = stylelintConfig