chore: merge develop into working branch

package.json

@@ -38,8 +38,7 @@
   },
   "devDependencies": {
     "@quasar/app": "^2.1.14",
-    "@quasar/quasar-app-extension-testing-unit-jest": "^2.1.0",
-    "@vue/cli-service": "^4.5.10",
+    "@quasar/quasar-app-extension-testing-unit-jest": "^2.2.1",
     "autoprefixer": "9.8.6",
     "babel-eslint": "^10.1.0",
     "commitizen": "^4.2.2",
@@ -52,7 +51,7 @@
     "husky": "^4.3.7",
     "markdownlint-cli": "^0.26.0",
     "node-sass": "^4.14.1",
-    "sass": "^1.32.2",
+    "sass": "^1.32.4",
     "sass-loader": "8.0.2",
     "standard-version": "^9.1.0",
     "stylelint": "^13.8.0",

src/App.vue

@@ -178,17 +178,16 @@ export default {
     getItemData(url) {
       this.request(url)
         .then((data) => {
-          this.collectiontitle = data.title;
-
+          this.collectiontitle = data.title.title;
           this.contenturl = data.content;
           this.imageurl = data.image && data.image.id ? data.image.id : '';
           this.itemlabel = data.n ? data.n : 'No itemlabel :(';
 
           // note: the scholars didn't mark the item language yet, so atm the API provides them all.
           // since we know, we are dealing with the arabic part of the collection, we define the language to be arabic.
-          const [arabic] = data['x-langString'].split(',');
+          const [language] = data['x-langString'] ? data['x-langString'].split(',') : data.lang;
 
-          this.itemlanguage = arabic;
+          this.itemlanguage = language;
         });
     },
     /**

src/components/metadata.vue

@@ -22,7 +22,7 @@
         </q-item-section>
       </q-item>
 
-      <q-item v-if="config.meta.collection.collector">
+      <q-item v-if="config.meta.collection.collector && collection.collector.name">
         <q-item-section>
           <q-item-label
             overline
@@ -36,7 +36,7 @@
         </q-item-section>
       </q-item>
 
-      <q-item v-if="config.meta.collection.description">
+      <q-item v-if="config.meta.collection.description && collection.description">
         <q-item-section>
           <q-item-label
             overline
@@ -65,7 +65,7 @@
         </q-item-section>
       </q-item>
 
-      <q-item v-if="config.meta.manifest.label">
+      <q-item v-if="config.meta.manifest.label && title">
         <q-item-section>
           <q-item-label
             overline
@@ -77,7 +77,7 @@
         </q-item-section>
       </q-item>
 
-      <q-item v-if="config.meta.manifest.creation">
+      <q-item v-if="config.meta.manifest.creation && date">
         <q-item-section>
           <q-item-label
             overline
@@ -89,7 +89,7 @@
         </q-item-section>
       </q-item>
 
-      <q-item v-if="config.meta.manifest.editor">
+      <q-item v-if="config.meta.manifest.editor && editor">
         <q-item-section>
           <q-item-label
             overline
@@ -101,7 +101,7 @@
         </q-item-section>
       </q-item>
 
-      <q-item v-if="config.meta.manifest.location">
+      <q-item v-if="config.meta.manifest.location && location">
         <q-item-section>
           <q-item-label
             overline
@@ -113,7 +113,7 @@
         </q-item-section>
       </q-item>
 
-      <q-item v-if="config.meta.manifest.origin">
+      <q-item v-if="config.meta.manifest.origin && origin">
         <q-item-section>
           <q-item-label
             overline
@@ -207,12 +207,15 @@ export default {
       return this.manifests[this.sequenceindex]['x-date'];
     },
     editor() {
-      let editors = '';
+      if (Array.isArray(this.manifests[this.sequenceindex]['x-editor'])) {
+        let editors = '';
 
-      Object.values(this.manifests[this.sequenceindex]['x-editor']).forEach((ed) => {
-        editors += `${ed.name}, `;
-      });
-      return editors.slice(0, -2);
+        Object.values(this.manifests[this.sequenceindex]['x-editor']).forEach((ed) => {
+          editors += `${ed.name}, `;
+        });
+        return editors.slice(0, -2);
+      }
+      return '';
     },
     itemcount() {
       return this.manifests[this.sequenceindex].sequence.length;