@valtimo/process-management 13.48.0 → 13.49.0

package/fesm2022/valtimo-process-management.mjs

@@ -21,7 +21,7 @@ import Modeler from 'bpmn-js/lib/Modeler';
 import camundaPlatformBehaviors from 'camunda-bpmn-js-behaviors/lib/camunda-platform';
 import CamundaBpmnModdle from 'camunda-bpmn-moddle/resources/camunda.json';
 import { isEqual } from 'lodash';
-import { filter, BehaviorSubject, Subject, Subscription, combineLatest, switchMap, of, tap, map as map$1, startWith, from, take, merge } from 'rxjs';
+import { filter, BehaviorSubject, Subject, Subscription, combineLatest, switchMap, of, tap, catchError, EMPTY, map as map$1, startWith, from, take, merge } from 'rxjs';
 import { distinctUntilChanged, map, filter as filter$1 } from 'rxjs/operators';
 import * as i2$1 from '@valtimo/form';
 import { toObservable } from '@angular/core/rxjs-interop';
@@ -2290,7 +2290,11 @@ class ProcessManagementBuilderComponent {
         this.selectedProcessDefinitionXml$ = this.processManagementEditorService.selectionProcessDefinition$.pipe(filter(selectedProcessDefinition => !!selectedProcessDefinition?.id), distinctUntilChanged((previous, current) => isEqual(previous, current)), tap(selectedProcessDefinition => {
             this.loading$.next(true);
             this.pageTitleService.setCustomPageTitle(selectedProcessDefinition?.name || '-');
-        }), switchMap(selectedProcessDefinition => this.processService.getProcessDefinitionXml(selectedProcessDefinition.id)), tap(result => {
+        }), switchMap(selectedProcessDefinition => this.processService.getProcessDefinitionXml(selectedProcessDefinition.id).pipe(catchError(error => {
+            this.logger.error('Failed to load process definition XML', error);
+            this.loading$.next(false);
+            return EMPTY;
+        }))), tap(result => {
             this.cleanUpListenersOnModeler();
             this._autofilledElements = result.autofilledElements ?? [];
             this.processManagementEditorService.setAutofilledElements(this._autofilledElements);
@@ -3324,22 +3328,13 @@ class ProcessManagementBuilderComponent {
     }
     initProcessDefinition() {
         this._subscriptions.add(this._selectedProcess$
-            .pipe(filter(selectedProcess => selectedProcess !== null && selectedProcess !== 'create'), distinctUntilChanged((previous, current) => isEqual(previous, current)), tap(() => this.loading$.next(true)))
+            .pipe(filter(selectedProcess => selectedProcess !== null && selectedProcess !== 'create'), distinctUntilChanged((previous, current) => isEqual(previous, current)))
             .subscribe(result => {
             const processDefinitionResult = result;
-            this.cleanUpListenersOnModeler();
-            this._autofilledElements = processDefinitionResult.autofilledElements ?? [];
-            this.processManagementEditorService.setAutofilledElements(this._autofilledElements);
-            this._bpmnModeler?.importXML(processDefinitionResult.bpmn20Xml).then(() => {
-                this.highlightAutofilledElements();
-            });
-            this._bpmnViewer?.importXML(processDefinitionResult.bpmn20Xml).then(() => {
-                this.highlightAutofilledElements();
-            });
+            // Diagram and loading owned by selectedProcessDefinitionXml$ — a second import re-rendered the panel
             this.canInitializeDocument$.next(!!processDefinitionResult?.processCaseLink?.canInitializeDocument);
             this.startableByUser$.next(!!processDefinitionResult?.processCaseLink?.startableByUser);
             this.draft$.next(!!processDefinitionResult?.draft);
-            this.loading$.next(false);
         }));
     }
     openParamsAndContextSubscription() {