Add cluster info to toasts, adds cluster info to URL

.github/workflows/cypress-test-multidatasources-enabled-e2e.yml

@@ -123,4 +123,4 @@ jobs:
         uses: ./.github/actions/run-cypress-tests
         with:
           dashboards_config_file: opensearch_dashboards_multidatasources.yml
-          yarn_command: 'yarn cypress:run --browser chrome --headed --env LOGIN_AS_ADMIN=true --spec "test/cypress/e2e/multi-datasources/multi_datasources_enabled.spec.js"'
+          yarn_command: 'yarn cypress:run --browser chrome --env LOGIN_AS_ADMIN=true --spec "test/cypress/e2e/multi-datasources/multi_datasources_enabled.spec.js"'

.github/workflows/integration-test.yml

@@ -6,7 +6,7 @@ env:
   TEST_BROWSER_HEADLESS: 1
   CI: 1
   PLUGIN_NAME: opensearch-security
-  OPENSEARCH_INITIAL_ADMIN_PASSWORD: myStrongPassword123!
+  OPENSEARCH_INITIAL_ADMIN_PASSWORD: admin
 
 jobs:
   tests:

public/apps/configuration/app-router.tsx

@@ -17,7 +17,7 @@ import { EuiBreadcrumb, EuiPage, EuiPageBody, EuiPageSideBar } from '@elastic/eu
 import { flow, partial } from 'lodash';
 import React, { createContext, useState } from 'react';
 import { HashRouter as Router, Route, Switch, Redirect } from 'react-router-dom';
-import { DataSourceOption } from '../../../../../src/plugins/data_source_management/public/components/data_source_selector/data_source_selector';
+import { DataSourceOption } from 'src/plugins/data_source_management/public/components/data_source_menu/types';
 import { AppDependencies } from '../types';
 import { AuditLogging } from './panels/audit-logging/audit-logging';
 import { AuditLoggingEditSettings } from './panels/audit-logging/audit-logging-edit-settings';
@@ -41,6 +41,7 @@ import { Action, RouteItem, SubAction } from './types';
 import { ResourceType } from '../../../common';
 import { buildHashUrl, buildUrl } from './utils/url-builder';
 import { CrossPageToast } from './cross-page-toast';
+import { getDataSourceFromUrl } from '../../utils/datasource-utils';
 
 const LANDING_PAGE_URL = '/getstarted';
 
