Dependency: Swap uuids with activity names

Author: vbakke

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

@@ -139,6 +139,7 @@ const baseYaml: any = {
         uuid: '00000000-1111-1111-2222-000000000000',
         level: 1,
         description: 'Description from base yaml',
+        dependsOn: ['Activity 111', '00000000-1111-2222-1111-000000000000'],
       },
     },
     'Dimension 12': {

src/app/model/activity-store.ts

@@ -1,6 +1,5 @@
 import { appendHashElement } from '../util/ArrayHash';
 import { IgnoreList } from './ignore-list';
-import { Progress } from './types';
 import { MarkdownText } from './markdown-text';
 
 export type Data = Record<string, Category>;
@@ -55,6 +54,8 @@ export interface DifficultyOfImplementation {
   resources: number;
 }
 
+const UUID = /([0-9a-f]{6,}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{6,})/i;
+
 export class ActivityStore {
   public data: Data = {};
   private _activityList: Activity[] = [];
@@ -122,6 +123,7 @@ export class ActivityStore {
       this._activityByName = {};
       this._activityByUuid = {};
       this.buildLookups(this._activityList, this._activityByName, this._activityByUuid, errors);
+      this.replaceDependsOnUUids(this._activityList, this._activityByUuid);
     }
     this.buildDataHierarchy(this._activityList);
     this.buildDimensionList(this._activityList);
@@ -246,6 +248,23 @@ export class ActivityStore {
     }
   }
 
+  /**
+   * Substitute dependsOn UUIDs with activity names
+   */
+  replaceDependsOnUUids(activityList: Activity[], activityByUuid: Record<string, Activity>) {
+    for (let activity of activityList) {
+      if (activity.dependsOn && activity.dependsOn.length > 0) {
+        for (let i = 0; i < activity.dependsOn.length; i++) {
+          if (activity.dependsOn[i].match(UUID)) {
+            if (activityByUuid.hasOwnProperty(activity.dependsOn[i])) {
+              activity.dependsOn[i] = activityByUuid[activity.dependsOn[i]].name;
+            }
+          }
+        }
+      }
+    }
+  }
+
   addActivityLookup(
     activity: Activity,
     activityByName: Record<string, Activity>,

src/assets/Markdown Files/TODO-v4.md

@@ -1,9 +1,6 @@
 ## Doing
 ### Dependency graph
 
-- Heatmap: Handle dependsOn uuid (example)
-  - http://localhost:4200/activity-description?uuid=13e9757e-58e2-4277-bc0f-eadc674891e6
-
 - Dependency graph: Make connecting nodes clickable
 - Heatmap: Add #uuid to URL
 
@@ -74,6 +71,7 @@
 - Meta.yaml: Allow admins to customize the terms 'Team' and 'Group' (e.g. to 'App' and 'Portfolio')
 
 # Done
+- Dependency: Handle dependsOn uuid, not just name
 - Matrix: Dependency graph: Render in center of page
 - Dependency graph: Add to CircularHeatmap Details
 - Dependency graph: Support dark mode