Merge pull request #1115 from cdapio/redirect-to-nsadmin-ui

Redirect to namespace admin UI to add service account to created namespace
cdapio · Oct 17, 2023 · f4e3bcc · f4e3bcc
2 parents 3a62ebd + 8f5f9e4
commit f4e3bcc
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 5 deletions.
diff --git a/app/cdap/components/CaskWizards/AddNamespace/index.js b/app/cdap/components/CaskWizards/AddNamespace/index.js
@@ -112,21 +112,49 @@ export default class AddNamespaceWizard extends Component {
       namespaceId: newNamespaceId,
     });
     let buttonLabel = T.translate(`${PREFIX}.callToAction`, { namespaceId: newNamespaceId });
-    let linkLabel = T.translate('features.Wizard.GoToHomePage');
     this.setState({
       successInfo: {
         message,
         buttonLabel,
         buttonUrl: window.getAbsUIUrl({
           namespaceId: newNamespaceId,
         }),
-        linkLabel,
-        linkUrl: `${window.getAbsUIUrl({
-          namespaceId: currentNamespaceId,
-        })}/control`,
+        links: this.getLinks(newNamespaceId, currentNamespaceId),
       },
     });
   }
+
+  isNamespacedServiceAccountsEnabled() {
+    return (
+      window.CDAP_CONFIG.featureFlags['feature.namespaced.service.accounts.enabled'] === 'true'
+    );
+  }
+
+  getLinks(newNamespaceId, currentNamespaceId) {
+    let links = [];
+    if (this.isNamespacedServiceAccountsEnabled()) {
+      links.push({
+        linkLabel: T.translate(`${PREFIX}.callToActionAddServiceAccounts`, {
+          namespaceId: newNamespaceId,
+        }),
+        linkUrl: `${window.getAbsUIUrl({
+          namespaceId: newNamespaceId,
+        })}/details/serviceaccounts`,
+      });
+    }
+    links.push(this.getHomePageLinkObject(currentNamespaceId));
+    return links;
+  }
+
+  getHomePageLinkObject(currentNamespaceId) {
+    return {
+      linkLabel: T.translate('features.Wizard.GoToHomePage'),
+      linkUrl: `${window.getAbsUIUrl({
+        namespaceId: currentNamespaceId,
+      })}/control`,
+    };
+  }
+
   render() {
     return (
       <div>

diff --git a/app/cdap/text/text-en.yaml b/app/cdap/text/text-en.yaml
@@ -3321,6 +3321,7 @@ features:
     title: Warning
   Wizard:
     Add-Namespace:
+      callToActionAddServiceAccounts: Add service account to '{namespaceId}'
       callToAction:
         primary: Switch to '{namespaceId}'
       headerlabel: Add namespace