Skip to content

Commit

Permalink
Merge pull request #581 from shnrndk/deploymentAlignmentIssue
Browse files Browse the repository at this point in the history 
Fix Deployment Page Alignment Issue
  • Loading branch information
@tharikaGitHub
tharikaGitHub authored Mar 3, 2024
2 parents cd33ea5 + 361a2c7 commit 9f46c43
Showing 1 changed file with 67 additions and 18 deletions.
85 changes: 67 additions & 18 deletions ...sher/src/main/webapp/source/src/app/components/Apis/Details/Environments/Environments.jsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ const Root = styled('div')((
[`& .${classes.shapeRec}`]: {
backgroundColor: 'black',
alignSelf: 'center',
width: 120,
width: 121,
height: 3,
},

Expand Down Expand Up @@ -198,15 +198,15 @@ const Root = styled('div')((
border: '2px solid #ffffff',
width: 47,
height: 47,
marginTop: 6,
marginLeft: 6,
marginTop: 8,
marginLeft: 8,
placeSelf: 'middle',
},

[`& .${classes.plusIconStyle}`]: {
marginTop: 8,
marginLeft: 8,
fontSize: 30,
fontSize: 30,
},

[`& .${classes.shapeDottedStart1}`]: {
Expand All @@ -226,7 +226,7 @@ const Root = styled('div')((
[`& .${classes.textShape2}`]: {
display: 'flex',
alignItems: 'center',
marginTop: 8,
marginTop: 12,
marginLeft: 115,
height: '18px',
fontFamily: 'sans-serif',
Expand Down Expand Up @@ -261,7 +261,7 @@ const Root = styled('div')((
color: '#415A85',
},

[`& .${classes.textShape4}`]: {
[`& .${classes.textShape4}`]: {
marginTop: 55,
},

Expand Down Expand Up @@ -307,6 +307,7 @@ const Root = styled('div')((
paddingLeft: '15px',
width: 15,
height: 15,
marginBottom: '2px'
},

[`& .${classes.changeCard}`]: {
Expand Down Expand Up @@ -436,6 +437,54 @@ const Root = styled('div')((
}
}));

const StyledDialog = styled(Dialog)(({ theme }) => ({
[`& .${classes.changeCard}`]: {
boxShadow: 15,
borderRadius: '10px',
backgroundColor: theme.palette.secondary.highlight,
},

[`& .${classes.dialogPaper}`]: {
width: '800px',
maxHeight: '800px',
},

[`& .${classes.cardHeight}`]: {
boxShadow: 1,
height: '100%',
},

[`& .${classes.cardContentHeight}`]: {
boxShadow: 1,
height: '50%',
},

[`& .${classes.createRevisionDialogStyle}`]: {
width: '800px',
},

[`& .${classes.dialogContent}`]: {
overflow: 'auto',
height: '90%',
},

[`& .${classes.warningText}`]: {
color: '#ff0000',
},

[`& .${classes.textCount}`]: {
marginTop: theme.spacing(-2.5),
},

[`& .${classes.sectionTitle}`]: {
marginBottom: theme.spacing(2),
},

[`& .${classes.textCount}`]: {
marginTop: theme.spacing(-2.5),
},
}))

/**
* Renders an Environments list
* @class Environments
Expand Down Expand Up @@ -1217,7 +1266,7 @@ export default function Environments() {
<Grid
className={classes.containerInline}
>
<Grid item className={classes.shapeRec} />
<Grid item className={classes.shapeRec}/>
<Grid item className={clsx(classes.shapeCircaleBack, classes.shapeCircle)}>
<Grid className={clsx(classes.shapeInnerInactive, classes.shapeCircle)} />
</Grid>
Expand Down Expand Up @@ -1437,7 +1486,7 @@ export default function Environments() {
</>
}
</Grid>
<Grid>
<Grid style={{display:'flex',flexDirection:'row'}}>
<Button
className={classes.textShape3}
onClick={() => toggleOpenConfirmRestore(
Expand Down Expand Up @@ -1487,7 +1536,7 @@ export default function Environments() {
</>
}
</Grid>
<Grid className={classes.textPadding}>
<Grid className={classes.textPadding} style={{display:'flex',flexDirection:'row'}}>
<Button
className={classes.textShape3}
onClick={() => toggleOpenConfirmRestore(
Expand Down Expand Up @@ -1647,7 +1696,7 @@ export default function Environments() {
if (!gatewayRevisions.length) {
// Content to display when there is no revision
return (
<div>
<div style={{display: 'flex', alignItems: 'center'}}>
<TextField
id='revision-selector'
select
Expand Down Expand Up @@ -1757,7 +1806,7 @@ export default function Environments() {
);
}
return (
<div>
<div style={{display: 'flex', alignItems: 'center'}}>
<TextField
id='revision-selector'
select
Expand Down Expand Up @@ -2004,13 +2053,13 @@ export default function Environments() {
</Grid>
)}
<Grid container>
<Dialog
<StyledDialog
open={openDeployPopup}
onClose={handleCloseDeployPopup}
aria-labelledby='form-dialog-title'
classes={{ paper: classes.dialogPaper }}
>
<DialogTitle id='form-dialog-title' variant='h2'>
<DialogTitle id='form-dialog-title' variant='h5'>
<FormattedMessage
id='Apis.Details.Environments.Environments.deploy.new.revision.heading'
defaultMessage='Deploy New Revision'
Expand Down Expand Up @@ -2438,7 +2487,7 @@ export default function Environments() {
/>
</Button>
</DialogActions>
</Dialog>
</StyledDialog>
</Grid>
{allRevisions && allRevisions.length !== 0 && (
<>
Expand Down Expand Up @@ -2487,13 +2536,13 @@ export default function Environments() {
</>
)}
<Grid container>
<Dialog
<StyledDialog
open={open}
onClose={handleClose}
aria-labelledby='form-dialog-title'
classes={{ paper: classes.createRevisionDialogStyle }}
>
<DialogTitle id='form-dialog-title' variant='h2'>
<DialogTitle id='form-dialog-title' variant='h5'>
<FormattedMessage
id='Apis.Details.Environments.Environments.revision.create.heading'
defaultMessage='Create New Revision (From Current API)'
Expand Down Expand Up @@ -2617,7 +2666,7 @@ export default function Environments() {
/>
</Button>
</DialogActions>
</Dialog>
</StyledDialog>
</Grid>
{api.lifeCycleStatus !== 'RETIRED'
&& allRevisions && allRevisions.length !== 0 && api.gatewayVendor === 'wso2' && (
Expand Down Expand Up @@ -2954,7 +3003,7 @@ export default function Environments() {
</Button>
</div>
) : (
<div>
<div style={{display:'flex',justifyContent: 'center'}}>
<TextField
id='revision-selector'
select
Expand Down

0 comments on commit 9f46c43

Please sign in to comment.