Merge branch 'master' of https://github.com/dhis2/capture-app into hv…

…/fix/DHIS2-16992_GiveChangelogModalAndColumsFixedSize
dhis2 · Oct 18, 2024 · 0d7e21b · 0d7e21b
2 parents ed68aef + fba5ecb
commit 0d7e21b
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [101.12.1](https://github.com/dhis2/capture-app/compare/v101.12.0...v101.12.1) (2024-10-16)
+
+
+### Bug Fixes
+
+* [DHIS2-17978] use title instead of alt on missing icons ([#3847](https://github.com/dhis2/capture-app/issues/3847)) ([b5940f2](https://github.com/dhis2/capture-app/commit/b5940f21204cf26afce6c28ba88b50c09728265f))
+
 # [101.12.0](https://github.com/dhis2/capture-app/compare/v101.11.2...v101.12.0) (2024-10-15)
 
 

diff --git a/cypress/e2e/MainPage/MainPage.js b/cypress/e2e/MainPage/MainPage.js
@@ -1,4 +1,4 @@
-import { Given, Then, defineStep as And } from '@badeball/cypress-cucumber-preprocessor';
+import { defineStep as And, Given, Then } from '@badeball/cypress-cucumber-preprocessor';
 
 Given('you are in the search page with Ngelehun and MNCH PNC context', () => {
     cy.visit('/#/search?orgUnitId=DiszpKrYNg8&programId=uy2gU8kT1jF');
@@ -20,13 +20,13 @@ And('you can load the view with the name Events assigned to me', () => {
 });
 
 Then('the icon is rendered as a custom icon', () => {
-    cy.get('[alt="child_program_positive"]')
+    cy.get('[title="child_program_positive"]')
         .invoke('attr', 'src')
         .should('match', /\/icons\/child_program_positive\/icon$/);
 });
 
 Then('the icon is rendered as an svg', () => {
-    cy.get('[alt="child_program_positive"]')
+    cy.get('[title="child_program_positive"]')
         .invoke('attr', 'src')
         .should('match', /\/icons\/child_program_positive\/icon.svg$/);
 });

diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-10-16T07:57:12.461Z\n"
-"PO-Revision-Date: 2024-10-16T07:57:12.461Z\n"
+"POT-Creation-Date: 2024-10-14T14:53:34.553Z\n"
+"PO-Revision-Date: 2024-10-14T14:53:34.553Z\n"
 
 msgid "Choose one or more dates..."
 msgstr "Choose one or more dates..."

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "101.12.0",
+    "version": "101.12.1",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "101.12.0",
+        "@dhis2/rules-engine-javascript": "101.12.1",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",

diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "101.12.0",
+    "version": "101.12.1",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {

diff --git a/src/core_modules/capture-ui/NonBundledIcon/NonBundledIcon.component.js b/src/core_modules/capture-ui/NonBundledIcon/NonBundledIcon.component.js
@@ -27,7 +27,9 @@ export const NonBundledIcon = ({
                     <img
                         className={classes.image}
                         src={source}
-                        alt={alternativeText}
+                        title={alternativeText}
+                        // add empty alt to avoid screen readers reading the url
+                        alt={''}
                     />
                 )
             }