Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

SITES-9113 - Unable to save teaser and image without alt text #2665

Merged
merged 10 commits into from
Feb 13, 2024
Merged

SITES-9113 - Unable to save teaser and image without alt text #2665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a466653
validate alt text only when decorative text is unchecked
Feb 5, 2024
716df14
fixed typo
Feb 5, 2024
d79a153
use vanilla JS to query the isDecorative selector
Feb 5, 2024
b41454e
use vanilla JS to query the isDecorative and altValueFromDAM selectors
Feb 5, 2024
7151247
fixed typo
Feb 5, 2024
c400019
fixed typo
Feb 5, 2024
8407e3a
Merge branch 'main' into SITES-9113
LSantha Feb 6, 2024
a84d352
Merge branch 'main' into SITES-9113
LSantha Feb 7, 2024
7b7e025
SITES-9113 - Unable to save teaser and image without alt text
LSantha Feb 12, 2024
58358f3
SITES-9113 - Unable to save teaser and image without alt text
LSantha Feb 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ...rc/content/jcr_root/apps/core/wcm/components/image/v2/image/clientlibs/editor/js/image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,10 @@
selector: altInputSelector,
validate: function() {
var seededValue = $(altInputSelector).attr("data-seeded-value");
var isAltCheckboxChecked = $(altCheckboxSelector).attr("checked");
var isAltCheckboxChecked = document.querySelector('coral-checkbox[name="./altValueFromDAM"]').checked;
var isDecorativeChecked = document.querySelector("coral-checkbox[name='./isDecorative']").checked;
var assetWithoutDescriptionErrorMessage = "Error: Please provide an asset which has a description that can be used as alt text.";
if (isAltCheckboxChecked && !seededValue) {
if (isAltCheckboxChecked && !seededValue && !isDecorativeChecked) {
return Granite.I18n.get(assetWithoutDescriptionErrorMessage);
}
}
Expand Down
5 changes: 3 additions & 2 deletions ...rc/content/jcr_root/apps/core/wcm/components/image/v3/image/clientlibs/editor/js/image.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,10 @@
selector: altInputSelector,
validate: function() {
var seededValue = $(altInputSelector).attr("data-seeded-value");
var isAltCheckboxChecked = $(altCheckboxSelector).attr("checked");
var isAltCheckboxChecked = document.querySelector('coral-checkbox[name="./altValueFromDAM"]').checked;
var isDecorativeChecked = document.querySelector("coral-checkbox[name='./isDecorative']").checked;
var assetWithoutDescriptionErrorMessage = "Error: Please provide an asset which has a description that can be used as alt text.";
if (isAltCheckboxChecked && !seededValue) {
if (isAltCheckboxChecked && !seededValue && !isDecorativeChecked) {
return Granite.I18n.get(assetWithoutDescriptionErrorMessage);
}
}
Expand Down
12 changes: 12 additions & 0 deletions ...nium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/image/ImageTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,18 @@ public void testAddAltTextAndTitle() throws TimeoutException, InterruptedExcepti
+ " and title " + captionText);
}

public void testSetAssetWithoutDescriptionAsDecorative(boolean imageV3) throws InterruptedException, TimeoutException {
Commons.openSidePanel();
dragImageWithoutDescription();
ImageEditDialog editDialog = image.getEditDialog();
if (!imageV3) {
editDialog.openMetadataTab();
}
editDialog.checkDecorative();
Commons.saveConfigureDialog();
assertFalse(editDialog.isVisible(), "Configuration dialog should be closed with no errors.");
}

public void testSetAssetWithoutDescription() throws InterruptedException, TimeoutException {
Commons.openSidePanel();
dragImageWithoutDescription();
Expand Down
9 changes: 9 additions & 0 deletions ...nium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/image/v2/ImageIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,13 @@ public void testSetAssetWithoutDescription() throws TimeoutException, Interrupte
imageTests.testSetAssetWithoutDescription();
}

/**
* Test: set asset from DAM without description as decorative image
*/
@Test
@DisplayName("Test: set asset from DAM without description as decorative")
public void testSetAssetWithoutDescriptionAsDecorative() throws TimeoutException, InterruptedException {
imageTests.testSetAssetWithoutDescriptionAsDecorative(false);
}

}
9 changes: 9 additions & 0 deletions ...nium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/image/v3/ImageIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,4 +279,13 @@ public void testSmartCropDialogOnNGDMImageV3_customAspectRatio() throws TimeoutE
public void testSmartCropDialogOnNGDMImageV3_flipAspectRatio() throws TimeoutException, InterruptedException, ClientException {
imageTests.testNGDMSmartCropDialogImageV3_aspectRatioFlip();
}

/**
* Test: set asset from DAM without description as decorative image
*/
@Test
@DisplayName("Test: set asset from DAM without description as decorative")
public void testSetAssetWithoutDescriptionAsDecorative() throws TimeoutException, InterruptedException {
imageTests.testSetAssetWithoutDescriptionAsDecorative(true);
}
}
Loading