Change UI text based on review feedback

jportner · jportner · commit c4e2237ebabb · 2020-09-08T18:03:19.000-04:00
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx
@@ -51,7 +51,7 @@ const createNewCopiesDisabled = {
   tooltip: i18n.translate(
     'savedObjectsManagement.objectsTable.importModeControl.createNewCopies.disabledText',
     {
-      defaultMessage: 'Check if objects were previously copied or imported into the space.',
+      defaultMessage: 'Check if objects were previously copied or imported.',
     }
   ),
 };
@@ -64,8 +64,7 @@ const createNewCopiesEnabled = {
   tooltip: i18n.translate(
     'savedObjectsManagement.objectsTable.importModeControl.createNewCopies.enabledText',
     {
-      defaultMessage:
-        'This option enables you to create multiple copies of the object in the same space.',
+      defaultMessage: 'Use this option to create one or more copies of the object.',
     }
   ),
 };
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.test.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.test.tsx
@@ -40,7 +40,7 @@ describe('OverwriteModal', () => {
       const wrapper = shallowWithI18nProvider(<OverwriteModal {...props} />);
 
       expect(wrapper.find('p').text()).toMatchInlineSnapshot(
-        `"\\"baz\\" conflicts with an existing object, overwrite it?"`
+        `"\\"baz\\" conflicts with an existing object. Overwrite it?"`
       );
       expect(wrapper.find('EuiSuperSelect')).toHaveLength(0);
     });
@@ -82,7 +82,7 @@ describe('OverwriteModal', () => {
       const wrapper = shallowWithI18nProvider(<OverwriteModal {...props} />);
 
       expect(wrapper.find('p').text()).toMatchInlineSnapshot(
-        `"\\"baz\\" conflicts with multiple existing objects, overwrite one?"`
+        `"\\"baz\\" conflicts with multiple existing objects. Overwrite one?"`
       );
       expect(wrapper.find('EuiSuperSelect')).toHaveLength(1);
     });
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/overwrite_modal.tsx
@@ -98,13 +98,13 @@ export const OverwriteModal = ({ conflict, onFinish }: OverwriteModalProps) => {
   const bodyText =
     error.type === 'conflict'
       ? i18n.translate('savedObjectsManagement.objectsTable.overwriteModal.body.conflict', {
-          defaultMessage: '"{title}" conflicts with an existing object, overwrite it?',
+          defaultMessage: '"{title}" conflicts with an existing object. Overwrite it?',
           values: { title },
         })
       : i18n.translate(
           'savedObjectsManagement.objectsTable.overwriteModal.body.ambiguousConflict',
           {
-            defaultMessage: '"{title}" conflicts with multiple existing objects, overwrite one?',
+            defaultMessage: '"{title}" conflicts with multiple existing objects. Overwrite one?',
             values: { title },
           }
         );
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_mode_control.tsx
@@ -51,7 +51,7 @@ const createNewCopiesEnabled = {
     'xpack.spaces.management.copyToSpace.copyModeControl.createNewCopies.enabledText',
     {
       defaultMessage:
-        'This option enables you to create multiple copies of the object in the same space.',
+        'Use this option to create one or more copies of the object in the same space.',
     }
   ),
 };
