[7.x] [Uptime] Update TLS settings (#64111) (#64469)

* [Uptime] Update TLS settings (#64111)

* Refactor settings form event handling and modify certs fields.

* Fix/improve broken types/unit/integration/api tests.

* Modify default expiration threshold.

* Rename test vars.

* Implement PR feedback.

* Refresh snapshots, fix broken tests/types.

* Remove unnecessary state spreading.

* Add type for settings field errors.

* Refresh test snapshots.

* Improve punctuation.

* Change default index pattern from 8.x to 7.x value.

Co-authored-by: Elastic Machine <[email protected]>

x-pack/legacy/plugins/uptime/common/constants/index.ts

@@ -9,6 +9,7 @@ export { CHART_FORMAT_LIMITS } from './chart_format_limits';
 export { CLIENT_DEFAULTS } from './client_defaults';
 export { CONTEXT_DEFAULTS } from './context_defaults';
 export * from './capabilities';
+export * from './settings_defaults';
 export { PLUGIN } from './plugin';
 export { QUERY, STATES } from './query';
 export * from './ui';

x-pack/legacy/plugins/uptime/common/constants/settings_defaults.ts

@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License;
+ * you may not use this file except in compliance with the Elastic License.
+ */
+
+import { DynamicSettings } from '../runtime_types';
+
+export const DYNAMIC_SETTINGS_DEFAULTS: DynamicSettings = {
+  heartbeatIndices: 'heartbeat-7*',
+  certThresholds: {
+    expiration: 30,
+    age: 365,
+  },
+};

x-pack/legacy/plugins/uptime/common/runtime_types/dynamic_settings.ts

@@ -6,19 +6,15 @@
 
 import * as t from 'io-ts';
 
-export const CertificatesStatesThresholdType = t.interface({
-  warningState: t.number,
-  errorState: t.number,
+export const CertStateThresholdsType = t.type({
+  age: t.number,
+  expiration: t.number,
 });
 
-export const DynamicSettingsType = t.intersection([
-  t.type({
-    heartbeatIndices: t.string,
-  }),
-  t.partial({
-    certificatesThresholds: CertificatesStatesThresholdType,
-  }),
-]);
+export const DynamicSettingsType = t.type({
+  heartbeatIndices: t.string,
+  certThresholds: CertStateThresholdsType,
+});
 
 export const DynamicSettingsSaveType = t.intersection([
   t.type({
@@ -31,12 +27,4 @@ export const DynamicSettingsSaveType = t.intersection([
 
 export type DynamicSettings = t.TypeOf<typeof DynamicSettingsType>;
 export type DynamicSettingsSaveResponse = t.TypeOf<typeof DynamicSettingsSaveType>;
-export type CertificatesStatesThreshold = t.TypeOf<typeof CertificatesStatesThresholdType>;
-
-export const defaultDynamicSettings: DynamicSettings = {
-  heartbeatIndices: 'heartbeat-7*',
-  certificatesThresholds: {
-    errorState: 7,
-    warningState: 30,
-  },
-};
+export type CertStateThresholds = t.TypeOf<typeof CertStateThresholdsType>;

x-pack/legacy/plugins/uptime/public/components/settings/__tests__/certificate_form.test.tsx

@@ -13,12 +13,13 @@ describe('CertificateForm', () => {
     expect(
       shallowWithRouter(
         <CertificateExpirationForm
+          loading={false}
           onChange={jest.fn()}
           formFields={{
             heartbeatIndices: 'heartbeat-8*',
-            certificatesThresholds: { errorState: 7, warningState: 36 },
+            certThresholds: { expiration: 7, age: 36 },
           }}
-          fieldErrors={{}}
+          fieldErrors={null}
           isDisabled={false}
         />
       )

x-pack/legacy/plugins/uptime/public/components/settings/__tests__/indices_form.test.tsx

@@ -13,12 +13,13 @@ describe('CertificateForm', () => {
     expect(
       shallowWithRouter(
         <IndicesForm
+          loading={false}
           onChange={jest.fn()}
           formFields={{
             heartbeatIndices: 'heartbeat-8*',
-            certificatesThresholds: { errorState: 7, warningState: 36 },
+            certThresholds: { expiration: 7, age: 36 },
           }}
-          fieldErrors={{}}
+          fieldErrors={null}
           isDisabled={false}
         />
       )