From cdebf9aa283f9f7c325ce5aa408ffb3726715b57 Mon Sep 17 00:00:00 2001 From: Jaanus Sellin Date: Tue, 14 Nov 2023 11:08:04 +0200 Subject: [PATCH] fix: sort order should be persisted and used from local storage (#5332) --- .../ProjectFeatureToggles/PaginatedProjectFeatureToggles.tsx | 5 ++++- .../Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/PaginatedProjectFeatureToggles.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/PaginatedProjectFeatureToggles.tsx index c5f75c3e50..1194018beb 100644 --- a/frontend/src/component/project/Project/ProjectFeatureToggles/PaginatedProjectFeatureToggles.tsx +++ b/frontend/src/component/project/Project/ProjectFeatureToggles/PaginatedProjectFeatureToggles.tsx @@ -423,7 +423,10 @@ export const PaginatedProjectFeatureToggles = ({ return { sortBy: [ { - id: searchParams.get('sort') || 'createdAt', + id: + searchParams.get('sort') || + storedParams.id || + 'createdAt', desc: searchParams.has('order') ? searchParams.get('order') === 'desc' : storedParams.desc, diff --git a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx index ed0bb7fd20..b84cf84c40 100644 --- a/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx +++ b/frontend/src/component/project/Project/ProjectFeatureToggles/ProjectFeatureToggles.tsx @@ -413,7 +413,10 @@ export const ProjectFeatureToggles = ({ return { sortBy: [ { - id: searchParams.get('sort') || 'createdAt', + id: + searchParams.get('sort') || + storedParams.id || + 'createdAt', desc: searchParams.has('order') ? searchParams.get('order') === 'desc' : storedParams.desc,