Merge pull request #59 from jacamo-lang/move-agent-graph

Move agent graph

Author: cleberjamaral

build.gradle

@@ -137,6 +137,7 @@ task javadocJar (type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
     from '${docsDir}/../../doc/api'
 }
+
 /*
  *
  * Maven publication
@@ -239,6 +240,20 @@ task buildYarn(type: YarnTask, dependsOn: 'yarn') {
 }
 build.dependsOn buildYarn
 
+
+/*
+ *
+ * Compile javascript if bundle does not exists
+ *
+ */
+
+if ( !file("src/resources/js/jacamoweb.js").exists() ) {
+	allprojects {
+    tasks.shadowJar.dependsOn tasks.build
+		tasks.run.dependsOn tasks.build
+	}
+}
+
 /*
  *
  * Clean compiled files
@@ -250,4 +265,4 @@ clean {
     delete 'build'
     delete 'log'
     delete testsExecutedMarkerName /*Used on testYarn*/
-}
+}

src/js/git.js

@@ -208,7 +208,7 @@ function commitChanges() {
             toastr.error('Operation cancelled.', { timeOut: 10000 });
           } else {
             h.post('/commit?email=' + getCookieValue('username'), message).then(function(response) {
-              toastr.info(`Commit result: ${response}`, { timeOut: 10000 });
+              toastr.success(`Commit result: ${response}`, { timeOut: 10000 });
             }).catch(function(error) {
               toastr.error(error, { timeOut: 10000 });
             });

src/js/organisation.js

@@ -5,6 +5,10 @@
 //const d3 = require('d3')
 const h = require('./helpers')
 const p = require('./parameters')
+const toastr = require('toastr')
+
+/** LOCK NOTIFICATIONS */
+toastr.options.preventDuplicates = true;
 
 /**
  * ORGANISATION FUNCTIONS
@@ -60,13 +64,25 @@ function newRole(org, gr) {
   var org = firstPart.substring(0, firstDot);
   var group = firstPart.substring(firstDot + 1);
 
-  http.open("POST", '/organisations/' + org + '/groups/' + group + '/roles/' + role, false);
-  http.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
   var data = "role=" + encodeURIComponent(role);
-  http.send(data);
-  window.location.assign('/oe.html');
+  h.post('/organisations/' + org + '/groups/' + group + '/roles/' + role, data, "application/x-www-form-urlencoded")
+  .then(
+    function(resolve) {
+      localStorage.setItem("organisationBuffer", `Role '${role}' on group '${group}' of organisation ${org} created!`);
+      window.location.assign('/oe.html');
+    },
+    function(error) { toastr.error(error, { timeOut: 10000 }); }
+  );
 }
 
+/* SHOW MESSAGE IN THE BUFFER IF EXISTS */
+
+const showBuffer = () => {
+  var buffer = localStorage.getItem("organisationBuffer");
+  if ((typeof(buffer) == "string") && (buffer != "")) toastr.info(buffer, { timeOut: 3000 });
+  localStorage.removeItem("organisationBuffer");
+};
+
 function getGroupsDetails() {
   const selectedItem = new URL(location.href).searchParams.get('organisation');
   h.get("./organisations/" + selectedItem).then(function(r) {
@@ -464,6 +480,7 @@ window.getOrgGroupGraph = getOrgGroupGraph;
 window.getOrgSchemeGraph = getOrgSchemeGraph;
 window.getOrgNormGraph = getOrgNormGraph;
 window.setOrganisationModalWindow = setOrganisationModalWindow;
+window.showBuffer = showBuffer;
 
 /**
  * END OF FILE

src/resources/css/style.css

@@ -2312,7 +2312,7 @@ table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focu
 
 .toast {
   margin-top: 75px !important;
-  color: #000 !important;
+  color: #030303 !important;
   opacity: 1 !important;
 }
 
@@ -2322,10 +2322,18 @@ table.hoverable tr:hover, table.hoverable tr:hover > td, table.hoverable tr:focu
 
 .toast-info {
   width: 550px !important;
-  background-color:#73A790;
+  background-color:#3276b1;
   color: #fff !important;
 }
 
+.toast-error {
+  background-color: #bd362f;
+}
+
+.toast-success {
+  background-color: #51a351;
+}
+
 #git-dialog-full, #commit-dialog-full {
   position: absolute;
   height: 100vh;

src/resources/html/oe.html

@@ -58,6 +58,7 @@
   <script>
     getOE();
     getOrganisationsNonVolatileGraph();
+    showBuffer();
   </script>
 </body>