@valtimo/building-block-management 13.25.0 → 13.27.0

package/fesm2022/valtimo-building-block-management.mjs

@@ -1191,6 +1191,7 @@ class BuildingBlockManagementProcessUploadComponent {
         this.modalOpen$ = this.buildingBlockManagementDetailService.showProcessDefinitionUploadModal$;
         this.showReplaceConfirmationModal$ = new BehaviorSubject(false);
         this.replaceModalContent = '';
+        this._conflictingProcessDefinitionId = null;
         this.ACCEPTED_FILES = ['bpmn'];
         this.form = this.formBuilder.group({
             file: this.formBuilder.control(new Set(), [Validators.required]),
@@ -1203,12 +1204,12 @@ class BuildingBlockManagementProcessUploadComponent {
             this.form.reset();
         }, CARBON_CONSTANTS.modalAnimationMs);
     }
-    uploadProcessBpmn(replace = false) {
+    uploadProcessBpmn() {
         const bpmnFile = this.form.value?.file?.values()?.next()?.value?.file;
         if (!bpmnFile)
             return;
         from(bpmnFile.text())
-            .pipe(switchMap(bpmnXml => this.processLinkService.deployProcessWithProcessLinksForBuildingBlock([], null, `${bpmnXml}`, this.buildingBlockManagementDetailService.buildingBlockDefinitionKey, this.buildingBlockManagementDetailService.buildingBlockDefinitionVersionTag, replace)))
+            .pipe(switchMap(bpmnXml => this.processLinkService.createProcessDefinitionForBuildingBlock([], `${bpmnXml}`, this.buildingBlockManagementDetailService.buildingBlockDefinitionKey, this.buildingBlockManagementDetailService.buildingBlockDefinitionVersionTag)))
             .subscribe({
             next: () => {
                 this.notificationService.showNotification({
@@ -1219,8 +1220,11 @@ class BuildingBlockManagementProcessUploadComponent {
                 this.buildingBlockManagementDetailService.reloadProcessDefinitions();
             },
             error: (error) => {
-                const duplicateKey = error instanceof HttpErrorResponse && error.status === 409;
-                if (duplicateKey) {
+                const isConflict = error instanceof HttpErrorResponse && error.status === 409;
+                if (isConflict) {
+                    const body = error.error;
+                    this._conflictingProcessDefinitionId =
+                        body?.duplicateProcessDefinitions?.[0]?.processDefinitionId ?? null;
                     this.replaceModalContent = this.buildReplaceModalContent(error);
                     this.showReplaceConfirmationModal$.next(true);
                     return;
@@ -1233,8 +1237,37 @@ class BuildingBlockManagementProcessUploadComponent {
         });
     }
     confirmReplace() {
+        const processDefinitionId = this._conflictingProcessDefinitionId;
         this.replaceModalContent = '';
-        this.uploadProcessBpmn(true);
+        this._conflictingProcessDefinitionId = null;
+        if (!processDefinitionId) {
+            this.notificationService.showNotification({
+                type: 'error',
+                title: this.translateService.instant('processManagement.upload.failure'),
+            });
+            return;
+        }
+        const bpmnFile = this.form.value?.file?.values()?.next()?.value?.file;
+        if (!bpmnFile)
+            return;
+        from(bpmnFile.text())
+            .pipe(switchMap(bpmnXml => this.processLinkService.updateProcessDefinitionForBuildingBlock([], processDefinitionId, `${bpmnXml}`, this.buildingBlockManagementDetailService.buildingBlockDefinitionKey, this.buildingBlockManagementDetailService.buildingBlockDefinitionVersionTag, true)))
+            .subscribe({
+            next: () => {
+                this.notificationService.showNotification({
+                    type: 'success',
+                    title: this.translateService.instant('processManagement.upload.success'),
+                });
+                this.closeModal();
+                this.buildingBlockManagementDetailService.reloadProcessDefinitions();
+            },
+            error: () => {
+                this.notificationService.showNotification({
+                    type: 'error',
+                    title: this.translateService.instant('processManagement.upload.failure'),
+                });
+            },
+        });
     }
     clearReplaceModal() {
         this.replaceModalContent = '';