fix compile errors

MrBrax · Nov 8, 2023 · 318ccfd · 318ccfd
1 parent 8aa4f16
commit 318ccfd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/client-vue/src/components/forms/SettingsForm.vue b/client-vue/src/components/forms/SettingsForm.vue
@@ -118,11 +118,11 @@
                     <textarea v-if="data.multiline" :id="`input_${key}`" v-model="formData.config[key] as string" class="input" type="text" :name="key" />
                     <input v-else :id="`input_${key}`" v-model="formData.config[key]" class="input" type="text" :name="key" />
                     <ul class="template-replacements">
-                        <li v-for="(item, ix) in data.replacements" :key="ix">
-                            <button v-if="item.deprecated" type="button" class="deprecated" title="Deprecated" @click="insertReplacement(key, ix)">
-                                <span class="strikethrough">&lbrace;{{ ix }}&rbrace;</span>
+                        <li v-for="(item, word) in data.replacements" :key="word">
+                            <button v-if="item.deprecated" type="button" class="deprecated" title="Deprecated" @click="insertReplacement(key, word)">
+                                <span class="strikethrough">&lbrace;{{ word }}&rbrace;</span>
                             </button>
-                            <button v-else type="button" @click="insertReplacement(key, ix)">&lbrace;{{ ix }}&rbrace;</button>
+                            <button v-else type="button" @click="insertReplacement(key, word)">&lbrace;{{ word }}&rbrace;</button>
                         </li>
                     </ul>
                     <p class="template-preview">
@@ -183,7 +183,7 @@ library.add(faGlobe, faSave);
 
 interface SettingsGroup {
     name: string;
-    fields: Record<string, SettingField<string | number | boolean>>;
+    fields: Record<string, SettingField>;
 }
 
 // emit
@@ -349,8 +349,9 @@ function doValidateExternalURL() {
         });
 }
 
-function templatePreview(data: SettingField<any>, template: string): string {
+function templatePreview(data: SettingField, template: string): string {
     // console.debug("templatePreview", data, template);
+    if (data.type !== "template") return "";
     if (!data.replacements) return "";
     const replaced_string = formatString(template, Object.fromEntries(Object.entries(data.replacements).map(([key, value]) => [key, value.display])));
     if (data.context) {

diff --git a/common/Config.ts b/common/Config.ts
@@ -115,6 +115,7 @@ export interface ObjectSettingField extends BaseSettingField {
 export interface TemplateSettingField extends BaseSettingField {
     type: "template";
     default?: string;
+    multiline?: boolean;
     replacements?: Record<
         string,
         { display: string; description?: string; deprecated?: boolean }