From b5940f21204cf26afce6c28ba88b50c09728265f Mon Sep 17 00:00:00 2001 From: Eirik Haugstulen Date: Wed, 16 Oct 2024 14:52:40 +0200 Subject: [PATCH 1/2] fix: [DHIS2-17978] use title instead of alt on missing icons (#3847) * fix: use title instead of alt on missing icons * chore: fix failing tests --- cypress/e2e/MainPage/MainPage.js | 6 +++--- i18n/en.pot | 7 ++----- .../capture-ui/NonBundledIcon/NonBundledIcon.component.js | 4 +++- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/cypress/e2e/MainPage/MainPage.js b/cypress/e2e/MainPage/MainPage.js index a420c317b5..01a56c2777 100644 --- 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 index 9b56b6db68..b1a2483c15 100644 --- 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-10T14:29:59.249Z\n" -"PO-Revision-Date: 2024-10-10T14:29:59.249Z\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..." @@ -1071,9 +1071,6 @@ msgstr "Create new event" msgid "Search for a {{trackedEntityName}} in {{programName}}" msgstr "Search for a {{trackedEntityName}} in {{programName}}" -msgid "Back to list" -msgstr "Back to list" - msgid "No tracked entity types available" msgstr "No tracked entity types available" diff --git a/src/core_modules/capture-ui/NonBundledIcon/NonBundledIcon.component.js b/src/core_modules/capture-ui/NonBundledIcon/NonBundledIcon.component.js index dda968e42f..b906adcebb 100644 --- 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 = ({ {alternativeText} ) } From fba5ecbb357d6fe400e97c33fcb4ac3e045ec52f Mon Sep 17 00:00:00 2001 From: "@dhis2-bot" Date: Wed, 16 Oct 2024 12:57:01 +0000 Subject: [PATCH 2/2] chore(release): cut 101.12.1 [skip release] ## [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)) --- CHANGELOG.md | 7 +++++++ package.json | 4 ++-- packages/rules-engine/package.json | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 37bbf4c6df..b65ed71063 100644 --- 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/package.json b/package.json index b74f30b14d..1dbe671fc5 100644 --- 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 index 29135de7e9..776bf19801 100644 --- 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": {