From 40f7f3fa6d6b34dfbe2b0e7d8cce9f174d269b5a Mon Sep 17 00:00:00 2001 From: Gerardo Navarro <gerardo@b310.de> Date: Mon, 22 Apr 2024 16:08:16 +0200 Subject: [PATCH] fix: Avoids whitespace when displaying the version number - Prefer `v1.0.0` instead of `v 1.0.0` - Ensures no whitespace is used to display the version number - This improves the visual consistency of the package details page Changelog: fixed --- .../package_registry/components/details/package_title.vue | 4 +--- .../package_registry/pages/details.vue | 2 +- .../package_registry/components/details/package_title_spec.js | 2 +- .../package_registry/pages/details_spec.js | 2 +- 4 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_title.vue b/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_title.vue index db5e007b81ffa..c1534bf12ffed 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_title.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/components/details/package_title.vue @@ -81,9 +81,7 @@ export default { <template #sub-header> <div data-testid="sub-header" class="gl-display-flex gl-flex-wrap gl-gap-3"> <gl-sprintf :message="$options.i18n.packageInfo"> - <template #version> - {{ packageEntity.version }} - </template> + <template #version>{{ packageEntity.version }}</template> <template #timeAgo> <time-ago-tooltip v-if="packageEntity.createdAt" :time="packageEntity.createdAt" /> diff --git a/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue b/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue index a6089fdba52e6..28004ad47cf46 100644 --- a/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue +++ b/app/assets/javascripts/packages_and_registries/package_registry/pages/details.vue @@ -108,7 +108,7 @@ export default { }, result() { this.breadCrumbState.updateName( - `${this.packageEntity?.name} v ${this.packageEntity?.version}`, + `${this.packageEntity?.name} v${this.packageEntity?.version}`, ); }, }, diff --git a/spec/frontend/packages_and_registries/package_registry/components/details/package_title_spec.js b/spec/frontend/packages_and_registries/package_registry/components/details/package_title_spec.js index 7fe8db1c2f749..c2e10d75fc083 100644 --- a/spec/frontend/packages_and_registries/package_registry/components/details/package_title_spec.js +++ b/spec/frontend/packages_and_registries/package_registry/components/details/package_title_spec.js @@ -123,7 +123,7 @@ describe('PackageTitle', () => { it('has a text showing version', async () => { await createComponent(); - expect(findSubHeaderText().text()).toMatchInterpolatedText('v 1.0.0 published'); + expect(findSubHeaderText().text()).toMatchInterpolatedText('v1.0.0 published'); }); it('has a time ago tooltip component', async () => { diff --git a/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js b/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js index c936af112f82b..554f7f2feb8de 100644 --- a/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js +++ b/spec/frontend/packages_and_registries/package_registry/pages/details_spec.js @@ -212,7 +212,7 @@ describe('PackagesApp', () => { await waitForPromises(); - expect(breadCrumbState.updateName).toHaveBeenCalledWith(`${name} v ${version}`); + expect(breadCrumbState.updateName).toHaveBeenCalledWith(`${name} v${version}`); }); describe('delete package', () => { -- GitLab