@@ -88,7 +88,7 @@ const copyOptionsTitle = i18n.translate(
 );
 const relationshipOptionsTitle = i18n.translate(
   'xpack.spaces.management.copyToSpace.copyModeControl.relationshipOptionsTitle',
-  { defaultMessage: 'Relationship options' }
+  { defaultMessage: 'Relationship' }
 );
 
 const createLabel = ({ text, tooltip }: { text: string; tooltip: string }) => (
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_status_indicator.tsx
@@ -59,7 +59,7 @@ export const CopyStatusIndicator = (props: Props) => {
       // this is a manual overwrite, e.g., the individual "Overwrite?" switch was enabled
       <FormattedMessage
         id="xpack.spaces.management.copyToSpace.copyStatus.pendingOverwriteMessage"
-        defaultMessage="Object will be overwritten. Disable to skip."
+        defaultMessage="Object will be overwritten. Disable 'Overwrite' to skip."
       />
     ) : (
       // this object is pending success, but it will not result in an overwrite
@@ -80,28 +80,46 @@ export const CopyStatusIndicator = (props: Props) => {
         content={
           <FormattedMessage
             id="xpack.spaces.management.copyToSpace.copyStatus.unresolvableErrorMessage"
-            defaultMessage="There was an error copying this saved object."
+            defaultMessage="An error occurred copying this object."
           />
         }
       />
     );
   }
 
   if (hasConflicts) {
-    return (
-      <EuiIconTip
-        type={'alert'}
-        color={'warning'}
-        content={
-          <Fragment>
-            <FormattedMessage
-              id="xpack.spaces.management.copyToSpace.copyStatus.conflictsMessage"
-              defaultMessage="An object with this ID already exists in this space. Enable ‘Overwrite’ to replace the existing object."
-            />
-          </Fragment>
-        }
-      />
-    );
+    switch (conflict!.error.type) {
+      case 'conflict':
+        return (
+          <EuiIconTip
+            type={'alert'}
+            color={'warning'}
+            content={
+              <Fragment>
+                <FormattedMessage
+                  id="xpack.spaces.management.copyToSpace.copyStatus.conflictMessage"
+                  defaultMessage="This conflicts with an existing object. Enable ‘Overwrite’ to replace it."
+                />
+              </Fragment>
+            }
+          />
+        );
+      case 'ambiguous_conflict':
+        return (
+          <EuiIconTip
+            type={'alert'}
+            color={'warning'}
+            content={
+              <Fragment>
+                <FormattedMessage
+                  id="xpack.spaces.management.copyToSpace.copyStatus.ambiguousConflictMessage"
+                  defaultMessage="This conflicts with multiple existing objects. Enable ‘Overwrite’ to replace one."
+                />
+              </Fragment>
+            }
+          />
+        );
+    }
   }
 
   return hasMissingReferences ? (
@@ -113,17 +131,17 @@ export const CopyStatusIndicator = (props: Props) => {
         overwrite ? (
           <FormattedMessage
             id="xpack.spaces.management.copyToSpace.copyStatus.missingReferencesAutomaticOverwriteMessage"
-            defaultMessage="This object will be overwritten, but one or more references are missing."
+            defaultMessage="Object will be overwritten, but one or more references are missing."
           />
         ) : conflict ? (
           <FormattedMessage
             id="xpack.spaces.management.copyToSpace.copyStatus.missingReferencesOverwriteMessage"
-            defaultMessage="This object will be overwritten, but one or more references are missing. Disable to skip."
+            defaultMessage="Object will be overwritten, but one or more references are missing. Disable 'Overwrite' to skip."
           />
         ) : (
           <FormattedMessage
             id="xpack.spaces.management.copyToSpace.copyStatus.missingReferencesMessage"
-            defaultMessage="This object will be copied, but one or more references are missing."
+            defaultMessage="Object will be copied, but one or more references are missing."
           />
         )
       }
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/copy_to_space_flyout.test.tsx
@@ -510,7 +510,7 @@ describe('CopyToSpaceFlyout', () => {
       Object {
         "color": "warning",
         "content": <FormattedMessage
-          defaultMessage="This object will be copied, but one or more references are missing."
+          defaultMessage="Object will be copied, but one or more references are missing."
           id="xpack.spaces.management.copyToSpace.copyStatus.missingReferencesMessage"
           values={Object {}}
         />,
@@ -604,7 +604,7 @@ describe('CopyToSpaceFlyout', () => {
       Object {
         "color": "danger",
         "content": <FormattedMessage
-          defaultMessage="There was an error copying this saved object."
+          defaultMessage="An error occurred copying this object."
           id="xpack.spaces.management.copyToSpace.copyStatus.unresolvableErrorMessage"
           values={Object {}}
         />,
diff --git a/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx b/x-pack/plugins/spaces/public/copy_saved_objects_to_space/components/processing_copy_to_space.tsx
@@ -45,36 +45,30 @@ const renderCopyOptions = ({ createNewCopies, overwrite, includeRelated }: CopyO
       defaultMessage="Check for existing objects"
     />
   );
-  const overwriteLabel = overwrite ? (
-    <FormattedMessage
-      id="xpack.spaces.management.copyToSpace.overwriteLabel"
-      defaultMessage="Automatically overwrite conflicts"
-    />
-  ) : (
-    <FormattedMessage
-      id="xpack.spaces.management.copyToSpace.dontOverwriteLabel"
-      defaultMessage="Do not automatically overwrite conflicts"
-    />
-  );
-  const includeRelatedLabel = includeRelated ? (
-    <FormattedMessage
-      id="xpack.spaces.management.copyToSpace.includeRelatedLabel"
-      defaultMessage="Include related saved objects"
-    />
-  ) : (
-    <FormattedMessage
-      id="xpack.spaces.management.copyToSpace.dontIncludeRelatedLabel"
-      defaultMessage="Do not include related saved objects"
-    />
-  );
 
   return (
     <EuiListGroup className="spcCopyToSpaceOptionsView" flush>
       <EuiListGroupItem iconType="copy" label={createNewCopiesLabel} />
       {!createNewCopies && (
-        <EuiListGroupItem iconType={overwrite ? 'check' : 'cross'} label={overwriteLabel} />
+        <EuiListGroupItem
+          iconType={overwrite ? 'check' : 'cross'}
+          label={
+            <FormattedMessage
+              id="xpack.spaces.management.copyToSpace.overwriteLabel"
+              defaultMessage="Automatically overwrite conflicts"
+            />
+          }
+        />
       )}
-      <EuiListGroupItem iconType={includeRelated ? 'check' : 'cross'} label={includeRelatedLabel} />
+      <EuiListGroupItem
+        iconType={includeRelated ? 'check' : 'cross'}
+        label={
+          <FormattedMessage
+            id="xpack.spaces.management.copyToSpace.includeRelatedLabel"
+            defaultMessage="Include related saved objects"
+          />
+        }
+      />
     </EuiListGroup>
   );
 };
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_flyout.tsx
@@ -107,7 +107,7 @@ export const ShareSavedObjectsToSpaceFlyout = (props: Props) => {
               defaultMessage: 'Object is now shared',
             })
           : i18n.translate('xpack.spaces.management.shareToSpace.shareEditSuccessTitle', {
-              defaultMessage: 'Object is updated',
+              defaultMessage: 'Object was updated',
             });
       if (spacesToAdd.length > 0) {
         await spacesManager.shareSavedObjectAdd({ type, id }, spacesToAdd);
@@ -227,7 +227,7 @@ export const ShareSavedObjectsToSpaceFlyout = (props: Props) => {
               <h2>
                 <FormattedMessage
                   id="xpack.spaces.management.shareToSpaceFlyoutHeader"
-                  defaultMessage="Share saved object to space"
+                  defaultMessage="Share to space"
                 />
               </h2>
             </EuiTitle>
diff --git a/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx b/x-pack/plugins/spaces/public/share_saved_objects_to_space/components/share_to_space_form.tsx
@@ -35,7 +35,7 @@ export const ShareToSpaceForm = (props: Props) => {
           title={
             <FormattedMessage
               id="xpack.spaces.management.shareToSpace.shareWarningTitle"
-              defaultMessage="Editing a shared object applies the changes to all spaces"
+              defaultMessage="Editing a shared object applies the changes in all spaces"
             />
           }
           color="warning"

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ const createNewCopiesDisabled = {`
`51`	`51`	`tooltip: i18n.translate(`
`52`	`52`	`'savedObjectsManagement.objectsTable.importModeControl.createNewCopies.disabledText',`
`53`	`53`	`{`
`54`		`- defaultMessage: 'Check if objects were previously copied or imported into the space.',`
	`54`	`+ defaultMessage: 'Check if objects were previously copied or imported.',`
`55`	`55`	`}`
`56`	`56`	`),`
`57`	`57`	`};`
`@@ -64,8 +64,7 @@ const createNewCopiesEnabled = {`
`64`	`64`	`tooltip: i18n.translate(`
`65`	`65`	`'savedObjectsManagement.objectsTable.importModeControl.createNewCopies.enabledText',`
`66`	`66`	`{`
`67`		`- defaultMessage:`
`68`		`- 'This option enables you to create multiple copies of the object in the same space.',`
	`67`	`+ defaultMessage: 'Use this option to create one or more copies of the object.',`
`69`	`68`	`}`
`70`	`69`	`),`
`71`	`70`	`};`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export const ShareToSpaceForm = (props: Props) => {`
`35`	`35`	`title={`
`36`	`36`	`<FormattedMessage`
`37`	`37`	`id="xpack.spaces.management.shareToSpace.shareWarningTitle"`
`38`		`- defaultMessage="Editing a shared object applies the changes to all spaces"`
	`38`	`+ defaultMessage="Editing a shared object applies the changes in all spaces"`
`39`	`39`	`/>`
`40`	`40`	`}`
`41`	`41`	`color="warning"`