From 01b9be63b9a81f92bdcb39a876ee8b573ab6a474 Mon Sep 17 00:00:00 2001
From: Elvy <88881326+EepyElvyra@users.noreply.github.com>
Date: Mon, 6 Jan 2025 15:01:43 +0100
Subject: [PATCH] thimgs

---
 src/api/Settings.ts                           |  8 ++-
 .../components/SettingArrayComponent.tsx      | 72 ++++++++++---------
 2 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/src/api/Settings.ts b/src/api/Settings.ts
index 698a5b51a..7fb1193b0 100644
--- a/src/api/Settings.ts
+++ b/src/api/Settings.ts
@@ -225,12 +225,14 @@ export function migratePluginSettings(name: string, ...oldNames: string[]) {
 }
 
 export function migrateSettingsToArrays(pluginName: string, settings: string[], stringSeparator: string = ",") {
+    const { plugins } = SettingsStore.plain;
+
     for (const setting of settings) {
-        if (SettingsStore.plain.plugins[pluginName] === undefined || typeof SettingsStore.plain.plugins[pluginName][setting] !== "string") continue;
+        if (plugins[pluginName] === undefined || typeof plugins[pluginName][setting] !== "string") continue;
         logger.info(`Migrating setting ${setting} from ${pluginName} to list`);
         // @ts-ignore
-        if (SettingsStore.plain.plugins[pluginName][setting] === "") SettingsStore.plain.plugins[pluginName][setting] = SettingsStore.plain.plugins[pluginName][setting].default ?? [];
-        else SettingsStore.plain.plugins[pluginName][setting] = SettingsStore.plain.plugins[pluginName][setting].split(stringSeparator);
+        if (plugins[pluginName][setting] === "") plugins[pluginName][setting] = plugins[pluginName][setting].default ?? [];
+        else plugins[pluginName][setting] = plugins[pluginName][setting].split(stringSeparator);
     }
 }
 
diff --git a/src/components/PluginSettings/components/SettingArrayComponent.tsx b/src/components/PluginSettings/components/SettingArrayComponent.tsx
index 7cd188223..35ee43cb0 100644
--- a/src/components/PluginSettings/components/SettingArrayComponent.tsx
+++ b/src/components/PluginSettings/components/SettingArrayComponent.tsx
@@ -60,6 +60,21 @@ export function SettingArrayComponent({
     const [items, setItems] = useState<string[]>([]);
     const [text, setText] = useState<string>("");
 
+    useEffect(() => {
+        if (text === "") {
+            setError(null);
+        } else if (!isNaN(Number(text))) {
+            if (text.length >= 18 && text.length <= 19) {
+                setError(null);
+            } else {
+                setError("Invalid ID");
+            }
+        } else {
+            setError(null);
+        }
+    }, [text]);
+
+
     useEffect(() => {
         pluginSettings[id] = items;
         onChange(items);
@@ -373,21 +388,6 @@ export function SettingArrayComponent({
     }
 
     function handleSubmit() {
-        if (text === "") {
-            return;
-        }
-        if (option.type !== OptionType.ARRAY) {
-            if (isNaN(Number(text))) {
-                openSearchModal(text);
-                setText("");
-                return;
-            }
-            if (!(text.length >= 18 && text.length <= 19)) {
-                setError("Invalid ID");
-                return;
-            }
-        }
-
         if (items.includes(text)) {
             setError("This item is already added");
             setText("");
@@ -437,29 +437,33 @@ export function SettingArrayComponent({
                 >
                     <TextInput
                         type="text"
-                        placeholder="Add Item (ID or Name)"
+                        placeholder="Enter text or ID"
                         id={cl("input")}
                         onChange={v => setText(v)}
                         value={text}
                     />
-                    <Button
-                        size={Button.Sizes.MIN}
-                        id={cl("add-button")}
-                        onClick={handleSubmit}
-                        style={{ background: "none" }}
-                    >
-                        <CheckMarkIcon />
-                    </Button>
-                    <Button
-                        id={cl("search-button")}
-                        size={Button.Sizes.MIN}
-                        onClick={() => openSearchModal(text)}
-                        style={
-                            { background: "none" }
-                        }
-                    >
-                        <SearchIcon />
-                    </Button>
+                    {text === "" ? null :
+                        !isNaN(Number(text)) ?
+                            <Button
+                                size={Button.Sizes.MIN}
+                                id={cl("add-button")}
+                                onClick={handleSubmit}
+                                style={{ background: "none" }}
+                                disabled={text.length < 18 || text.length > 19}
+                            >
+                                <CheckMarkIcon />
+                            </Button> :
+                            < Button
+                                id={cl("search-button")}
+                                size={Button.Sizes.MIN}
+                                onClick={() => openSearchModal(text)}
+                                style={
+                                    { background: "none" }
+                                }
+                            >
+                                <SearchIcon />
+                            </Button>
+                    }
                 </Flex>
             </ErrorBoundary>
             {error && <Forms.FormText style={{ color: "var(--text-danger)" }}>{error}</Forms.FormText>}