Skip to content

Commit 22b41c0

Browse files
committed
feat: Enhance ReportDetailPage with new layout and data structure for flagged and normal values
1 parent bfdc653 commit 22b41c0

File tree

4 files changed

+588
-530
lines changed

4 files changed

+588
-530
lines changed

frontend/src/common/components/Icon/Icon.tsx

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,18 @@ import {
3030
faComment,
3131
faUserCircle,
3232
faGlobe as faGoogle,
33-
faA as faApple
33+
faA as faApple,
34+
faFlag,
35+
faFlask,
36+
faChevronUp,
37+
faChevronDown,
38+
faVial,
3439
} from '@fortawesome/free-solid-svg-icons';
3540
import {
3641
faFileLines as faRegularFileLines,
3742
faComment as faRegularComment,
3843
faUser as faRegularUser,
39-
faBookmark as faRegularBookmark
44+
faBookmark as faRegularBookmark,
4045
} from '@fortawesome/free-regular-svg-icons';
4146
import classNames from 'classnames';
4247

@@ -76,7 +81,12 @@ export type IconName =
7681
| 'userGear'
7782
| 'xmark'
7883
| 'google'
79-
| 'apple';
84+
| 'apple'
85+
| 'flag'
86+
| 'flask'
87+
| 'chevronUp'
88+
| 'chevronDown'
89+
| 'vial';
8090

8191
/**
8292
* Properties for the `Icon` component.
@@ -123,6 +133,11 @@ const solidIcons: Record<IconName, IconProp> = {
123133
xmark: faXmark,
124134
google: faGoogle,
125135
apple: faApple,
136+
flag: faFlag,
137+
flask: faFlask,
138+
chevronUp: faChevronUp,
139+
chevronDown: faChevronDown,
140+
vial: faVial,
126141
};
127142

128143
/**
@@ -154,9 +169,8 @@ const Icon = ({
154169
...iconProps
155170
}: IconProps): JSX.Element => {
156171
// Select icon based on style
157-
const faIcon = iconStyle === 'regular' && regularIcons[icon]
158-
? regularIcons[icon]
159-
: solidIcons[icon];
172+
const faIcon =
173+
iconStyle === 'regular' && regularIcons[icon] ? regularIcons[icon] : solidIcons[icon];
160174

161175
return (
162176
<IonText color={color} slot={slot} data-testid={testid}>

frontend/src/common/components/Router/TabNavigation.tsx

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ import ProfilePage from 'pages/Account/components/Profile/ProfilePage';
1616
import DiagnosticsPage from 'pages/Account/components/Diagnostics/DiagnosticsPage';
1717
import ChatPage from 'pages/Chat/ChatPage';
1818
import UploadPage from 'pages/Upload/UploadPage';
19-
import ReportDetailPage from 'pages/Reports/ReportDetailPage';
2019
import ReportsListPage from 'pages/Reports/ReportsListPage';
20+
import ReportDetailPage from 'pages/Reports/ReportDetailPage';
2121
import Processing from 'pages/Processing/Processing';
2222

2323
/**
@@ -101,14 +101,13 @@ const TabNavigation = (): JSX.Element => {
101101

102102
<IonTabBar slot="bottom" className="ls-tab-navigation__bar ion-hide-md-up">
103103
<IonTabButton className="ls-tab-navigation__bar-button" tab="home" href="/tabs/home">
104-
<Icon
105-
className="ls-tab-navigation__bar-button-icon"
106-
icon="home"
107-
size="xl"
108-
fixedWidth
109-
/>
104+
<Icon className="ls-tab-navigation__bar-button-icon" icon="home" size="xl" fixedWidth />
110105
</IonTabButton>
111-
<IonTabButton className="ls-tab-navigation__bar-button" tab="reports" href="/tabs/reports">
106+
<IonTabButton
107+
className="ls-tab-navigation__bar-button"
108+
tab="reports"
109+
href="/tabs/reports"
110+
>
112111
<Icon
113112
className="ls-tab-navigation__bar-button-icon"
114113
icon="fileLines"

0 commit comments

Comments
 (0)