This is an automated email from the ASF dual-hosted git repository.
benjobs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git
The following commit(s) were added to refs/heads/dev by this push:
new b58d0ef0c [Bug] Modifications should be disabled when building a
project (#2596) (#2597)
b58d0ef0c is described below
commit b58d0ef0c6f0e684d2358b2056bce3f4c8f0285e
Author: sober <[email protected]>
AuthorDate: Sun Apr 16 22:17:25 2023 +0800
[Bug] Modifications should be disabled when building a project (#2596)
(#2597)
* [Bug] Modifications should be disabled when building a project (#2596)
* [Bug] Modifications should be disabled when building a project , Remove
useless code (#2596)
---
.../core/service/impl/ProjectServiceImpl.java | 78 ++++++++++------------
.../views/flink/project/components/ListItem.vue | 10 +--
2 files changed, 42 insertions(+), 46 deletions(-)
diff --git
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
index 4f335b5a7..96da9fec4 100644
---
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
+++
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/ProjectServiceImpl.java
@@ -115,49 +115,45 @@ public class ProjectServiceImpl extends
ServiceImpl<ProjectMapper, Project>
@Override
@Transactional(rollbackFor = {Exception.class})
public boolean update(Project projectParam) {
- try {
- Project project = getById(projectParam.getId());
- Utils.notNull(project);
- ApiAlertException.throwIfFalse(
- project.getTeamId().equals(projectParam.getTeamId()),
- "TeamId can't be changed, update project failed.");
- project.setName(projectParam.getName());
- project.setUrl(projectParam.getUrl());
- project.setBranches(projectParam.getBranches());
- project.setGitCredential(projectParam.getGitCredential());
- project.setPrvkeyPath(projectParam.getPrvkeyPath());
- project.setUserName(projectParam.getUserName());
- project.setPassword(projectParam.getPassword());
- project.setPom(projectParam.getPom());
- project.setDescription(projectParam.getDescription());
- project.setBuildArgs(projectParam.getBuildArgs());
- if (GitCredential.isSSH(project.getGitCredential())) {
- project.setUserName(null);
- } else {
- project.setPrvkeyPath(null);
- }
- if (projectParam.getBuildState() != null) {
- project.setBuildState(projectParam.getBuildState());
- if
(BuildState.of(projectParam.getBuildState()).equals(BuildState.NEED_REBUILD)) {
- List<Application> applications = getApplications(project);
- // Update deployment status
- applications.forEach(
- (app) -> {
- log.info(
- "update deploy by project: {}, appName:{}",
- project.getName(),
- app.getJobName());
- app.setRelease(ReleaseState.NEED_CHECK.get());
- applicationService.updateRelease(app);
- });
- }
+ Project project = getById(projectParam.getId());
+ Utils.notNull(project);
+ ApiAlertException.throwIfFalse(
+ project.getTeamId().equals(projectParam.getTeamId()),
+ "TeamId can't be changed, update project failed.");
+ ApiAlertException.throwIfFalse(
+ !project.getBuildState().equals(BuildState.BUILDING.get()),
+ "The project is being built, update project failed.");
+ project.setName(projectParam.getName());
+ project.setUrl(projectParam.getUrl());
+ project.setBranches(projectParam.getBranches());
+ project.setGitCredential(projectParam.getGitCredential());
+ project.setPrvkeyPath(projectParam.getPrvkeyPath());
+ project.setUserName(projectParam.getUserName());
+ project.setPassword(projectParam.getPassword());
+ project.setPom(projectParam.getPom());
+ project.setDescription(projectParam.getDescription());
+ project.setBuildArgs(projectParam.getBuildArgs());
+ if (GitCredential.isSSH(project.getGitCredential())) {
+ project.setUserName(null);
+ } else {
+ project.setPrvkeyPath(null);
+ }
+ if (projectParam.getBuildState() != null) {
+ project.setBuildState(projectParam.getBuildState());
+ if
(BuildState.of(projectParam.getBuildState()).equals(BuildState.NEED_REBUILD)) {
+ List<Application> applications = getApplications(project);
+ // Update deployment status
+ applications.forEach(
+ (app) -> {
+ log.info(
+ "update deploy by project: {}, appName:{}",
project.getName(), app.getJobName());
+ app.setRelease(ReleaseState.NEED_CHECK.get());
+ applicationService.updateRelease(app);
+ });
}
- baseMapper.updateById(project);
- return true;
- } catch (Exception e) {
- log.error(e.getMessage(), e);
- return false;
}
+ baseMapper.updateById(project);
+ return true;
}
@Override
diff --git
a/streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue
b/streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue
index e1618e03a..0368c992f 100644
---
a/streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue
+++
b/streampark-console/streampark-console-webapp/src/views/flink/project/components/ListItem.vue
@@ -89,13 +89,13 @@
</a-button>
</a-popconfirm>
</a-tooltip>
+ <a-tooltip :title="t('flink.project.operationTips.updateProject')">
+ <a-button v-auth="'project:update'" @click="handleEdit"
shape="circle" class="ml-8px">
+ <EditOutlined />
+ </a-button>
+ </a-tooltip>
</template>
- <a-tooltip :title="t('flink.project.operationTips.updateProject')">
- <a-button v-auth="'project:update'" @click="handleEdit" shape="circle"
class="ml-8px">
- <EditOutlined />
- </a-button>
- </a-tooltip>
<a-tooltip :title="t('flink.project.operationTips.deleteProject')">
<a-popconfirm
:title="t('flink.project.operationTips.deleteProjectMessage')"
