fix(client): fix DMN navigation

* fix sorting of sheets Closes #1317
camunda · Mar 20, 2019 · 9d1f2ab · 9d1f2ab
1 parent e83b8fe
commit 9d1f2ab
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 3 deletions.
diff --git a/client/src/app/tabs/MultiSheetTab.js b/client/src/app/tabs/MultiSheetTab.js
@@ -61,7 +61,7 @@ export class MultiSheetTab extends CachedComponent {
       .filter(sheet => sheet.provider !== provider)
       .concat(wiredNewSheets)
       .map(t => ({ ...t, order: t.order || 0 }))
-      .sort((a, b) => a.order > b.order);
+      .sort((a, b) => a.order - b.order);
 
     if (newActiveSheet) {
       activeSheet = sheets.find(s => s.id === newActiveSheet.id);

diff --git a/client/src/app/tabs/__tests__/MultiSheetTabSpec.js b/client/src/app/tabs/__tests__/MultiSheetTabSpec.js
@@ -224,6 +224,37 @@ describe('<MultiSheetTab>', function() {
   });
 
 
+  describe('#sheetsChanged', function() {
+
+    it('should order sheets', function() {
+
+      // given
+      const {
+        instance
+      } = renderTab();
+
+      const sheets = [
+        { id: '2', order: -1 },
+        { id: '3', order: 0 },
+        { id: '1', order: -2 },
+        { id: '4', order: 1 },
+      ];
+
+      // when
+      instance.sheetsChanged(sheets);
+
+      // then
+      expectSheetOrder(instance.getCached().sheets, [
+        '1',
+        '2',
+        '3',
+        '4'
+      ]);
+    });
+
+  });
+
+
   describe('dirty state', function() {
 
     let instance,
@@ -425,4 +456,10 @@ function renderTab(options = {}) {
     instance,
     wrapper
   };
+}
+
+function expectSheetOrder(sheets, expectedOrder) {
+  sheets.forEach((sheet, index) => {
+    expect(sheet.id === expectedOrder[ index ]);
+  });
 }
diff --git a/client/src/app/tabs/dmn/DmnEditor.js b/client/src/app/tabs/dmn/DmnEditor.js
@@ -200,13 +200,13 @@ export class DmnEditor extends CachedComponent {
     let activeSheet;
 
     const sheets = views.map(view => {
-      const { element } = view;
+      const { element, type } = view;
 
       const newSheet = {
         element,
         id: element.id,
         name: getSheetName(view),
-        order: -1
+        order: type === 'drd' ? -2 : -1
       };
 
       if (view === activeView) {