From c8410ac6f3b3207a66c93b650829921f4ee23e5e Mon Sep 17 00:00:00 2001 From: Scott Wilson Date: Fri, 11 Oct 2024 15:53:44 -0700 Subject: [PATCH] fix: keep main page filters enabled by default for UI and only disable query via permissions --- .../views/SecretMainPage/SecretMainPage.tsx | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/frontend/src/views/SecretMainPage/SecretMainPage.tsx b/frontend/src/views/SecretMainPage/SecretMainPage.tsx index 813e437e4..27df54e53 100644 --- a/frontend/src/views/SecretMainPage/SecretMainPage.tsx +++ b/frontend/src/views/SecretMainPage/SecretMainPage.tsx @@ -106,11 +106,12 @@ export const SecretMainPage = () => { const defaultFilterState = { tags: {}, searchFilter: (router.query.searchFilter as string) || "", + // these should always be on by default for the UI, they will be disabled for the query below based off permissions include: { [RowType.Folder]: true, - [RowType.Import]: canReadSecretImports, - [RowType.DynamicSecret]: canReadDynamicSecret, - [RowType.Secret]: canReadSecret + [RowType.Import]: true, + [RowType.DynamicSecret]: true, + [RowType.Secret]: true } }; @@ -118,19 +119,6 @@ export const SecretMainPage = () => { const [debouncedSearchFilter, setDebouncedSearchFilter] = useDebounce(filter.searchFilter); const [filterHistory, setFilterHistory] = useState>(new Map()); - // change filters if permissions change at different paths/env - useEffect(() => { - setFilter((prev) => ({ - ...prev, - include: { - [RowType.Folder]: true, - [RowType.Import]: canReadSecretImports, - [RowType.DynamicSecret]: canReadDynamicSecret, - [RowType.Secret]: canReadSecret - } - })); - }, [canReadSecret, canReadSecretImports, canReadDynamicSecret]); - useEffect(() => { if ( !isWorkspaceLoading &&