Fix list rename

Author: AndreasArvidsson

src/Menu.ts

@@ -63,7 +63,7 @@ function clipItemContextMenu(hints: string[]) {
 }
 
 function listsMenu() {
-    const activeList = getActiveList();
+    const { activeList, activeListIsDefault } = getActiveList();
     const lists = defaultLists.concat(storage.getLists());
 
     const getOptions = (list: List): MenuItemConstructorOptions => ({
@@ -87,7 +87,7 @@ function listsMenu() {
             label: "Rename list",
             type: "normal",
             click: () => runCommand({ id: "renameList" }),
-            enabled: !activeList.isDefault,
+            enabled: !activeListIsDefault,
         },
         {
             type: "separator",
@@ -105,11 +105,12 @@ function listsMenu() {
                     label: "Delete list and all items",
                     type: "normal",
                     click: () => runCommand({ id: "removeList" }),
-                    enabled: !activeList.isDefault,
+                    enabled: !activeListIsDefault,
                 },
             ],
         },
     ]);
+
     menu.popup();
 }
 

src/commands/removeAllItems.ts

@@ -4,7 +4,7 @@ import { getActiveList } from "../util/getList";
 import { updateRenderer } from "../util/updateRenderer";
 
 export function removeAllItems(render = true) {
-    const activeList = getActiveList();
+    const { activeList } = getActiveList();
     const allItems = storage.getClipboardItems();
 
     const itemsToRemove = (() => {

src/commands/removeList.ts

@@ -5,9 +5,9 @@ import { updateRenderer } from "../util/updateRenderer";
 import { removeAllItems } from "./removeAllItems";
 
 export function removeList() {
-    const activeList = getActiveList();
+    const { activeList, activeListIsDefault } = getActiveList();
 
-    if (activeList.isDefault) {
+    if (activeListIsDefault) {
         throw Error(`Can't remove default list '${activeList.name}'`);
     }
 

src/commands/renameList.ts

@@ -11,17 +11,17 @@ export function renameList(command: RenameListCommand) {
     }
 
     const name = command.name.trim();
-    const activeList = getActiveList();
-
-    if (!name) {
-        throw Error("Can't rename list: Name can't be empty");
-    }
+    const { activeList, activeListIsDefault } = getActiveList();
 
     if (activeList.name === name) {
         return;
     }
 
-    if (activeList.isDefault) {
+    if (!name) {
+        throw Error("Can't rename list: Name can't be empty");
+    }
+
+    if (activeListIsDefault) {
         throw Error(`Can't rename default list '${activeList.name}'`);
     }
 
@@ -32,7 +32,8 @@ export function renameList(command: RenameListCommand) {
     }
 
     activeList.name = name;
-    storage.setLists(storage.getLists());
+
+    storage.saveStateFile();
 
     updateRenderer();
 }

src/commands/switchList.ts

@@ -4,7 +4,7 @@ import { getActiveList, getListByNameIgnoreCase } from "../util/getList";
 import { updateRenderer } from "../util/updateRenderer";
 
 export function switchList(command: SwitchListCommand) {
-    const activeList = getActiveList();
+    const { activeList } = getActiveList();
     const namedList = getListByNameIgnoreCase(command.name);
 
     if (namedList.id === activeList.id) {

src/storage.ts

@@ -129,6 +129,8 @@ export const storage = {
             }
         }
     },
+
+    saveStateFile,
 };
 
 async function readStateFile() {
@@ -140,7 +142,7 @@ async function readStateFile() {
     return { ...stateDefault };
 }
 
-function saveStateFile() {
+export function saveStateFile() {
     const { stateFile } = storagePaths.get();
     writeJsonFile(stateFile, _state).catch((error) => {
         showErrorNotification("Failed to save storage", error);

src/types/types.ts

@@ -52,10 +52,6 @@ export interface List {
     name: string;
 }
 
-export interface EnrichedList extends List {
-    isDefault: boolean;
-}
-
 export interface StorageState {
     windowBounds?: Electron.Rectangle;
     config: Config;

src/util/getList.ts

@@ -1,25 +1,9 @@
 import { storage } from "../storage";
-import { type EnrichedList, type List, defaultLists } from "../types/types";
+import { type List, defaultLists } from "../types/types";
 
-export function getList(id: string): EnrichedList {
-    const defaultList = defaultLists.find((l) => l.id === id);
-
-    if (defaultList != null) {
-        return { ...defaultList, isDefault: true };
-    }
-
-    const userList = storage.getLists().find((l) => l.id === id);
-
-    if (userList != null) {
-        return { ...userList, isDefault: false };
-    }
-
-    throw Error(`Can't find list '${id}'`);
-}
-
-export function getActiveList(): EnrichedList {
-    const { activeList } = storage.getConfig();
-    return getList(activeList);
+export function getActiveList(): { activeList: List; activeListIsDefault: boolean } {
+    const [activeList, activeListIsDefault] = getListInternal(storage.getConfig().activeList);
+    return { activeList, activeListIsDefault };
 }
 
 export function tryGetListByNameIgnoreCase(name: string): List | undefined {
@@ -39,3 +23,19 @@ export function getListByNameIgnoreCase(name: string): List {
 
     return list;
 }
+
+function getListInternal(id: string): [List, boolean] {
+    const defaultList = defaultLists.find((l) => l.id === id);
+
+    if (defaultList != null) {
+        return [defaultList, true];
+    }
+
+    const userList = storage.getLists().find((l) => l.id === id);
+
+    if (userList != null) {
+        return [userList, false];
+    }
+
+    throw Error(`Can't find list '${id}'`);
+}

src/util/getRendererData.ts

@@ -9,7 +9,7 @@ export function getRendererData(): RendererData {
     const items = getListItems(isVisible);
     return {
         totalCount: items.length,
-        activeListName: getActiveList().name,
+        activeListName: getActiveList().activeList.name,
         config: storage.getConfig(),
         search: storage.getSearch(),
         showSettings: storage.getShowSettings(),