Merge pull request #505 from AudiovisualMetadataPlatform/AMP-3131_ref…

…actor AMP-3131
AudiovisualMetadataPlatform · Apr 15, 2024 · a54b9ea · a54b9ea
2 parents 34804ea + 999c032
commit a54b9ea
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 66 deletions.
diff --git a/src/components/entity/EntityList.vue b/src/components/entity/EntityList.vue
@@ -1331,7 +1331,6 @@ export default {
         self.showLoader = true;
         const configPropertiesResponse = await self.configPropertiesService.getConfigProperties();
         self.configProperties = configPropertiesResponse.data;
-
         self.showLoader = false;
       } catch (error) {
         self.showLoader = false;
@@ -1350,12 +1349,10 @@ export default {
           this.getCollectionItems();
         else {
           self.selectedCollection = self.entity = {};
-          self.showLoader = false;
           self.showEdit = false;
         }
       } else if (self.baseUrl === "item") {
         self.entity = self.selectedItem;
-        self.showLoader = false;
         if (self.isCreatePage) {
           self.selectedItem = self.entity = {};
           self.showEdit = false;
@@ -1487,38 +1484,38 @@ export default {
   },
   mounted() {
     const self = this;
-    self.showLoader = true;
-    if (!self.configProperties) {
+    
+    // retrieve configProperties if not yet populated
+    if (!self.configProperties || Object.keys(self.configProperties).length === 0) {
       self.getConfigs();
     }
 
-    // For unit details page
+    // retrieve units list and currentUnit info from storage if available, otherwise initialize them 
     const uEntity = JSON.parse(sessionStorage.getItem("unitEntity"));
-
     if (!uEntity) {
       self.unitEntity = { unitList: [], currentUnit: "" };
     }
     else {
       self.unitEntity = uEntity;    
     }
 
+    // retrieve units list if not yet populated
     if (!self.unitEntity.unitList || !self.unitEntity.unitList.length) {
       self.getAllUnits();
     } 
 
+    // if currentUnit set, gegetEntityData for the page 
     if (self.unitEntity.currentUnit) {
       self.getEntityData();
     }
 
+    // adjust size of PFile fields for PFile page
     let formHTML = document.getElementsByClassName("form")[0];
     if (formHTML && this.baseUrl === "file") {
       formHTML.style.width = "50%";
     } else if (formHTML) {
       formHTML.style.width = "100%";
     }
-
-    // console.log("end of mounted: mediaSource = " + self.entity.mediaSource);
-    // console.log("end of mounted: mediaType = " + self.entity.mediaType);
   },
 };
 </script>

diff --git a/src/components/entity/ItemSearch.vue b/src/components/entity/ItemSearch.vue
@@ -40,7 +40,6 @@
 
 <script>
 import Search from "@/components/shared/Search.vue";
-import WorkflowResultService from "../../service/workflow-result-service";
 import Loader from "@/components/shared/Loader.vue";
 import ItemService from "../../service/item-service";
 
@@ -52,7 +51,6 @@ export default {
   },
   data() {
     return {
-      workflowResultService: new WorkflowResultService(),
       itemService: new ItemService(),
       loading: false,
       searchType: "",

diff --git a/src/components/shared/Search.vue b/src/components/shared/Search.vue
@@ -1027,7 +1027,11 @@ export default {
           );
           break;
         case "item-search": {   
+          // since item search by keyword returns a list of items each with all parents IDs
+          // there is no need to do extra fetching for entity details along the chain at this point
+          // rather, the details can be fetched later upon request for a sepcific parent entity detail page
           console.log("item-search: selectedItemId: ", this.selectedItem.id, "selectedCollectionId: ", this.selectedCollection.id, "selectedUnitId: ", this.selectedUnit.id);
+          // update currentUnit
           let uEntity = JSON.parse(
             sessionStorage.getItem("unitEntity")
           );
@@ -1038,56 +1042,11 @@ export default {
             "unitEntity",
             JSON.stringify({ ...uEntity })
           );
-          // checking permission
+          // check permission
           if (uEntity && uEntity.currentUnit)
-            self.accessControlService.checkAccessControl(self);    
-          // go to item detail page
-          self.$router.push("/collections/items/item-search/details");          
-          // this.itemService
-          //   .getItemDetails(this.selectedItemId)
-          //   .then((res) => {
-          //     const self = this;
-          //     const selectedCollectionId = res._embedded.collection.id;
-          //     self.collectionDetailsService
-          //       .getCollection(selectedCollectionId)
-          //       .then((response) => {
-          //         self.selectedCollection = response.data;
-          //         //Updating unit id in our session storage for content page
-          //         const unitId = response.data._embedded.unit.id;
-          //         let uEntity = JSON.parse(
-          //           sessionStorage.getItem("unitEntity")
-          //         );
-          //         uEntity = uEntity || {};
-          //         console.log("Search: uEntity = " + uEntity);
-          //         uEntity.currentUnit = unitId;
-          //         sessionStorage.setItem(
-          //           "unitEntity",
-          //           JSON.stringify({ ...uEntity })
-          //         );
-          //         //checking permission
-          //         if (uEntity && uEntity.currentUnit)
-          //           self.accessControlService.checkAccessControl(self);
-          //       });                  
-          //     self.selectedItem = res;
-          //     self.selectedItem.parentType = self.type;
-          //     self.selectedItem.unitName = self.selectedUnit.name;
-          //     self.selectedItem.collectionName = self.selectedCollection.name;
-          //     self.$router.push("/collections/items/item-search/details");
-          //   })
-          //   .catch((error) => {
-          //     this.dataSource = [];
-          //     this.clonedDataSource = [];
-          //     this.searchWord = "";
-          //     this.selectedItemId = null;
-          //     this.errors.search_error = "";
-          //     this.errors.no_data_error = "";
-          //     this.$bvToast.toast("Failed to show the item", {
-          //       title: "Notification",
-          //       appendToast: true,
-          //       variant: "danger",
-          //       autoHideDelay: 5000,
-          //     });
-          //   });
+            this.accessControlService.checkAccessControl(this);    
+          // go to item detail page (upon which point the item detail info shall be fetched in EntityList)
+          this.$router.push("/collections/items/item-search/details");          
           break;
         }
         case "workflow-search":

diff --git a/src/components/supplement/SupplementFile.vue b/src/components/supplement/SupplementFile.vue
@@ -340,15 +340,21 @@ export default {
       const self = this;
       try {
         self.loading = true;
-        const configPropertiesResponse = await self.configPropertiesService.getConfigProperties();
-        self.configProperties = configPropertiesResponse.data;
+
+        // retrieve configProperties if not yet done
+        if (!self.configProperties || Object.keys(self.configProperties).length === 0) {
+          self.configProperties = await self.configPropertiesService.getConfigProperties();        
+        }
+
+        // retrieve accessible units for create/update
         await self.accessControlService.getPermissionsUnits("Create", "Supplement").then((res) => {
           self.allUnits = res.data;
           self.supplement["allUnits"] = self.sharedService.sortByAlphabatical(self.allUnits);
           self.canCreate = self.acIsAdmin || res.data && res.data.length > 0
-          self.canUpdate = self.acIsAdmin || self.action !== "view" && self.canCreate;
-          self.loading = false;          
+          self.canUpdate = self.acIsAdmin || self.action !== "view" && self.canCreate;                
         });
+
+        self.loading = false;    
       } catch (error) {
         self.loading = false;
         console.log(error);

diff --git a/src/service/config-properties-service.js b/src/service/config-properties-service.js
@@ -7,6 +7,6 @@ export default class ConfigPropertiesService extends BaseService {
    */
 
   async getConfigProperties() {
-    return super.get_auth(`/config`);
+    return super.get_auth(`/config`).then(result => result.data);
   }
 }