From 65d17ef501585132412dd9c2d69e8d1f6bc28346 Mon Sep 17 00:00:00 2001
From: Zoltan Runyo <zoltan.runyo@ess.eu>
Date: Wed, 22 Feb 2023 15:37:21 +0100
Subject: [PATCH] ICSHWI-11534: Allow deploying same revision
---
.../IOC/IOCDeployDialog/IOCDeployDialog.js | 12 ++++--------
src/components/IOC/IOCManage/IOCManage.js | 6 +++---
2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js
index a45e2aba..b813fc2f 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 583c3939..45d0333e 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>
--
GitLab