fix disabled enum value getting selected as default

add failsafe for fully-disabled enums
VedalAI · Jul 7, 2024 · 535b9a6 · 535b9a6
1 parent f343818
commit 535b9a6
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/frontend/www/src/modules/modal.ts b/frontend/www/src/modules/modal.ts
@@ -339,16 +339,23 @@ async function addDropdown(modal: HTMLElement, param: EnumParam) {
     setupField(field, select, param);
     for (let i = 0; i < options.length; i++) {
         const option = document.createElement("option");
+        const name = options[i];
         option.value = i.toString();
-        option.disabled = options[i].startsWith('[DISABLED] ');
-        option.textContent = options[i].replace(/\[DISABLED\] /g, '');
+        option.disabled = name.startsWith('[DISABLED] ');
+        option.textContent = name.substring(option.disabled ? 11 : 0);
         select.appendChild(option);
     }
+    const firstEnabled = Array.from(select.options).findIndex(op => !op.disabled);
+    if (firstEnabled < 0 || firstEnabled >= select.options.length) {
+        console.error(`No enabled options in enum ${param.type}`);
+        showErrorModal("Config error", `This redeem is misconfigured, please message AlexejheroDev\nError: ${param.type} has no enabled options`);
+        return;
+    }
 
     if (param.defaultValue !== undefined) {
         select.value = param.defaultValue;
     } else {
-        select.value = select.options[0].value;
+        select.value = select.options[firstEnabled].value;
     }
     modal.appendChild(field);
 }