Skip to content

Display delete dialog also for collaborations #69

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

Open
fabiannaether wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Display delete dialog also for collaborations #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5572095
display delete dialog also for collaborations
fabiannaether Mar 6, 2025
75a3cc9
define process type as enum
fabiannaether Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions backend/src/main/java/de/envite/proa/usecases/processmodel/ProcessModelUsecase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,8 @@ public Long saveProcessModel(Long projectId, String name, String xml, String des
ProcessModelTable existingProcessModel = repository.findByNameOrBpmnProcessIdWithoutCollaborations(name,
bpmnProcessId, projectId);

if (existingProcessModel != null) {
if (!isUploadedProcessCollaboration) {
return replaceProcessModel(projectId, existingProcessModel.getId(), name, xml, description);
}
if (existingProcessModel != null && !isUploadedProcessCollaboration) {
return replaceProcessModel(projectId, existingProcessModel.getId(), name, xml, description);
}

if (isUploadedProcessCollaboration) {
Expand Down Expand Up @@ -189,4 +187,4 @@ private void copyConnections(Long projectId, Long oldProcessId, Long newProcessI
private void copyMessageFlowsAndRelations(Long projectId, Long oldProcessId, Long newProcessId) {
processMapRepository.copyMessageFlowsAndRelations(projectId, oldProcessId, newProcessId);
}
}
}
22 changes: 14 additions & 8 deletions frontend/src/components/ProcessList/ProcessList.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,13 @@ interface ProcessModelInformation {
description: string;
createdAt: string;
childrenIds: number[];
processType: string;
processType: ProcessType;
}

enum ProcessType {
COLLABORATION = "COLLABORATION",
PARTICIPANT = "PARTICIPANT",
PROCESS = "PROCESS"
}

export interface ProcessModelNode extends ProcessModelInformation {
Expand Down Expand Up @@ -401,8 +407,8 @@ export default defineComponent({
processModelNode: ProcessModelNode,
skipConfirm: boolean = false
) {
const isParticipant = processModelNode.processType === "PARTICIPANT";
if (!skipConfirm && isParticipant) {
const isProcess = processModelNode.processType === ProcessType.PROCESS;
if (!skipConfirm && !isProcess) {
this.processModelToBeDeleted = processModelNode;
this.confirmDeleteDialog = true;
return;
Expand Down Expand Up @@ -436,9 +442,9 @@ export default defineComponent({
const modelMap = new Map<number, ProcessModelInformation>();
processModelInformation.forEach((model) => modelMap.set(model.id, model));
return processModelInformation
.filter((model) => model.processType !== "PARTICIPANT")
.filter((model) => model.processType !== ProcessType.PARTICIPANT)
.map((model) => {
if (model.processType === "COLLABORATION") {
if (model.processType === ProcessType.COLLABORATION) {
const children = model.childrenIds.map((id) => modelMap.get(id)!);
const childrenAsNodes = children.map((child) => ({
...child,
Expand Down Expand Up @@ -488,9 +494,9 @@ export default defineComponent({
const xmlDoc = parser.parseFromString(content, "text/xml");

const isCollaboration =
xmlDoc.getElementsByTagName("bpmn:participant")?.length > 1 ||
xmlDoc.getElementsByTagName("semantic:participant")?.length > 1 ||
xmlDoc.getElementsByTagName("participant")?.length > 1;
xmlDoc.getElementsByTagName("bpmn:participant")?.length > 1 ||
xmlDoc.getElementsByTagName("semantic:participant")?.length > 1 ||
xmlDoc.getElementsByTagName("participant")?.length > 1;

if (isCollaboration) {
const collaboration =
Expand Down