From 50bed3e0b041fef4bc433b7da25efc31d774c726 Mon Sep 17 00:00:00 2001
From: Cee Chen <constance.chen@elastic.co>
Date: Fri, 23 Aug 2024 10:28:54 -0700
Subject: [PATCH] Remove unnecessary `hasEmptyLabelSpace` prop within
 `EuiDescribedFormGroup`s

- EuiDescribedFormGroups already automatically accounts for form rows without labels, so the `hasEmptyLabelSpace` prop is now unnecessary and adds extra unwanted spacing
---
 .../form_based/dimension_panel/format_selector.tsx    |  1 -
 .../components/connection_mode.tsx                    |  2 +-
 .../components/connection_mode_cloud.tsx              |  2 +-
 .../remote_cluster_form/remote_cluster_form.tsx       |  1 -
 .../components/policy_form/_policy_form.scss          | 10 ----------
 .../include_feature_states_field.tsx                  |  2 +-
 .../include_global_state_field.tsx                    |  2 +-
 .../indices_and_data_streams_field.tsx                |  2 +-
 .../policy_form/steps/step_settings/step_settings.tsx |  4 ++--
 .../components/repository_form/step_one.tsx           |  3 +--
 .../repository_form/type_settings/azure_settings.tsx  |  2 --
 .../repository_form/type_settings/fs_settings.tsx     |  2 --
 .../repository_form/type_settings/gcs_settings.tsx    |  2 --
 .../repository_form/type_settings/hdfs_settings.tsx   |  3 ---
 .../repository_form/type_settings/s3_settings.tsx     |  3 ---
 .../restore_snapshot_form/_restore_snapshot_form.scss | 11 -----------
 .../steps/step_logistics/step_logistics.tsx           | 10 ++++------
 .../restore_snapshot_form/steps/step_settings.tsx     |  4 ++--
 18 files changed, 14 insertions(+), 52 deletions(-)

