Skip to content

Commit 58dd157

Browse files
committed
feat: update local storage acc to search string
1 parent 457ed64 commit 58dd157

File tree

3 files changed

+9
-29
lines changed

3 files changed

+9
-29
lines changed

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@devtron-labs/devtron-fe-common-lib",
3-
"version": "0.6.1-beta-1",
3+
"version": "0.6.1-beta-7",
44
"description": "Supporting common component library",
55
"type": "module",
66
"main": "dist/index.js",

src/Common/Hooks/useUrlFilters/useUrlFilters.ts

Lines changed: 6 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -153,34 +153,14 @@ const useUrlFilters = <T = string, K = unknown>({
153153
}
154154

155155
useEffect(() => {
156-
// If we have pageSize || pageNumber || searchKey || sortBy || sortOrder in params, no need to change other filters
157-
const paramsSortByKey = searchParams.get(SORT_BY) || ''
158-
const paramsSortByOrder = searchParams.get(SORT_ORDER) || ''
159-
const paramsPageNumber = searchParams.get(PAGE_NUMBER) || 0
160-
const paramsPageSize = searchParams.get(PAGE_SIZE) || 0
161-
if (
162-
!localStorageKey ||
163-
!!paramsPageSize ||
164-
!!paramsPageNumber ||
165-
!!searchKey ||
166-
!!paramsSortByKey ||
167-
!!paramsSortByOrder
168-
) {
156+
// if we have search string, set secondary params in local storage accordingly
157+
if (location.search) {
158+
localStorage.setItem(localStorageKey, JSON.stringify(parsedParams))
169159
return
170160
}
171-
if (
172-
Object.keys(parsedParams).some(
173-
(key) =>
174-
(Array.isArray(parsedParams[key]) && parsedParams[key].length) ||
175-
(typeof parsedParams[key] === 'string' && !!parsedParams[key]),
176-
)
177-
) {
178-
localStorage.setItem(localStorageKey, JSON.stringify(parsedParams))
179-
} else {
180-
const localStorageValue = localStorage.getItem(localStorageKey)
181-
if (localStorageValue) {
182-
updateSearchParams(JSON.parse(localStorageValue))
183-
}
161+
const localStorageValue = localStorage.getItem(localStorageKey)
162+
if (localStorageValue) {
163+
updateSearchParams(JSON.parse(localStorageValue))
184164
}
185165
}, [])
186166

0 commit comments

Comments
 (0)