fix: use real import done event

Author: barmac

bpmn-js-app/src/app/app.component.ts

@@ -1,4 +1,6 @@
 import { Component } from '@angular/core';
+import type { ImportDoneEvent } from 'bpmn-js/lib/BaseViewer';
+
 
 @Component({
   selector: 'app-root',
@@ -10,19 +12,16 @@ export class AppComponent {
   diagramUrl = 'https://cdn.statically.io/gh/bpmn-io/bpmn-js-examples/dfceecba/starter/diagram.bpmn';
   importError?: Error;
 
-  handleImported(event) {
+  handleImported(event: ImportDoneEvent) {
 
     const {
-      type,
       error,
       warnings
     } = event;
 
-    if (type === 'success') {
+    if (!error) {
       console.log(`Rendered diagram (%s warnings)`, warnings.length);
-    }
-
-    if (type === 'error') {
+    } else {
       console.error('Failed to render diagram', error);
     }
 

bpmn-js-app/src/app/diagram/diagram.component.spec.ts

@@ -81,7 +81,6 @@ describe('DiagramComponent', () => {
     component.importDone.subscribe(result => {
       // then
       expect(result).toEqual({
-        type: 'success',
         warnings: []
       });
 
@@ -104,7 +103,7 @@ describe('DiagramComponent', () => {
 
     component.importDone.subscribe(result => {
       // then
-      expect(result.type).toEqual('success');
+      expect(result.error).toBeUndefined();
 
       expect(result.warnings.length).toEqual(1);
       expect(result.warnings[0].message).toContain('unparsable content <process> detected');
@@ -132,7 +131,7 @@ describe('DiagramComponent', () => {
     component.importDone.subscribe(result => {
 
       // then
-      expect(result.type).toEqual('error');
+      expect(result.error).toBeDefined();
       expect(result.error.message).toEqual('Http failure response for some-url: 404 FOO');
 
       done();

bpmn-js-app/src/app/diagram/diagram.component.ts

@@ -16,7 +16,7 @@ import { HttpClient } from '@angular/common/http';
 import { map, switchMap } from 'rxjs/operators';
 
 import type Canvas from 'diagram-js/lib/core/Canvas';
-import type { ImportDoneEvent, ImportXMLResult } from 'bpmn-js';
+import type { ImportDoneEvent, ImportXMLResult } from 'bpmn-js/lib/BaseViewer';
 
 /**
  * You may include a different variant of BpmnJS:
@@ -91,14 +91,13 @@ export class DiagramComponent implements AfterContentInit, OnChanges, OnDestroy,
       ).subscribe(
         (warnings) => {
           this.importDone.emit({
-            type: 'success',
             warnings
           });
         },
         (err) => {
           this.importDone.emit({
-            type: 'error',
-            error: err
+            error: err,
+            warnings: []
           });
         }
       )