Skip to content

fix(orchestrator-form-react): fix ui styling issues in workflow results page #2808

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
karthikjeeyar wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(orchestrator-form-react): fix ui styling issues in workflow results page #2808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions workspaces/orchestrator/.changeset/new-books-matter.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@red-hat-developer-hub/backstage-plugin-orchestrator': patch
---

Fix UI styling issues in worfkflow results page
1 change: 1 addition & 0 deletions workspaces/orchestrator/plugins/orchestrator/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
"@backstage/plugin-permission-react": "^0.4.39",
"@backstage/types": "^1.2.2",
"@material-ui/core": "^4.12.4",
"@material-ui/lab": "^4.0.0-alpha.61",
"@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^",
"@red-hat-developer-hub/backstage-plugin-orchestrator-form-api": "workspace:^",
"@red-hat-developer-hub/backstage-plugin-orchestrator-form-react": "workspace:^",
Expand Down
9 changes: 8 additions & 1 deletion ...tor/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowDescriptionModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,14 @@ export const RefForwardingWorkflowDescriptionModal: ForwardRefRenderFunction<
fullWidth
>
<DialogTitle>
<Box>
<Box
sx={{
display: 'flex',
alignItems: 'baseline',
justifyContent: 'space-between',
gap: 1,
}}
>
<Typography variant="h5">{workflow.name}</Typography>
<IconButton
className={classes.closeBtn}
Expand Down
7 changes: 3 additions & 4 deletions .../orchestrator/plugins/orchestrator/src/components/WorkflowInstancePage/WorkflowResult.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ import {
import { RouteFunc, useApi, useRouteRef } from '@backstage/core-plugin-api';
import { AboutField } from '@backstage/plugin-catalog';

import Alert from '@mui/material/Alert';
import AlertTitle from '@mui/material/AlertTitle';
import { Alert, AlertTitle } from '@material-ui/lab';
import Box from '@mui/material/Box';
import Button from '@mui/material/Button';
import CircularProgress from '@mui/material/CircularProgress';
Expand Down Expand Up @@ -433,7 +432,7 @@ export const WorkflowResult: React.FC<{
className={className}
cardClassName={cardClassName}
>
<Divider sx={{ mb: 2 }} />
<Divider sx={{ '&&': { mb: 2 } }} />
{logsEnabled && (
<>
<Box sx={{ ml: 2 }}>
Expand All @@ -452,7 +451,7 @@ export const WorkflowResult: React.FC<{
{t('run.logs.viewLogs')}
</Button>
</Box>
<Divider sx={{ mt: 2, mb: 2 }} />
<Divider sx={{ '&&': { my: 2 } }} />
</>
)}
<Grid container alignContent="flex-start" spacing="1rem">
Expand Down
5 changes: 4 additions & 1 deletion workspaces/orchestrator/plugins/orchestrator/src/components/ui/TextCodeBlock.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,12 @@ const useStyles = makeStyles<{ isDarkMode: boolean; maxHeight?: number }>()(
position: 'relative',
paddingTop: theme.spacing(2),
paddingBottom: theme.spacing(2),
backgroundColor: isDarkMode ? '#151515' : '#F0F0F0',
maxWidth: 600,
marginTop: '0.6rem',
'&&': {
outline: 'unset',
backgroundColor: isDarkMode ? '#151515' : '#F0F0F0',
},
},
iconButton: {
position: 'absolute',
Expand Down
1 change: 1 addition & 0 deletions workspaces/orchestrator/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12679,6 +12679,7 @@ __metadata:
"@backstage/ui": "npm:^0.11.2"
"@janus-idp/cli": "npm:3.7.0"
"@material-ui/core": "npm:^4.12.4"
"@material-ui/lab": "npm:^4.0.0-alpha.61"
"@mui/icons-material": "npm:^5.17.1"
"@mui/material": "npm:^5.17.1"
"@red-hat-developer-hub/backstage-plugin-orchestrator-common": "workspace:^"
Expand Down
Loading
⚡