feat(coral): Adapt superadmin preview banner and add tenants link (#2585

) * Add superadmin link to Tenants page Signed-off-by: Mirjam Aulbach <[email protected]> * Update preview banner in Klaw Signed-off-by: Mirjam Aulbach <[email protected]> --------- Signed-off-by: Mirjam Aulbach <[email protected]>
Aiven-Open · Aug 30, 2024 · 876de75 · 876de75
1 parent e588916
commit 876de75
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/coral/src/app/layout/main-navigation/MainNavigation.test.tsx b/coral/src/app/layout/main-navigation/MainNavigation.test.tsx
@@ -259,6 +259,10 @@ describe("MainNavigation.tsx", () => {
             name: "Teams",
             linkTo: `/configuration/teams`,
           },
+          {
+            name: "Tenants",
+            linkTo: "/tenants",
+          },
           {
             name: "Environments",
             linkTo: "/configuration/environments",

diff --git a/coral/src/app/layout/main-navigation/MainNavigation.tsx b/coral/src/app/layout/main-navigation/MainNavigation.tsx
@@ -163,6 +163,9 @@ function MainNavigation() {
               linkText={"Teams"}
               active={pathname.startsWith(Routes.TEAMS)}
             />
+            {showNavigationForSuperAdmin && (
+              <MainNavigationLink linkText={"Tenants"} to={"/tenants"} />
+            )}
             {showNavigationForSuperAdmin && (
               <MainNavigationLink
                 linkText={"Approve user request"}

diff --git a/core/src/main/resources/templates/browseAcls.html b/core/src/main/resources/templates/browseAcls.html
@@ -429,7 +429,7 @@ <h4 class="mb-3">Shortcuts</h4>
 		<div class="container-fluid">
 			<div class="row page-titles">
 			</div>
-			<div class="row" ng-if="dashboardDetails.coralEnabled === 'true'">
+			<div class="row" ng-if="dashboardDetails.coralEnabled === 'true' && userrole != 'SUPERADMIN'">
 				<div class="ribbon-wrapper card col-lg-6 col-md-6 col-xlg-2 col-xs-6">
 					<div class="ribbon ribbon-success">New user interface available</div>
 					<p class="ribbon-content">

diff --git a/core/src/main/resources/templates/clusters.html b/core/src/main/resources/templates/clusters.html
@@ -460,7 +460,7 @@ <h4 class="mb-3">Shortcuts</h4>
 
 			<!-- Row -->
 
-			<div class="row" ng-if="dashboardDetails.coralEnabled === 'true' && userrole != 'SUPERADMIN'">
+			<div class="row" ng-if="dashboardDetails.coralEnabled === 'true'">
 				<div class="ribbon-wrapper card col-lg-6 col-md-6 col-xlg-2 col-xs-6">
 					<div class="ribbon ribbon-success">New user interface available</div>
 					<p class="ribbon-content">

diff --git a/core/src/main/resources/templates/connectorOverview.html b/core/src/main/resources/templates/connectorOverview.html
@@ -430,7 +430,7 @@ <h4 class="mb-3">Shortcuts</h4>
 		<div class="container-fluid">
 			<div class="row page-titles">
 			</div>
-			<div class="row" ng-if="dashboardDetails.coralEnabled === 'true'">
+			<div class="row" ng-if="dashboardDetails.coralEnabled === 'true' && userrole != 'SUPERADMIN'">
 				<div class="ribbon-wrapper card col-lg-6 col-md-6 col-xlg-2 col-xs-6">
 					<div class="ribbon ribbon-success">New user interface available</div>
 					<p class="ribbon-content">

diff --git a/core/src/main/resources/templates/envs.html b/core/src/main/resources/templates/envs.html
@@ -437,7 +437,7 @@ <h4 class="mb-3">Shortcuts</h4>
 			<div class="row page-titles">
 			</div>
 
-			<div class="row" ng-if="dashboardDetails.coralEnabled === 'true' && userrole != 'SUPERADMIN'">
+			<div class="row" ng-if="dashboardDetails.coralEnabled === 'true'">
 				<div class="ribbon-wrapper card col-lg-6 col-md-6 col-xlg-2 col-xs-6">
 					<div class="ribbon ribbon-success">New user interface available</div>
 					<p class="ribbon-content">