diff --git a/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js index a45e2aba3b1ccbd70b67492b02e8e7600895c3eb..b813fc2fbfaa11ff1071c5f3f37ae63f3205d0a7 100644 --- a/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js +++ b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js @@ -117,7 +117,7 @@ export function IOCDeployDialog({ > <form onSubmit={onSubmit}> <DialogTitle id="form-dialog-title"> - {hasActiveDeployment ? "Deploy new revision" : "Deploy"} + {hasActiveDeployment ? "Deploy revision" : "Deploy"} </DialogTitle> <DialogContent> <TextField @@ -186,7 +186,7 @@ export function IOCDeployDialog({ renderInput={(params) => ( <TextField {...params} - label="Git reference" + label="Revision" variant="outlined" fullWidth required @@ -207,7 +207,7 @@ export function IOCDeployDialog({ renderInput={(params) => ( <TextField {...params} - label="host" + label="Host" variant="outlined" required /> @@ -254,11 +254,7 @@ export function IOCDeployDialog({ color="primary" variant="contained" type="submit" - disabled={ - !host || - !gitVersion || - (hasActiveDeployment && init?.version === gitVersion) - } + disabled={!host || !gitVersion} > Deploy </Button> diff --git a/src/components/IOC/IOCManage/IOCManage.js b/src/components/IOC/IOCManage/IOCManage.js index 583c39391f022d73c98886306d56e28299346fb7..45d0333e2a66cac95f5b1f9ca51ca18eb4aa0cd0 100644 --- a/src/components/IOC/IOCManage/IOCManage.js +++ b/src/components/IOC/IOCManage/IOCManage.js @@ -143,13 +143,13 @@ export function IOCManage({ const formInit = { name: ioc.namingName, description: ioc.description, - version: ioc.sourceVersion, - shortVersion: ioc.sourceVersionShort, git: ioc.sourceUrl, gitProjectId: ioc.gitProjectId }; if (ioc.activeDeployment) { + formInit.version = ioc.activeDeployment.sourceVersion; + formInit.shortVersion = ioc.activeDeployment.sourceVersionShort; formInit.csEntryHost = { fqdn: ioc.activeDeployment.host.fqdn, id: ioc.activeDeployment.host.csEntryId @@ -186,7 +186,7 @@ export function IOCManage({ }} disabled={buttonDisabled || ioc.operationInProgress} > - {ioc.activeDeployment ? "Deploy new revision" : "Deploy"} + {ioc.activeDeployment ? "Deploy revision" : "Deploy"} </Button> </span> </Tooltip>