feat(dmn-editor): migrate DMN diagrams to DMN 1.3

client/package.json

@@ -8,6 +8,7 @@
   "dependencies": {
     "@bpmn-io/add-exporter": "^0.2.0",
     "@bpmn-io/align-to-origin": "^0.6.0",
+    "@bpmn-io/dmn-migrate": "^0.4.3",
     "@bpmn-io/replace-ids": "^0.2.0",
     "bpmn-js": "^6.3.4",
     "bpmn-js-disable-collapsed-subprocess": "^0.1.1",
@@ -27,7 +28,7 @@
     "diagram-js-direct-editing": "^1.6.1",
     "diagram-js-minimap": "^2.0.3",
     "diagram-js-origin": "^1.3.1",
-    "dmn-js": "^7.5.0",
+    "dmn-js": "^8.0.0-alpha.1",
     "dmn-js-properties-panel": "^0.3.5",
     "drag-tabs": "^2.2.0",
     "events": "^3.0.0",

client/src/app/App.js

@@ -1725,6 +1725,12 @@ export class App extends PureComponent {
     return config.get(key, file, ...args);
   }
 
+  setConfig = (key, ...args) => {
+    const config = this.getGlobal('config');
+
+    return config.set(key, ...args);
+  }
+
   getPlugins = type => {
     return this.getGlobal('plugins').get(type);
   }
@@ -1917,6 +1923,7 @@ export class App extends PureComponent {
                     onAction={ this.triggerAction }
                     onModal={ this.openModal }
                     getConfig={ this.getConfig }
+                    setConfig={ this.setConfig }
                     getPlugins={ this.getPlugins }
                     ref={ this.tabRef }
                   />

client/src/app/__tests__/AppSpec.js

@@ -2392,6 +2392,36 @@ describe('<App>', function() {
   });
 
 
+  describe('#setConfig', function() {
+
+    afterEach(sinon.restore);
+
+
+    it('should set config', async function() {
+
+      // given
+      const setConfigSpy = spy();
+
+      const config = new Config({
+        set: setConfigSpy
+      });
+
+      const { app } = createApp({
+        globals: {
+          config
+        }
+      });
+
+      // when
+      app.setConfig('foo');
+
+      // then
+      expect(setConfigSpy).to.be.calledOnceWith('foo');
+    });
+
+  });
+
+
   describe('#loadPlugins', function() {
 
     it('should load plugins', function() {

client/src/app/tabs/MultiSheetTab.js

@@ -337,6 +337,19 @@ export class MultiSheetTab extends CachedComponent {
     return file && !file.path;
   }
 
+  onAction = (action, options) => {
+    const {
+      onAction,
+      tab
+    } = this.props;
+
+    if (action === 'close-tab') {
+      return onAction('close-tab', { tabId: tab.id });
+    }
+
+    return onAction(action, options);
+  }
+
   render() {
     let {
       activeSheet,
@@ -348,7 +361,6 @@ export class MultiSheetTab extends CachedComponent {
       id,
       xml,
       layout,
-      onAction,
       tab
     } = this.props;
 
@@ -376,14 +388,15 @@ export class MultiSheetTab extends CachedComponent {
             activeSheet={ activeSheet }
             onSheetsChanged={ this.sheetsChanged }
             onContextMenu={ this.handleContextMenu }
-            onAction={ onAction }
+            onAction={ this.onAction }
             onChanged={ this.handleChanged }
             onContentUpdated={ this.handleContentUpdated }
             onError={ this.handleError }
             onImport={ this.handleImport }
             onLayoutChanged={ this.handleLayoutChanged }
             onModal={ this.props.onModal }
             getConfig={ this.props.getConfig }
+            setConfig={ this.props.setConfig }
             getPlugins={ this.props.getPlugins }
           />
         </TabContainer>

client/src/app/tabs/__tests__/MultiSheetTabSpec.js

@@ -455,6 +455,47 @@ describe('<MultiSheetTab>', function() {
 
   });
 
+
+  describe('#onAction', function() {
+
+    it('should propagate action', async function() {
+
+      // given
+      const onAction = sinon.spy();
+
+      const {
+        instance
+      } = renderTab({
+        onAction
+      });
+
+      // when
+      await instance.onAction('foo');
+
+      // then
+      expect(onAction).to.have.been.calledWith('foo');
+    });
+
+
+    it('should handle close-tab action', async function() {
+
+      // given
+      const onAction = sinon.spy();
+
+      const {
+        instance
+      } = renderTab({
+        onAction
+      });
+
+      // when
+      await instance.onAction('close-tab');
+
+      // then
+      expect(onAction).to.have.been.calledWith('close-tab', { tabId: instance.props.tab.id });
+    });
+  });
+
 });
 
 

client/src/app/tabs/bpmn/BpmnEditor.js

@@ -52,7 +52,7 @@ import applyDefaultTemplates from './modeler/features/apply-default-templates/ap
 import {
   findUsages as findNamespaceUsages,
   replaceUsages as replaceNamespaceUsages
-} from './util/namespace';
+} from '../util/namespace';
 
 import configureModeler from './util/configure';