Moves table pagination component
Move the table paginaiton component under the new pagination folder in vue shared components and updates all the paths
This commit is contained in:
parent
e206e66bbb
commit
442dce052a
8 changed files with 11 additions and 6 deletions
|
@ -2,7 +2,7 @@
|
||||||
import PipelinesService from '../../pipelines/services/pipelines_service';
|
import PipelinesService from '../../pipelines/services/pipelines_service';
|
||||||
import PipelineStore from '../../pipelines/stores/pipelines_store';
|
import PipelineStore from '../../pipelines/stores/pipelines_store';
|
||||||
import pipelinesMixin from '../../pipelines/mixins/pipelines';
|
import pipelinesMixin from '../../pipelines/mixins/pipelines';
|
||||||
import TablePagination from '../../vue_shared/components/table_pagination.vue';
|
import TablePagination from '../../vue_shared/components/pagination/table_pagination.vue';
|
||||||
import { getParameterByName } from '../../lib/utils/common_utils';
|
import { getParameterByName } from '../../lib/utils/common_utils';
|
||||||
import CIPaginationMixin from '../../vue_shared/mixins/ci_pagination_api_mixin';
|
import CIPaginationMixin from '../../vue_shared/mixins/ci_pagination_api_mixin';
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<script>
|
<script>
|
||||||
import { GlLoadingIcon } from '@gitlab/ui';
|
import { GlLoadingIcon } from '@gitlab/ui';
|
||||||
import TablePagination from '~/vue_shared/components/table_pagination.vue';
|
import TablePagination from '~/vue_shared/components/pagination/table_pagination.vue';
|
||||||
import containerMixin from 'ee_else_ce/environments/mixins/container_mixin';
|
import containerMixin from 'ee_else_ce/environments/mixins/container_mixin';
|
||||||
import EnvironmentTable from '../components/environments_table.vue';
|
import EnvironmentTable from '../components/environments_table.vue';
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@ import Flash from '../../flash';
|
||||||
import eventHub from '../event_hub';
|
import eventHub from '../event_hub';
|
||||||
|
|
||||||
import EnvironmentsService from '../services/environments_service';
|
import EnvironmentsService from '../services/environments_service';
|
||||||
import tablePagination from '../../vue_shared/components/table_pagination.vue';
|
import tablePagination from '../../vue_shared/components/pagination/table_pagination.vue';
|
||||||
import environmentTable from '../components/environments_table.vue';
|
import environmentTable from '../components/environments_table.vue';
|
||||||
import tabs from '../../vue_shared/components/navigation_tabs.vue';
|
import tabs from '../../vue_shared/components/navigation_tabs.vue';
|
||||||
import container from '../components/container.vue';
|
import container from '../components/container.vue';
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { __, sprintf, s__ } from '../../locale';
|
||||||
import createFlash from '../../flash';
|
import createFlash from '../../flash';
|
||||||
import PipelinesService from '../services/pipelines_service';
|
import PipelinesService from '../services/pipelines_service';
|
||||||
import pipelinesMixin from '../mixins/pipelines';
|
import pipelinesMixin from '../mixins/pipelines';
|
||||||
import TablePagination from '../../vue_shared/components/table_pagination.vue';
|
import TablePagination from '../../vue_shared/components/pagination/table_pagination.vue';
|
||||||
import NavigationTabs from '../../vue_shared/components/navigation_tabs.vue';
|
import NavigationTabs from '../../vue_shared/components/navigation_tabs.vue';
|
||||||
import NavigationControls from './nav_controls.vue';
|
import NavigationControls from './nav_controls.vue';
|
||||||
import { getParameterByName } from '../../lib/utils/common_utils';
|
import { getParameterByName } from '../../lib/utils/common_utils';
|
||||||
|
|
|
@ -4,7 +4,7 @@ import { GlButton, GlTooltipDirective } from '@gitlab/ui';
|
||||||
import { n__ } from '../../locale';
|
import { n__ } from '../../locale';
|
||||||
import createFlash from '../../flash';
|
import createFlash from '../../flash';
|
||||||
import ClipboardButton from '../../vue_shared/components/clipboard_button.vue';
|
import ClipboardButton from '../../vue_shared/components/clipboard_button.vue';
|
||||||
import TablePagination from '../../vue_shared/components/table_pagination.vue';
|
import TablePagination from '../../vue_shared/components/pagination/table_pagination.vue';
|
||||||
import Icon from '../../vue_shared/components/icon.vue';
|
import Icon from '../../vue_shared/components/icon.vue';
|
||||||
import timeagoMixin from '../../vue_shared/mixins/timeago';
|
import timeagoMixin from '../../vue_shared/mixins/timeago';
|
||||||
import { errorMessages, errorMessagesTypes } from '../constants';
|
import { errorMessages, errorMessagesTypes } from '../constants';
|
||||||
|
|
5
changelogs/unreleased/62788-clean-up-pagination.yml
Normal file
5
changelogs/unreleased/62788-clean-up-pagination.yml
Normal file
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Moves the table pagination shared component
|
||||||
|
merge_request:
|
||||||
|
author:
|
||||||
|
type: other
|
|
@ -1,5 +1,5 @@
|
||||||
import Vue from 'vue';
|
import Vue from 'vue';
|
||||||
import paginationComp from '~/vue_shared/components/table_pagination.vue';
|
import paginationComp from '~/vue_shared/components/pagination/table_pagination.vue';
|
||||||
|
|
||||||
describe('Pagination component', () => {
|
describe('Pagination component', () => {
|
||||||
let component;
|
let component;
|
||||||
|
|
Loading…
Reference in a new issue