Skip to content

Commit

Permalink
Merge pull request #983 from zhx828/add-asco-banner
Browse files Browse the repository at this point in the history
Add service disruption banner message
  • Loading branch information
zhx828 authored Jun 9, 2023
2 parents 3a309d6 + a24f3be commit 14cda43
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 3 deletions.
32 changes: 29 additions & 3 deletions src/main/webapp/app/components/userMessager/UserMessage.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import * as React from 'react';
import { observer } from 'mobx-react';
import { remoteData } from 'cbioportal-frontend-commons';
import {
action,
observable,
Expand All @@ -9,7 +8,6 @@ import {
IReactionDisposer,
toJS,
} from 'mobx';
import autobind from 'autobind-decorator';
import * as _ from 'lodash';
import styles from './styles.module.scss';
import classNames from 'classnames';
Expand All @@ -23,11 +21,14 @@ import {
import { Link } from 'react-router-dom';
import AppStore from 'app/store/AppStore';
import { Linkout } from 'app/shared/links/Linkout';
import { COLOR_BLACK, COLOR_WARNING } from 'app/config/theme';

export interface IUserMessage {
dateStart?: number;
dateEnd: number;
content: JSX.Element;
backgroundColor?: string;
color?: string;
id: string;
}

Expand Down Expand Up @@ -112,6 +113,24 @@ if (
),
id: '2023_asco',
},
{
dateEnd: 1686456000000,
content: (
<div>
<b>Attention</b>: We want to inform you of an upcoming infrastructure
update that may lead to a temporary service disruption over the
weekend, planned <b>June 10th, 10am-12pm EDT</b>.
<br />
During this period, you may experience intermittent service
interruptions, brief outages, or slower response times while accessing
our services. Thank you for your understanding and cooperation as we
strive to provide you with an improved service experience.
</div>
),
backgroundColor: COLOR_WARNING,
color: COLOR_BLACK,
id: 'warning_msg_06102023',
},
];
}

Expand Down Expand Up @@ -172,7 +191,14 @@ export default class UserMessage extends React.Component<UserMessageProps> {
render() {
if (this.showBeVisible) {
return toJS(this.messages).map(message => (
<div className={styles.message} key={message.id}>
<div
className={styles.message}
key={message.id}
style={{
backgroundColor: message.backgroundColor,
color: message.color,
}}
>
<Container
fluid={!this.props.windowStore.isXLscreen}
className={styles.messageContainer}
Expand Down
2 changes: 2 additions & 0 deletions src/main/webapp/app/config/theme.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ export const COLOR_PRIMARY = COLOR_BLUE;
export const COLOR_GREY = '#808080';
export const COLOR_LIGHT_GREY = '#D3D3D3';
export const COLOR_BLACK = '#000';
export const COLOR_WARNING = '#ffc107';
export const COLOR_ERROR = '#dc3545';

export const COLOR_ICON_WITH_INFO = COLOR_BLACK;
export const COLOR_ICON_WITHOUT_INFO = COLOR_LIGHT_GREY;

0 comments on commit 14cda43

Please sign in to comment.