Fix and/or simplify prepend/append usages

elastic · Sep 19, 2019 · d8a5547 · d8a5547
1 parent 6c9b3c0
commit d8a5547
Show file tree

Hide file tree

Showing 13 changed files with 216 additions and 404 deletions.
diff --git a/.../search/search_bar/components/saved_query_management/saved_query_management_component.tsx b/.../search/search_bar/components/saved_query_management/saved_query_management_component.tsx
@@ -113,7 +113,6 @@ export const SavedQueryManagementComponent: FunctionComponent<Props> = ({
 
   const savedQueryPopoverButton = (
     <EuiButtonEmpty
-      className="euiFormControlLayout__prepend"
       iconType="arrowDown"
       iconSide="right"
       onClick={() => {
@@ -164,7 +163,6 @@ export const SavedQueryManagementComponent: FunctionComponent<Props> = ({
     <Fragment>
       <EuiPopover
         id="savedQueryPopover"
-        anchorClassName="euiFormControlLayout__prepend"
         button={savedQueryPopoverButton}
         isOpen={isOpen}
         closePopover={() => {

diff --git a/src/legacy/ui/public/vis/editors/default/controls/extended_bounds.tsx b/src/legacy/ui/public/vis/editors/default/controls/extended_bounds.tsx
@@ -19,7 +19,7 @@
 
 import React, { useEffect, ChangeEvent } from 'react';
 
-import { EuiFieldNumber, EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiText } from '@elastic/eui';
+import { EuiFieldNumber, EuiFlexGroup, EuiFlexItem, EuiFormRow } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { isUndefined } from 'lodash';
 import { AggParamEditorProps } from '..';
@@ -95,11 +95,7 @@ function ExtendedBoundsParamEditor({
               fullWidth={true}
               isInvalid={showValidation ? !isValid : false}
               aria-label={minLabel}
-              prepend={
-                <EuiText size="xs">
-                  <strong>{minLabel}</strong>
-                </EuiText>
-              }
+              prepend={minLabel}
               compressed
             />
           </EuiFlexItem>
@@ -111,11 +107,7 @@ function ExtendedBoundsParamEditor({
               fullWidth={true}
               isInvalid={showValidation ? !isValid : false}
               aria-label={maxLabel}
-              prepend={
-                <EuiText size="xs">
-                  <strong>{maxLabel}</strong>
-                </EuiText>
-              }
+              prepend={maxLabel}
               compressed
             />
           </EuiFlexItem>

diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/cron_daily.js b/src/plugins/es_ui_shared/public/components/cron_editor/cron_daily.js
@@ -22,29 +22,14 @@ import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiFormRow,
-  EuiSelect,
-  EuiText,
-} from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiFormRow, EuiSelect } from '@elastic/eui';
 
-export const CronDaily = ({
-  minute,
-  minuteOptions,
-  hour,
-  hourOptions,
-  onChange,
-}) => (
+export const CronDaily = ({ minute, minuteOptions, hour, hourOptions, onChange }) => (
   <Fragment>
     <EuiFormRow
-      label={(
-        <FormattedMessage
-          id="esUi.cronEditor.cronDaily.fieldTimeLabel"
-          defaultMessage="Time"
-        />
-      )}
+      label={
+        <FormattedMessage id="esUi.cronEditor.cronDaily.fieldTimeLabel" defaultMessage="Time" />
+      }
       fullWidth
       data-test-subj="cronFrequencyConfiguration"
     >
@@ -54,20 +39,13 @@ export const CronDaily = ({
             options={hourOptions}
             value={hour}
             aria-label={i18n.translate('esUi.cronEditor.cronDaily.hourSelectLabel', {
-              defaultMessage: 'Hour'
+              defaultMessage: 'Hour',
             })}
             onChange={e => onChange({ hour: e.target.value })}
             fullWidth
-            prepend={(
-              <EuiText size="xs">
-                <strong>
-                  <FormattedMessage
-                    id="esUi.cronEditor.cronDaily.fieldHour.textAtLabel"
-                    defaultMessage="At"
-                  />
-                </strong>
-              </EuiText>
-            )}
+            prepend={i18n.translate('esUi.cronEditor.cronDaily.fieldHour.textAtLabel', {
+              defaultMessage: 'At',
+            })}
             data-test-subj="cronFrequencyDailyHourSelect"
           />
         </EuiFlexItem>
@@ -77,17 +55,11 @@ export const CronDaily = ({
             options={minuteOptions}
             value={minute}
             aria-label={i18n.translate('esUi.cronEditor.cronDaily.minuteSelectLabel', {
-              defaultMessage: 'Minute'
+              defaultMessage: 'Minute',
             })}
             onChange={e => onChange({ minute: e.target.value })}
             fullWidth
-            prepend={(
-              <EuiText size="xs">
-                <strong>
-                  :
-                </strong>
-              </EuiText>
-            )}
+            prepend=":"
             data-test-subj="cronFrequencyDailyMinuteSelect"
           />
         </EuiFlexItem>

diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.js b/src/plugins/es_ui_shared/public/components/cron_editor/cron_editor.js
@@ -21,12 +21,9 @@ import React, { Component, Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { padLeft } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 
-import {
-  EuiSelect,
-  EuiText,
-  EuiFormRow,
-} from '@elastic/eui';
+import { EuiSelect, EuiFormRow } from '@elastic/eui';
 
 import {
   getOrdinalValue,
@@ -81,25 +78,32 @@ const MONTH_OPTIONS = makeSequence(1, 12).map(value => ({
   text: getMonthName(value - 1),
 }));
 
-const UNITS = [{
-  value: MINUTE,
-  text: 'minute',
-}, {
-  value: HOUR,
-  text: 'hour',
-}, {
-  value: DAY,
-  text: 'day',
-}, {
-  value: WEEK,
-  text: 'week',
-}, {
-  value: MONTH,
-  text: 'month',
-}, {
-  value: YEAR,
-  text: 'year',
-}];
+const UNITS = [
+  {
+    value: MINUTE,
+    text: 'minute',
+  },
+  {
+    value: HOUR,
+    text: 'hour',
+  },
+  {
+    value: DAY,
+    text: 'day',
+  },
+  {
+    value: WEEK,
+    text: 'week',
+  },
+  {
+    value: MONTH,
+    text: 'month',
+  },
+  {
+    value: YEAR,
+    text: 'year',
+  },
+];
 
 const frequencyToFieldsMap = {
   [MINUTE]: {},
@@ -185,7 +189,7 @@ export class CronEditor extends Component {
     frequency: PropTypes.string.isRequired,
     cronExpression: PropTypes.string.isRequired,
     onChange: PropTypes.func.isRequired,
-  }
+  };
 
   static getDerivedStateFromProps(props) {
     const { cronExpression } = props;
@@ -209,12 +213,15 @@ export class CronEditor extends Component {
 
     // Update fields which aren't editable with acceptable baseline values.
     const editableFields = Object.keys(frequencyToFieldsMap[frequency]);
-    const inheritedFields = editableFields.reduce((baselineFields, field) => {
-      if (fieldToPreferredValueMap[field] != null) {
-        baselineFields[field] = fieldToPreferredValueMap[field];
-      }
-      return baselineFields;
-    }, { ...frequencyToBaselineFieldsMap[frequency] });
+    const inheritedFields = editableFields.reduce(
+      (baselineFields, field) => {
+        if (fieldToPreferredValueMap[field] != null) {
+          baselineFields[field] = fieldToPreferredValueMap[field];
+        }
+        return baselineFields;
+      },
+      { ...frequencyToBaselineFieldsMap[frequency] }
+    );
 
     const newCronExpression = cronPartsToExpression(inheritedFields);
 
@@ -231,17 +238,20 @@ export class CronEditor extends Component {
     const editableFields = Object.keys(frequencyToFieldsMap[frequency]);
     const newFieldToPreferredValueMap = {};
 
-    const editedFields = editableFields.reduce((accumFields, field) => {
-      if (fields[field] !== undefined) {
-        accumFields[field] = fields[field];
-        // Once the user touches a field, we want to persist its value as the user changes
-        // the cron frequency.
-        newFieldToPreferredValueMap[field] = fields[field];
-      } else {
-        accumFields[field] = this.state[field];
-      }
-      return accumFields;
-    }, { ...frequencyToBaselineFieldsMap[frequency] });
+    const editedFields = editableFields.reduce(
+      (accumFields, field) => {
+        if (fields[field] !== undefined) {
+          accumFields[field] = fields[field];
+          // Once the user touches a field, we want to persist its value as the user changes
+          // the cron frequency.
+          newFieldToPreferredValueMap[field] = fields[field];
+        } else {
+          accumFields[field] = this.state[field];
+        }
+        return accumFields;
+      },
+      { ...frequencyToBaselineFieldsMap[frequency] }
+    );
 
     const newCronExpression = cronPartsToExpression(editedFields);
 
@@ -251,20 +261,14 @@ export class CronEditor extends Component {
       fieldToPreferredValueMap: {
         ...fieldToPreferredValueMap,
         ...newFieldToPreferredValueMap,
-      }
+      },
     });
   };
 
   renderForm() {
     const { frequency } = this.props;
 
-    const {
-      minute,
-      hour,
-      day,
-      date,
-      month,
-    } = this.state;
+    const { minute, hour, day, date, month } = this.state;
 
     switch (frequency) {
       case MINUTE:
@@ -342,29 +346,19 @@ export class CronEditor extends Component {
     return (
       <Fragment>
         <EuiFormRow
-          label={(
-            <FormattedMessage
-              id="esUi.cronEditor.fieldFrequencyLabel"
-              defaultMessage="Frequency"
-            />
-          )}
+          label={
+            <FormattedMessage id="esUi.cronEditor.fieldFrequencyLabel" defaultMessage="Frequency" />
+          }
           fullWidth
         >
           <EuiSelect
             options={UNITS}
             value={frequency}
             onChange={e => this.onChangeFrequency(e.target.value)}
             fullWidth
-            prepend={(
-              <EuiText size="xs">
-                <strong>
-                  <FormattedMessage
-                    id="esUi.cronEditor.textEveryLabel"
-                    defaultMessage="Every"
-                  />
-                </strong>
-              </EuiText>
-            )}
+            prepend={i18n.translate('esUi.cronEditor.textEveryLabel', {
+              defaultMessage: 'Every',
+            })}
             data-test-subj="cronFrequencySelect"
           />
         </EuiFormRow>

diff --git a/src/plugins/es_ui_shared/public/components/cron_editor/cron_hourly.js b/src/plugins/es_ui_shared/public/components/cron_editor/cron_hourly.js
@@ -20,26 +20,16 @@
 import React, { Fragment } from 'react';
 import PropTypes from 'prop-types';
 import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 
-import {
-  EuiFormRow,
-  EuiSelect,
-  EuiText,
-} from '@elastic/eui';
+import { EuiFormRow, EuiSelect } from '@elastic/eui';
 
-export const CronHourly = ({
-  minute,
-  minuteOptions,
-  onChange,
-}) => (
+export const CronHourly = ({ minute, minuteOptions, onChange }) => (
   <Fragment>
     <EuiFormRow
-      label={(
-        <FormattedMessage
-          id="esUi.cronEditor.cronHourly.fieldTimeLabel"
-          defaultMessage="Minute"
-        />
-      )}
+      label={
+        <FormattedMessage id="esUi.cronEditor.cronHourly.fieldTimeLabel" defaultMessage="Minute" />
+      }
       fullWidth
       data-test-subj="cronFrequencyConfiguration"
     >
@@ -48,16 +38,9 @@ export const CronHourly = ({
         value={minute}
         onChange={e => onChange({ minute: e.target.value })}
         fullWidth
-        prepend={(
-          <EuiText size="xs">
-            <strong>
-              <FormattedMessage
-                id="esUi.cronEditor.cronHourly.fieldMinute.textAtLabel"
-                defaultMessage="At"
-              />
-            </strong>
-          </EuiText>
-        )}
+        prepend={i18n.translate('esUi.cronEditor.cronHourly.fieldMinute.textAtLabel', {
+          defaultMessage: 'At',
+        })}
         data-test-subj="cronFrequencyHourlyMinuteSelect"
       />
     </EuiFormRow>