From c06f7bf560778b524fc6e629cc2947754fa5bc99 Mon Sep 17 00:00:00 2001 From: Thomas Hutterer Date: Mon, 12 May 2025 14:20:23 +0200 Subject: [PATCH] Switch Package and Container Registry breadcrumbs to use singleNavOptIn See https://gitlab.com/gitlab-org/gitlab/-/issues/539583 --- .../container_registry/explorer/index.js | 9 ++++++++- .../packages_and_registries/package_registry/index.js | 9 ++++++++- .../shared/components/registry_breadcrumb.vue | 8 ++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/packages_and_registries/container_registry/explorer/index.js b/app/assets/javascripts/packages_and_registries/container_registry/explorer/index.js index ca5327c864ba45..2edef1c6a94884 100644 --- a/app/assets/javascripts/packages_and_registries/container_registry/explorer/index.js +++ b/app/assets/javascripts/packages_and_registries/container_registry/explorer/index.js @@ -92,7 +92,14 @@ export default () => { }); return { - attachBreadcrumb: () => injectVueAppBreadcrumbs(router, RegistryBreadcrumb, apolloProvider), + attachBreadcrumb: () => + injectVueAppBreadcrumbs( + router, + RegistryBreadcrumb, + apolloProvider, + {}, + { singleNavOptIn: true }, + ), attachMainComponent, }; }; diff --git a/app/assets/javascripts/packages_and_registries/package_registry/index.js b/app/assets/javascripts/packages_and_registries/package_registry/index.js index cbd781532f8bf1..2c8e93924b793e 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/index.js +++ b/app/assets/javascripts/packages_and_registries/package_registry/index.js @@ -51,7 +51,14 @@ export default () => { }); return { - attachBreadcrumb: () => injectVueAppBreadcrumbs(router, RegistryBreadcrumb, apolloProvider), + attachBreadcrumb: () => + injectVueAppBreadcrumbs( + router, + RegistryBreadcrumb, + apolloProvider, + {}, + { singleNavOptIn: true }, + ), attachMainComponent, }; }; diff --git a/app/assets/javascripts/packages_and_registries/shared/components/registry_breadcrumb.vue b/app/assets/javascripts/packages_and_registries/shared/components/registry_breadcrumb.vue index 568dee26e690d3..b2955ba515e03a 100644 --- a/app/assets/javascripts/packages_and_registries/shared/components/registry_breadcrumb.vue +++ b/app/assets/javascripts/packages_and_registries/shared/components/registry_breadcrumb.vue @@ -9,6 +9,13 @@ export default { components: { GlBreadcrumb, }, + props: { + staticBreadcrumbs: { + type: Object, + required: false, + default: () => ({ items: [] }), + }, + }, computed: { rootRoute() { return this.$router.options.routes.find((r) => r.meta.root); @@ -27,6 +34,7 @@ export default { }, allCrumbs() { const crumbs = [ + ...this.staticBreadcrumbs.items, { text: this.rootRoute.meta.nameGenerator(), to: this.rootRoute.path, -- GitLab