Wording changes (#784) (#789)

* Wording changes Signed-off-by: suzhou <[email protected]> * feat: update release-notes Signed-off-by: suzhou <[email protected]> --------- Signed-off-by: suzhou <[email protected]> (cherry picked from commit c821a2a) Co-authored-by: suzhou <[email protected]>
opensearch-project · May 31, 2023 · c9294e6 · c9294e6
1 parent 637a38d
commit c9294e6
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 39 deletions.
diff --git 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{" "}
           <EuiLink style={{ textDecoration: "underline" }} href={`#${ROUTES.NOTIFICATIONS}`} target="_blank" external={false}>
-            Notifications
+            Notifications settings
           </EuiLink>
           .
         </>

diff --git a/public/containers/NotificationConfig/NotificationConfig.tsx b/public/containers/NotificationConfig/NotificationConfig.tsx
@@ -123,7 +123,7 @@ const NotificationConfig = (
   const content = (
     <div>
       <EuiTitle size="s">
-        <h5>Notify on {OperationTypeMapTitle[operationType || actionType]} status</h5>
+        <h5>Notifications</h5>
       </EuiTitle>
       <NotificationCallout
         actionType={actionType}

diff --git a/public/containers/NotificationConfig/__snapshots__/NotificationCallout.test.tsx.snap b/public/containers/NotificationConfig/__snapshots__/NotificationCallout.test.tsx.snap
@@ -52,7 +52,7 @@ exports[`<ChannelNotification /> spec renders with full permission and default n
           style="text-decoration: underline;"
           target="_blank"
         >
-          Notifications
+          Notifications settings
           <span
             class="euiScreenReaderOnly"
           >
@@ -84,7 +84,7 @@ exports[`<ChannelNotification /> 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.
       </span>
     </div>
   </div>
@@ -109,7 +109,7 @@ exports[`<ChannelNotification /> 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.
       </span>
     </div>
   </div>

diff --git a/public/containers/NotificationConfig/__snapshots__/NotificationConfig.test.tsx.snap b/public/containers/NotificationConfig/__snapshots__/NotificationConfig.test.tsx.snap
@@ -9,9 +9,7 @@ exports[`<ChannelNotification /> spec renders with create permission and no defa
     <h5
       class="euiTitle euiTitle--small"
     >
-      Notify on 
-      shrink
-       status
+      Notifications
     </h5>
     <div
       class="euiSpacer euiSpacer--s"
@@ -116,9 +114,7 @@ exports[`<ChannelNotification /> spec renders with full permission and default n
     <h5
       class="euiTitle euiTitle--small"
     >
-      Notify on 
-      shrink
-       status
+      Notifications
     </h5>
     <div
       class="euiSpacer euiSpacer--s"
@@ -145,7 +141,7 @@ exports[`<ChannelNotification /> spec renders with full permission and default n
             style="text-decoration: underline;"
             target="_blank"
           >
-            Notifications
+            Notifications settings
             <span
               class="euiScreenReaderOnly"
             >
@@ -294,9 +290,7 @@ exports[`<ChannelNotification /> spec renders with full permission and no defaul
     <h5
       class="euiTitle euiTitle--small"
     >
-      Notify on 
-      shrink
-       status
+      Notifications
     </h5>
     <div
       class="euiSpacer euiSpacer--s"
@@ -416,9 +410,7 @@ exports[`<ChannelNotification /> spec renders with view permission and default n
     <h5
       class="euiTitle euiTitle--small"
     >
-      Notify on 
-      shrink
-       status
+      Notifications
     </h5>
     <div
       class="euiSpacer euiSpacer--s"
@@ -436,7 +428,7 @@ exports[`<ChannelNotification /> 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.
         </span>
       </div>
     </div>

diff --git 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<ForceMergeProps, "services
       </EuiTitle>
       <CustomFormRow
         fullWidth
-        helpText="Manually merge data stream index shards or backing indexes. You can also use force merge to remove deleted documents within indexes."
+        helpText="Manually merge shards of indexes or backing indexes of data streams. You can also use force merge to clear up deleted documents within indexes."
       >
         <></>
       </CustomFormRow>

diff --git 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[`<ForceMerge /> 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.
       </div>
     </div>
   </div>

diff --git 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
@@ -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/...ic/pages/Notifications/containers/Notifications/__snapshots__/Notifications.test.tsx.snap b/...ic/pages/Notifications/containers/Notifications/__snapshots__/Notifications.test.tsx.snap
@@ -24,7 +24,7 @@ exports[`<Notifications /> 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.
           </div>
         </div>
       </div>
@@ -112,7 +112,7 @@ exports[`<Notifications /> 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.
           </div>
         </div>
       </div>
@@ -181,7 +181,7 @@ exports[`<Notifications /> spec renders 1`] = `
             <div
               class="euiTextColor euiTextColor--subdued"
             >
-              Notify when any reindex operations has failed or completed.
+              Notify when any reindex operation has failed or completed.
             </div>
           </div>
         </div>
@@ -303,7 +303,7 @@ exports[`<Notifications /> spec renders 1`] = `
             <div
               class="euiTextColor euiTextColor--subdued"
             >
-              Notify when any shrink, split, or clone operations has failed or completed.
+              Notify when any shrink, split, or clone operation has failed or completed.
             </div>
           </div>
         </div>
@@ -425,7 +425,7 @@ exports[`<Notifications /> spec renders 1`] = `
             <div
               class="euiTextColor euiTextColor--subdued"
             >
-              Notify when any force merge operations has failed or completed.
+              Notify when any force merge operation has failed or completed.
             </div>
           </div>
         </div>
@@ -547,7 +547,7 @@ exports[`<Notifications /> spec renders 1`] = `
             <div
               class="euiTextColor euiTextColor--subdued"
             >
-              Notify when any open operations has failed or completed.
+              Notify when any open operation has failed or completed.
             </div>
           </div>
         </div>

diff --git 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[`<Shrink index /> spec renders the component 1`] = `
           <h5
             class="euiTitle euiTitle--small"
           >
-            Notify on 
-            shrink
-             status
+            Notifications
           </h5>
           <div
             class="euiSpacer euiSpacer--l"

diff --git a/...se-notes/opensearch-index-management-dashboards-plugin.release-notes-2.8.0.0.md b/...se-notes/opensearch-index-management-dashboards-plugin.release-notes-2.8.0.0.md
@@ -6,7 +6,7 @@ Compatible with OpenSearch 2.8.0
 * Feature: Add refresh index operation to UI  ([#761](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/761))
 * Feature: Add clear cache operation to UI  ([#728](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/728),[#773](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/773))
 * Feature: Add flush index operation to UI  ([#713](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/713),[#718](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/718),[#751](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/751),[#753](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/753),[#779](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/779))
-* Feature: Add notification settings page and runtime notification option for long running index operations  ([#731](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/731),[#732](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/732))
+* Feature: Add notification settings page and runtime notification option for long running index operations  ([#731](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/731),[#732](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/732)),[#784](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/784))
 * Feature: Composable templates enhancement  ([#730](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/730))
 * Implemented alias action UX. ([#754](https://github.com/opensearch-project/index-management-dashboards-plugin/pull/754))