adding source property in sling model of image component to get dam a…

…sset path in headless json (#1198) * [eds adding source property in sling model of image component to get the path in crx of the image.......] * [eds adding source property in sling model of image component to get the path in crx of the image.......] * [FORMS-13952] changed the dam repo path property to fd:repoPath * [FORMS-13952] changed the dam repo path property to fd:repoPath * fixed some test cases ........ * FORMS-13952 removed unused api of getSource... * [FORMS-13952] formatter change added in StaticImage...... --------- Co-authored-by: Deep Prakash Dewanji <deepprakashdewanji@labusers-mbp-5.macromedia.com> Co-authored-by: Deep Prakash Dewanji <deepprakashdewanji@labusers-mbp-9.corp.adobe.com>
adobe · May 7, 2024 · e23a818 · e23a818
1 parent e9b4d42
commit e23a818
Show file tree

Hide file tree

Showing 5 changed files with 59 additions and 1 deletion.
diff --git a/...main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImpl.java b/...main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImpl.java
@@ -16,7 +16,9 @@
 package com.adobe.cq.forms.core.components.internal.models.v1.form;
 
 import java.io.IOException;
+import java.util.Map;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import javax.jcr.RepositoryException;
 
@@ -45,6 +47,8 @@
     extensions = ExporterConstants.SLING_MODEL_EXTENSION)
 public class StaticImageImpl extends AbstractFormComponentImpl implements StaticImage {
 
+    public static final String DAM_REPO_PATH = "fd:repoPath";
+
     private Image image;
 
     @SlingObject
@@ -62,6 +66,10 @@ public class StaticImageImpl extends AbstractFormComponentImpl implements Static
     @org.jetbrains.annotations.Nullable
     protected String description; // long description as per current spec
 
+    @ValueMapValue(injectionStrategy = InjectionStrategy.OPTIONAL, name = "fileReference")
+    @Nullable
+    protected String fileReference;
+
     /**
      * Returns the source where the image is present.
      *
@@ -120,4 +128,13 @@ public String getLinkUrl() {
             return null;
         }
     }
+
+    @Override
+    public @Nonnull Map<String, Object> getProperties() {
+        Map<String, Object> properties = super.getProperties();
+        if (fileReference != null && fileReference.length() > 0) {
+            properties.put(DAM_REPO_PATH, fileReference);
+        }
+        return properties;
+    }
 }
diff --git a/.../java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImplTest.java b/.../java/com/adobe/cq/forms/core/components/internal/models/v1/form/StaticImageImplTest.java
@@ -48,6 +48,8 @@ public class StaticImageImplTest {
     private static final String BASE = "/form/image";
     private static final String CONTENT_ROOT = "/content";
     private static final String PATH_IMAGE_CUSTOMIZED = CONTENT_ROOT + "/image-customized";
+
+    private static final String PATH_IMAGE_PARSED = CONTENT_ROOT + "/image-parsedSrc";
     private static final String PATH_IMAGE = CONTENT_ROOT + "/image";
     private static final String PATH_IMAGE_DATALAYER = CONTENT_ROOT + "/image-datalayer";
 
@@ -67,6 +69,13 @@ void testExportedType() {
         assertEquals("", staticImageMock.getExportedType());
     }
 
+    @Test
+    void testExportedTypeForParsedImage() {
+        StaticImage staticImage = Utils.getComponentUnderTest(PATH_IMAGE_PARSED, StaticImage.class, context);
+        assertEquals(FormConstants.RT_FD_FORM_IMAGE_V1, staticImage.getExportedType());
+        assertEquals("/content/dam/formsanddocuments/abc.jpeg", staticImage.getProperties().get("fd:repoPath"));
+    }
+
     @Test
     void testFieldType() {
         StaticImage staticImage = Utils.getComponentUnderTest(PATH_IMAGE_CUSTOMIZED, StaticImage.class, context);

diff --git a/bundles/af-core/src/test/resources/form/image/exporter-image-parsedSrc.json b/bundles/af-core/src/test/resources/form/image/exporter-image-parsedSrc.json
@@ -0,0 +1,18 @@
+{
+  "id": "image-7cfd7f1fe4",
+  "fieldType": "image",
+  "name": "abcd",
+  "visible": false,
+  "altText": "abc",
+  "value": "/content/image-customized.img.png",
+  "events": {
+    "custom:setProperty": [
+      "$event.payload"
+    ]
+  },
+  "properties": {
+    "fd:path": "/content/image",
+    "fd:repoPath": "/content/dam/formsanddocuments/abc.jpeg"
+  },
+  ":type": "core/fd/components/form/image/v1/image"
+}
diff --git a/bundles/af-core/src/test/resources/form/image/exporter-image.json b/bundles/af-core/src/test/resources/form/image/exporter-image.json
@@ -8,7 +8,8 @@
     ]
   },
   "properties": {
-    "fd:path": "/content/image"
+    "fd:path": "/content/image",
+    "fd:repoPath": "/content/dam/formsanddocuments/abc.jpeg"
   },
   ":type": "core/fd/components/form/image/v1/image"
 }
diff --git a/bundles/af-core/src/test/resources/form/image/test-content.json b/bundles/af-core/src/test/resources/form/image/test-content.json
@@ -1,4 +1,16 @@
 {
+  "image-parsedSrc" : {
+    "jcr:primaryType": "nt:unstructured",
+    "sling:resourceType": "core/fd/components/form/image/v1/image",
+    "name" : "abcd",
+    "jcr:title" : "def",
+    "hideTitle" : false,
+    "visible" : false,
+    "altText": "abc",
+    "fileReference": "/content/dam/formsanddocuments/abc.jpeg",
+    "excludeFromDor": false,
+    "fieldType": "image"
+  },
  "image-customized" : {
     "jcr:primaryType": "nt:unstructured",
     "sling:resourceType": "core/fd/components/form/image/v1/image",
@@ -21,6 +33,7 @@
     "jcr:createdBy": "admin",
     "jcr:title": "Image",
     "name": "emptyImage",
+    "fileReference": "/content/dam/formsanddocuments/abc.jpeg",
     "sling:resourceType": "core/fd/components/form/image/v1/image",
     "fieldType": "image"
   },