Merge pull request #774 from libris/feature/lxl-2483-external-data

Fixes for external data.
libris · Oct 20, 2021 · dd553c3 · dd553c3
2 parents 8a9917c + 1b34fae
commit dd553c3
Show file tree

Hide file tree

Showing 7 changed files with 40 additions and 6 deletions.
diff --git a/vue-client/src/components/inspector/entity-header.vue b/vue-client/src/components/inspector/entity-header.vue
@@ -24,6 +24,10 @@ export default {
       type: Object,
       default: null,
     },
+    recordData: {
+      type: Object,
+      default: null,
+    },
   },
   data() {
     return {
@@ -108,6 +112,7 @@ export default {
         @hiddenDetailsNumber="setHiddenDetailsNumber"
         :show-all-keys="showAllKeys || hiddenDetailsNumber === 1"
         :focus-data="focusData"
+        :record-data="recordData"
         :should-link="false"
         :exclude-components="inspector.status.isNew ? ['id'] : []"
         :valueDisplayLimit=3>

diff --git a/vue-client/src/components/inspector/toolbar.vue b/vue-client/src/components/inspector/toolbar.vue
@@ -373,9 +373,13 @@ export default {
     },
     userIsPermittedToEdit() {
       const mainEntity = this.inspector.data.mainEntity;
+      const record = this.inspector.data.record;
       if (this.user.isLoggedIn === false) {
         return false;
       }
+      if (record['@type'] !== 'Record') {
+        return false;
+      }
       if (mainEntity['@type'] === 'Item') {
         if (this.isMyHolding || this.user.isGlobalRegistrant()) {
           return true;
@@ -395,6 +399,13 @@ export default {
       }
       return true;
     },
+    userIsPermittedToRemove() {
+      const record = this.inspector.data.record;
+      if (record['@type'] === 'CacheRecord' || record['@type'] === 'PlaceholderRecord') {
+        return true;
+      }
+      return this.userIsPermittedToEdit;
+    },
     showRecord() {
       return this.status.showRecord;
     },
@@ -599,7 +610,7 @@ export default {
             {{ "Preview MARC21" | translatePhrase }}  {{ getKeybindText('preview-marc') ? ` (${getKeybindText('preview-marc')})` : ''}}
           </a>
         </li>
-        <li class="Toolbar-menuItem remove-option" v-if="user.isLoggedIn && !inspector.status.isNew && userIsPermittedToEdit">
+        <li class="Toolbar-menuItem remove-option" v-if="user.isLoggedIn && !inspector.status.isNew && userIsPermittedToRemove">
           <a class="Toolbar-menuLink"  @click="postControl('remove-post')">
           <i class="fa fa-fw fa-trash" aria-hidden="true"></i>
           {{"Remove" | translatePhrase}} {{ recordType | labelByLang | lowercase }}

diff --git a/vue-client/src/components/mixins/lens-mixin.vue b/vue-client/src/components/mixins/lens-mixin.vue
@@ -67,14 +67,26 @@ export default {
       return card;
     },
     getSummary() {
-      const summary = DisplayUtil.getItemSummary(
+      const mainSummary = DisplayUtil.getItemSummary(
         this.focusData,
         this.resources,
         this.inspector.data.quoted,
         this.settings,
         this.excludeProperties,
       );
-      return summary;
+      const record = this.focusData.meta || this.recordData || {};
+      const recordSummary = DisplayUtil.getItemSummary(
+        record,
+        this.resources,
+        this.inspector.data.quoted,
+        this.settings,
+        this.excludeProperties,
+      );
+      return {
+        categorization: mainSummary.categorization.concat(recordSummary.categorization),
+        header: mainSummary.header,
+        info: mainSummary.info,
+      };
     },
   },
 };

diff --git a/vue-client/src/components/search/panel-search-item.vue b/vue-client/src/components/search/panel-search-item.vue
@@ -211,7 +211,7 @@ export default {
   }
 
   &-linkCount {
-    border: 2px solid #29A1A2;
+    border: 2px solid @brand-primary;
     width: 100%;
     text-align: center;
     margin-top: -4px;

diff --git a/vue-client/src/components/shared/entity-summary.vue b/vue-client/src/components/shared/entity-summary.vue
@@ -22,6 +22,10 @@ export default {
       type: Object,
       default: null,
     },
+    recordData: {
+      type: Object,
+      default: null,
+    },
     animate: {
       type: Boolean,
       default: false,

diff --git a/vue-client/src/resources/json/displayGroups.json b/vue-client/src/resources/json/displayGroups.json
@@ -5,7 +5,8 @@
       "inCollection",
       "inScheme",
       "mediaType",
-      "carrierType"
+      "carrierType",
+      "inDataset"
     ],
     "header": [
       "hasTitle",

diff --git a/vue-client/src/views/Inspector.vue b/vue-client/src/views/Inspector.vue
@@ -937,7 +937,8 @@ export default {
         </div>
         <entity-header id="main-header"
           :full="true"
-          :focus-data="inspector.data.mainEntity"
+          :focus-data="inspector.data.mainEntity" 
+          :record-data="inspector.data.record"
           v-if="!isItem">
         </entity-header>
         <validation-summary v-if="user.settings.appTech" />