From d6ac10c47521ba59625cb16eb4cab8fed722b5e5 Mon Sep 17 00:00:00 2001
From: Sergey Myssak <sergey.myssak@gmail.com>
Date: Sat, 20 May 2023 22:09:36 +0600
Subject: [PATCH] Add new or remove extra tags and styles (#3967)

Co-authored-by: Andrey Myssak <andreymyssak@gmail.com>
Signed-off-by: Sergey Myssak <sergey.myssak@gmail.com>
---
 .../__snapshots__/flyout.test.tsx.snap        | 194 +++++++++---------
 .../__snapshots__/relationships.test.tsx.snap |   8 +-
 .../objects_table/components/flyout.tsx       |   8 +-
 .../components/import_summary.scss            |   4 -
 .../components/relationships.tsx              |   2 +-
 5 files changed, 105 insertions(+), 111 deletions(-)

diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
index f9091d06c691..c91fcbd7769e 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/flyout.test.tsx.snap
@@ -21,43 +21,41 @@ exports[`Flyout conflicts should allow conflict resolution 1`] = `
     </EuiTitle>
   </EuiFlyoutHeader>
   <EuiFlyoutBody>
-    <span>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiCallOut
-        color="warning"
-        data-test-subj="importSavedObjectsConflictsWarning"
-        iconType="help"
-        title={
-          <FormattedMessage
-            defaultMessage="Index Pattern Conflicts"
-            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
-            values={Object {}}
-          />
-        }
-      >
-        <p>
-          <FormattedMessage
-            defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
-            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
-            values={
-              Object {
-                "indexPatternLink": <EuiLink
-                  href=""
-                >
-                  <FormattedMessage
-                    defaultMessage="create a new index pattern"
-                    id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
-                    values={Object {}}
-                  />
-                </EuiLink>,
-              }
+    <EuiSpacer
+      size="s"
+    />
+    <EuiCallOut
+      color="warning"
+      data-test-subj="importSavedObjectsConflictsWarning"
+      iconType="help"
+      title={
+        <FormattedMessage
+          defaultMessage="Index Pattern Conflicts"
+          id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
+          values={Object {}}
+        />
+      }
+    >
+      <p>
+        <FormattedMessage
+          defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
+          id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
+          values={
+            Object {
+              "indexPatternLink": <EuiLink
+                href=""
+              >
+                <FormattedMessage
+                  defaultMessage="create a new index pattern"
+                  id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
+                  values={Object {}}
+                />
+              </EuiLink>,
             }
-          />
-        </p>
-      </EuiCallOut>
-    </span>
+          }
+        />
+      </p>
+    </EuiCallOut>
     <EuiInMemoryTable
       columns={
         Array [
@@ -284,71 +282,67 @@ exports[`Flyout legacy conflicts should allow conflict resolution 1`] = `
     </EuiTitle>
   </EuiFlyoutHeader>
   <EuiFlyoutBody>
-    <span>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiCallOut
-        color="warning"
-        data-test-subj="importSavedObjectsLegacyWarning"
-        iconType="help"
-        title={
-          <FormattedMessage
-            defaultMessage="Support for JSON files is going away"
-            id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle"
-            values={Object {}}
-          />
-        }
-      >
-        <p>
-          <FormattedMessage
-            defaultMessage="Use our updated export to generate NDJSON files, and you'll be all set."
-            id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody"
-            values={Object {}}
-          />
-        </p>
-      </EuiCallOut>
-      <EuiSpacer
-        size="m"
-      />
-    </span>
-    <span>
-      <EuiSpacer
-        size="s"
-      />
-      <EuiCallOut
-        color="warning"
-        data-test-subj="importSavedObjectsConflictsWarning"
-        iconType="help"
-        title={
-          <FormattedMessage
-            defaultMessage="Index Pattern Conflicts"
-            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
-            values={Object {}}
-          />
-        }
-      >
-        <p>
-          <FormattedMessage
-            defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
-            id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
-            values={
-              Object {
-                "indexPatternLink": <EuiLink
-                  href=""
-                >
-                  <FormattedMessage
-                    defaultMessage="create a new index pattern"
-                    id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
-                    values={Object {}}
-                  />
-                </EuiLink>,
-              }
+    <EuiSpacer
+      size="s"
+    />
+    <EuiCallOut
+      color="warning"
+      data-test-subj="importSavedObjectsLegacyWarning"
+      iconType="help"
+      title={
+        <FormattedMessage
+          defaultMessage="Support for JSON files is going away"
+          id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedTitle"
+          values={Object {}}
+        />
+      }
+    >
+      <p>
+        <FormattedMessage
+          defaultMessage="Use our updated export to generate NDJSON files, and you'll be all set."
+          id="savedObjectsManagement.objectsTable.flyout.legacyFileUsedBody"
+          values={Object {}}
+        />
+      </p>
+    </EuiCallOut>
+    <EuiSpacer
+      size="m"
+    />
+    <EuiSpacer
+      size="s"
+    />
+    <EuiCallOut
+      color="warning"
+      data-test-subj="importSavedObjectsConflictsWarning"
+      iconType="help"
+      title={
+        <FormattedMessage
+          defaultMessage="Index Pattern Conflicts"
+          id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsTitle"
+          values={Object {}}
+        />
+      }
+    >
+      <p>
+        <FormattedMessage
+          defaultMessage="The following saved objects use index patterns that do not exist. Please select the index patterns you'd like re-associated with them. You can {indexPatternLink} if necessary."
+          id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsDescription"
+          values={
+            Object {
+              "indexPatternLink": <EuiLink
+                href=""
+              >
+                <FormattedMessage
+                  defaultMessage="create a new index pattern"
+                  id="savedObjectsManagement.objectsTable.flyout.indexPatternConflictsCalloutLinkText"
+                  values={Object {}}
+                />
+              </EuiLink>,
             }
-          />
-        </p>
-      </EuiCallOut>
-    </span>
+          }
+        />
+      </p>
+    </EuiCallOut>
     <EuiInMemoryTable
       columns={
         Array [
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
index b4842f289136..52f4b67ee238 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/__snapshots__/relationships.test.tsx.snap
@@ -197,7 +197,9 @@ exports[`Relationships from legacy app should render errors 1`] = `
         />
       }
     >
-      foo
+      <p>
+        foo
+      </p>
     </EuiCallOut>
   </EuiFlyoutBody>
 </EuiFlyout>
@@ -887,7 +889,9 @@ exports[`Relationships should render errors 1`] = `
         />
       }
     >
-      foo
+      <p>
+        foo
+      </p>
     </EuiCallOut>
   </EuiFlyoutBody>
 </EuiFlyout>
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
index b0dd8c269039..35457ccf9a56 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/flyout.tsx
@@ -918,16 +918,16 @@ export class Flyout extends Component<FlyoutProps, FlyoutState> {
     return (
       <Fragment>
         {legacyFileWarning && (
-          <span>
+          <>
             <EuiSpacer size="s" />
             {legacyFileWarning}
-          </span>
+          </>
         )}
         {indexPatternConflictsWarning && (
-          <span>
+          <>
             <EuiSpacer size="s" />
             {indexPatternConflictsWarning}
-          </span>
+          </>
         )}
       </Fragment>
     );
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss
index 4b46c1244e24..99e824f3b4f3 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/import_summary.scss
@@ -14,7 +14,3 @@
 .savedObjectsManagementImportSummary__errorCount {
   color: $euiColorDangerText;
 }
-
-.savedObjectsManagementImportSummary__icon {
-  margin-left: $euiSizeXS;
-}
diff --git a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
index ff42351d83af..bcb56191b971 100644
--- a/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
+++ b/src/plugins/saved_objects_management/public/management_section/objects_table/components/relationships.tsx
@@ -116,7 +116,7 @@ export class Relationships extends Component<RelationshipsProps, RelationshipsSt
         }
         color="danger"
       >
-        {error}
+        <p>{error}</p>
       </EuiCallOut>
     );
   }