Merge branch 'activity-state-display' of https://github.com/nasa/openmct into timelist-expanded-view

src/plugins/plan/inspector/components/PlanActivitiesView.vue

@@ -20,28 +20,26 @@
  at runtime from the About dialog for additional information.
 -->
 <template>
-  <div>
-    <plan-activity-time-view
-        v-for="activity in activities"
-        :key="activity.key"
-        :activity="activity"
-        :heading="heading"
-    />
-    <plan-activity-properties-view
-        v-for="activity in activities"
-        :key="activity.key"
-        heading="Properties"
-        :activity="activity"
-    />
-    <plan-activity-status-view
-        v-if="canPersistState"
-        :key="activities[0].key"
-        :activity="activities[0]"
-        :execution-state="activityExecutionState"
-        :heading="Activity Status"
-        @update-activity-state="persistActivityState"
-    />
-  </div>
+  <plan-activity-time-view
+    v-for="activity in activities"
+    :key="activity.key"
+    :activity="activity"
+    :heading="heading"
+  />
+  <plan-activity-properties-view
+    v-for="activity in activities"
+    :key="activity.key"
+    heading="Properties"
+    :activity="activity"
+  />
+  <plan-activity-status-view
+    v-if="canPersistState"
+    :key="activities[0].key"
+    :activity="activities[0]"
+    :execution-state="activityExecutionState"
+    heading="Activity Status"
+    @update-activity-state="persistActivityState"
+  />
 </template>
 
 <script>

src/plugins/plan/inspector/components/PlanActivityStatusView.vue

@@ -110,9 +110,7 @@ export default {
   },
   methods: {
     setActivityStatus() {
-      let statusKeyIndex = Object.keys(activityStates).findIndex(
-        (key) => key === this.executionState
-      );
+      let statusKeyIndex = activityStates.findIndex((state) => state.key === this.executionState);
       if (statusKeyIndex < 0) {
         statusKeyIndex = 0;
       }

src/plugins/timelist/TimelistComponent.vue

@@ -490,9 +490,7 @@ export default {
         this.pastActivitiesCount = this.pastActivitiesCount + 1;
       }
 
-      if (activity.id) {
-        activity.key = activity.id;
-      } else if (!activity.key) {
+      if (!activity.key) {
         activity.key = uuid();
       }