fixup! Category: Add new category button to create new folders in cur…

…rent notes path for categories.
nextcloud · Nov 7, 2023 · 7593066 · 7593066
1 parent 2134307
commit 7593066
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 35 deletions.
diff --git a/src/NotesService.js b/src/NotesService.js
@@ -341,7 +341,7 @@ export const setFavorite = (noteId, favorite) => {
 
 export const findCategory = (categoryName) => {
 	return axios
-		.get(generateRemoteUrl(`dav/files/${getCurrentUser().uid}/${store.state.app.settings.notesPath}${categoryName}`))
+		.get(generateRemoteUrl(`dav/files/${getCurrentUser().uid}/${store.state.app.settings.notesPath}/${categoryName}`))
 		.then(response => {
 			return categoryName
 		})
@@ -360,10 +360,11 @@ export const createCategory = (categoryName) => {
 	// Axios MKCOL workaround: https://github.com/axios/axios/issues/2220
 	return axios
 		.request({
-			url: generateRemoteUrl(`dav/files/${getCurrentUser().uid}/${store.state.app.settings.notesPath}${categoryName}`),
+			url: generateRemoteUrl(`dav/files/${getCurrentUser().uid}/${store.state.app.settings.notesPath}/${categoryName}`),
 			method: 'MKCOL',
 		})
 		.then(response => {
+			store.commit('addCategory', categoryName)
 			return categoryName
 		})
 		.catch(err => {

diff --git a/src/components/CategoriesList.vue b/src/components/CategoriesList.vue
@@ -1,37 +1,5 @@
 <template>
 	<Fragment>
-
-	<NcAppNavigationItem
-		:title="title"
-		class="app-navigation-noclose separator-below"
-		:class="{ 'category-header': selectedCategory !== null }"
-		:open.sync="open"
-		:menu-open.sync="menuOpen"
-		:allow-collapse="true"
-		@click.prevent.stop="onToggleCategories"
-	>
-		<template #menu-icon>
-			<AddIcon :size="20" @click="onToggleNewCategory" />
-		</template>
-		<template #actions>
-			<NcActionText>
-				<template #icon>
-					<ErrorIcon v-if="createCategoryError" :size="20" />
-					<AddIcon v-else-if="!createCategoryError" :size="20" />
-				</template>
-				{{ createCategoryError ? createCategoryError : t('notes', 'Create a new category') }}
-			</NcActionText>
-			<NcActionInput
-				icon=""
-				:value="t('notes', 'Category name')"
-				@submit.prevent.stop="createNewCategory"
-			>
-				<template #icon>
-					<FolderIcon :size="20" />
-				</template>
-			</NcActionInput>
-		</template>
-
 		<FolderIcon slot="icon" :size="20" />
 		<NcAppNavigationItem
 			:title="t('notes', 'All notes')"
@@ -44,7 +12,29 @@
 			</NcAppNavigationCounter>
 		</NcAppNavigationItem>
 
-		<NcAppNavigationCaption :title="t('notes', 'Categories')" />
+		<NcAppNavigationCaption :title="t('notes', 'Categories')">
+			<template #actionsTriggerIcon>
+				<AddIcon slot="icon" :size="20" />
+			</template>
+			<template #actions>
+				<NcActionText>
+					<template #icon>
+						<ErrorIcon v-if="createCategoryError" :size="20" />
+						<AddIcon v-else-if="!createCategoryError" :size="20" />
+					</template>
+					{{ createCategoryError ? createCategoryError : t('notes', 'Create a new category') }}
+				</NcActionText>
+				<NcActionInput
+					icon=""
+					:value="t('notes', 'Category name')"
+					@submit.prevent.stop="createNewCategory"
+				>
+					<template #icon>
+						<FolderIcon :size="20" />
+					</template>
+				</NcActionInput>
+			</template>
+		</NcAppNavigationCaption>
 
 		<NcAppNavigationItem v-for="category in categories"
 			:key="category.name"

diff --git a/src/store/notes.js b/src/store/notes.js
@@ -179,6 +179,10 @@ const mutations = {
 		state.categories = categories
 	},
 
+	addCategory(state, category) {
+		state.categories.push(category)
+	},
+
 	setSelectedCategory(state, category) {
 		state.selectedCategory = category
 	},