Fix paths and update tests

Signed-off-by: Derek Ho <[email protected]>
derek-ho · May 16, 2024 · 428e0a4 · 428e0a4
1 parent fd09f20
commit 428e0a4
Show file tree

Hide file tree

Showing 6 changed files with 169 additions and 88 deletions.
diff --git a/public/apps/configuration/app-router.tsx b/public/apps/configuration/app-router.tsx
@@ -70,6 +70,10 @@ const ROUTE_MAP: { [key: string]: RouteItem } = {
     name: 'Tenants',
     href: buildUrl(ResourceType.tenants),
   },
+  [ResourceType.tenantsConfigureTab]: {
+    name: '',
+    href: buildUrl(ResourceType.tenantsConfigureTab),
+  },
   [ResourceType.auth]: {
     name: 'Authentication',
     href: buildUrl(ResourceType.auth),
@@ -90,10 +94,11 @@ const getRouteList = (multitenancyEnabled: boolean) => {
     ROUTE_MAP[ResourceType.permissions],
     ...(multitenancyEnabled ? [ROUTE_MAP[ResourceType.tenants]] : []),
     ROUTE_MAP[ResourceType.auditLogging],
+    ...(multitenancyEnabled ? [ROUTE_MAP[ResourceType.tenantsConfigureTab]] : []),
   ];
 };
 
-const allNavPanelUrls = (multitenancyEnabled: boolean) =>
+export const allNavPanelUrls = (multitenancyEnabled: boolean) =>
   getRouteList(multitenancyEnabled)
     .map((route) => route.href)
     .concat([
@@ -161,13 +166,22 @@ export function AppRouter(props: AppDependencies) {
   function getTenancyRoutes() {
     if (multitenancyEnabled) {
       return (
-        <Route
-          path={ROUTE_MAP.tenants.href}
-          render={() => {
-            setGlobalBreadcrumbs(ResourceType.tenants);
-            return <TenantList tabID={'Manage'} {...props} />;
-          }}
-        />
+        <>
+          <Route
+            path={ROUTE_MAP.tenants.href}
+            render={() => {
+              setGlobalBreadcrumbs(ResourceType.tenants);
+              return <TenantList tabID={'Manage'} {...props} />;
+            }}
+          />
+          <Route
+            path={ROUTE_MAP.tenantsConfigureTab.href}
+            render={() => {
+              setGlobalBreadcrumbs(ResourceType.tenants);
+              return <TenantList tabID={'Configure'} {...props} />;
+            }}
+          />
+        </>
       );
     }
     return null;
@@ -279,14 +293,14 @@ export function AppRouter(props: AppDependencies) {
                   return <PermissionList {...props} />;
                 }}
               />
-              {getTenancyRoutes()}
               <Route
                 path={ROUTE_MAP.getStarted.href}
                 render={() => {
                   setGlobalBreadcrumbs();
                   return <GetStarted {...props} />;
                 }}
               />
+              {getTenancyRoutes()}
               <Redirect exact from="/" to={LANDING_PAGE_URL} />
             </Switch>
           </EuiPageBody>

diff --git a/public/apps/configuration/panels/get-started.tsx b/public/apps/configuration/panels/get-started.tsx
@@ -276,39 +276,41 @@ export function GetStarted(props: AppDependencies) {
 
         <EuiSpacer size="l" />
 
-        <EuiPanel paddingSize="l">
-          <EuiTitle size="s">
-            <h3>Optional: Multi-tenancy</h3>
-          </EuiTitle>
-          <EuiText size="s" color="subdued">
-            <p>
-              By default tenancy is activated in Dashboards. Tenants in OpenSearch Dashboards are
-              spaces for saving index patterns, visualizations, dashboards, and other OpenSearch
-              Dashboards objects.
-            </p>
-            <EuiFlexGroup gutterSize="s">
-              <EuiFlexItem grow={false}>
-                <EuiButton
-                  fill
-                  onClick={() => {
-                    window.location.href = buildHashUrl(ResourceType.tenants);
-                  }}
-                >
-                  Manage Multi-tenancy
-                </EuiButton>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiButton
-                  onClick={() => {
-                    window.location.href = buildHashUrl(ResourceType.tenantsConfigureTab);
-                  }}
-                >
-                  Configure Multi-tenancy
-                </EuiButton>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiText>
-        </EuiPanel>
+        {props.config.multitenancy.enabled ? (
+          <EuiPanel paddingSize="l">
+            <EuiTitle size="s">
+              <h3>Optional: Multi-tenancy</h3>
+            </EuiTitle>
+            <EuiText size="s" color="subdued">
+              <p>
+                By default tenancy is activated in Dashboards. Tenants in OpenSearch Dashboards are
+                spaces for saving index patterns, visualizations, dashboards, and other OpenSearch
+                Dashboards objects.
+              </p>
+              <EuiFlexGroup gutterSize="s">
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    fill
+                    onClick={() => {
+                      window.location.href = buildHashUrl(ResourceType.tenants);
+                    }}
+                  >
+                    Manage Multi-tenancy
+                  </EuiButton>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    onClick={() => {
+                      window.location.href = buildHashUrl(ResourceType.tenantsConfigureTab);
+                    }}
+                  >
+                    Configure Multi-tenancy
+                  </EuiButton>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiText>
+          </EuiPanel>
+        ) : null}
       </div>
       <EuiGlobalToastList toasts={toasts} toastLifeTimeMs={10000} dismissToast={removeToast} />
     </>

diff --git a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap
@@ -8,6 +8,9 @@ exports[`Get started (landing page) renders when backend configuration is disabl
     <Memo()
       config={
         Object {
+          "multitenancy": Object {
+            "enabled": true,
+          },
           "ui": Object {
             "backend_configurable": false,
           },
@@ -284,6 +287,9 @@ exports[`Get started (landing page) renders when backend configuration is enable
     <Memo()
       config={
         Object {
+          "multitenancy": Object {
+            "enabled": true,
+          },
           "ui": Object {
             "backend_configurable": true,
           },

diff --git a/public/apps/configuration/panels/test/get-started.test.tsx b/public/apps/configuration/panels/test/get-started.test.tsx
@@ -43,6 +43,9 @@ describe('Get started (landing page)', () => {
     ui: {
       backend_configurable: true,
     },
+    multitenancy: {
+      enabled: true,
+    },
   };
 
   it('renders when backend configuration is enabled', () => {
@@ -62,6 +65,9 @@ describe('Get started (landing page)', () => {
       ui: {
         backend_configurable: false,
       },
+      multitenancy: {
+        enabled: true,
+      },
     };
     const component = shallow(
       <GetStarted

diff --git a/public/apps/configuration/test/__snapshots__/app-router.test.tsx.snap b/public/apps/configuration/test/__snapshots__/app-router.test.tsx.snap
@@ -57,6 +57,10 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
               ]
             }
           />
@@ -103,6 +107,10 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
               ]
             }
           />
@@ -149,6 +157,10 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
               ]
             }
           />
@@ -195,6 +207,10 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
               ]
             }
           />
@@ -241,6 +257,10 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
               ]
             }
           />
@@ -287,6 +307,10 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
               ]
             }
           />
