[Uptime] Update TLS settings #64111
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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-8*', | ||
| certificatesThresholds: { | ||
| expiration: 7, | ||
| age: 365, | ||
| }, | ||
| }; | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,8 +17,7 @@ import { | |
| } from '@elastic/eui'; | ||
| import { FormattedMessage } from '@kbn/i18n/react'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { isEqual, merge } from 'lodash'; | ||
| import { Link } from 'react-router-dom'; | ||
| import { selectDynamicSettings } from '../state/selectors'; | ||
| import { getDynamicSettings, setDynamicSettings } from '../state/actions/dynamic_settings'; | ||
|
|
@@ -32,14 +31,15 @@ import { | |
| CertificateExpirationForm, | ||
| OnFieldChangeType, | ||
| } from '../components/settings/certificate_form'; | ||
| import * as Translations from './translations'; | ||
|
|
||
| const getFieldErrors = (formFields: DynamicSettings | null) => { | ||
| if (formFields) { | ||
| const blankStr = 'May not be blank'; | ||
| const { certificatesThresholds, heartbeatIndices } = formFields; | ||
| const heartbeatIndErr = heartbeatIndices.match(/^\S+$/) ? '' : blankStr; | ||
| const errorStateErr = certificatesThresholds?.expiration ? null : blankStr; | ||
| const warningStateErr = certificatesThresholds?.age ? null : blankStr; | ||
|
There was a problem hiding this comment. can you also rename var name? There was a problem hiding this comment. I realized we needed to improve this, so I added a type and renamed the var usage in 59e60e8. |
||
| return { | ||
| heartbeatIndices: heartbeatIndErr, | ||
| certificatesThresholds: | ||
|
|
@@ -57,10 +57,7 @@ const getFieldErrors = (formFields: DynamicSettings | null) => { | |
| export const SettingsPage = () => { | ||
| const dss = useSelector(selectDynamicSettings); | ||
|
|
||
| useBreadcrumbs([{ text: Translations.settings.breadcrumbText }]); | ||
|
|
||
| useUptimeTelemetry(UptimePage.Settings); | ||
|
|
||
|
|
@@ -70,52 +67,32 @@ export const SettingsPage = () => { | |
| dispatch(getDynamicSettings()); | ||
| }, [dispatch]); | ||
|
|
||
| const [formFields, setFormFields] = useState<DynamicSettings>({ ...dss.settings }); | ||
|
|
||
| const fieldErrors = getFieldErrors(formFields); | ||
|
|
||
| const isFormValid = !(fieldErrors && Object.values(fieldErrors).find(v => !!v)); | ||
|
|
||
| const onChangeFormField: OnFieldChangeType = changedField => | ||
| setFormFields(Object.assign({ ...merge(formFields, changedField) })); | ||
|
There was a problem hiding this comment. We are using merge bcoz Object.assign doesn't take of nested merging, right? There was a problem hiding this comment. I've gotten rid of merge altogether because it isn't pure and it was editing the state var. I'm wondering if settings shouldn't just be a flat object to avoid recursive concerns when editing slices of it. There was a problem hiding this comment. yes i think having a right data structure is important, i do agree, having nested have made a lot of complexity. if you think, it's worth an effort, go ahead. There was a problem hiding this comment. I'll make a follow-up issue. We have other more important stuff we need to review and it's not worth holding that up for more work in this patch. We don't have any further settings changes planned for the time being, so this complexity shouldn't increase any more than what it is right now until we can get to it. It should be a light patch. There was a problem hiding this comment. Issue: elastic/uptime#175 |
||
|
|
||
| const onApply = (event: React.FormEvent) => { | ||
| event.preventDefault(); | ||
| dispatch(setDynamicSettings(formFields)); | ||
| }; | ||
|
|
||
| const resetForm = () => setFormFields({ ...dss.settings }); | ||
|
|
||
| const isFormDirty = !isEqual(dss.settings, formFields); | ||
| const canEdit: boolean = | ||
| !!useKibana().services?.application?.capabilities.uptime.configureSettings || false; | ||
| const isFormDisabled = dss.loading || !canEdit; | ||
|
|
||
| const cannotEditNotice = canEdit ? null : ( | ||
| <> | ||
| <EuiCallOut title={Translations.settings.editNoticeTitle}> | ||
| {Translations.settings.editNoticeText} | ||
| </EuiCallOut> | ||
| <EuiSpacer size="s" /> | ||
| </> | ||
| ); | ||
|
|
@@ -124,9 +101,7 @@ export const SettingsPage = () => { | |
| <> | ||
| <Link to={OVERVIEW_ROUTE} data-test-subj="uptimeSettingsToOverviewLink"> | ||
| <EuiButtonEmpty size="s" color="primary" iconType="arrowLeft"> | ||
| {Translations.settings.returnToOverviewLinkLabel} | ||
| </EuiButtonEmpty> | ||
| </Link> | ||
| <EuiSpacer size="s" /> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| /* | ||
| * 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 { i18n } from '@kbn/i18n'; | ||
|
|
||
| export const settings = { | ||
| breadcrumbText: i18n.translate('xpack.uptime.settingsBreadcrumbText', { | ||
| defaultMessage: 'Settings', | ||
| }), | ||
| editNoticeTitle: i18n.translate('xpack.uptime.settings.cannotEditTitle', { | ||
| defaultMessage: 'You do not have permission to edit settings.', | ||
| }), | ||
| editNoticeText: i18n.translate('xpack.uptime.settings.cannotEditText', { | ||
| defaultMessage: | ||
| "Your user currently has 'Read' permissions for the Uptime app. Enable a permissions-level of 'All' to edit these settings.", | ||
| }), | ||
| returnToOverviewLinkLabel: i18n.translate('xpack.uptime.settings.returnToOverviewLinkLabel', { | ||
| defaultMessage: 'Return to overview', | ||
| }), | ||
| }; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i think this should be 30 days be default.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in d0246a7.