Fix appwrite filters

TundeAkintola · Apr 20, 2022 · d23abb2 · d23abb2
1 parent c6dbcb8
commit d23abb2
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 39 deletions.
diff --git a/documentation/docs/guides-and-concepts/multi-tenancy/appwrite.md b/documentation/docs/guides-and-concepts/multi-tenancy/appwrite.md
@@ -545,8 +545,8 @@ export const CreateProduct: React.FC<CreateProductProps> = ({
                                                 "default",
                                                 rcFile.name,
                                                 rcFile,
-                                                ["*"],
-                                                ["*"],
+                                                ["role:all"],
+                                                ["role:all"],
                                             );
 
                                         const url =

diff --git a/examples/multi-tenancy/appwrite/package.json b/examples/multi-tenancy/appwrite/package.json
@@ -10,18 +10,18 @@
     "@testing-library/jest-dom": "^5.12.0",
     "@testing-library/react": "^11.2.6",
     "@testing-library/user-event": "^12.8.3",
-    "@types/jest": "^26.0.23",
+    "@types/jest": "^26.0.24",
     "@types/node": "^12.20.10",
     "@types/react": "^17.0.4",
-    "@types/react-dom": "^17.0.3",
+    "@types/react-dom": "^17.0.4",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-scripts": "^5.0.0",
     "typescript": "^4.4.3",
     "web-vitals": "^1.1.1"
   },
   "scripts": {
-    "dev": "react-scripts start",
+    "start": "react-scripts start",
     "build": "DISABLE_ESLINT_PLUGIN=true react-scripts build",
     "test": "react-scripts test",
     "eject": "react-scripts eject"

diff --git a/examples/multi-tenancy/appwrite/src/components/product/create.tsx b/examples/multi-tenancy/appwrite/src/components/product/create.tsx
@@ -93,8 +93,8 @@ export const CreateProduct: React.FC<CreateProductProps> = ({
                                                 "default",
                                                 rcFile.name,
                                                 rcFile,
-                                                ["*"],
-                                                ["*"],
+                                                ["role:all"],
+                                                ["role:all"],
                                             );
 
                                         const url =

diff --git a/examples/multi-tenancy/appwrite/src/components/product/edit.tsx b/examples/multi-tenancy/appwrite/src/components/product/edit.tsx
@@ -65,6 +65,8 @@ export const EditProduct: React.FC<EditProductProps> = ({
                                             "default",
                                             rcFile.name,
                                             rcFile,
+                                            ["role:all"],
+                                            ["role:all"],
                                         );
 
                                     const url =

diff --git a/packages/appwrite/src/index.ts b/packages/appwrite/src/index.ts
@@ -4,31 +4,12 @@ import {
     LiveEvent,
     CrudFilters,
     CrudSorting,
+    CrudFilter,
 } from "@pankod/refine-core";
-import { Appwrite } from "appwrite";
+import { Appwrite, Query } from "appwrite";
 
 export * from "appwrite";
 
-const operators = {
-    eq: "=",
-    ne: "!=",
-    lt: "<",
-    gt: ">",
-    lte: "<=",
-    gte: ">=",
-    in: undefined,
-    nin: undefined,
-    contains: undefined,
-    containss: undefined,
-    ncontains: undefined,
-    ncontainss: undefined,
-    null: undefined,
-    between: undefined,
-    nbetween: undefined,
-    nnull: undefined,
-    or: undefined,
-};
-
 const appwriteEventToRefineEvent = {
     "database.documents.create": "created",
     "database.documents.update": "updated",
@@ -58,6 +39,27 @@ type GetAppwriteSortingType = {
     };
 };
 
+const generateFilter = (filter: CrudFilter) => {
+    switch (filter.operator) {
+        case "eq":
+            return Query.equal(filter.field, filter.value);
+        case "ne":
+            return Query.notEqual(filter.field, filter.value);
+        case "gt":
+            return Query.greater(filter.field, filter.value);
+        case "gte":
+            return Query.greaterEqual(filter.field, filter.value);
+        case "lt":
+            return Query.lesser(filter.field, filter.value);
+        case "lte":
+            return Query.lesserEqual(filter.field, filter.value);
+        case "contains":
+            return Query.search(filter.field, `%${filter.value}%`);
+        default:
+            throw new Error(`Operator ${filter.operator} is not supported`);
+    }
+};
+
 export const getAppwriteFilters: GetAppwriteFiltersType = (filters) => {
     if (!filters) {
         return undefined;
@@ -66,16 +68,15 @@ export const getAppwriteFilters: GetAppwriteFiltersType = (filters) => {
     const appwriteFilters: string[] = [];
 
     for (const filter of filters) {
-        const operator = operators[filter.operator];
-
-        if (!operator) {
-            throw new Error(`Operator ${filter.operator} is not supported`);
-        }
-
         if (filter.operator !== "or") {
             const filterField = filter.field === "id" ? "$id" : filter.field;
 
-            appwriteFilters.push(`${filterField}${operator}${filter.value}`);
+            appwriteFilters.push(
+                generateFilter({
+                    ...filter,
+                    field: filterField,
+                }),
+            );
         }
     }
 
@@ -160,8 +161,7 @@ export const dataProvider = (appwriteClient: Appwrite): DataProvider => {
             const { $id, ...restData } =
                 await appwriteClient.database.createDocument(
                     resource,
-                    // TODO: Make this configureable
-                    "unique()",
+                    metaData?.documentId ?? "unique()",
                     variables as unknown as object,
                     metaData?.readPermissions ?? ["role:all"],
                     metaData?.writePermissions ?? ["role:all"],
@@ -179,8 +179,7 @@ export const dataProvider = (appwriteClient: Appwrite): DataProvider => {
                 variables.map((document) =>
                     appwriteClient.database.createDocument<any>(
                         resource,
-                        // TODO: Make this configureable
-                        "unique()",
+                        metaData?.documentId ?? "unique()",
                         document as unknown as object,
                         metaData?.readPermissions ?? ["role:all"],
                         metaData?.writePermissions ?? ["role:all"],