diff options
Diffstat (limited to 'app/assets/javascripts/packages/list')
4 files changed, 22 insertions, 7 deletions
diff --git a/app/assets/javascripts/packages/list/components/packages_list.vue b/app/assets/javascripts/packages/list/components/packages_list.vue index b26c6087e14..7067f70a923 100644 --- a/app/assets/javascripts/packages/list/components/packages_list.vue +++ b/app/assets/javascripts/packages/list/components/packages_list.vue @@ -82,11 +82,11 @@ export default { </script> <template> - <div class="d-flex flex-column"> + <div class="gl-display-flex gl-flex-direction-column"> <slot v-if="isListEmpty && !isLoading" name="empty-state"></slot> <div v-else-if="isLoading"> - <packages-list-loader :is-group="isGroupPage" /> + <packages-list-loader /> </div> <template v-else> @@ -106,7 +106,7 @@ export default { :per-page="perPage" :total-items="totalItems" align="center" - class="w-100 mt-2" + class="gl-w-full gl-mt-3" /> <gl-modal diff --git a/app/assets/javascripts/packages/list/components/packages_list_app.vue b/app/assets/javascripts/packages/list/components/packages_list_app.vue index ef242ea5f75..6304f723f6a 100644 --- a/app/assets/javascripts/packages/list/components/packages_list_app.vue +++ b/app/assets/javascripts/packages/list/components/packages_list_app.vue @@ -2,11 +2,14 @@ import { mapActions, mapState } from 'vuex'; import { GlEmptyState, GlTab, GlTabs, GlLink, GlSprintf } from '@gitlab/ui'; import { s__, sprintf } from '~/locale'; +import createFlash from '~/flash'; import PackageFilter from './packages_filter.vue'; import PackageList from './packages_list.vue'; import PackageSort from './packages_sort.vue'; -import { PACKAGE_REGISTRY_TABS } from '../constants'; +import { PACKAGE_REGISTRY_TABS, DELETE_PACKAGE_SUCCESS_MESSAGE } from '../constants'; import PackagesComingSoon from '../coming_soon/packages_coming_soon.vue'; +import { SHOW_DELETE_SUCCESS_ALERT } from '~/packages/shared/constants'; +import { historyReplaceState } from '~/lib/utils/common_utils'; export default { components: { @@ -34,6 +37,7 @@ export default { }, mounted() { this.requestPackagesList(); + this.checkDeleteAlert(); }, methods: { ...mapActions(['requestPackagesList', 'requestDeletePackage', 'setSelectedType']), @@ -64,6 +68,16 @@ export default { return s__('PackageRegistry|There are no packages yet'); }, + checkDeleteAlert() { + const urlParams = new URLSearchParams(window.location.search); + const showAlert = urlParams.get(SHOW_DELETE_SUCCESS_ALERT); + if (showAlert) { + // to be refactored to use gl-alert + createFlash({ message: DELETE_PACKAGE_SUCCESS_MESSAGE, type: 'notice' }); + const cleanUrl = window.location.href.split('?')[0]; + historyReplaceState(cleanUrl); + } + }, }, i18n: { widenFilters: s__('PackageRegistry|To widen your search, change or remove the filters above.'), @@ -77,7 +91,9 @@ export default { <template> <gl-tabs @input="tabChanged"> <template #tabs-end> - <div class="d-flex align-self-center ml-md-auto py-1 py-md-0"> + <div + class="gl-display-flex gl-align-self-center gl-py-2 gl-flex-grow-1 gl-justify-content-end" + > <package-filter class="mr-1" @filter="requestPackagesList" /> <package-sort @sort:changed="requestPackagesList" /> </div> diff --git a/app/assets/javascripts/packages/list/constants.js b/app/assets/javascripts/packages/list/constants.js index 510d04965cb..0ff8c86362d 100644 --- a/app/assets/javascripts/packages/list/constants.js +++ b/app/assets/javascripts/packages/list/constants.js @@ -5,7 +5,6 @@ export const FETCH_PACKAGES_LIST_ERROR_MESSAGE = __( 'Something went wrong while fetching the packages list.', ); export const FETCH_PACKAGE_ERROR_MESSAGE = __('Something went wrong while fetching the package.'); -export const DELETE_PACKAGE_ERROR_MESSAGE = __('Something went wrong while deleting the package.'); export const DELETE_PACKAGE_SUCCESS_MESSAGE = __('Package deleted successfully'); export const DEFAULT_PAGE = 1; diff --git a/app/assets/javascripts/packages/list/stores/actions.js b/app/assets/javascripts/packages/list/stores/actions.js index 0ed24aee2c5..bbc11e3cf13 100644 --- a/app/assets/javascripts/packages/list/stores/actions.js +++ b/app/assets/javascripts/packages/list/stores/actions.js @@ -1,10 +1,10 @@ import Api from '~/api'; import axios from '~/lib/utils/axios_utils'; import { deprecatedCreateFlash as createFlash } from '~/flash'; +import { DELETE_PACKAGE_ERROR_MESSAGE } from '~/packages/shared/constants'; import * as types from './mutation_types'; import { FETCH_PACKAGES_LIST_ERROR_MESSAGE, - DELETE_PACKAGE_ERROR_MESSAGE, DELETE_PACKAGE_SUCCESS_MESSAGE, DEFAULT_PAGE, DEFAULT_PAGE_SIZE, |