From 21343073d4c4dfe35c07662c504f744733d00663 Mon Sep 17 00:00:00 2001
From: Jonathan Pagel <jonny_tischbein@systemli.org>
Date: Fri, 24 Mar 2023 22:21:55 +0100
Subject: [PATCH 1/2] Category: Add new category button to create new folders
 in current notes path for categories.

Signed-off-by: Jonathan Pagel <jonny_tischbein@systemli.org>
---
 package-lock.json                 | 17 +++----
 package.json                      |  1 +
 src/NotesService.js               | 37 ++++++++++++++-
 src/components/CategoriesList.vue | 79 ++++++++++++++++++++++++++++++-
 4 files changed, 124 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b8536d41e..751fb5ce7 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,6 +9,7 @@
       "version": "4.8.1",
       "license": "agpl",
       "dependencies": {
+        "@nextcloud/auth": "^2.2.1",
         "@nextcloud/axios": "^2.4.0",
         "@nextcloud/dialogs": "^4.2.1",
         "@nextcloud/event-bus": "^3.1.0",
@@ -3099,15 +3100,15 @@
       "integrity": "sha512-rxzuSL2RSt/pWWnFnUFQi5GJArm2tHMhx20Gee3Ydn+xT2bqbR4syfgdPrq2b+j+n5LjC7C8Fb1QDM6LKeF0cA=="
     },
     "node_modules/@nextcloud/auth": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.1.0.tgz",
-      "integrity": "sha512-wf5xQrWQu6fkl3MGegVdyR5mh/EdSQKJByH3m2Url2K2xbML9Y4Y7LAff9jjJAcMt2MkzzJEM463ZBbgTqs0lg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.2.1.tgz",
+      "integrity": "sha512-zYtgrg9NMZfN8kmL5JPCsh5jDhpTCEslhnZWMvbhTiQ7hrOnji/67ok6VMK0CTJ1a92Vr67Ow72lW7YRX69zEA==",
       "dependencies": {
         "@nextcloud/event-bus": "^3.1.0"
       },
       "engines": {
-        "node": "^16.0.0",
-        "npm": "^7.0.0 || ^8.0.0"
+        "node": "^20.0.0",
+        "npm": "^9.0.0"
       }
     },
     "node_modules/@nextcloud/axios": {
@@ -19995,9 +19996,9 @@
       "integrity": "sha512-rxzuSL2RSt/pWWnFnUFQi5GJArm2tHMhx20Gee3Ydn+xT2bqbR4syfgdPrq2b+j+n5LjC7C8Fb1QDM6LKeF0cA=="
     },
     "@nextcloud/auth": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.1.0.tgz",
-      "integrity": "sha512-wf5xQrWQu6fkl3MGegVdyR5mh/EdSQKJByH3m2Url2K2xbML9Y4Y7LAff9jjJAcMt2MkzzJEM463ZBbgTqs0lg==",
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/@nextcloud/auth/-/auth-2.2.1.tgz",
+      "integrity": "sha512-zYtgrg9NMZfN8kmL5JPCsh5jDhpTCEslhnZWMvbhTiQ7hrOnji/67ok6VMK0CTJ1a92Vr67Ow72lW7YRX69zEA==",
       "requires": {
         "@nextcloud/event-bus": "^3.1.0"
       }
diff --git a/package.json b/package.json
index 3ebb94023..f626dbc62 100644
--- a/package.json
+++ b/package.json
@@ -13,6 +13,7 @@
     "stylelint:fix": "stylelint 'src/**/*.vue' 'css/**/*.css' --fix"
   },
   "dependencies": {
+    "@nextcloud/auth": "^2.2.1",
     "@nextcloud/axios": "^2.4.0",
     "@nextcloud/dialogs": "^4.2.1",
     "@nextcloud/event-bus": "^3.1.0",
diff --git a/src/NotesService.js b/src/NotesService.js
index cba6f8ced..4c5dd2316 100644
--- a/src/NotesService.js
+++ b/src/NotesService.js
@@ -1,5 +1,6 @@
 import axios from '@nextcloud/axios'
-import { generateUrl } from '@nextcloud/router'
+import { getCurrentUser } from '@nextcloud/auth'
+import { generateUrl, generateRemoteUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
 
 import store from './store.js'
@@ -338,6 +339,40 @@ export const setFavorite = (noteId, favorite) => {
 		})
 }
 
