Skip to content

Commit df7e964

Browse files
authored
fix(orchestrator):fix wrong color for selected tab (#1331)
Signed-off-by: Lior Soffer <liorsoffer1@gmail.com>
1 parent a4ae23c commit df7e964

3 files changed

Lines changed: 73 additions & 29 deletions

File tree

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
'@red-hat-developer-hub/backstage-plugin-orchestrator': patch
3+
---
4+
5+
fix wrong color for selected tab

workspaces/orchestrator/plugins/orchestrator/src/components/OrchestratorPage/OrchestratorPage.tsx

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,25 +16,44 @@
1616

1717
import { TabbedLayout } from '@backstage/core-components';
1818

19+
import { Box } from '@material-ui/core';
20+
import { makeStyles } from 'tss-react/mui';
21+
1922
import { workflowInstancesRouteRef } from '../../routes';
23+
import { useIsDarkMode } from '../../utils/isDarkMode';
2024
import { BaseOrchestratorPage } from '../BaseOrchestratorPage';
2125
import { WorkflowRunsTabContent } from './WorkflowRunsTabContent';
2226
import { WorkflowsTabContent } from './WorkflowsTabContent';
2327

28+
const useStyles = makeStyles<{ isDarkMode: boolean }>()(
29+
(_, { isDarkMode }) => ({
30+
tabbedLayout: {
31+
'& .Mui-selected': {
32+
color: isDarkMode ? '#ffffff !important' : '#151515 !important',
33+
},
34+
},
35+
}),
36+
);
37+
2438
export const OrchestratorPage = () => {
39+
const isDarkMode = useIsDarkMode();
40+
const { classes } = useStyles({ isDarkMode });
41+
2542
return (
2643
<BaseOrchestratorPage title="Workflow Orchestrator" noPadding>
27-
<TabbedLayout>
28-
<TabbedLayout.Route path="/" title="Workflows">
29-
<WorkflowsTabContent />
30-
</TabbedLayout.Route>
31-
<TabbedLayout.Route
32-
path={workflowInstancesRouteRef.path}
33-
title="All runs"
34-
>
35-
<WorkflowRunsTabContent />
36-
</TabbedLayout.Route>
37-
</TabbedLayout>
44+
<Box className={classes.tabbedLayout}>
45+
<TabbedLayout>
46+
<TabbedLayout.Route path="/" title="Workflows">
47+
<WorkflowsTabContent />
48+
</TabbedLayout.Route>
49+
<TabbedLayout.Route
50+
path={workflowInstancesRouteRef.path}
51+
title="All runs"
52+
>
53+
<WorkflowRunsTabContent />
54+
</TabbedLayout.Route>
55+
</TabbedLayout>
56+
</Box>
3857
</BaseOrchestratorPage>
3958
);
4059
};

workspaces/orchestrator/plugins/orchestrator/src/components/WorkflowPage/WorkflowPage.tsx

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,33 @@ import { useAsync } from 'react-use';
1919
import { TabbedLayout } from '@backstage/core-components';
2020
import { useApi, useRouteRefParams } from '@backstage/core-plugin-api';
2121

22+
import { Box } from '@material-ui/core';
2223
import Grid from '@mui/material/Grid';
24+
import { makeStyles } from 'tss-react/mui';
2325

2426
import { orchestratorApiRef } from '../../api';
2527
import { workflowRouteRef, workflowRunsRoutePath } from '../../routes';
28+
import { useIsDarkMode } from '../../utils/isDarkMode';
2629
import { BaseOrchestratorPage } from '../BaseOrchestratorPage';
2730
import { WorkflowRunsTabContent } from '../OrchestratorPage/WorkflowRunsTabContent';
2831
import { RunButton } from './RunButton';
2932
import { WorkflowDetailsTabContent } from './WorkflowDetailsTabContent';
3033

34+
const useStyles = makeStyles<{ isDarkMode: boolean }>()(
35+
(_, { isDarkMode }) => ({
36+
tabbedLayout: {
37+
'& .Mui-selected': {
38+
color: isDarkMode ? '#ffffff !important' : '#151515 !important',
39+
},
40+
},
41+
}),
42+
);
43+
3144
export const WorkflowPage = () => {
3245
const { workflowId } = useRouteRefParams(workflowRouteRef);
3346
const orchestratorApi = useApi(orchestratorApiRef);
47+
const isDarkMode = useIsDarkMode();
48+
const { classes } = useStyles({ isDarkMode });
3449

3550
const {
3651
value: workflowOverviewDTO,
@@ -47,24 +62,29 @@ export const WorkflowPage = () => {
4762
typeLink="/orchestrator"
4863
noPadding
4964
>
50-
<TabbedLayout>
51-
<TabbedLayout.Route path="/" title="Workflow details">
52-
<Grid container spacing={2}>
53-
<RunButton isAvailable={workflowOverviewDTO?.data.isAvailable} />
54-
<WorkflowDetailsTabContent
55-
loadingWorkflowOverview={loadingWorkflowOverview}
56-
workflowOverviewDTO={workflowOverviewDTO?.data}
57-
errorWorkflowOverview={errorWorkflowOverview}
58-
/>
59-
</Grid>
60-
</TabbedLayout.Route>
61-
<TabbedLayout.Route path={workflowRunsRoutePath} title="Workflow runs">
62-
<Grid container spacing={2}>
63-
<RunButton isAvailable={workflowOverviewDTO?.data.isAvailable} />
64-
<WorkflowRunsTabContent />
65-
</Grid>
66-
</TabbedLayout.Route>
67-
</TabbedLayout>
65+
<Box className={classes.tabbedLayout}>
66+
<TabbedLayout>
67+
<TabbedLayout.Route path="/" title="Workflow details">
68+
<Grid container spacing={2}>
69+
<RunButton isAvailable={workflowOverviewDTO?.data.isAvailable} />
70+
<WorkflowDetailsTabContent
71+
loadingWorkflowOverview={loadingWorkflowOverview}
72+
workflowOverviewDTO={workflowOverviewDTO?.data}
73+
errorWorkflowOverview={errorWorkflowOverview}
74+
/>
75+
</Grid>
76+
</TabbedLayout.Route>
77+
<TabbedLayout.Route
78+
path={workflowRunsRoutePath}
79+
title="Workflow runs"
80+
>
81+
<Grid container spacing={2}>
82+
<RunButton isAvailable={workflowOverviewDTO?.data.isAvailable} />
83+
<WorkflowRunsTabContent />
84+
</Grid>
85+
</TabbedLayout.Route>
86+
</TabbedLayout>
87+
</Box>
6888
</BaseOrchestratorPage>
6989
);
7090
};

0 commit comments

Comments
 (0)