@@ -155,7 +156,9 @@ export const DataSourceContext = createContext<DataSourceContextType | null>(nul
 
 export function AppRouter(props: AppDependencies) {
   const setGlobalBreadcrumbs = flow(getBreadcrumbs, props.coreStart.chrome.setBreadcrumbs);
-  const [dataSource, setDataSource] = useState<DataSourceOption>(LocalCluster);
+  const dataSourceFromUrl = getDataSourceFromUrl();
+
+  const [dataSource, setDataSource] = useState<DataSourceOption>(dataSourceFromUrl);
 
   return (
     <DataSourceContext.Provider value={{ dataSource, setDataSource }}>

public/apps/configuration/panels/audit-logging/test/__snapshots__/audit-logging.test.tsx.snap

@@ -241,7 +241,7 @@ exports[`Audit logs render when AuditLoggingSettings.enabled is true 1`] = `
 <div
   className="panel-restrict-width"
 >
-  <SecurityPluginTopNavMenu
+  <Memo()
     coreStart={
       Object {
         "http": 1,

public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx

@@ -75,6 +75,7 @@ export function InternalUserEdit(props: InternalUserEditDeps) {
   const [toasts, addToast, removeToast] = useToastState();
 
   const [isFormValid, setIsFormValid] = useState<boolean>(true);
+  const dataSourceEnabled = !!props.depsStart.dataSource?.dataSourceEnabled;
   const { dataSource, setDataSource } = useContext(DataSourceContext)!;
 
   React.useEffect(() => {
@@ -135,7 +136,13 @@ export function InternalUserEdit(props: InternalUserEditDeps) {
       setCrossPageToast(buildUrl(ResourceType.users), {
         id: 'updateUserSucceeded',
         color: 'success',
-        title: getSuccessToastMessage('User', props.action, userName),
+        title: `${getSuccessToastMessage(
+          'User',
+          props.action,
+          userName,
+          dataSourceEnabled,
+          dataSource
+        )}`,
       });
       // Redirect to user listing
       window.location.href = buildHashUrl(ResourceType.users);

public/apps/configuration/panels/internal-user-edit/test/internal-user-edit.test.tsx

@@ -56,7 +56,7 @@ describe('Internal user edit', () => {
         sourceUserName={sampleUsername}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -77,7 +77,7 @@ describe('Internal user edit', () => {
         sourceUserName={sampleUsername}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -98,7 +98,7 @@ describe('Internal user edit', () => {
         sourceUserName={sampleUsername}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -118,7 +118,7 @@ describe('Internal user edit', () => {
         sourceUserName={sampleUsername}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -140,7 +140,7 @@ describe('Internal user edit', () => {
         sourceUserName={sampleUsername}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />

public/apps/configuration/panels/permission-list/permission-list.tsx

@@ -192,6 +192,7 @@ export function PermissionList(props: AppDependencies) {
   const [selection, setSelection] = React.useState<PermissionListingItem[]>([]);
   const [itemIdToExpandedRowMap, setItemIdToExpandedRowMap] = useState<ExpandedRowMapInterface>({});
 
+  const dataSourceEnabled = !!props.depsStart.dataSource?.dataSourceEnabled;
   const { dataSource, setDataSource } = useContext(DataSourceContext)!;
 
   // Modal state
@@ -305,7 +306,13 @@ export function PermissionList(props: AppDependencies) {
             fetchData();
             addToast({
               id: 'saveSucceeded',
-              title: getSuccessToastMessage('Action group', action, groupName),
+              title: `${getSuccessToastMessage(
+                'Action group',
+                action,
+                groupName,
+                dataSourceEnabled,
+                dataSource
+              )}`,
               color: 'success',
             });
           } catch (e) {

public/apps/configuration/panels/permission-list/test/permission-list.test.tsx

@@ -109,7 +109,7 @@ describe('Permission list page ', () => {
       const component = shallow(
         <PermissionList
           coreStart={{} as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -123,7 +123,7 @@ describe('Permission list page ', () => {
       shallow(
         <PermissionList
           coreStart={mockCoreStart as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -145,7 +145,7 @@ describe('Permission list page ', () => {
       shallow(
         <PermissionList
           coreStart={{} as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -159,7 +159,7 @@ describe('Permission list page ', () => {
       const component = shallow(
         <PermissionList
           coreStart={mockCoreStart as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -186,7 +186,7 @@ describe('Permission list page ', () => {
       const component = shallow(
         <PermissionList
           coreStart={{} as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -203,7 +203,7 @@ describe('Permission list page ', () => {
       shallow(
         <PermissionList
           coreStart={mockCoreStart as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />
@@ -223,7 +223,7 @@ describe('Permission list page ', () => {
       const component = shallow(
         <PermissionList
           coreStart={{} as any}
-          navigation={{} as any}
+          depsStart={{} as any}
           params={{} as any}
           config={{} as any}
         />

public/apps/configuration/panels/role-edit/role-edit.tsx

@@ -89,6 +89,7 @@ export function RoleEdit(props: RoleEditDeps) {
 
   const [isFormValid, setIsFormValid] = useState<boolean>(true);
 
+  const dataSourceEnabled = !!props.depsStart.dataSource?.dataSourceEnabled;
   const { dataSource, setDataSource } = useContext(DataSourceContext)!;
 
   React.useEffect(() => {
@@ -174,7 +175,13 @@ export function RoleEdit(props: RoleEditDeps) {
       setCrossPageToast(buildUrl(ResourceType.roles, Action.view, roleName), {
         id: 'updateRoleSucceeded',
         color: 'success',
-        title: getSuccessToastMessage('Role', props.action, roleName),
+        title: `${getSuccessToastMessage(
+          'Role',
+          props.action,
+          roleName,
+          dataSourceEnabled,
+          dataSource
+        )}`,
       });
       // Redirect to role view
       window.location.href = buildHashUrl(ResourceType.roles, Action.view, roleName);

public/apps/configuration/panels/role-edit/test/role-edit.test.tsx

@@ -63,7 +63,7 @@ describe('Role edit', () => {
         sourceRoleName={sampleSourceRole}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -89,7 +89,7 @@ describe('Role edit', () => {
         sourceRoleName={sampleSourceRole}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -112,7 +112,7 @@ describe('Role edit', () => {
         sourceRoleName={sampleSourceRole}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />

public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx

@@ -45,7 +45,7 @@ import { setCrossPageToast } from '../../utils/storage-utils';
 import { ExternalLink } from '../../utils/display-utils';
 import { SecurityPluginTopNavMenu } from '../../top-nav-menu';
 import { DataSourceContext } from '../../app-router';
-import { createDataSourceQuery } from '../../../../utils/datasource-utils';
+import { createDataSourceQuery, getClusterInfoIfEnabled } from '../../../../utils/datasource-utils';
 
 interface RoleEditMappedUserProps extends BreadcrumbsPageDependencies {
   roleName: string;
@@ -63,6 +63,7 @@ export function RoleEditMappedUser(props: RoleEditMappedUserProps) {
   const [userNames, setUserNames] = useState<string[]>([]);
   const [hosts, setHosts] = React.useState<string[]>([]);
   const [toasts, addToast, removeToast] = useToastState();
+  const dataSourceEnabled = !!props.depsStart.dataSource?.dataSourceEnabled;
   const { dataSource, setDataSource } = useContext(DataSourceContext)!;
 
   React.useEffect(() => {
@@ -130,7 +131,10 @@ export function RoleEditMappedUser(props: RoleEditMappedUserProps) {
         {
           id: 'updateRoleMappingSucceeded',
           color: 'success',
-          title: 'Role "' + props.roleName + '" successfully updated.',
+          title: `Role "${props.roleName}" successfully updated ${getClusterInfoIfEnabled(
+            dataSourceEnabled,
+            dataSource
+          )}`,
         }
       );
       window.location.href = buildHashUrl(

public/apps/configuration/panels/role-mapping/test/role-edit-mapped-user.test.tsx

@@ -56,7 +56,7 @@ describe('Role mapping edit', () => {
         roleName={sampleRole}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -81,7 +81,7 @@ describe('Role mapping edit', () => {
         roleName={sampleRole}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -102,7 +102,7 @@ describe('Role mapping edit', () => {
         roleName={sampleRole}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />
@@ -135,7 +135,7 @@ describe('Role mapping edit', () => {
         roleName={sampleRole}
         buildBreadcrumbs={buildBreadcrumbs}
         coreStart={mockCoreStart as any}
-        navigation={{} as any}
+        depsStart={{} as any}
         params={{} as any}
         config={{} as any}
       />

public/apps/configuration/panels/role-view/role-view.tsx

@@ -72,7 +72,7 @@ import { requestDeleteRoles } from '../../utils/role-list-utils';
 import { setCrossPageToast } from '../../utils/storage-utils';
 import { DataSourceContext } from '../../app-router';
 import { SecurityPluginTopNavMenu } from '../../top-nav-menu';
-import { createDataSourceQuery } from '../../../../utils/datasource-utils';
+import { createDataSourceQuery, getClusterInfoIfEnabled } from '../../../../utils/datasource-utils';
 
 interface RoleViewProps extends BreadcrumbsPageDependencies {
   roleName: string;
@@ -111,6 +111,7 @@ export function RoleView(props: RoleViewProps) {
   const [toasts, addToast, removeToast] = useToastState();
   const [isReserved, setIsReserved] = React.useState(false);
   const [loading, setLoading] = React.useState(false);
+  const dataSourceEnabled = !!props.depsStart.dataSource?.dataSourceEnabled;
   const { dataSource, setDataSource } = useContext(DataSourceContext)!;
 
   const PERMISSIONS_TAB_INDEX = 0;
@@ -378,7 +379,10 @@ export function RoleView(props: RoleViewProps) {
           setCrossPageToast(buildUrl(ResourceType.roles), {
             id: 'deleteRole',
             color: 'success',
-            title: props.roleName + ' deleted.',
+            title: `${props.roleName} deleted ${getClusterInfoIfEnabled(
+              dataSourceEnabled,
+              dataSource
+            )}`,
           });
           window.location.href = buildHashUrl(ResourceType.roles);
         } catch (e) {

public/apps/configuration/panels/role-view/test/__snapshots__/role-view.test.tsx.snap

@@ -2,7 +2,7 @@
 
 exports[`Role view basic rendering when permission tab is selected 1`] = `
 <Fragment>
-  <SecurityPluginTopNavMenu
+  <Memo()
     buildBreadcrumbs={
       [MockFunction] {
         "calls": Array [
@@ -25,7 +25,7 @@ exports[`Role view basic rendering when permission tab is selected 1`] = `
       }
     }
     dataSourcePickerReadOnly={true}
-    navigation={Object {}}
+    depsStart={Object {}}
     params={Object {}}
     prevAction=""
     roleName="role"
@@ -327,7 +327,7 @@ exports[`Role view basic rendering when permission tab is selected 1`] = `
 
 exports[`Role view renders when mapped user tab is selected 1`] = `
 <Fragment>
-  <SecurityPluginTopNavMenu
+  <Memo()
     buildBreadcrumbs={
       [MockFunction] {
         "calls": Array [
@@ -350,7 +350,7 @@ exports[`Role view renders when mapped user tab is selected 1`] = `
       }
     }
     dataSourcePickerReadOnly={true}
-    navigation={Object {}}
+    depsStart={Object {}}
     params={Object {}}
     prevAction="mapuser"
     roleName="role"