Merge pull request #1689 from adobe/DevToMaster1208

anshikag-adobe · web-flow · commit 84b2898e721f · 2025-08-12T12:57:32.000+05:30
DevToMaster1208
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/fileinput/fileinputv4/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/fileinput/fileinputv4/.content.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="sling:Folder"
+    lcFolder="{Long}0"
+    type="lcFolder"
+/>
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:dam="http://www.day.com/dam/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:fd="http://www.adobe.com/aemfd/fd/1.0"
+          jcr:primaryType="dam:Asset">
+    <jcr:content
+            jcr:lastModified="{Date}2023-01-25T17:24:29.344+05:30"
+            jcr:primaryType="dam:AssetContent"
+            sling:resourceType="fd/fm/af/render"
+            guide="1"
+            type="guide">
+        <metadata
+                fd:version="2.1"
+                jcr:primaryType="nt:unstructured"
+                allowedRenderFormat="HTML"
+                author="admin"
+                availableInMobileApp="{Boolean}false"
+                dorTemplateChanged="Boolean"
+                dorType="none"
+                formmodel="none"
+                hasCustomThumbnail="{Boolean}false"
+                themeRef="/libs/fd/af/themes/canvas"
+                title="Adaptive Form V4 (IT)"/>
+    </jcr:content>
+</jcr:root>
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/datepicker/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/datepicker/basic/.content.xml
diff --git a/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml b/it/content/src/main/content/jcr_root/content/forms/af/core-components-it/samples/fileinput/fileinputv4/basic/.content.xml
@@ -29,7 +29,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="File Input - 1"
-                    sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
+                    sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
                     accept="[audio/*, video/*, image/*, text/*, application/pdf]"
                     buttonText="Attach Files"
                     enabled="{Boolean}true"
@@ -43,15 +43,15 @@
             <fileinput2
                     jcr:primaryType="nt:unstructured"
                     jcr:title="File Input - 2"
-                    sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
+                    sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
                     accept="[audio/*, video/*, image/*, text/*, application/pdf]"
                     fieldType="file-input"
                     name="fileinput2"
                     type="file"/>
             <fileinput3
                     jcr:primaryType="nt:unstructured"
                     jcr:title="File Input - 3"
-                    sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
+                    sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
                     accept="[application/pdf]"
                     description="This is long description"
                     fieldType="file-input"
@@ -63,7 +63,7 @@
             <fileinput4
                     jcr:primaryType="nt:unstructured"
                     jcr:title="File Input - 4"
-                    sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
+                    sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
                     accept="[application/x-msdownload,application/vnd.ms-outlook,application/pdf]"
                     description="This is long description"
                     fieldType="file-input"
@@ -77,7 +77,7 @@
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="File Input - 5"
-                    sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
+                    sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
                     accept="[audio/*, video/*, image/*, text/*, application/pdf]"
                     buttonText="Attach Files"
                     enabled="{Boolean}true"
@@ -91,7 +91,7 @@
              <fileinput6
                     jcr:primaryType="nt:unstructured"
                     jcr:title="File Input - 6"
