SYNC: Merge pull request #3 from dbgate/feature/zip

packages/web/src/forms/FormArchiveFilesSelect.svelte

@@ -10,14 +10,17 @@
 
   export let folderName;
   export let name;
+  export let filterExtension = null;
 
   const { setFieldValue, values } = getFormContext();
 
   $: files = useArchiveFiles({ folder: folderName });
-  $: filesOptions = ($files || []).map(x => ({
-    value: x.name,
-    label: x.name,
-  }));
+  $: filesOptions = ($files || [])
+    .filter(x => (filterExtension ? x.name.endsWith('.' + filterExtension) : true))
+    .map(x => ({
+      value: x.name,
+      label: x.name,
+    }));
 </script>
 
 <div class="wrapper">

packages/web/src/forms/FormArchiveFolderSelect.svelte

@@ -11,16 +11,22 @@
 
   export let additionalFolders = [];
   export let name;
+  export let allowCreateNew = false;
+  export let zipFilesOnly = false;
+  export let skipZipFiles = false;
 
   const { setFieldValue } = getFormContext();
 
   const folders = useArchiveFolders();
 
   $: folderOptions = [
-    ...($folders || []).map(folder => ({
-      value: folder.name,
-      label: folder.name,
-    })),
+    ...($folders || [])
+      .filter(folder => (zipFilesOnly ? folder.name.endsWith('.zip') : true))
+      .filter(folder => (skipZipFiles ? !folder.name.endsWith('.zip') : true))
+      .map(folder => ({
+        value: folder.name,
+        label: folder.name,
+      })),
     ...additionalFolders
       .filter(x => x != '@create')
       .filter(x => !($folders || []).find(y => y.name == x))
@@ -28,7 +34,7 @@
         value: folder,
         label: folder,
       })),
-    {
+    allowCreateNew && {
       label: '(Create new)',
       value: '@create',
     },

packages/web/src/forms/FormCheckboxField.svelte

@@ -22,7 +22,7 @@
     ? { disabled: true }
     : {
         onClick: () => {
-          setFieldValue(name, !$values[name]);
+          setFieldValue(name, $values?.[name] == 0 ? true : $values?.[name] == 1 ? false : !$values?.[name]);
           dispatch('change');
         },
       }}

packages/web/src/forms/FormCheckboxFieldRaw.svelte

@@ -11,4 +11,9 @@
   }
 </script>
 
-<CheckboxField {...$$restProps} checked={$values[name] ?? defaultValue} on:change={handleChange} on:change />
+<CheckboxField
+  {...$$restProps}
+  checked={$values?.[name] == 0 ? false : $values?.[name] == '1' ? true : ($values?.[name] ?? defaultValue)}
+  on:change={handleChange}
+  on:change
+/>