Application Filter - Search key retrieval. (#1795)

* Applicatin Filter Updates * Application filter * Search Key retrievel updates for draft submissions.
AOT-Technologies · Dec 12, 2023 · 733b6bd · 733b6bd
1 parent f12f68c
commit 733b6bd
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/forms-flow-web/src/components/Application/ApplicationTable.js b/forms-flow-web/src/components/Application/ApplicationTable.js
@@ -27,7 +27,8 @@ import LoadingOverlay from "react-loading-overlay";
 const ApplicationTable = () => {
   const dispatch = useDispatch();
   const [displayFilter, setDisplayFilter] = useState(false);
-  const [filterParams, setFilterParams] = useState({});
+  const searchParams = useSelector((state) => state.applications.searchParams);
+  const [filterParams, setFilterParams] = useState(searchParams);
   const [pageLimit, setPageLimit] = useState(5);
   const applications = useSelector(
     (state) => state.applications.applicationsList
@@ -110,10 +111,10 @@ const ApplicationTable = () => {
           <Translation>{(t) => t("No submissions found")}</Translation>{" "}
         </label>
         <br />
-        {(filterParams.id ||
-          filterParams.applicationName ||
-          filterParams.applicationStatus ||
-          filterParams.modified) && (
+        {(filterParams?.id ||
+          filterParams?.applicationName ||
+          filterParams?.applicationStatus ||
+          filterParams?.modified) && (
           <label className="lbl-no-application-desc">
             {" "}
             <Translation>

diff --git a/forms-flow-web/src/components/Draft/DraftTable.js b/forms-flow-web/src/components/Draft/DraftTable.js
@@ -23,7 +23,8 @@ import LoadingOverlay from "react-loading-overlay";
 const DraftTable = () => {
   const dispatch = useDispatch();
   const [displayFilter, setDisplayFilter] = useState(false);
-  const [filterParams, setFilterParams] = useState({});
+  const searchParams = useSelector((state) => state.draft.searchParams);
+  const [filterParams, setFilterParams] = useState(searchParams);
   const [pageLimit, setPageLimit] = useState(5);
   const drafts = useSelector((state) => state.draft.draftList);
   const tenantKey = useSelector((state) => state.tenants?.tenantId);
@@ -69,7 +70,7 @@ const DraftTable = () => {
           <Translation>{(t) => t("No drafts found")}</Translation>{" "}
         </label>
         <br />
-        {(filterParams.id || filterParams.draftName || filterParams.modified) && (
+        {(filterParams?.id || filterParams?.draftName || filterParams?.modified) && (
           <label className="lbl-no-application-desc">
             {" "}
             <Translation>

diff --git a/forms-flow-web/src/modules/draftReducer.js b/forms-flow-web/src/modules/draftReducer.js
@@ -2,7 +2,7 @@ import ACTION_CONSTANTS from "../actions/actionConstants";
 
 const initialState = {
   draftSubmission: {},
-  draftDelete : { modalOpen: false, draftId:null, draftName:'' },
+  draftDelete: { modalOpen: false, draftId: null, draftName: '' },
   draftSubmissionError: {
     error: null,
     message: null,
@@ -16,10 +16,10 @@ const initialState = {
   submission: {},
   draftDetailStatusCode: "",
   lastUpdated: {},
-  sortOrder : "desc",
-  sortBy : "id",
-  searchParams : {},
-  isDraftLoading : false,
+  sortOrder: "desc",
+  sortBy: "id",
+  searchParams: {},
+  isDraftLoading: false,
 };
 
 const draftSubmission = (state = initialState, action) => {
@@ -56,11 +56,11 @@ const draftSubmission = (state = initialState, action) => {
     case ACTION_CONSTANTS.DRAFT_LIST_SORT_ORDER:
       return { ...state, sortOrder: action.payload };
     case ACTION_CONSTANTS.DRAFT_LIST_SORT_BY:
-        return { ...state, sortBy: action.payload };
+      return { ...state, sortBy: action.payload };
     case ACTION_CONSTANTS.DRAFT_LIST_LOADING:
-        return { ...state, isDraftLoading : action.payload };
+      return { ...state, isDraftLoading: action.payload };
     case ACTION_CONSTANTS.DRAFT_LIST_SEARCH_PARAMS:
-        return { ...state, searchParams : action.payload };      
+      return { ...state, searchParams: action.payload };
     default:
       return state;
   }