Merge branch 'master' into #78-add-option-to-delete-group-withou-chil…

…dren
WPS · May 6, 2021 · e60cdb3 · e60cdb3
2 parents e61c9d0 + 4f37874
commit e60cdb3
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 18 deletions.
diff --git a/app/domain-story-modeler/language/DomainStoryRenderer.js b/app/domain-story-modeler/language/DomainStoryRenderer.js
@@ -712,6 +712,10 @@ DomainStoryRenderer.prototype.drawConnection = function(p, element) {
 
   makeDirty();
 
+  if (!element.businessObject.type) {
+    element.businessObject.type = type;
+  }
+
   if (type === ACTIVITY) {
     return this.drawActivity(p, element);
   } else if (type === CONNECTION) {

diff --git a/app/index.html b/app/index.html
@@ -239,21 +239,25 @@ <h3 id="headline">
             <td>ctrl + A</td>
           </tr>
           <tr>
-            <td>Export DST</td>
+            <td>Export as .dst</td>
             <td>ctrl + S</td>
           </tr>
           <tr>
-            <td>Import DST</td>
+            <td>Import from .dst</td>
             <td>ctrl + L</td>
           </tr>
           <tr>
             <td>Search for text (default browser funtion)</td>
             <td>ctrl + F</td>
           </tr>
           <tr>
-            <td>Direct editing</td>
+            <td>Edit label</td>
             <td>E</td>
           </tr>
+          <tr>
+            <td>Copy/paste</td>
+            <td>ctrl + C, ctrl + V</td>
+          </tr>
           <tr>
             <td>Hand tool</td>
             <td>H</td>

diff --git a/test/spec/language/DomainStoryModelerSpec.js b/test/spec/language/DomainStoryModelerSpec.js
@@ -15,7 +15,7 @@ import {
 
 import { DST_TYPE } from '../../../app/domain-story-modeler/features/import/import';
 
-import { jsonString, brokenJsonString, oldIntricateV_0_2_0_JsonString, oldIntricateV_0_3_0_JsonString, intricateV0_5_0_JsonString, intricateV0_6_0_JSONString, intricateConfig } from './dstJsons';
+import { jsonString, jsonString2, brokenJsonString, oldIntricateV_0_2_0_JsonString, oldIntricateV_0_3_0_JsonString, intricateV0_5_0_JsonString, intricateV0_6_0_JSONString, intricateConfig } from './dstJsons';
 
 const sinon = require('sinon');
 
@@ -252,7 +252,7 @@ describe('domainStory modeler', function() {
       const jsonExport = JSON.stringify(newObject);
 
       // then
-      expect(jsonExport).to.eql(jsonString);
+      expect(jsonExport).to.eql(jsonString2);
     });
   });
 
@@ -451,11 +451,13 @@ describe('domainStory modeler', function() {
       }
 
       jsonElements.forEach(element => {
-        let id = element.substring(
-          element.indexOf('id'),
-          element.indexOf('id') + 15
-        );
-        expect(intricateV0_5_0_JsonString.includes(id)).to.be.true;
+        if (element.includes('id')) {
+          let id = element.substring(
+            element.indexOf('id'),
+            element.indexOf('id') + 15
+          );
+          expect(intricateV0_5_0_JsonString.includes(id)).to.be.true;
+        }
       });
     });
   });
@@ -543,11 +545,13 @@ describe('domainStory modeler', function() {
       }
 
       jsonElements.forEach(element => {
-        let id = element.substring(
-          element.indexOf('id'),
-          element.indexOf('id') + 15
-        );
-        expect(intricateV0_6_0_JSONString.includes(id)).to.be.true;
+        if (element.includes('id')) {
+          let id = element.substring(
+            element.indexOf('id'),
+            element.indexOf('id') + 15
+          );
+          expect(intricateV0_6_0_JSONString.includes(id)).to.be.true;
+        }
       });
     });
   });

diff --git a/test/spec/language/dstJsons.js b/test/spec/language/dstJsons.js