Commit 9fe409eb authored by Enrique Alcántara's avatar Enrique Alcántara

Merge branch '326704-cleanup-stage-table' into 'master'

Rename StageTableNew to StageTable

See merge request gitlab-org/gitlab!62385
parents 23551042 3e34bc48
...@@ -11,7 +11,7 @@ import DurationChart from './duration_chart.vue'; ...@@ -11,7 +11,7 @@ import DurationChart from './duration_chart.vue';
import FilterBar from './filter_bar.vue'; import FilterBar from './filter_bar.vue';
import Metrics from './metrics.vue'; import Metrics from './metrics.vue';
import PathNavigation from './path_navigation.vue'; import PathNavigation from './path_navigation.vue';
import StageTableNew from './stage_table_new.vue'; import StageTable from './stage_table.vue';
import TypeOfWorkCharts from './type_of_work_charts.vue'; import TypeOfWorkCharts from './type_of_work_charts.vue';
import ValueStreamSelect from './value_stream_select.vue'; import ValueStreamSelect from './value_stream_select.vue';
...@@ -23,7 +23,7 @@ export default { ...@@ -23,7 +23,7 @@ export default {
GlEmptyState, GlEmptyState,
ProjectsDropdownFilter, ProjectsDropdownFilter,
TypeOfWorkCharts, TypeOfWorkCharts,
StageTableNew, StageTable,
PathNavigation, PathNavigation,
FilterBar, FilterBar,
ValueStreamSelect, ValueStreamSelect,
...@@ -237,7 +237,7 @@ export default { ...@@ -237,7 +237,7 @@ export default {
/> />
<type-of-work-charts /> <type-of-work-charts />
</template> </template>
<stage-table-new <stage-table
v-else v-else
:is-loading="isLoading || isLoadingStage" :is-loading="isLoading || isLoadingStage"
:stage-events="currentStageEvents" :stage-events="currentStageEvents"
......
...@@ -31,7 +31,7 @@ const WORKFLOW_COLUMN_TITLES = { ...@@ -31,7 +31,7 @@ const WORKFLOW_COLUMN_TITLES = {
}; };
export default { export default {
name: 'StageTableNew', name: 'StageTable',
components: { components: {
GlEmptyState, GlEmptyState,
GlIcon, GlIcon,
......
...@@ -8,7 +8,7 @@ import DurationChart from 'ee/analytics/cycle_analytics/components/duration_char ...@@ -8,7 +8,7 @@ import DurationChart from 'ee/analytics/cycle_analytics/components/duration_char
import FilterBar from 'ee/analytics/cycle_analytics/components/filter_bar.vue'; import FilterBar from 'ee/analytics/cycle_analytics/components/filter_bar.vue';
import Metrics from 'ee/analytics/cycle_analytics/components/metrics.vue'; import Metrics from 'ee/analytics/cycle_analytics/components/metrics.vue';
import PathNavigation from 'ee/analytics/cycle_analytics/components/path_navigation.vue'; import PathNavigation from 'ee/analytics/cycle_analytics/components/path_navigation.vue';
import StageTableNew from 'ee/analytics/cycle_analytics/components/stage_table_new.vue'; import StageTable from 'ee/analytics/cycle_analytics/components/stage_table.vue';
import TypeOfWorkCharts from 'ee/analytics/cycle_analytics/components/type_of_work_charts.vue'; import TypeOfWorkCharts from 'ee/analytics/cycle_analytics/components/type_of_work_charts.vue';
import ValueStreamSelect from 'ee/analytics/cycle_analytics/components/value_stream_select.vue'; import ValueStreamSelect from 'ee/analytics/cycle_analytics/components/value_stream_select.vue';
import { OVERVIEW_STAGE_ID } from 'ee/analytics/cycle_analytics/constants'; import { OVERVIEW_STAGE_ID } from 'ee/analytics/cycle_analytics/constants';
...@@ -167,7 +167,7 @@ describe('Value Stream Analytics component', () => { ...@@ -167,7 +167,7 @@ describe('Value Stream Analytics component', () => {
}; };
const displaysStageTable = (flag) => { const displaysStageTable = (flag) => {
expect(wrapper.findComponent(StageTableNew).exists()).toBe(flag); expect(wrapper.findComponent(StageTable).exists()).toBe(flag);
}; };
const displaysDurationChart = (flag) => { const displaysDurationChart = (flag) => {
......
import { GlEmptyState, GlLoadingIcon, GlTable } from '@gitlab/ui'; import { GlEmptyState, GlLoadingIcon, GlTable } from '@gitlab/ui';
import { shallowMount, mount } from '@vue/test-utils'; import { shallowMount, mount } from '@vue/test-utils';
import StageTableNew from 'ee/analytics/cycle_analytics/components/stage_table_new.vue'; import StageTable from 'ee/analytics/cycle_analytics/components/stage_table.vue';
import { PAGINATION_SORT_FIELD_DURATION } from 'ee/analytics/cycle_analytics/constants'; import { PAGINATION_SORT_FIELD_DURATION } from 'ee/analytics/cycle_analytics/constants';
import { extendedWrapper } from 'helpers/vue_test_utils_helper'; import { extendedWrapper } from 'helpers/vue_test_utils_helper';
import { import {
...@@ -33,7 +33,7 @@ const findStageEventTitle = (ev) => extendedWrapper(ev).findByTestId('vsa-stage- ...@@ -33,7 +33,7 @@ const findStageEventTitle = (ev) => extendedWrapper(ev).findByTestId('vsa-stage-
function createComponent(props = {}, shallow = false) { function createComponent(props = {}, shallow = false) {
const func = shallow ? shallowMount : mount; const func = shallow ? shallowMount : mount;
return extendedWrapper( return extendedWrapper(
func(StageTableNew, { func(StageTable, {
propsData: { propsData: {
isLoading: false, isLoading: false,
stageEvents: issueEvents, stageEvents: issueEvents,
......
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