Skip to content

Commit dafe318

Browse files
committed
improvement(resources): simplify list preference adapters
1 parent b25c821 commit dafe318

5 files changed

Lines changed: 14 additions & 39 deletions

File tree

apps/sim/app/workspace/[workspaceId]/files/files.tsx

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,6 @@ export function Files() {
425425
dir: sortDirection,
426426
activeSort,
427427
onSort: applyUrlSort,
428-
onClear: clearUrlSort,
429428
} = useUrlSort(filesSortParams, filesFilterUrlKeys)
430429

431430
const currentListPreference = useMemo<ResourceListPreference>(
@@ -447,17 +446,9 @@ export function Files() {
447446
size: [...preference.filters.size],
448447
uploadedBy: [...preference.filters.uploadedBy],
449448
})
450-
const defaultSort = filesListPreferenceConfig.defaultPreference.sort
451-
if (
452-
preference.sort.column === defaultSort.column &&
453-
preference.sort.direction === defaultSort.direction
454-
) {
455-
clearUrlSort()
456-
} else {
457-
applyUrlSort(preference.sort.column, preference.sort.direction)
458-
}
449+
applyUrlSort(preference.sort.column, preference.sort.direction)
459450
},
460-
[applyUrlSort, clearUrlSort, setFileFilters]
451+
[applyUrlSort, setFileFilters]
461452
)
462453

463454
const {

apps/sim/app/workspace/[workspaceId]/knowledge/knowledge.tsx

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,6 @@ export function Knowledge() {
285285
dir: sortDirection,
286286
activeSort,
287287
onSort: applyUrlSort,
288-
onClear: clearUrlSort,
289288
} = useUrlSort(knowledgeSortParams, knowledgeUrlKeys)
290289

291290
const currentListPreference = useMemo<ResourceListPreference>(
@@ -307,17 +306,9 @@ export function Knowledge() {
307306
content: [...preference.filters.content],
308307
owner: [...preference.filters.owner],
309308
})
310-
const defaultSort = knowledgeListPreferenceConfig.defaultPreference.sort
311-
if (
312-
preference.sort.column === defaultSort.column &&
313-
preference.sort.direction === defaultSort.direction
314-
) {
315-
clearUrlSort()
316-
} else {
317-
applyUrlSort(preference.sort.column, preference.sort.direction)
318-
}
309+
applyUrlSort(preference.sort.column, preference.sort.direction)
319310
},
320-
[applyUrlSort, clearUrlSort, setKnowledgeFilters]
311+
[applyUrlSort, setKnowledgeFilters]
321312
)
322313

323314
const {

apps/sim/app/workspace/[workspaceId]/tables/tables.tsx

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ export function Tables() {
256256
dir: sortDirection,
257257
activeSort,
258258
onSort: applyUrlSort,
259-
onClear: clearUrlSort,
260259
} = useUrlSort(tablesSortParams, tablesUrlKeys)
261260

262261
const currentListPreference = useMemo<ResourceListPreference>(
@@ -273,17 +272,9 @@ export function Tables() {
273272
rows: [...preference.filters.rows],
274273
owner: [...preference.filters.owner],
275274
})
276-
const defaultSort = tablesListPreferenceConfig.defaultPreference.sort
277-
if (
278-
preference.sort.column === defaultSort.column &&
279-
preference.sort.direction === defaultSort.direction
280-
) {
281-
clearUrlSort()
282-
} else {
283-
applyUrlSort(preference.sort.column, preference.sort.direction)
284-
}
275+
applyUrlSort(preference.sort.column, preference.sort.direction)
285276
},
286-
[applyUrlSort, clearUrlSort, setTableFilters]
277+
[applyUrlSort, setTableFilters]
287278
)
288279

289280
const {

apps/sim/hooks/use-resource-list-preferences.test.tsx

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -247,14 +247,18 @@ describe('useResourceListPreferences', () => {
247247
await flushEffects()
248248
expect(useResourceListPreferencesStore.getState()._hasHydrated).toBe(true)
249249

250-
act(() => result.current.commitPreference(filteredPreference))
250+
act(() => result.current.setFilter('type', ['document']))
251251

252-
expect(applyPreference).toHaveBeenCalledWith(filteredPreference)
252+
const filterPreference: ResourceListPreference = {
253+
...defaultPreference,
254+
filters: { ...defaultPreference.filters, type: ['document'] },
255+
}
256+
expect(applyPreference).toHaveBeenCalledWith(filterPreference)
253257
expect(useResourceListPreferencesStore.getState().preferences).toEqual({
254-
'workspace-1': { files: filteredPreference },
258+
'workspace-1': { files: filterPreference },
255259
})
256260

257-
act(() => result.current.commitPreference(defaultPreference))
261+
act(() => result.current.clearFilters())
258262

259263
expect(applyPreference).toHaveBeenCalledWith(defaultPreference)
260264
expect(useResourceListPreferencesStore.getState().preferences).toEqual({})

apps/sim/hooks/use-resource-list-preferences.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ interface UseResourceListPreferencesProps {
1919

2020
interface UseResourceListPreferencesReturn {
2121
isReady: boolean
22-
commitPreference: (preference: ResourceListPreference) => void
2322
setFilter: (filterKey: string, values: string[]) => void
2423
clearFilters: () => void
2524
setSort: (column: string, direction: ResourceListPreference['sort']['direction']) => void
@@ -231,7 +230,6 @@ export function useResourceListPreferences({
231230

232231
return {
233232
isReady: !enabled || (pendingRestoration?.key !== key && hasUrlPreference) || readyKey === key,
234-
commitPreference,
235233
setFilter,
236234
clearFilters,
237235
setSort,

0 commit comments

Comments
 (0)