Merge pull request #1541 from rowyio/rc

Rc
rowyio · Nov 23, 2024 · a5b4316 · a5b4316
2 parents f8e6aa8 + 147a7fa
commit a5b4316
Show file tree

Hide file tree

Showing 33 changed files with 280 additions and 103 deletions.
diff --git a/README.md b/README.md
@@ -101,7 +101,7 @@ https://user-images.githubusercontent.com/307298/157185793-f67511cd-7b7b-4229-95
 
 Set up Rowy on your Google Cloud Platform project with this easy deploy button.
 Your data and cloud functions stay on your own Firestore/GCP and is managed via
-a cloud run instance that operates exclusively on your GCP project. So we do do
+a cloud run instance that operates exclusively on your GCP project. So we do
 not access or store any of your data on Rowy.
 
 [<img width="200" alt="Guided quick start button" src="https://user-images.githubusercontent.com/307298/185548050-e9208fb6-fe53-4c84-bbfa-53c08e03c15f.png">](https://rowy.app/)

diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "file-saver": "^2.0.5",
     "firebase": "^9.12.1",
     "firebaseui": "^6.0.1",
+    "fuse.js": "^7.0.0",
     "jotai": "^1.8.4",
     "json-stable-stringify-without-jsonify": "^1.0.1",
     "jszip": "^3.10.0",

diff --git a/src/atoms/tableScope/rowActions.ts b/src/atoms/tableScope/rowActions.ts
@@ -386,9 +386,7 @@ export const updateFieldAtom = atom(
     );
 
     if (!row) throw new Error("Could not find row");
-    const isLocalRow =
-      fieldName.startsWith("_rowy_formulaValue_") ||
-      Boolean(find(tableRowsLocal, ["_rowy_ref.path", path]));
+    const isLocalRow = Boolean(find(tableRowsLocal, ["_rowy_ref.path", path]));
 
     const update: Partial<TableRow> = {};
 
@@ -469,14 +467,6 @@ export const updateFieldAtom = atom(
         deleteFields: deleteField ? [fieldName] : [],
       });
 
-      // TODO(han): Formula field persistence
-      // const config = find(tableColumnsOrdered, (c) => {
-      //  const [, key] = fieldName.split("_rowy_formulaValue_");
-      //  return c.key === key;
-      // });
-      // if(!config.persist) return;
-      if (fieldName.startsWith("_rowy_formulaValue")) return;
-
       // If it has no missingRequiredFields, also write to db
       // And write entire row to handle the case where it doesn’t exist in db yet
       if (missingRequiredFields.length === 0) {

diff --git a/src/components/ColumnModals/FieldsDropdown.tsx b/src/components/ColumnModals/FieldsDropdown.tsx
@@ -1,5 +1,6 @@
 import MultiSelect from "@rowy/multiselect";
 import { Box, ListItemIcon, Typography } from "@mui/material";
+import Fuse from 'fuse.js';
 
 import { FIELDS } from "@src/components/fields";
 import { FieldType } from "@src/constants/fields";
@@ -23,6 +24,15 @@ export interface IFieldsDropdownProps {
   [key: string]: any;
 }
 
+export interface OptionsType {
+  label: string;
+  value: string;
+  disabled: boolean;
+  requireCloudFunctionSetup: boolean;
+  requireCollectionTable: boolean;
+  keywords: string[];
+}
+
 /**
  * Returns dropdown component of all available types
  */
@@ -52,9 +62,21 @@ export default function FieldsDropdown({
       disabled: requireCloudFunctionSetup || requireCollectionTable,
       requireCloudFunctionSetup,
       requireCollectionTable,
+      keywords: fieldConfig.keywords || []
     };
   });
 
+  const filterOptions = (options: OptionsType[], inputConfig: any) => {
+    const fuse = new Fuse(options, {
+      keys: [{name:'label', weight: 2}, 'keywords'],
+      includeScore: true,
+      threshold: 0.4, 
+    });
+
+    const results = fuse.search(inputConfig?.inputValue);
+    return results.length > 0 ? results.map((result) => result.item) : options;
+  }
+
   return (
     <MultiSelect
       multiple={false}
@@ -80,6 +102,7 @@ export default function FieldsDropdown({
                 },
             },
           },
+          filterOptions
         },
       } as any)}
       itemRenderer={(option) => (

diff --git a/src/components/Table/Table.tsx b/src/components/Table/Table.tsx
@@ -121,6 +121,7 @@ export default function Table({
   const [tablePage, setTablePage] = useAtom(tablePageAtom, tableScope);
   const setReactTable = useSetAtom(reactTableAtom, tableScope);
 
+  const setSelectedCell = useSetAtom(selectedCellAtom, tableScope);
   const updateColumn = useSetAtom(updateColumnAtom, tableScope);
 
   // Get user settings and tableId for applying sort sorting
@@ -313,6 +314,8 @@ export default function Table({
 
       const { scrollHeight, scrollTop, clientHeight } = containerElement;
       if (scrollHeight - scrollTop - clientHeight < 300) {
+        // deselect cell on next page load
+        setSelectedCell(null);
         setTablePage((p) => p + 1);
       }
     },