diff --git a/portal-ui/src/common/SecureComponent/permissions.ts b/portal-ui/src/common/SecureComponent/permissions.ts index 8bd6cbd9b..daa613005 100644 --- a/portal-ui/src/common/SecureComponent/permissions.ts +++ b/portal-ui/src/common/SecureComponent/permissions.ts @@ -368,13 +368,14 @@ export const IAM_PAGES_PERMISSIONS = { ], [IAM_PAGES.TIERS]: [ IAM_SCOPES.ADMIN_LIST_TIERS, // display tiers list - IAM_SCOPES.ADMIN_SET_TIER, // display "add tier" button ], [IAM_PAGES.TIERS_ADD]: [ IAM_SCOPES.ADMIN_SET_TIER, // display "add tier" button / shows add service tier page + IAM_SCOPES.ADMIN_LIST_TIERS, // display tiers list ], [IAM_PAGES.TIERS_ADD_SERVICE]: [ IAM_SCOPES.ADMIN_SET_TIER, // display "add tier" button / shows add service tier page + IAM_SCOPES.ADMIN_LIST_TIERS, // display tiers list ], [IAM_PAGES.TOOLS]: [ IAM_SCOPES.S3_LISTEN_NOTIFICATIONS, // displays watch notifications diff --git a/portal-ui/src/screens/Console/Configurations/TiersConfiguration/ListTiersConfiguration.tsx b/portal-ui/src/screens/Console/Configurations/TiersConfiguration/ListTiersConfiguration.tsx index 2b7774023..c4b2cbc74 100644 --- a/portal-ui/src/screens/Console/Configurations/TiersConfiguration/ListTiersConfiguration.tsx +++ b/portal-ui/src/screens/Console/Configurations/TiersConfiguration/ListTiersConfiguration.tsx @@ -58,6 +58,8 @@ import { tierTypes } from "./utils"; import { selDistSet, setErrorSnackMessage } from "../../../../systemSlice"; import { useNavigate } from "react-router-dom"; import { useAppDispatch } from "../../../../store"; +import { hasPermission } from "../../../../common/SecureComponent"; +import TooltipWrapper from "../../Common/TooltipWrapper/TooltipWrapper"; const UpdateTierCredentialsModal = withSuspense( React.lazy(() => import("./UpdateTierCredentialsModal")) @@ -109,6 +111,10 @@ const ListTiersConfiguration = ({ classes }: IListTiersConfig) => { type: "unsupported", }); + const hasSetTier = hasPermission(CONSOLE_UI_RESOURCE, [ + IAM_SCOPES.ADMIN_SET_TIER, + ]); + useEffect(() => { if (isLoading) { if (distributedSetup) { @@ -285,20 +291,29 @@ const ListTiersConfiguration = ({ classes }: IListTiersConfig) => { setIsLoading(true); }} /> - - -