Display published status in Progress page data table and sidebar

Author: Hrvoje Vucic

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

@@ -22,6 +22,10 @@
     <template #item.dueDate="{ value }">
       <overview-due-date v-if="value" :value="value" />
     </template>
+    <template v-if="isAdmin || isRepositoryAdmin" #item.publishedAt="{ item }">
+      <publishing-badge :activity="item" />
+      <span>{{ item.publishedAt ? 'Published' : 'Not published' }}</span>
+    </template>
   </v-data-table>
 </template>
 
@@ -33,6 +37,7 @@ import OverviewDueDate from './DueDate';
 import OverviewName from './Name';
 import OverviewPriority from './Priority';
 import OverviewStatus from './Status';
+import PublishingBadge from '@/components/repository/common/Sidebar/Badge';
 import selectActivity from '@/components/repository/common/selectActivity';
 
 export default {
@@ -42,7 +47,8 @@ export default {
     activities: { type: Array, default: () => [] }
   },
   computed: {
-    ...mapGetters('repository', ['workflow']),
+    ...mapGetters(['isAdmin']),
+    ...mapGetters('repository', ['isRepositoryAdmin', 'workflow']),
     headers() {
       return [{
         text: 'Name',
@@ -62,13 +68,18 @@ export default {
       }, {
         text: 'Due date',
         value: 'dueDate'
+      }, {
+        text: 'Publish state',
+        value: 'publishedAt'
       }];
     },
     items() {
-      return this.activities.map(({ id, data, status }) => ({
+      return this.activities.map(({ id, data, publishedAt, status, type }) => ({
         ...status,
         id,
         name: data.name,
+        publishedAt,
+        type,
         status: this.getStatusById(status.status),
         priority: getPriority(status.priority),
         class: this.isActivitySelected(id) && 'selected'
@@ -97,6 +108,7 @@ export default {
     }
   },
   components: {
+    PublishingBadge,
     OverviewAssignee,
     OverviewDueDate,
     OverviewName,

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

@@ -9,6 +9,11 @@
         :type-label="activityConfig.label"
         :color="activityConfig.color" />
     </div>
+    <publishing
+      v-if="isAdmin || isRepositoryAdmin"
+      :activity="{ publishedAt, type }"
+      :outline-activities="outlineActivities"
+      hide-publish />
     <div class="mt-8">
       <v-tooltip open-delay="500" bottom>
         <template #activator="{ on }">
@@ -58,6 +63,7 @@ import { getLevel } from 'shared/activities';
 import isBefore from 'date-fns/isBefore';
 import LabelChip from '@/components/repository/common/LabelChip';
 import { mapGetters } from 'vuex';
+import Publishing from '@/components/repository/common/Sidebar/Publishing';
 
 export default {
   props: {
@@ -67,10 +73,12 @@ export default {
     name: { type: String, required: true },
     type: { type: String, required: true },
     createdAt: { type: String, required: true },
-    updatedAt: { type: String, default: null }
+    updatedAt: { type: String, default: null },
+    publishedAt: { type: String, default: null }
   },
   computed: {
-    ...mapGetters('repository', ['structure']),
+    ...mapGetters(['isAdmin']),
+    ...mapGetters('repository', ['structure', 'outlineActivities', 'isRepositoryAdmin']),
     activityConfig: vm => getLevel(vm.type),
     isUpdated() {
       if (!this.updatedAt) return false;
@@ -86,6 +94,6 @@ export default {
       return fecha.parse(fecha.format(date, format), format);
     }
   },
-  components: { ActivityCard, LabelChip }
+  components: { ActivityCard, LabelChip, Publishing }
 };
 </script>

client/components/repository/common/Sidebar/Publishing.vue

@@ -1,6 +1,6 @@
 <template>
   <span class="publish-container">
-    <v-menu offset-y left>
+    <v-menu v-if="!hidePublish" offset-y left>
       <template v-slot:activator="{ on }">
         <v-btn
           v-on="on"
@@ -43,7 +43,8 @@ export default {
   mixins: [publishMixin],
   props: {
     activity: { type: Object, required: true },
-    outlineActivities: { type: Array, required: true }
+    outlineActivities: { type: Array, required: true },
+    hidePublish: { type: Boolean, default: false }
   },
   computed: {
     config: vm => getLevel(vm.activity.type),