-
Notifications
You must be signed in to change notification settings - Fork 8.3k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[Synthetics] Fix/refactor usage of default url params, fixes loading …
…states (#150367) Co-authored-by: kibanamachine <42973632+kibanamachine@users.noreply.github.com>
- Loading branch information
1 parent
c074504
commit db251ed
Showing
69 changed files
with
651 additions
and
235 deletions.
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
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
82 changes: 82 additions & 0 deletions
82
...ns/synthetics/public/apps/synthetics/components/common/components/auto_refresh_button.tsx
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,82 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import React, { useEffect, useRef } from 'react'; | ||
| import { EuiAutoRefreshButton, OnRefreshChangeProps } from '@elastic/eui'; | ||
| import { useDispatch, useSelector } from 'react-redux'; | ||
| import { CLIENT_DEFAULTS_SYNTHETICS } from '../../../../../../common/constants/synthetics/client_defaults'; | ||
| import { SyntheticsUrlParams } from '../../../utils/url_params'; | ||
| import { useUrlParams } from '../../../hooks'; | ||
| import { | ||
| selectRefreshInterval, | ||
| selectRefreshPaused, | ||
| setRefreshIntervalAction, | ||
| setRefreshPausedAction, | ||
| } from '../../../state'; | ||
| const { AUTOREFRESH_INTERVAL_SECONDS, AUTOREFRESH_IS_PAUSED } = CLIENT_DEFAULTS_SYNTHETICS; | ||
|
|
||
| const replaceDefaults = ({ refreshPaused, refreshInterval }: Partial<SyntheticsUrlParams>) => { | ||
| return { | ||
| refreshInterval: refreshInterval === AUTOREFRESH_INTERVAL_SECONDS ? undefined : refreshInterval, | ||
| refreshPaused: refreshPaused === AUTOREFRESH_IS_PAUSED ? undefined : refreshPaused, | ||
| }; | ||
| }; | ||
| export const AutoRefreshButton = () => { | ||
| const dispatch = useDispatch(); | ||
|
|
||
| const refreshPaused = useSelector(selectRefreshPaused); | ||
| const refreshInterval = useSelector(selectRefreshInterval); | ||
|
|
||
| const [getUrlsParams, updateUrlParams] = useUrlParams(); | ||
|
|
||
| const { refreshInterval: urlRefreshInterval, refreshPaused: urlIsPaused } = getUrlsParams(); | ||
|
|
||
| const isFirstRender = useRef(true); | ||
|
|
||
| useEffect(() => { | ||
| if (isFirstRender.current) { | ||
| // sync url state with redux state on first render | ||
| dispatch(setRefreshIntervalAction(urlRefreshInterval)); | ||
| dispatch(setRefreshPausedAction(urlIsPaused)); | ||
| isFirstRender.current = false; | ||
| } else { | ||
| // sync redux state with url state on subsequent renders | ||
| if (urlRefreshInterval !== refreshInterval || urlIsPaused !== refreshPaused) { | ||
| updateUrlParams( | ||
| replaceDefaults({ | ||
| refreshInterval, | ||
| refreshPaused, | ||
| }), | ||
| true | ||
| ); | ||
| } | ||
| } | ||
| }, [updateUrlParams, refreshInterval, refreshPaused, urlRefreshInterval, urlIsPaused, dispatch]); | ||
|
|
||
| const onRefreshChange = (newProps: OnRefreshChangeProps) => { | ||
| dispatch(setRefreshIntervalAction(newProps.refreshInterval / 1000)); | ||
| dispatch(setRefreshPausedAction(newProps.isPaused)); | ||
|
|
||
| updateUrlParams( | ||
| replaceDefaults({ | ||
| refreshInterval: newProps.refreshInterval / 1000, | ||
| refreshPaused: newProps.isPaused, | ||
| }), | ||
| true | ||
| ); | ||
| }; | ||
|
|
||
| return ( | ||
| <EuiAutoRefreshButton | ||
| size="m" | ||
| isPaused={refreshPaused} | ||
| refreshInterval={refreshInterval * 1000} | ||
| onRefreshChange={onRefreshChange} | ||
| shortHand | ||
| /> | ||
| ); | ||
| }; |
71 changes: 71 additions & 0 deletions
71
...plugins/synthetics/public/apps/synthetics/components/common/components/last_refreshed.tsx
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,71 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the Elastic License | ||
| * 2.0; you may not use this file except in compliance with the Elastic License | ||
| * 2.0. | ||
| */ | ||
|
|
||
| import React, { useEffect, useState } from 'react'; | ||
| import moment from 'moment'; | ||
| import { EuiText } from '@elastic/eui'; | ||
| import { FormattedMessage } from '@kbn/i18n-react'; | ||
| import { useSelector } from 'react-redux'; | ||
| import { SHORT_TIMESPAN_LOCALE, SHORT_TS_LOCALE } from '../../../../../../common/constants'; | ||
| import { useSyntheticsRefreshContext } from '../../../contexts'; | ||
| import { selectRefreshPaused } from '../../../state'; | ||
|
|
||
| export function LastRefreshed() { | ||
| const { lastRefresh: lastRefreshed } = useSyntheticsRefreshContext(); | ||
| const [refresh, setRefresh] = useState(() => Date.now()); | ||
|
|
||
| const refreshPaused = useSelector(selectRefreshPaused); | ||
|
|
||
| useEffect(() => { | ||
| const interVal = setInterval(() => { | ||
| setRefresh(Date.now()); | ||
| }, 5000); | ||
|
|
||
| return () => { | ||
| clearInterval(interVal); | ||
| }; | ||
| }, []); | ||
|
|
||
| useEffect(() => { | ||
| setRefresh(Date.now()); | ||
| }, [lastRefreshed]); | ||
|
|
||
| if (!lastRefreshed || refreshPaused) { | ||
| return null; | ||
| } | ||
|
|
||
| const isWarning = moment().diff(moment(lastRefreshed), 'minutes') > 1; | ||
| const isDanger = moment().diff(moment(lastRefreshed), 'minutes') > 5; | ||
|
|
||
| const prevLocal: string = moment.locale() ?? 'en'; | ||
|
|
||
| const shortLocale = moment.locale(SHORT_TS_LOCALE) === SHORT_TS_LOCALE; | ||
| if (!shortLocale) { | ||
| moment.defineLocale(SHORT_TS_LOCALE, SHORT_TIMESPAN_LOCALE); | ||
| } | ||
|
|
||
| const updatedDate = moment(lastRefreshed).from(refresh); | ||
|
|
||
| // Need to reset locale so it doesn't effect other parts of the app | ||
| moment.locale(prevLocal); | ||
|
|
||
| return ( | ||
| <EuiText | ||
| color={isDanger ? 'danger' : isWarning ? 'warning' : 'subdued'} | ||
| size="s" | ||
| css={{ lineHeight: '40px', fontWeight: isWarning ? 'bold' : undefined }} | ||
| > | ||
| <FormattedMessage | ||
| id="xpack.synthetics.lastUpdated.label" | ||
| defaultMessage="Updated {updatedDate}" | ||
| values={{ | ||
| updatedDate, | ||
| }} | ||
| /> | ||
| </EuiText> | ||
| ); | ||
| } |
Oops, something went wrong.