Fix #144

cairis-platform · Nov 18, 2017 · b1c9c29 · b1c9c29
1 parent 5c9ef0b
commit b1c9c29
Show file tree

Hide file tree

Showing 45 changed files with 274 additions and 295 deletions.
diff --git a/cairis/web/dist/js/cairis/Cairis.js b/cairis/web/dist/js/cairis/Cairis.js
@@ -1716,7 +1716,6 @@ $("#traceExplorer").on('click', '#AddTrace',function(e) {
   output.object = tr;
   output.session_id = $.session.get('sessionID');
   output = JSON.stringify(output);
-  debugLogger(output);
 
   $.ajax({
     type: "POST",
@@ -1994,3 +1993,110 @@ function makeSession() {
   });
 }
 
+$(document).on('submit',function(e) {
+  if (!e.isDefaultPrevented()) {
+    e.preventDefault();
+    var originForm = $(e.target).attr('id');
+    switch (originForm) {
+      case "editArchitecturalPatternOptionsForm":
+        commitArchitecturalPattern();
+        break;
+      case "editAssetsOptionsform":
+        commitAsset();
+        break;
+      case "editAssetAssociationOptionsForm":
+        commitAssetAssociation();
+        break;
+      case "editAttackerOptionsForm":
+        commitAttacker();
+        break;
+      case "editConceptReferenceOptionsForm":
+        commitConceptReference();
+        break;
+      case "editCountermeasureOptionsForm":
+        commitCountermeasure();
+        break;
+      case "editDataflowOptionsForm":
+        commitDataFlow();
+        break;
+      case "editDependencyOptionsForm":
+        commitDependency();
+        break;
+      case "editDocumentReferenceOptionsForm":
+        commitDocumentReference();
+        break;
+      case "editDomainPropertyOptionsForm":    
+        commitDomainProperty();
+        break;
+      case "editEnvironmentOptionsform":    
+        commitEnvironment();
+        break;
+      case "editExternalDocumentOptionsForm":
+        commitExternalDocument();
+        break;
+      case "editGoalOptionsForm":
+        commitGoal();
+        break;
+      case "editLocationsOptionsForm":
+        commitLocations();
+        break;
+      case "editObstacleOptionsForm":
+        commitObstacle();
+        break;
+      case "editPersonaCharacteristicOptionsForm":
+        commitPersonaCharacteristic();
+        break;
+      case "editPersonasOptionsForm":
+        commitPersona();
+        break;
+      case "ProjectsProperties":
+        commitProject();
+        break;
+      case "editResponseOptionsform":
+        commitResponse();
+        break;
+      case "editRisksForm":
+        commitRisk();
+        break;
+      case "editRoleOptionsform":
+        commitRole();
+        break;
+      case "editScoredValueTypeOptionsForm":
+        commitValueType();
+        break;
+      case "editSecurityPatternOptionsForm":
+        commitSecurityPattern();
+        break;
+      case "editTaskCharacteristicOptionsForm":
+        commitTaskCharacteristic();
+        break;
+      case "editTaskOptionsForm" :
+        commitTask();
+        break;
+      case "editTemplateAssetOptionsform":
+        commitTemplateAsset();
+        break;
+      case "editTemplateGoalOptionsForm":
+        commitTemplateGoal();
+        break;
+      case "editTemplateRequirementOptionsForm": 
+        commitTemplateRequirement();
+        break;
+      case "editThreatOptionsform":
+        commitThreat();
+        break;
+      case "editTrustBoundaryOptionsForm":
+        commitTrustBoundary();
+        break;
+      case "editUseCaseOptionsForm":
+        commitUseCase();
+        break;
+      case "editValueTypeOptionsForm":
+        commitValueType();
+        break;
+      case "editVulnerabilityOptionsform":
+        commitVulnerability();
+        break;
+    }
+  }
+});
diff --git a/cairis/web/dist/js/cairis/architecturalpatterns.js b/cairis/web/dist/js/cairis/architecturalpatterns.js
@@ -241,9 +241,7 @@ $(document).on("click", "#addNewArchitecturalPattern", function () {
   });
 });
 