-                    sling:resourceType="core/fd/components/form/fileinput/v3/fileinput"
+                    sling:resourceType="core/fd/components/form/fileinput/v4/fileinput"
                     accept="[audio/*, video/*, image/*, text/*, application/pdf]"
                     buttonText="Attach Files"
                     enabled="{Boolean}true"
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerwidget.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/clientlibs/site/js/datepickerwidget.js
@@ -1209,10 +1209,25 @@ if (typeof window.DatePickerWidget === 'undefined') {
         // If value is already a Date object and it's valid, use it as is
         currDate = value;
       } else {
-        // Otherwise, construct a new Date object
-        currDate = new Date(value);
-        const timezoneOffset = currDate.getTimezoneOffset();
-        currDate.setMinutes(currDate.getMinutes() + timezoneOffset);
+        // Check if value is empty
+        if (!value || value.trim() === '') {
+          currDate = new Date();
+        } else {
+          let displayFormat = this.#model._jsonModel?.displayFormat;
+          // If displayFormat is null/undefined, use default parsing
+          if (!displayFormat) {
+            currDate = new Date(value);
+          } else {
+            // Use FormView.Formatters.parseDate for custom formats
+            currDate = FormView.Formatters.parseDate(value, this.#lang || 'en', displayFormat);
+            // If parseDate failed (returned null), fallback to default parsing
+            if (currDate === null) {
+              currDate = new Date(value);
+            }
+            const timezoneOffset = currDate.getTimezoneOffset();
+            currDate.setMinutes(currDate.getMinutes() + timezoneOffset);
+          }
+        }
       }
 
       if (!isNaN(currDate) && value != null) {
@@ -1223,7 +1238,7 @@ if (typeof window.DatePickerWidget === 'undefined') {
       } else {
         this.selectedYear
             = this.selectedMonth
-            = this.selectedYear
+            = this.selectedDay
             = -1;
       }
       if (this.#curInstance != null) {
@@ -1257,5 +1272,4 @@ if (typeof window.DatePickerWidget === 'undefined') {
     }
 
   }
-
-}
+}
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/clientlibs/site/js/fileinputwidget.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v3/fileinput/clientlibs/site/js/fileinputwidget.js
@@ -89,5 +89,40 @@ if (typeof window.FileInputWidget === 'undefined') {
             fileItem.appendChild(fileEndContainer);
             return fileItem;
         }
+
+        handleClick (event){
+            let elem = event.target,
+                text = elem.parentElement.previousSibling.textContent,
+                index = this.getIndexOfText(text, elem.parentElement),
+                url = elem.parentElement.previousSibling.dataset.key,
+                objectUrl = elem.parentElement.previousSibling.dataset.objectUrl;   
+            if (index !== -1) {
+                this.values.splice(index, 1);
+                this.fileArr.splice(index, 1);
+                // set the model with the new value
+                this.model.value = this.fileArr;
+                // value and fileArr contains items of both URL and file types, hence while removing from DOM
+                // get the correct index as per this.#widget.files
+                let domIndex = Array.from(this.widget.files).findIndex(function(file) {
+                return file.name === text;
+                });
+                this.deleteFilesFromInputDom([domIndex]);
+                if (url != null) {
+                    // remove the data so that others don't use this url
+                    delete elem.parentElement.previousSibling.dataset.key;
+                }
+                if(objectUrl) {
+                    // revoke the object URL to avoid memory leaks in browser
+                    // since file is anyways getting deleted, remove the object URL's too
+                    window.URL.revokeObjectURL(objectUrl);
+                }
+            }
+            // Remove the dom from view
+            //All bound events and jQuery data associated with the element are also removed
+            elem.parentElement.parentElement.remove();
+            // Set the focus on file upload button after click of close
+            this.widget.focus();
+
+        }
     }
 }
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/clientlibs/site/js/fileinputwidget.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/fileinput/v4/fileinput/clientlibs/site/js/fileinputwidget.js
@@ -188,5 +188,40 @@ if (typeof window.FileInputWidget === 'undefined') {
             };
             return messages[invalidFeature];
         }
+
+        handleClick (event){
+            let elem = event.target,
+                text = elem.parentElement.previousSibling.textContent,
+                index = this.getIndexOfText(text, elem.parentElement),
+                url = elem.parentElement.previousSibling.dataset.key,
+                objectUrl = elem.parentElement.previousSibling.dataset.objectUrl;   
+            if (index !== -1) {
+                this.values.splice(index, 1);
+                this.fileArr.splice(index, 1);
+                // set the model with the new value
+                this.model.value = this.fileArr;
+                // value and fileArr contains items of both URL and file types, hence while removing from DOM
+                // get the correct index as per this.#widget.files
+                let domIndex = Array.from(this.widget.files).findIndex(function(file) {
+                return file.name === text;
+                });
+                this.deleteFilesFromInputDom([domIndex]);
+                if (url != null) {
+                    // remove the data so that others don't use this url
+                    delete elem.parentElement.previousSibling.dataset.key;
+                }
+                if(objectUrl) {
+                    // revoke the object URL to avoid memory leaks in browser
+                    // since file is anyways getting deleted, remove the object URL's too
+                    window.URL.revokeObjectURL(objectUrl);
+                }
+            }
+            // Remove the dom from view
+            //All bound events and jQuery data associated with the element are also removed
+            elem.parentElement.parentElement.remove();
+            // Set the focus on file upload button after click of close
+            this.widget.focus();
+
+        }
     }
 }
