Browse Source

fix(dashboard): Fix filtering in administrator list

Michael Bromley 3 months ago
parent
commit
622e1a4f59

+ 2 - 2
packages/dashboard/src/app/routes/_authenticated/_administrators/administrators.graphql.ts

@@ -29,8 +29,8 @@ export const administratorItemFragment = graphql(`
 
 export const administratorListDocument = graphql(
     `
-        query AdministratorList {
-            administrators {
+        query AdministratorList($options: AdministratorListOptions) {
+            administrators(options: $options) {
                 items {
                     ...AdministratorItem
                 }

+ 13 - 3
packages/dashboard/src/app/routes/_authenticated/_administrators/administrators.tsx

@@ -24,10 +24,20 @@ function AdministratorListPage() {
             listQuery={administratorListDocument}
             route={Route}
             onSearchTermChange={searchTerm => {
+                return searchTerm
+                    ? {
+                          firstName: { contains: searchTerm },
+                          lastName: { contains: searchTerm },
+                          emailAddress: { contains: searchTerm },
+                      }
+                    : {};
+            }}
+            transformVariables={variables => {
                 return {
-                    firstName: { contains: searchTerm },
-                    lastName: { contains: searchTerm },
-                    emailAddress: { contains: searchTerm },
+                    options: {
+                        ...variables.options,
+                        filterOperator: 'OR',
+                    },
                 };
             }}
             additionalColumns={{