filters refactor fix

packages/web/src/formview/FormViewFilterColumn.svelte

@@ -22,10 +22,10 @@
   export let isFormView;
 
   $: column = isFormView
-    ? display.display.formColumns.find(x => x.uniqueName == uniqueName)
-    : display.findColumn(uniqueName);
+    ? display.formColumns?.find(x => x.uniqueName == uniqueName)
+    : display?.findColumn(uniqueName);
 
-  function computeFilterType(display, column, isFormView, isDynamicStructure, useEvalFilters) {
+  function computeFilterType(column, isDynamicStructure, useEvalFilters) {
     if (useEvalFilters) return 'eval';
     if (isDynamicStructure) return 'mongo';
 
@@ -51,7 +51,7 @@
       </InlineButton>
     </div>
     <DataFilterControl
-      filterType={computeFilterType(display, uniqueName, isFormView, isDynamicStructure, useEvalFilters)}
+      filterType={computeFilterType(column, isDynamicStructure, useEvalFilters)}
       filter={filters[uniqueName]}
       setFilter={value => display.setFilter(uniqueName, value)}
       {driver}

packages/web/src/formview/FormViewFilters.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
   import _ from 'lodash';
+  import DataFilterControl from '../datagrid/DataFilterControl.svelte';
 
   import ManagerInnerContainer from '../elements/ManagerInnerContainer.svelte';
   import keycodes from '../utility/keycodes';
@@ -24,7 +25,7 @@
   $: formFilterColumns = display?.config?.formFilterColumns;
   $: filters = display?.config?.filters;
 
-  $: allFilterNames = _.union(_.keys(filters || {}), formFilterColumns || []);
+  $: allFilterNames = isFormView ? _.union(_.keys(filters || {}), formFilterColumns || []) : _.keys(filters);
 </script>
 
 {#if isFormView}
@@ -53,6 +54,19 @@
   </div>
 {/if}
 
+<!-- <DataFilterControl
+  filterType='string'
+  filter={filters[uniqueName]}
+  setFilter={value => display.setFilter(uniqueName, value)}
+  {driver}
+  {conid}
+  {database}
+  {schemaName}
+  {pureName}
+  columnName={column.uniquePath.length == 1 ? column.uniquePath[0] : null}
+  foreignKey={column.foreignKey}
+/> -->
+
 <ManagerInnerContainer width={managerSize}>
   {#each allFilterNames as uniqueName}
     <FormViewFilterColumn