diff --git a/app/assets/javascripts/gitlab_version_check/components/security_patch_upgrade_alert_modal.vue b/app/assets/javascripts/gitlab_version_check/components/security_patch_upgrade_alert_modal.vue
index 4638ba8a26857887890cfc2ff60a03015335ae34..337b53047e92d3e3817445ec026ce4a359a8196c 100644
--- a/app/assets/javascripts/gitlab_version_check/components/security_patch_upgrade_alert_modal.vue
+++ b/app/assets/javascripts/gitlab_version_check/components/security_patch_upgrade_alert_modal.vue
@@ -23,6 +23,9 @@ export default {
modalBodyStableVersions: s__(
'VersionCheck|You are currently on version %{currentVersion}! We strongly recommend upgrading your GitLab installation to one of the following versions immediately: %{latestStableVersions}.',
),
+ additionalAvailablePatch: s__(
+ 'VersionCheck|Additionally, there is an available stable patch for your current GitLab minor version: %{latestStableVersionOfMinor}',
+ ),
modalDetails: s__('VersionCheck|%{details}'),
learnMore: s__('VersionCheck|Learn more about this critical security release.'),
primaryButtonText: s__('VersionCheck|Upgrade now'),
@@ -53,6 +56,11 @@ export default {
required: false,
default: () => [],
},
+ latestStableVersionOfMinor: {
+ type: String,
+ required: false,
+ default: '',
+ },
},
data() {
return {
@@ -76,6 +84,12 @@ export default {
latestStableVersionsStrings() {
return this.latestStableVersions?.length > 0 ? this.latestStableVersions.join(', ') : '';
},
+ showLatestStableVersionOfMinor() {
+ return (
+ this.latestStableVersionOfMinor &&
+ !this.latestStableVersionsStrings.includes(this.latestStableVersionOfMinor)
+ );
+ },
},
created() {
if (getHideAlertModalCookie(this.currentVersion)) {
@@ -136,6 +150,13 @@ export default {
<span class="gl-font-weight-bold">{{ latestStableVersionsStrings }}</span>
</template>
</gl-sprintf>
+ <div v-if="showLatestStableVersionOfMinor" class="gl-mt-6">
+ <gl-sprintf :message="$options.i18n.additionalAvailablePatch">
+ <template #latestStableVersionOfMinor>
+ <span class="gl-font-weight-bold">{{ latestStableVersionOfMinor }}</span>
+ </template>
+ </gl-sprintf>
+ </div>
</div>
<div v-if="details" data-testid="alert-modal-details" class="gl-mb-6">
{{ modalDetails }}
diff --git a/app/assets/javascripts/gitlab_version_check/index.js b/app/assets/javascripts/gitlab_version_check/index.js
index dff09d2cb5156c10b6362058b975901f72c8c47a..9d442e45bbf68aac6dc6ae7a3d4004d912827f2a 100644
--- a/app/assets/javascripts/gitlab_version_check/index.js
+++ b/app/assets/javascripts/gitlab_version_check/index.js
@@ -36,7 +36,11 @@ const mountSecurityPatchUpgradeAlertModal = (el) => {
const { currentVersion, version } = el.dataset;
try {
- const { details, latestStableVersions } = convertObjectPropsToCamelCase(JSON.parse(version));
+ const {
+ details,
+ latestStableVersions,
+ latestStableVersionOfMinor,
+ } = convertObjectPropsToCamelCase(JSON.parse(version));
return new Vue({
el,
@@ -46,6 +50,7 @@ const mountSecurityPatchUpgradeAlertModal = (el) => {
currentVersion,
details,
latestStableVersions,
+ latestStableVersionOfMinor,
},
});
},
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 34f6cf6b0c2df6f4f159ef3af3009cfdbccd162f..b3bfb43e5257f041ca29357f5d3d34266e4884b2 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -54182,6 +54182,9 @@ msgstr ""
msgid "VersionCheck|%{details}"
msgstr ""
+msgid "VersionCheck|Additionally, there is an available stable patch for your current GitLab minor version: %{latestStableVersionOfMinor}"
+msgstr ""
+
msgid "VersionCheck|Important notice - Critical security release"
msgstr ""
diff --git a/spec/frontend/gitlab_version_check/components/security_patch_upgrade_alert_modal_spec.js b/spec/frontend/gitlab_version_check/components/security_patch_upgrade_alert_modal_spec.js
index b1a1d2d137200972670b4a7617f0cd58d58093bd..ea859eb7b3f080b4aee58b9266a57aa43dfab5f6 100644
--- a/spec/frontend/gitlab_version_check/components/security_patch_upgrade_alert_modal_spec.js
+++ b/spec/frontend/gitlab_version_check/components/security_patch_upgrade_alert_modal_spec.js
@@ -2,7 +2,6 @@ import { GlModal, GlLink, GlSprintf } from '@gitlab/ui';
import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
import { mockTracking, unmockTracking } from 'helpers/tracking_helper';
import { stubComponent, RENDER_ALL_SLOTS_TEMPLATE } from 'helpers/stub_component';
-import { sprintf } from '~/locale';
import SecurityPatchUpgradeAlertModal from '~/gitlab_version_check/components/security_patch_upgrade_alert_modal.vue';
import * as utils from '~/gitlab_version_check/utils';
import {
@@ -16,7 +15,6 @@ describe('SecurityPatchUpgradeAlertModal', () => {
let wrapper;
let trackingSpy;
const hideMock = jest.fn();
- const { i18n } = SecurityPatchUpgradeAlertModal;
const defaultProps = {
currentVersion: '11.1.1',
@@ -72,14 +70,12 @@ describe('SecurityPatchUpgradeAlertModal', () => {
});
it('renders the modal title correctly', () => {
- expect(findGlModalTitle().text()).toBe(i18n.modalTitle);
+ expect(findGlModalTitle().text()).toBe('Important notice - Critical security release');
});
it('renders modal body without suggested versions', () => {
expect(findGlModalBody().text()).toBe(
- sprintf(i18n.modalBodyNoStableVersions, {
- currentVersion: defaultProps.currentVersion,
- }),
+ `You are currently on version ${defaultProps.currentVersion}! We strongly recommend upgrading your GitLab installation immediately.`,
);
});
@@ -99,7 +95,7 @@ describe('SecurityPatchUpgradeAlertModal', () => {
describe('Learn more link', () => {
it('renders with correct text and link', () => {
- expect(findGlLink().text()).toBe(i18n.learnMore);
+ expect(findGlLink().text()).toBe('Learn more about this critical security release.');
expect(findGlLink().attributes('href')).toBe(ABOUT_RELEASES_PAGE);
});
@@ -112,7 +108,7 @@ describe('SecurityPatchUpgradeAlertModal', () => {
describe('Remind me button', () => {
it('renders with correct text', () => {
- expect(findGlRemindButton().text()).toBe(i18n.secondaryButtonText);
+ expect(findGlRemindButton().text()).toBe('Remind me again in 3 days');
});
it(`tracks click ${TRACKING_LABELS.REMIND_ME_BTN} when clicked`, async () => {
@@ -137,7 +133,7 @@ describe('SecurityPatchUpgradeAlertModal', () => {
describe('Upgrade button', () => {
it('renders with correct text and link', () => {
- expect(findGlUpgradeButton().text()).toBe(i18n.primaryButtonText);
+ expect(findGlUpgradeButton().text()).toBe('Upgrade now');
expect(findGlUpgradeButton().attributes('href')).toBe(UPGRADE_DOCS_URL);
});
@@ -165,10 +161,11 @@ describe('SecurityPatchUpgradeAlertModal', () => {
it('renders modal body with suggested versions', () => {
expect(findGlModalBody().text()).toBe(
- sprintf(i18n.modalBodyStableVersions, {
- currentVersion: defaultProps.currentVersion,
- latestStableVersions: latestStableVersions.join(', '),
- }),
+ `You are currently on version ${
+ defaultProps.currentVersion
+ }! We strongly recommend upgrading your GitLab installation to one of the following versions immediately: ${latestStableVersions.join(
+ ', ',
+ )}.`,
);
});
});
@@ -181,7 +178,53 @@ describe('SecurityPatchUpgradeAlertModal', () => {
});
it('renders modal details', () => {
- expect(findGlModalDetails().text()).toBe(sprintf(i18n.modalDetails, { details }));
+ expect(findGlModalDetails().text()).toBe(details);
+ });
+ });
+
+ describe('template with latestStableVersionOfMinor', () => {
+ describe('when value is null', () => {
+ const latestStableVersionOfMinor = null;
+
+ beforeEach(() => {
+ createComponent({ latestStableVersionOfMinor });
+ });
+
+ it('does not render the additional text', () => {
+ expect(findGlModalBody().text()).not.toContain(
+ `Additionally, there is an available stable patch for your current GitLab minor version: ${latestStableVersionOfMinor}`,
+ );
+ });
+ });
+
+ describe('when value is already included in latestStableVersions', () => {
+ const latestStableVersionOfMinor = '11.1.2';
+ const latestStableVersions = ['11.3.1', '11.2.1', '11.1.2'];
+
+ beforeEach(() => {
+ createComponent({ latestStableVersionOfMinor, latestStableVersions });
+ });
+
+ it('does not render the additional text', () => {
+ expect(findGlModalBody().text()).not.toContain(
+ `Additionally, there is an available stable patch for your current GitLab minor version: ${latestStableVersionOfMinor}`,
+ );
+ });
+ });
+
+ describe('when value is not already included in latestStableVersions', () => {
+ const latestStableVersionOfMinor = '11.1.2';
+ const latestStableVersions = ['11.4.1', '11.3.1', '11.2.1'];
+
+ beforeEach(() => {
+ createComponent({ latestStableVersionOfMinor, latestStableVersions });
+ });
+
+ it('does render the additional text', () => {
+ expect(findGlModalBody().text()).toContain(
+ `Additionally, there is an available stable patch for your current GitLab minor version: ${latestStableVersionOfMinor}`,
+ );
+ });
});
});