-var mainContent = $("#objectViewer");
-mainContent.on("click","#UpdateArchitecturalPattern",function(e) {
-  e.preventDefault();
+function commitArchitecturalPattern() {
   var ap = JSON.parse($.session.get("ArchitecturalPattern"));
   if ($("#editArchitecturalPatternOptionsForm").hasClass("new")) {
     ap.theName = $('#theName').val();
@@ -263,7 +261,7 @@ mainContent.on("click","#UpdateArchitecturalPattern",function(e) {
       refreshMenuBreadCrumb('architectural_pattern');
     });
   }
-});
+}
 
 function postArchitecturalPattern(ap, callback){
   var output = {};
@@ -402,6 +400,7 @@ $(document).on('click', "td.component-row", function () {
   });
 });
 
+var mainContent = $("#objectViewer");
 mainContent.on('click','#addComponent',function() {
   $.session.set("Component", JSON.stringify(jQuery.extend(true, {},componentDefault )));
   $("#editComponentDiv").addClass('new');

diff --git a/cairis/web/dist/js/cairis/assetassociations.js b/cairis/web/dist/js/cairis/assetassociations.js
@@ -124,7 +124,6 @@ $(document).on('click', "td.assetassociation-rows", function(){
   var assoc = assocs[$(this).closest('tr').index()];
 
   fillOptionMenu("fastTemplates/editAssetAssociationOptions.html","#objectViewer",null,true,true, function(){
-    $('#editAssetAssociationOptionsForm').validator();
     $('#UpdateAssetAssociation').text("Update");
     refreshDimensionSelector($('#theEnvironmentName'),'environment',undefined,function() {
       $('#theEnvironmentName').val(assoc.theEnvironmentName);
@@ -143,17 +142,14 @@ $(document).on('click', "td.assetassociation-rows", function(){
           $('#theRationale').val(assoc.theRationale);
           $.session.set("AssetAssociation", JSON.stringify(assoc));
           $('#editAssetAssociationOptionsForm').loadJSON(assoc, null);
+          $('#editAssetAssociationOptionsForm').validator('update');
         },['All']);
       },['All']);
     },['All']);
   });
 });
 
-var mainContent = $("#objectViewer");
-mainContent.on('click', '#UpdateAssetAssociation', function (e) {
-  e.preventDefault();
-  $("#editAssetAssociationOptionsForm").validator();
-
+function commitAssetAssociation() {
   var assoc = JSON.parse($.session.get("AssetAssociation"));
   var oldEnvName = assoc.theEnvironmentName;
   var oldHeadName = assoc.theHeadAsset;
@@ -184,8 +180,9 @@ mainContent.on('click', '#UpdateAssetAssociation', function (e) {
       refreshMenuBreadCrumb('assetassociation');
     });
   }
-});
+}
 
