From 0ec27f2a2ae7c599a46935ffd94e365e340e2b33 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Thu, 31 Aug 2023 10:37:19 -0700
Subject: [PATCH 01/27] Rough first pass at fetching changelog and displaying
 results per activity

---
 .../ActivityDirectiveChangelog.svelte         | 112 ++++++++++++++++++
 .../activity/ActivityFormPanel.svelte         |  16 ++-
 src/types/activity.ts                         |   8 ++
 src/utilities/effects.ts                      |  24 ++++
 src/utilities/gql.ts                          |  19 +++
 5 files changed, 178 insertions(+), 1 deletion(-)
 create mode 100644 src/components/activity/ActivityDirectiveChangelog.svelte

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
new file mode 100644
index 0000000000..5262ef5c5c
--- /dev/null
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -0,0 +1,112 @@
+<svelte:options immutable={true} />
+
+<script lang="ts">
+  import { onMount } from 'svelte';
+  import type { ActivityDirective, ActivityDirectiveRevision } from '../../types/activity';
+  import type { User } from '../../types/app';
+  import effects from '../../utilities/effects';
+
+  export let activityDirective: ActivityDirective;
+  export let user: User | null;
+
+  let activityRevisions: ActivityDirectiveRevision[];
+  $: activityRevisions = [];
+  $: activityRevisionChangeMap = {};
+
+  function formatDate(dateString: string) {
+    return new Date(dateString).toLocaleString().replace(',', '').replace(' PM', 'pm').replace(' AM', 'am');
+  }
+
+  function diffRevisions(next: ActivityDirectiveRevision, prev: ActivityDirectiveRevision) {
+    console.log('DIFFING REVISIONS', next, prev);
+    if (!next || !prev) {
+      return [];
+    }
+
+    let differences = [];
+    Object.keys(next.arguments).forEach(argument => {
+      if (next.arguments[argument] !== prev.arguments[argument]) {
+        differences.push({ key: argument, next: next.arguments[argument], prev: prev.arguments[argument] });
+      }
+    });
+
+    return differences;
+  }
+
+  onMount(async () => {
+    const { id: activityId, plan_id: planId } = activityDirective;
+    activityRevisions = await effects.getActivityDirectiveChangelog(planId, activityId, user);
+
+    for (let i = 0; i < activityRevisions.length - 1; i++) {
+      activityRevisionChangeMap[activityRevisions[i].revision] = diffRevisions(
+        activityRevisions[i],
+        activityRevisions[i + 1],
+      );
+    }
+
+    console.log('RETURNED REVISIONS', activityRevisions);
+    console.log('CHANGE MAPPING', activityRevisionChangeMap);
+  });
+</script>
+
+<div class="activity-revisions">
+  {#each activityRevisions as revision}
+    <div class="activity-revision">
+      <div class="date st-typography-medium">{formatDate(revision.changed_at)}</div>
+      <div class="change-summary st-typography-body">Change Summary</div>
+      <div class="changed-by st-typography-label">{revision.changed_by}</div>
+      <div class="new-value st-typography-body">New Value</div>
+      <div class="actions"><button class="st-button">Restore</button></div>
+      <div class="previous-value st-typography-body">Previous Value</div>
+    </div>
+  {/each}
+</div>
+
+<style>
+  .activity-revision {
+    align-content: center;
+    border: 1px solid transparent;
+    border-radius: 4px;
+    column-gap: 2px;
+    display: grid;
+    font-size: 12px;
+    font-weight: 400;
+    grid-template-columns: 1fr 1fr;
+    line-height: 16px;
+    margin: 8px 8px 0px 8px;
+    padding: 4px;
+    row-gap: 4px;
+  }
+
+  .activity-revision:hover {
+    background-color: #f8f8f8;
+    border-color: #ebecec;
+  }
+
+  .new-value,
+  .previous-value,
+  .change-summary {
+    text-align: right;
+  }
+
+  .actions button {
+    display: none;
+    height: 16px;
+    line-height: 16px;
+    margin: 0;
+    padding: 0 8px;
+  }
+
+  .activity-revision:hover .actions button {
+    display: inline-flex;
+  }
+
+  .new-value {
+    color: #265fc5;
+  }
+
+  .previous-value {
+    color: #a91900;
+    text-decoration: line-through;
+  }
+</style>
diff --git a/src/components/activity/ActivityFormPanel.svelte b/src/components/activity/ActivityFormPanel.svelte
index f0f06de12c..0e568c1b24 100644
--- a/src/components/activity/ActivityFormPanel.svelte
+++ b/src/components/activity/ActivityFormPanel.svelte
@@ -32,6 +32,7 @@
   import GridMenu from '../menus/GridMenu.svelte';
   import Panel from '../ui/Panel.svelte';
   import PanelHeaderActions from '../ui/PanelHeaderActions.svelte';
+  import ActivityDirectiveChangelog from './ActivityDirectiveChangelog.svelte';
   import ActivityDirectiveForm from './ActivityDirectiveForm.svelte';
   import ActivitySpanForm from './ActivitySpanForm.svelte';
 
@@ -39,6 +40,7 @@
   export let user: User | null;
 
   let hasDeletePermission: boolean = false;
+  let viewingActivityDirectiveChangelog: boolean = false;
 
   $: deletePermissionError = $planReadOnly
     ? PlanStatusMessages.READ_ONLY
@@ -91,12 +93,24 @@
         >
           <TrashIcon />
         </button>
+
+        <button
+          class="st-button icon activity-header-delete"
+          on:click|stopPropagation={() => {
+            viewingActivityDirectiveChangelog = !viewingActivityDirectiveChangelog;
+          }}
+          use:tooltip={{ content: 'View Activity Changelog', placement: 'top' }}
+        >
+          <TrashIcon />
+        </button>
       {/if}
     </PanelHeaderActions>
   </svelte:fragment>
 
   <svelte:fragment slot="body">
-    {#if $selectedActivityDirective && $plan !== null}
+    {#if $selectedActivityDirective && $plan !== null && viewingActivityDirectiveChangelog}
+      <ActivityDirectiveChangelog activityDirective={$selectedActivityDirective} {user} />
+    {:else if $selectedActivityDirective && $plan !== null}
       <ActivityDirectiveForm
         activityDirectivesMap={$activityDirectivesMap}
         activityDirective={$selectedActivityDirective}
diff --git a/src/types/activity.ts b/src/types/activity.ts
index 9b291eebd5..32ccee413a 100644
--- a/src/types/activity.ts
+++ b/src/types/activity.ts
@@ -63,6 +63,14 @@ export type ActivityDirectiveInsertInput = {
 
 export type ActivityDirectiveSetInput = Partial<ActivityDirectiveInsertInput>;
 
+export type ActivityDirectiveRevision =
+  | Partial<ActivityDirective>
+  | {
+      changed_at: string;
+      changed_by: string;
+      revision: number;
+    };
+
 export type AppliedPreset = {
   activity_id: ActivityDirectiveId;
   plan_id: number;
diff --git a/src/utilities/effects.ts b/src/utilities/effects.ts
index f1f7abadfa..f0b52e2221 100644
--- a/src/utilities/effects.ts
+++ b/src/utilities/effects.ts
@@ -23,6 +23,7 @@ import type {
   ActivityDirective,
   ActivityDirectiveId,
   ActivityDirectiveInsertInput,
+  ActivityDirectiveRevision,
   ActivityDirectiveSetInput,
   ActivityDirectivesMap,
   ActivityPreset,
@@ -2228,6 +2229,29 @@ const effects = {
     }
   },
 
+  async getActivityDirectiveChangelog(
+    planId: number,
+    activityId: number,
+    user: User | null,
+  ): Promise<ActivityDirectiveRevision[]> {
+    try {
+      const data = await reqHasura<ActivityDirectiveRevision[]>(
+        gql.GET_ACTIVITY_DIRECTIVE_CHANGELOG,
+        { activityId, planId },
+        user,
+      );
+      const { activityDirectiveRevisions } = data;
+      if (activityDirectiveRevisions != null) {
+        return activityDirectiveRevisions;
+      } else {
+        throw Error('Unable to retrieve activity directive changelog');
+      }
+    } catch (e) {
+      catchError(e as Error);
+      return [];
+    }
+  },
+
   async getActivityTypes(modelId: number, user: User | null): Promise<ActivityType[]> {
     try {
       const query = convertToQuery(gql.SUB_ACTIVITY_TYPES);
diff --git a/src/utilities/gql.ts b/src/utilities/gql.ts
index cc51bfdc77..2e16cb49da 100644
--- a/src/utilities/gql.ts
+++ b/src/utilities/gql.ts
@@ -620,6 +620,25 @@ const gql = {
     }
   `,
 
+  GET_ACTIVITY_DIRECTIVE_CHANGELOG: `#graphql
+    query GetActivityTypesExpansionRules($activityId: Int!, $planId: Int!) {
+      activityDirectiveRevisions: activity_directive_changelog(
+        where: { plan_id: { _eq: $planId }, _and: { activity_directive_id: { _eq: $activityId }}},
+        order_by: { revision: desc }
+      ) {
+        revision
+        changed_by
+        changed_at
+        anchor_id
+        anchored_to_start
+        arguments
+        metadata
+        name
+        start_offset
+      }
+    }
+  `,
+
   GET_ACTIVITY_TYPES_EXPANSION_RULES: `#graphql
     query GetActivityTypesExpansionRules($modelId: Int!) {
       activity_types: activity_type(where: { model_id: { _eq: $modelId } }) {

From aae33764c65e79540b85820b5a962036e2d2a036 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Thu, 21 Sep 2023 16:31:52 -0700
Subject: [PATCH 02/27] Basic working UI for change log, no restore or preview

---
 .../ActivityDirectiveChangelog.svelte         | 123 +++++++++++++-----
 .../activity/ActivityFormPanel.svelte         |   7 +-
 src/types/activity.ts                         |  18 ++-
 3 files changed, 106 insertions(+), 42 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 5262ef5c5c..065547f3f8 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -2,64 +2,116 @@
 
 <script lang="ts">
   import { onMount } from 'svelte';
-  import type { ActivityDirective, ActivityDirectiveRevision } from '../../types/activity';
+  import type { ActivityDirective, ActivityDirectiveRevision, ActivityType } from '../../types/activity';
   import type { User } from '../../types/app';
+  import type { ArgumentsMap } from '../../types/parameter';
   import effects from '../../utilities/effects';
 
   export let activityDirective: ActivityDirective;
+  export let activityTypes: ActivityType[] = [];
+  export let modelId: number;
   export let user: User | null;
 
   let activityRevisions: ActivityDirectiveRevision[];
   $: activityRevisions = [];
-  $: activityRevisionChangeMap = {};
+  let activityRevisionChangeMap = [];
+  $: activityRevisionChangeMap = [];
+  $: activityType =
+    (activityTypes ?? []).find(({ name: activityTypeName }) => activityDirective?.type === activityTypeName) ?? null;
+  let defaultArguments: ArgumentsMap | undefined;
+  $: defaultArguments = {};
+  let effectiveRevisionArguments: ArgumentsMap[];
+  $: effectiveRevisionArguments = [];
 
   function formatDate(dateString: string) {
-    return new Date(dateString).toLocaleString().replace(',', '').replace(' PM', 'pm').replace(' AM', 'am');
+    return new Date(dateString).toLocaleString(undefined, {
+      day: 'numeric',
+      hour: 'numeric',
+      minute: '2-digit',
+      month: 'numeric',
+      year: '2-digit',
+    });
   }
 
-  function diffRevisions(next: ActivityDirectiveRevision, prev: ActivityDirectiveRevision) {
-    console.log('DIFFING REVISIONS', next, prev);
-    if (!next || !prev) {
-      return [];
-    }
-
-    let differences = [];
-    Object.keys(next.arguments).forEach(argument => {
-      if (next.arguments[argument] !== prev.arguments[argument]) {
-        differences.push({ key: argument, next: next.arguments[argument], prev: prev.arguments[argument] });
+  function diffRevisions(current: ActivityDirectiveRevision, previous: ActivityDirectiveRevision) {
+    const differences: { [name: string]: { currentValue: any; previousValue: any } } = {};
+    Object.keys(current.arguments).forEach(argument => {
+      if (current.arguments[argument] !== previous.arguments[argument]) {
+        differences[argument] = {
+          currentValue: current.arguments[argument],
+          previousValue: previous.arguments[argument],
+        };
       }
     });
 
-    return differences;
+    const changedProperties = Object.keys(differences);
+    const firstChange = differences[changedProperties[0]];
+
+    if (changedProperties.length > 1) {
+      return { currentValue: `${changedProperties.length} Changes`, name: '', previousValue: '' };
+    }
+
+    return {
+      currentValue: firstChange.currentValue,
+      name: changedProperties[0],
+      previousValue: firstChange.previousValue,
+    };
   }
 
   onMount(async () => {
     const { id: activityId, plan_id: planId } = activityDirective;
     activityRevisions = await effects.getActivityDirectiveChangelog(planId, activityId, user);
+    const effectiveArguments = await effects.getEffectiveActivityArguments(modelId, activityType.name, {}, user);
+    defaultArguments = effectiveArguments?.arguments;
+
+    // Get effective arguments for all revisions
+    const effectiveArgumentsRequests = activityRevisions.map(revision =>
+      effects.getEffectiveActivityArguments(modelId, activityType.name, revision.arguments, user),
+    );
+    const effectiveArgumentsResponses = await Promise.all(effectiveArgumentsRequests);
+    effectiveRevisionArguments = effectiveArgumentsResponses.map(effectiveArguments => effectiveArguments?.arguments);
+
+    // Build a summary of changes by comparing two revisions and their effective arguments
+    activityRevisionChangeMap = activityRevisions.map((activityRevision, i) => {
+      const previousRevision = activityRevisions[i + 1];
+
+      if (!previousRevision) {
+        return { currentValue: '', name: 'Last Known Revision', previousValue: '' };
+      }
 
-    for (let i = 0; i < activityRevisions.length - 1; i++) {
-      activityRevisionChangeMap[activityRevisions[i].revision] = diffRevisions(
-        activityRevisions[i],
-        activityRevisions[i + 1],
+      return diffRevisions(
+        { ...activityRevision, arguments: effectiveRevisionArguments[i] },
+        { ...previousRevision, arguments: effectiveRevisionArguments[i + 1] },
       );
-    }
-
-    console.log('RETURNED REVISIONS', activityRevisions);
-    console.log('CHANGE MAPPING', activityRevisionChangeMap);
+    });
   });
 </script>
 
 <div class="activity-revisions">
-  {#each activityRevisions as revision}
-    <div class="activity-revision">
-      <div class="date st-typography-medium">{formatDate(revision.changed_at)}</div>
-      <div class="change-summary st-typography-body">Change Summary</div>
-      <div class="changed-by st-typography-label">{revision.changed_by}</div>
-      <div class="new-value st-typography-body">New Value</div>
-      <div class="actions"><button class="st-button">Restore</button></div>
-      <div class="previous-value st-typography-body">Previous Value</div>
-    </div>
-  {/each}
+  {#if activityRevisionChangeMap.length}
+    {#each activityRevisions as revision, i}
+      <div class="activity-revision">
+        <div class="date st-typography-medium">{formatDate(revision.changed_at)}</div>
+        <div class="change-summary st-typography-body">
+          {activityRevisionChangeMap[i].name}
+        </div>
+        <div class="changed-by st-typography-label">{revision.changed_by}</div>
+        <div class="new-value st-typography-body">
+          {activityRevisionChangeMap[i].currentValue}
+        </div>
+        <div class="actions">
+          {#if i == 0}
+            <span>Current Revision</span>
+          {:else}
+            <button class="st-button">Restore</button>
+          {/if}
+        </div>
+        <div class="previous-value st-typography-body">
+          {activityRevisionChangeMap[i].previousValue}
+        </div>
+      </div>
+    {/each}
+  {/if}
 </div>
 
 <style>
@@ -89,15 +141,18 @@
     text-align: right;
   }
 
-  .actions button {
+  .actions > * {
     display: none;
     height: 16px;
     line-height: 16px;
     margin: 0;
+  }
+
+  .actions button {
     padding: 0 8px;
   }
 
-  .activity-revision:hover .actions button {
+  .activity-revision:hover .actions > * {
     display: inline-flex;
   }
 
diff --git a/src/components/activity/ActivityFormPanel.svelte b/src/components/activity/ActivityFormPanel.svelte
index 0e568c1b24..27e911cdb0 100644
--- a/src/components/activity/ActivityFormPanel.svelte
+++ b/src/components/activity/ActivityFormPanel.svelte
@@ -109,7 +109,12 @@
 
   <svelte:fragment slot="body">
     {#if $selectedActivityDirective && $plan !== null && viewingActivityDirectiveChangelog}
-      <ActivityDirectiveChangelog activityDirective={$selectedActivityDirective} {user} />
+      <ActivityDirectiveChangelog
+        activityDirective={$selectedActivityDirective}
+        activityTypes={$activityTypes}
+        modelId={$modelId}
+        {user}
+      />
     {:else if $selectedActivityDirective && $plan !== null}
       <ActivityDirectiveForm
         activityDirectivesMap={$activityDirectivesMap}
diff --git a/src/types/activity.ts b/src/types/activity.ts
index 32ccee413a..53cd48ea78 100644
--- a/src/types/activity.ts
+++ b/src/types/activity.ts
@@ -63,13 +63,17 @@ export type ActivityDirectiveInsertInput = {
 
 export type ActivityDirectiveSetInput = Partial<ActivityDirectiveInsertInput>;
 
-export type ActivityDirectiveRevision =
-  | Partial<ActivityDirective>
-  | {
-      changed_at: string;
-      changed_by: string;
-      revision: number;
-    };
+export type ActivityDirectiveRevision = {
+  anchor_id: number | null;
+  anchored_to_start: boolean;
+  arguments: ArgumentsMap;
+  changed_at: string;
+  changed_by: string;
+  metadata: ActivityMetadata;
+  name: string;
+  revision: number;
+  start_offset: string;
+};
 
 export type AppliedPreset = {
   activity_id: ActivityDirectiveId;

From b307b7824cf1b98e0b5ea124f0c303077fff4561 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 25 Sep 2023 14:00:11 -0700
Subject: [PATCH 03/27] Account for anchor differences

---
 .../ActivityDirectiveChangelog.svelte         | 56 ++++++++++++++++---
 .../activity/ActivityFormPanel.svelte         |  1 +
 2 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 065547f3f8..c6f683f66f 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -2,12 +2,18 @@
 
 <script lang="ts">
   import { onMount } from 'svelte';
-  import type { ActivityDirective, ActivityDirectiveRevision, ActivityType } from '../../types/activity';
+  import type {
+    ActivityDirective,
+    ActivityDirectiveRevision,
+    ActivityDirectivesMap,
+    ActivityType,
+  } from '../../types/activity';
   import type { User } from '../../types/app';
   import type { ArgumentsMap } from '../../types/parameter';
   import effects from '../../utilities/effects';
 
   export let activityDirective: ActivityDirective;
+  export let activityDirectivesMap: ActivityDirectivesMap = {};
   export let activityTypes: ActivityType[] = [];
   export let modelId: number;
   export let user: User | null;
@@ -24,17 +30,20 @@
   $: effectiveRevisionArguments = [];
 
   function formatDate(dateString: string) {
-    return new Date(dateString).toLocaleString(undefined, {
-      day: 'numeric',
-      hour: 'numeric',
-      minute: '2-digit',
-      month: 'numeric',
-      year: '2-digit',
-    });
+    return new Date(dateString)
+      .toLocaleString(undefined, {
+        day: 'numeric',
+        hour: 'numeric',
+        minute: '2-digit',
+        month: 'numeric',
+        year: '2-digit',
+      })
+      .replace(',', '');
   }
 
   function diffRevisions(current: ActivityDirectiveRevision, previous: ActivityDirectiveRevision) {
     const differences: { [name: string]: { currentValue: any; previousValue: any } } = {};
+
     Object.keys(current.arguments).forEach(argument => {
       if (current.arguments[argument] !== previous.arguments[argument]) {
         differences[argument] = {
@@ -44,8 +53,37 @@
       }
     });
 
+    if (current.start_offset !== previous.start_offset) {
+      differences['Start Time'] = {
+        currentValue: current.start_offset,
+        previousValue: previous.start_offset,
+      };
+    }
+
+    if (current.anchored_to_start !== previous.anchored_to_start) {
+      differences['Anchor'] = {
+        currentValue: current.anchored_to_start ? 'Start' : 'End',
+        previousValue: previous.anchored_to_start ? 'Start' : 'End',
+      };
+    }
+
+    if (current.anchor_id !== previous.anchor_id) {
+      const currentAnchorDirective = current.anchor_id
+        ? activityDirectivesMap[current.anchor_id].name
+        : 'Unknown Directive';
+      const previousAnchorDirective = previous.anchor_id
+        ? activityDirectivesMap[previous.anchor_id]
+        : 'Unknown Directive';
+      differences['Anchored To'] = {
+        currentValue: current.anchor_id ? `${current.anchor_id} - ${currentAnchorDirective}` : 'Plan',
+        previousValue: previous.anchor_id ? `${previous.anchor_id} - ${previousAnchorDirective}` : 'Plan',
+      };
+    }
+
     const changedProperties = Object.keys(differences);
-    const firstChange = differences[changedProperties[0]];
+    const firstChange = changedProperties.length
+      ? differences[changedProperties[0]]
+      : { currentValue: '', name: '', previousValue: '' };
 
     if (changedProperties.length > 1) {
       return { currentValue: `${changedProperties.length} Changes`, name: '', previousValue: '' };
diff --git a/src/components/activity/ActivityFormPanel.svelte b/src/components/activity/ActivityFormPanel.svelte
index 27e911cdb0..ec6e45b5f5 100644
--- a/src/components/activity/ActivityFormPanel.svelte
+++ b/src/components/activity/ActivityFormPanel.svelte
@@ -111,6 +111,7 @@
     {#if $selectedActivityDirective && $plan !== null && viewingActivityDirectiveChangelog}
       <ActivityDirectiveChangelog
         activityDirective={$selectedActivityDirective}
+        activityDirectivesMap={$activityDirectivesMap}
         activityTypes={$activityTypes}
         modelId={$modelId}
         {user}

From 879a509ce0b62001514ddc69b55586ef3c41b605 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 25 Sep 2023 14:38:58 -0700
Subject: [PATCH 04/27] small formatting fixes and type corrections

---
 .../ActivityDirectiveChangelog.svelte         | 20 ++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index c6f683f66f..c7d93c0fcd 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -20,13 +20,13 @@
 
   let activityRevisions: ActivityDirectiveRevision[];
   $: activityRevisions = [];
-  let activityRevisionChangeMap = [];
+  let activityRevisionChangeMap: { currentValue: string; name: string; previousValue: string }[] = [];
   $: activityRevisionChangeMap = [];
   $: activityType =
     (activityTypes ?? []).find(({ name: activityTypeName }) => activityDirective?.type === activityTypeName) ?? null;
   let defaultArguments: ArgumentsMap | undefined;
   $: defaultArguments = {};
-  let effectiveRevisionArguments: ArgumentsMap[];
+  let effectiveRevisionArguments: (ArgumentsMap | undefined)[];
   $: effectiveRevisionArguments = [];
 
   function formatDate(dateString: string) {
@@ -44,6 +44,7 @@
   function diffRevisions(current: ActivityDirectiveRevision, previous: ActivityDirectiveRevision) {
     const differences: { [name: string]: { currentValue: any; previousValue: any } } = {};
 
+    // Build list of all arguments that differ
     Object.keys(current.arguments).forEach(argument => {
       if (current.arguments[argument] !== previous.arguments[argument]) {
         differences[argument] = {
@@ -53,6 +54,8 @@
       }
     });
 
+    // Manually check remaining fields that could have change and need extra formatting
+
     if (current.start_offset !== previous.start_offset) {
       differences['Start Time'] = {
         currentValue: current.start_offset,
@@ -99,12 +102,12 @@
   onMount(async () => {
     const { id: activityId, plan_id: planId } = activityDirective;
     activityRevisions = await effects.getActivityDirectiveChangelog(planId, activityId, user);
-    const effectiveArguments = await effects.getEffectiveActivityArguments(modelId, activityType.name, {}, user);
+    const effectiveArguments = await effects.getEffectiveActivityArguments(modelId, activityType?.name || '', {}, user);
     defaultArguments = effectiveArguments?.arguments;
 
     // Get effective arguments for all revisions
     const effectiveArgumentsRequests = activityRevisions.map(revision =>
-      effects.getEffectiveActivityArguments(modelId, activityType.name, revision.arguments, user),
+      effects.getEffectiveActivityArguments(modelId, activityType?.name || '', revision.arguments, user),
     );
     const effectiveArgumentsResponses = await Promise.all(effectiveArgumentsRequests);
     effectiveRevisionArguments = effectiveArgumentsResponses.map(effectiveArguments => effectiveArguments?.arguments);
@@ -118,8 +121,8 @@
       }
 
       return diffRevisions(
-        { ...activityRevision, arguments: effectiveRevisionArguments[i] },
-        { ...previousRevision, arguments: effectiveRevisionArguments[i + 1] },
+        { ...activityRevision, arguments: { ...effectiveRevisionArguments[i] } },
+        { ...previousRevision, arguments: { ...effectiveRevisionArguments[i + 1] } },
       );
     });
   });
@@ -135,7 +138,7 @@
         </div>
         <div class="changed-by st-typography-label">{revision.changed_by}</div>
         <div class="new-value st-typography-body">
-          {activityRevisionChangeMap[i].currentValue}
+          {activityRevisionChangeMap[i].currentValue || ' '}
         </div>
         <div class="actions">
           {#if i == 0}
@@ -176,7 +179,10 @@
   .new-value,
   .previous-value,
   .change-summary {
+    height: 1rem;
     text-align: right;
+    text-overflow: ellipsis;
+    white-space: nowrap;
   }
 
   .actions > * {

From a80deec54f3ba54095aa68b23761ab3142e40c7e Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 25 Sep 2023 15:05:18 -0700
Subject: [PATCH 05/27] Catch scenarios with no changes, e.g. creating a preset

---
 .../activity/ActivityDirectiveChangelog.svelte         | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index c7d93c0fcd..63e64e6ddb 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -54,7 +54,7 @@
       }
     });
 
-    // Manually check remaining fields that could have change and need extra formatting
+    // Manually check remaining fields that could have changed and require extra formatting
 
     if (current.start_offset !== previous.start_offset) {
       differences['Start Time'] = {
@@ -86,15 +86,17 @@
     const changedProperties = Object.keys(differences);
     const firstChange = changedProperties.length
       ? differences[changedProperties[0]]
-      : { currentValue: '', name: '', previousValue: '' };
+      : { currentValue: '', previousValue: '' };
 
     if (changedProperties.length > 1) {
-      return { currentValue: `${changedProperties.length} Changes`, name: '', previousValue: '' };
+      return { currentValue: `${changedProperties.length} Changes`, name: 'Multiple Changes', previousValue: '' };
+    } else if (changedProperties.length === 0) {
+      return { currentValue: '', name: 'No Changes', previousValue: '' };
     }
 
     return {
       currentValue: firstChange.currentValue,
-      name: changedProperties[0],
+      name: changedProperties[0] || '',
       previousValue: firstChange.previousValue,
     };
   }

From 630c2461a00edc1e1b68dabefd891e86415d96dc Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 25 Sep 2023 15:39:29 -0700
Subject: [PATCH 06/27] remove unused data, format durations

---
 .../ActivityDirectiveChangelog.svelte         | 29 ++++++++++++++-----
 .../activity/ActivityDirectiveForm.svelte     |  1 +
 2 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 63e64e6ddb..7a57fc4f42 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -11,6 +11,7 @@
   import type { User } from '../../types/app';
   import type { ArgumentsMap } from '../../types/parameter';
   import effects from '../../utilities/effects';
+  import { convertUsToDurationString } from '../../utilities/time';
 
   export let activityDirective: ActivityDirective;
   export let activityDirectivesMap: ActivityDirectivesMap = {};
@@ -24,8 +25,6 @@
   $: activityRevisionChangeMap = [];
   $: activityType =
     (activityTypes ?? []).find(({ name: activityTypeName }) => activityDirective?.type === activityTypeName) ?? null;
-  let defaultArguments: ArgumentsMap | undefined;
-  $: defaultArguments = {};
   let effectiveRevisionArguments: (ArgumentsMap | undefined)[];
   $: effectiveRevisionArguments = [];
 
@@ -41,6 +40,20 @@
       .replace(',', '');
   }
 
+  function formatParameterValue(parameterName: string, parameterValue: any) {
+    if (!activityType?.parameters || !activityType.parameters[parameterName]) {
+      return parameterValue;
+    }
+
+    const parameterType = activityType.parameters[parameterName].schema.type;
+    switch (parameterType) {
+      case 'duration':
+        return convertUsToDurationString(parameterValue);
+      default:
+        return parameterValue;
+    }
+  }
+
   function diffRevisions(current: ActivityDirectiveRevision, previous: ActivityDirectiveRevision) {
     const differences: { [name: string]: { currentValue: any; previousValue: any } } = {};
 
@@ -91,6 +104,8 @@
     if (changedProperties.length > 1) {
       return { currentValue: `${changedProperties.length} Changes`, name: 'Multiple Changes', previousValue: '' };
     } else if (changedProperties.length === 0) {
+      // Catch edge-case scenarios where there a no differences between revisions
+      // e.g. an API update that didn't actually change anything, or creating a preset from the current parameter values
       return { currentValue: '', name: 'No Changes', previousValue: '' };
     }
 
@@ -104,8 +119,6 @@
   onMount(async () => {
     const { id: activityId, plan_id: planId } = activityDirective;
     activityRevisions = await effects.getActivityDirectiveChangelog(planId, activityId, user);
-    const effectiveArguments = await effects.getEffectiveActivityArguments(modelId, activityType?.name || '', {}, user);
-    defaultArguments = effectiveArguments?.arguments;
 
     // Get effective arguments for all revisions
     const effectiveArgumentsRequests = activityRevisions.map(revision =>
@@ -118,6 +131,7 @@
     activityRevisionChangeMap = activityRevisions.map((activityRevision, i) => {
       const previousRevision = activityRevisions[i + 1];
 
+      // At some point there will be no previous revision to compute a difference from
       if (!previousRevision) {
         return { currentValue: '', name: 'Last Known Revision', previousValue: '' };
       }
@@ -140,7 +154,7 @@
         </div>
         <div class="changed-by st-typography-label">{revision.changed_by}</div>
         <div class="new-value st-typography-body">
-          {activityRevisionChangeMap[i].currentValue || ' '}
+          {formatParameterValue(activityRevisionChangeMap[i].name, activityRevisionChangeMap[i].currentValue)}
         </div>
         <div class="actions">
           {#if i == 0}
@@ -150,7 +164,7 @@
           {/if}
         </div>
         <div class="previous-value st-typography-body">
-          {activityRevisionChangeMap[i].previousValue}
+          {formatParameterValue(activityRevisionChangeMap[i].name, activityRevisionChangeMap[i].previousValue)}
         </div>
       </div>
     {/each}
@@ -166,7 +180,7 @@
     display: grid;
     font-size: 12px;
     font-weight: 400;
-    grid-template-columns: 1fr 1fr;
+    grid-template-columns: 1fr max-content;
     line-height: 16px;
     margin: 8px 8px 0px 8px;
     padding: 4px;
@@ -182,6 +196,7 @@
   .previous-value,
   .change-summary {
     height: 1rem;
+    overflow: hidden;
     text-align: right;
     text-overflow: ellipsis;
     white-space: nowrap;
diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index 0cd31d8f82..ccf7ebd9ba 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -128,6 +128,7 @@
   function editActivityName() {
     editingActivityName = true;
   }
+
   function updateAnchor({ detail: anchorId }: CustomEvent<ActivityDirectiveId>) {
     const { id } = activityDirective;
     if ($plan) {

From 418a0566103911a2883fdbcc4958134f75b5872d Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 25 Sep 2023 16:39:41 -0700
Subject: [PATCH 07/27] move changelog button into activity name header

---
 .../ActivityDirectiveChangelog.svelte         | 47 ++++++++++++++++++-
 .../activity/ActivityDirectiveForm.svelte     | 17 +++++++
 .../activity/ActivityFormPanel.svelte         | 16 +++----
 3 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 7a57fc4f42..3d58aec9fd 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -1,7 +1,8 @@
 <svelte:options immutable={true} />
 
 <script lang="ts">
-  import { onMount } from 'svelte';
+  import TrashIcon from '@nasa-jpl/stellar/icons/trash.svg?component';
+  import { createEventDispatcher, onMount } from 'svelte';
   import type {
     ActivityDirective,
     ActivityDirectiveRevision,
@@ -12,6 +13,9 @@
   import type { ArgumentsMap } from '../../types/parameter';
   import effects from '../../utilities/effects';
   import { convertUsToDurationString } from '../../utilities/time';
+  import { tooltip } from '../../utilities/tooltip';
+
+  const dispatch = createEventDispatcher();
 
   export let activityDirective: ActivityDirective;
   export let activityDirectivesMap: ActivityDirectivesMap = {};
@@ -144,6 +148,23 @@
   });
 </script>
 
+<div class="activity-header">
+  <div class="activity-header-title">
+    <div class="activity-header-title-value st-typography-medium">
+      {activityType?.name}
+    </div>
+  </div>
+  <div>
+    <button
+      class="st-button icon activity-header-changelog"
+      on:click|stopPropagation={() => dispatch('closeChangelog')}
+      use:tooltip={{ content: 'Close Activity Changelog', placement: 'top' }}
+    >
+      <TrashIcon />
+    </button>
+  </div>
+</div>
+
 <div class="activity-revisions">
   {#if activityRevisionChangeMap.length}
     {#each activityRevisions as revision, i}
@@ -172,6 +193,24 @@
 </div>
 
 <style>
+  .activity-header {
+    align-items: center;
+    background: var(--st-gray-10);
+    border-bottom: 1px solid var(--st-gray-15);
+    display: flex;
+    flex-shrink: 0;
+    font-style: italic;
+    padding: 4px 8px;
+    padding-left: 8px;
+  }
+
+  .activity-header-title {
+    align-items: flex-start;
+    display: flex;
+    padding-left: 8px;
+    width: 100%;
+  }
+
   .activity-revision {
     align-content: center;
     border: 1px solid transparent;
@@ -192,6 +231,12 @@
     border-color: #ebecec;
   }
 
+  .activity-header-changelog {
+    background-color: #007bff10;
+    border: 1px solid #007bff82;
+    color: #007bff;
+  }
+
   .new-value,
   .previous-value,
   .change-summary {
diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index ccf7ebd9ba..be35104636 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -3,6 +3,8 @@
 <script lang="ts">
   import CheckIcon from '@nasa-jpl/stellar/icons/check.svg?component';
   import PenIcon from '@nasa-jpl/stellar/icons/pen.svg?component';
+  import TrashIcon from '@nasa-jpl/stellar/icons/trash.svg?component';
+  import { createEventDispatcher } from 'svelte';
   import { PlanStatusMessages } from '../../enums/planStatusMessages';
   import { field } from '../../stores/form';
   import { plan, planReadOnly } from '../../stores/plan';
@@ -52,6 +54,8 @@
   export let showHeader: boolean = true;
   export let user: User | null;
 
+  const dispatch = createEventDispatcher();
+
   let editingActivityName: boolean = false;
   let hasUpdatePermission: boolean = false;
   let numOfUserChanges: number = 0;
@@ -341,6 +345,15 @@
         </button>
       {/if}
     </div>
+    <div>
+      <button
+        class="st-button icon activity-header-changelog"
+        on:click|stopPropagation={() => dispatch('viewChangelog')}
+        use:tooltip={{ content: 'View Activity Changelog', placement: 'top' }}
+      >
+        <TrashIcon />
+      </button>
+    </div>
   </div>
 {/if}
 
@@ -608,6 +621,10 @@
     font-style: normal;
   }
 
+  .activity-header-changelog:hover {
+    color: #007bff;
+  }
+
   .annotations {
     display: flex;
     flex-direction: column;
diff --git a/src/components/activity/ActivityFormPanel.svelte b/src/components/activity/ActivityFormPanel.svelte
index ec6e45b5f5..86ec736233 100644
--- a/src/components/activity/ActivityFormPanel.svelte
+++ b/src/components/activity/ActivityFormPanel.svelte
@@ -54,6 +54,10 @@
     const { detail: spanId } = event;
     selectActivity(null, spanId);
   }
+
+  function onToggleViewChangelog() {
+    viewingActivityDirectiveChangelog = !viewingActivityDirectiveChangelog;
+  }
 </script>
 
 <Panel padBody={false}>
@@ -93,16 +97,6 @@
         >
           <TrashIcon />
         </button>
-
-        <button
-          class="st-button icon activity-header-delete"
-          on:click|stopPropagation={() => {
-            viewingActivityDirectiveChangelog = !viewingActivityDirectiveChangelog;
-          }}
-          use:tooltip={{ content: 'View Activity Changelog', placement: 'top' }}
-        >
-          <TrashIcon />
-        </button>
       {/if}
     </PanelHeaderActions>
   </svelte:fragment>
@@ -114,6 +108,7 @@
         activityDirectivesMap={$activityDirectivesMap}
         activityTypes={$activityTypes}
         modelId={$modelId}
+        on:closeChangelog={onToggleViewChangelog}
         {user}
       />
     {:else if $selectedActivityDirective && $plan !== null}
@@ -126,6 +121,7 @@
         editable={!$activityEditingLocked}
         modelId={$modelId}
         planStartTimeYmd={$plan.start_time}
+        on:viewChangelog={onToggleViewChangelog}
         {user}
       />
     {:else if $selectedSpan && $plan !== null}

From 5c0b8d268611da740aeed1dfff94e1b9e3ba40bb Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 25 Sep 2023 17:16:57 -0700
Subject: [PATCH 08/27] wire up effect for restoring from changelog

---
 .../ActivityDirectiveChangelog.svelte         | 11 +++++++-
 src/utilities/effects.ts                      | 26 +++++++++++++++++++
 src/utilities/gql.ts                          |  8 ++++++
 3 files changed, 44 insertions(+), 1 deletion(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 3d58aec9fd..070fcb0ac6 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -120,6 +120,15 @@
     };
   }
 
+  async function restoreRevision(revisionId: number) {
+    const { id: activityId, plan_id: planId } = activityDirective;
+    const restored = await effects.restoreActivityFromChangelog(activityId, planId, revisionId, user);
+
+    if (restored) {
+      dispatch('closeChangelog');
+    }
+  }
+
   onMount(async () => {
     const { id: activityId, plan_id: planId } = activityDirective;
     activityRevisions = await effects.getActivityDirectiveChangelog(planId, activityId, user);
@@ -181,7 +190,7 @@
           {#if i == 0}
             <span>Current Revision</span>
           {:else}
-            <button class="st-button">Restore</button>
+            <button class="st-button" on:click={() => restoreRevision(revision.revision)}>Restore</button>
           {/if}
         </div>
         <div class="previous-value st-typography-body">
diff --git a/src/utilities/effects.ts b/src/utilities/effects.ts
index f0b52e2221..a6b9974b9a 100644
--- a/src/utilities/effects.ts
+++ b/src/utilities/effects.ts
@@ -3448,6 +3448,32 @@ const effects = {
     }
   },
 
+  async restoreActivityFromChangelog(
+    activityId: number,
+    planId: number,
+    revision: number,
+    user: User | null,
+  ): Promise<boolean> {
+    try {
+      const data = await reqHasura(
+        gql.RESTORE_ACTIVITY_FROM_CHANGELOG,
+        { activity_id: activityId, plan_id: planId, revision },
+        user,
+      );
+
+      if (data.restoreActivityFromChangelog != null) {
+        showSuccessToast('Restored Activity from Changelog');
+        return true;
+      } else {
+        throw Error(`Unable to restore activity revision ${revision} from changelog`);
+      }
+    } catch (e) {
+      catchError('Restoring Activity From Changelog Failed', e as Error);
+      showFailureToast('Restoring Activity from Changelog Failed');
+      return false;
+    }
+  },
+
   async restorePlanSnapshot(snapshot: PlanSnapshot, plan: Plan, user: User | null): Promise<boolean> {
     try {
       if (!queryPermissions.RESTORE_PLAN_SNAPSHOT(user, plan, plan.model)) {
diff --git a/src/utilities/gql.ts b/src/utilities/gql.ts
index 2e16cb49da..7fc5c3c9e8 100644
--- a/src/utilities/gql.ts
+++ b/src/utilities/gql.ts
@@ -1339,6 +1339,14 @@ const gql = {
     }
   `,
 
+  RESTORE_ACTIVITY_FROM_CHANGELOG: `#graphql
+    mutation RestoreActivityFromChangelog($activity_id: Int!, $plan_id: Int!, $revision: Int!) {
+      restoreActivityFromChangelog(args: { _plan_id: $plan_id, _activity_directive_id: $activity_id, _revision: $revision }) {
+        id
+      }
+    }
+  `,
+
   RESTORE_PLAN_SNAPSHOT: `#graphql
     mutation RestorePlanSnapshot($plan_id: Int!, $snapshot_id: Int!) {
       restore_from_snapshot(args: { _plan_id: $plan_id, _snapshot_id: $snapshot_id }) {

From 0ae96cf7fdca66d25d75b3bcd96bd719a4e28332 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 25 Sep 2023 17:27:23 -0700
Subject: [PATCH 09/27] Close the changelog if the selected activity changes

---
 src/components/activity/ActivityFormPanel.svelte | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/activity/ActivityFormPanel.svelte b/src/components/activity/ActivityFormPanel.svelte
index 86ec736233..c9c9f2168b 100644
--- a/src/components/activity/ActivityFormPanel.svelte
+++ b/src/components/activity/ActivityFormPanel.svelte
@@ -50,6 +50,11 @@
       featurePermissions.activityDirective.canDelete(user, $plan, $selectedActivityDirective) && !$planReadOnly;
   }
 
+  // Hacky(?) way to auto close the changelog whenever the selected activity changes
+  $: if ($selectedActivityDirective !== null) {
+    viewingActivityDirectiveChangelog = false;
+  }
+
   function onSelectSpan(event: CustomEvent<SpanId>) {
     const { detail: spanId } = event;
     selectActivity(null, spanId);

From be63641130c7f23af64285006d2b7b23da4e6211 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 25 Sep 2023 17:38:21 -0700
Subject: [PATCH 10/27] use new changelog icon

---
 package-lock.json                                  | 14 +++++++-------
 package.json                                       |  2 +-
 .../activity/ActivityDirectiveChangelog.svelte     |  7 +++++--
 .../activity/ActivityDirectiveForm.svelte          | 10 ++++++++--
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4187003df9..7ae4c08d66 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,7 +11,7 @@
       "dependencies": {
         "@fontsource/jetbrains-mono": "^5.0.3",
         "@nasa-jpl/aerie-ampcs": "^1.0.1",
-        "@nasa-jpl/stellar": "^1.1.9",
+        "@nasa-jpl/stellar": "^1.1.10",
         "@sveltejs/adapter-node": "1.2.4",
         "@sveltejs/kit": "1.20.5",
         "ag-grid-community": "29.3.3",
@@ -830,9 +830,9 @@
       }
     },
     "node_modules/@nasa-jpl/stellar": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@nasa-jpl/stellar/-/stellar-1.1.9.tgz",
-      "integrity": "sha512-MLYJqbW24jc5yCUD8V+xMrZtu/cwHOHHgYUpq9TgijMdMNkSfFAgzUucsXa57xLaTl4ujEh0VLag84lyJPA7zg=="
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/@nasa-jpl/stellar/-/stellar-1.1.10.tgz",
+      "integrity": "sha512-14PdIh16CzNtr80M1/z9VJC2gNDI1z6aeO/c5SIw2hbcAykoGHXg0FIJFgOOeToY2HqM+EUi5wLJ8z045mbuDw=="
     },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -7925,9 +7925,9 @@
       }
     },
     "@nasa-jpl/stellar": {
-      "version": "1.1.9",
-      "resolved": "https://registry.npmjs.org/@nasa-jpl/stellar/-/stellar-1.1.9.tgz",
-      "integrity": "sha512-MLYJqbW24jc5yCUD8V+xMrZtu/cwHOHHgYUpq9TgijMdMNkSfFAgzUucsXa57xLaTl4ujEh0VLag84lyJPA7zg=="
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/@nasa-jpl/stellar/-/stellar-1.1.10.tgz",
+      "integrity": "sha512-14PdIh16CzNtr80M1/z9VJC2gNDI1z6aeO/c5SIw2hbcAykoGHXg0FIJFgOOeToY2HqM+EUi5wLJ8z045mbuDw=="
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
diff --git a/package.json b/package.json
index b008f97630..82970a2f66 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
   "dependencies": {
     "@fontsource/jetbrains-mono": "^5.0.3",
     "@nasa-jpl/aerie-ampcs": "^1.0.1",
-    "@nasa-jpl/stellar": "^1.1.9",
+    "@nasa-jpl/stellar": "^1.1.10",
     "@sveltejs/adapter-node": "1.2.4",
     "@sveltejs/kit": "1.20.5",
     "ag-grid-community": "29.3.3",
diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 070fcb0ac6..a1fb03863a 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -1,7 +1,7 @@
 <svelte:options immutable={true} />
 
 <script lang="ts">
-  import TrashIcon from '@nasa-jpl/stellar/icons/trash.svg?component';
+  import HistoryIcon from '@nasa-jpl/stellar/icons/history.svg?component';
   import { createEventDispatcher, onMount } from 'svelte';
   import type {
     ActivityDirective,
@@ -169,7 +169,7 @@
       on:click|stopPropagation={() => dispatch('closeChangelog')}
       use:tooltip={{ content: 'Close Activity Changelog', placement: 'top' }}
     >
-      <TrashIcon />
+      <HistoryIcon />
     </button>
   </div>
 </div>
@@ -216,6 +216,7 @@
   .activity-header-title {
     align-items: flex-start;
     display: flex;
+    justify-items: center;
     padding-left: 8px;
     width: 100%;
   }
@@ -244,6 +245,8 @@
     background-color: #007bff10;
     border: 1px solid #007bff82;
     color: #007bff;
+    display: flex;
+    width: 24px;
   }
 
   .new-value,
diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index be35104636..dbb0b8549b 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -2,8 +2,8 @@
 
 <script lang="ts">
   import CheckIcon from '@nasa-jpl/stellar/icons/check.svg?component';
+  import HistoryIcon from '@nasa-jpl/stellar/icons/history.svg?component';
   import PenIcon from '@nasa-jpl/stellar/icons/pen.svg?component';
-  import TrashIcon from '@nasa-jpl/stellar/icons/trash.svg?component';
   import { createEventDispatcher } from 'svelte';
   import { PlanStatusMessages } from '../../enums/planStatusMessages';
   import { field } from '../../stores/form';
@@ -351,7 +351,7 @@
         on:click|stopPropagation={() => dispatch('viewChangelog')}
         use:tooltip={{ content: 'View Activity Changelog', placement: 'top' }}
       >
-        <TrashIcon />
+        <HistoryIcon />
       </button>
     </div>
   </div>
@@ -621,6 +621,12 @@
     font-style: normal;
   }
 
+  .activity-header-changelog {
+    border: 1px solid transparent;
+    display: flex;
+    width: 24px;
+  }
+
   .activity-header-changelog:hover {
     color: #007bff;
   }

From 6f14b54e3e86121d872c38b6230ac2a714bad5e6 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Wed, 27 Sep 2023 17:00:56 -0700
Subject: [PATCH 11/27] Basic working revision preview

---
 .../ActivityDirectiveChangelog.svelte         | 16 ++++++-
 .../activity/ActivityDirectiveForm.svelte     | 43 +++++++++++-------
 .../activity/ActivityFormPanel.svelte         | 45 ++++++++++++++++++-
 3 files changed, 84 insertions(+), 20 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index a1fb03863a..0bfaf58f78 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -92,7 +92,7 @@
         ? activityDirectivesMap[current.anchor_id].name
         : 'Unknown Directive';
       const previousAnchorDirective = previous.anchor_id
-        ? activityDirectivesMap[previous.anchor_id]
+        ? activityDirectivesMap[previous.anchor_id].name
         : 'Unknown Directive';
       differences['Anchored To'] = {
         currentValue: current.anchor_id ? `${current.anchor_id} - ${currentAnchorDirective}` : 'Plan',
@@ -100,6 +100,13 @@
       };
     }
 
+    if (current.name !== previous.name) {
+      differences['Name'] = {
+        currentValue: current.name,
+        previousValue: previous.name,
+      };
+    }
+
     const changedProperties = Object.keys(differences);
     const firstChange = changedProperties.length
       ? differences[changedProperties[0]]
@@ -191,6 +198,7 @@
             <span>Current Revision</span>
           {:else}
             <button class="st-button" on:click={() => restoreRevision(revision.revision)}>Restore</button>
+            <button class="st-button secondary" on:click={() => dispatch('previewRevision', revision)}>Preview</button>
           {/if}
         </div>
         <div class="previous-value st-typography-body">
@@ -267,7 +275,11 @@
   }
 
   .actions button {
-    padding: 0 8px;
+    padding: 0 4px;
+  }
+
+  .actions .secondary {
+    border: 1px solid #bec0c2;
   }
 
   .activity-revision:hover .actions > * {
diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index dbb0b8549b..fad28052e4 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -11,6 +11,7 @@
   import type {
     ActivityDirective,
     ActivityDirectiveId,
+    ActivityDirectiveRevision,
     ActivityDirectivesMap,
     ActivityPreset,
     ActivityPresetInsertInput,
@@ -53,6 +54,7 @@
   export let showActivityName: boolean = false;
   export let showHeader: boolean = true;
   export let user: User | null;
+  export let revision: ActivityDirectiveRevision | undefined;
 
   const dispatch = createEventDispatcher();
 
@@ -76,7 +78,10 @@
   $: highlightKeysMap = keyByBoolean(highlightKeys);
   $: activityType =
     (activityTypes ?? []).find(({ name: activityTypeName }) => activityDirective?.type === activityTypeName) ?? null;
-  $: startTimeDoy = getDoyTimeFromInterval(planStartTimeYmd, activityDirective.start_offset);
+  $: startTimeDoy = getDoyTimeFromInterval(
+    planStartTimeYmd,
+    revision ? revision.start_offset : activityDirective.start_offset,
+  );
   $: startTimeDoyField = field<string>(startTimeDoy, [required, timestamp]);
   $: activityNameField = field<string>(activityDirective.name);
 
@@ -88,9 +93,9 @@
           const { arguments: defaultArgumentsMap } = effectiveArguments;
           formParameters = getFormParameters(
             activityType.parameters,
-            activityDirective.arguments,
+            revision ? revision.arguments : activityDirective.arguments,
             activityType.required_parameters,
-            activityDirective.applied_preset?.preset_applied?.arguments,
+            revision ? undefined : activityDirective.applied_preset?.preset_applied?.arguments,
             defaultArgumentsMap,
           );
         }
@@ -319,7 +324,11 @@
 {#if showHeader}
   <div class="activity-header">
     <div class={classNames('activity-header-title', { 'activity-header-title--editing': editingActivityName })}>
-      {#if !editingActivityName}
+      {#if !editable}
+        <div class="activity-header-title-value st-typography-medium">
+          {revision ? revision.name : $activityNameField.value}
+        </div>
+      {:else if !editingActivityName}
         <button class="icon st-button activity-header-title-edit-button" on:click={editActivityName}>
           <div class="activity-header-title-value st-typography-medium">
             {$activityNameField.value}
@@ -345,15 +354,17 @@
         </button>
       {/if}
     </div>
-    <div>
-      <button
-        class="st-button icon activity-header-changelog"
-        on:click|stopPropagation={() => dispatch('viewChangelog')}
-        use:tooltip={{ content: 'View Activity Changelog', placement: 'top' }}
-      >
-        <HistoryIcon />
-      </button>
-    </div>
+    {#if !revision}
+      <div>
+        <button
+          class="st-button icon activity-header-changelog"
+          on:click|stopPropagation={() => dispatch('viewChangelog')}
+          use:tooltip={{ content: 'View Activity Changelog', placement: 'top' }}
+        >
+          <HistoryIcon />
+        </button>
+      </div>
+    {/if}
   </div>
 {/if}
 
@@ -412,12 +423,12 @@
         {activityDirective}
         {activityDirectivesMap}
         {hasUpdatePermission}
-        anchorId={activityDirective.anchor_id}
+        anchorId={revision ? revision.anchor_id : activityDirective.anchor_id}
         disabled={!editable}
         {highlightKeysMap}
         planReadOnly={$planReadOnly}
-        isAnchoredToStart={activityDirective.anchored_to_start}
-        startOffset={activityDirective.start_offset}
+        isAnchoredToStart={revision ? revision.anchored_to_start : activityDirective.anchored_to_start}
+        startOffset={revision ? revision.start_offset : activityDirective.start_offset}
         on:updateAnchor={updateAnchor}
         on:updateAnchorEdge={updateAnchorEdge}
         on:updateStartOffset={updateStartOffset}
diff --git a/src/components/activity/ActivityFormPanel.svelte b/src/components/activity/ActivityFormPanel.svelte
index c9c9f2168b..4336e70e72 100644
--- a/src/components/activity/ActivityFormPanel.svelte
+++ b/src/components/activity/ActivityFormPanel.svelte
@@ -22,6 +22,7 @@
   } from '../../stores/plan';
   import { selectedSpan, simulationDatasetId, spanUtilityMaps, spansMap } from '../../stores/simulation';
   import { tags } from '../../stores/tags';
+  import type { ActivityDirective, ActivityDirectiveRevision } from '../../types/activity';
   import type { User } from '../../types/app';
   import type { SpanId } from '../../types/simulation';
   import type { ViewGridSection } from '../../types/view';
@@ -41,6 +42,8 @@
 
   let hasDeletePermission: boolean = false;
   let viewingActivityDirectiveChangelog: boolean = false;
+  let highlightKeys: string[] = [];
+  let previewRevision: ActivityDirectiveRevision | undefined;
 
   $: deletePermissionError = $planReadOnly
     ? PlanStatusMessages.READ_ONLY
@@ -50,9 +53,11 @@
       featurePermissions.activityDirective.canDelete(user, $plan, $selectedActivityDirective) && !$planReadOnly;
   }
 
-  // Hacky(?) way to auto close the changelog whenever the selected activity changes
+  // Auto close the changelog and clear revision preview state whenever the selected activity changes
   $: if ($selectedActivityDirective !== null) {
     viewingActivityDirectiveChangelog = false;
+    highlightKeys = [];
+    previewRevision = undefined;
   }
 
   function onSelectSpan(event: CustomEvent<SpanId>) {
@@ -63,6 +68,39 @@
   function onToggleViewChangelog() {
     viewingActivityDirectiveChangelog = !viewingActivityDirectiveChangelog;
   }
+
+  function onPreviewRevision(event: CustomEvent<ActivityDirectiveRevision>) {
+    if (!$selectedActivityDirective) {
+      return;
+    }
+
+    const revision: ActivityDirectiveRevision = event.detail;
+    const activityType = $activityTypes.find(type => type.name == $selectedActivityDirective?.type);
+    const changedKeys: string[] = [];
+
+    const potentialChanges: Array<keyof ActivityDirective & keyof ActivityDirectiveRevision> = [
+      'anchor_id',
+      'anchored_to_start',
+      'start_offset',
+    ];
+    potentialChanges.forEach(key => {
+      if ($selectedActivityDirective && $selectedActivityDirective[key] !== revision[key]) {
+        changedKeys.push(key);
+      }
+    });
+
+    if (activityType) {
+      Object.keys(activityType.parameters).forEach(key => {
+        if ($selectedActivityDirective?.arguments[key] !== revision.arguments[key]) {
+          changedKeys.push(key);
+        }
+      });
+    }
+
+    highlightKeys = changedKeys;
+    previewRevision = revision;
+    viewingActivityDirectiveChangelog = false;
+  }
 </script>
 
 <Panel padBody={false}>
@@ -114,6 +152,7 @@
         activityTypes={$activityTypes}
         modelId={$modelId}
         on:closeChangelog={onToggleViewChangelog}
+        on:previewRevision={onPreviewRevision}
         {user}
       />
     {:else if $selectedActivityDirective && $plan !== null}
@@ -123,10 +162,12 @@
         activityMetadataDefinitions={$activityMetadataDefinitions}
         activityTypes={$activityTypes}
         tags={$tags}
-        editable={!$activityEditingLocked}
+        editable={!$activityEditingLocked && !previewRevision}
         modelId={$modelId}
         planStartTimeYmd={$plan.start_time}
         on:viewChangelog={onToggleViewChangelog}
+        revision={previewRevision}
+        {highlightKeys}
         {user}
       />
     {:else if $selectedSpan && $plan !== null}

From a7ac660ccaf82daea6d8ba9dc3046240439c264c Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Wed, 27 Sep 2023 17:49:02 -0700
Subject: [PATCH 12/27] Add header and 'restore' action to revision preview

---
 .../activity/ActivityDirectiveForm.svelte     | 70 ++++++++++++++++---
 .../activity/ActivityFormPanel.svelte         |  9 ++-
 2 files changed, 67 insertions(+), 12 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index fad28052e4..f403fc53b0 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -2,6 +2,7 @@
 
 <script lang="ts">
   import CheckIcon from '@nasa-jpl/stellar/icons/check.svg?component';
+  import CloseIcon from '@nasa-jpl/stellar/icons/close.svg?component';
   import HistoryIcon from '@nasa-jpl/stellar/icons/history.svg?component';
   import PenIcon from '@nasa-jpl/stellar/icons/pen.svg?component';
   import { createEventDispatcher } from 'svelte';
@@ -319,6 +320,15 @@
       }
     }
   }
+
+  async function restoreRevision(revisionId: number) {
+    const { id: activityId, plan_id: planId } = activityDirective;
+    const restored = await effects.restoreActivityFromChangelog(activityId, planId, revisionId, user);
+
+    if (restored) {
+      dispatch('closeRevisionPreview');
+    }
+  }
 </script>
 
 {#if showHeader}
@@ -354,17 +364,33 @@
         </button>
       {/if}
     </div>
-    {#if !revision}
-      <div>
-        <button
-          class="st-button icon activity-header-changelog"
-          on:click|stopPropagation={() => dispatch('viewChangelog')}
-          use:tooltip={{ content: 'View Activity Changelog', placement: 'top' }}
-        >
-          <HistoryIcon />
-        </button>
-      </div>
-    {/if}
+    <div>
+      <button
+        class="st-button icon activity-header-changelog"
+        on:click|stopPropagation={() => dispatch('viewChangelog')}
+        use:tooltip={{ content: 'View Activity Changelog', placement: 'top' }}
+      >
+        <HistoryIcon />
+      </button>
+    </div>
+  </div>
+{/if}
+
+{#if revision}
+  <div class="revision-preview-header">
+    <div>
+      <button class="st-button primary" on:click|stopPropagation={() => revision && restoreRevision(revision.revision)}>
+        Restore
+      </button>
+      <span class="st-typography-medium">{highlightKeys.length} Change{highlightKeys.length === 1 ? '' : 's'}</span>
+    </div>
+    <button
+      use:tooltip={{ content: 'Close Revision Preview', placement: 'top' }}
+      class="icon st-button"
+      on:click|stopPropagation={() => dispatch('closeRevisionPreview')}
+    >
+      <CloseIcon />
+    </button>
   </div>
 {/if}
 
@@ -642,6 +668,28 @@
     color: #007bff;
   }
 
+  .revision-preview-header {
+    align-items: center;
+    background-color: #e6e6ff;
+    border-bottom: 1px solid #c4c6ff;
+    border-top: 1px solid #c4c6ff;
+    display: flex;
+    flex-shrink: 0;
+    justify-content: space-between;
+    padding: 4px 8px;
+    padding-left: 8px;
+  }
+
+  .revision-preview-header span {
+    font-style: italic;
+    margin-left: 4px;
+  }
+
+  .revision-preview .icon {
+    align-content: flex-end;
+    display: flex;
+  }
+
   .annotations {
     display: flex;
     flex-direction: column;
diff --git a/src/components/activity/ActivityFormPanel.svelte b/src/components/activity/ActivityFormPanel.svelte
index 4336e70e72..782bed6289 100644
--- a/src/components/activity/ActivityFormPanel.svelte
+++ b/src/components/activity/ActivityFormPanel.svelte
@@ -101,6 +101,12 @@
     previewRevision = revision;
     viewingActivityDirectiveChangelog = false;
   }
+
+  function onCloseRevisionPreview() {
+    highlightKeys = [];
+    previewRevision = undefined;
+    viewingActivityDirectiveChangelog = false;
+  }
 </script>
 
 <Panel padBody={false}>
@@ -165,8 +171,9 @@
         editable={!$activityEditingLocked && !previewRevision}
         modelId={$modelId}
         planStartTimeYmd={$plan.start_time}
-        on:viewChangelog={onToggleViewChangelog}
         revision={previewRevision}
+        on:viewChangelog={onToggleViewChangelog}
+        on:closeRevisionPreview={onCloseRevisionPreview}
         {highlightKeys}
         {user}
       />

From 1960a806a3cbb201baf6708ba04d525ad2d1e3ec Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Thu, 28 Sep 2023 13:54:42 -0700
Subject: [PATCH 13/27] more efficient effective arguments construction

---
 .../ActivityDirectiveChangelog.svelte         | 19 ++++++++++++++-----
 .../activity/ActivityFormPanel.svelte         |  2 ++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 0bfaf58f78..3f92c9b92a 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -140,12 +140,21 @@
     const { id: activityId, plan_id: planId } = activityDirective;
     activityRevisions = await effects.getActivityDirectiveChangelog(planId, activityId, user);
 
-    // Get effective arguments for all revisions
-    const effectiveArgumentsRequests = activityRevisions.map(revision =>
-      effects.getEffectiveActivityArguments(modelId, activityType?.name || '', revision.arguments, user),
+    // Get default set of effective arguments
+    const effectiveDefaultArguments = await effects.getEffectiveActivityArguments(
+      modelId,
+      activityType?.name || '',
+      {},
+      user,
     );
-    const effectiveArgumentsResponses = await Promise.all(effectiveArgumentsRequests);
-    effectiveRevisionArguments = effectiveArgumentsResponses.map(effectiveArguments => effectiveArguments?.arguments);
+
+    // Get effective arguments for all revisions by coalescing defaults with args supplied in revision
+    effectiveRevisionArguments = activityRevisions.map(revision => {
+      return {
+        ...effectiveDefaultArguments?.arguments,
+        ...revision.arguments,
+      };
+    });
 
     // Build a summary of changes by comparing two revisions and their effective arguments
     activityRevisionChangeMap = activityRevisions.map((activityRevision, i) => {
diff --git a/src/components/activity/ActivityFormPanel.svelte b/src/components/activity/ActivityFormPanel.svelte
index 782bed6289..11be2963a9 100644
--- a/src/components/activity/ActivityFormPanel.svelte
+++ b/src/components/activity/ActivityFormPanel.svelte
@@ -66,6 +66,8 @@
   }
 
   function onToggleViewChangelog() {
+    highlightKeys = [];
+    previewRevision = undefined;
     viewingActivityDirectiveChangelog = !viewingActivityDirectiveChangelog;
   }
 

From 646da5711f6ce422201f3dd6b450ac1a03d88bf2 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Thu, 28 Sep 2023 14:17:31 -0700
Subject: [PATCH 14/27] add Last Modified By to activity directive form

---
 src/components/activity/ActivityDirectiveForm.svelte | 11 ++++++++++-
 src/types/activity.ts                                |  1 +
 src/utilities/gql.ts                                 |  1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index f403fc53b0..7e9f138234 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -462,7 +462,7 @@
 
       <Highlight highlight={highlightKeysMap.created_at}>
         <Input layout="inline">
-          <label use:tooltip={{ content: 'Creation Time', placement: 'top' }} for="creationTime"> Creation Time </label>
+          <label use:tooltip={{ content: 'Creation Time', placement: 'top' }} for="creationTime">Creation Time</label>
           <input class="st-input w-100" disabled name="creationTime" value={activityDirective.created_at} />
         </Input>
       </Highlight>
@@ -476,6 +476,15 @@
         </Input>
       </Highlight>
 
+      <Highlight highlight={highlightKeysMap.last_modified_by}>
+        <Input layout="inline">
+          <label use:tooltip={{ content: 'Last Modified By', placement: 'top' }} for="modifiedBy">
+            Last Modified By
+          </label>
+          <input class="st-input w-100" disabled name="modifiedBy" value={activityDirective.last_modified_by} />
+        </Input>
+      </Highlight>
+
       <Highlight highlight={highlightKeysMap.source_scheduling_goal_id}>
         <Input layout="inline">
           <label use:tooltip={{ content: 'Source Scheduling Goal ID', placement: 'top' }} for="sourceSchedulingGoalId">
diff --git a/src/types/activity.ts b/src/types/activity.ts
index 53cd48ea78..01dc029d02 100644
--- a/src/types/activity.ts
+++ b/src/types/activity.ts
@@ -41,6 +41,7 @@ export type ActivityDirective = {
   id: ActivityDirectiveId;
   last_modified_arguments_at: string;
   last_modified_at: string;
+  last_modified_by: string;
   metadata: ActivityMetadata;
   name: string;
   plan_id: number;
diff --git a/src/utilities/gql.ts b/src/utilities/gql.ts
index 7fc5c3c9e8..c298c2e445 100644
--- a/src/utilities/gql.ts
+++ b/src/utilities/gql.ts
@@ -1399,6 +1399,7 @@ const gql = {
         id
         last_modified_arguments_at
         last_modified_at
+        last_modified_by
         metadata
         name
         plan_id

From 2e640eb35ff40a45501341ca91354e0c340c7291 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Thu, 28 Sep 2023 14:45:42 -0700
Subject: [PATCH 15/27] Add permission handling

---
 .../ActivityDirectiveChangelog.svelte         | 21 ++++++++++++++++++-
 .../activity/ActivityDirectiveForm.svelte     |  9 +++++++-
 src/utilities/effects.ts                      |  4 ++++
 src/utilities/permissions.ts                  |  3 +++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 3f92c9b92a..1ace53dc60 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -3,6 +3,7 @@
 <script lang="ts">
   import HistoryIcon from '@nasa-jpl/stellar/icons/history.svg?component';
   import { createEventDispatcher, onMount } from 'svelte';
+  import { plan } from '../../stores/plan';
   import type {
     ActivityDirective,
     ActivityDirectiveRevision,
@@ -12,10 +13,13 @@
   import type { User } from '../../types/app';
   import type { ArgumentsMap } from '../../types/parameter';
   import effects from '../../utilities/effects';
+  import { permissionHandler } from '../../utilities/permissionHandler';
+  import { featurePermissions } from '../../utilities/permissions';
   import { convertUsToDurationString } from '../../utilities/time';
   import { tooltip } from '../../utilities/tooltip';
 
   const dispatch = createEventDispatcher();
+  const updatePermissionError = 'You do not have permission to update this activity';
 
   export let activityDirective: ActivityDirective;
   export let activityDirectivesMap: ActivityDirectivesMap = {};
@@ -23,12 +27,20 @@
   export let modelId: number;
   export let user: User | null;
 
+  let hasUpdatePermission: boolean = false;
+  $: if (user !== null && $plan !== null) {
+    hasUpdatePermission = featurePermissions.activityDirective.canUpdate(user, $plan, activityDirective);
+  }
+
   let activityRevisions: ActivityDirectiveRevision[];
   $: activityRevisions = [];
+
   let activityRevisionChangeMap: { currentValue: string; name: string; previousValue: string }[] = [];
   $: activityRevisionChangeMap = [];
+
   $: activityType =
     (activityTypes ?? []).find(({ name: activityTypeName }) => activityDirective?.type === activityTypeName) ?? null;
+
   let effectiveRevisionArguments: (ArgumentsMap | undefined)[];
   $: effectiveRevisionArguments = [];
 
@@ -206,7 +218,14 @@
           {#if i == 0}
             <span>Current Revision</span>
           {:else}
-            <button class="st-button" on:click={() => restoreRevision(revision.revision)}>Restore</button>
+            <button
+              class="st-button"
+              use:permissionHandler={{
+                hasPermission: hasUpdatePermission,
+                permissionError: updatePermissionError,
+              }}
+              on:click={() => restoreRevision(revision.revision)}>Restore</button
+            >
             <button class="st-button secondary" on:click={() => dispatch('previewRevision', revision)}>Preview</button>
           {/if}
         </div>
diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index 7e9f138234..e777ae07ec 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -379,7 +379,14 @@
 {#if revision}
   <div class="revision-preview-header">
     <div>
-      <button class="st-button primary" on:click|stopPropagation={() => revision && restoreRevision(revision.revision)}>
+      <button
+        class="st-button primary"
+        use:permissionHandler={{
+          hasPermission: hasUpdatePermission,
+          permissionError: updatePermissionError,
+        }}
+        on:click|stopPropagation={() => revision && restoreRevision(revision.revision)}
+      >
         Restore
       </button>
       <span class="st-typography-medium">{highlightKeys.length} Change{highlightKeys.length === 1 ? '' : 's'}</span>
diff --git a/src/utilities/effects.ts b/src/utilities/effects.ts
index a6b9974b9a..5d7a33f487 100644
--- a/src/utilities/effects.ts
+++ b/src/utilities/effects.ts
@@ -3455,6 +3455,10 @@ const effects = {
     user: User | null,
   ): Promise<boolean> {
     try {
+      if (!queryPermissions.RESTORE_ACTIVITY_FROM_CHANGELOG(user)) {
+        throwPermissionError('restore activity from changelog');
+      }
+
       const data = await reqHasura(
         gql.RESTORE_ACTIVITY_FROM_CHANGELOG,
         { activity_id: activityId, plan_id: planId, revision },
diff --git a/src/utilities/permissions.ts b/src/utilities/permissions.ts
index d0750b6676..0dea40ce4a 100644
--- a/src/utilities/permissions.ts
+++ b/src/utilities/permissions.ts
@@ -625,6 +625,9 @@ const queryPermissions = {
       (getPermission(queries, user) && getRolePlanBranchPermission(queries, user, sourcePlan, targetPlan, model))
     );
   },
+  RESTORE_ACTIVITY_FROM_CHANGELOG: (user: User | null): boolean => {
+    return isUserAdmin(user) || getPermission(['restoreActivityFromChangelog'], user);
+  },
   RESTORE_PLAN_SNAPSHOT: (user: User | null, plan: PlanWithOwners, model: ModelWithOwner): boolean => {
     const queries = ['restore_from_snapshot'];
     return isUserAdmin(user) || (getPermission(queries, user) && getRolePlanPermission(queries, user, plan, model));

From 64ead69bbc5ee8222183263dc1607adf3b56ac8d Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Thu, 28 Sep 2023 15:27:21 -0700
Subject: [PATCH 16/27] fix linter errors

---
 src/components/activity/ActivityDirectiveForm.svelte | 2 +-
 src/types/activity.ts                                | 2 +-
 src/utilities/activities.test.ts                     | 3 +++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index e777ae07ec..df4807b523 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -55,7 +55,7 @@
   export let showActivityName: boolean = false;
   export let showHeader: boolean = true;
   export let user: User | null;
-  export let revision: ActivityDirectiveRevision | undefined;
+  export let revision: ActivityDirectiveRevision | undefined = undefined;
 
   const dispatch = createEventDispatcher();
 
diff --git a/src/types/activity.ts b/src/types/activity.ts
index 01dc029d02..3c509da6cc 100644
--- a/src/types/activity.ts
+++ b/src/types/activity.ts
@@ -41,7 +41,7 @@ export type ActivityDirective = {
   id: ActivityDirectiveId;
   last_modified_arguments_at: string;
   last_modified_at: string;
-  last_modified_by: string;
+  last_modified_by?: string | null;
   metadata: ActivityMetadata;
   name: string;
   plan_id: number;
diff --git a/src/utilities/activities.test.ts b/src/utilities/activities.test.ts
index a1825cccaa..d6f036b88e 100644
--- a/src/utilities/activities.test.ts
+++ b/src/utilities/activities.test.ts
@@ -107,6 +107,7 @@ describe('sortActivityDirectivesOrSpans', () => {
       id: 1,
       last_modified_arguments_at: '2022-08-03T21:53:22',
       last_modified_at: '2022-08-03T21:53:22',
+      last_modified_by: 'admin',
       metadata: {},
       name: 'foo 1',
       plan_id: 1,
@@ -124,6 +125,7 @@ describe('sortActivityDirectivesOrSpans', () => {
       id: 2,
       last_modified_arguments_at: '2022-08-03T21:53:22',
       last_modified_at: '2022-08-03T21:53:22',
+      last_modified_by: 'admin',
       metadata: {},
       name: 'foo 2',
       plan_id: 1,
@@ -141,6 +143,7 @@ describe('sortActivityDirectivesOrSpans', () => {
       id: 3,
       last_modified_arguments_at: '2022-08-03T21:53:22',
       last_modified_at: '2022-08-03T21:53:22',
+      last_modified_by: 'admin',
       metadata: {},
       name: 'foo 3',
       plan_id: 1,

From 344c8e396fd4e7eb0b1854a8a3b4b87c62e17ab9 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Thu, 28 Sep 2023 17:09:14 -0700
Subject: [PATCH 17/27] drive anchor offset detection from props instead of
 activity object

---
 src/components/activity/ActivityAnchorForm.svelte | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/activity/ActivityAnchorForm.svelte b/src/components/activity/ActivityAnchorForm.svelte
index 5cbb78ba81..c1039b0a85 100644
--- a/src/components/activity/ActivityAnchorForm.svelte
+++ b/src/components/activity/ActivityAnchorForm.svelte
@@ -57,10 +57,7 @@
   // only set this when the viewed activity is changed
   $: if (activityDirective.id !== previousActivityDirectiveId) {
     previousActivityDirectiveId = activityDirective.id;
-    isRelativeOffset =
-      activityDirective.anchor_id !== null ||
-      (activityDirective.anchor_id === null && !activityDirective.anchored_to_start) ||
-      !!startOffsetError;
+    isRelativeOffset = anchorId !== null || (anchorId === null && !isAnchoredToStart) || !!startOffsetError;
   }
 
   function formatActivityDirectiveAnchorText(activityDirective: ActivityDirective) {

From fdc9fbc275364cdca61f2f07d8a5c7acb77cfe47 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Fri, 29 Sep 2023 17:19:07 -0700
Subject: [PATCH 18/27] Fix tests. Add basic handling of array/struct types

---
 e2e-tests/tests/plan-activities.test.ts       |  8 ++--
 .../ActivityDirectiveChangelog.svelte         | 46 +++++++++++++++++--
 2 files changed, 46 insertions(+), 8 deletions(-)

diff --git a/e2e-tests/tests/plan-activities.test.ts b/e2e-tests/tests/plan-activities.test.ts
index 32ad9110d7..85c7d363e5 100644
--- a/e2e-tests/tests/plan-activities.test.ts
+++ b/e2e-tests/tests/plan-activities.test.ts
@@ -38,7 +38,7 @@ test.beforeEach(async () => {
   await plan.panelActivityTypes.getByRole('button', { name: 'CreateActivity-PickBanana' }).click();
   await plan.panelActivityTypes.getByRole('button', { name: 'CreateActivity-ThrowBanana' }).click();
   await plan.panelActivityDirectivesTable.getByRole('gridcell', { name: 'PickBanana' }).first().click();
-  await plan.panelActivityForm.getByRole('group').filter({ hasText: 'Anchor' }).first().click();
+  await plan.panelActivityForm.getByRole('button', { name: 'Is Relative To Another Activity Directive' }).click();
 
   await plan.selectActivityAnchorByIndex(1);
 });
@@ -63,19 +63,17 @@ test.describe.serial('Plan Activities', () => {
     await page.locator('.modal-content select').nth(1).selectOption('anchor-plan');
     await page.getByRole('button', { name: 'Confirm' }).click();
     await plan.panelActivityDirectivesTable.getByRole('gridcell', { name: 'PickBanana' }).nth(1).click();
-    await plan.panelActivityForm.getByRole('group').filter({ hasText: 'Anchor' }).first().click();
+    await plan.panelActivityForm.getByRole('button', { name: 'Is Relative To Another Activity Directive' }).click();
     await page.waitForFunction(
       () => document.querySelector('.anchor-form .selected-display-value')?.innerHTML === 'To Plan',
     );
 
-    await plan.panelActivityForm.getByRole('group').filter({ hasText: 'Anchor' }).first().click();
+    await plan.panelActivityForm.getByRole('button', { name: 'Is Relative To Another Activity Directive' }).click();
     expect(plan.panelActivityForm.getByRole('textbox', { name: 'To Plan' })).toBeVisible();
   });
 
   test('Deleting multiple activity directives but only 1 has a remaining anchored dependent should prompt for just the one with a remaining dependent', async () => {
     await plan.panelActivityDirectivesTable.getByRole('gridcell', { name: 'ThrowBanana' }).nth(1).click();
-    await page.getByRole('group').filter({ hasText: 'Anchor' }).first().click();
-
     await plan.selectActivityAnchorByIndex(2);
 
     await plan.panelActivityDirectivesTable.getByRole('gridcell', { name: 'GrowBanana' }).nth(1).click();
diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 1ace53dc60..ffb8d3d6d8 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -70,12 +70,52 @@
     }
   }
 
+  function diffArrays(itemName: string, current: any[], previous: any[], itemSchema: any) {
+    let differences: { [name: string]: { currentValue: any; previousValue: any } } = {};
+
+    for (let i = 0; i < current.length; i++) {
+      if (itemSchema.type === 'series') {
+        differences = {
+          ...differences,
+          ...diffArrays(`${itemName} > [${i}]`, current[i], previous[i], itemSchema.items),
+        };
+      } else if (typeof current[i].key !== 'undefined' && typeof current[i].value !== 'undefined') {
+        if (current[i].key !== previous[i].key) {
+          differences[`${itemName} > [${i}] > key`] = {
+            currentValue: current[i].key,
+            previousValue: previous[i].key,
+          };
+        }
+        if (current[i].value !== previous[i].value) {
+          differences[`${itemName} > [${i}] > value`] = {
+            currentValue: current[i].value,
+            previousValue: previous[i].value,
+          };
+        }
+      } else if (current[i] !== previous[i]) {
+        differences[`${itemName} > [${i}]`] = {
+          currentValue: current[i],
+          previousValue: previous[i],
+        };
+      }
+    }
+
+    return differences;
+  }
+
   function diffRevisions(current: ActivityDirectiveRevision, previous: ActivityDirectiveRevision) {
-    const differences: { [name: string]: { currentValue: any; previousValue: any } } = {};
+    let differences: { [name: string]: { currentValue: any; previousValue: any } } = {};
 
     // Build list of all arguments that differ
     Object.keys(current.arguments).forEach(argument => {
-      if (current.arguments[argument] !== previous.arguments[argument]) {
+      const schema = activityType?.parameters[argument].schema;
+
+      if (schema?.type === 'series') {
+        differences = {
+          ...differences,
+          ...diffArrays(argument, current.arguments[argument], previous.arguments[argument], schema.items),
+        };
+      } else if (current.arguments[argument] !== previous.arguments[argument]) {
         differences[argument] = {
           currentValue: current.arguments[argument],
           previousValue: previous.arguments[argument],
@@ -174,7 +214,7 @@
 
       // At some point there will be no previous revision to compute a difference from
       if (!previousRevision) {
-        return { currentValue: '', name: 'Last Known Revision', previousValue: '' };
+        return { currentValue: '', name: 'Earliest Known Revision', previousValue: '' };
       }
 
       return diffRevisions(

From d846ff0012c72855d762ab9f9e63d8a48f7b7cbe Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 2 Oct 2023 14:38:26 -0700
Subject: [PATCH 19/27] Fix date formatting, username display, and padding

---
 .../ActivityDirectiveChangelog.svelte         | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index ffb8d3d6d8..50a438a5e8 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -45,15 +45,13 @@
   $: effectiveRevisionArguments = [];
 
   function formatDate(dateString: string) {
-    return new Date(dateString)
-      .toLocaleString(undefined, {
-        day: 'numeric',
-        hour: 'numeric',
-        minute: '2-digit',
-        month: 'numeric',
-        year: '2-digit',
-      })
-      .replace(',', '');
+    return new Date(dateString).toLocaleString(undefined, {
+      day: 'numeric',
+      hour: 'numeric',
+      minute: '2-digit',
+      month: 'numeric',
+      year: '2-digit',
+    });
   }
 
   function formatParameterValue(parameterName: string, parameterValue: any) {
@@ -250,7 +248,7 @@
         <div class="change-summary st-typography-body">
           {activityRevisionChangeMap[i].name}
         </div>
-        <div class="changed-by st-typography-label">{revision.changed_by}</div>
+        <div class="changed-by st-typography-label">@{revision.changed_by}</div>
         <div class="new-value st-typography-body">
           {formatParameterValue(activityRevisionChangeMap[i].name, activityRevisionChangeMap[i].currentValue)}
         </div>
@@ -312,6 +310,10 @@
     row-gap: 4px;
   }
 
+  .activity-revision:last-child {
+    margin-bottom: 8px;
+  }
+
   .activity-revision:hover {
     background-color: #f8f8f8;
     border-color: #ebecec;

From 097373ffb4f4fe5114136c774b92982bd163001c Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 2 Oct 2023 14:50:44 -0700
Subject: [PATCH 20/27] Display Start Time in DOY format

---
 .../activity/ActivityDirectiveChangelog.svelte         | 10 +++++++---
 src/components/activity/ActivityFormPanel.svelte       |  1 +
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 50a438a5e8..abd6c39a13 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -15,7 +15,7 @@
   import effects from '../../utilities/effects';
   import { permissionHandler } from '../../utilities/permissionHandler';
   import { featurePermissions } from '../../utilities/permissions';
-  import { convertUsToDurationString } from '../../utilities/time';
+  import { convertUsToDurationString, getDoyTimeFromInterval } from '../../utilities/time';
   import { tooltip } from '../../utilities/tooltip';
 
   const dispatch = createEventDispatcher();
@@ -25,6 +25,7 @@
   export let activityDirectivesMap: ActivityDirectivesMap = {};
   export let activityTypes: ActivityType[] = [];
   export let modelId: number;
+  export let planStartTimeYmd: string;
   export let user: User | null;
 
   let hasUpdatePermission: boolean = false;
@@ -124,9 +125,12 @@
     // Manually check remaining fields that could have changed and require extra formatting
 
     if (current.start_offset !== previous.start_offset) {
+      const currentStartTimeDoy = getDoyTimeFromInterval(planStartTimeYmd, current.start_offset);
+      const previousStartTimeDoy = getDoyTimeFromInterval(planStartTimeYmd, previous.start_offset);
+
       differences['Start Time'] = {
-        currentValue: current.start_offset,
-        previousValue: previous.start_offset,
+        currentValue: currentStartTimeDoy,
+        previousValue: previousStartTimeDoy,
       };
     }
 
diff --git a/src/components/activity/ActivityFormPanel.svelte b/src/components/activity/ActivityFormPanel.svelte
index 11be2963a9..7e038e8104 100644
--- a/src/components/activity/ActivityFormPanel.svelte
+++ b/src/components/activity/ActivityFormPanel.svelte
@@ -159,6 +159,7 @@
         activityDirectivesMap={$activityDirectivesMap}
         activityTypes={$activityTypes}
         modelId={$modelId}
+        planStartTimeYmd={$plan.start_time}
         on:closeChangelog={onToggleViewChangelog}
         on:previewRevision={onPreviewRevision}
         {user}

From b7c5b3654f512408bedd916c218e86fb8e0c6989 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Mon, 2 Oct 2023 14:58:33 -0700
Subject: [PATCH 21/27] re-run validations with preview arguments if supplied

---
 src/components/activity/ActivityDirectiveForm.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index df4807b523..aca76328ce 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -102,7 +102,7 @@
         }
       });
   }
-  $: validateArguments(activityDirective.arguments);
+  $: validateArguments(revision ? revision.arguments : activityDirective.arguments);
   $: numOfUserChanges = formParameters.reduce((previousHasChanges: number, formParameter) => {
     return /user/.test(formParameter.valueSource) ? previousHasChanges + 1 : previousHasChanges;
   }, 0);

From 091d7f857639cac5db4e33251e1542e4b97a384a Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Wed, 11 Oct 2023 15:31:58 -0700
Subject: [PATCH 22/27] use revision when getting effective arguments, use
 current name of activity in changelog header

---
 src/components/activity/ActivityDirectiveChangelog.svelte | 2 +-
 src/components/activity/ActivityDirectiveForm.svelte      | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index abd6c39a13..424cd3d384 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -230,7 +230,7 @@
 <div class="activity-header">
   <div class="activity-header-title">
     <div class="activity-header-title-value st-typography-medium">
-      {activityType?.name}
+      {activityDirective.name}
     </div>
   </div>
   <div>
diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index aca76328ce..95a95eb654 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -88,7 +88,12 @@
 
   $: if (activityType && activityDirective.arguments) {
     effects
-      .getEffectiveActivityArguments(modelId, activityType.name, activityDirective.arguments, user)
+      .getEffectiveActivityArguments(
+        modelId,
+        activityType.name,
+        revision ? revision.arguments : activityDirective.arguments,
+        user,
+      )
       .then(effectiveArguments => {
         if (effectiveArguments && activityType) {
           const { arguments: defaultArgumentsMap } = effectiveArguments;

From 0088237518f5bfebcbff36b8e1d78a7b1d774cca Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Wed, 11 Oct 2023 15:42:01 -0700
Subject: [PATCH 23/27] constrain width to always have enough room for
 restore/preview buttons

---
 src/components/activity/ActivityDirectiveChangelog.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 424cd3d384..2401a7e9d5 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -307,7 +307,7 @@
     display: grid;
     font-size: 12px;
     font-weight: 400;
-    grid-template-columns: 1fr max-content;
+    grid-template-columns: 10.5em 1fr;
     line-height: 16px;
     margin: 8px 8px 0px 8px;
     padding: 4px;

From 91350aee1883fbdb19dfab0b9b0e5344c5553fb9 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Thu, 12 Oct 2023 15:36:13 -0700
Subject: [PATCH 24/27] add more generic method for deep diffing objects

---
 .../ActivityDirectiveChangelog.svelte         | 52 +++++++------------
 1 file changed, 18 insertions(+), 34 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 2401a7e9d5..5fb7ea0c2b 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -69,37 +69,26 @@
     }
   }
 
-  function diffArrays(itemName: string, current: any[], previous: any[], itemSchema: any) {
-    let differences: { [name: string]: { currentValue: any; previousValue: any } } = {};
+  function diffObjects(
+    label: string,
+    current: any,
+    previous: any,
+    accumulator: { [name: string]: { currentValue: any; previousValue: any } },
+  ) {
+    Object.keys(current).forEach(key => {
+      if (typeof current[key] === 'object') {
+        return diffObjects(`${label} > ${key}`, current[key], previous[key], accumulator);
+      }
 
-    for (let i = 0; i < current.length; i++) {
-      if (itemSchema.type === 'series') {
-        differences = {
-          ...differences,
-          ...diffArrays(`${itemName} > [${i}]`, current[i], previous[i], itemSchema.items),
-        };
-      } else if (typeof current[i].key !== 'undefined' && typeof current[i].value !== 'undefined') {
-        if (current[i].key !== previous[i].key) {
-          differences[`${itemName} > [${i}] > key`] = {
-            currentValue: current[i].key,
-            previousValue: previous[i].key,
-          };
-        }
-        if (current[i].value !== previous[i].value) {
-          differences[`${itemName} > [${i}] > value`] = {
-            currentValue: current[i].value,
-            previousValue: previous[i].value,
-          };
-        }
-      } else if (current[i] !== previous[i]) {
-        differences[`${itemName} > [${i}]`] = {
-          currentValue: current[i],
-          previousValue: previous[i],
+      if (current[key] !== previous[key]) {
+        accumulator[`${label} > ${key}`] = {
+          currentValue: current[key],
+          previousValue: previous[key],
         };
       }
-    }
+    });
 
-    return differences;
+    return accumulator;
   }
 
   function diffRevisions(current: ActivityDirectiveRevision, previous: ActivityDirectiveRevision) {
@@ -107,13 +96,8 @@
 
     // Build list of all arguments that differ
     Object.keys(current.arguments).forEach(argument => {
-      const schema = activityType?.parameters[argument].schema;
-
-      if (schema?.type === 'series') {
-        differences = {
-          ...differences,
-          ...diffArrays(argument, current.arguments[argument], previous.arguments[argument], schema.items),
-        };
+      if (typeof current.arguments[argument] === 'object') {
+        diffObjects(argument, current.arguments[argument], previous.arguments[argument], differences);
       } else if (current.arguments[argument] !== previous.arguments[argument]) {
         differences[argument] = {
           currentValue: current.arguments[argument],

From e8dbad3b9e41ded06e6789e746879b842ec4c02a Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Thu, 12 Oct 2023 15:47:11 -0700
Subject: [PATCH 25/27] add tooltip for overflowed values

---
 .../ActivityDirectiveChangelog.svelte         | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 5fb7ea0c2b..1b45968569 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -233,11 +233,20 @@
     {#each activityRevisions as revision, i}
       <div class="activity-revision">
         <div class="date st-typography-medium">{formatDate(revision.changed_at)}</div>
-        <div class="change-summary st-typography-body">
+        <div
+          class="change-summary st-typography-body"
+          use:tooltip={{ content: activityRevisionChangeMap[i].name, placement: 'top' }}
+        >
           {activityRevisionChangeMap[i].name}
         </div>
         <div class="changed-by st-typography-label">@{revision.changed_by}</div>
-        <div class="new-value st-typography-body">
+        <div
+          class="new-value st-typography-body"
+          use:tooltip={{
+            content: formatParameterValue(activityRevisionChangeMap[i].name, activityRevisionChangeMap[i].currentValue),
+            placement: 'top',
+          }}
+        >
           {formatParameterValue(activityRevisionChangeMap[i].name, activityRevisionChangeMap[i].currentValue)}
         </div>
         <div class="actions">
@@ -255,7 +264,16 @@
             <button class="st-button secondary" on:click={() => dispatch('previewRevision', revision)}>Preview</button>
           {/if}
         </div>
-        <div class="previous-value st-typography-body">
+        <div
+          class="previous-value st-typography-body"
+          use:tooltip={{
+            content: formatParameterValue(
+              activityRevisionChangeMap[i].name,
+              activityRevisionChangeMap[i].previousValue,
+            ),
+            placement: 'top',
+          }}
+        >
           {formatParameterValue(activityRevisionChangeMap[i].name, activityRevisionChangeMap[i].previousValue)}
         </div>
       </div>

From f22d07aca3e17c947764ee47512777d4acf1bd4f Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Fri, 13 Oct 2023 12:51:02 -0700
Subject: [PATCH 26/27] hook changelog auto-closing to a change in selected ID

---
 src/components/activity/ActivityFormPanel.svelte | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/activity/ActivityFormPanel.svelte b/src/components/activity/ActivityFormPanel.svelte
index 7e038e8104..239bb16b78 100644
--- a/src/components/activity/ActivityFormPanel.svelte
+++ b/src/components/activity/ActivityFormPanel.svelte
@@ -10,6 +10,7 @@
     activityMetadataDefinitions,
     selectActivity,
     selectedActivityDirective,
+    selectedActivityDirectiveId,
   } from '../../stores/activities';
   import { filteredExpansionSequences } from '../../stores/expansion';
   import {
@@ -54,7 +55,7 @@
   }
 
   // Auto close the changelog and clear revision preview state whenever the selected activity changes
-  $: if ($selectedActivityDirective !== null) {
+  $: if ($selectedActivityDirectiveId !== null) {
     viewingActivityDirectiveChangelog = false;
     highlightKeys = [];
     previewRevision = undefined;

From 8ba227b8cc71daecdbe5be630515ac14af809011 Mon Sep 17 00:00:00 2001
From: Jeff Pamer <jeffrey.r.pamer@jpl.nasa.gov>
Date: Fri, 13 Oct 2023 13:00:32 -0700
Subject: [PATCH 27/27] Update restore permissions check to account for plan
 ownership

---
 src/components/activity/ActivityDirectiveChangelog.svelte | 8 ++++++--
 src/components/activity/ActivityDirectiveForm.svelte      | 8 ++++++--
 src/utilities/effects.ts                                  | 6 +++---
 src/utilities/permissions.ts                              | 8 ++++++--
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/components/activity/ActivityDirectiveChangelog.svelte b/src/components/activity/ActivityDirectiveChangelog.svelte
index 1b45968569..1f957b474c 100644
--- a/src/components/activity/ActivityDirectiveChangelog.svelte
+++ b/src/components/activity/ActivityDirectiveChangelog.svelte
@@ -166,8 +166,12 @@
   }
 
   async function restoreRevision(revisionId: number) {
-    const { id: activityId, plan_id: planId } = activityDirective;
-    const restored = await effects.restoreActivityFromChangelog(activityId, planId, revisionId, user);
+    if (!$plan) {
+      return;
+    }
+
+    const { id: activityId } = activityDirective;
+    const restored = await effects.restoreActivityFromChangelog(activityId, $plan, revisionId, user);
 
     if (restored) {
       dispatch('closeChangelog');
diff --git a/src/components/activity/ActivityDirectiveForm.svelte b/src/components/activity/ActivityDirectiveForm.svelte
index 95a95eb654..5d35c69e50 100644
--- a/src/components/activity/ActivityDirectiveForm.svelte
+++ b/src/components/activity/ActivityDirectiveForm.svelte
@@ -327,8 +327,12 @@
   }
 
   async function restoreRevision(revisionId: number) {
-    const { id: activityId, plan_id: planId } = activityDirective;
-    const restored = await effects.restoreActivityFromChangelog(activityId, planId, revisionId, user);
+    if (!$plan) {
+      return;
+    }
+
+    const { id: activityId } = activityDirective;
+    const restored = await effects.restoreActivityFromChangelog(activityId, $plan, revisionId, user);
 
     if (restored) {
       dispatch('closeRevisionPreview');
diff --git a/src/utilities/effects.ts b/src/utilities/effects.ts
index 5d7a33f487..98df9bdd2f 100644
--- a/src/utilities/effects.ts
+++ b/src/utilities/effects.ts
@@ -3450,18 +3450,18 @@ const effects = {
 
   async restoreActivityFromChangelog(
     activityId: number,
-    planId: number,
+    plan: Plan,
     revision: number,
     user: User | null,
   ): Promise<boolean> {
     try {
-      if (!queryPermissions.RESTORE_ACTIVITY_FROM_CHANGELOG(user)) {
+      if (!queryPermissions.RESTORE_ACTIVITY_FROM_CHANGELOG(user, plan)) {
         throwPermissionError('restore activity from changelog');
       }
 
       const data = await reqHasura(
         gql.RESTORE_ACTIVITY_FROM_CHANGELOG,
-        { activity_id: activityId, plan_id: planId, revision },
+        { activity_id: activityId, plan_id: plan.id, revision },
         user,
       );
 
diff --git a/src/utilities/permissions.ts b/src/utilities/permissions.ts
index 0dea40ce4a..71256f2611 100644
--- a/src/utilities/permissions.ts
+++ b/src/utilities/permissions.ts
@@ -625,8 +625,12 @@ const queryPermissions = {
       (getPermission(queries, user) && getRolePlanBranchPermission(queries, user, sourcePlan, targetPlan, model))
     );
   },
-  RESTORE_ACTIVITY_FROM_CHANGELOG: (user: User | null): boolean => {
-    return isUserAdmin(user) || getPermission(['restoreActivityFromChangelog'], user);
+  RESTORE_ACTIVITY_FROM_CHANGELOG: (user: User | null, plan: PlanWithOwners): boolean => {
+    return (
+      isUserAdmin(user) ||
+      (getPermission(['restoreActivityFromChangelog'], user) &&
+        (isPlanOwner(user, plan) || isPlanCollaborator(user, plan)))
+    );
   },
   RESTORE_PLAN_SNAPSHOT: (user: User | null, plan: PlanWithOwners, model: ModelWithOwner): boolean => {
     const queries = ['restore_from_snapshot'];