Merge pull request #2282 from bcgov/GWELLS/2265Hotfix

[GWELLS-2265] HOTFIX** Fix issue with logout/login
bcgov · Jul 31, 2024 · f7024de · f7024de
2 parents 8e7f584 + 1e1a6e0
commit f7024de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/app/frontend/src/wells/components/SearchColumnSelect.vue b/app/frontend/src/wells/components/SearchColumnSelect.vue
@@ -229,7 +229,6 @@ export default {
   methods: {
     handleReset () {
       this.$emit('reset')
-      this.localSelectedColumnIds = [...DEFAULT_COLUMNS]
     },
     showModal () {
       this.$refs['column-select-modal'].show()

diff --git a/app/frontend/src/wells/store/index.js b/app/frontend/src/wells/store/index.js
@@ -239,6 +239,9 @@ const wellsStore = {
       if (state.pendingSearch !== null) {
         state.pendingSearch.cancel()
       }
+      if(!localStorage.getItem('userColumnPreferences')){
+          commit(SET_SEARCH_RESULT_COLUMNS, DEFAULT_COLUMNS)
+      }
 
       commit(SET_PENDING_LOCATION_SEARCH, null)
       commit(SET_HAS_SEARCHED, false)
@@ -253,7 +256,6 @@ const wellsStore = {
       commit(SET_SEARCH_RESULTS, null)
       commit(SET_SEARCH_RESULT_COUNT, 0)
       commit(SET_LOCATION_SEARCH_RESULTS, [])
-      commit(SET_SEARCH_RESULT_COLUMNS, DEFAULT_COLUMNS)
       commit(SET_SEARCH_RESULT_FILTERS, {})
       commit(SET_SEARCH_MAP_CENTRE, null)
       commit(SET_SEARCH_MAP_ZOOM, null)