@abi-software/simulationvuer 0.5.2 → 0.5.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abi-software/simulationvuer",
-  "version": "0.5.2",
+  "version": "0.5.5",
   "private": false,
   "scripts": {
     "serve": "vue-cli-service serve --mode static",

package/src/App.vue

@@ -37,14 +37,12 @@ export default {
       },
       normalEntry: {
         dataset: "https://sparc.science/datasets/135?type=dataset",
-        datasetId: 135,
         description: "CellML version of the Fabbri et al. 2017 mathematical model of the spontaneous electrical activity of a human sinoatrial node (SAN) pacemaker cell",
         name: "Computational analysis of the human sinus node action potential - Model development and effects of mutations",
         resource: "https://models.physiomeproject.org/workspace/486/rawfile/55879cbc485e2d4c41f3dc6d60424b849f94c4ee/HumanSAN_Fabbri_Fantini_Wilders_Severi_2017.cellml",
       },
       compositeEntry: {
         dataset: "https://sparc.science/datasets/157?type=dataset",
-        datasetId: 157,
         description: "CellML version of the Fabbri et al. 2017 human sinoatrial node (SAN) cell model and an ODE-based version of the Gerstner & Kistler 2002 brain stem model combined to demonstrate the effect of brain stem activity on heart rate",
         name: "Fabbri-based composite SAN model",
         resource: "https://models.physiomeproject.org/workspace/698/rawfile/f3fc911063ac72ed44e84c0c5af28df41c25d452/fabbri_et_al_based_composite_SAN_model.sedml",

package/src/components/SimulationVuer.vue

@@ -178,48 +178,58 @@ export default {
     },
   },
   created: function() {
-    this.userMessage = "Retrieving UI information...";
-    this.showUserMessage = true;
+    let url = document.createElement("a");
 
-    // Retrieve the simulation UI file for the given dataset.
+    url.href = this.entry.dataset;
 
-    let xmlhttp = new XMLHttpRequest();
+    let datasetId = url.pathname.replace("/datasets/", "");
 
-    xmlhttp.open("GET", this.apiLocation + "/simulation_ui_file/" + this.entry.datasetId, true);
-    xmlhttp.setRequestHeader("Content-type", "application/json");
-    xmlhttp.onreadystatechange = () => {
-      if (xmlhttp.readyState === 4) {
-        // Keep track of the simulation UI information.
+    if (datasetId !== "/undefined") {
+      // Let people know that we are retrieving our UI information.
 
-        this.simulationUiInformation = JSON.parse(xmlhttp.responseText);
+      this.userMessage = "Retrieving UI information...";
+      this.showUserMessage = true;
 
-        // Make sure that the simulation UI information is valid.
+      // Retrieve the simulation UI file for the given dataset.
 
-        this.hasValidSimulationUiInformation = validJson(this.simulationUiInformation);
+      let xmlhttp = new XMLHttpRequest();
 
-        if (!this.hasValidSimulationUiInformation) {
-          this.showUserMessage = false;
+      xmlhttp.open("GET", this.apiLocation + "/simulation_ui_file/" + datasetId, true);
+      xmlhttp.setRequestHeader("Content-type", "application/json");
+      xmlhttp.onreadystatechange = () => {
+        if (xmlhttp.readyState === 4) {
+          // Keep track of the simulation UI information.
 
-          return;
-        }
+          this.simulationUiInformation = JSON.parse(xmlhttp.responseText);
 
-        // Initialise our UI.
+          // Make sure that the simulation UI information is valid.
 
-        initialiseUi(this);
+          this.hasValidSimulationUiInformation = validJson(this.simulationUiInformation);
 
-        // Finalise our UI.
-        // Note: we try both here and in the mounded() function since we have no
-        //       idea how long it's going to take to retrieve the simulation UI
-        //       information.
+          if (!this.hasValidSimulationUiInformation) {
+            this.showUserMessage = false;
 
-        this.$nextTick(() => {
-          finaliseUi(this);
+            return;
+          }
 
-          this.showUserMessage = false;
-        });
-      }
-    };
-    xmlhttp.send();
+          // Initialise our UI.
+
+          initialiseUi(this);
+
+          // Finalise our UI.
+          // Note: we try both here and in the mounded() function since we have no
+          //       idea how long it's going to take to retrieve the simulation UI
+          //       information.
+
+          this.$nextTick(() => {
+            finaliseUi(this);
+
+            this.showUserMessage = false;
+          });
+        }
+      };
+      xmlhttp.send();
+    }
   },
   mounted: function() {
     // Finalise our UI.

package/src/components/json.js

@@ -79,16 +79,19 @@ export function validJson(json) {
           type: "object",
         },
         minItems: 1,
+        required: true,
         type: "array",
       },
       output: {
         additionalProperties: false,
+        minItems: 1,
         properties: {
           data: {
             items: {
               additionalProperties: false,
               properties: {
                 id: {
+                  required: true,
                   type: "string",
                 },
                 name: {
@@ -98,6 +101,8 @@ export function validJson(json) {
               },
               type: "object",
             },
+            minItems: 1,
+            required: true,
             type: "array",
           },
           plots: {