Commit 9d6f0a58 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '262061-mr-analytics-include-date-range-in-deep-linking' into 'master'

Resolve "MR Analytics: Include date range in deep linking"

See merge request gitlab-org/gitlab!44562
parents 28fb4a1d 9d2350ff
<script> <script>
import { getDateInPast } from '~/lib/utils/datetime_utility'; import dateFormat from 'dateformat';
import UrlSync from '~/vue_shared/components/url_sync.vue';
import DateRange from '../../shared/components/daterange.vue'; import DateRange from '../../shared/components/daterange.vue';
import { DEFAULT_NUMBER_OF_DAYS } from '../constants'; import { dateFormats } from '../../shared/constants';
import FilterBar from './filter_bar.vue'; import FilterBar from './filter_bar.vue';
import ThroughputChart from './throughput_chart.vue'; import ThroughputChart from './throughput_chart.vue';
import ThroughputTable from './throughput_table.vue'; import ThroughputTable from './throughput_table.vue';
...@@ -13,12 +14,25 @@ export default { ...@@ -13,12 +14,25 @@ export default {
FilterBar, FilterBar,
ThroughputChart, ThroughputChart,
ThroughputTable, ThroughputTable,
UrlSync,
}, },
data() { props: {
return { startDate: {
startDate: getDateInPast(new Date(), DEFAULT_NUMBER_OF_DAYS), type: Date,
endDate: new Date(), required: true,
}; },
endDate: {
type: Date,
required: true,
},
},
computed: {
query() {
return {
start_date: dateFormat(this.startDate, dateFormats.isoDate),
end_date: dateFormat(this.endDate, dateFormats.isoDate),
};
},
}, },
methods: { methods: {
setDateRange({ startDate, endDate }) { setDateRange({ startDate, endDate }) {
...@@ -44,5 +58,6 @@ export default { ...@@ -44,5 +58,6 @@ export default {
</div> </div>
<throughput-chart :start-date="startDate" :end-date="endDate" /> <throughput-chart :start-date="startDate" :end-date="endDate" />
<throughput-table :start-date="startDate" :end-date="endDate" class="gl-mt-6" /> <throughput-table :start-date="startDate" :end-date="endDate" class="gl-mt-6" />
<url-sync :query="query" />
</div> </div>
</template> </template>
...@@ -2,9 +2,12 @@ import Vue from 'vue'; ...@@ -2,9 +2,12 @@ import Vue from 'vue';
import VueApollo from 'vue-apollo'; import VueApollo from 'vue-apollo';
import createDefaultClient from '~/lib/graphql'; import createDefaultClient from '~/lib/graphql';
import { urlQueryToFilter } from '~/vue_shared/components/filtered_search_bar/filtered_search_utils'; import { urlQueryToFilter } from '~/vue_shared/components/filtered_search_bar/filtered_search_utils';
import { getDateInPast } from '~/lib/utils/datetime_utility';
import { getParameterValues } from '~/lib/utils/url_utility';
import createStore from './store'; import createStore from './store';
import MergeRequestAnalyticsApp from './components/app.vue'; import MergeRequestAnalyticsApp from './components/app.vue';
import { ITEM_TYPE } from '~/groups/constants'; import { ITEM_TYPE } from '~/groups/constants';
import { DEFAULT_NUMBER_OF_DAYS } from './constants';
Vue.use(VueApollo); Vue.use(VueApollo);
...@@ -43,6 +46,9 @@ export default () => { ...@@ -43,6 +46,9 @@ export default () => {
selectedLabelList: label_name, selectedLabelList: label_name,
}); });
const startDateParam = getParameterValues('start_date');
const endDateParam = getParameterValues('end_date');
return new Vue({ return new Vue({
el, el,
apolloProvider, apolloProvider,
...@@ -52,6 +58,14 @@ export default () => { ...@@ -52,6 +58,14 @@ export default () => {
fullPath, fullPath,
type, type,
}, },
render: createElement => createElement(MergeRequestAnalyticsApp), render: createElement =>
createElement(MergeRequestAnalyticsApp, {
props: {
startDate: startDateParam.length
? new Date(startDateParam)
: getDateInPast(new Date(), DEFAULT_NUMBER_OF_DAYS),
endDate: endDateParam.length ? new Date(endDateParam) : new Date(),
},
}),
}); });
}; };
...@@ -4,12 +4,18 @@ import DateRange from 'ee/analytics/shared/components/daterange.vue'; ...@@ -4,12 +4,18 @@ import DateRange from 'ee/analytics/shared/components/daterange.vue';
import FilterBar from 'ee/analytics/merge_request_analytics/components/filter_bar.vue'; import FilterBar from 'ee/analytics/merge_request_analytics/components/filter_bar.vue';
import ThroughputChart from 'ee/analytics/merge_request_analytics/components/throughput_chart.vue'; import ThroughputChart from 'ee/analytics/merge_request_analytics/components/throughput_chart.vue';
import ThroughputTable from 'ee/analytics/merge_request_analytics/components/throughput_table.vue'; import ThroughputTable from 'ee/analytics/merge_request_analytics/components/throughput_table.vue';
import UrlSync from '~/vue_shared/components/url_sync.vue';
describe('MergeRequestAnalyticsApp', () => { describe('MergeRequestAnalyticsApp', () => {
let wrapper; let wrapper;
function createComponent() { function createComponent() {
wrapper = shallowMount(MergeRequestAnalyticsApp); wrapper = shallowMount(MergeRequestAnalyticsApp, {
propsData: {
startDate: new Date('2020-05-01'),
endDate: new Date('2020-10-01'),
},
});
} }
beforeEach(() => { beforeEach(() => {
...@@ -42,4 +48,19 @@ describe('MergeRequestAnalyticsApp', () => { ...@@ -42,4 +48,19 @@ describe('MergeRequestAnalyticsApp', () => {
it('displays the throughput table component', () => { it('displays the throughput table component', () => {
expect(wrapper.find(ThroughputTable).exists()).toBe(true); expect(wrapper.find(ThroughputTable).exists()).toBe(true);
}); });
describe('url sync', () => {
it('includes the url sync component', () => {
expect(wrapper.find(UrlSync).exists()).toBe(true);
});
it('has the start and end date params', () => {
const urlSync = wrapper.find(UrlSync);
expect(urlSync.props('query')).toMatchObject({
start_date: '2020-05-01',
end_date: '2020-10-01',
});
});
});
}); });
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