Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into eh/feat/DHIS2-18250…
Browse files Browse the repository at this point in the history
…-breadcrumb-navigation-bar

# Conflicts:
#	i18n/en.pot
  • Loading branch information
eirikhaugstulen committed Oct 17, 2024
2 parents 4d7024d + fba5ecb commit 3d0864e
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 7 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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)


Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/MainPage/MainPage.js
Original file line number Diff line number Diff line change
@@ -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');
Expand All @@ -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$/);
});
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "capture-app",
"homepage": ".",
"version": "101.12.0",
"version": "101.12.1",
"cacheVersion": "7",
"serverVersion": "38",
"license": "BSD-3-Clause",
Expand All @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/rules-engine/package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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={''}
/>
)
}
Expand Down

0 comments on commit 3d0864e

Please sign in to comment.