-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
test(MaintenancePage): fix for flacky test [YTFRONT-3772]
- Loading branch information
1 parent
24c142e
commit 3b10286
Showing
8 changed files
with
70 additions
and
88 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
62 changes: 24 additions & 38 deletions
62
packages/ui/src/ui/containers/MaintenancePage/HandleMaintenance.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 |
|---|---|---|
| @@ -1,51 +1,37 @@ | ||
| import React from 'react'; | ||
| import {ConnectedProps, connect} from 'react-redux'; | ||
| import {useSelector} from 'react-redux'; | ||
|
|
||
| import {MaintenancePage} from '../../containers/MaintenancePage/MaintenancePage'; | ||
| import {RootState} from '../../store/reducers'; | ||
| import {isMaintenanceIgnored, setMaintenanceIgnored} from '../../utils/maintenance'; | ||
| import {getMaintenanceEvent} from '../../store/selectors/global/maintenance'; | ||
|
|
||
| type Props = { | ||
| cluster: string; | ||
| children: React.ReactNode; | ||
| maintenanceContent?: React.ReactNode; | ||
| emptyMaintenance?: boolean; | ||
| }; | ||
|
|
||
| type ReduxProps = ConnectedProps<typeof connector>; | ||
|
|
||
| class HandleMaintenance extends React.Component<Props & ReduxProps> { | ||
| render() { | ||
| const {cluster, maintenancePageEvent, maintenanceContent, children} = this.props; | ||
|
|
||
| if (maintenancePageEvent) { | ||
| const isIgnored = isMaintenanceIgnored(cluster); | ||
|
|
||
| if (!isIgnored) { | ||
| return maintenanceContent !== undefined ? ( | ||
| maintenanceContent | ||
| ) : ( | ||
| <MaintenancePage | ||
| cluster={cluster} | ||
| maintenancePageEvent={maintenancePageEvent} | ||
| onProceed={() => { | ||
| setMaintenanceIgnored(cluster); | ||
| this.forceUpdate(); | ||
| }} | ||
| /> | ||
| ); | ||
| } | ||
| export function HandleMaintenance({cluster, children, emptyMaintenance}: Props) { | ||
| const [c, forceUpdate] = React.useState(0); | ||
|
|
||
| const maintenancePageEvent = useSelector(getMaintenanceEvent); | ||
|
|
||
| if (maintenancePageEvent) { | ||
| const isIgnored = isMaintenanceIgnored(cluster); | ||
|
|
||
| if (!isIgnored) { | ||
| return emptyMaintenance ? null : ( | ||
| <MaintenancePage | ||
| cluster={cluster} | ||
| maintenancePageEvent={maintenancePageEvent} | ||
| onProceed={() => { | ||
| setMaintenanceIgnored(cluster); | ||
| forceUpdate(c + 1); | ||
| }} | ||
| /> | ||
| ); | ||
| } | ||
|
|
||
| return children; | ||
| } | ||
| } | ||
|
|
||
| const mapStateToProps = (state: RootState) => { | ||
| const {maintenancePageEvent, eventsFirstUpdate} = state.global; | ||
|
|
||
| return {maintenancePageEvent, eventsFirstUpdate}; | ||
| }; | ||
|
|
||
| const connector = connect(mapStateToProps); | ||
|
|
||
| export default connector(HandleMaintenance); | ||
| return children; | ||
| } |
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 |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| import {createSelector} from 'reselect'; | ||
| import {RootState} from '../../../store/reducers'; | ||
| import {getCluster} from './cluster'; | ||
|
|
||
| const getOngoingEvents = (state: RootState) => state.global.ongoingEvents; | ||
|
|
||
| export const getMaintenanceEvent = createSelector( | ||
| [getCluster, getOngoingEvents], | ||
| (cluster, ongoing) => { | ||
| if (!ongoing?.events?.length || cluster !== ongoing.cluster) { | ||
| return undefined; | ||
| } | ||
|
|
||
| return ongoing.events.find((item) => { | ||
| try { | ||
| const meta = JSON.parse(item.meta!); | ||
| return meta && meta.show_maintenance_page; | ||
| } catch (err) { | ||
| console.error('Failed to parse notification meta', err); | ||
| return null; | ||
| } | ||
| }); | ||
| }, | ||
| ); |