Account for null target activity in non-conflicting activity in plan …

…merge (#388)
NASA-AMMOS · Feb 14, 2023 · 44ae9fb · 44ae9fb
1 parent 17e2658
commit 44ae9fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/components/plan/PlanMergeReview.svelte b/src/components/plan/PlanMergeReview.svelte
@@ -111,7 +111,9 @@
         const { source, target } = conflictingActivity;
 
         return {
-          receivingPlanDirectives: [...previous.receivingPlanDirectives, target],
+          receivingPlanDirectives: target
+            ? [...previous.receivingPlanDirectives, target]
+            : previous.receivingPlanDirectives,
           supplyingPlanDirectives: [
             ...previous.supplyingPlanDirectives,
             {

diff --git a/src/types/plan.ts b/src/types/plan.ts
@@ -28,7 +28,7 @@ export type PlanMergeNonConflictingActivity = {
   change_type: PlanMergeActivityOutcome;
   merge_request_id: number;
   source: PlanMergeActivityDirective;
-  target: PlanMergeActivityDirective;
+  target: PlanMergeActivityDirective | null;
 };
 
 export type PlanMergeRequestType = 'incoming' | 'outgoing';