Fix incorrect publish state display in sidebar

Author: Hrvoje Vucic

client/components/repository/Workflow/Sidebar/Header.vue

@@ -5,24 +5,24 @@
         Related <span class="text-lowercase">{{ activityConfig.label }}</span>
       </h5>
       <activity-card
-        v-bind="{ id, name, shortId }"
+        v-bind="{ ...activity, name: activity.data.name }"
         :type-label="activityConfig.label"
         :color="activityConfig.color" />
     </div>
     <publishing
       v-if="isAdmin || isRepositoryAdmin"
-      :activity="{ publishedAt, type }"
+      :activity="activity"
       :outline-activities="outlineActivities"
       hide-publish />
     <div class="mt-8">
       <v-tooltip open-delay="500" bottom>
         <template #activator="{ on }">
-          <label-chip v-on="on">{{ shortId }}</label-chip>
+          <label-chip v-on="on">{{ activity.shortId }}</label-chip>
         </template>
         {{ activityConfig.label }} ID
       </v-tooltip>
       <v-btn
-        v-clipboard:copy="shortId"
+        v-clipboard:copy="activity.shortId"
         v-clipboard:success="() => {
           $snackbar.show('ID copied to the clipboard', { immediate: true })
         }"
@@ -46,10 +46,10 @@
         Copy link
       </v-btn>
       <div class="mt-1 caption grey--text text--darken-1">
-        Created at {{ createdAt | formatDate }}
+        Created at {{ activity.createdAt | formatDate }}
         <template v-if="isUpdated">
           <span class="mx-1">|</span>
-          Updated at {{ updatedAt | formatDate }}
+          Updated at {{ activity.status.updatedAt | formatDate }}
         </template>
       </div>
     </div>
@@ -67,23 +67,17 @@ import Publishing from '@/components/repository/common/Sidebar/Publishing';
 
 export default {
   props: {
-    uid: { type: String, required: true },
-    id: { type: Number, required: true },
-    shortId: { type: String, required: true },
-    name: { type: String, required: true },
-    type: { type: String, required: true },
-    createdAt: { type: String, required: true },
-    updatedAt: { type: String, default: null },
-    publishedAt: { type: String, default: null }
+    activity: { type: Object, required: true }
   },
   computed: {
     ...mapGetters(['isAdmin']),
     ...mapGetters('repository', ['structure', 'outlineActivities', 'isRepositoryAdmin']),
-    activityConfig: vm => getLevel(vm.type),
+    activityConfig: ({ activity }) => getLevel(activity.type),
     isUpdated() {
-      if (!this.updatedAt) return false;
-      const createdAt = this.truncateSeconds(new Date(this.createdAt));
-      const updatedAt = this.truncateSeconds(new Date(this.updatedAt));
+      const { activity } = this;
+      if (!activity.status.updatedAt) return false;
+      const createdAt = this.truncateSeconds(new Date(activity.createdAt));
+      const updatedAt = this.truncateSeconds(new Date(activity.status.updatedAt));
       return isBefore(createdAt, updatedAt);
     },
     statusUrl: () => window.location.href

client/components/repository/Workflow/Sidebar/index.vue

@@ -6,9 +6,7 @@
     class="px-4">
     <template v-if="isTrackedActivity">
       <sidebar-header
-        v-bind="selectedActivity"
-        :name="selectedActivity.data.name"
-        :updated-at="selectedActivity.status.updatedAt"
+        :activity="selectedActivity"
         class="pt-4" />
       <status-field-group
         @update="updateStatus"