Address PR feedback

Signed-off-by: Derek Ho <dxho@amazon.com>
opensearch-project · Aug 19, 2024 · 442f525 · 442f525
1 parent 8c4d56e
commit 442f525
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 98 deletions.
diff --git a/public/apps/configuration/app-router.tsx b/public/apps/configuration/app-router.tsx
@@ -48,27 +48,27 @@ const LANDING_PAGE_URL = '/getstarted';
 export const ROUTE_MAP: { [key: string]: RouteItem } = {
   getStarted: {
     name: 'Get Started',
-    displayNameWithoutSecurityBase: 'Get started with access control',
+    breadCrumbDisplayNameWithoutSecurityBase: 'Get started with access control',
     href: LANDING_PAGE_URL,
   },
   [ResourceType.roles]: {
     name: 'Roles',
-    displayNameWithoutSecurityBase: 'Roles',
+    breadCrumbDisplayNameWithoutSecurityBase: 'Roles',
     href: buildUrl(ResourceType.roles),
   },
   [ResourceType.users]: {
     name: 'Internal users',
-    displayNameWithoutSecurityBase: 'Internal users',
+    breadCrumbDisplayNameWithoutSecurityBase: 'Internal users',
     href: buildUrl(ResourceType.users),
   },
   [ResourceType.permissions]: {
     name: 'Permissions',
-    displayNameWithoutSecurityBase: 'Permissions',
+    breadCrumbDisplayNameWithoutSecurityBase: 'Permissions',
     href: buildUrl(ResourceType.permissions),
   },
   [ResourceType.tenants]: {
     name: 'Tenants',
-    displayNameWithoutSecurityBase: 'Dashboard multi-tenancy',
+    breadCrumbDisplayNameWithoutSecurityBase: 'Dashboard multi-tenancy',
     href: buildUrl(ResourceType.tenants),
   },
   [ResourceType.tenantsConfigureTab]: {
@@ -77,12 +77,12 @@ export const ROUTE_MAP: { [key: string]: RouteItem } = {
   },
   [ResourceType.auth]: {
     name: 'Authentication',
-    displayNameWithoutSecurityBase: 'Authentication and authorization',
+    breadCrumbDisplayNameWithoutSecurityBase: 'Authentication and authorization',
     href: buildUrl(ResourceType.auth),
   },
   [ResourceType.auditLogging]: {
     name: 'Audit logs',
-    displayNameWithoutSecurityBase: 'Audit logs',
+    breadCrumbDisplayNameWithoutSecurityBase: 'Audit logs',
     href: buildUrl(ResourceType.auditLogging),
   },
 };

diff --git a/public/apps/configuration/header/header-components.tsx b/public/apps/configuration/header/header-components.tsx
@@ -18,16 +18,13 @@ import { flow } from 'lodash';
 import { ControlProps, DescriptionProps, HeaderProps } from './header-props';
 import { getBreadcrumbs } from '../utils/resource-utils';
 
-// controlType should be one of: https://github.com/AMoo-Miki/OpenSearch-Dashboards/blob/header-collective/src/plugins/navigation/public/top_nav_menu/top_nav_control_data.tsx#L91
-
-export const HeaderButtonOrLink = React.memo((props: ControlProps) => {
+export const HeaderButtonOrLink = React.memo((props: HeaderProps & ControlProps) => {
   const { HeaderControl } = props.navigation.ui;
 
   return (
     <HeaderControl
-      setMountPoint={props.application.setAppRightControls}
-      controls={props.controls}
-      className={props.className}
+      setMountPoint={props.coreStart.application.setAppRightControls}
+      controls={props.appRightControls}
     />
   );
 });
@@ -51,10 +48,10 @@ export const PageHeader = (props: HeaderProps & DescriptionProps & ControlProps)
             controls={props.descriptionControls}
           />
         ) : null}
-        {props.controlControls ? (
+        {props.appRightControls ? (
           <HeaderControl
             setMountPoint={props.coreStart.application.setAppRightControls}
-            controls={props.controlControls}
+            controls={props.appRightControls}
           />
         ) : null}
       </>

diff --git a/public/apps/configuration/header/header-props.tsx b/public/apps/configuration/header/header-props.tsx
@@ -29,7 +29,7 @@ export interface HeaderProps {
 }
 
 export interface ControlProps {
-  controlControls?: TopNavControlData[];
+  appRightControls?: TopNavControlData[];
 }
 
 export interface DescriptionProps {

diff --git a/public/apps/configuration/header/test/header-components.test.tsx b/public/apps/configuration/header/test/header-components.test.tsx
@@ -86,6 +86,7 @@ describe('PageHeader', () => {
       5
     );
     expect(wrapper.contains(props.fallBackComponent)).toBe(false);
+    // Verifies that the HeaderControl is called with both controls passed as props
     expect(props.navigation.ui.HeaderControl.mock.calls[0][0].controls).toEqual(['control-1']);
     expect(props.navigation.ui.HeaderControl.mock.calls[1][0].controls).toEqual(['control-2']);
   });

diff --git a/public/apps/configuration/panels/auth-view/auth-view.tsx b/public/apps/configuration/panels/auth-view/auth-view.tsx
@@ -115,7 +115,7 @@ export function AuthView(props: AppDependencies) {
       <PageHeader
         navigation={props.depsStart.navigation}
         coreStart={props.coreStart}
-        controlControls={buttonData}
+        appRightControls={buttonData}
         fallBackComponent={
           <EuiPageHeader>
             <EuiTitle size="l">

diff --git a/public/apps/configuration/panels/get-started.tsx b/public/apps/configuration/panels/get-started.tsx
@@ -197,7 +197,7 @@ export function GetStarted(props: AppDependencies) {
         <PageHeader
           navigation={props.depsStart.navigation}
           coreStart={props.coreStart}
-          controlControls={buttonData}
+          appRightControls={buttonData}
           fallBackComponent={
             <EuiPageHeader>
               <EuiTitle size="l">

diff --git a/public/apps/configuration/panels/permission-list/permission-list.tsx b/public/apps/configuration/panels/permission-list/permission-list.tsx
@@ -402,7 +402,7 @@ export function PermissionList(props: AppDependencies) {
         navigation={props.depsStart.navigation}
         coreStart={props.coreStart}
         descriptionControls={descriptionData}
-        controlControls={buttonData}
+        appRightControls={buttonData}
         fallBackComponent={
           <EuiPageHeader>
             <EuiTitle size="l">

diff --git a/public/apps/configuration/panels/role-list.tsx b/public/apps/configuration/panels/role-list.tsx
@@ -305,7 +305,7 @@ export function RoleList(props: AppDependencies) {
         navigation={props.depsStart.navigation}
         coreStart={props.coreStart}
         descriptionControls={descriptionData}
-        controlControls={buttonData}
+        appRightControls={buttonData}
         fallBackComponent={
           <EuiPageHeader>
             <EuiTitle size="l">

diff --git a/public/apps/configuration/panels/role-view/role-view.tsx b/public/apps/configuration/panels/role-view/role-view.tsx
@@ -455,7 +455,7 @@ export function RoleView(props: RoleViewProps) {
       <PageHeader
         navigation={props.depsStart.navigation}
         coreStart={props.coreStart}
-        controlControls={roleView}
+        appRightControls={roleView}
         fallBackComponent={
           <>
             <EuiPageContentHeader>

diff --git a/public/apps/configuration/panels/tenant-list/manage_tab.tsx b/public/apps/configuration/panels/tenant-list/manage_tab.tsx
@@ -543,9 +543,11 @@ export function ManageTab(props: AppDependencies) {
               <EuiFlexItem>{actionsMenu}</EuiFlexItem>
               { useUpdatedUX ? 
                 <HeaderButtonOrLink
-                  navigation={props.depsStart.navigation}
-                  controls={createTenantButton}
-                  application={props.coreStart.application}
+
+                navigation={props.depsStart.navigation}
+          coreStart={props.coreStart}
+                  appRightControls={createTenantButton}
+
                 />
               : 
               <EuiFlexItem>

diff --git a/public/apps/configuration/panels/user-list.tsx b/public/apps/configuration/panels/user-list.tsx
@@ -247,7 +247,7 @@ export function UserList(props: AppDependencies) {
         navigation={props.depsStart.navigation}
         coreStart={props.coreStart}
         descriptionControls={descriptionData}
-        controlControls={buttonData}
+        appRightControls={buttonData}
         fallBackComponent={
           <EuiPageHeader>
             <EuiTitle size="l">