From 744888144bdac081cde7de3f67b13fab79d6f004 Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Wed, 21 Aug 2024 14:51:08 -0700 Subject: [PATCH 01/11] Look&Feel Modal Changes Signed-off-by: Dan Dong --- public/apps/account/password-reset-panel.tsx | 8 +++--- public/apps/account/role-info-panel.tsx | 21 +++++++-------- public/apps/account/tenant-switch-panel.tsx | 7 +++-- .../configuration/panels/expression-modal.tsx | 7 ++++- .../panels/permission-list/edit-modal.tsx | 7 ++++- .../panels/tenant-list/edit-modal.tsx | 7 ++++- .../panels/tenant-list/save_changes_modal.tsx | 27 +++++++++++-------- .../utils/delete-confirm-modal-utils.tsx | 6 +++-- 8 files changed, 55 insertions(+), 35 deletions(-) diff --git a/public/apps/account/password-reset-panel.tsx b/public/apps/account/password-reset-panel.tsx index 5ca0f44dd..a35b2b466 100644 --- a/public/apps/account/password-reset-panel.tsx +++ b/public/apps/account/password-reset-panel.tsx @@ -27,7 +27,7 @@ import { EuiModalFooter, EuiOverlayMask, EuiSpacer, - EuiTitle, + EuiText, } from '@elastic/eui'; import { CoreStart } from 'opensearch-dashboards/public'; import { FormRow } from '../configuration/utils/form-row'; @@ -104,9 +104,9 @@ export function PasswordResetPanel(props: PasswordResetPanelProps) { - -

Reset password for "{props.username}"

- + +

Reset password for "{props.username}"

+ diff --git a/public/apps/account/role-info-panel.tsx b/public/apps/account/role-info-panel.tsx index ce19c8188..2ba848655 100644 --- a/public/apps/account/role-info-panel.tsx +++ b/public/apps/account/role-info-panel.tsx @@ -17,7 +17,6 @@ import { EuiModalBody, EuiOverlayMask, EuiText, - EuiTitle, EuiHorizontalRule, EuiSpacer, } from '@elastic/eui'; @@ -48,29 +47,29 @@ export function RoleInfoPanel(props: { coreStart: CoreStart; handleClose: () => - -

Roles ({roles.length})

- - + +

Roles ({roles.length})

+ + Roles you are currently mapped to by your administrator. {roles.map((item) => ( - + {item}
))} - -

Backend roles ({backendRoles.length})

- - + +

Backend roles ({backendRoles.length})

+ + Backend roles you are currently mapped to by your administrator. {backendRoles.map((item) => ( - + {item}
diff --git a/public/apps/account/tenant-switch-panel.tsx b/public/apps/account/tenant-switch-panel.tsx index cff48b27e..103c7a845 100755 --- a/public/apps/account/tenant-switch-panel.tsx +++ b/public/apps/account/tenant-switch-panel.tsx @@ -26,7 +26,6 @@ import { EuiCompressedRadioGroup, EuiSpacer, EuiText, - EuiTitle, } from '@elastic/eui'; import { CoreStart } from 'opensearch-dashboards/public'; import { keys } from 'lodash'; @@ -286,9 +285,9 @@ export function TenantSwitchPanel(props: TenantSwitchPanelProps) { - -

Select your tenant

- + +

Select your tenant

+ diff --git a/public/apps/configuration/panels/expression-modal.tsx b/public/apps/configuration/panels/expression-modal.tsx index 1f501612a..8d47cb7fe 100644 --- a/public/apps/configuration/panels/expression-modal.tsx +++ b/public/apps/configuration/panels/expression-modal.tsx @@ -22,6 +22,7 @@ import { EuiModalHeader, EuiModalHeaderTitle, EuiOverlayMask, + EuiText, } from '@elastic/eui'; export function ExpressionModal(props: { title: string; expression: object }) { @@ -38,7 +39,11 @@ export function ExpressionModal(props: { title: string; expression: object }) { - {props.title} + + +

{props.title}

+ + diff --git a/public/apps/configuration/panels/permission-list/edit-modal.tsx b/public/apps/configuration/panels/permission-list/edit-modal.tsx index 1086dc982..d39f39fa1 100644 --- a/public/apps/configuration/panels/permission-list/edit-modal.tsx +++ b/public/apps/configuration/panels/permission-list/edit-modal.tsx @@ -24,6 +24,7 @@ import { EuiOverlayMask, EuiForm, EuiCompressedComboBox, + EuiText, } from '@elastic/eui'; import React, { useState } from 'react'; import { ComboBoxOptions, Action } from '../../types'; @@ -61,7 +62,11 @@ export function PermissionEditModal(props: PermissionEditModalDeps) { - {TITLE_DICT[props.action]} + + +

{TITLE_DICT[props.action]}

+ + diff --git a/public/apps/configuration/panels/tenant-list/edit-modal.tsx b/public/apps/configuration/panels/tenant-list/edit-modal.tsx index eb7a244a2..8605e372d 100644 --- a/public/apps/configuration/panels/tenant-list/edit-modal.tsx +++ b/public/apps/configuration/panels/tenant-list/edit-modal.tsx @@ -25,6 +25,7 @@ import { EuiForm, EuiCompressedTextArea, EuiHorizontalRule, + EuiText, } from '@elastic/eui'; import React, { useState } from 'react'; import { Action } from '../../types'; @@ -59,7 +60,11 @@ export function TenantEditModal(props: TenantEditModalDeps) { - {TITLE_DICT[props.action]} + + +

{TITLE_DICT[props.action]}

+ + diff --git a/public/apps/configuration/panels/tenant-list/save_changes_modal.tsx b/public/apps/configuration/panels/tenant-list/save_changes_modal.tsx index 8395f4dfb..7ce35bb38 100644 --- a/public/apps/configuration/panels/tenant-list/save_changes_modal.tsx +++ b/public/apps/configuration/panels/tenant-list/save_changes_modal.tsx @@ -18,6 +18,7 @@ import { EuiHorizontalRule, EuiCompressedCheckbox, EuiConfirmModal, + EuiText, } from '@elastic/eui'; import React from 'react'; import { ExternalLink } from '../../utils/display-utils'; @@ -55,12 +56,14 @@ export function SaveChangesModalGenerator(props: SaveChangesModalDeps) { confirmButtonText="Change Default Tenant" defaultFocusedButton="confirm" > -

- Users will load into {props.updatedTenancyConfig.default_tenant} tenant when they log into - Dashboards if they have the appropriate permissions. If users don’t have permissions to a - custom tenant they will load into the global tenant.{' '} - -

+ +

+ Users will load into {props.updatedTenancyConfig.default_tenant} tenant when they log + into Dashboards if they have the appropriate permissions. If users don’t have + permissions to a custom tenant they will load into the global tenant.{' '} + +

+ ); return globalDefaultModal; @@ -168,11 +171,13 @@ export function SaveChangesModalGenerator(props: SaveChangesModalDeps) { ) } > -

- The changes you are about to make can break large portions of OpenSearch Dashboards. You - might be able to revert some of these changes.{' '} - -

+ +

+ The changes you are about to make can break large portions of OpenSearch Dashboards. You + might be able to revert some of these changes.{' '} + +

+ diff --git a/public/apps/configuration/utils/delete-confirm-modal-utils.tsx b/public/apps/configuration/utils/delete-confirm-modal-utils.tsx index ec0c5ee0d..fffd202ca 100644 --- a/public/apps/configuration/utils/delete-confirm-modal-utils.tsx +++ b/public/apps/configuration/utils/delete-confirm-modal-utils.tsx @@ -14,7 +14,7 @@ */ import React, { useState } from 'react'; -import { EuiOverlayMask, EuiConfirmModal } from '@elastic/eui'; +import { EuiOverlayMask, EuiConfirmModal, EuiText } from '@elastic/eui'; /** * @@ -51,7 +51,9 @@ export function useDeleteConfirmState( {customConfirmationText ? ( customConfirmationText ) : ( -

Do you really want to delete selected {entity}?

+ +

Do you really want to delete selected {entity}?

+ )} From 2cd429b3c26bcb762fbbb13d7ebbcd2abeed4d5d Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Wed, 21 Aug 2024 14:52:20 -0700 Subject: [PATCH 02/11] Look&Feel EuiTabs Changes Signed-off-by: Dan Dong --- .../configuration/panels/role-view/role-view.tsx | 1 + .../panels/tenant-list/tenant-list.tsx | 16 ++++------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/public/apps/configuration/panels/role-view/role-view.tsx b/public/apps/configuration/panels/role-view/role-view.tsx index 1c04351c2..44609eee9 100644 --- a/public/apps/configuration/panels/role-view/role-view.tsx +++ b/public/apps/configuration/panels/role-view/role-view.tsx @@ -479,6 +479,7 @@ export function RoleView(props: RoleViewProps) { ? tabs[MAP_USER_TAB_INDEX] : tabs[PERMISSIONS_TAB_INDEX] } + size="s" /> diff --git a/public/apps/configuration/panels/tenant-list/tenant-list.tsx b/public/apps/configuration/panels/tenant-list/tenant-list.tsx index aa5ee9e40..f12aa69f2 100644 --- a/public/apps/configuration/panels/tenant-list/tenant-list.tsx +++ b/public/apps/configuration/panels/tenant-list/tenant-list.tsx @@ -13,15 +13,7 @@ * permissions and limitations under the License. */ -import { - EuiPageHeader, - EuiText, - EuiTitle, - EuiTabs, - EuiTab, - EuiCallOut, - EuiSmallButton, -} from '@elastic/eui'; +import { EuiPageHeader, EuiText, EuiTabs, EuiTab, EuiCallOut, EuiSmallButton } from '@elastic/eui'; import { Route } from 'react-router-dom'; import React, { useState, useMemo } from 'react'; import { ManageTab } from './manage_tab'; @@ -159,9 +151,9 @@ export function TenantList(props: TenantListProps) { fallBackComponent={ <> - +

Dashboards multi-tenancy

- + Tenants in OpenSearch Dashboards are spaces for saving index patterns, visualizations, @@ -175,7 +167,7 @@ export function TenantList(props: TenantListProps) { resourceType={ResourceType.tenants} /> - {renderTabs()} + {renderTabs()} {!isMultiTenancyEnabled && selectedTabId === 'Manage' && tenancyDisabledWarning} {selectedTabContent} From a64929a37dafcd7b6f73c067f4c8d6418369e6e3 Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Wed, 21 Aug 2024 14:54:20 -0700 Subject: [PATCH 03/11] Look&Feel Semantic Headers and Paragraph Changes Signed-off-by: Dan Dong --- .../audit-logging-edit-settings.tsx | 5 +++-- .../panels/audit-logging/audit-logging.tsx | 8 +++---- .../panels/auth-view/auth-view.tsx | 10 ++++----- .../apps/configuration/panels/get-started.tsx | 4 ++-- .../internal-user-edit/internal-user-edit.tsx | 7 +++---- .../permission-list/permission-list.tsx | 4 ++-- .../panels/role-edit/role-edit.tsx | 21 ++++++++++--------- .../apps/configuration/panels/role-list.tsx | 4 ++-- .../role-mapping/role-edit-mapped-user.tsx | 14 +++++++------ .../panels/role-view/role-view.tsx | 4 ++-- .../apps/configuration/panels/user-list.tsx | 4 ++-- 11 files changed, 44 insertions(+), 41 deletions(-) diff --git a/public/apps/configuration/panels/audit-logging/audit-logging-edit-settings.tsx b/public/apps/configuration/panels/audit-logging/audit-logging-edit-settings.tsx index 4de73094c..a150525c9 100644 --- a/public/apps/configuration/panels/audit-logging/audit-logging-edit-settings.tsx +++ b/public/apps/configuration/panels/audit-logging/audit-logging-edit-settings.tsx @@ -23,6 +23,7 @@ import { EuiPanel, EuiSpacer, EuiTitle, + EuiText, } from '@elastic/eui'; import { Toast } from '@elastic/eui/src/components/toast/global_toast_list'; import { cloneDeep, set, without } from 'lodash'; @@ -221,9 +222,9 @@ export function AuditLoggingEditSettings(props: AuditLoggingEditSettingProps) { coreStart={props.coreStart} fallBackComponent={ - +

General settings

- + } resourceType={ResourceType.auditLogging} diff --git a/public/apps/configuration/panels/audit-logging/audit-logging.tsx b/public/apps/configuration/panels/audit-logging/audit-logging.tsx index efaa13d15..1b05e42d7 100644 --- a/public/apps/configuration/panels/audit-logging/audit-logging.tsx +++ b/public/apps/configuration/panels/audit-logging/audit-logging.tsx @@ -61,7 +61,7 @@ function renderStatusPanel(onSwitchChange: () => void, auditLoggingEnabled: bool Storage location} className="described-form-group"> - + - -

Audit logging

- + +

Audit logging

+ } resourceType={ResourceType.auditLogging} diff --git a/public/apps/configuration/panels/auth-view/auth-view.tsx b/public/apps/configuration/panels/auth-view/auth-view.tsx index 6c19a9814..2b39851aa 100644 --- a/public/apps/configuration/panels/auth-view/auth-view.tsx +++ b/public/apps/configuration/panels/auth-view/auth-view.tsx @@ -14,7 +14,7 @@ */ import React, { useContext } from 'react'; -import { EuiLoadingContent, EuiPageHeader, EuiSpacer, EuiTitle } from '@elastic/eui'; +import { EuiLoadingContent, EuiPageHeader, EuiSpacer, EuiText } from '@elastic/eui'; import { isEmpty } from 'lodash'; import { AuthenticationSequencePanel } from './authentication-sequence-panel'; import { AuthorizationPanel } from './authorization-panel'; @@ -87,9 +87,9 @@ export function AuthView(props: AppDependencies) { navigation={props.depsStart.navigation} coreStart={props.coreStart} fallBackComponent={ - +

Authentication and authorization

- + } /> {accessErrorFlag ? ( @@ -118,9 +118,9 @@ export function AuthView(props: AppDependencies) { appRightControls={buttonData} fallBackComponent={ - +

Authentication and authorization

- + {!loading && !errorFlag && props.config.ui.backend_configurable && ( - +

Get started

- + } diff --git a/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx b/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx index 6546978c3..c2d158426 100644 --- a/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx +++ b/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx @@ -22,7 +22,6 @@ import { EuiPageHeader, EuiSpacer, EuiText, - EuiTitle, } from '@elastic/eui'; import React, { useContext, useState } from 'react'; import { BreadcrumbsPageDependencies } from '../../../types'; @@ -178,12 +177,12 @@ export function InternalUserEdit(props: InternalUserEditDeps) { - +

{TITLE_TEXT_DICT[props.action]}

- + - + The security plugin includes an internal user database. Use this database in place of, or in addition to, an external authentication system such as LDAP or Active Directory. diff --git a/public/apps/configuration/panels/permission-list/permission-list.tsx b/public/apps/configuration/panels/permission-list/permission-list.tsx index 7981abb24..dd2e16ca9 100644 --- a/public/apps/configuration/panels/permission-list/permission-list.tsx +++ b/public/apps/configuration/panels/permission-list/permission-list.tsx @@ -405,9 +405,9 @@ export function PermissionList(props: AppDependencies) { appRightControls={buttonData} fallBackComponent={ - +

Permissions

- + } resourceType={ResourceType.permissions} diff --git a/public/apps/configuration/panels/role-edit/role-edit.tsx b/public/apps/configuration/panels/role-edit/role-edit.tsx index 6006600fc..ef4a104fa 100644 --- a/public/apps/configuration/panels/role-edit/role-edit.tsx +++ b/public/apps/configuration/panels/role-edit/role-edit.tsx @@ -22,7 +22,6 @@ import { EuiPageHeader, EuiSpacer, EuiText, - EuiTitle, } from '@elastic/eui'; import React, { useState, useContext } from 'react'; import { isEmpty } from 'lodash'; @@ -237,7 +236,7 @@ export function RoleEdit(props: RoleEditDeps) { const descriptionData = [ { renderComponent: ( - + Roles are the core way of controlling access to your cluster. Roles contain any combination of cluster-wide permission, index-
@@ -262,15 +261,17 @@ export function RoleEdit(props: RoleEditDeps) { <> {' '} - - + +

{TITLE_TEXT_DICT[props.action]}

- - Roles are the core way of controlling access to your cluster. Roles contain any - combination of cluster-wide permission, index-specific permissions, document- and - field-level security, and tenants. Once you've created the role, you can map - users to the roles so that users gain those permissions.{' '} - + + + Roles are the core way of controlling access to your cluster. Roles contain any + combination of cluster-wide permission, index-specific permissions, document- and + field-level security, and tenants. Once you've created the role, you can map + users to the roles so that users gain those permissions.{' '} + + diff --git a/public/apps/configuration/panels/role-list.tsx b/public/apps/configuration/panels/role-list.tsx index af640bf1f..a3f280d92 100644 --- a/public/apps/configuration/panels/role-list.tsx +++ b/public/apps/configuration/panels/role-list.tsx @@ -308,9 +308,9 @@ export function RoleList(props: AppDependencies) { appRightControls={buttonData} fallBackComponent={ - +

Roles

- + } resourceType={ResourceType.roles} diff --git a/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx b/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx index 956f9ebe4..9cb4c86ff 100644 --- a/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx +++ b/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx @@ -20,7 +20,6 @@ import { EuiPageHeader, EuiSpacer, EuiText, - EuiTitle, EuiGlobalToastList, } from '@elastic/eui'; import React, { useState, useContext } from 'react'; @@ -167,12 +166,15 @@ export function RoleEditMappedUser(props: RoleEditMappedUserProps) { coreStart={props.coreStart} fallBackComponent={ - - + +

Map user

- - Map users to this role to inherit role permissions. Two types of users are supported: - user, and backend role. + + + Map users to this role to inherit role permissions. Two types of users are + supported: user, and backend role.{' '} + + } diff --git a/public/apps/configuration/panels/role-view/role-view.tsx b/public/apps/configuration/panels/role-view/role-view.tsx index 44609eee9..1072b0ec9 100644 --- a/public/apps/configuration/panels/role-view/role-view.tsx +++ b/public/apps/configuration/panels/role-view/role-view.tsx @@ -460,9 +460,9 @@ export function RoleView(props: RoleViewProps) { <> - +

{props.roleName}

- + {pageActions} diff --git a/public/apps/configuration/panels/user-list.tsx b/public/apps/configuration/panels/user-list.tsx index 545f9071b..ffeba204a 100644 --- a/public/apps/configuration/panels/user-list.tsx +++ b/public/apps/configuration/panels/user-list.tsx @@ -250,9 +250,9 @@ export function UserList(props: AppDependencies) { appRightControls={buttonData} fallBackComponent={ - +

Internal users

- + } resourceType={ResourceType.users} From 71259d9663f706caa411e4779b876ea131e4e9a3 Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Wed, 21 Aug 2024 14:54:42 -0700 Subject: [PATCH 04/11] Look&Feel Context Menu Changes Signed-off-by: Dan Dong --- public/apps/configuration/utils/context-menu.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/apps/configuration/utils/context-menu.tsx b/public/apps/configuration/utils/context-menu.tsx index aea6ae5a8..328eff0c8 100644 --- a/public/apps/configuration/utils/context-menu.tsx +++ b/public/apps/configuration/utils/context-menu.tsx @@ -60,9 +60,9 @@ export function useContextMenuState( button={button} isOpen={isContextMenuOpen} closePopover={closeContextMenu} - panelPaddingSize="s" + panelPaddingSize="none" > - + ); From a1188860e8c63153f71593ed76ae2f97490f68c2 Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Wed, 21 Aug 2024 14:56:00 -0700 Subject: [PATCH 05/11] Look&Feel External Button Changes Signed-off-by: Dan Dong --- .../panels/auth-view/instruction-view.tsx | 1 - public/apps/configuration/panels/get-started.tsx | 6 +----- public/apps/configuration/utils/display-utils.tsx | 10 +++++----- .../configuration/utils/test/display-utils.test.tsx | 2 +- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/public/apps/configuration/panels/auth-view/instruction-view.tsx b/public/apps/configuration/panels/auth-view/instruction-view.tsx index 0e53938e8..0e1c64bb7 100644 --- a/public/apps/configuration/panels/auth-view/instruction-view.tsx +++ b/public/apps/configuration/panels/auth-view/instruction-view.tsx @@ -41,7 +41,6 @@ export function InstructionView(props: { config: ClientConfigType }) { {props.config.ui.backend_configurable && (
- + + {props.text} - + ); } diff --git a/public/apps/configuration/utils/test/display-utils.test.tsx b/public/apps/configuration/utils/test/display-utils.test.tsx index caed8615c..fa38d1472 100644 --- a/public/apps/configuration/utils/test/display-utils.test.tsx +++ b/public/apps/configuration/utils/test/display-utils.test.tsx @@ -91,7 +91,7 @@ describe('Display utils', () => { it('Render External Link Button', () => { const component = shallow( - + ); expect(component).toMatchSnapshot(); }); From 2c631c900886e8e33bb944a792b4818020b3399b Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Wed, 21 Aug 2024 14:56:29 -0700 Subject: [PATCH 06/11] Look&Feel Navigational Button Changes Signed-off-by: Dan Dong --- .../apps/configuration/panels/get-started.tsx | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/public/apps/configuration/panels/get-started.tsx b/public/apps/configuration/panels/get-started.tsx index 5446f8bdb..00bededfc 100644 --- a/public/apps/configuration/panels/get-started.tsx +++ b/public/apps/configuration/panels/get-started.tsx @@ -25,6 +25,7 @@ import { EuiText, EuiTitle, EuiGlobalToastList, + EuiSmallButtonEmpty, } from '@elastic/eui'; import React, { useContext } from 'react'; import { FormattedMessage } from '@osd/i18n/react'; @@ -92,15 +93,14 @@ const setOfSteps = [ - { window.location.href = buildHashUrl(ResourceType.roles); }} > Explore existing roles - + - { window.location.href = buildHashUrl(ResourceType.users); }} > Map users to a role - + {' '}

- { window.location.href = buildHashUrl(ResourceType.auditLogging); }} > Review Audit Log Configuration - + @@ -259,7 +257,6 @@ export function GetStarted(props: AppDependencies) {

{ try { @@ -304,23 +301,22 @@ export function GetStarted(props: AppDependencies) {

- { window.location.href = buildHashUrl(ResourceType.tenants); }} > Manage Multi-tenancy - + - { window.location.href = buildHashUrl(ResourceType.tenantsConfigureTab); }} > Configure Multi-tenancy - + From 2f42104ed0f3f6bc30786763c745b97fd7d5d4e3 Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Wed, 21 Aug 2024 14:56:43 -0700 Subject: [PATCH 07/11] Look&Feel Render Component Changes Signed-off-by: Dan Dong --- .../panels/internal-user-edit/internal-user-edit.tsx | 2 +- .../configuration/panels/role-mapping/role-edit-mapped-user.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx b/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx index c2d158426..6b5c7aa99 100644 --- a/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx +++ b/public/apps/configuration/panels/internal-user-edit/internal-user-edit.tsx @@ -150,7 +150,7 @@ export function InternalUserEdit(props: InternalUserEditDeps) { const descriptionData = [ { renderComponent: ( - + The security plugin includes an internal user database. Use this database in place of, or in addition to, an external
authentication system such as LDAP or Active Directory.{' '} diff --git a/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx b/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx index 9cb4c86ff..61746bfdf 100644 --- a/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx +++ b/public/apps/configuration/panels/role-mapping/role-edit-mapped-user.tsx @@ -58,7 +58,7 @@ const TITLE_TEXT_DICT = { const descriptionData = [ { renderComponent: ( - + Map users to this role to inherit role permissions. Two types of users are supported: user, and backend role. From a48449a5787076161f874528776dbf0d64a10d59 Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Thu, 22 Aug 2024 14:03:43 -0700 Subject: [PATCH 08/11] Fixed jest and cypress testing Signed-off-by: Dan Dong --- .../role-info-panel.test.tsx.snap | 26 +++++--- .../tenant-switch-panel.test.tsx.snap | 50 +++++++++------ .../__snapshots__/audit-logging.test.tsx.snap | 21 ++++--- .../__snapshots__/auth-view.test.tsx.snap | 6 +- .../permission-list.test.tsx.snap | 6 +- .../__snapshots__/role-view.test.tsx.snap | 14 +++-- .../expression-modal.test.tsx.snap | 8 ++- .../__snapshots__/get-started.test.tsx.snap | 63 ++++++++----------- .../__snapshots__/role-list.test.tsx.snap | 6 +- .../__snapshots__/user-list.test.tsx.snap | 6 +- .../__snapshots__/display-utils.test.tsx.snap | 5 +- test/cypress/e2e/oidc/oidc_auth_test.spec.js | 2 +- test/cypress/e2e/saml/saml_auth_test.spec.js | 2 +- 13 files changed, 116 insertions(+), 99 deletions(-) diff --git a/public/apps/account/test/__snapshots__/role-info-panel.test.tsx.snap b/public/apps/account/test/__snapshots__/role-info-panel.test.tsx.snap index 69b211b62..6fee461be 100644 --- a/public/apps/account/test/__snapshots__/role-info-panel.test.tsx.snap +++ b/public/apps/account/test/__snapshots__/role-info-panel.test.tsx.snap @@ -8,53 +8,63 @@ exports[`Account menu - Role info panel renders 1`] = ` > - -

+ +

Roles ( 2 ) -

- +

+ Roles you are currently mapped to by your administrator. role1
role2
- -

+ +

Backend roles ( 2 ) -

- +

+ Backend roles you are currently mapped to by your administrator. backend_role1
backend_role2
diff --git a/public/apps/account/test/__snapshots__/tenant-switch-panel.test.tsx.snap b/public/apps/account/test/__snapshots__/tenant-switch-panel.test.tsx.snap index 0ee1048a2..38433d575 100644 --- a/public/apps/account/test/__snapshots__/tenant-switch-panel.test.tsx.snap +++ b/public/apps/account/test/__snapshots__/tenant-switch-panel.test.tsx.snap @@ -8,11 +8,13 @@ exports[`Account menu -tenant switch panel confirm button and renders renders wh > - -

+ +

Select your tenant -

- +

+ - -

+ +

Select your tenant -

- +

+ - -

+ +

Select your tenant -

- +

+ - -

+ +

Select your tenant -

- +

+ - -

+ +

Select your tenant -

- +

+ - -

+

Audit logging -

- + + } navigation={Object {}} @@ -309,6 +309,7 @@ exports[`Audit logs render when AuditLoggingSettings.enabled is true 1`] = ` - -

+

Audit logging -

- + + } navigation={Object {}} diff --git a/public/apps/configuration/panels/auth-view/test/__snapshots__/auth-view.test.tsx.snap b/public/apps/configuration/panels/auth-view/test/__snapshots__/auth-view.test.tsx.snap index 6ede754fb..b7678aef7 100644 --- a/public/apps/configuration/panels/auth-view/test/__snapshots__/auth-view.test.tsx.snap +++ b/public/apps/configuration/panels/auth-view/test/__snapshots__/auth-view.test.tsx.snap @@ -28,13 +28,13 @@ exports[`Auth view should load access error component 1`] = ` } } fallBackComponent={ -

Authentication and authorization

- + } navigation={Object {}} /> diff --git a/public/apps/configuration/panels/permission-list/test/__snapshots__/permission-list.test.tsx.snap b/public/apps/configuration/panels/permission-list/test/__snapshots__/permission-list.test.tsx.snap index 2dc58bac1..32dbd03a8 100644 --- a/public/apps/configuration/panels/permission-list/test/__snapshots__/permission-list.test.tsx.snap +++ b/public/apps/configuration/panels/permission-list/test/__snapshots__/permission-list.test.tsx.snap @@ -157,13 +157,13 @@ exports[`Permission list page AccessError component should load access error co } fallBackComponent={ -

Permissions

- + } resourceType="permissions" diff --git a/public/apps/configuration/panels/role-view/test/__snapshots__/role-view.test.tsx.snap b/public/apps/configuration/panels/role-view/test/__snapshots__/role-view.test.tsx.snap index 2f557ebd8..37b927fa0 100644 --- a/public/apps/configuration/panels/role-view/test/__snapshots__/role-view.test.tsx.snap +++ b/public/apps/configuration/panels/role-view/test/__snapshots__/role-view.test.tsx.snap @@ -99,13 +99,13 @@ exports[`Role view basic rendering when permission tab is selected 1`] = ` -

role

- + -

role

- + - Title + +

+ Title +

+ 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 index 33a5d8009..5b3d6ac77 100644 --- a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap +++ b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap @@ -52,13 +52,13 @@ exports[`Get started (landing page) renders when backend configuration is disabl } fallBackComponent={ -

Get started

- + - Explore existing roles - + - Map users to a role - +

- Review Audit Log Configuration - + @@ -273,21 +269,20 @@ exports[`Get started (landing page) renders when backend configuration is disabl - Manage Multi-tenancy - + - Configure Multi-tenancy - + @@ -354,13 +349,13 @@ exports[`Get started (landing page) renders when backend configuration is enable } fallBackComponent={ -

Get started

- + @@ -477,13 +471,12 @@ exports[`Get started (landing page) renders when backend configuration is enable - Explore existing roles - + - Map users to a role - +

- Review Audit Log Configuration - + @@ -642,21 +632,20 @@ exports[`Get started (landing page) renders when backend configuration is enable - Manage Multi-tenancy - + - Configure Multi-tenancy - + diff --git a/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap index cdc9a6f17..bbab64088 100644 --- a/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap +++ b/public/apps/configuration/panels/test/__snapshots__/role-list.test.tsx.snap @@ -96,13 +96,13 @@ exports[`Role list AccessError component should load access error component 1`] } fallBackComponent={ -

Roles

- + } navigation={Object {}} diff --git a/public/apps/configuration/panels/test/__snapshots__/user-list.test.tsx.snap b/public/apps/configuration/panels/test/__snapshots__/user-list.test.tsx.snap index 105e6dd38..8b3e0feb4 100644 --- a/public/apps/configuration/panels/test/__snapshots__/user-list.test.tsx.snap +++ b/public/apps/configuration/panels/test/__snapshots__/user-list.test.tsx.snap @@ -111,13 +111,13 @@ exports[`User list AccessError component should load access error component 1`] } fallBackComponent={ -

Internal users

- + } navigation={Object {}} diff --git a/public/apps/configuration/utils/test/__snapshots__/display-utils.test.tsx.snap b/public/apps/configuration/utils/test/__snapshots__/display-utils.test.tsx.snap index 4ba456b4a..50d7abcfd 100644 --- a/public/apps/configuration/utils/test/__snapshots__/display-utils.test.tsx.snap +++ b/public/apps/configuration/utils/test/__snapshots__/display-utils.test.tsx.snap @@ -60,8 +60,7 @@ exports[`Display utils Render External Link 1`] = ` `; exports[`Display utils Render External Link Button 1`] = ` - Test - + `; exports[`Display utils Render expression when expression is non-empty 1`] = ` diff --git a/test/cypress/e2e/oidc/oidc_auth_test.spec.js b/test/cypress/e2e/oidc/oidc_auth_test.spec.js index 2228d2fbf..5e305f6eb 100644 --- a/test/cypress/e2e/oidc/oidc_auth_test.spec.js +++ b/test/cypress/e2e/oidc/oidc_auth_test.spec.js @@ -88,7 +88,7 @@ describe('Log in via OIDC', () => { localStorage.setItem('opendistro::security::tenant::saved', '""'); localStorage.setItem('home:newThemeModal:show', 'false'); - cy.get('h1.euiTitle--large').contains('Get started'); + cy.get('h1.euiText--small').contains('Get started'); }); it('Tenancy persisted after logout in OIDC', () => { diff --git a/test/cypress/e2e/saml/saml_auth_test.spec.js b/test/cypress/e2e/saml/saml_auth_test.spec.js index 34f58da2b..8630c7eda 100644 --- a/test/cypress/e2e/saml/saml_auth_test.spec.js +++ b/test/cypress/e2e/saml/saml_auth_test.spec.js @@ -90,7 +90,7 @@ describe('Log in via SAML', () => { samlLogin(); - cy.get('h1.euiTitle--large').contains('Get started'); + cy.get('h1.euiText--small').contains('Get started'); cy.getCookie('security_authentication').should('exist'); }); From 00986073aee16c9a0f3e4a73b79fd8016445739b Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Fri, 23 Aug 2024 10:45:53 -0700 Subject: [PATCH 09/11] Fixed jest and cypress testing Signed-off-by: Dan Dong --- test/cypress/e2e/oidc/oidc_auth_test.spec.js | 2 +- test/cypress/e2e/saml/saml_auth_test.spec.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/cypress/e2e/oidc/oidc_auth_test.spec.js b/test/cypress/e2e/oidc/oidc_auth_test.spec.js index 5e305f6eb..79a41807d 100644 --- a/test/cypress/e2e/oidc/oidc_auth_test.spec.js +++ b/test/cypress/e2e/oidc/oidc_auth_test.spec.js @@ -88,7 +88,7 @@ describe('Log in via OIDC', () => { localStorage.setItem('opendistro::security::tenant::saved', '""'); localStorage.setItem('home:newThemeModal:show', 'false'); - cy.get('h1.euiText--small').contains('Get started'); + cy.get('h1').contains('Get started'); }); it('Tenancy persisted after logout in OIDC', () => { diff --git a/test/cypress/e2e/saml/saml_auth_test.spec.js b/test/cypress/e2e/saml/saml_auth_test.spec.js index 8630c7eda..fc6c6934c 100644 --- a/test/cypress/e2e/saml/saml_auth_test.spec.js +++ b/test/cypress/e2e/saml/saml_auth_test.spec.js @@ -90,7 +90,7 @@ describe('Log in via SAML', () => { samlLogin(); - cy.get('h1.euiText--small').contains('Get started'); + cy.get('h1').contains('Get started'); cy.getCookie('security_authentication').should('exist'); }); From b3a4f5cb9d92a4577b077b14dffaceaae7587f04 Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Fri, 23 Aug 2024 16:34:53 -0700 Subject: [PATCH 10/11] Revert button changes Signed-off-by: Dan Dong --- .../panels/auth-view/instruction-view.tsx | 1 + .../apps/configuration/panels/get-started.tsx | 27 ++++++++++--------- .../configuration/utils/display-utils.tsx | 10 +++---- .../utils/test/display-utils.test.tsx | 2 +- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/public/apps/configuration/panels/auth-view/instruction-view.tsx b/public/apps/configuration/panels/auth-view/instruction-view.tsx index 0e1c64bb7..0e53938e8 100644 --- a/public/apps/configuration/panels/auth-view/instruction-view.tsx +++ b/public/apps/configuration/panels/auth-view/instruction-view.tsx @@ -41,6 +41,7 @@ export function InstructionView(props: { config: ClientConfigType }) { {props.config.ui.backend_configurable && (
- + - { window.location.href = buildHashUrl(ResourceType.roles); }} > Explore existing roles - + - { window.location.href = buildHashUrl(ResourceType.users); }} > Map users to a role - + {' '}

- { window.location.href = buildHashUrl(ResourceType.auditLogging); }} > Review Audit Log Configuration - + @@ -301,22 +304,22 @@ export function GetStarted(props: AppDependencies) {

- { window.location.href = buildHashUrl(ResourceType.tenants); }} > Manage Multi-tenancy - + - { window.location.href = buildHashUrl(ResourceType.tenantsConfigureTab); }} > Configure Multi-tenancy - + diff --git a/public/apps/configuration/utils/display-utils.tsx b/public/apps/configuration/utils/display-utils.tsx index 00d6a97ba..b1be5bfee 100644 --- a/public/apps/configuration/utils/display-utils.tsx +++ b/public/apps/configuration/utils/display-utils.tsx @@ -20,8 +20,8 @@ import { EuiText, EuiIcon, EuiFlexGroup, - EuiSmallButtonEmpty, - EuiButtonEmptyProps, + EuiSmallButton, + EuiButtonProps, EuiToolTip, EuiLink, } from '@elastic/eui'; @@ -131,12 +131,12 @@ export const displayHeaderWithTooltip = (columnHeader: string, tooltipText: stri ); }; -export function ExternalLinkButton(props: { text: string; href: string } & EuiButtonEmptyProps) { +export function ExternalLinkButton(props: { text: string; href: string } & EuiButtonProps) { const { text, ...buttonProps } = props; return ( - + {props.text} - + ); } diff --git a/public/apps/configuration/utils/test/display-utils.test.tsx b/public/apps/configuration/utils/test/display-utils.test.tsx index fa38d1472..caed8615c 100644 --- a/public/apps/configuration/utils/test/display-utils.test.tsx +++ b/public/apps/configuration/utils/test/display-utils.test.tsx @@ -91,7 +91,7 @@ describe('Display utils', () => { it('Render External Link Button', () => { const component = shallow( - + ); expect(component).toMatchSnapshot(); }); From 3b37f3a9e6e1d43575235440c41bddc71e11d615 Mon Sep 17 00:00:00 2001 From: Dan Dong Date: Fri, 23 Aug 2024 16:38:49 -0700 Subject: [PATCH 11/11] Updated jest testing Signed-off-by: Dan Dong --- .../__snapshots__/get-started.test.tsx.snap | 41 ++++++++++--------- .../__snapshots__/display-utils.test.tsx.snap | 5 ++- 2 files changed, 24 insertions(+), 22 deletions(-) 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 index 5b3d6ac77..001b3b6c9 100644 --- a/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap +++ b/public/apps/configuration/panels/test/__snapshots__/get-started.test.tsx.snap @@ -108,12 +108,12 @@ exports[`Get started (landing page) renders when backend configuration is disabl - Explore existing roles - + - Map users to a role - +

- Review Audit Log Configuration - + - Manage Multi-tenancy - + - Configure Multi-tenancy - + @@ -429,6 +429,7 @@ exports[`Get started (landing page) renders when backend configuration is enable grow={false} > @@ -471,12 +472,12 @@ exports[`Get started (landing page) renders when backend configuration is enable - Explore existing roles - + - Map users to a role - +

- Review Audit Log Configuration - + - Manage Multi-tenancy - + - Configure Multi-tenancy - + diff --git a/public/apps/configuration/utils/test/__snapshots__/display-utils.test.tsx.snap b/public/apps/configuration/utils/test/__snapshots__/display-utils.test.tsx.snap index 50d7abcfd..4ba456b4a 100644 --- a/public/apps/configuration/utils/test/__snapshots__/display-utils.test.tsx.snap +++ b/public/apps/configuration/utils/test/__snapshots__/display-utils.test.tsx.snap @@ -60,7 +60,8 @@ exports[`Display utils Render External Link 1`] = ` `; exports[`Display utils Render External Link Button 1`] = ` - Test - + `; exports[`Display utils Render expression when expression is non-empty 1`] = `