some fixes to schema filtering, wip

1 files changed, 18 insertions, 31 deletions

diff --git a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
index 46ab08dcd..245e1abc0 100644
--- a/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
+++ b/src/client/views/collections/collectionSchema/CollectionSchemaView.tsx
@@ -3,7 +3,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { action, computed, observable, ObservableMap, untracked } from 'mobx';
 import { observer } from 'mobx-react';
 import { computedFn } from 'mobx-utils';
-import { Doc, Field, StrListCast } from '../../../../fields/Doc';
+import { Doc, DocListCast, Field, StrListCast } from '../../../../fields/Doc';
 import { Id } from '../../../../fields/FieldSymbols';
 import { List } from '../../../../fields/List';
 import { listSpec } from '../../../../fields/Schema';
@@ -61,7 +61,7 @@ export class CollectionSchemaView extends CollectionSubView() {
     @observable _newFieldType: ColumnType = ColumnType.Number;
     @observable _menuValue: string = '';
     @observable _filterColumnIndex: number | undefined;
-    @observable _filterValue: string = '';
+    @observable _filterSearchValue: string = '';
 
     get documentKeys() {
         const docs = this.childDocs;
@@ -483,24 +483,17 @@ export class CollectionSchemaView extends CollectionSubView() {
     @action
     openFilterMenu = (index: number) => {
         this._filterColumnIndex = index;
-        this._filterValue = this.getFieldFilters(this.columnKeys[this._filterColumnIndex!]).map(filter => filter.split(':')[1])[0];
+        this._filterSearchValue = '';
     };
 
     @action
-    closeFilterMenu = (setValue: boolean) => {
-        if (setValue) {
-            if (this._filterValue !== '') {
-                Doc.setDocFilter(this.Document, this.columnKeys[this._filterColumnIndex!], this._filterValue, 'check', false, undefined, false);
-            } else {
-                this.removeFieldFilters(this.columnKeys[this._filterColumnIndex!]);
-            }
-        }
+    closeFilterMenu = () => {
         this._filterColumnIndex = undefined;
     };
 
     openContextMenu = (x: number, y: number, index: number) => {
         this.closeColumnMenu();
-        this.closeFilterMenu(false);
+        this.closeFilterMenu();
         ContextMenu.Instance.clearItems();
         ContextMenu.Instance.addItem({
             description: 'Change field',
@@ -533,15 +526,16 @@ export class CollectionSchemaView extends CollectionSubView() {
     };
 
     onFilterKeyDown = (e: React.KeyboardEvent) => {
-        //prettier-ignore
         switch (e.key) {
-            case 'Enter' : this.closeFilterMenu(true); break;
-            case 'Escape': this.closeFilterMenu(false);break;
+            case 'Enter':
+            case 'Escape':
+                this.closeFilterMenu();
+                break;
         }
     };
 
     @action
-    updateFilterSearch = (e: React.ChangeEvent<HTMLInputElement>) => (this._filterValue = e.target.value);
+    updateFilterSearch = (e: React.ChangeEvent<HTMLInputElement>) => (this._filterSearchValue = e.target.value);
 
     @computed get newFieldMenu() {
         return (
@@ -660,21 +654,16 @@ export class CollectionSchemaView extends CollectionSubView() {
     @computed get renderFilterOptions() {
         const keyOptions: string[] = [];
         const columnKey = this.columnKeys[this._filterColumnIndex!];
-        this.childDocs.forEach(doc => {
-            const key = StrCast(doc[columnKey]);
-            if (keyOptions.includes(key) === false && (key.includes(this._filterValue) || !this._filterValue) && key !== '') {
-                keyOptions.push(key);
+        const allDocs = DocListCast(this.dataDoc[this.props.fieldKey]);
+        allDocs.forEach(doc => {
+            const value = StrCast(doc[columnKey]);
+            if (!keyOptions.includes(value) && value !== '' && (this._filterSearchValue === '' || value.includes(this._filterSearchValue))) {
+                keyOptions.push(value);
             }
         });
 
         const filters = StrListCast(this.Document._docFilters);
-        for (let i = 0; i < (filters?.length ?? 0) - 1; i++) {
-            if (filters[i] === columnKey && keyOptions.includes(filters[i].split(':')[1]) === false) {
-                keyOptions.push(filters[i + 1]);
-            }
-        }
-
-        const options = keyOptions.map(key => {
+        return keyOptions.map(key => {
             let bool = false;
             if (filters !== undefined) {
                 const ind = filters.findIndex(filter => filter.split(':')[1] === key);
@@ -700,21 +689,19 @@ export class CollectionSchemaView extends CollectionSubView() {
                 </div>
             );
         });
-
-        return options;
     }
 
     @computed get renderFilterMenu() {
         const x = this.displayColumnWidths.reduce((total, curr, index) => total + (index < this._filterColumnIndex! ? curr : 0), CollectionSchemaView._rowMenuWidth);
         return (
             <div className="schema-filter-menu" style={{ left: x, minWidth: CollectionSchemaView._minColWidth }}>
-                <input className="schema-filter-input" type="text" value={this._filterValue} onKeyDown={this.onFilterKeyDown} onChange={this.updateFilterSearch} onPointerDown={e => e.stopPropagation()} />
+                <input className="schema-filter-input" type="text" value={this._filterSearchValue} onKeyDown={this.onFilterKeyDown} onChange={this.updateFilterSearch} onPointerDown={e => e.stopPropagation()} />
                 {this.renderFilterOptions}
                 <div
                     className="schema-column-menu-button"
                     onPointerDown={action(e => {
                         e.stopPropagation();
-                        this.closeFilterMenu(true);
+                        this.closeFilterMenu();
                     })}>
                     done
                 </div>