diff --git a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx
index 08972b236240d..c94bf1e30bb2e 100644
--- a/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx
+++ b/x-pack/plugins/lens/public/datasources/form_based/dimension_panel/format_selector.tsx
@@ -366,7 +366,6 @@ export function FormatSelector(props: FormatSelectorProps) {
           <EuiFormRow
             display="columnCompressed"
             hasEmptyLabelSpace
-            label=" "
             helpText={
               <EuiLink
                 href={docLinks.links.indexPatterns.fieldFormattersNumber}
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode.tsx b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode.tsx
index f44f5ffc0cf9c..b51d389b73014 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode.tsx
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode.tsx
@@ -52,7 +52,7 @@ export const ConnectionMode: FunctionComponent<Props> = (props) => {
               id="xpack.remoteClusters.remoteClusterForm.sectionModeDescription"
               defaultMessage="Use seed nodes by default, or switch to proxy mode."
             />
-            <EuiFormRow hasEmptyLabelSpace fullWidth>
+            <EuiFormRow fullWidth>
               <EuiSwitch
                 label={
                   <FormattedMessage
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode_cloud.tsx b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode_cloud.tsx
index 42dc257b4baf3..b5d27b15de8e2 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode_cloud.tsx
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/components/connection_mode_cloud.tsx
@@ -57,7 +57,7 @@ export const ConnectionModeCloud: FunctionComponent<Props> = (props) => {
             id="xpack.remoteClusters.remoteClusterForm.sectionModeCloudDescription"
             defaultMessage="Configure how to connect to the remote cluster."
           />
-          <EuiFormRow hasEmptyLabelSpace fullWidth>
+          <EuiFormRow fullWidth>
             <EuiSwitch
               label={
                 <FormattedMessage
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.tsx b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.tsx
index 22415edc091a9..e92c515c4162f 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.tsx
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/remote_cluster_form.tsx
@@ -287,7 +287,6 @@ export class RemoteClusterForm extends Component<Props, State> {
         <EuiFormRow
           data-test-subj="remoteClusterFormSkipUnavailableFormRow"
           className="remoteClusterSkipIfUnavailableSwitch"
-          hasEmptyLabelSpace
           fullWidth
           helpText={
             skipUnavailable !== defaultClusterValues.skipUnavailable ? (
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/_policy_form.scss b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/_policy_form.scss
index 389e925f392c2..0f2422a4c54f0 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/_policy_form.scss
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/_policy_form.scss
@@ -1,13 +1,3 @@
-/*
- * Prevent switch controls from moving around when toggling content
- */
-.snapshotRestore__policyForm__stepSettings {
-  .euiFormRow--hasEmptyLabelSpace {
-    min-height: auto;
-    margin-top: $euiFontSizeXS + $euiSizeS + calc($euiSizeXXL / 4);
-  }
-}
-
 /*
  * Allow toggle mode link in indices field label to be flushed right
  */
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/include_feature_states_field/include_feature_states_field.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/include_feature_states_field/include_feature_states_field.tsx
index ee69225766f75..97da14324e44d 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/include_feature_states_field/include_feature_states_field.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/include_feature_states_field/include_feature_states_field.tsx
@@ -82,7 +82,7 @@ export const IncludeFeatureStatesField: FunctionComponent<Props> = ({ policy, on
       }
       fullWidth
     >
-      <EuiFormRow hasEmptyLabelSpace fullWidth>
+      <EuiFormRow fullWidth>
         <EuiSwitch
           data-test-subj="featureStatesToggle"
           label={
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/include_global_state_field/include_global_state_field.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/include_global_state_field/include_global_state_field.tsx
index a30083f05dffd..e91e1c7bbf6b6 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/include_global_state_field/include_global_state_field.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/include_global_state_field/include_global_state_field.tsx
@@ -64,7 +64,7 @@ export const IncludeGlobalStateField: FunctionComponent<Props> = ({ policy, onUp
       }
       fullWidth
     >
-      <EuiFormRow hasEmptyLabelSpace fullWidth>
+      <EuiFormRow fullWidth>
         <EuiSwitch
           data-test-subj="globalStateToggle"
           label={
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/indices_and_data_streams_field/indices_and_data_streams_field.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/indices_and_data_streams_field/indices_and_data_streams_field.tsx
index 6ffd1b1ec031b..6ad3e1704720f 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/indices_and_data_streams_field/indices_and_data_streams_field.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/fields/indices_and_data_streams_field/indices_and_data_streams_field.tsx
@@ -172,7 +172,7 @@ export const IndicesAndDataStreamsField: FunctionComponent<Props> = ({
       }
       fullWidth
     >
-      <EuiFormRow hasEmptyLabelSpace fullWidth>
+      <EuiFormRow fullWidth>
         <Fragment>
           {isManagedPolicy ? (
             <EuiToolTip
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
index e576a6ee090ec..64e08be6d32a5 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/policy_form/steps/step_settings/step_settings.tsx
@@ -71,7 +71,7 @@ export const PolicyStepSettings: React.FunctionComponent<StepProps> = ({
       }
       fullWidth
     >
-      <EuiFormRow hasEmptyLabelSpace fullWidth>
+      <EuiFormRow fullWidth>
         <EuiSwitch
           data-test-subj="ignoreUnavailableIndicesToggle"
           label={
@@ -111,7 +111,7 @@ export const PolicyStepSettings: React.FunctionComponent<StepProps> = ({
       }
       fullWidth
     >
-      <EuiFormRow hasEmptyLabelSpace fullWidth>
+      <EuiFormRow fullWidth>
         <EuiSwitch
           data-test-subj="partialIndicesToggle"
           label={
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx
index fc35e05f9b1cc..7649471f41a19 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/step_one.tsx
@@ -242,7 +242,6 @@ export const RepositoryFormStepOne: React.FunctionComponent<Props> = ({
           />
         </EuiText>
         <EuiFormRow
-          hasEmptyLabelSpace
           describedByIds={['repositoryTypeDescription']}
           fullWidth
           isInvalid={Boolean(hasValidationErrors && validation.errors.type)}
@@ -290,7 +289,7 @@ export const RepositoryFormStepOne: React.FunctionComponent<Props> = ({
       }
       fullWidth
     >
-      <EuiFormRow hasEmptyLabelSpace={true} fullWidth>
+      <EuiFormRow fullWidth>
         <EuiSwitch
           label={
             <FormattedMessage
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/azure_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/azure_settings.tsx
index 6c0b18ccf2082..da061fa8c2abb 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/azure_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/azure_settings.tsx
@@ -219,7 +219,6 @@ export const AzureSettings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.compress)}
           error={settingErrors.compress}
@@ -333,7 +332,6 @@ export const AzureSettings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.readonly)}
           error={settingErrors.readonly}
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/fs_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/fs_settings.tsx
index bc7aafc781081..8c3111a32abd0 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/fs_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/fs_settings.tsx
@@ -122,7 +122,6 @@ export const FSSettings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.compress)}
           error={settingErrors.compress}
@@ -190,7 +189,6 @@ export const FSSettings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.readonly)}
           error={settingErrors.readonly}
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/gcs_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/gcs_settings.tsx
index 4cacb7e628e07..865a628b984b6 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/gcs_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/gcs_settings.tsx
@@ -207,7 +207,6 @@ export const GCSSettings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.compress)}
           error={settingErrors.compress}
@@ -275,7 +274,6 @@ export const GCSSettings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.readonly)}
           error={settingErrors.readonly}
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/hdfs_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/hdfs_settings.tsx
index c40a9765e56d2..5526b6fe006c0 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/hdfs_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/hdfs_settings.tsx
@@ -181,7 +181,6 @@ export const HDFSSettings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.loadDefaults)}
           error={settingErrors.loadDefaults}
@@ -225,7 +224,6 @@ export const HDFSSettings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.compress)}
           error={settingErrors.compress}
@@ -427,7 +425,6 @@ export const HDFSSettings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.readonly)}
           error={settingErrors.readonly}
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/s3_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/s3_settings.tsx
index 26cb2a091762a..88398315a327c 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/s3_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/repository_form/type_settings/s3_settings.tsx
@@ -242,7 +242,6 @@ export const S3Settings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.compress)}
           error={settingErrors.compress}
@@ -294,7 +293,6 @@ export const S3Settings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.serverSideEncryption)}
           error={settingErrors.serverSideEncryption}
@@ -503,7 +501,6 @@ export const S3Settings: React.FunctionComponent<Props> = ({
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           isInvalid={Boolean(hasErrors && settingErrors.readonly)}
           error={settingErrors.readonly}
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/_restore_snapshot_form.scss b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/_restore_snapshot_form.scss
index ec680472edf46..cbb0914ac760f 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/_restore_snapshot_form.scss
+++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/_restore_snapshot_form.scss
@@ -1,14 +1,3 @@
-/*
- * Prevent switch controls from moving around when toggling content
- */
-.snapshotRestore__restoreForm__stepLogistics,
-.snapshotRestore__restoreForm__stepSettings {
-  .euiFormRow--hasEmptyLabelSpace {
-    min-height: auto;
-    margin-top: $euiFontSizeXS + $euiSizeS + calc($euiSizeXXL / 4);
-  }
-}
-
 /*
  * Allow toggle mode link in indices field label to be flushed right
  */
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
index 70f3255bb4d0c..46503c492d034 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_logistics/step_logistics.tsx
@@ -236,7 +236,7 @@ export const RestoreSnapshotStepLogistics: React.FunctionComponent<StepProps> =
         }
         fullWidth
       >
-        <EuiFormRow hasEmptyLabelSpace fullWidth>
+        <EuiFormRow fullWidth>
           <Fragment>
             <EuiSwitch
               label={
@@ -451,7 +451,7 @@ export const RestoreSnapshotStepLogistics: React.FunctionComponent<StepProps> =
         }
         fullWidth
       >
-        <EuiFormRow hasEmptyLabelSpace fullWidth>
+        <EuiFormRow fullWidth>
           <Fragment>
             <EuiSwitch
               label={
@@ -566,7 +566,7 @@ export const RestoreSnapshotStepLogistics: React.FunctionComponent<StepProps> =
         }
         fullWidth
       >
-        <EuiFormRow hasEmptyLabelSpace={true} fullWidth>
+        <EuiFormRow fullWidth>
           <EuiSwitch
             label={
               <FormattedMessage
@@ -601,7 +601,6 @@ export const RestoreSnapshotStepLogistics: React.FunctionComponent<StepProps> =
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           helpText={
             snapshotIncludeGlobalState ? null : (
@@ -660,7 +659,6 @@ export const RestoreSnapshotStepLogistics: React.FunctionComponent<StepProps> =
         fullWidth
       >
         <EuiFormRow
-          hasEmptyLabelSpace={true}
           fullWidth
           helpText={
             snapshotIncludeFeatureStates ? null : (
@@ -732,7 +730,7 @@ export const RestoreSnapshotStepLogistics: React.FunctionComponent<StepProps> =
         }
         fullWidth
       >
-        <EuiFormRow hasEmptyLabelSpace={true} fullWidth>
+        <EuiFormRow fullWidth>
           <EuiSwitch
             label={
               <FormattedMessage
diff --git a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx
index 5b1c23551477e..228bf4c90f629 100644
--- a/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx
+++ b/x-pack/plugins/snapshot_restore/public/application/components/restore_snapshot_form/steps/step_settings.tsx
@@ -143,7 +143,7 @@ export const RestoreSnapshotStepSettings: React.FunctionComponent<StepProps> = (
         }
         fullWidth
       >
-        <EuiFormRow hasEmptyLabelSpace fullWidth>
+        <EuiFormRow fullWidth>
           <Fragment>
             <EuiSwitch
               data-test-subj="modifyIndexSettingsSwitch"
@@ -244,7 +244,7 @@ export const RestoreSnapshotStepSettings: React.FunctionComponent<StepProps> = (
         }
         fullWidth
       >
-        <EuiFormRow hasEmptyLabelSpace fullWidth>
+        <EuiFormRow fullWidth>
           <Fragment>
             <EuiSwitch
               label={