diff options
Diffstat (limited to 'app/assets/javascripts/packages_and_registries/package_registry/components/details')
3 files changed, 21 insertions, 22 deletions
diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_history.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_history.vue index a1fc7563de1..663c361819e 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_history.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_history.vue @@ -159,9 +159,9 @@ export default { <history-item icon="commit" data-testid="first-pipeline-commit"> <gl-sprintf :message="$options.i18n.createdByCommitText"> <template #link> - <gl-link :href="firstPipeline.commitPath" @click="trackCommitClick" - >#{{ truncate(firstPipeline.sha) }}</gl-link - > + <gl-link :href="firstPipeline.commitPath" @click="trackCommitClick">{{ + truncate(firstPipeline.sha) + }}</gl-link> </template> <template #branch> <strong>{{ firstPipeline.ref }}</strong> @@ -212,9 +212,9 @@ export default { > <gl-sprintf :message="$options.i18n.combinedUpdateText"> <template #link> - <gl-link :href="pipeline.commitPath" @click="trackCommitClick" - >#{{ truncate(pipeline.sha) }}</gl-link - > + <gl-link :href="pipeline.commitPath" @click="trackCommitClick">{{ + truncate(pipeline.sha) + }}</gl-link> </template> <template #branch> <strong>{{ pipeline.ref }}</strong> 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/package_registry/components/details/pypi_installation.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/pypi_installation.vue index dd58f28a262..fdc6e75c932 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/pypi_installation.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/pypi_installation.vue @@ -30,7 +30,7 @@ export default { computed: { pypiPipCommand() { // eslint-disable-next-line @gitlab/require-i18n-strings - return `pip install ${this.packageEntity.name} --extra-index-url ${this.packageEntity.pypiUrl}`; + return `pip install ${this.packageEntity.name} --index-url ${this.packageEntity.pypiUrl}`; }, pypiSetupCommand() { return `[gitlab] |