Skip to content

G
gitlab-ce
Commit 8483dda7 authored by Simon Knox's avatar Simon Knox
Browse files
Options

Merge branch '230631-223735-mlunoe-clean-up-instance-level-value-stream-analytics' into 'master' 

Remove (dead) instance level Value Stream Analytics page code

Closes #223735 and #230631

See merge request gitlab-org/gitlab!42232
parents 761f71de 4dd08265
Show whitespace changes
Inline Side-by-side
Showing with 384 additions and 620 deletions
ee/app/assets/javascripts/analytics/cycle_analytics/components/base.vue
View file @ 8483dda7
<script>
import { GlEmptyState } from '@gitlab/ui';
import { mapActions, mapState, mapGetters } from 'vuex';
import { featureAccessLevel } from '~/pages/projects/shared/permissions/constants';
import { PROJECTS_PER_PAGE } from '../constants';
import GroupsDropdownFilter from '../../shared/components/groups_dropdown_filter.vue';
import ProjectsDropdownFilter from '../../shared/components/projects_dropdown_filter.vue';
import { SIMILARITY_ORDER, LAST_ACTIVITY_AT, DATE_RANGE_LIMIT } from '../../shared/constants';
import DateRange from '../../shared/components/daterange.vue';
......@@ -25,7 +23,6 @@ export default {
DateRange,
DurationChart,
GlEmptyState,
GroupsDropdownFilter,
ProjectsDropdownFilter,
StageTable,
TypeOfWorkCharts,
......@@ -50,10 +47,6 @@ export default {
type: String,
required: true,
},
hideGroupDropDown: {
type: Boolean,
required: true,
},
},
computed: {
...mapState([
......@@ -61,7 +54,7 @@ export default {
'isLoading',
'isLoadingStage',
'isEmptyStage',
'selectedGroup',
'currentGroup',
'selectedProjects',
'selectedStage',
'stages',
......@@ -87,10 +80,10 @@ export default {
]),
...mapGetters('customStages', ['customStageFormActive']),
shouldRenderEmptyState() {
return !this.selectedGroup && !this.isLoading;
return !this.currentGroup && !this.isLoading;
},
shouldDisplayFilters() {
return this.selectedGroup && !this.errorCode;
return !this.errorCode;
},
shouldDisplayDurationChart() {
return this.featureFlags.hasDurationChart && !this.hasNoAccessError;
......@@ -101,11 +94,6 @@ export default {
shouldDisplayPathNavigation() {
return this.featureFlags.hasPathNavigation && !this.hasNoAccessError && this.selectedStage;
},
shouldDisplayFilterBar() {
// TODO: After we remove instance VSA currentGroupPath will be always set
// https://gitlab.com/gitlab-org/gitlab/-/issues/223735
return this.currentGroupPath;
},
shouldDisplayCreateMultipleValueStreams() {
return Boolean(
this.featureFlags.hasCreateMultipleValueStreams && !this.isLoadingValueStreams,
......@@ -118,7 +106,6 @@ export default {
const selectedProjectIds = this.selectedProjectIds?.length ? this.selectedProjectIds : null;
return {
group_id: !this.hideGroupDropDown ? this.currentGroupPath : null,
project_ids: selectedProjectIds,
created_after: toYmd(this.startDate),
created_before: toYmd(this.endDate),
......@@ -143,26 +130,14 @@ export default {
...mapActions([
'fetchCycleAnalyticsData',
'fetchStageData',
'setSelectedGroup',
'setSelectedProjects',
'setSelectedStage',
'setDateRange',
'updateStage',
'removeStage',
'updateStage',
'reorderStage',
]),
...mapActions('customStages', [
'hideForm',
'showCreateForm',
'showEditForm',
'createStage',
'clearFormErrors',
]),
onGroupSelect(group) {
this.setSelectedGroup(group);
this.fetchCycleAnalyticsData();
},
...mapActions('customStages', ['hideForm', 'showCreateForm', 'showEditForm', 'createStage']),
onProjectsSelect(projects) {
this.setSelectedProjects(projects);
this.fetchCycleAnalyticsData();
......@@ -194,9 +169,6 @@ export default {
},
multiProjectSelect: true,
dateOptions: [7, 30, 90],
groupsQueryParams: {
min_access_level: featureAccessLevel.EVERYONE,
},
maxDateRange: DATE_RANGE_LIMIT,
};
</script>
......@@ -211,7 +183,15 @@ export default {
class="gl-align-self-start gl-sm-align-self-start gl-mt-0 gl-sm-mt-5"
/>
</div>
<div class="gl-max-w-full">
<gl-empty-state
v-if="shouldRenderEmptyState"
:title="__('Value Stream Analytics can help you determine your team’s velocity')"
:description="
__('Filter parameters are not valid. Make sure that the end date is after the start date.')
"
:svg-path="emptyStateSvgPath"
/>
<div v-if="!shouldRenderEmptyState" class="gl-max-w-full">
<div class="gl-mt-3 gl-py-2 gl-px-3 bg-gray-light border-top border-bottom">
<div v-if="shouldDisplayPathNavigation" class="gl-w-full gl-pb-2">
<path-navigation
......@@ -223,29 +203,18 @@ export default {
/>
</div>
<div
v-if="shouldDisplayFilters"
class="gl-display-flex gl-flex-direction-column gl-lg-flex-direction-row gl-justify-content-space-between"
>
<div class="dropdown-container d-flex flex-column flex-lg-row">
<groups-dropdown-filter
v-if="!hideGroupDropDown"
class="js-groups-dropdown-filter"
:class="{ 'mr-lg-3': shouldDisplayFilters }"
:query-params="$options.groupsQueryParams"
:default-group="selectedGroup"
@selected="onGroupSelect"
/>
<projects-dropdown-filter
v-if="shouldDisplayFilters"
:key="selectedGroup.id"
:key="currentGroup.id"
class="js-projects-dropdown-filter project-select"
:group-id="selectedGroup.id"
:group-id="currentGroup.id"
:query-params="projectsQueryParams"
:multi-select="$options.multiProjectSelect"
:default-projects="selectedProjects"
@selected="onProjectsSelect"
/>
</div>
<div v-if="shouldDisplayFilters" class="gl-justify-content-end gl-white-space-nowrap">
<date-range
:start-date="startDate"
:end-date="endDate"
......@@ -255,25 +224,14 @@ export default {
@change="setDateRange"
/>
</div>
</div>
<filter-bar
v-if="shouldDisplayFilterBar"
v-if="shouldDisplayFilters"
class="js-filter-bar filtered-search-box gl-display-flex gl-mt-3 gl-mr-3 gl-border-none"
:group-path="currentGroupPath"
/>
</div>
</div>
<gl-empty-state
v-if="shouldRenderEmptyState"
:title="__('Value Stream Analytics can help you determine your team’s velocity')"
:description="
__(
'Start by choosing a group to see how your team is spending time. You can then drill down to the project level.',
)
"
:svg-path="emptyStateSvgPath"
/>
<div v-else class="cycle-analytics mt-0">
<div v-if="!shouldRenderEmptyState" class="cycle-analytics gl-mt-0">
<gl-empty-state
v-if="hasNoAccessError"
class="js-empty-state"
......
ee/app/assets/javascripts/analytics/cycle_analytics/components/type_of_work_charts.vue
View file @ 8483dda7
......@@ -29,7 +29,7 @@ export default {
startDate,
endDate,
selectedProjectIds,
selectedGroup: { name: groupName },
currentGroup: { name: groupName },
} = this.selectedTasksByTypeFilters;
const selectedProjectCount = selectedProjectIds.length;
......
ee/app/assets/javascripts/analytics/cycle_analytics/index.js
View file @ 8483dda7
......@@ -4,13 +4,12 @@ import CycleAnalytics from './components/base.vue';
import createStore from './store';
import { buildCycleAnalyticsInitialData } from '../shared/utils';
import { urlQueryToFilter } from '~/vue_shared/components/filtered_search_bar/filtered_search_utils';
import { parseBoolean } from '~/lib/utils/common_utils';
Vue.use(GlToast);
export default () => {
const el = document.querySelector('#js-cycle-analytics-app');
const { emptyStateSvgPath, noDataSvgPath, noAccessSvgPath, hideGroupDropDown } = el.dataset;
const { emptyStateSvgPath, noDataSvgPath, noAccessSvgPath } = el.dataset;
const initialData = buildCycleAnalyticsInitialData(el.dataset);
const store = createStore();
const {
......@@ -51,7 +50,6 @@ export default () => {
emptyStateSvgPath,
noDataSvgPath,
noAccessSvgPath,
hideGroupDropDown: parseBoolean(hideGroupDropDown),
},
}),
});
......
ee/app/assets/javascripts/analytics/cycle_analytics/store/actions.js
View file @ 8483dda7
......@@ -14,16 +14,11 @@ import {
const appendExtension = path => (path.indexOf('.') > -1 ? path : `${path}.json`);
export const setPaths = ({ dispatch }, options) => {
const { group, milestonesPath = '', labelsPath = '' } = options;
// TODO: After we remove instance VSA we can rely on the paths from the BE
// https://gitlab.com/gitlab-org/gitlab/-/issues/223735
const groupPath = group?.parentId || group?.fullPath || '';
const milestonesEndpoint = milestonesPath || `/groups/${groupPath}/-/milestones`;
const labelsEndpoint = labelsPath || `/groups/${groupPath}/-/labels`;
const { groupPath, milestonesPath = '', labelsPath = '' } = options;
return dispatch('filters/setEndpoints', {
labelsEndpoint: appendExtension(labelsEndpoint),
milestonesEndpoint: appendExtension(milestonesEndpoint),
labelsEndpoint: appendExtension(labelsPath),
milestonesEndpoint: appendExtension(milestonesPath),
groupEndpoint: groupPath,
});
};
......@@ -31,11 +26,6 @@ export const setPaths = ({ dispatch }, options) => {
export const setFeatureFlags = ({ commit }, featureFlags) =>
commit(types.SET_FEATURE_FLAGS, featureFlags);
export const setSelectedGroup = ({ commit, dispatch }, group) => {
commit(types.SET_SELECTED_GROUP, group);
return dispatch('filters/initialize', { groupPath: group.full_path });
};
export const setSelectedProjects = ({ commit }, projects) =>
commit(types.SET_SELECTED_PROJECTS, projects);
......@@ -293,12 +283,13 @@ export const initializeCycleAnalytics = ({ dispatch, commit }, initialData = {})
selectedMilestone,
selectedAssigneeList,
selectedLabelList,
group,
} = initialData;
commit(types.SET_FEATURE_FLAGS, featureFlags);
if (initialData.group?.fullPath) {
if (group?.fullPath) {
return Promise.all([
dispatch('setPaths', { group: initialData.group, milestonesPath, labelsPath }),
dispatch('setPaths', { group, milestonesPath, labelsPath }),
dispatch('filters/initialize', {
selectedAuthor,
selectedMilestone,
......@@ -311,6 +302,7 @@ export const initializeCycleAnalytics = ({ dispatch, commit }, initialData = {})
.then(() => dispatch('fetchCycleAnalyticsData'))
.then(() => dispatch('initializeCycleAnalyticsSuccess'));
}
return dispatch('initializeCycleAnalyticsSuccess');
};
......
ee/app/assets/javascripts/analytics/cycle_analytics/store/getters.js
View file @ 8483dda7
......@@ -11,7 +11,7 @@ export const hasNoAccessError = state => state.errorCode === httpStatus.FORBIDDE
export const currentValueStreamId = ({ selectedValueStream }) =>
selectedValueStream?.id || DEFAULT_VALUE_STREAM_ID;
export const currentGroupPath = ({ selectedGroup }) => selectedGroup?.fullPath || null;
export const currentGroupPath = ({ currentGroup }) => currentGroup?.fullPath || null;
export const selectedProjectIds = ({ selectedProjects }) =>
selectedProjects?.map(({ id }) => id) || [];
......
ee/app/assets/javascripts/analytics/cycle_analytics/store/modules/type_of_work/getters.js
View file @ 8483dda7
......@@ -2,9 +2,9 @@ import { getTasksByTypeData } from '../../../utils';
export const selectedTasksByTypeFilters = (state = {}, _, rootState = {}) => {
const { selectedLabelIds = [], subject } = state;
const { selectedGroup, selectedProjectIds = [], startDate = null, endDate = null } = rootState;
const { currentGroup, selectedProjectIds = [], startDate = null, endDate = null } = rootState;
return {
selectedGroup,
currentGroup,
selectedProjectIds,
startDate,
endDate,
......
ee/app/assets/javascripts/analytics/cycle_analytics/store/mutation_types.js
View file @ 8483dda7
export const SET_FEATURE_FLAGS = 'SET_FEATURE_FLAGS';
export const SET_SELECTED_GROUP = 'SET_SELECTED_GROUP';
export const SET_SELECTED_PROJECTS = 'SET_SELECTED_PROJECTS';
export const SET_SELECTED_STAGE = 'SET_SELECTED_STAGE';
export const SET_DATE_RANGE = 'SET_DATE_RANGE';
......
ee/app/assets/javascripts/analytics/cycle_analytics/store/mutations.js
View file @ 8483dda7
......@@ -6,10 +6,6 @@ export default {
[types.SET_FEATURE_FLAGS](state, featureFlags) {
state.featureFlags = featureFlags;
},
[types.SET_SELECTED_GROUP](state, group) {
state.selectedGroup = convertObjectPropsToCamelCase(group, { deep: true });
state.selectedProjects = [];
},
[types.SET_SELECTED_PROJECTS](state, projects) {
state.selectedProjects = projects;
},
......@@ -91,14 +87,14 @@ export default {
[types.INITIALIZE_CYCLE_ANALYTICS](
state,
{
group: selectedGroup = null,
group = null,
createdAfter: startDate = null,
createdBefore: endDate = null,
selectedProjects = [],
} = {},
) {
state.isLoading = true;
state.selectedGroup = selectedGroup;
state.currentGroup = group;
state.selectedProjects = selectedProjects;
state.startDate = startDate;
state.endDate = endDate;
......
ee/app/assets/javascripts/analytics/cycle_analytics/store/state.js
View file @ 8483dda7
......@@ -13,7 +13,7 @@ export default () => ({
isSavingStageOrder: false,
errorSavingStageOrder: false,
selectedGroup: null,
currentGroup: null,
selectedProjects: [],
selectedStage: null,
selectedValueStream: null,
......
ee/app/assets/javascripts/pages/analytics/cycle_analytics/index.js deleted 100644 → 0
View file @ 761f71de
import initCycleAnalyticsApp from 'ee/analytics/cycle_analytics/index';
document.addEventListener('DOMContentLoaded', initCycleAnalyticsApp);
ee/app/views/groups/analytics/cycle_analytics/show.html.haml
View file @ 8483dda7
......@@ -2,7 +2,6 @@
- data_attributes = @request_params.valid? ? @request_params.to_data_attributes : {}
- api_paths = @group.present? ? { milestones_path: group_milestones_path(@group), labels_path: group_labels_path(@group) } : {}
- image_paths = { empty_state_svg_path: image_path("illustrations/analytics/cycle-analytics-empty-chart.svg"), no_data_svg_path: image_path("illustrations/analytics/cycle-analytics-empty-chart.svg"), no_access_svg_path: image_path("illustrations/analytics/no-access.svg")}
- settings = { hide_group_drop_down: 'true' }
- data_attributes.merge!(api_paths, image_paths, settings)
- data_attributes.merge!(api_paths, image_paths)
#js-cycle-analytics-app{ data: data_attributes }
ee/spec/features/groups/analytics/cycle_analytics/filters_and_data_spec.rb
View file @ 8483dda7
......@@ -77,7 +77,7 @@ RSpec.describe 'Group value stream analytics filters and data', :js do
it 'displays empty text' do
[
'Value Stream Analytics can help you determine your team’s velocity',
'Start by choosing a group to see how your team is spending time. You can then drill down to the project level.'
'Filter parameters are not valid. Make sure that the end date is after the start date.'
].each do |content|
expect(page).to have_content(content)
end
......
ee/spec/frontend/analytics/cycle_analytics/components/base_spec.js
View file @ 8483dda7
import { createLocalVue, shallowMount, mount } from '@vue/test-utils';
import Vuex from 'vuex';
import store from 'ee/analytics/cycle_analytics/store';
import createStore from 'ee/analytics/cycle_analytics/store';
import Component from 'ee/analytics/cycle_analytics/components/base.vue';
import { GlEmptyState } from '@gitlab/ui';
import axios from 'axios';
import MockAdapter from 'axios-mock-adapter';
import GroupsDropdownFilter from 'ee/analytics/shared/components/groups_dropdown_filter.vue';
import ProjectsDropdownFilter from 'ee/analytics/shared/components/projects_dropdown_filter.vue';
import Metrics from 'ee/analytics/cycle_analytics/components/metrics.vue';
import PathNavigation from 'ee/analytics/cycle_analytics/components/path_navigation.vue';
......@@ -30,9 +29,8 @@ import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
const noDataSvgPath = 'path/to/no/data';
const noAccessSvgPath = 'path/to/no/access';
const currentGroup = convertObjectPropsToCamelCase(mockData.group);
const emptyStateSvgPath = 'path/to/empty/state';
const hideGroupDropDown = false;
const selectedGroup = convertObjectPropsToCamelCase(mockData.group);
const localVue = createLocalVue();
localVue.use(Vuex);
......@@ -43,7 +41,6 @@ const defaultStubs = {
'tasks-by-type-chart': true,
'labels-selector': true,
DurationChart: true,
GroupsDropdownFilter: true,
ValueStreamSelect: true,
Metrics: true,
UrlSync,
......@@ -58,7 +55,7 @@ const defaultFeatureFlags = {
const initialCycleAnalyticsState = {
createdAfter: mockData.startDate,
createdBefore: mockData.endDate,
group: selectedGroup,
group: currentGroup,
};
const mocks = {
......@@ -67,7 +64,38 @@ const mocks = {
},
};
function createComponent({
function mockRequiredRoutes(mockAdapter) {
mockAdapter.onGet(mockData.endpoints.stageData).reply(httpStatusCodes.OK, mockData.issueEvents);
mockAdapter
.onGet(mockData.endpoints.tasksByTypeTopLabelsData)
.reply(httpStatusCodes.OK, mockData.groupLabels);
mockAdapter
.onGet(mockData.endpoints.tasksByTypeData)
.reply(httpStatusCodes.OK, { ...mockData.tasksByTypeData });
mockAdapter
.onGet(mockData.endpoints.baseStagesEndpoint)
.reply(httpStatusCodes.OK, { ...mockData.customizableStagesAndEvents });
mockAdapter
.onGet(mockData.endpoints.durationData)
.reply(httpStatusCodes.OK, mockData.customizableStagesAndEvents.stages);
mockAdapter.onGet(mockData.endpoints.stageMedian).reply(httpStatusCodes.OK, { value: null });
}
async function shouldMergeUrlParams(wrapper, result) {
await wrapper.vm.$nextTick();
expect(urlUtils.mergeUrlParams).toHaveBeenCalledWith(result, window.location.href, {
spreadArrays: true,
});
expect(commonUtils.historyPushState).toHaveBeenCalled();
}
describe('Cycle Analytics component', () => {
let wrapper;
let mock;
let store;
async function createComponent(options = {}) {
const {
opts = {
stubs: defaultStubs,
},
......@@ -75,8 +103,19 @@ function createComponent({
withStageSelected = false,
withValueStreamSelected = true,
featureFlags = {},
initialState = initialCycleAnalyticsState,
props = {},
} = {}) {
} = options;
store = createStore();
await store.dispatch('initializeCycleAnalytics', {
...initialState,
featureFlags: {
...defaultFeatureFlags,
...featureFlags,
},
});
const func = shallow ? shallowMount : mount;
const comp = func(Component, {
localVue,
......@@ -85,52 +124,24 @@ function createComponent({
emptyStateSvgPath,
noDataSvgPath,
noAccessSvgPath,
hideGroupDropDown,
...props,
},
mocks,
...opts,
});
comp.vm.$store.dispatch('initializeCycleAnalytics', {
createdAfter: mockData.startDate,
createdBefore: mockData.endDate,
featureFlags: {
...defaultFeatureFlags,
...featureFlags,
},
});
if (withValueStreamSelected) {
comp.vm.$store.dispatch('receiveValueStreamsSuccess', mockData.valueStreams);
await store.dispatch('receiveValueStreamsSuccess', mockData.valueStreams);
}
if (withStageSelected) {
comp.vm.$store.commit('SET_SELECTED_GROUP', {
...selectedGroup,
});
comp.vm.$store.dispatch(
'receiveGroupStagesSuccess',
mockData.customizableStagesAndEvents.stages,
);
comp.vm.$store.dispatch('receiveStageDataSuccess', mockData.issueEvents);
await Promise.all([
store.dispatch('receiveGroupStagesSuccess', mockData.customizableStagesAndEvents.stages),
store.dispatch('receiveStageDataSuccess', mockData.issueEvents),
]);
}
return comp;
}
async function shouldMergeUrlParams(wrapper, result) {
await wrapper.vm.$nextTick();
expect(urlUtils.mergeUrlParams).toHaveBeenCalledWith(result, window.location.href, {
spreadArrays: true,
});
expect(commonUtils.historyPushState).toHaveBeenCalled();
}
describe('Cycle Analytics component', () => {
let wrapper;
let mock;
}
const findStageNavItemAtIndex = index =>
wrapper
......@@ -180,12 +191,16 @@ describe('Cycle Analytics component', () => {
expect(wrapper.find(ValueStreamSelect).exists()).toBe(flag);
};
beforeEach(() => {
describe('displays the components as required', () => {
describe('without a group', () => {
beforeEach(async () => {
const { group, ...stateWithoutGroup } = initialCycleAnalyticsState;
mock = new MockAdapter(axios);
wrapper = createComponent({
wrapper = await createComponent({
featureFlags: {
hasPathNavigation: true,
},
initialState: stateWithoutGroup,
});
});
......@@ -195,8 +210,6 @@ describe('Cycle Analytics component', () => {
wrapper = null;
});
describe('displays the components as required', () => {
describe('before a filter has been selected', () => {
it('displays an empty state', () => {
const emptyState = wrapper.find(GlEmptyState);
......@@ -204,13 +217,6 @@ describe('Cycle Analytics component', () => {
expect(emptyState.props('svgPath')).toBe(emptyStateSvgPath);
});
it('displays the groups filter', () => {
expect(wrapper.find(GroupsDropdownFilter).exists()).toBe(true);
expect(wrapper.find(GroupsDropdownFilter).props('queryParams')).toEqual(
wrapper.vm.$options.groupsQueryParams,
);
});
it('does not display the projects filter', () => {
displaysProjectsDropdownFilter(false);
});
......@@ -242,43 +248,30 @@ describe('Cycle Analytics component', () => {
it('does not display the value stream select component', () => {
displaysValueStreamSelect(false);
});
describe('hideGroupDropDown = true', () => {
beforeEach(() => {
mock = new MockAdapter(axios);
wrapper = createComponent({
props: {
hideGroupDropDown: true,
},
});
});
it('does not render the group dropdown', () => {
expect(wrapper.find(GroupsDropdownFilter).exists()).toBe(false);
});
});
describe('hasCreateMultipleValueStreams = true', () => {
beforeEach(() => {
describe('with a group', () => {
beforeEach(async () => {
mock = new MockAdapter(axios);
wrapper = createComponent({
mockRequiredRoutes(mock);
wrapper = await createComponent({
featureFlags: {
hasCreateMultipleValueStreams: true,
hasPathNavigation: true,
},
});
});
it('displays the value stream select component', () => {
displaysValueStreamSelect(true);
});
});
afterEach(() => {
wrapper.destroy();
mock.restore();
wrapper = null;
});
describe('after a filter has been selected', () => {
describe('the user has access to the group', () => {
beforeEach(() => {
beforeEach(async () => {
mock = new MockAdapter(axios);
wrapper = createComponent({
mockRequiredRoutes(mock);
wrapper = await createComponent({
withStageSelected: true,
featureFlags: {
hasPathNavigation: true,
......@@ -296,15 +289,35 @@ describe('Cycle Analytics component', () => {
expect(wrapper.find(ProjectsDropdownFilter).props()).toEqual(
expect.objectContaining({
queryParams: wrapper.vm.projectsQueryParams,
groupId: mockData.group.id,
multiSelect: wrapper.vm.$options.multiProjectSelect,
}),
);
});
describe('when analyticsSimilaritySearch feature flag is on', () => {
describe('hasCreateMultipleValueStreams = true', () => {
beforeEach(() => {
wrapper = createComponent({
mock = new MockAdapter(axios);
mockRequiredRoutes(mock);
});
it('hides the value stream select component', () => {
displaysValueStreamSelect(false);
});
it('displays the value stream select component', async () => {
wrapper = await createComponent({
featureFlags: {
hasCreateMultipleValueStreams: true,
},
});
displaysValueStreamSelect(true);
});
});
describe('when analyticsSimilaritySearch feature flag is on', () => {
beforeEach(async () => {
wrapper = await createComponent({
withStageSelected: true,
featureFlags: {
hasAnalyticsSimilaritySearch: true,
......@@ -337,28 +350,27 @@ describe('Cycle Analytics component', () => {
displaysFilterBar(true);
});
it('displays the add stage button', () => {
wrapper = createComponent({
it('displays the add stage button', async () => {
wrapper = await createComponent({
opts: {
stubs: {
StageTable,
StageTableNav,
AddStageButton,
},
},
withStageSelected: true,
});
return wrapper.vm.$nextTick().then(() => {
await wrapper.vm.$nextTick();
displaysAddStageButton(true);
});
});
it('displays the tasks by type chart', () => {
wrapper = createComponent({ shallow: false, withStageSelected: true });
return wrapper.vm.$nextTick().then(() => {
it('displays the tasks by type chart', async () => {
wrapper = await createComponent({ shallow: false, withStageSelected: true });
await wrapper.vm.$nextTick();
expect(wrapper.find('.js-tasks-by-type-chart').exists()).toBe(true);
});
});
it('displays the duration chart', () => {
displaysDurationChart(true);
......@@ -366,8 +378,8 @@ describe('Cycle Analytics component', () => {
describe('path navigation', () => {
describe('disabled', () => {
beforeEach(() => {
wrapper = createComponent({
beforeEach(async () => {
wrapper = await createComponent({
withStageSelected: true,
featureFlags: {
hasPathNavigation: false,
......@@ -381,8 +393,8 @@ describe('Cycle Analytics component', () => {
});
describe('enabled', () => {
beforeEach(() => {
wrapper = createComponent({
beforeEach(async () => {
wrapper = await createComponent({
withStageSelected: true,
featureFlags: {
hasPathNavigation: true,
......@@ -397,10 +409,11 @@ describe('Cycle Analytics component', () => {
});
describe('StageTable', () => {
beforeEach(() => {
beforeEach(async () => {
mock = new MockAdapter(axios);
mockRequiredRoutes(mock);
wrapper = createComponent({
wrapper = await createComponent({
opts: {
stubs: {
StageTable,
......@@ -413,7 +426,7 @@ describe('Cycle Analytics component', () => {
});
});
it('has the first stage selected by default', () => {
it('has the first stage selected by default', async () => {
const first = findStageNavItemAtIndex(0);
const second = findStageNavItemAtIndex(1);
......@@ -421,21 +434,19 @@ describe('Cycle Analytics component', () => {
expect(second.props('isActive')).toBe(false);
});
it('can navigate to different stages', () => {
it('can navigate to different stages', async () => {
findStageNavItemAtIndex(2).trigger('click');
return wrapper.vm.$nextTick().then(() => {
await wrapper.vm.$nextTick();
const first = findStageNavItemAtIndex(0);
const third = findStageNavItemAtIndex(2);
expect(third.props('isActive')).toBe(true);
expect(first.props('isActive')).toBe(false);
});
});
describe('Add stage button', () => {
beforeEach(() => {
wrapper = createComponent({
beforeEach(async () => {
wrapper = await createComponent({
opts: {
stubs: {
StageTable,
......@@ -447,26 +458,21 @@ describe('Cycle Analytics component', () => {
});
});
it('can navigate to the custom stage form', () => {
it('can navigate to the custom stage form', async () => {
expect(wrapper.find(CustomStageForm).exists()).toBe(false);
findAddStageButton().trigger('click');
return wrapper.vm.$nextTick().then(() => {
await wrapper.vm.$nextTick();
expect(wrapper.find(CustomStageForm).exists()).toBe(true);
});
});
});
});
});
describe('the user does not have access to the group', () => {
beforeEach(() => {
mock = new MockAdapter(axios);
mock.onAny().reply(httpStatusCodes.FORBIDDEN);
wrapper.vm.onGroupSelect(mockData.group);
return waitForPromises();
beforeEach(async () => {
await store.dispatch('receiveCycleAnalyticsDataError', {
response: { status: httpStatusCodes.FORBIDDEN },
});
});
it('renders the no access information', () => {
......@@ -512,18 +518,22 @@ describe('Cycle Analytics component', () => {
});
describe('enabled', () => {
beforeEach(() => {
wrapper = createComponent({
beforeEach(async () => {
wrapper = await createComponent({
withValueStreamSelected: false,
withStageSelected: true,
pathNavigationEnabled: true,
});
mock = new MockAdapter(axios);
mockRequiredRoutes(mock);
mock.onAny().reply(httpStatusCodes.FORBIDDEN);
wrapper.vm.onGroupSelect(mockData.group);
return waitForPromises();
await waitForPromises();
});
afterEach(() => {
mock.restore();
});
it('does not display the path navigation', () => {
......@@ -534,217 +544,126 @@ describe('Cycle Analytics component', () => {
});
});
});
describe('with failed requests while loading', () => {
const mockRequestCycleAnalyticsData = ({
overrides = {},
mockFetchStageData = true,
mockFetchStageMedian = true,
mockFetchTasksByTypeData = true,
mockFetchTopRankedGroupLabels = true,
}) => {
const defaultStatus = 200;
const defaultRequests = {
fetchGroupStagesAndEvents: {
status: defaultStatus,
endpoint: mockData.endpoints.baseStagesEndpoint,
response: { ...mockData.customizableStagesAndEvents },
},
...overrides,
};
if (mockFetchTopRankedGroupLabels) {
mock
.onGet(mockData.endpoints.tasksByTypeTopLabelsData)
.reply(defaultStatus, mockData.groupLabels);
}
if (mockFetchTasksByTypeData) {
mock
.onGet(mockData.endpoints.tasksByTypeData)
.reply(defaultStatus, { ...mockData.tasksByTypeData });
}
if (mockFetchStageMedian) {
mock.onGet(mockData.endpoints.stageMedian).reply(defaultStatus, { value: null });
}
if (mockFetchStageData) {
mock.onGet(mockData.endpoints.stageData).reply(defaultStatus, mockData.issueEvents);
}
Object.values(defaultRequests).forEach(({ endpoint, status, response }) => {
mock.onGet(endpoint).replyOnce(status, response);
});
};
beforeEach(() => {
describe('with failed requests while loading', () => {
beforeEach(async () => {
setFixtures('<div class="flash-container"></div>');
mock = new MockAdapter(axios);
wrapper = createComponent();
mockRequiredRoutes(mock);
wrapper = await createComponent({
featureFlags: {
hasPathNavigation: true,
},
});
});
afterEach(() => {
wrapper.destroy();
mock.restore();
wrapper = null;
});
const findFlashError = () => document.querySelector('.flash-container .flash-text');
const selectGroupAndFindError = msg => {
wrapper.vm.onGroupSelect(mockData.group);
return waitForPromises().then(() => {
const findError = async msg => {
await waitForPromises();
expect(findFlashError().innerText.trim()).toEqual(msg);
});
};
it('will display an error if the fetchGroupStagesAndEvents request fails', () => {
expect(findFlashError()).toBeNull();
it('will display an error if the fetchGroupStagesAndEvents request fails', async () => {
expect(await findFlashError()).toBeNull();
mockRequestCycleAnalyticsData({
overrides: {
fetchGroupStagesAndEvents: {
endPoint: mockData.endpoints.baseStagesEndpoint,
status: httpStatusCodes.NOT_FOUND,
response: { response: { status: httpStatusCodes.NOT_FOUND } },
},
},
});
mock
.onGet(mockData.endpoints.baseStagesEndpoint)
.reply(httpStatusCodes.NOT_FOUND, { response: { status: httpStatusCodes.NOT_FOUND } });
wrapper = await createComponent();
return selectGroupAndFindError('There was an error fetching value stream analytics stages.');
await findError('There was an error fetching value stream analytics stages.');
});
it('will display an error if the fetchStageData request fails', () => {
expect(findFlashError()).toBeNull();
it('will display an error if the fetchStageData request fails', async () => {
expect(await findFlashError()).toBeNull();
mockRequestCycleAnalyticsData({
mockFetchStageData: false,
});
mock
.onGet(mockData.endpoints.stageData)
.reply(httpStatusCodes.NOT_FOUND, { response: { status: httpStatusCodes.NOT_FOUND } });
await createComponent();
return selectGroupAndFindError('There was an error fetching data for the selected stage');
await findError('There was an error fetching data for the selected stage');
});
it('will display an error if the fetchTopRankedGroupLabels request fails', () => {
expect(findFlashError()).toBeNull();
it('will display an error if the fetchTopRankedGroupLabels request fails', async () => {
expect(await findFlashError()).toBeNull();
mockRequestCycleAnalyticsData({ mockFetchTopRankedGroupLabels: false });
mock
.onGet(mockData.endpoints.tasksByTypeTopLabelsData)
.reply(httpStatusCodes.NOT_FOUND, { response: { status: httpStatusCodes.NOT_FOUND } });
await createComponent();
return selectGroupAndFindError(
'There was an error fetching the top labels for the selected group',
);
await findError('There was an error fetching the top labels for the selected group');
});
it('will display an error if the fetchTasksByTypeData request fails', () => {
expect(findFlashError()).toBeNull();
it('will display an error if the fetchTasksByTypeData request fails', async () => {
expect(await findFlashError()).toBeNull();
mockRequestCycleAnalyticsData({ mockFetchTasksByTypeData: false });
mock
.onGet(mockData.endpoints.tasksByTypeData)
.reply(httpStatusCodes.NOT_FOUND, { response: { status: httpStatusCodes.NOT_FOUND } });
await createComponent();
return selectGroupAndFindError(
'There was an error fetching data for the tasks by type chart',
);
await findError('There was an error fetching data for the tasks by type chart');
});
it('will display an error if the fetchStageMedian request fails', () => {
expect(findFlashError()).toBeNull();
it('will display an error if the fetchStageMedian request fails', async () => {
expect(await findFlashError()).toBeNull();
mockRequestCycleAnalyticsData({
mockFetchStageMedian: false,
});
wrapper.vm.onGroupSelect(mockData.group);
mock
.onGet(mockData.endpoints.stageMedian)
.reply(httpStatusCodes.NOT_FOUND, { response: { status: httpStatusCodes.NOT_FOUND } });
await createComponent();
return waitForPromises().catch(() => {
expect(findFlashError().innerText.trim()).toEqual(
'There was an error while fetching value stream analytics data.',
await waitForPromises();
expect(await findFlashError().innerText.trim()).toEqual(
'There was an error fetching median data for stages',
);
});
});
});
describe('Url parameters', () => {
const fakeGroup = {
id: 2,
path: 'new-test',
fullPath: 'new-test-group',
name: 'New test group',
};
const defaultParams = {
created_after: toYmd(mockData.startDate),
created_before: toYmd(mockData.endDate),
group_id: selectedGroup.fullPath,
project_ids: null,
};
const selectedProjectIds = mockData.selectedProjects.map(({ id }) => id);
beforeEach(() => {
commonUtils.historyPushState = jest.fn();
urlUtils.mergeUrlParams = jest.fn();
mock = new MockAdapter(axios);
wrapper = createComponent();
wrapper.vm.$store.dispatch('initializeCycleAnalytics', initialCycleAnalyticsState);
});
it('sets the created_after and created_before url parameters', async () => {
await shouldMergeUrlParams(wrapper, defaultParams);
});
describe('with hideGroupDropDown=true', () => {
beforeEach(() => {
beforeEach(async () => {
commonUtils.historyPushState = jest.fn();
urlUtils.mergeUrlParams = jest.fn();
mock = new MockAdapter(axios);
mockRequiredRoutes(mock);
wrapper = await createComponent();
wrapper = createComponent({
props: {
hideGroupDropDown: true,
},
await store.dispatch('initializeCycleAnalytics', initialCycleAnalyticsState);
});
wrapper.vm.$store.dispatch('initializeCycleAnalytics', {
...initialCycleAnalyticsState,
group: fakeGroup,
});
});
it('sets the group_id url parameter', async () => {
await shouldMergeUrlParams(wrapper, {
...defaultParams,
created_after: toYmd(mockData.startDate),
created_before: toYmd(mockData.endDate),
group_id: null,
});
});
});
describe('with a group selected', () => {
beforeEach(() => {
wrapper.vm.$store.dispatch('setSelectedGroup', {
...fakeGroup,
});
});
it('sets the group_id url parameter', async () => {
await shouldMergeUrlParams(wrapper, {
...defaultParams,
group_id: fakeGroup.fullPath,
});
});
afterEach(() => {
wrapper.destroy();
mock.restore();
wrapper = null;
});
describe('with a group and selectedProjectIds set', () => {
beforeEach(() => {
wrapper.vm.$store.dispatch('setSelectedGroup', {
...selectedGroup,
it('sets the created_after and created_before url parameters', async () => {
await shouldMergeUrlParams(wrapper, defaultParams);
});
wrapper.vm.$store.dispatch('setSelectedProjects', mockData.selectedProjects);
return wrapper.vm.$nextTick();
describe('with selectedProjectIds set', () => {
beforeEach(async () => {
store.dispatch('setSelectedProjects', mockData.selectedProjects);
await wrapper.vm.$nextTick();
});
it('sets the project_ids url parameter', async () => {
......@@ -752,7 +671,6 @@ describe('Cycle Analytics component', () => {
...defaultParams,
created_after: toYmd(mockData.startDate),
created_before: toYmd(mockData.endDate),
group_id: selectedGroup.fullPath,
project_ids: selectedProjectIds,
});
});
......
ee/spec/frontend/analytics/cycle_analytics/mock_data.js
View file @ 8483dda7
......@@ -52,7 +52,7 @@ export const group = {
avatar_url: `${TEST_HOST}/images/home/nasa.svg`,
};
export const selectedGroup = convertObjectPropsToCamelCase(group, { deep: true });
export const currentGroup = convertObjectPropsToCamelCase(group, { deep: true });
const getStageByTitle = (stages, title) =>
stages.find(stage => stage.title && stage.title.toLowerCase().trim() === title) || {};
......@@ -189,7 +189,7 @@ export const tasksByTypeData = {
};
export const taskByTypeFilters = {
selectedGroup: {
currentGroup: {
id: 22,
name: 'Gitlab Org',
fullName: 'Gitlab Org',
......
ee/spec/frontend/analytics/cycle_analytics/store/actions_spec.js
View file @ 8483dda7
......@@ -7,7 +7,7 @@ import * as types from 'ee/analytics/cycle_analytics/store/mutation_types';
import { deprecatedCreateFlash as createFlash } from '~/flash';
import httpStatusCodes from '~/lib/utils/http_status';
import {
selectedGroup,
currentGroup,
allowedStages as stages,
startDate,
endDate,
......@@ -16,7 +16,7 @@ import {
valueStreams,
} from '../mock_data';
const group = { parentId: 'fake_group_parent_id', fullPath: 'fake_group_full_path' };
const group = { fullPath: 'fake_group_full_path' };
const milestonesPath = 'fake_milestones_path';
const labelsPath = 'fake_labels_path';
......@@ -33,12 +33,12 @@ const selectedStageSlug = selectedStage.slug;
const [selectedValueStream] = valueStreams;
const mockGetters = {
currentGroupPath: () => selectedGroup.fullPath,
currentGroupPath: () => currentGroup.fullPath,
currentValueStreamId: () => selectedValueStream.id,
};
const stageEndpoint = ({ stageId }) =>
`/groups/${selectedGroup.fullPath}/-/analytics/value_stream_analytics/value_streams/${selectedValueStream.id}/stages/${stageId}`;
`/groups/${currentGroup.fullPath}/-/analytics/value_stream_analytics/value_streams/${selectedValueStream.id}/stages/${stageId}`;
jest.mock('~/flash');
......@@ -68,7 +68,7 @@ describe('Cycle analytics actions', () => {
afterEach(() => {
mock.restore();
state = { ...state, selectedGroup: null };
state = { ...state, currentGroup: null };
});
it.each`
......@@ -106,52 +106,10 @@ describe('Cycle analytics actions', () => {
});
describe('setPaths', () => {
describe('with endpoint paths provided', () => {
it('dispatches the filters/setEndpoints action with enpoints', () => {
return testAction(
actions.setPaths,
{ group, milestonesPath, labelsPath },
state,
[],
[
{
type: 'filters/setEndpoints',
payload: {
groupEndpoint: 'fake_group_parent_id',
labelsEndpoint: 'fake_labels_path.json',
milestonesEndpoint: 'fake_milestones_path.json',
},
},
],
);
});
});
describe('without endpoint paths provided', () => {
it('dispatches the filters/setEndpoints action and prefers group.parentId', () => {
return testAction(
actions.setPaths,
{ group },
state,
[],
[
{
type: 'filters/setEndpoints',
payload: {
groupEndpoint: 'fake_group_parent_id',
labelsEndpoint: '/groups/fake_group_parent_id/-/labels.json',
milestonesEndpoint: '/groups/fake_group_parent_id/-/milestones.json',
},
},
],
);
});
it('dispatches the filters/setEndpoints action and uses group.fullPath', () => {
const { fullPath } = group;
return testAction(
actions.setPaths,
{ group: { fullPath } },
{ groupPath: group.fullPath, milestonesPath, labelsPath },
state,
[],
[
......@@ -159,35 +117,12 @@ describe('Cycle analytics actions', () => {
type: 'filters/setEndpoints',
payload: {
groupEndpoint: 'fake_group_full_path',
labelsEndpoint: '/groups/fake_group_full_path/-/labels.json',
milestonesEndpoint: '/groups/fake_group_full_path/-/milestones.json',
},
},
],
);
});
it.each([undefined, null, { parentId: null }, { fullPath: null }, {}])(
'group=%s will return empty string',
value => {
return testAction(
actions.setPaths,
{ group: value, milestonesPath, labelsPath },
state,
[],
[
{
type: 'filters/setEndpoints',
payload: {
groupEndpoint: '',
labelsEndpoint: 'fake_labels_path.json',
milestonesEndpoint: 'fake_milestones_path.json',
},
},
],
);
},
);
});
});
......@@ -205,34 +140,9 @@ describe('Cycle analytics actions', () => {
});
});
describe('setSelectedGroup', () => {
const { fullPath } = selectedGroup;
beforeEach(() => {
mock = new MockAdapter(axios);
});
it('commits the setSelectedGroup mutation', () => {
return testAction(
actions.setSelectedGroup,
{ full_path: fullPath },
state,
[{ type: types.SET_SELECTED_GROUP, payload: { full_path: fullPath } }],
[
{
type: 'filters/initialize',
payload: {
groupPath: fullPath,
},
},
],
);
});
});
describe('fetchStageData', () => {
beforeEach(() => {
state = { ...state, selectedGroup };
state = { ...state, currentGroup };
mock = new MockAdapter(axios);
mock.onGet(endpoints.stageData).reply(httpStatusCodes.OK, { events: [] });
});
......@@ -338,7 +248,7 @@ describe('Cycle analytics actions', () => {
}
beforeEach(() => {
state = { ...state, selectedGroup, startDate, endDate };
state = { ...state, currentGroup, startDate, endDate };
});
it(`dispatches actions for required value stream analytics analytics data`, () => {
......@@ -713,7 +623,7 @@ describe('Cycle analytics actions', () => {
beforeEach(() => {
mock.onDelete(stageEndpoint({ stageId })).replyOnce(httpStatusCodes.OK);
state = { selectedGroup };
state = { currentGroup };
});
it('dispatches fetchCycleAnalyticsData', () => {
......@@ -745,7 +655,7 @@ describe('Cycle analytics actions', () => {
const fetchMedianResponse = activeStages.map(({ slug: id }) => ({ events: [], id }));
beforeEach(() => {
state = { ...state, stages, selectedGroup };
state = { ...state, stages, currentGroup };
mock = new MockAdapter(axios);
mock.onGet(endpoints.stageMedian).reply(httpStatusCodes.OK, { events: [] });
mockDispatch = jest.fn();
......@@ -846,7 +756,7 @@ describe('Cycle analytics actions', () => {
let store;
const initialData = {
group: selectedGroup,
group: currentGroup,
projectIds: [1, 2],
};
......@@ -861,30 +771,29 @@ describe('Cycle analytics actions', () => {
};
});
describe('with no initialData', () => {
it('commits "INITIALIZE_CYCLE_ANALYTICS"', () =>
actions.initializeCycleAnalytics(store).then(() => {
expect(mockCommit).toHaveBeenCalledWith('INITIALIZE_CYCLE_ANALYTICS', {});
}));
describe('with only group in initialData', () => {
it('commits "INITIALIZE_CYCLE_ANALYTICS"', async () => {
await actions.initializeCycleAnalytics(store, { group });
expect(mockCommit).toHaveBeenCalledWith('INITIALIZE_CYCLE_ANALYTICS', { group });
});
it('dispatches "initializeCycleAnalyticsSuccess"', () =>
actions.initializeCycleAnalytics(store).then(() => {
expect(mockDispatch).not.toHaveBeenCalledWith('fetchCycleAnalyticsData');
expect(mockDispatch).toHaveBeenCalledWith('initializeCycleAnalyticsSuccess');
}));
it('dispatches "fetchCycleAnalyticsData" and "initializeCycleAnalyticsSuccess"', async () => {
await actions.initializeCycleAnalytics(store, { group });
expect(mockDispatch).toHaveBeenCalledWith('fetchCycleAnalyticsData');
});
});
describe('with initialData', () => {
it('dispatches "fetchCycleAnalyticsData" and "initializeCycleAnalyticsSuccess"', () =>
actions.initializeCycleAnalytics(store, initialData).then(() => {
it('dispatches "fetchCycleAnalyticsData" and "initializeCycleAnalyticsSuccess"', async () => {
await actions.initializeCycleAnalytics(store, initialData);
expect(mockDispatch).toHaveBeenCalledWith('fetchCycleAnalyticsData');
expect(mockDispatch).toHaveBeenCalledWith('initializeCycleAnalyticsSuccess');
}));
});
it('commits "INITIALIZE_CYCLE_ANALYTICS"', () =>
actions.initializeCycleAnalytics(store, initialData).then(() => {
it('commits "INITIALIZE_CYCLE_ANALYTICS"', async () => {
await actions.initializeCycleAnalytics(store, initialData);
expect(mockCommit).toHaveBeenCalledWith('INITIALIZE_CYCLE_ANALYTICS', initialData);
}));
});
});
});
......@@ -977,7 +886,7 @@ describe('Cycle analytics actions', () => {
const payload = { name: 'cool value stream' };
beforeEach(() => {
state = { selectedGroup };
state = { currentGroup };
});
describe('with no errors', () => {
......@@ -1030,7 +939,7 @@ describe('Cycle analytics actions', () => {
const payload = 'my-fake-value-stream';
beforeEach(() => {
state = { selectedGroup };
state = { currentGroup };
});
describe('with no errors', () => {
......@@ -1086,7 +995,7 @@ describe('Cycle analytics actions', () => {
state = {
...state,
stages: [{ slug: selectedStageSlug }],
selectedGroup,
currentGroup,
featureFlags: {
...state.featureFlags,
hasCreateMultipleValueStreams: true,
......@@ -1175,7 +1084,7 @@ describe('Cycle analytics actions', () => {
state = {
...state,
stages: [{ slug: selectedStageSlug }],
selectedGroup,
currentGroup,
featureFlags: {
...state.featureFlags,
hasCreateMultipleValueStreams: true,
......
ee/spec/frontend/analytics/cycle_analytics/store/getters_spec.js
View file @ 8483dda7
......@@ -63,11 +63,11 @@ describe('Cycle analytics getters', () => {
});
describe('currentGroupPath', () => {
describe('with selectedGroup set', () => {
describe('with currentGroup set', () => {
it('returns the `fullPath` value of the group', () => {
const fullPath = 'cool-beans';
state = {
selectedGroup: {
currentGroup: {
fullPath,
},
};
......@@ -76,9 +76,9 @@ describe('Cycle analytics getters', () => {
});
});
describe('without a selectedGroup set', () => {
describe('without a currentGroup set', () => {
it.each([[''], [{}], [null]])('given "%s" will return null', value => {
state = { selectedGroup: value };
state = { currentGroup: value };
expect(getters.currentGroupPath(state)).toEqual(null);
});
});
......@@ -88,7 +88,7 @@ describe('Cycle analytics getters', () => {
beforeEach(() => {
const fullPath = 'cool-beans';
state = {
selectedGroup: {
currentGroup: {
fullPath,
},
startDate,
......
ee/spec/frontend/analytics/cycle_analytics/store/modules/custom_stages/actions_spec.js
View file @ 8483dda7
......@@ -5,7 +5,7 @@ import * as actions from 'ee/analytics/cycle_analytics/store/modules/custom_stag
import * as types from 'ee/analytics/cycle_analytics/store/modules/custom_stages/mutation_types';
import { deprecatedCreateFlash as createFlash } from '~/flash';
import httpStatusCodes from '~/lib/utils/http_status';
import { selectedGroup, endpoints, rawCustomStage } from '../../../mock_data';
import { currentGroup, endpoints, rawCustomStage } from '../../../mock_data';
jest.mock('~/flash');
......@@ -25,7 +25,7 @@ describe('Custom stage actions', () => {
afterEach(() => {
mock.restore();
state = { selectedGroup: null };
state = { currentGroup: null };
});
describe('createStage', () => {
......@@ -37,7 +37,7 @@ describe('Custom stage actions', () => {
};
beforeEach(() => {
state = { ...state, selectedGroup };
state = { ...state, currentGroup };
mock.onPost(endpoints.baseStagesEndpointstageData).reply(201, customStageData);
});
......@@ -70,7 +70,7 @@ describe('Custom stage actions', () => {
};
beforeEach(() => {
state = { ...state, selectedGroup };
state = { ...state, currentGroup };
mock
.onPost(endpoints.baseStagesEndpointstageData)
.reply(httpStatusCodes.UNPROCESSABLE_ENTITY, {
......
ee/spec/frontend/analytics/cycle_analytics/store/mutations_spec.js
View file @ 8483dda7
......@@ -62,7 +62,6 @@ describe('Cycle analytics mutations', () => {
it.each`
mutation | payload | expectedState
${types.SET_FEATURE_FLAGS} | ${{ hasDurationChart: true }} | ${{ featureFlags: { hasDurationChart: true } }}
${types.SET_SELECTED_GROUP} | ${{ fullPath: 'cool-beans' }} | ${{ selectedGroup: { fullPath: 'cool-beans' }, selectedProjects: [] }}
${types.SET_SELECTED_PROJECTS} | ${selectedProjects} | ${{ selectedProjects }}
${types.SET_DATE_RANGE} | ${{ startDate, endDate }} | ${{ startDate, endDate }}
${types.SET_SELECTED_STAGE} | ${{ id: 'first-stage' }} | ${{ selectedStage: { id: 'first-stage' } }}
......@@ -176,7 +175,6 @@ describe('Cycle analytics mutations', () => {
it.each`
stateKey | expectedState
${'isLoading'} | ${true}
${'selectedGroup'} | ${initialData.group}
${'selectedProjects'} | ${initialData.selectedProjects}
${'startDate'} | ${initialData.createdAfter}
${'endDate'} | ${initialData.createdBefore}
......
locale/gitlab.pot
View file @ 8483dda7
......@@ -11147,6 +11147,9 @@ msgstr ""
msgid "Filter by user"
msgstr ""
msgid "Filter parameters are not valid. Make sure that the end date is after the start date."
msgstr ""
msgid "Filter pipelines"
msgstr ""
......@@ -24192,9 +24195,6 @@ msgstr ""
msgid "Start and due date"
msgstr ""
msgid "Start by choosing a group to see how your team is spending time. You can then drill down to the project level."
msgstr ""
msgid "Start by choosing a group to start exploring the merge requests in that group. You can then proceed to filter by projects, labels, milestones and authors."
msgstr ""
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7