Add type for settings field errors.

elastic · Apr 23, 2020 · 59e60e8 · 59e60e8
1 parent 8412951
commit 59e60e8
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 22 deletions.
diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx b/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx
@@ -19,7 +19,7 @@ describe('CertificateForm', () => {
             heartbeatIndices: 'heartbeat-8*',
             certThresholds: { expiration: 7, age: 36 },
           }}
-          fieldErrors={{}}
+          fieldErrors={null}
           isDisabled={false}
         />
       )

diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx b/x-pack/legacy/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx
@@ -19,7 +19,7 @@ describe('CertificateForm', () => {
             heartbeatIndices: 'heartbeat-8*',
             certThresholds: { expiration: 7, age: 36 },
           }}
-          fieldErrors={{}}
+          fieldErrors={null}
           isDisabled={false}
         />
       )

diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/certificate_form.tsx b/x-pack/legacy/plugins/uptime/public/components/settings/certificate_form.tsx
@@ -17,8 +17,9 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
-import { DynamicSettings, CertStateThresholds } from '../../../common/runtime_types';
+import { CertStateThresholds } from '../../../common/runtime_types';
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../common/constants';
+import { SettingsFormProps } from '../../pages/settings';
 
 interface ChangedValues {
   heartbeatIndices?: string;
@@ -27,14 +28,6 @@ interface ChangedValues {
 
 export type OnFieldChangeType = (changedValues: ChangedValues) => void;
 
-export interface SettingsFormProps {
-  loading: boolean;
-  onChange: OnFieldChangeType;
-  formFields: DynamicSettings | null;
-  fieldErrors: any;
-  isDisabled: boolean;
-}
-
 export const CertificateExpirationForm: React.FC<SettingsFormProps> = ({
   loading,
   onChange,
@@ -70,7 +63,7 @@ export const CertificateExpirationForm: React.FC<SettingsFormProps> = ({
     >
       <EuiFormRow
         describedByIds={['errorState']}
-        error={fieldErrors?.certificatesThresholds?.errorState}
+        error={fieldErrors?.certificatesThresholds?.expirationThresholdError}
         fullWidth
         helpText={
           <FormattedMessage
@@ -83,7 +76,7 @@ export const CertificateExpirationForm: React.FC<SettingsFormProps> = ({
             }}
           />
         }
-        isInvalid={!!fieldErrors?.certificatesThresholds?.errorState}
+        isInvalid={!!fieldErrors?.certificatesThresholds?.expirationThresholdError}
         label={
           <FormattedMessage
             id="xpack.uptime.sourceConfiguration.errorStateLabel"
@@ -120,7 +113,7 @@ export const CertificateExpirationForm: React.FC<SettingsFormProps> = ({
       </EuiFormRow>
       <EuiFormRow
         describedByIds={['warningState']}
-        error={fieldErrors?.certificatesThresholds?.warningState}
+        error={fieldErrors?.certificatesThresholds?.ageThresholdError}
         fullWidth
         helpText={
           <FormattedMessage
@@ -131,7 +124,7 @@ export const CertificateExpirationForm: React.FC<SettingsFormProps> = ({
             }}
           />
         }
-        isInvalid={!!fieldErrors?.certificatesThresholds?.warningState}
+        isInvalid={!!fieldErrors?.certificatesThresholds?.ageThresholdError}
         label={
           <FormattedMessage
             id="xpack.uptime.sourceConfiguration.warningStateLabel"

diff --git a/x-pack/legacy/plugins/uptime/public/components/settings/indices_form.tsx b/x-pack/legacy/plugins/uptime/public/components/settings/indices_form.tsx
@@ -14,8 +14,8 @@ import {
   EuiTitle,
   EuiSpacer,
 } from '@elastic/eui';
-import { SettingsFormProps } from './certificate_form';
 import { DYNAMIC_SETTINGS_DEFAULTS } from '../../../common/constants';
+import { SettingsFormProps } from '../../pages/settings';
 
 export const IndicesForm: React.FC<SettingsFormProps> = ({
   onChange,

diff --git a/x-pack/legacy/plugins/uptime/public/pages/settings.tsx b/x-pack/legacy/plugins/uptime/public/pages/settings.tsx
@@ -33,20 +33,36 @@ import {
 } from '../components/settings/certificate_form';
 import * as Translations from './translations';
 
-const getFieldErrors = (formFields: DynamicSettings | null) => {
+interface SettingsPageFieldErrors {
+  heartbeatIndices: 'May not be blank' | '';
+  certificatesThresholds: {
+    expirationThresholdError: string | null;
+    ageThresholdError: string | null;
+  } | null;
+}
+
+export interface SettingsFormProps {
+  loading: boolean;
+  onChange: OnFieldChangeType;
+  formFields: DynamicSettings | null;
+  fieldErrors: SettingsPageFieldErrors | null;
+  isDisabled: boolean;
+}
+
+const getFieldErrors = (formFields: DynamicSettings | null): SettingsPageFieldErrors | null => {
   if (formFields) {
     const blankStr = 'May not be blank';
     const { certThresholds: certificatesThresholds, heartbeatIndices } = formFields;
     const heartbeatIndErr = heartbeatIndices.match(/^\S+$/) ? '' : blankStr;
-    const errorStateErr = certificatesThresholds?.expiration ? null : blankStr;
-    const warningStateErr = certificatesThresholds?.age ? null : blankStr;
+    const expirationThresholdError = certificatesThresholds?.expiration ? null : blankStr;
+    const ageThresholdError = certificatesThresholds?.age ? null : blankStr;
     return {
       heartbeatIndices: heartbeatIndErr,
       certificatesThresholds:
-        errorStateErr || warningStateErr
+        expirationThresholdError || ageThresholdError
           ? {
-              errorState: errorStateErr,
-              warningState: warningStateErr,
+              expirationThresholdError,
+              ageThresholdError,
             }
           : null,
     };