+var mainContent = $("#objectViewer");
 mainContent.on('change',"#theEnvironmentName", function() {
   var envName = $(this).find('option:selected').text();
   var currentHeadAsset = $('#theHeadAsset').val();
@@ -276,7 +273,6 @@ function putAssetAssociation(assoc, oldEnvName, oldHeadAsset, oldTailAsset, call
   output.object = assoc;
   output.session_id = $.session.get('sessionID');
   output = JSON.stringify(output);
-  debugLogger(output);
 
   $.ajax({
     type: "PUT",
@@ -308,7 +304,6 @@ function postAssetAssociation(assoc, callback){
   output.object = assoc;
   output.session_id = $.session.get('sessionID');
   output = JSON.stringify(output);
-  debugLogger(output);
 
   $.ajax({
     type: "POST",

diff --git a/cairis/web/dist/js/cairis/assets.js b/cairis/web/dist/js/cairis/assets.js
@@ -632,8 +632,7 @@ mainContent.on('click', '#cancelButtonAsset', function(){
 });
 
 
-mainContent.on('click', '#UpdateAsset',function(e){
-  e.preventDefault();
+function commitAsset(){
   var envProps = $.session.get("AssetProperties");
   if (envProps == undefined || envProps.length == 0) {
     alert("Environments not defined");
@@ -648,7 +647,7 @@ mainContent.on('click', '#UpdateAsset',function(e){
     $('#menuBCClick').attr('dimension','asset');
     refreshMenuBreadCrumb('asset');
   }
-});
+}
 
 mainContent.on('click', '#CloseAsset', function (e) {
   e.preventDefault();

diff --git a/cairis/web/dist/js/cairis/attackers.js b/cairis/web/dist/js/cairis/attackers.js
@@ -382,8 +382,7 @@ function addRoleToAttacker() {
   });
 }
 
-mainContent.on('click', '#UpdateAttacker', function (e) {
-  e.preventDefault();
+function commitAttacker() {
   $("#editAttackerOptionsForm").validator('validate');
   var attacker = JSON.parse($.session.get("Attacker"));
   if (attacker.theEnvironmentProperties.length == 0) {
@@ -411,7 +410,7 @@ mainContent.on('click', '#UpdateAttacker', function (e) {
       });
     }
   }
-});
+}
 
 $(document).on("click", "#addNewAttacker", function () {
   refreshObjectBreadCrumb('New Attacker');
@@ -425,42 +424,6 @@ $(document).on("click", "#addNewAttacker", function () {
   });
 });
 
-/*
-mainContent.on('click', "#UpdateAttackerCapability", function () {
-  var attacker = JSON.parse($.session.get("Attacker"));
-  var theEnvName = $.session.get("attackerEnvironmentName");
-  if($("#addAttackerPropertyDiv").hasClass("new")){
-    $.each(attacker.theEnvironmentProperties, function (index, env) {
-      if(env.theEnvironmentName == theEnvName){
-        var prop = {};
-        prop.name = $("#theCap option:selected").text();
-        prop.value = $("#thePropValue option:selected").text();
-        env.theCapabilities.push(prop);
-        $.session.set("Attacker", JSON.stringify(attacker));
-        appendAttackerCapability(prop);
-        attackerToggle();
-      }
-    });
-  }
-  else {
-    var oldCapName = $.session.get("AttackerCapName");
-    $.each(attacker.theEnvironmentProperties, function (index, env) {
-      if(env.theEnvironmentName == theEnvName){
-        $.each(env.theCapabilities, function (index, cap) {
-          if(oldCapName == cap.name){
-            cap.name = $("#theCap option:selected").text();
-            cap.value = $("#thePropValue option:selected").text();
-          }
-        });
-        $.session.set("Attacker", JSON.stringify(attacker));
-        $("#theAttackerEnvironments").find(".attackerEnvironment:first").trigger('click');
-        attackerToggle();
-      }
-    });
-  }
-}); 
-*/
-
 mainContent.on("click", ".removeAttackerCapability", function () {
   var text = $(this).closest('tr').find(".attackerCapability").text();
   $(this).closest("tr").remove();
@@ -507,9 +470,6 @@ $(document).on('click', 'td.deleteAttackerButton', function (e) {
   });
 });
 
-
-
-
 var uploading = false;
 $("#objectViewer").on('click', '#theAttackerImage', function () {
   if(!uploading) {
@@ -598,7 +558,6 @@ function putAttacker(attacker, oldName, callback){
   output.object = attacker;
   output.session_id = $.session.get('sessionID');
   output = JSON.stringify(output);
-  debugLogger(output);
 
   $.ajax({
     type: "PUT",
@@ -630,7 +589,6 @@ function postAttacker(attacker, callback){
   output.object = attacker;
   output.session_id = $.session.get('sessionID');
   output = JSON.stringify(output);
-  debugLogger(output);
 
   $.ajax({
     type: "POST",

diff --git a/cairis/web/dist/js/cairis/conceptreferences.js b/cairis/web/dist/js/cairis/conceptreferences.js
@@ -115,14 +115,13 @@ $(document).on('click', "td.conceptreference-rows", function () {
   });
 });
 
+var mainContent = $("#objectViewer");
 mainContent.on('change', '#theDimName', function (e) {
   e.preventDefault();
   getObjtNames($('#theDimName').val());
 });
 
-var mainContent = $("#objectViewer");
-mainContent.on('click', '#UpdateConceptReference', function (e) {
-  e.preventDefault();
+function commitConceptReference() {
   var cr = JSON.parse($.session.get("ConceptReference"));
   var oldName = cr.theName;
   cr.theName = $("#theName").val();
@@ -141,7 +140,7 @@ mainContent.on('click', '#UpdateConceptReference', function (e) {
       createConceptReferencesTable();
     });
   }
-});
+}
 
 $(document).on('click', 'td.deleteConceptReferenceButton', function (e) {
   e.preventDefault();
@@ -168,7 +167,6 @@ function putConceptReference(cr, oldName, callback){
   output.object = cr;
   output.session_id = $.session.get('sessionID');
   output = JSON.stringify(output);
-  debugLogger(output);
 
   $.ajax({
     type: "PUT",
@@ -200,7 +198,6 @@ function postConceptReference(cr, callback){
   output.object = cr;
   output.session_id = $.session.get('sessionID');
   output = JSON.stringify(output);
-  debugLogger(output);
 
   $.ajax({
     type: "POST",