Use full schema for list filter

lolocompany · Aug 10, 2023 · 4e81fbe · 4e81fbe
1 parent 3bce37a
commit 4e81fbe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lolocompany/react-admin-lolo",
-  "version": "2.1.9",
+  "version": "2.1.10",
   "description": "A library for schema-driven web apps using [Lolo](https://lolo.company), [React Admin](https://github.com/marmelab/react-admin) and [RJSF](https://github.com/rjsf-team/react-jsonschema-form)",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",

diff --git a/src/views/List.js b/src/views/List.js
@@ -17,25 +17,28 @@ const BulkActionButtons = props => (
 );
 
 const List = props => {
-  const { listSchema: schema } = useContext(ResourceContext);
+  const { listSchema, schema } = useContext(ResourceContext);
 
-  if (!Object.keys(schema).length) return null;
+  if (!Object.keys(listSchema).length) return null;
+
+  const filterSchema = JSON.parse(JSON.stringify(schema));
+  delete filterSchema.properties.accountId;
 
   return (
     <ra.List
       {...props}
       bulkActionButtons={props.hasEdit ? <BulkActionButtons /> : false}
-      filters={<Filter schema={schema} />}
+      filters={<Filter schema={filterSchema} />}
       actions={<ListActions />}
       empty={<ListEmpty />}
       sort={{ field: 'createdAt', order: 'ASC' }}
-      title={schema.title ? pluralize(schema.title) : undefined}
+      title={listSchema.title ? pluralize(listSchema.title) : undefined}
     >
       <ra.Datagrid
         rowClick={props.hasShow ? 'show' : props.hasEdit ? 'edit' : null}
         expand={props.expand || <ExpandPanel />}
       >
-        {Object.entries(schema.properties).map(toField)}
+        {Object.entries(listSchema.properties).map(toField)}
       </ra.Datagrid>
     </ra.List>
   );