Merge pull request #3083 from marmelab/fix-export-permanent-filter

[RFR] Fix Export button ignores permanent filter from List
marmelab · Apr 2, 2019 · d83ffd8 · d83ffd8
2 parents dd996b0 + 63ac7c6
commit d83ffd8
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/packages/ra-ui-materialui/src/list/List.js b/packages/ra-ui-materialui/src/list/List.js
@@ -102,6 +102,7 @@ export const ListView = ({
     // component props
     actions,
     aside,
+    filter,
     filters,
     bulkActions, // deprecated
     bulkActionButtons,
@@ -138,6 +139,7 @@ export const ListView = ({
                         actions={actions}
                         bulkActions={bulkActions}
                         exporter={exporter}
+                        permanentFilter={filter}
                     />
                 )}
                 <div key={version}>

diff --git a/packages/ra-ui-materialui/src/list/ListActions.js b/packages/ra-ui-materialui/src/list/ListActions.js
@@ -15,6 +15,7 @@ const Actions = ({
     displayedFilters,
     exporter,
     filterValues,
+    permanentFilter,
     hasCreate,
     basePath,
     selectedIds,
@@ -46,7 +47,7 @@ const Actions = ({
                 disabled={total === 0}
                 resource={resource}
                 sort={currentSort}
-                filter={filterValues}
+                filter={{ ...filterValues, ...permanentFilter }}
                 exporter={exporter}
             />
         )}

diff --git a/packages/ra-ui-materialui/src/list/ListToolbar.js b/packages/ra-ui-materialui/src/list/ListToolbar.js
@@ -12,6 +12,8 @@ const styles = createStyles({
 const ListToolbar = ({
     classes,
     filters,
+    filterValues, // dynamically set via the UI by the user
+    permanentFilter, // set in the List component by the developer
     actions,
     bulkActions,
     exporter,
@@ -21,6 +23,7 @@ const ListToolbar = ({
         {filters &&
             React.cloneElement(filters, {
                 ...rest,
+                filterValues,
                 context: 'form',
             })}
         <span />
@@ -31,14 +34,17 @@ const ListToolbar = ({
                 bulkActions,
                 exporter,
                 filters,
-                ...actions.props
+                filterValues,
+                permanentFilter,
+                ...actions.props,
             })}
     </Toolbar>
 );
 
 ListToolbar.propTypes = {
     classes: PropTypes.object,
     filters: PropTypes.element,
+    permanentFilter: PropTypes.object,
     actions: PropTypes.element,
     bulkActions: PropTypes.oneOfType([PropTypes.element, PropTypes.bool]),
     exporter: PropTypes.oneOfType([PropTypes.func, PropTypes.bool]),