Skip to content
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

Jump to bottom

[Bug] Disable delete a specific workflow version when exist workflow instance under this version which is not finish #15730

Merged
merged 1 commit into from Mar 21, 2024
Merged

[Bug] Disable delete a specific workflow version when exist workflow instance under this version which is not finish #15730

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
148 changes: 74 additions & 74 deletions ...src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
View file
Open in desktop
Expand Up @@ -90,16 +90,16 @@
/**
* create process definition
*
* @param loginUser login user
* @param projectCode project code
* @param name process definition name
* @param description description
* @param globalParams globalParams
* @param locations locations for nodes
* @param timeout timeout
* @param taskRelationJson relation json for nodes
* @param loginUser login user
* @param projectCode project code
* @param name process definition name
* @param description description
* @param globalParams globalParams
* @param locations locations for nodes
* @param timeout timeout
* @param taskRelationJson relation json for nodes
* @param taskDefinitionJson taskDefinitionJson
* @param otherParamsJson otherParamsJson handle other params
* @param otherParamsJson otherParamsJson handle other params
* @return create result code
*/
@Operation(summary = "createProcessDefinition", description = "CREATE_PROCESS_DEFINITION_NOTES")
Expand Down Expand Up @@ -132,9 +132,9 @@
/**
* copy process definition
*
* @param loginUser login user
* @param projectCode project code
* @param codes process definition codes
* @param loginUser login user
* @param projectCode project code
* @param codes process definition codes
* @param targetProjectCode target project code
* @return copy result code
*/
Expand All @@ -157,9 +157,9 @@
/**
* move process definition
*
* @param loginUser login user
* @param projectCode project code
* @param codes process definition codes
* @param loginUser login user
* @param projectCode project code
* @param codes process definition codes
* @param targetProjectCode target project code
* @return move result code
*/
Expand All @@ -182,9 +182,9 @@
/**
* verify process definition name unique
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @param name name
* @param name name
* @return true if process definition name not exists, otherwise false
*/
@Operation(summary = "verify-name", description = "VERIFY_PROCESS_DEFINITION_NAME_NOTES")
Expand All @@ -207,17 +207,17 @@
/**
* update process definition, with whole process definition object including task definition, task relation and location.
*
* @param loginUser login user
* @param projectCode project code
* @param name process definition name
* @param code process definition code
* @param description description
* @param globalParams globalParams
* @param locations locations for nodes
* @param timeout timeout
* @param taskRelationJson relation json for nodes
* @param loginUser login user
* @param projectCode project code
* @param name process definition name
* @param code process definition code
* @param description description
* @param globalParams globalParams
* @param locations locations for nodes
* @param timeout timeout
* @param taskRelationJson relation json for nodes
* @param taskDefinitionJson taskDefinitionJson
* @param otherParamsJson otherParamsJson handle other params
* @param otherParamsJson otherParamsJson handle other params

Check notice

Code scanning / CodeQL

Spurious Javadoc @param tags Note

@param tag "otherParamsJson" does not match any actual parameter of method "updateProcessDefinition()".
* @return update result code
*/
@Operation(summary = "update", description = "UPDATE_PROCESS_DEFINITION_NOTES")
Expand Down Expand Up @@ -263,11 +263,11 @@
/**
* query process definition version paging list info
*
* @param loginUser login user info
* @param loginUser login user info
* @param projectCode project code
* @param pageNo the process definition version list current page number
* @param pageSize the process definition version list page size
* @param code the process definition code
* @param pageNo the process definition version list current page number
* @param pageSize the process definition version list page size
* @param code the process definition code
* @return the process definition version list
*/
@Operation(summary = "queryVersions", description = "QUERY_PROCESS_DEFINITION_VERSIONS_NOTES")
Expand All @@ -293,10 +293,10 @@
/**
* switch certain process definition version
*
* @param loginUser login user info
* @param loginUser login user info
* @param projectCode project code
* @param code the process definition code
* @param version the version user want to switch
* @param code the process definition code
* @param version the version user want to switch
* @return switch version result code
*/
@Operation(summary = "switchVersion", description = "SWITCH_PROCESS_DEFINITION_VERSION_NOTES")
Expand All @@ -319,10 +319,10 @@
/**
* delete the certain process definition version by version and process definition code
*
* @param loginUser login user info
* @param loginUser login user info
* @param projectCode project code
* @param code the process definition code
* @param version the process definition version user want to delete
* @param code the process definition code

Check notice

Code scanning / CodeQL

Spurious Javadoc @param tags Note

@param tag "code" does not match any actual parameter of method "deleteProcessDefinitionVersion()".
* @param version the process definition version user want to delete

Check notice

Code scanning / CodeQL

Spurious Javadoc @param tags Note

@param tag "version" does not match any actual parameter of method "deleteProcessDefinitionVersion()".
* @return delete version result code
*/
@Operation(summary = "deleteVersion", description = "DELETE_PROCESS_DEFINITION_VERSION_NOTES")
Expand All @@ -333,13 +333,13 @@
@DeleteMapping(value = "/{code}/versions/{version}")
@ResponseStatus(HttpStatus.OK)
@ApiException(DELETE_PROCESS_DEFINITION_VERSION_ERROR)
public Result deleteProcessDefinitionVersion(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@Parameter(name = "projectCode", description = "PROJECT_CODE", required = true) @PathVariable long projectCode,
@PathVariable(value = "code") long code,
@PathVariable(value = "version") int version) {
Map<String, Object> result =
processDefinitionService.deleteProcessDefinitionVersion(loginUser, projectCode, code, version);
return returnDataList(result);
public Result<Void> deleteProcessDefinitionVersion(@Parameter(hidden = true) @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@Parameter(name = "projectCode", description = "PROJECT_CODE", required = true) @PathVariable long projectCode,
@PathVariable(value = "code") long workflowDefinitionCode,
@PathVariable(value = "version") int workflowDefinitionVersion) {
processDefinitionService.deleteProcessDefinitionVersion(loginUser, projectCode, workflowDefinitionCode,
workflowDefinitionVersion);
return Result.success();
}

@Operation(summary = "release", description = "RELEASE_PROCESS_DEFINITION_NOTES")
Expand Down Expand Up @@ -372,9 +372,9 @@
/**
* query detail of process definition by code
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @param code process definition code
* @param code process definition code
* @return process definition detail
*/
@Operation(summary = "queryProcessDefinitionByCode", description = "QUERY_PROCESS_DEFINITION_BY_CODE_NOTES")
Expand All @@ -395,9 +395,9 @@
/**
* query detail of process definition by name
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @param name process definition name
* @param name process definition name
* @return process definition detail
*/
@Operation(summary = "queryProcessDefinitionByName", description = "QUERY_PROCESS_DEFINITION_BY_NAME_NOTES")
Expand All @@ -418,7 +418,7 @@
/**
* query Process definition list
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @return process definition list
*/
Expand All @@ -435,7 +435,7 @@
/**
* query Process definition simple list
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @return process definition list
*/
Expand All @@ -452,13 +452,13 @@
/**
* query process definition list paging
*
* @param loginUser login user
* @param projectCode project code
* @param searchVal search value
* @param loginUser login user
* @param projectCode project code
* @param searchVal search value
* @param otherParamsJson otherParamsJson handle other params
* @param pageNo page number
* @param pageSize page size
* @param userId user id
* @param pageNo page number
* @param pageSize page size
* @param userId user id
* @return process definition page
*/
@Operation(summary = "queryListPaging", description = "QUERY_PROCESS_DEFINITION_LIST_PAGING_NOTES")
Expand Down Expand Up @@ -493,10 +493,10 @@
/**
* encapsulation tree view structure
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @param code process definition code
* @param limit limit
* @param code process definition code
* @param limit limit
* @return tree view json data
*/
@Operation(summary = "viewTree", description = "VIEW_TREE_NOTES")
Expand All @@ -518,9 +518,9 @@
/**
* get tasks list by process definition code
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @param code process definition code
* @param code process definition code
* @return task list
*/
@Operation(summary = "getTasksByDefinitionCode", description = "GET_TASK_LIST_BY_DEFINITION_CODE_NOTES")
Expand All @@ -541,9 +541,9 @@
/**
* get tasks list map by process definition multiple code
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @param codes process definition codes
* @param codes process definition codes
* @return node list data
*/
@Operation(summary = "getTaskListByDefinitionCodes", description = "GET_TASK_LIST_BY_DEFINITION_CODE_NOTES")
Expand All @@ -564,7 +564,7 @@
/**
* get process definition list map by project code
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @return process definition list data
*/
Expand All @@ -584,7 +584,7 @@
/**
* get task definition list by process definition code
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @return process definition list data
*/
Expand Down Expand Up @@ -621,9 +621,9 @@
/**
* batch delete process definition by codes
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @param codes process definition code list
* @param codes process definition code list
* @return delete result code
*/
@Operation(summary = "batchDeleteByCodes", description = "BATCH_DELETE_PROCESS_DEFINITION_BY_IDS_NOTES")
Expand All @@ -645,10 +645,10 @@
/**
* batch export process definition by codes
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @param codes process definition codes
* @param response response
* @param codes process definition codes
* @param response response
*/
@Operation(summary = "batchExportByCodes", description = "BATCH_EXPORT_PROCESS_DEFINITION_BY_CODES_NOTES")
@Parameters({
Expand All @@ -670,7 +670,7 @@
/**
* query all process definition by project code
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @return process definition list
*/
Expand All @@ -688,9 +688,9 @@
/**
* import process definition
*
* @param loginUser login user
* @param loginUser login user
* @param projectCode project code
* @param file resource file
* @param file resource file
* @return import result code
*/
@Operation(summary = "importProcessDefinition", description = "IMPORT_PROCESS_DEFINITION_NOTES")
Expand All @@ -715,7 +715,7 @@
* query process definition global variables and local variables
*
* @param loginUser login user
* @param code process definition code
* @param code process definition code
* @return variables data
*/
@Operation(summary = "viewVariables", description = "QUERY_PROCESS_DEFINITION_GLOBAL_VARIABLES_AND_LOCAL_VARIABLES_NOTES")
Expand Down