+export const findCategory = (categoryName) => {
+	return axios
+		.get(generateRemoteUrl(`dav/files/${getCurrentUser().uid}/${store.state.app.settings.notesPath}${categoryName}`))
+		.then(response => {
+			return categoryName
+		})
+		.catch(err => {
+			if (err?.response?.status === 404) {
+				return false
+			} else {
+				console.error(err)
+				handleSyncError(t('notes', 'Fetching category {name} has failed.', { name: categoryName }), err)
+				throw err
+			}
+		})
+}
+
+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}`),
+			method: 'MKCOL',
+		})
+		.then(response => {
+			return categoryName
+		})
+		.catch(err => {
+			console.error(err)
+			handleSyncError(t('notes', 'Creating new category {name} has failed.', { name: categoryName }), err)
+			throw err
+		})
+}
+
 export const setCategory = (noteId, category) => {
 	return axios
 		.put(url('/notes/' + noteId + '/category'), { category })
diff --git a/src/components/CategoriesList.vue b/src/components/CategoriesList.vue
index 7ff1f56fa..882ddb939 100644
--- a/src/components/CategoriesList.vue
+++ b/src/components/CategoriesList.vue
@@ -1,5 +1,38 @@
 <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')"
 			:class="{ active: selectedCategory === null }"
@@ -31,6 +64,8 @@
 
 <script>
 import {
+	NcActionInput,
+	NcActionText,
 	NcAppNavigationItem,
 	NcAppNavigationCaption,
 	NcAppNavigationCounter,
@@ -40,8 +75,10 @@ import { Fragment } from 'vue-fragment'
 import FolderIcon from 'vue-material-design-icons/Folder.vue'
 import FolderOutlineIcon from 'vue-material-design-icons/FolderOutline.vue'
 import HistoryIcon from 'vue-material-design-icons/History.vue'
+import AddIcon from 'vue-material-design-icons/Plus.vue'
+import ErrorIcon from 'vue-material-design-icons/AlertCircle.vue'
 
-import { getCategories } from '../NotesService.js'
+import { createCategory, findCategory, getCategories } from '../NotesService.js'
 import { categoryLabel } from '../Util.js'
 import store from '../store.js'
 
@@ -56,6 +93,18 @@ export default {
 		FolderIcon,
 		FolderOutlineIcon,
 		HistoryIcon,
+		AddIcon,
+		ErrorIcon,
+		NcActionInput,
+		NcActionText,
+	},
+
+	data() {
+		return {
+			open: false,
+			menuOpen: false,
+			createCategoryError: null,
+		}
 	},
 
 	computed: {
@@ -77,9 +126,37 @@ export default {
 			return categoryLabel(category)
 		},
 
+		onToggleCategories() {
+			this.open = !this.open
+		},
+
+		onToggleNewCategory() {
+			this.menuOpen = !this.menuOpen
+		},
+
 		onSelectCategory(category) {
 			store.commit('setSelectedCategory', category)
 		},
+
+		createNewCategory(event) {
+			const input = event.target.querySelector('input[type=text]')
+			const categoryName = input.value.trim()
+
+			// Check if already exists
+			findCategory(categoryName).then(data => {
+				if (data !== false) {
+					this.createCategoryError = t('notes', 'This category already exists')
+					return
+				}
+
+				// Create new directory for category in current notes path defined in settings
+				createCategory(categoryName)
+				this.createCategoryError = null
+				this.onToggleNewCategory()
+				this.onSelectCategory(categoryName)
+			})
+
+		},
 	},
 }
 </script>

From 75930668aa2902e97a727361237b5bae55c6df95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julius=20H=C3=A4rtl?= <jus@bitgrid.net>
Date: Tue, 7 Nov 2023 15:23:41 +0100
Subject: [PATCH 2/2] fixup! Category: Add new category button to create new
 folders in current notes path for categories.

---
 src/NotesService.js               |  5 +--
 src/components/CategoriesList.vue | 56 +++++++++++++------------------
 src/store/notes.js                |  4 +++
 3 files changed, 30 insertions(+), 35 deletions(-)

diff --git a/src/NotesService.js b/src/NotesService.js
index 4c5dd2316..114037876 100644
--- 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
index 882ddb939..84180ea4a 100644
--- 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
index 8e3603f83..a646a02b1 100644
--- 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
 	},