#83

Adds Alert when an SVG is uploaded without a domain story attached
WPS · Oct 28, 2020 · 1828052 · 1828052
1 parent 9cc6a4e
commit 1828052
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 3 deletions.
diff --git a/app/domain-story-modeler/features/import/import.js b/app/domain-story-modeler/features/import/import.js
@@ -40,11 +40,15 @@ let modal = document.getElementById('modal'),
     title = document.getElementById('title'),
     versionInfo = document.getElementById('versionInfo'),
     brokenDSTInfo = document.getElementById('brokenDSTInfo'),
+    brokenSVGInfo = document.getElementById('brokenSVGInfo'),
     importedVersionLabel = document.getElementById('importedVersion'),
     modelerVersionLabel = document.getElementById('modelerVersion'),
     brokenDSTDialogButtonCancel = document.getElementById(
       'brokenDSTDialogButtonCancel'
     ),
+    brokenSVGDialogButtonCancel = document.getElementById(
+      'brokenSVGDialogButtonCancel'
+    ),
     versionDialogButtonCancel = document.getElementById('closeVersionDialog');
 
 let titleInputLast = '',
@@ -59,6 +63,10 @@ if (versionDialogButtonCancel) {
   brokenDSTDialogButtonCancel.addEventListener('click', function() {
     closeBrokenDSTDialog();
   });
+
+  brokenSVGDialogButtonCancel.addEventListener('click', function() {
+    closeBrokenSVGDialog();
+  });
 }
 
 export function getTitleInputLast() {
@@ -205,9 +213,25 @@ export function readerFunction(text, version, modeler, type) {
   } else if (type === DST_TYPE) {
     dstText = text;
   }
+
   let elements, config;
   let configChanged = false;
-  let dstAndConfig = JSON.parse(dstText);
+
+  let dstAndConfig;
+  try {
+    dstAndConfig = JSON.parse(dstText);
+  } catch (e) {
+    if (type === DST_TYPE) {
+      showBrokenDSTDialog();
+    }
+    else if (type === SVG_TYPE) {
+      showBrokenSVGDialog();
+    }
+  }
+
+  if (dstAndConfig == null) {
+    return;
+  }
 
   if (dstAndConfig.domain) {
     config = dstAndConfig.domain;
@@ -367,6 +391,16 @@ function showBrokenDSTDialog() {
   modal.style.display = 'block';
 }
 
+function showBrokenSVGDialog() {
+  brokenSVGInfo.style.display = 'block';
+  modal.style.display = 'block';
+}
+
+function closeBrokenSVGDialog() {
+  brokenSVGInfo.style.display = 'none';
+  modal.style.display = 'none';
+}
+
 function closeBrokenDSTDialog() {
   brokenDSTInfo.style.display = 'none';
   modal.style.display = 'none';

diff --git a/app/domain-story.css b/app/domain-story.css
@@ -224,6 +224,7 @@ input {
 #keyboardShortcutInfoDialogButtonCancel,
 #downloadDialogCancelButton,
 #brokenDSTDialogButtonCancel,
+#brokenSVGDialogButtonCancel,
 #closeNoContentOnCanvasInfo {
   position: absolute;
   font-size: 9pt;
@@ -276,6 +277,7 @@ input {
 #dictionaryDialog,
 #numberDialog,
 #brokenDSTInfo,
+#brokenSVGInfo,
 #labelDialog,
 #wpsLogoInfo,
 #dstLogoInfo,
@@ -295,6 +297,7 @@ input {
 #versionInfo,
 #keyboardShortcutInfo,
 #brokenDSTInfo,
+#brokenSVGInfo,
 #noContentOnCanvasInfo {
   font-size: 11pt;
   border: solid 1px #aaaaab;

diff --git a/app/index.html b/app/index.html
@@ -313,8 +313,14 @@ <h3 id="headline">
   <div id="brokenDSTInfo" style="display:none">
     <button id="brokenDSTDialogButtonCancel">X</button>
     <br>
-    <text>Your .dst File is incomplete, there most likely was an error during export.</text>
-    <text>Some of your activities and Domain Elements might be missing.</text>
+    <text>Your .dst File is corrupted, there most likely was an error during export.</text>
+    <text>If the domain story was imported, some of your activities and Domain Elements might be missing.</text>
+  </div>
+
+  <div id="brokenSVGInfo" style="display:none">
+    <button id="brokenSVGDialogButtonCancel">X</button>
+    <br>
+    <text>Your .svg File does not contain a Domain Story, there most likely was an error during export.</text>
   </div>
 
   <script src="./app.js"></script>