From 619f859ff6e25de4712b5fc48eaeebbe55cd89a4 Mon Sep 17 00:00:00 2001 From: "opensearch-trigger-bot[bot]" <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Date: Wed, 31 May 2023 14:12:57 +0800 Subject: [PATCH] Wording changes (#784) (#788) * Wording changes Signed-off-by: suzhou * feat: update release-notes Signed-off-by: suzhou --------- Signed-off-by: suzhou (cherry picked from commit c821a2acb8dd5c138203c3fceb76c8761c9fc9fd) Co-authored-by: suzhou --- .../NotificationCallout.tsx | 6 +++--- .../NotificationConfig/NotificationConfig.tsx | 2 +- .../NotificationCallout.test.tsx.snap | 6 +++--- .../NotificationConfig.test.tsx.snap | 20 ++++++------------- .../container/ForceMerge/ForceMerge.tsx | 2 +- .../__snapshots__/ForceMerge.test.tsx.snap | 2 +- public/pages/Notifications/constant.ts | 8 ++++---- .../Notifications/Notifications.tsx | 4 ++-- .../__snapshots__/Notifications.test.tsx.snap | 12 +++++------ .../__snapshots__/ShrinkIndex.test.tsx.snap | 4 +--- ...dashboards-plugin.release-notes-2.8.0.0.md | 2 +- 11 files changed, 29 insertions(+), 39 deletions(-) diff --git a/public/containers/NotificationConfig/NotificationCallout.tsx b/public/containers/NotificationConfig/NotificationCallout.tsx index 612c0b62a..4a25ffe37 100644 --- a/public/containers/NotificationConfig/NotificationCallout.tsx +++ b/public/containers/NotificationConfig/NotificationCallout.tsx @@ -26,7 +26,7 @@ export default function NotificationCallout(props: INotificationCalloutProps) { title = ( <> Your administrator may have set default notification settings for {OperationTypeMapTitle[operationType || actionType]} operations. - Contact your administrator to request access to notification settings. + Contact your administrator to request access. ); break; @@ -49,7 +49,7 @@ export default function NotificationCallout(props: INotificationCalloutProps) { title = ( <> Your administrator has set default notification settings for {OperationTypeMapTitle[operationType || actionType]} operations. - Contact your administrator to request access to notification settings. + Contact your administrator to request access. ); break; @@ -59,7 +59,7 @@ export default function NotificationCallout(props: INotificationCalloutProps) { Default notification settings are set for {OperationTypeMapTitle[operationType || actionType]} operations. Configure default settings at{" "} - Notifications + Notifications settings . diff --git a/public/containers/NotificationConfig/NotificationConfig.tsx b/public/containers/NotificationConfig/NotificationConfig.tsx index 35ea2414d..c2ebea8b4 100644 --- a/public/containers/NotificationConfig/NotificationConfig.tsx +++ b/public/containers/NotificationConfig/NotificationConfig.tsx @@ -123,7 +123,7 @@ const NotificationConfig = ( const content = (
-
Notify on {OperationTypeMapTitle[operationType || actionType]} status
+
Notifications
 spec renders with full permission and default n style="text-decoration: underline;" target="_blank" > - Notifications + Notifications settings @@ -84,7 +84,7 @@ exports[` spec renders with no permission and no default > Your administrator may have set default notification settings for shrink - operations. Contact your administrator to request access to notification settings. + operations. Contact your administrator to request access.
@@ -109,7 +109,7 @@ exports[` spec renders with view permission and default n > Your administrator has set default notification settings for shrink - operations. Contact your administrator to request access to notification settings. + operations. Contact your administrator to request access. diff --git a/public/containers/NotificationConfig/__snapshots__/NotificationConfig.test.tsx.snap b/public/containers/NotificationConfig/__snapshots__/NotificationConfig.test.tsx.snap index 554f9a6c2..20530817d 100644 --- a/public/containers/NotificationConfig/__snapshots__/NotificationConfig.test.tsx.snap +++ b/public/containers/NotificationConfig/__snapshots__/NotificationConfig.test.tsx.snap @@ -9,9 +9,7 @@ exports[` spec renders with create permission and no defa
- Notify on - shrink - status + Notifications
spec renders with full permission and default n
- Notify on - shrink - status + Notifications
spec renders with full permission and default n style="text-decoration: underline;" target="_blank" > - Notifications + Notifications settings @@ -294,9 +290,7 @@ exports[` spec renders with full permission and no defaul
- Notify on - shrink - status + Notifications
spec renders with view permission and default n
- Notify on - shrink - status + Notifications
spec renders with view permission and default n > Your administrator has set default notification settings for shrink - operations. Contact your administrator to request access to notification settings. + operations. Contact your administrator to request access.
diff --git a/public/pages/ForceMerge/container/ForceMerge/ForceMerge.tsx b/public/pages/ForceMerge/container/ForceMerge/ForceMerge.tsx index 6ab48a984..96e9450ee 100644 --- a/public/pages/ForceMerge/container/ForceMerge/ForceMerge.tsx +++ b/public/pages/ForceMerge/container/ForceMerge/ForceMerge.tsx @@ -170,7 +170,7 @@ export default function ForceMergeWrapper(props: Omit <> diff --git a/public/pages/ForceMerge/container/ForceMerge/__snapshots__/ForceMerge.test.tsx.snap b/public/pages/ForceMerge/container/ForceMerge/__snapshots__/ForceMerge.test.tsx.snap index 348f9dc8f..f47014230 100644 --- a/public/pages/ForceMerge/container/ForceMerge/__snapshots__/ForceMerge.test.tsx.snap +++ b/public/pages/ForceMerge/container/ForceMerge/__snapshots__/ForceMerge.test.tsx.snap @@ -20,7 +20,7 @@ exports[` spec renders the component 1`] = ` class="euiFormHelpText euiFormRow__text" style="padding-top: 0px; padding-bottom: 4px;" > - Manually merge data stream index shards or backing indexes. You can also use force merge to remove deleted documents within indexes. + Manually merge shards of indexes or backing indexes of data streams. You can also use force merge to clear up deleted documents within indexes.
diff --git a/public/pages/Notifications/constant.ts b/public/pages/Notifications/constant.ts index 1c7904958..74bb52897 100644 --- a/public/pages/Notifications/constant.ts +++ b/public/pages/Notifications/constant.ts @@ -22,10 +22,10 @@ export const ActionTypeMapTitle = { }; export const ActionTypeMapDescription = { - [ActionType.REINDEX]: "Notify when any reindex operations has failed or completed.", - [ActionType.RESIZE]: "Notify when any shrink, split, or clone operations has failed or completed.", - [ActionType.FORCEMERGE]: "Notify when any force merge operations has failed or completed.", - [ActionType.OPEN]: "Notify when any open operations has failed or completed.", + [ActionType.REINDEX]: "Notify when any reindex operation has failed or completed.", + [ActionType.RESIZE]: "Notify when any shrink, split, or clone operation has failed or completed.", + [ActionType.FORCEMERGE]: "Notify when any force merge operation has failed or completed.", + [ActionType.OPEN]: "Notify when any open operation has failed or completed.", }; export const OperationTypeMapTitle = { diff --git a/public/pages/Notifications/containers/Notifications/Notifications.tsx b/public/pages/Notifications/containers/Notifications/Notifications.tsx index 526df827b..8020d01b9 100644 --- a/public/pages/Notifications/containers/Notifications/Notifications.tsx +++ b/public/pages/Notifications/containers/Notifications/Notifications.tsx @@ -175,7 +175,7 @@ const Notifications = (props: NotificationsProps) => { fullWidth helpText={ <> - Configure the default notification settings on index operation statuses such as failed or completed. You can configure + Configure the default notification settings on index operation statuses, such as failed or completed. You can configure additional notification settings while performing an index operation. } @@ -214,7 +214,7 @@ const Notifications = (props: NotificationsProps) => { const index = matchResult[1]; const itemField = matchResult[2]; const notificationItem = (field.getValues().dataSource || [])[parseInt(index, 10)]; - const errorMessagePrefix = `${notificationItem.title} - ${FieldMapLabel[itemField as keyof typeof FieldMapLabel]}: `; + const errorMessagePrefix = `${notificationItem.title} — ${FieldMapLabel[itemField as keyof typeof FieldMapLabel]}: `; return [ ...total, ...(errors || []).map((item) => ( diff --git a/public/pages/Notifications/containers/Notifications/__snapshots__/Notifications.test.tsx.snap b/public/pages/Notifications/containers/Notifications/__snapshots__/Notifications.test.tsx.snap index 6c09558e2..18bb58128 100644 --- a/public/pages/Notifications/containers/Notifications/__snapshots__/Notifications.test.tsx.snap +++ b/public/pages/Notifications/containers/Notifications/__snapshots__/Notifications.test.tsx.snap @@ -24,7 +24,7 @@ exports[` spec View without permission 1`] = ` class="euiFormHelpText euiFormRow__text" style="padding-top: 0px; padding-bottom: 4px;" > - Configure the default notification settings on index operation statuses such as failed or completed. You can configure additional notification settings while performing an index operation. + Configure the default notification settings on index operation statuses, such as failed or completed. You can configure additional notification settings while performing an index operation. @@ -112,7 +112,7 @@ exports[` spec renders 1`] = ` class="euiFormHelpText euiFormRow__text" style="padding-top: 0px; padding-bottom: 4px;" > - Configure the default notification settings on index operation statuses such as failed or completed. You can configure additional notification settings while performing an index operation. + Configure the default notification settings on index operation statuses, such as failed or completed. You can configure additional notification settings while performing an index operation. @@ -181,7 +181,7 @@ exports[` spec renders 1`] = `
- Notify when any reindex operations has failed or completed. + Notify when any reindex operation has failed or completed.
@@ -303,7 +303,7 @@ exports[` spec renders 1`] = `
- Notify when any shrink, split, or clone operations has failed or completed. + Notify when any shrink, split, or clone operation has failed or completed.
@@ -425,7 +425,7 @@ exports[` spec renders 1`] = `
- Notify when any force merge operations has failed or completed. + Notify when any force merge operation has failed or completed.
@@ -547,7 +547,7 @@ exports[` spec renders 1`] = `
- Notify when any open operations has failed or completed. + Notify when any open operation has failed or completed.
diff --git a/public/pages/ShrinkIndex/container/ShrinkIndex/__snapshots__/ShrinkIndex.test.tsx.snap b/public/pages/ShrinkIndex/container/ShrinkIndex/__snapshots__/ShrinkIndex.test.tsx.snap index 5ff5f2009..85fd12d27 100644 --- a/public/pages/ShrinkIndex/container/ShrinkIndex/__snapshots__/ShrinkIndex.test.tsx.snap +++ b/public/pages/ShrinkIndex/container/ShrinkIndex/__snapshots__/ShrinkIndex.test.tsx.snap @@ -742,9 +742,7 @@ exports[` spec renders the component 1`] = `
- Notify on - shrink - status + Notifications