From 8003273b2cff39979382b509b6ff9252d6cbc725 Mon Sep 17 00:00:00 2001 From: Akhil Mohan Date: Fri, 8 Sep 2023 20:51:10 +0530 Subject: [PATCH] feat(rbac): changed withpermission hoc text and removed loading on overview pageg --- frontend/src/hoc/withPermission/withPermission.tsx | 6 +++--- .../src/views/SecretOverviewPage/SecretOverviewPage.tsx | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frontend/src/hoc/withPermission/withPermission.tsx b/frontend/src/hoc/withPermission/withPermission.tsx index 520ccff29..870c54f81 100644 --- a/frontend/src/hoc/withPermission/withPermission.tsx +++ b/frontend/src/hoc/withPermission/withPermission.tsx @@ -43,10 +43,10 @@ export const withPermission = (
-
Permission Denied
+
Access Restricted
- You do not have permission to this page.
Kindly contact your organization - administrator + Your role has limited permissions, please
You do not have permission to this + page.
diff --git a/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx b/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx index ff3af03ea..b5fa1dc1b 100644 --- a/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx +++ b/frontend/src/views/SecretOverviewPage/SecretOverviewPage.tsx @@ -243,6 +243,8 @@ export const SecretOverviewPage = () => { folders?.some(({ isLoading }) => !isLoading) && secrets?.some(({ isLoading }) => !isLoading) ); + const canViewOverviewPage = Boolean(userAvailableEnvs.length); + const filteredSecretNames = secKeys ?.filter((name) => name.toUpperCase().includes(searchFilter.toUpperCase())) .sort((a, b) => (sortDir === "asc" ? a.localeCompare(b) : b.localeCompare(a))); @@ -347,7 +349,7 @@ export const SecretOverviewPage = () => { - {isTableLoading && ( + {canViewOverviewPage && isTableLoading && (