Merge pull request #7109 from G-Chubinidze/gc_SCI_10189

To add "Archived on"column to Projects table (archived state) & rename column titles of "archived on" [SCI-10189]

app/javascript/vue/projects/list.vue

@@ -114,9 +114,12 @@ export default {
       objectsToMove: null,
       reloadingTable: false,
       folderDeleteDescription: '',
-      exportDescription: '',
-      columnDefs: [
-        {
+      exportDescription: ''
+    };
+  },
+  computed: {
+    columnDefs() {
+      const columns = [{
         field: 'name',
         flex: 1,
         headerName: this.i18n.t('projects.index.card.name'),
@@ -131,8 +134,7 @@ export default {
       {
         field: 'created_at',
         headerName: this.i18n.t('projects.index.card.start_date'),
-          sortable: true,
-          minWidth: 130
+        sortable: true
       },
       {
         field: 'users',
@@ -141,11 +143,18 @@ export default {
         sortable: false,
         minWidth: 210,
         notSelectable: true
+      }];
+
+      if (this.currentViewMode === 'archived') {
+        columns.push({
+          field: 'archived_on',
+          headerName: this.i18n.t('projects.index.card.archived_date'),
+          sortable: true
+        });
       }
-      ]
-    };
+
+      return columns;
     },
-  computed: {
     viewRenders() {
       return [
         { type: 'table' },

config/locales/en.yml

@@ -570,7 +570,7 @@ en:
         visibility: "Visible to"
         users: "Members"
         name: "Project name"
-        archived_date: "Archived"
+        archived_date: "Archived on"
       end_of_list_placeholder: 'You’ve reached the end of the list'
       folder:
         description: "%{projects_count} projects | %{folders_count} folders"
@@ -1462,7 +1462,7 @@ en:
       id: "ID"
       start_date: "Start date"
       modified_date: "Modified date"
-      archived_date: "Archived date"
+      archived_date: "Archived on"
       completed_task: "Completed"
       completed_value: "%{completed}/%{all} tasks"
       description: "Description"
@@ -1537,7 +1537,7 @@ en:
         id_html: 'ID'
         task_name_html: 'Task name'
         due_date_html: 'Due date'
-        archived_html: 'Archived'
+        archived_html: 'Archived on'
         age_html: 'Age'
         results_html: 'Results'
         status_html: 'Status'
@@ -4100,7 +4100,7 @@ en:
     updated_on:
       label: "Modified date"
     archived_on:
-      label: "Archived date"
+      label: "Archived on"
     recent_searches_label: "Recent searches"
     show_btn:
      one: "Show results"