Update saved object management UI text (#76826)

Author: jportner

src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap

@@ -267,6 +267,10 @@ describe('Flyout', () => {
 
       expect(component.state('status')).toBe('success');
       expect(component.find('EuiFlyout ImportSummary')).toMatchSnapshot();
+      const cancelButton = await component.find(
+        'EuiButtonEmpty[data-test-subj="importSavedObjectsCancelBtn"]'
+      );
+      expect(cancelButton.prop('disabled')).toBe(true);
     });
   });
 

src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/header.test.tsx.snap

@@ -729,7 +729,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
           label={
             <FormattedMessage
               id="savedObjectsManagement.objectsTable.flyout.selectFileToImportFormRowLabel"
-              defaultMessage="Please select a file to import"
+              defaultMessage="Select a file to import"
             />
           }
         >
@@ -756,7 +756,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
   }
 
   renderFooter() {
-    const { status } = this.state;
+    const { isLegacyFile, status } = this.state;
     const { done, close } = this.props;
 
     let confirmButton;
@@ -773,7 +773,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
     } else if (this.hasUnmatchedReferences) {
       confirmButton = (
         <EuiButton
-          onClick={this.state.isLegacyFile ? this.confirmLegacyImport : this.resolveImportErrors}
+          onClick={isLegacyFile ? this.confirmLegacyImport : this.resolveImportErrors}
           size="s"
           fill
           isLoading={status === 'loading'}
@@ -788,7 +788,7 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
     } else {
       confirmButton = (
         <EuiButton
-          onClick={this.state.isLegacyFile ? this.legacyImport : this.import}
+          onClick={isLegacyFile ? this.legacyImport : this.import}
           size="s"
           fill
           isLoading={status === 'loading'}
@@ -805,7 +805,12 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
     return (
       <EuiFlexGroup justifyContent="spaceBetween">
         <EuiFlexItem grow={false}>
-          <EuiButtonEmpty onClick={close} size="s">
+          <EuiButtonEmpty
+            onClick={close}
+            size="s"
+            disabled={status === 'loading' || (isLegacyFile === false && status === 'success')}
+            data-test-subj="importSavedObjectsCancelBtn"
+          >
             <FormattedMessage
               id="savedObjectsManagement.objectsTable.flyout.import.cancelButtonLabel"
               defaultMessage="Cancel"

src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.test.tsx

@@ -101,10 +101,7 @@ export const Header = ({
         <EuiTextColor color="subdued">
           <FormattedMessage
             id="savedObjectsManagement.objectsTable.howToDeleteSavedObjectsDescription"
-            defaultMessage="From here you can delete saved objects, such as saved searches.
-            You can also edit the raw data of saved objects.
-            Typically objects are only modified via their associated application,
-            which is probably what you should use instead of this screen."
+            defaultMessage="Manage and share your saved objects. To edit the underlying data of an object, go to its associated application."
           />
         </EuiTextColor>
       </p>

src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx

@@ -51,8 +51,7 @@ const createNewCopiesDisabled = {
   tooltip: i18n.translate(
     'savedObjectsManagement.objectsTable.importModeControl.createNewCopies.disabledText',
     {
-      defaultMessage:
-        'Check if each object was previously copied or imported into the destination space.',
+      defaultMessage: 'Check if objects were previously copied or imported.',
     }
   ),
 };
@@ -64,21 +63,23 @@ const createNewCopiesEnabled = {
   ),
   tooltip: i18n.translate(
     'savedObjectsManagement.objectsTable.importModeControl.createNewCopies.enabledText',
-    { defaultMessage: 'All imported objects will be created with new random IDs.' }
+    {
+      defaultMessage: 'Use this option to create one or more copies of the object.',
+    }
   ),
 };
 const overwriteEnabled = {
   id: 'overwriteEnabled',
   label: i18n.translate(
     'savedObjectsManagement.objectsTable.importModeControl.overwrite.enabledLabel',
-    { defaultMessage: 'Automatically try to overwrite conflicts' }
+    { defaultMessage: 'Automatically overwrite conflicts' }
   ),
 };
 const overwriteDisabled = {
   id: 'overwriteDisabled',
   label: i18n.translate(
     'savedObjectsManagement.objectsTable.importModeControl.overwrite.disabledLabel',
-    { defaultMessage: 'Request action when conflict occurs' }
+    { defaultMessage: 'Request action on conflict' }
   ),
 };
 const importOptionsTitle = i18n.translate(

src/plugins/saved_objects_management/public/management_section/objects_table/components/header.tsx

@@ -70,7 +70,7 @@ describe('ImportSummary', () => {
     const wrapper = shallowWithI18nProvider(<ImportSummary {...props} />);
 
     expect(findHeader(wrapper).childAt(0).props()).toEqual(
-      expect.objectContaining({ values: { importCount: 1 } })
+      expect.not.objectContaining({ values: expect.anything() }) // no importCount for singular
     );
     const countCreated = findCountCreated(wrapper);
     expect(countCreated).toHaveLength(1);
@@ -90,7 +90,7 @@ describe('ImportSummary', () => {
     const wrapper = shallowWithI18nProvider(<ImportSummary {...props} />);
 
     expect(findHeader(wrapper).childAt(0).props()).toEqual(
-      expect.objectContaining({ values: { importCount: 1 } })
+      expect.not.objectContaining({ values: expect.anything() }) // no importCount for singular
     );
     expect(findCountCreated(wrapper)).toHaveLength(0);
     const countOverwritten = findCountOverwritten(wrapper);
@@ -110,7 +110,7 @@ describe('ImportSummary', () => {
     const wrapper = shallowWithI18nProvider(<ImportSummary {...props} />);
 
     expect(findHeader(wrapper).childAt(0).props()).toEqual(
-      expect.objectContaining({ values: { importCount: 1 } })
+      expect.not.objectContaining({ values: expect.anything() }) // no importCount for singular
     );
     expect(findCountCreated(wrapper)).toHaveLength(0);
     expect(findCountOverwritten(wrapper)).toHaveLength(0);

src/plugins/saved_objects_management/public/management_section/objects_table/components/import_mode_control.tsx

@@ -141,7 +141,7 @@ const getCountIndicators = (importItems: ImportItem[]) => {
   );
 };
 
-const getStatusIndicator = ({ outcome, errorMessage }: ImportItem) => {
+const getStatusIndicator = ({ outcome, errorMessage = 'Error' }: ImportItem) => {
   switch (outcome) {
     case 'created':
       return (
@@ -168,8 +168,8 @@ const getStatusIndicator = ({ outcome, errorMessage }: ImportItem) => {
           type={'alert'}
           color={'danger'}
           content={i18n.translate('savedObjectsManagement.importSummary.errorOutcomeLabel', {
-            defaultMessage: 'Error{message}',
-            values: { message: errorMessage ? `: ${errorMessage}` : '' },
+            defaultMessage: '{errorMessage}',
+            values: { errorMessage },
           })}
         />
       );
@@ -194,11 +194,18 @@ export const ImportSummary = ({ failedImports, successfulImports }: ImportSummar
         }
       >
         <h3>
-          <FormattedMessage
-            id="savedObjectsManagement.importSummary.headerLabel"
-            defaultMessage="{importCount} object(s) imported"
-            values={{ importCount: importItems.length }}
-          />
+          {importItems.length === 1 ? (
+            <FormattedMessage
+              id="savedObjectsManagement.importSummary.headerLabelSingular"
+              defaultMessage="1 object imported"
+            />
+          ) : (
+            <FormattedMessage
+              id="savedObjectsManagement.importSummary.headerLabelPlural"
+              defaultMessage="{importCount} objects imported"
+              values={{ importCount: importItems.length }}
+            />
+          )}
         </h3>
       </EuiTitle>
       <EuiSpacer size="m" />

src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.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, are you sure you want to 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, do you want to overwrite one of them?"`
+        `"\\"baz\\" conflicts with multiple existing objects. Overwrite one?"`
       );
       expect(wrapper.find('EuiSuperSelect')).toHaveLength(1);
     });

src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.tsx

@@ -98,15 +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, are you sure you want to 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, do you want to overwrite one of them?',
+            defaultMessage: '"{title}" conflicts with multiple existing objects. Overwrite one?',
             values: { title },
           }
         );