Fix the virtual uncategorized category appearing as tag.

VPKSoft · Sep 28, 2024 · e38b8d5 · e38b8d5
1 parent 2c3eccc
commit e38b8d5
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/components/reusable/PasswordList.tsx b/src/components/reusable/PasswordList.tsx
@@ -8,6 +8,7 @@ import { DataEntry } from "../../types/PasswordEntry";
 import { CommonProps } from "../Types";
 import { useLocalize } from "../../i18n";
 import { generalId } from "../../misc/DataUtils";
+import { unCategorized } from "../../utilities/app/Files";
 import { SearchMode, SearchTextBoxValue } from "./inputs/SearchTextBox";
 
 /**
@@ -53,7 +54,7 @@ const PasswordList = ({
     const treeData = React.useMemo(() => {
         const generalName = lm("categoryGeneral");
         const generalNode = dataSource.find(f => f.id === generalId) ?? {
-            name: "#NO_CATEGORY#",
+            name: unCategorized,
             id: generalId,
             parentId: -1,
         };

diff --git a/src/misc/DataUtils.ts b/src/misc/DataUtils.ts
@@ -23,6 +23,7 @@ SOFTWARE.
 */
 
 import { DataEntry } from "../types/PasswordEntry";
+import { unCategorized } from "../utilities/app/Files";
 
 const getNewId = (dataSource: DataEntry[]) => {
     let id = Math.max(...dataSource.map(f => f.id));
@@ -36,14 +37,23 @@ const getNewId = (dataSource: DataEntry[]) => {
 const newEntry = (parentId: number, dataSource: DataEntry[], newDataName: string) => {
     const id = getNewId(dataSource);
 
+    let tags = dataSource.find(f => f.id === parentId)?.name;
+    if (!tags) {
+        tags = "";
+    }
+
+    if (tags === unCategorized) {
+        tags = "";
+    }
+
     const result: DataEntry = {
         name: newDataName,
         password: "",
         userName: "",
         notes: "",
         id: id,
         parentId: parentId,
-        tags: dataSource.find(f => f.id === parentId)?.name,
+        tags: tags,
     };
 
     return result;

diff --git a/src/utilities/app/Files.ts b/src/utilities/app/Files.ts
@@ -161,7 +161,7 @@ const loadFile = async (password: string, fileName: string) => {
             data.entries.push({
                 parentId: -1,
                 id: generalId,
-                name: "#NO_CATEGORY#",
+                name: unCategorized,
             });
 
             data.version = 1;
@@ -234,4 +234,6 @@ const generateTags = <T>(fileData: (DataEntry | GeneralEntry<T>)[]) => {
     return [...resultSet];
 };
 
-export { loadFile, saveFile, selectFileToOpen, selectFileToSave, generateTags };
+const unCategorized = "#NO_CATEGORY#";
+
+export { loadFile, saveFile, selectFileToOpen, selectFileToSave, generateTags, unCategorized };