Merged in r2-2657-ux-applying-filters (pull request #6602)

R2-2657 UX - Applying filters Approved-by: Joshua Toliver
primeroIMS · Nov 21, 2023 · 97301e0 · 97301e0
2 parents e0ecef0 + 5473b65
commit 97301e0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/javascript/components/record-actions/bulk-transtions/reducer.js b/app/javascript/components/record-actions/bulk-transtions/reducer.js
@@ -27,7 +27,8 @@ export default namespace =>
         return state
           .setIn([NAMESPACE, "loading"], false)
           .setIn([NAMESPACE, "data"], fromJS([]))
-          .setIn([NAMESPACE, "errors"], fromJS([]));
+          .setIn([NAMESPACE, "errors"], fromJS([]))
+          .setIn([NAMESPACE, "selectedRecordsLength"], 0);
       case `${namespace}/${actions.BULK_ASSIGN_USER_SELECTED_RECORDS_LENGTH}`:
         return state.setIn([NAMESPACE, "selectedRecordsLength"], fromJS(payload.selectedRecordsLength, 0));
       default:

diff --git a/app/javascript/components/record-actions/transitions/components/reassign-form.jsx b/app/javascript/components/record-actions/transitions/components/reassign-form.jsx
@@ -17,7 +17,6 @@ import SearchableSelect from "../../../searchable-select";
 import { enqueueSnackbar } from "../../../notifier";
 import { useI18n } from "../../../i18n";
 import { applyFilters } from "../../../index-filters/action-creators";
-import { DEFAULT_FILTERS } from "../../../record-list/constants";
 import { filterUsers } from "../utils";
 import { useMemoizedSelector } from "../../../../libs";
 import { getFiltersValuesByRecordType } from "../../../index-filters/selectors";
@@ -128,7 +127,7 @@ const ReassignForm = ({
     dispatch(
       applyFilters({
         recordType,
-        data: DEFAULT_FILTERS
+        data: appliedFilters
       })
     );
   };