@@ -333,6 +357,10 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
               ]
             }
           />
@@ -379,6 +407,60 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
+              ]
+            }
+          />
+        </EuiPageSideBar>
+      </Route>
+      <Route
+        exact={true}
+        key="/tenantsConfigureTab"
+        path="/tenantsConfigureTab"
+      >
+        <EuiPageSideBar>
+          <NavPanel
+            items={
+              Array [
+                Object {
+                  "href": "/getstarted",
+                  "name": "Get Started",
+                },
+                Object {
+                  "href": "/auth",
+                  "name": "Authentication",
+                },
+                Object {
+                  "href": "/roles",
+                  "name": "Roles",
+                },
+                Object {
+                  "href": "/users",
+                  "name": "Internal users",
+                },
+                Object {
+                  "href": "/serviceAccounts",
+                  "name": "Service Accounts",
+                },
+                Object {
+                  "href": "/permissions",
+                  "name": "Permissions",
+                },
+                Object {
+                  "href": "/tenants",
+                  "name": "Tenants",
+                },
+                Object {
+                  "href": "/auditLogging",
+                  "name": "Audit logs",
+                },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
               ]
             }
           />
@@ -425,6 +507,10 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
               ]
             }
           />
@@ -471,6 +557,10 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
                   "href": "/auditLogging",
                   "name": "Audit logs",
                 },
+                Object {
+                  "href": "/tenantsConfigureTab",
+                  "name": "",
+                },
               ]
             }
           />
@@ -526,12 +616,16 @@ exports[`SecurityPluginTopNavMenu renders DataSourceMenu when dataSource is enab
             path="/permissions"
             render={[Function]}
           />
+          <Route
+            path="/getstarted"
+            render={[Function]}
+          />
           <Route
             path="/tenants"
             render={[Function]}
           />
           <Route
-            path="/getstarted"
+            path="/tenantsConfigureTab"
             render={[Function]}
           />
           <Redirect