From 7312151f36ff14d49a81783c47ef36eadc0d3372 Mon Sep 17 00:00:00 2001 From: aaronskiba <71047780+aaronskiba@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:17:00 -0700 Subject: [PATCH 1/3] Call getConstant() after constants.js callback Prior to this commit, requiredField.js was calling getConstant('REQUIRED_FIELD_TEXT') before the constant was loaded to constants.js. As a result, `asterisk` was evaluating to `undefined`. --- app/javascript/src/utils/requiredField.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/javascript/src/utils/requiredField.js b/app/javascript/src/utils/requiredField.js index 6b4995e65a..10833f8e45 100644 --- a/app/javascript/src/utils/requiredField.js +++ b/app/javascript/src/utils/requiredField.js @@ -1,7 +1,7 @@ import getConstant from './constants'; import { isObject } from './isType'; -const asterisk = `* `; +var asterisk; export const addAsterisk = (el) => { const target = $(el); @@ -32,5 +32,6 @@ export const addAsterisks = (el) => { }; $(() => { + asterisk = `* `; addAsterisks('body'); }); From 83f16f8b9e77a88bc0eb07851fbdbbcf52c0034c Mon Sep 17 00:00:00 2001 From: aaronskiba <71047780+aaronskiba@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:19:39 -0700 Subject: [PATCH 2/3] Put back constant for passwordHelper.js getConstant('VALIDATION_MESSAGE_PASSWORDS_MATCH') still exists in passwordhelper.js Was previously removed here: https://github.com/portagenetwork/roadmap/commit/33a60587b5ad60f3dcc1d7864cae5b94a7b7e7a0 --- app/views/layouts/application.html.erb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 687385e6a9..491e2d8039 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -118,6 +118,7 @@ MAX_NUMBER_GUIDANCE_SELECTIONS: 6, REQUIRED_FIELD_TEXT: _('This field is required.'), + VALIDATION_MESSAGE_PASSWORDS_MATCH: _('The passwords must match.'), SHOW_PASSWORD_MESSAGE: _('Show password'), SHOW_SELECT_ORG_MESSAGE: _('Select an organisation from the list.'), From 831d6d34a0f70fdce9fc1ba1d8c675deef03ea98 Mon Sep 17 00:00:00 2001 From: aaronskiba <71047780+aaronskiba@users.noreply.github.com> Date: Wed, 27 Mar 2024 11:13:40 -0600 Subject: [PATCH 3/3] Update CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 963208c31d..9ecca00727 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -150,6 +150,7 @@ We sometimes use the button native Dom element to programmatically click, as the ### Fixed - Fixed rubocop errors after Bootstrap upgrade - Fixed RSpec tests after Bootstrap upgrade +- Fix "undefined" Tooltip Messages [#3364](https://github.com/DMPRoadmap/roadmap/pull/3364) ## V4.1.1