Add latest changes from gitlab-org/gitlab@13-10-stable-eev13.10.0-rc40

1 files changed, 41 insertions, 0 deletions

diff --git a/app/assets/javascripts/analytics/usage_trends/components/app.vue b/app/assets/javascripts/analytics/usage_trends/components/app.vue
new file mode 100644
index 00000000000..4c5ddd7f458
--- /dev/null
+++ b/app/assets/javascripts/analytics/usage_trends/components/app.vue
@@ -0,0 +1,41 @@
+<script>
+import { TODAY, TOTAL_DAYS_TO_SHOW, START_DATE } from '../constants';
+import ChartsConfig from './charts_config';
+import UsageCounts from './usage_counts.vue';
+import UsageTrendsCountChart from './usage_trends_count_chart.vue';
+import UsersChart from './users_chart.vue';
+
+export default {
+  name: 'UsageTrendsApp',
+  components: {
+    UsageCounts,
+    UsageTrendsCountChart,
+    UsersChart,
+  },
+  TOTAL_DAYS_TO_SHOW,
+  START_DATE,
+  TODAY,
+  configs: ChartsConfig,
+};
+</script>
+
+<template>
+  <div>
+    <usage-counts />
+    <users-chart
+      :start-date="$options.START_DATE"
+      :end-date="$options.TODAY"
+      :total-data-points="$options.TOTAL_DAYS_TO_SHOW"
+    />
+    <usage-trends-count-chart
+      v-for="chartOptions in $options.configs"
+      :key="chartOptions.chartTitle"
+      :queries="chartOptions.queries"
+      :x-axis-title="chartOptions.xAxisTitle"
+      :y-axis-title="chartOptions.yAxisTitle"
+      :load-chart-error-message="chartOptions.loadChartError"
+      :no-data-message="chartOptions.noDataMessage"
+      :chart-title="chartOptions.chartTitle"
+    />
+  </div>
+</template>