diff --git a/ui.tests/test-module/specs/datepicker/datepicker.runtime.cy.js b/ui.tests/test-module/specs/datepicker/datepicker.runtime.cy.js
@@ -415,7 +415,9 @@ describe("Form Runtime with Date Picker", () => {
 
         cy.get(`#${datePicker7}`).find("input").should("have.attr", "type", "text"); // Custom format uses text input
         cy.get(`#${datePicker7}`).find(".cmp-adaptiveform-datepicker__calendar-icon").should("have.attr", "tabindex", "0");
-        cy.get(`#${datePicker7}`).find("input").focus().tab();
+        
+        // Test that calendar icon can be focused and activated
+        cy.get(`#${datePicker7}`).find(".cmp-adaptiveform-datepicker__calendar-icon").focus();
         cy.focused().should("have.class", "cmp-adaptiveform-datepicker__calendar-icon");
         cy.focused().type("{enter}");
         cy.get(".datetimepicker").should("be.visible");
@@ -442,6 +444,7 @@ describe("Form Runtime with Date Picker", () => {
         cy.get(`#${datePicker7}`).find(".cmp-adaptiveform-datepicker__calendar-icon").focus().type("{enter}");
         cy.get(".datetimepicker").should("be.visible");
         cy.get("body").type("{esc}");
+    });
 
     // Mobile Touch Functionality Tests
     describe("Mobile Touch Functionality", () => {
@@ -510,4 +513,95 @@ describe("Form Runtime with Date Picker", () => {
             })
         });
     });
