Merge pull request #2157 from FAIRsharing/dev

Merging Dev in Master
FAIRsharing · Oct 4, 2023 · 8937013 · 8937013
2 parents 1464751 + fc79ddd
commit 8937013
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 3 deletions.
diff --git a/package.json b/package.json
@@ -41,6 +41,7 @@
     "prettier": "^2.8.6",
     "roboto-fontface": "*",
     "sigma": "^2.4.0",
+    "simple-analytics-vue": "^3.0.2",
     "trace-unhandled": "^2.0.1",
     "tsparticles": "^2.8.0",
     "v-clipboard": "^2.2.3",

diff --git a/src/components/Records/Record/AdditionalInfo.vue b/src/components/Records/Record/AdditionalInfo.vue
@@ -88,9 +88,15 @@ export default {
       // if received node is not an array
       if (!isArray(selectedNode)) {
         this.tempData[key] = []
-        Object.keys(selectedNode).forEach(item_key => {
-          this.tempData[key].push({[item_key]: selectedNode[item_key]})
-        })
+        // Special case this is a string
+        if (typeof selectedNode === 'string' ){
+            this.tempData[key].push({"Value": selectedNode})
+        }
+        else {
+            Object.keys(selectedNode).forEach(item_key => {
+             this.tempData[key].push({[item_key]: selectedNode[item_key]})
+            })
+        }
         return
       }
       // if received node is an array

diff --git a/src/main.js b/src/main.js
@@ -20,6 +20,7 @@ import VueSanitize from "vue-sanitize";
 import Particles from "vue2-particles";
 import VueGtag from "vue-gtag";
 import VueHead from 'vue-head';
+import SimpleAnalytics from "simple-analytics-vue";
 import "vue-code-highlight/themes/prism-twilight.css";
 import "vue-code-highlight/themes/window.css";
 import 'prism-es6/components/prism-ruby.min';
@@ -63,6 +64,9 @@ Vue.use(VueGtag, {
     config: { id:  process.env.VUE_APP_ANALYTICS_ID }
 });
 Vue.use(VueHead);
+Vue.use(SimpleAnalytics, {
+    skip: process.env.NODE_ENV !== 'production'
+})
 
 router.beforeEach(async(to, from, next) => await beforeEach(to, from, next, store));
 router.afterEach(async(to) => await afterEach(to));

diff --git a/tests/unit/components/Records/Record/AdditionalInfo.spec.js b/tests/unit/components/Records/Record/AdditionalInfo.spec.js
@@ -71,6 +71,7 @@ describe("AdditionalInfo.vue", function(){
         await wrapper.vm.setAvailableData(selectedNode,'n')
         selectedNode = [{}]
         await wrapper.vm.setAvailableData(selectedNode,'a')
+        await wrapper.vm.setAvailableData("Hello",'justString')
         expect(wrapper.vm.tempData).toStrictEqual({
             "a": [
                 {
@@ -88,6 +89,11 @@ describe("AdditionalInfo.vue", function(){
                 {
                     "a": []
                 }
+            ],
+            "justString": [
+                {
+                    "Value": "Hello"
+                }
             ]
         });
     });