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

…actor Amp 3131 refactor
AudiovisualMetadataPlatform · Apr 16, 2024 · 39647bf · 39647bf
2 parents a54b9ea + 53c1903
commit 39647bf
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 7 deletions.
diff --git a/src/components/entity/EntityList.vue b/src/components/entity/EntityList.vue
@@ -1329,8 +1329,7 @@ export default {
       const self = this;
       try {
         self.showLoader = true;
-        const configPropertiesResponse = await self.configPropertiesService.getConfigProperties();
-        self.configProperties = configPropertiesResponse.data;
+        self.configProperties = await self.configPropertiesService.getConfigProperties();        
         self.showLoader = false;
       } catch (error) {
         self.showLoader = false;
@@ -1344,6 +1343,10 @@ export default {
         self.assignedRolesUnitChanged = true;
         self.settingsRolesUnitChanged = true;
       } else if (self.baseUrl === "collection") {
+        // if current collection exists but fields not populated, get its details
+        if (self.selectedCollection && self.selectedCollection.id && !self.selectedCollection.name) {
+          self.selectedCollection = await this.collectionService.getCollectionDetails(self.selectedCollection.id);
+        }
         self.entity = self.selectedCollection;
         if (self.selectedCollection && !self.isCreatePage)
           this.getCollectionItems();

diff --git a/src/components/supplement/SupplementFile.vue b/src/components/supplement/SupplementFile.vue
@@ -296,8 +296,6 @@ export default {
   },
   data() {
     return {
-      loading: false,
-      superLoading: false,
       unitService: new UnitService(),
       itemService: new ItemService(),
       sharedService: new SharedService(),
@@ -306,6 +304,8 @@ export default {
       supplementService: new SupplementService(),
       accessControlService: new AccessControlService(),
       configPropertiesService: new ConfigPropertiesService(),
+      loading: false,
+      superLoading: false,
       supplement: {
         showCollectionList: false,
         collectionList: [],

diff --git a/src/service/collection-service.js b/src/service/collection-service.js
@@ -2,13 +2,20 @@
 import { result } from 'underscore';
 import BaseService from './base-service.js';
 const baseService = new BaseService();
+
 export default class CollectionService extends BaseService{
+    // Get collection detail
+    async getCollectionDetails(id) {
+        return super.get_auth(`/collections/${id}`).then(result => result.data);
+    }
+
     async getCollectionPage(num,size){
         if(num && size){
             return super.get_auth(`/collections?page=${num}&size=${size}`)
         }
         else return super.get_auth('/collections');
     }
+
     async activateCollection(id, active){        
         return await super.patch_auth(`/collections/${id}`, 
            {

diff --git a/src/service/config-properties-service.js b/src/service/config-properties-service.js
@@ -6,7 +6,7 @@ export default class ConfigPropertiesService extends BaseService {
    * @method GET
    */
 
-  async getConfigProperties() {
+  getConfigProperties() {
     return super.get_auth(`/config`).then(result => result.data);
   }
 }
diff --git a/src/service/entity-service.js b/src/service/entity-service.js
@@ -13,7 +13,7 @@ export default class EntityService {
         await unitService.getUnitById(defaultUnit).then(res => {
             unitDetails.response = res;
         }).catch(err => {
-            self.$bvToast.toast("Unable to retrive unit details. Please try again!", context.sharedService.erorrToastConfig);
+            self.$bvToast.toast("Unable to retrieve unit details. Please try again!", context.sharedService.erorrToastConfig);
         });
         return unitDetails;
     }

diff --git a/src/service/unit-service.js b/src/service/unit-service.js
@@ -5,7 +5,7 @@ const baseService = new BaseService();
 export default class UnitService extends BaseService{
 
     /***
-     * To get all unit details
+     * To get the list of all units.
      * @params num, size
      */