Skip to content

Commit 24286de

Browse files
committed
prettier
Signed-off-by: Abdelsalem <[email protected]>
1 parent f5ce0e9 commit 24286de

File tree

2 files changed

+30
-32
lines changed

2 files changed

+30
-32
lines changed

src/components/topBar/MessageBanner.tsx

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import { ReactNode, useState, useEffect } from 'react';
88
import { Box, type SxProps, type Theme } from '@mui/material';
99
import { Close as CloseIcon, WarningAmber as WarningAmberIcon, Campaign as CampaignIcon } from '@mui/icons-material';
10-
import { mergeSx } from "../../utils";
11-
import { AnnouncementProps } from "./TopBar";
10+
import { UUID } from 'crypto';
11+
import { mergeSx } from '../../utils';
1212

1313
const styles = {
1414
banner: (theme) => ({
@@ -66,6 +66,13 @@ export interface MessageBannerProps {
6666
announcementInfos?: AnnouncementProps;
6767
}
6868

69+
export type AnnouncementProps = {
70+
announcementId: UUID;
71+
message: string;
72+
duration: number;
73+
severity: string;
74+
};
75+
6976
function MessageBanner({ children, announcementInfos }: MessageBannerProps) {
7077
const [visible, setVisible] = useState(true);
7178

@@ -84,24 +91,26 @@ function MessageBanner({ children, announcementInfos }: MessageBannerProps) {
8491
}
8592
}, [announcementInfos]);
8693

87-
return (visible && (
88-
<Box sx={mergeSx(styles.banner, isInfo ? styles.infoBg : styles.warningBg)}>
89-
{isInfo && (
90-
<Box sx={mergeSx(styles.icon, styles.infoIcon)}>
91-
<CampaignIcon/>
92-
</Box>
93-
)}
94-
{!isInfo && (
95-
<Box sx={mergeSx(styles.icon, styles.warningIcon)}>
96-
<WarningAmberIcon/>
94+
return (
95+
visible && (
96+
<Box sx={mergeSx(styles.banner, isInfo ? styles.infoBg : styles.warningBg)}>
97+
{isInfo && (
98+
<Box sx={mergeSx(styles.icon, styles.infoIcon)}>
99+
<CampaignIcon />
100+
</Box>
101+
)}
102+
{!isInfo && (
103+
<Box sx={mergeSx(styles.icon, styles.warningIcon)}>
104+
<WarningAmberIcon />
105+
</Box>
106+
)}
107+
<Box sx={styles.message}>{children}</Box>
108+
<Box sx={styles.button} onClick={() => setVisible(false)}>
109+
<CloseIcon />
97110
</Box>
98-
)}
99-
<Box sx={styles.message}>{children}</Box>
100-
<Box sx={styles.button} onClick={() => setVisible(false)}>
101-
<CloseIcon/>
102111
</Box>
103-
</Box>
104-
));
112+
)
113+
);
105114
}
106115

107116
export default MessageBanner;

src/components/topBar/TopBar.tsx

Lines changed: 3 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import {
2828
ToggleButtonGroup,
2929
Toolbar,
3030
Typography,
31-
Tooltip
31+
Tooltip,
3232
} from '@mui/material';
3333
import {
3434
Apps as AppsIcon,
@@ -58,8 +58,7 @@ import {
5858
LANG_SYSTEM,
5959
LIGHT_THEME,
6060
} from '../../utils/constants/browserConstants';
61-
import MessageBanner from './MessageBanner';
62-
import { UUID } from 'crypto';
61+
import MessageBanner, { AnnouncementProps } from './MessageBanner';
6362

6463
const styles = {
6564
grow: {
@@ -169,13 +168,6 @@ function abbreviationFromUserName(name: string) {
169168
return tab[0] + tab[tab.length - 1];
170169
}
171170

172-
export type AnnouncementProps = {
173-
announcementId: UUID;
174-
message: string;
175-
duration: number;
176-
severity: string;
177-
}
178-
179171
export type TopBarProps = Omit<GridLogoProps, 'onClick'> &
180172
Omit<LogoutProps, 'disabled'> &
181173
Omit<AboutDialogProps, 'open' | 'onClose'> & {
@@ -311,10 +303,7 @@ export function TopBar({
311303
)}
312304
{user && announcementInfos && (
313305
<MessageBanner announcementInfos={announcementInfos}>
314-
<Tooltip
315-
title={announcementInfos.message}
316-
placement="bottom"
317-
>
306+
<Tooltip title={announcementInfos.message} placement="bottom">
318307
<span>{announcementInfos.message}</span>
319308
</Tooltip>
320309
</MessageBanner>

0 commit comments

Comments
 (0)