Dependency: Added unit test for substituting dependsOn uuid

Author: vbakke

src/app/model/activity-store.spec.ts

@@ -35,6 +35,8 @@ describe('ActivityStore', () => {
     expect(store.getActivityByUuid('00000000-1111-1111-1111-000000000000')?.name).toBe('Activity 111');
     expect(store.getActivityByName('Activity 111')?.level).toBe(1);
     expect(store.getActivityByName('Activity 121')?.uuid).toBe('00000000-1111-2222-1111-000000000000');
+    expect(store.getActivityByName('Activity 112')?.dependsOn).toContain('Activity 111');
+    expect(store.getActivityByName('Activity 112')?.dependsOn).toContain('Activity 121'); // Substituted uuid
     expect(store.getActivities('Dimension 11', 1)).toHaveSize(2);
     expect(store.getActivities('Dimension 11', 1)?.map(a => a.name)).toContain('Activity 112');
   });

src/app/model/activity-store.ts

@@ -123,8 +123,8 @@ export class ActivityStore {
       this._activityByName = {};
       this._activityByUuid = {};
       this.buildLookups(this._activityList, this._activityByName, this._activityByUuid, errors);
-      this.replaceDependsOnUUids(this._activityList, this._activityByUuid);
     }
+    this.replaceDependsOnUUids(this._activityList, this._activityByUuid);
     this.buildDataHierarchy(this._activityList);
     this.buildDimensionList(this._activityList);
   }
@@ -257,6 +257,7 @@ export class ActivityStore {
         for (let i = 0; i < activity.dependsOn.length; i++) {
           if (activity.dependsOn[i].match(UUID)) {
             if (activityByUuid.hasOwnProperty(activity.dependsOn[i])) {
+              console.log(`Replaces ${activity.dependsOn[i]} with ${activityByUuid[activity.dependsOn[i]].name}`);
               activity.dependsOn[i] = activityByUuid[activity.dependsOn[i]].name;
             }
           }

src/app/service/loader/data-loader.service.ts

@@ -20,6 +20,10 @@ export class LoaderService {
 
   constructor(private yamlService: YamlService) {}
 
+  get datastore(): DataStore | null {
+    return this.dataStore;
+  }
+
   public async load(): Promise<DataStore> {
     // Return cached data if available
     if (this.dataStore) {