From 4d4f83ee95ed7ccab2922baaf913e707d4575d74 Mon Sep 17 00:00:00 2001 From: Shefali Date: Wed, 10 Jan 2024 10:13:40 -0800 Subject: [PATCH] Only save status if we have a unique ids for activities --- .../components/PlanActivitiesView.vue | 26 ++++++++++++++----- .../components/PlanActivityPropertiesView.vue | 5 ++-- .../components/PlanActivityStatusView.vue | 2 +- .../components/PlanActivityTimeView.vue | 5 ++-- src/plugins/plan/util.js | 4 +++ 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/src/plugins/plan/inspector/components/PlanActivitiesView.vue b/src/plugins/plan/inspector/components/PlanActivitiesView.vue index dcc3ba0da2..6bd9c8ed31 100644 --- a/src/plugins/plan/inspector/components/PlanActivitiesView.vue +++ b/src/plugins/plan/inspector/components/PlanActivitiesView.vue @@ -23,26 +23,26 @@
@@ -80,6 +80,11 @@ export default { heading: '' }; }, + computed: { + canPersistState() { + return this.activities.length === 1 && this.activities[0].id; + } + }, mounted() { this.setFormatters(); this.getPlanData(this.selection); @@ -142,7 +147,8 @@ export default { this.activities.splice(0); this.selectedActivities.forEach((selectedActivity, index) => { const activity = { - uuid: selectedActivity.uuid ?? selectedActivity.name, + id: selectedActivity.id, + key: selectedActivity.id ?? selectedActivity.name, timeProperties: { start: { label: propertyLabels.start, @@ -189,6 +195,8 @@ export default { let latestEnd; let gap; let overlap; + let id; + let key; //Sort by start time let selectedActivities = this.selectedActivities.sort(this.sortFn); @@ -207,6 +215,8 @@ export default { earliestStart = Math.min(earliestStart, selectedActivity.start); latestEnd = Math.max(latestEnd, selectedActivity.end); } else { + id = selectedActivity.id; + key = selectedActivity.id ?? selectedActivity.name; earliestStart = selectedActivity.start; latestEnd = selectedActivity.end; } @@ -214,6 +224,8 @@ export default { let totalTime = latestEnd - earliestStart; const activity = { + id, + key, timeProperties: { earliestStart: { label: propertyLabels.earliestStart, diff --git a/src/plugins/plan/inspector/components/PlanActivityPropertiesView.vue b/src/plugins/plan/inspector/components/PlanActivityPropertiesView.vue index b0fa628729..1e5e945b04 100644 --- a/src/plugins/plan/inspector/components/PlanActivityPropertiesView.vue +++ b/src/plugins/plan/inspector/components/PlanActivityPropertiesView.vue @@ -32,8 +32,6 @@