Merge pull request #129 from dinukadesilva/bug-fix-10-12-2022-15-22

Bug fix: Remove unecessary metadata calls
SciGaP · Oct 12, 2022 · f1824ba · f1824ba
2 parents 69c9262 + ac773e7
commit f1824ba
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 30 deletions.
diff --git a/src/pages/resource/resource-list.vue b/src/pages/resource/resource-list.vue
@@ -521,20 +521,16 @@ export default {
         });
       }
     },
-    getResourceThumbnailUrl({resourceId, type}) {
-      const metadata = this.$store.getters["emcResource/getResourceMetadata"]({resourceId, type});
-      if (metadata && metadata.length > 0 && metadata[0].thumbnail) {
-        return metadata[0].thumbnail;
-      } else {
-        return null;
+    getResourceThumbnailUrl({resourceId}) {
+      const resource = this.$store.getters["emcResource/getResource"]({resourceId});
+      if (resource) {
+        return resource.thumbnail;
       }
     },
-    getResourceImageUrl({resourceId, type}) {
-      const metadata = this.$store.getters["emcResource/getResourceMetadata"]({resourceId, type});
-      if (metadata && metadata.length > 0 && metadata[0].image) {
-        return metadata[0].image;
-      } else {
-        return null;
+    getResourceImageUrl({resourceId}) {
+      const resource = this.$store.getters["emcResource/getResource"]({resourceId});
+      if (resource) {
+        return resource.image;
       }
     }
   },
@@ -566,12 +562,12 @@ export default {
     async resources() {
       if (this.resources) {
         try {
-          await Promise.all(this.resources.filter(({type}) => type === EmcResource.EMC_RESOURCE_TYPE.EMC_RESOURCE_TYPE_DATASET).map(resource => {
-            return this.$store.dispatch("emcResource/fetchResourceMetadata", {
-              resourceId: resource.resourceId,
-              type: resource.type
-            });
-          }));
+          // await Promise.all(this.resources.filter(({type}) => type === EmcResource.EMC_RESOURCE_TYPE.EMC_RESOURCE_TYPE_DATASET).map(resource => {
+          //   return this.$store.dispatch("emcResource/fetchResourceMetadata", {
+          //     resourceId: resource.resourceId,
+          //     type: resource.type
+          //   });
+          // }));
         } catch (e) {
           // TODO
         }

diff --git a/src/service/emc-service/emc-service-resource.js b/src/service/emc-service/emc-service-resource.js
@@ -169,7 +169,7 @@ export default class EmcResource {
                     // resourceId, resourcePath,
                     properties: {
                         // entityType, tenantId, name, entityId,
-                        description, createdTime, lastModifiedTime, owner, note, permission
+                        description, createdTime, lastModifiedTime, owner, note, permission, image, thumbnail
                     },
                     type,
                     // parentResourcePath,
@@ -194,7 +194,9 @@ export default class EmcResource {
             note,
             permission,
             canShare: permission === "OWNER" || permission === "EDITOR",
-            canDelete: permission === "OWNER"
+            canDelete: permission === "OWNER",
+            image,
+            thumbnail
         };
     }
 
@@ -263,7 +265,7 @@ export default class EmcResource {
                 // resourcePath,
                 properties: {
                     // entityType, tenantId, name, entityId
-                    description, createdTime, lastModifiedTime, owner, note, permission
+                    description, createdTime, lastModifiedTime, owner, note, permission, image, thumbnail
                 },
                 type,
                 // parentResourcePath,
@@ -286,7 +288,9 @@ export default class EmcResource {
                 permission,
                 canShare: permission === "OWNER" || permission === "EDITOR",
                 canDelete: permission === "OWNER",
-                resourcePath
+                resourcePath,
+                image,
+                thumbnail
             }
         });
     }

diff --git a/src/store/modules/emc/emc-resource.store.js b/src/store/modules/emc/emc-resource.store.js
@@ -19,10 +19,11 @@ const actions = {
             parentResourceId, parentResourceType, type, queries
         });
 
-        const resourceIds = resources.map(({resourceId, entityId, name, description, createdAt, createdBy, lastUpdatedAt, lastUpdatedBy, status, type, note, permission, canShare, canDelete, resourcePath}) => {
+        const resourceIds = resources.map(({resourceId, entityId, name, description, createdAt, createdBy, lastUpdatedAt, lastUpdatedBy, status, type, note, permission, canShare, canDelete, resourcePath, image, thumbnail}) => {
             commit("SET_RESOURCE", {
                 resourceId, entityId, name, description, createdAt, createdBy, lastUpdatedAt,
-                lastUpdatedBy, status, type, note, permission, canShare, canDelete, resourcePath
+                lastUpdatedBy, status, type, note, permission, canShare, canDelete, resourcePath,
+                image, thumbnail
             });
 
             return resourceId;
@@ -33,7 +34,7 @@ const actions = {
 
     async fetchResource({commit}, {resourceId} = {}) {
         const resource = await emcService.resources.fetchResource({resourceId});
-        const {entityId, name, description, createdAt, createdBy, lastUpdatedAt, lastUpdatedBy, status, type, note, permission, canShare, canDelete, resourcePath} = resource;
+        const {entityId, name, description, createdAt, createdBy, lastUpdatedAt, lastUpdatedBy, status, type, note, permission, canShare, canDelete, resourcePath, image, thumbnail} = resource;
         commit("SET_RESOURCE", {
             resourceId,
             entityId,
@@ -46,7 +47,8 @@ const actions = {
             status,
             type,
             note,
-            permission, canShare, canDelete, resourcePath
+            permission, canShare, canDelete, resourcePath,
+            image, thumbnail
         });
     },
 
@@ -57,7 +59,7 @@ const actions = {
 
     async fetchParentResources({commit}, {resourceId}) {
         const resources = await emcService.resources.fetchParentResources({resourceId});
-        const parentResourceIds = resources.map(({resourceId, entityId, name, description, createdAt, createdBy, lastUpdatedAt, lastUpdatedBy, status, type, note}) => {
+        const parentResourceIds = resources.map(({resourceId, entityId, name, description, createdAt, createdBy, lastUpdatedAt, lastUpdatedBy, status, type, note, image, thumbnail}) => {
             commit("SET_RESOURCE", {
                 resourceId,
                 entityId,
@@ -69,7 +71,8 @@ const actions = {
                 lastUpdatedBy,
                 status,
                 type,
-                note
+                note,
+                image, thumbnail
             });
 
             return resourceId;
@@ -166,7 +169,7 @@ const mutations = {
             [resourceId]: metadata
         }
     },
-    SET_RESOURCE(state, {resourceId, entityId, name, description, createdAt, createdBy, lastUpdatedAt, lastUpdatedBy, status, type, note, permission = null, canShare = false, canDelete = false, resourcePath}) {
+    SET_RESOURCE(state, {resourceId, entityId, name, description, createdAt, createdBy, lastUpdatedAt, lastUpdatedBy, status, type, note, permission = null, canShare = false, canDelete = false, resourcePath, image, thumbnail}) {
         state.resourceMap = {
             ...state.resourceMap,
             [resourceId]: {
@@ -182,7 +185,8 @@ const mutations = {
                 status,
                 type,
                 note,
-                permission, canShare, canDelete, resourcePath
+                permission, canShare, canDelete, resourcePath,
+                image, thumbnail
             }
         };
     },