Merge pull request #390 from berty/feat/rememberTheme

feat: Save last filters as next default filters.
berty · Oct 5, 2020 · cd6f82a · cd6f82a
2 parents 06f3aff + 1a3fcd9
commit cd6f82a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/web/src/hooks/queryHooks.js b/web/src/hooks/queryHooks.js
@@ -76,7 +76,7 @@ export const useSetFiltersOnQueryChange = () => {
   const { search: locationSearch } = useLocation()
   useEffect(() => {
     const updateFilters = () => {
-      const { artifact_kinds, build_driver, build_state } = getFiltersFromUrlQuery({ locationSearch }) || {}
+      const { artifact_kinds, build_driver, build_state } = JSON.parse(window.localStorage.getItem("uiFilters")) || getFiltersFromUrlQuery({ locationSearch }) || {}
       dispatch({
         type: actions.UPDATE_UI_FILTERS,
         payload: { artifact_kinds, build_driver, build_state },

diff --git a/web/src/store/GlobalStore.js b/web/src/store/GlobalStore.js
@@ -35,7 +35,7 @@ export const INITIAL_STATE = {
     build_state: [],
   },
   calculatedFilters: {
-    projects: [PROJECT.messenger],
+    projects: JSON.parse(window.localStorage.getItem("projects")) || [PROJECT.messenger],
     order: 'created_at',
   },
   showingFilterModal: false,
@@ -58,6 +58,8 @@ function reducer(state, action) {
       }
     }
     case actions.LOGOUT:
+      window.localStorage.removeItem("projects")
+      window.localStorage.removeItem("uiFilters")
       return {
         ...state,
         autoRefreshOn: false,

diff --git a/web/src/ui/components/FilterModal/FilterModal.js b/web/src/ui/components/FilterModal/FilterModal.js
@@ -131,6 +131,7 @@ const FilterModal = ({ closeAction }) => {
           className="btn btn-primary"
           data-dismiss="modal"
           onClick={() => {
+            window.localStorage.setItem("projects", JSON.stringify([...selectedProjects]))
             updateState({
               isLoaded: false,
               needsRefresh: true,
@@ -139,16 +140,20 @@ const FilterModal = ({ closeAction }) => {
               },
             })
             closeAction()
+            const uiFilters = {
+              build_driver: selectedDrivers,
+              build_state: selectedBuildStates,
+              artifact_kinds: selectedArtifactKinds,
+            }
+            window.localStorage.setItem("uiFilters", JSON.stringify(uiFilters))
             history.push({
               path: '/',
               search: queryString
                 .stringify(
-                  _.pickBy({
-                    build_driver: selectedDrivers,
-                    build_state: selectedBuildStates,
-                    artifact_kinds: selectedArtifactKinds,
-                  },
-                  (val) => getIsArrayWithN(val, 1)),
+                  _.pickBy(
+                    uiFilters,
+                    (val) => getIsArrayWithN(val, 1),
+                  ),
                 ),
             })
           }}
@@ -163,8 +168,8 @@ const FilterModal = ({ closeAction }) => {
         <Tag
           onClick={() => {
             removeAuthCookie()
-            dispatch({ type: actions.LOGOUT })
             dispatch({ type: actions.UPDATE_UI_FILTERS, payload: {} })
+            dispatch({ type: actions.LOGOUT })
             closeAction()
             redirectHome()
           }}