feat: multi-select fixed can allow unknown values

danielo515 · Jan 2, 2024 · dcefe7c · dcefe7c
1 parent fa9da3d
commit dcefe7c
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 5 deletions.
diff --git a/src/FormModal.ts b/src/FormModal.ts
@@ -15,6 +15,7 @@ import { log_error, log_notice } from "./utils/Log";
 import { FieldValue, FormEngine, makeFormEngine } from "./store/formStore";
 import { Writable } from "svelte/store";
 import { FolderSuggest } from "./suggesters/suggestFolder";
+import { allowsUnknownValues } from "./core/InputDefinitionSchema";
 
 export type SubmitFn = (formResult: FormResult) => void;
 
@@ -162,8 +163,7 @@ export class FormModal extends Modal {
                     });
                 case "multiselect": {
                     const source = fieldInput.source;
-                    const allowUnknownValues =
-                        source === "dataview" ? fieldInput.allowUnknownValues : false;
+                    const allowUnknownValues = allowsUnknownValues(fieldInput);
                     const options =
                         source == "fixed"
                             ? fieldInput.multi_select_options

diff --git a/src/core/InputDefinitionSchema.ts b/src/core/InputDefinitionSchema.ts
@@ -1,5 +1,5 @@
 import { trySchemas, ParsingFn, parseC } from "@std";
-import { AllFieldTypes } from "./formDefinition";
+import { AllFieldTypes, AllSources } from "./formDefinition";
 import {
     object,
     number,
@@ -88,6 +88,7 @@ const MultiSelectFixedSchema = object({
     type: literal("multiselect"),
     source: literal("fixed"),
     multi_select_options: array(string()),
+    allowUnknownValues: optional(boolean(), false),
 });
 const MultiSelectQuerySchema = object({
     type: literal("multiselect"),
@@ -96,6 +97,18 @@ const MultiSelectQuerySchema = object({
     allowUnknownValues: optional(boolean(), false),
 });
 
+export function canAllowUnknownValues(
+    type: "multiselect",
+    source: AllSources,
+): source is "dataview" | "fixed" {
+    return type === "multiselect" && (source === "dataview" || source === "fixed");
+}
+
+export function allowsUnknownValues(input: multiselect): boolean {
+    if (input.source === "notes") return false;
+    return input.allowUnknownValues;
+}
+
 export const MultiselectSchema = union([
     MultiSelectNotesSchema,
     MultiSelectFixedSchema,

diff --git a/src/exampleModalDefinition.ts b/src/exampleModalDefinition.ts
@@ -62,6 +62,7 @@ export const exampleModalDefinition: FormDefinition = {
             input: {
                 type: "multiselect",
                 source: "fixed",
+                allowUnknownValues: false,
                 multi_select_options: [
                     "Android",
                     "iOS",

diff --git a/src/views/components/InputBuilderSelect.svelte b/src/views/components/InputBuilderSelect.svelte
@@ -10,6 +10,7 @@
     import InputFolder from "./InputFolder.svelte";
     import { AllSources } from "src/core/formDefinition";
     import InputBuilderDataview from "./inputBuilderDataview.svelte";
+    import { canAllowUnknownValues } from "src/core/InputDefinitionSchema";
 
     export let index: number;
     export let source: AllSources = "fixed";
@@ -22,7 +23,7 @@
     export let is_multi: boolean;
     $: id = `builder_select_${index}`;
     $: options_id = `builder_select_options_btn_${index}`;
-    $: canAllowUnknownValues = source === "dataview" && is_multi;
+    $: showAllowUnknownValuesOption = is_multi && canAllowUnknownValues("multiselect", source);
 
     function moveOption(from: number, direction: "up" | "down") {
         const to = direction === "up" ? from - 1 : from + 1;
@@ -46,7 +47,7 @@
             <option value="dataview">Dataview</option>
         {/if}
     </select>
-    {#if canAllowUnknownValues}
+    {#if showAllowUnknownValuesOption}
         <label class="unknown-checkbox">
             <span>
                 <input type="checkbox" bind:checked={allowUnknownValues} />