Merge branch 'feature/sessionscopeddmn' into 'develop'

Feature/sessionscopeddmn

See merge request jonasblatt/ma-jonasblatt-dmn-verifier!39

dmnverifierfrontend/src/main/java/de/unikoblenz/fgbks/dmn/frontend/DmnBean.java

+package de.unikoblenz.fgbks.dmn.frontend;
+
+import java.io.Serializable;
+import javax.enterprise.context.SessionScoped;
+
+@SessionScoped
+public class DmnBean implements Serializable {
+
+  protected String dmnXml;
+
+  public String getDmnXml() {
+    return dmnXml;
+  }
+
+  public void setDmnXml(String dmnXml) {
+    this.dmnXml = dmnXml;
+  }
+}

dmnverifierfrontend/src/main/java/de/unikoblenz/fgbks/dmn/frontend/DmnSessionApi.java

+package de.unikoblenz.fgbks.dmn.frontend;
+
+import javax.inject.Inject;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+@Path("/dmn")
+public class DmnSessionApi {
+
+  @Inject
+  DmnBean dmnBean;
+
+  @GET
+  @Path("/getdmn")
+  @Produces(MediaType.TEXT_XML)
+  public Response getSessionDmn() {
+    if (dmnBean.getDmnXml() == null) {
+      return Response.noContent().build();
+    }
+    return Response.ok(dmnBean.getDmnXml()).build();
+  }
+
+  @POST
+  @Path("/setdmn")
+  @Consumes(MediaType.TEXT_XML)
+  public void setSessionDmn(String dmnXml) {
+    dmnBean.setDmnXml(dmnXml);
+  }
+}

dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnUpDownload.js

-document.addEventListener("DOMContentLoaded", function () {
+$(document).ready(function () {
   $('#dmn-file-upload').on('change', loadDmnFromFile);
   $('#dmn-file-empty').on('click', loadEmptyFile);
-  $('#dmn-file-download').on('click', exportDiagram);
+  $('#dmn-file-download').on('click', download);
+  // try to load dmn from session
+  loadSessionDmn();
 });
 
 function loadDmnFromFile(evt) {
@@ -26,13 +28,53 @@ function loadEmptyFile() {
   });
 }
 
-function download(filename, dmnXml) {
-  let el = document.createElement('a');
-  el.setAttribute('href',
-      'data:text/xml;charset=utf-8,' + encodeURIComponent(dmnXml));
-  el.setAttribute('download', filename);
-  el.style.display = 'none';
-  document.body.appendChild(el);
-  el.click();
-  document.body.removeChild(el);
+function download() {
+  let dmnXml = exportDiagram();
+  console.log("xxx:" + dmnXml);
+  if (dmnXml !== undefined) {
+    let el = document.createElement('a');
+    el.setAttribute('href',
+        'data:text/xml;charset=utf-8,' + dmnXml);
+    el.setAttribute('download', "dmnTable.dmn");
+    el.style.display = 'none';
+    document.body.appendChild(el);
+    el.click();
+    document.body.removeChild(el);
+  }
+}
+
+let oSerializer = new XMLSerializer();
+
+function loadSessionDmn() {
+  $.ajax({
+    timeout: 1000,
+    url: "/dmn/getdmn",
+    type: 'GET',
+    contentType: 'text/xml',
+    error: function (err) {
+      // nothing
+      console.log(">-->--> loading session dmn failed. <--<--<");
+      // loading empty dmn
+      loadEmptyFile();
+    },
+    success: function (data) {
+      let sXML = oSerializer.serializeToString(data);
+      openDiagram(sXML);
+    }
+  });
+}
+
+function saveSessionDmn() {
+  let dmnXml = exportDiagram();
+  $.ajax({
+    timeout: 1000,
+    url: "/dmn/setdmn",
+    type: 'POST',
+    contentType: 'text/xml',
+    data: dmnXml,
+    error: function (err) {
+      // nothing
+      console.log(">-->--> saving session dmn failed. <--<--<");
+    }
+  });
 }

dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnVerifier.js

@@ -47,7 +47,6 @@ function loadAvailableTypes() {
     timeout: 1000,
     url: dmnApi + 'verification/types',
     type: 'GET',
-    contentType: 'text/xml',
     error: function (err) {
       inactiveBackend = true;
       handleStatus();
@@ -117,6 +116,7 @@ function cleanDmnVerifierRoot() {
 
 function checkVerifications() {
   cleanDmnVerifierRoot();
+  saveSessionDmn();
   getVerifications();
 }
 

dmnverifierfrontend/src/main/resources/META-INF/resources/js/dmnViewer.js

@@ -28,6 +28,8 @@ let dmnModeler = new DmnJS({
 });
 
 dmnModeler.on('views.changed', function (event) {
+  // save dmn in Session
+  saveSessionDmn();
   var {views, activeView} = event;
   // clear tabs
   $tabs.empty();
@@ -48,14 +50,16 @@ dmnModeler.on('views.changed', function (event) {
  * Save diagram contents and print them to the console.
  */
 function exportDiagram() {
-  dmnModeler.saveXML({format: true}, function (err, xml) {
+  let retXml = undefined;
+  dmnModeler.saveXML({format: false}, function (err, xml) {
     if (err) {
-      return console.log('could not save DMN 1.1 diagram');
+      console.log('could not export DMN 1.1 diagram');
     } else {
-      console.log('saving dmn..');
+      console.log('exporting DMN 1.1 diagram..');
+      retXml = xml;
     }
-    download("dmnTable.dmn", xml);
   });
+  return retXml;
 }
 
 /**

dmnverifierparent/pom.xml

@@ -9,7 +9,7 @@
   <properties>
     <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
     <surefire-plugin.version>2.22.0</surefire-plugin.version>
-    <quarkus.version>0.25.0</quarkus.version>
+    <quarkus.version>0.23.2</quarkus.version>
     <maven.compiler.source>1.8</maven.compiler.source>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <maven.compiler.target>1.8</maven.compiler.target>
@@ -18,7 +18,7 @@
 
   <packaging>pom</packaging>
 
-  <version>0.9.4</version>
+  <version>0.9.5</version>
 
   <dependencyManagement>
     <dependencies>