Add latest changes from gitlab-org/gitlab@master

3 files changed, 5 insertions, 16 deletions

diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
index 365cbeaf6a2..cc97a77e925 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
@@ -91,11 +91,7 @@ export default {
     },
     selectedStageCount() {
       if (this.selectedStage) {
-        const {
-          stageCounts,
-          selectedStage: { id },
-        } = this;
-        return stageCounts[id];
+        return this.stageCounts[this.selectedStage.id];
       }
       return 0;
     },
@@ -113,12 +109,9 @@ export default {
       );
     },
     dashboardsPath() {
-      const {
-        namespace: { fullPath },
-        groupPath,
-      } = this;
+      const { fullPath } = this.namespace;
       return this.showLinkToDashboard
-        ? generateValueStreamsDashboardLink(groupPath, [fullPath])
+        ? generateValueStreamsDashboardLink(this.groupPath, [fullPath])
         : null;
     },
     query() {
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue b/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue
index 78ac29426d9..6842373fb61 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/stage_table.vue
@@ -102,9 +102,7 @@ export default {
   },
   data() {
     if (this.pagination) {
-      const {
-        pagination: { sort, direction },
-      } = this;
+      const { sort, direction } = this.pagination;
       return {
         sort,
         direction,
diff --git a/app/assets/javascripts/analytics/cycle_analytics/components/total_time.vue b/app/assets/javascripts/analytics/cycle_analytics/components/total_time.vue
index 725952c3518..662c5c64bba 100644
--- a/app/assets/javascripts/analytics/cycle_analytics/components/total_time.vue
+++ b/app/assets/javascripts/analytics/cycle_analytics/components/total_time.vue
@@ -14,9 +14,7 @@ export default {
       return Object.keys(this.time).length;
     },
     calculatedTime() {
-      const {
-        time: { days = null, mins = null, hours = null, seconds = null },
-      } = this;
+      const { days = null, mins = null, hours = null, seconds = null } = this.time;
 
       if (days) {
         return {