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-22935 NGDM remote image issue #2792

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

SITES-22935 NGDM remote image issue #2792

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
967fc08
SITES-22935 NGDM remote image issue
mohiaror Jun 20, 2024
4cc7295
SITES-22935 NGDM remote image issue
mohiaror Jun 25, 2024
763f357
Merge branch 'main' into issues/SITES-22935
mohiaror Jun 25, 2024
36d7f2d
Merge branch 'main' into issues/SITES-22935
mohiaror Jul 1, 2024
f97f697
SITES-22935 NGDM remote image issue
mohiaror Jul 1, 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
68 changes: 40 additions & 28 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 @@ -62,7 +62,7 @@
var polarisRepositoryId;
var imagePresetRadio = ".cmp-image__editor-dynamicmedia-presettype input[name='./dmPresetType'][value='imagePreset']";
var smartCropRadio = ".cmp-image__editor-dynamicmedia-presettype input[name='./dmPresetType'][value='smartCrop']";
var remoteFileReference;
var remoteFileReferencesArray = [];

$(document).on("dialog-loaded", function(e) {
altTextFromPage = undefined;
Expand Down Expand Up @@ -108,35 +108,27 @@
polarisRepositoryId = JSON.parse(cfg).repositoryId;
if (polarisRepositoryId) {
isPolarisEnabled = true;
remoteFileReference = $cqFileUpload.find("input[name='./fileReference']").val();
remoteFileReferencesArray = $cqFileUpload.find("[data-cq-fileupload-parameter='filereference']");
}
}

retrieveInstanceInfo(imagePath);
$cqFileUpload.on("assetselected", function(e) {
fileReference = e.path;
// if it is a remote asset
remoteFileReference = $cqFileUpload.find("input[name='./fileReference']").val();
if (fileReference === undefined && remoteFileReference && remoteFileReference !== "" &&
remoteFileReference.includes("urn:aaid:aem")) {
fileReference = remoteFileReference;
smartCropRenditionFromJcr = "NONE"; // for newly selected asset we clear the smartcrop selection dropdown
}
retrieveDAMInfo(fileReference).then(
function() {
if (isDecorative) {
altTuple.hideCheckbox(isDecorative.checked);
}
captionTuple.hideCheckbox(false);
altTuple.reinitCheckbox();
captionTuple.reinitCheckbox();
toggleAlternativeFieldsAndLink(imageFromPageImage, isDecorative);
if (areDMFeaturesEnabled && !isPolarisEnabled) {
selectPresetType($(presetTypeSelector), "imagePreset");
resetSelectField($dynamicMediaGroup.find(smartCropRenditionDropDownSelector));
if (fileReference === undefined) {
mohiaror marked this conversation as resolved.
Show resolved Hide resolved
var $fileReferences = $cqFileUpload.find("[data-cq-fileupload-parameter='filereference']");
$fileReferences.each(function() {
var remoteFileReference = $(this).val();
if (remoteFileReference && remoteFileReference !== "" &&
mohiaror marked this conversation as resolved.
Show resolved Hide resolved
remoteFileReference.includes("urn:aaid:aem")) {
smartCropRenditionFromJcr = "NONE"; // for newly selected asset we clear the smartcrop selection dropdown
processFileReference(remoteFileReference);
}
}
);
});
} else {
processFileReference(fileReference);
}
});
$cqFileUpload.on("click", "[coral-fileupload-clear]", function() {
altTuple.reset();
Expand Down Expand Up @@ -239,6 +231,22 @@
}
});

function processFileReference(fileReference) {
retrieveDAMInfo(fileReference).then(function() {
if (isDecorative) {
altTuple.hideCheckbox(isDecorative.checked);
}
captionTuple.hideCheckbox(false);
altTuple.reinitCheckbox();
captionTuple.reinitCheckbox();
toggleAlternativeFieldsAndLink(imageFromPageImage, isDecorative);
if (areDMFeaturesEnabled && !isPolarisEnabled) {
selectPresetType($(presetTypeSelector), "imagePreset");
resetSelectField($dynamicMediaGroup.find(smartCropRenditionDropDownSelector));
}
});
}

function updateImageThumbnail() {
var linkValue;
var thumbnailConfigPath = $(dialogContentSelector).find(pageImageThumbnailSelector).attr(pageImageThumbnailConfigPathAttribute);
Expand Down Expand Up @@ -396,15 +404,19 @@
// we need to get saved value of 'smartCropRendition' of Core Image component
smartCropRenditionFromJcr = data["smartCropRendition"];
}
if (filePath.endsWith("/cq:featuredimage")) {
remoteFileReference = data["fileReference"];
}

// we want to call retrieveDAMInfo after loading the dialog so that saved smartcrop rendition of remote asset
// can be shown on initial load. Also adding condition filePath.endsWith("/cq:featuredimage") to trigger alt
// update for page properties.
if (remoteFileReference && remoteFileReference !== "" && (remoteFileReference.includes("urn:aaid:aem") || filePath.endsWith("/cq:featuredimage"))) {
retrieveDAMInfo(remoteFileReference);
}
remoteFileReferencesArray.each(function() {
var remoteFileReference = $(this).val();
if (filePath.endsWith("/cq:featuredimage")) {
remoteFileReference = data["fileReference"];
}
if (remoteFileReference && remoteFileReference !== "" && remoteFileReference.includes("urn:aaid:aem") || filePath.endsWith("/cq:featuredimage")) {
retrieveDAMInfo(remoteFileReference);
}
});
});
}

Expand Down
Loading