-})
+    it("Test dd/MM/yyyy format - verify July is highlighted for 03/07/2025", () => {
+        // Test the datepicker component configured with dd/MM/yyyy format
+
+        let targetDatepicker = null;
+        let targetModel = null;
+
+        // Find the datepicker with dd/MM/yyyy format
+        cy.wrap(null).then(() => {
+            for (const [fieldId, fieldView] of Object.entries(formContainer._fields)) {
+                const model = fieldView.getModel();
+                if (model && model._jsonModel && model._jsonModel.displayFormat === "dd/MM/yyyy") {
+                    targetDatepicker = fieldId;
+                    targetModel = model;
+                    cy.log(`Found dd/MM/yyyy datepicker: ${fieldId}`);
+                    break;
+                }
+            }
+
+            // Log all available datepickers for debugging
+            if (!targetDatepicker) {
+                cy.log("Available datepickers:");
+                Object.entries(formContainer._fields).forEach(([id, field]) => {
+                    const model = field.getModel();
+                    const displayFormat = model._jsonModel?.displayFormat;
+                    cy.log(`- ${id}: displayFormat = ${displayFormat}`);
+                });
+            }
+        });
+
+        // Only proceed if we found the datepicker
+        cy.then(() => {
+            if (!targetDatepicker) {
+                cy.log("No datepicker with dd/MM/yyyy format found. Skipping test.");
+                return;
+            }
+
+            // Test the main bug: "03/07/2025" should show July, not March
+            cy.get(`#${targetDatepicker}`).should('exist').then(() => {
+
+                const testDate = "03/07/2025"; // 3rd July 2025
+
+                cy.log(`Testing: ${testDate} (should be July 2025, NOT March 2025)`);
+
+                // Enter the date
+                cy.get(`#${targetDatepicker}`).find("input").clear().type(testDate).blur();
+
+                // Check model value
+                cy.wrap(null).then(() => {
+                    if (targetModel) {
+                        const modelValue = targetModel.getState().value;
+                        cy.log(`Model value: ${modelValue}`);
+
+                        // Should be 2025-07-03 (July), not 2025-03-07 (March)
+                        if (modelValue === "2025-07-03") {
+                            cy.log("SUCCESS: Model correctly stores July");
+                        } else if (modelValue === "2025-03-07") {
+                            cy.log("BUG: Model incorrectly stores March");
+                        }
+                    }
+                });
+
+                // Open calendar and check month
+                cy.get(`#${targetDatepicker}`).find(".cmp-adaptiveform-datepicker__calendar-icon")
+                    .should('be.visible')
+                    .click({force: true});
+
+                cy.wait(1000);
+
+                // Check calendar month
+                cy.get('body').then(($body) => {
+                    if ($body.find('.datetimepicker:visible').length > 0) {
+                        cy.get(".dp-caption").should("be.visible").then(($caption) => {
+                            const captionText = $caption.text();
+                            cy.log(`Calendar shows: ${captionText}`);
+
+                            // Critical test: should show July, not March
+                            if (captionText.includes("July") && captionText.includes("2025")) {
+                                expect(captionText).to.include("July");
+                            } else if (captionText.includes("March")) {
+                            }
+                        });
+
+                        // Close calendar
+                        cy.get("body").click(10, 10);
+                    } else {
+                        cy.log("Calendar widget not available");
+                    }
+                });
+            });
+        });
+    });
+});
diff --git a/ui.tests/test-module/specs/fileinput/fileinputv3.runtime.cy.js b/ui.tests/test-module/specs/fileinput/fileinputv3.runtime.cy.js
@@ -173,6 +173,20 @@ describe("Form with File Input V-3 - Basic Tests", () => {
         getFormObjTest(['empty.pdf', 'empty.pdf', 'empty.pdf', 'empty.pdf', 'empty.pdf'])
     });
 
+    it("check delete functionality of duplicate files", () => {
+        let sampleFileNames = ['sample2.txt', 'sample.txt', 'sample2.txt'];
+        const fileInput = "input[name='fileinput1']";
+        
+        // Attach files
+        cy.attachFile(fileInput, [sampleFileNames[0]]);
+        cy.attachFile(fileInput, [sampleFileNames[1]]);
+        cy.attachFile(fileInput, [sampleFileNames[2]]);
+
+        deleteSelectedFiles(fileInput, sampleFileNames);
+
+        cy.get('.cmp-adaptiveform-fileinput__fileitem').should('have.length', 0);
+    });
+
     it("should toggle description and tooltip", () => {
         cy.toggleDescriptionTooltip(bemBlock, 'fileinput_tooltip_scenario_test');
     })
diff --git a/ui.tests/test-module/specs/fileinput/fileinputv4.runtime.cy.js b/ui.tests/test-module/specs/fileinput/fileinputv4.runtime.cy.js
@@ -181,6 +181,20 @@ describe("Form with File Input V-4 - Basic Tests", () => {
         getFormObjTest(['empty.pdf', 'empty.pdf', 'empty.pdf', 'empty.pdf', 'empty.pdf'])
     });
 
+    it("check delete functionality of duplicate files", () => {
+        let sampleFileNames = ['sample2.txt', 'sample.txt', 'sample2.txt'];
+        const fileInput = "input[name='fileinput1']";
+        
+        // Attach files
+        cy.attachFile(fileInput, [sampleFileNames[0]]);
+        cy.attachFile(fileInput, [sampleFileNames[1]]);
+        cy.attachFile(fileInput, [sampleFileNames[2]]);
+
+        deleteSelectedFiles(fileInput, sampleFileNames);
+
+        cy.get('.cmp-adaptiveform-fileinput__fileitem').should('have.length', 0);
+    });
+
     it("should toggle description and tooltip", () => {
         cy.toggleDescriptionTooltip(bemBlock, 'fileinput_tooltip_scenario_test');
     });
