Commit 325ab72c authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'group-level-cycle-analytics' into 'master'

CE Port: FE for group level Cycle Analytics

See merge request gitlab-org/gitlab-ce!31574
parents d3c133f7 99fec4ef
This diff is collapsed.
import $ from 'jquery'; import $ from 'jquery';
import Vue from 'vue'; import Vue from 'vue';
import Cookies from 'js-cookie'; import Cookies from 'js-cookie';
import { GlEmptyState } from '@gitlab/ui';
import filterMixins from 'ee_else_ce/analytics/cycle_analytics/mixins/filter_mixins';
import Flash from '../flash'; import Flash from '../flash';
import { __ } from '~/locale';
import Translate from '../vue_shared/translate'; import Translate from '../vue_shared/translate';
import banner from './components/banner.vue'; import banner from './components/banner.vue';
import stageCodeComponent from './components/stage_code_component.vue'; import stageCodeComponent from './components/stage_code_component.vue';
...@@ -11,7 +14,6 @@ import stageStagingComponent from './components/stage_staging_component.vue'; ...@@ -11,7 +14,6 @@ import stageStagingComponent from './components/stage_staging_component.vue';
import stageTestComponent from './components/stage_test_component.vue'; import stageTestComponent from './components/stage_test_component.vue';
import CycleAnalyticsService from './cycle_analytics_service'; import CycleAnalyticsService from './cycle_analytics_service';
import CycleAnalyticsStore from './cycle_analytics_store'; import CycleAnalyticsStore from './cycle_analytics_store';
import { __ } from '~/locale';
Vue.use(Translate); Vue.use(Translate);
...@@ -24,6 +26,7 @@ export default () => { ...@@ -24,6 +26,7 @@ export default () => {
el: '#cycle-analytics', el: '#cycle-analytics',
name: 'CycleAnalytics', name: 'CycleAnalytics',
components: { components: {
GlEmptyState,
banner, banner,
'stage-issue-component': stageComponent, 'stage-issue-component': stageComponent,
'stage-plan-component': stageComponent, 'stage-plan-component': stageComponent,
...@@ -32,12 +35,15 @@ export default () => { ...@@ -32,12 +35,15 @@ export default () => {
'stage-review-component': stageReviewComponent, 'stage-review-component': stageReviewComponent,
'stage-staging-component': stageStagingComponent, 'stage-staging-component': stageStagingComponent,
'stage-production-component': stageComponent, 'stage-production-component': stageComponent,
GroupsDropdownFilter: () =>
import('ee_component/analytics/shared/components/groups_dropdown_filter.vue'),
ProjectsDropdownFilter: () =>
import('ee_component/analytics/shared/components/projects_dropdown_filter.vue'),
DateRangeDropdown: () =>
import('ee_component/analytics/shared/components/date_range_dropdown.vue'),
}, },
mixins: [filterMixins],
data() { data() {
const cycleAnalyticsService = new CycleAnalyticsService({
requestPath: cycleAnalyticsEl.dataset.requestPath,
});
return { return {
store: CycleAnalyticsStore, store: CycleAnalyticsStore,
state: CycleAnalyticsStore.state, state: CycleAnalyticsStore.state,
...@@ -47,7 +53,7 @@ export default () => { ...@@ -47,7 +53,7 @@ export default () => {
hasError: false, hasError: false,
startDate: 30, startDate: 30,
isOverviewDialogDismissed: Cookies.get(OVERVIEW_DIALOG_COOKIE), isOverviewDialogDismissed: Cookies.get(OVERVIEW_DIALOG_COOKIE),
service: cycleAnalyticsService, service: this.createCycleAnalyticsService(cycleAnalyticsEl.dataset.requestPath),
}; };
}, },
computed: { computed: {
...@@ -124,6 +130,7 @@ export default () => { ...@@ -124,6 +130,7 @@ export default () => {
.fetchStageData({ .fetchStageData({
stage, stage,
startDate: this.startDate, startDate: this.startDate,
projectIds: this.selectedProjectIds,
}) })
.then(response => { .then(response => {
this.isEmptyStage = !response.events.length; this.isEmptyStage = !response.events.length;
...@@ -139,6 +146,11 @@ export default () => { ...@@ -139,6 +146,11 @@ export default () => {
this.isOverviewDialogDismissed = true; this.isOverviewDialogDismissed = true;
Cookies.set(OVERVIEW_DIALOG_COOKIE, '1', { expires: 365 }); Cookies.set(OVERVIEW_DIALOG_COOKIE, '1', { expires: 365 });
}, },
createCycleAnalyticsService(requestPath) {
return new CycleAnalyticsService({
requestPath,
});
},
}, },
}); });
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment