diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-04 21:08:48 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-01-04 21:08:48 +0300 |
commit | 9c66c38ab6ce56cfe06eca21f717977f1684f08c (patch) | |
tree | 84fc6c7ebd49b8b6f73371b30b641d582fdb9725 /app/assets/javascripts/packages_and_registries | |
parent | 333d6f857ee7d329d4c53c874e6858679306442f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/packages_and_registries')
2 files changed, 19 insertions, 18 deletions
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_versions_list.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_versions_list.vue index efc60c9c037..787f21d9419 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_versions_list.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_versions_list.vue @@ -1,13 +1,13 @@ <script> -import { GlKeysetPagination } from '@gitlab/ui'; import VersionRow from '~/packages_and_registries/package_registry/components/details/version_row.vue'; import PackagesListLoader from '~/packages_and_registries/shared/components/packages_list_loader.vue'; +import RegistryList from '~/packages_and_registries/shared/components/registry_list.vue'; export default { components: { VersionRow, - GlKeysetPagination, PackagesListLoader, + RegistryList, }, props: { versions: { @@ -26,9 +26,6 @@ export default { }, }, computed: { - showPagination() { - return this.pageInfo.hasPreviousPage || this.pageInfo.hasNextPage; - }, isListEmpty() { return this.versions.length === 0; }, @@ -42,16 +39,18 @@ export default { </div> <slot v-else-if="isListEmpty" name="empty-state"></slot> <div v-else> - <version-row v-for="version in versions" :key="version.id" :package-entity="version" /> - <div class="gl-display-flex gl-justify-content-center"> - <gl-keyset-pagination - v-if="showPagination" - v-bind="pageInfo" - class="gl-mt-3" - @prev="$emit('prev-page')" - @next="$emit('next-page')" - /> - </div> + <registry-list + :hidden-delete="true" + :is-loading="isLoading" + :items="versions" + :pagination="pageInfo" + @prev-page="$emit('prev-page')" + @next-page="$emit('next-page')" + > + <template #default="{ item }"> + <version-row :package-entity="item" /> + </template> + </registry-list> </div> </div> </template> diff --git a/app/assets/javascripts/packages_and_registries/shared/components/registry_list.vue b/app/assets/javascripts/packages_and_registries/shared/components/registry_list.vue index cc345fda7e8..d07d0a7673f 100644 --- a/app/assets/javascripts/packages_and_registries/shared/components/registry_list.vue +++ b/app/assets/javascripts/packages_and_registries/shared/components/registry_list.vue @@ -87,13 +87,15 @@ export default { <template> <div> - <div class="gl-display-flex gl-justify-content-space-between gl-mb-3 gl-align-items-center"> - <gl-form-checkbox v-if="!hiddenDelete" v-model="selectAll" class="gl-ml-2 gl-pt-2"> + <div + v-if="!hiddenDelete" + class="gl-display-flex gl-justify-content-space-between gl-mb-3 gl-align-items-center" + > + <gl-form-checkbox v-model="selectAll" class="gl-ml-2 gl-pt-2"> <span class="gl-font-weight-bold">{{ title }}</span> </gl-form-checkbox> <gl-button - v-if="!hiddenDelete" :disabled="disableDeleteButton" category="secondary" variant="danger" |