Merge pull request #1166 from adobe/devToMaster4April

sakshi-arora1 · web-flow · commit 9e45e752e17a · 2024-04-05T10:32:18.000+05:30
Dev to master4 april
diff --git a/it/apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/fa.json b/it/apps/src/main/content/jcr_root/apps/core/fd/af-clientlibs/core-forms-components-runtime-all/resources/i18n/fa.json
@@ -0,0 +1,43 @@
+{
+  "FileCloseAccessText"         :   "اضغط على Enter لحذف الملف",
+  "FileSizeGreater"             :   "حجم الملفات (${0}) أكبر من الحجم المتوقع: ${1} ميجابايت.",
+  "FileNameInvalid"             :   "لا تقم بإرفاق ملفات يبدأ اسم الملف بـ (.)، أو يحتوي على \\ / : * ? \" < > | ; % $، أو هو كلمة محجوزة مثل nul، prn، con، lpt، أو com.",
+  "FileMimeTypeInvalid"         :   "أنواع الملفات (${0}) غير مدعومة",
+  "InternalFormSubmissionError" :   "حدث خطأ داخلي أثناء تقديم النموذج.",
+  "electronicSignature"         :   "التوقيع الإلكتروني",
+  "readOnlyMessage"             :   "قراءة فقط",
+  "thankYouMessage"             :   "شكرًا لتقديم النموذج",
+  "type"                        :   "الرجاء إدخال قيمة صالحة.",
+  "required"                    :   "الرجاء ملء هذا الحقل.",
+  "minimum"                     :   "يجب أن تكون القيمة أكبر من أو تساوي ${0}.",
+  "maximum"                     :   "يجب أن تكون القيمة أقل من أو تساوي ${0}.",
+  "minLength"                   :   "الرجاء تمديد هذا النص إلى ${0} أحرف أو أكثر.",
+  "maxLength"                   :   "الرجاء تقصير هذا النص إلى ${0} حرفًا أو أقل.",
+  "step"                        :   "الرجاء إدخال قيمة صالحة.",
+  "format"                      :   "حدد القيمة بالتنسيق المسموح به: ${0}.",
+  "pattern"                     :   "الرجاء مطابقة الشكل المطلوب.",
+  "minItems"                    :   "حدد عدد العناصر مساويًا أو أكبر من ${0}.",
+  "maxItems"                    :   "حدد عدد العناصر مساويًا أو أقل من ${0}.",
+  "uniqueItems"                 :   "يجب أن تكون جميع العناصر فريدة.",
+  "validationExpression"        :   "الرجاء إدخال قيمة صالحة.",
+  "maxFileSize"                 :   "حجم الملف كبير جدًا. يرجى تقليل الحجم والمحاولة مرة أخرى.",
+  "accept"                      :   "النوع المحدد للملف غير مدعوم.",
+  "defaultError"                :   "هناك خطأ في الحقل",
+  "clearText"                   :   "مسح",
+  "calendarSymbols" : {
+    "monthNames" : ["يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو", "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"],
+    "abbrmonthNames" : ["يناير", "فبراير", "مارس", "أبريل", "مايو", "يونيو", "يوليو", "أغسطس", "سبتمبر", "أكتوبر", "نوفمبر", "ديسمبر"],
+    "dayNames" : ["الأحد", "الاثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"],
+    "abbrdayNames" : ["الأحد", "الاثنين", "الثلاثاء", "الأربعاء", "الخميس", "الجمعة", "السبت"],
+    "meridiemNames" : ["ص", "م"],
+    "eraNames" : ["ق.م", "م"],
+    "day": "يوم",
+    "days": "أيام",
+    "month": "شهر",
+    "months": "أشهر",
+    "year": "سنة",
+    "years": "سنوات",
+    "more": "أكثر",
+    "less": "أقل"
+  }
+}
diff --git a/it/config/src/main/content/jcr_root/apps/system/config/Guide Localization Service.cfg.json b/it/config/src/main/content/jcr_root/apps/system/config/Guide Localization Service.cfg.json
@@ -12,6 +12,7 @@
     "es",
     "ru-ru",
     "hi",
-    "th"
+    "th",
+    "fa"
   ]
 }
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/af2-form-translation/.content.xml
@@ -21,6 +21,7 @@
             <ru-ru/>
             <hi/>
             <th/>
+            <fa/>
         </dictionary>
         <metadata
             fd:version="2.1"
diff --git a/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/datepicker/basic/.content.xml b/it/content/src/main/content/jcr_root/content/dam/formsanddocuments/core-components-it/samples/datepicker/basic/.content.xml
@@ -2,21 +2,22 @@
 <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-20T15:28:03.292+05:30"
+            jcr:lastModified="{Date}2024-04-03T17:09:20.123+05:30"
             jcr:primaryType="dam:AssetContent"
             sling:resourceType="fd/fm/af/render"
             guide="1"
             type="guide">
         <metadata
                 fd:version="2.1"
-                themeRef="/libs/fd/af/themes/canvas"
                 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 V2 (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
@@ -3,7 +3,7 @@
           jcr:primaryType="cq:Page">
     <jcr:content
             cq:deviceGroups="[mobile/groups/responsive]"
-            cq:lastModified="{Date}2024-03-18T15:08:02.397+05:30"
+            cq:lastModified="{Date}2024-04-03T17:09:19.976+05:30"
             cq:lastModifiedBy="admin"
             cq:template="/conf/core-components-examples/settings/wcm/templates/af-blank-v2"
             jcr:language="en"
@@ -17,13 +17,14 @@
                 jcr:lastModifiedBy="admin"
                 jcr:primaryType="nt:unstructured"
                 sling:resourceType="forms-components-examples/components/form/container"
-                themeRef="/libs/fd/af/themes/canvas"
                 clientLibRef="corecomponent.it.customfunction"
+                dorType="none"
                 fieldType="form"
                 schemaType="none"
                 textIsRich="true"
                 thankYouMessage="Thank you for submitting the form."
-                thankYouOption="page">
+                thankYouOption="page"
+                themeRef="/libs/fd/af/themes/canvas">
             <dateinput1
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Date Input 1"
@@ -103,7 +104,7 @@
             <datepicker
                     jcr:created="{Date}2023-08-10T15:45:30.311+05:30"
                     jcr:createdBy="admin"
-                    jcr:lastModified="{Date}2023-08-10T15:47:00.344+05:30"
+                    jcr:lastModified="{Date}2024-04-03T17:07:16.009+05:30"
                     jcr:lastModifiedBy="admin"
                     jcr:primaryType="nt:unstructured"
                     jcr:title="Date Picker with edit and display formats"
@@ -114,6 +115,7 @@
                     editPatternType="d/M/y"
                     enabled="{Boolean}true"
                     fieldType="date-input"
+                    formatMessage="Date format expected is d/M/y"
                     hideTitle="false"
                     name="datepicker7"
                     readOnly="{Boolean}false"
@@ -143,6 +145,27 @@
                         validationStatus="valid"/>
                 <fd:events jcr:primaryType="nt:unstructured"/>
             </datepicker_1911670949>
+            <datepicker_269513547
+                    jcr:created="{Date}2024-04-04T09:54:04.561+05:30"
+                    jcr:createdBy="admin"
+                    jcr:lastModified="{Date}2024-04-04T10:01:04.574+05:30"
+                    jcr:lastModifiedBy="admin"
+                    jcr:primaryType="nt:unstructured"
+                    jcr:title="Date Input with fixed date"
+                    sling:resourceType="forms-components-examples/components/form/datepicker"
+                    default="2024-03-01"
+                    displayFormat="MMMM d, y"
+                    displayPatternType="MMMM d, y"
+                    editFormat="MMMM d, y"
+                    editPatternType="MMMM d, y"
+                    enabled="{Boolean}true"
+                    fieldType="date-input"
+                    hideTitle="false"
+                    name="datepicker_2695135471712204644671"
+                    readOnly="{Boolean}false"
+                    textIsRich="[true,true,true]"
+                    unboundFormElement="{Boolean}false"
+                    visible="{Boolean}true"/>
         </guideContainer>
     </jcr:content>
 </jcr:root>
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_dialog/.content.xml b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/datepicker/v1/datepicker/_cq_dialog/.content.xml
@@ -215,6 +215,13 @@
                                                             fieldLabel="Edit Format"
                                                             name="./editFormat">
                                                     </editFormat>
+                                                    <formatMessage
+                                                            jcr:primaryType="nt:unstructured"
+                                                            sling:resourceType="granite/ui/components/coral/foundation/form/textarea"
+                                                            fieldDescription="Error message shown when the date format is incorrect."
+                                                            granite:class="cmp-adaptiveform-datepicker__formatmessage"
+                                                            fieldLabel="Format error message"
+                                                            name="./formatMessage"/>
                                                 </items>
                                             </editPatternGroup>
                                         </items>
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
@@ -728,13 +728,24 @@ if (typeof window.DatePickerWidget === 'undefined') {
     }
 
     #getLocalizedYear(date) {
+      /*
+      // Only Thai language return year according to Buddhist calendar, rest all languages follows gregorian calendar in practice.
+      // The Buddhist Year in 2024 = 543 + 2024  = B.E. 2567 (reference https://wesak.org.my/calculating-b-e/)
+      // Intl.DateTimeFormat#formatToParts returns number (2024) for all languages except for Thai (2567) & for Persian ('۱۴۰۳')
+      // For Persian ('۱۴۰۳'), returned year is not in numbers that is breaking next flow.
+      */
+      if(this.#lang === 'th') {
         const dateFormat = new Intl.DateTimeFormat(this.#lang, {
-            year: 'numeric'
+          year: 'numeric'
         });
         const dateParts = dateFormat.formatToParts(date);
         const yearObject = dateParts.find(yearObject => yearObject.type === "year");
         const localizedYear = yearObject.value;
         return Number(localizedYear);
+      }
+      else {
+        return Number(date.getFullYear());
+      }
     }
 
     /*
diff --git a/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/clientlibs/site/js/dropdownview.js b/ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/dropdown/v1/dropdown/clientlibs/site/js/dropdownview.js
@@ -117,10 +117,10 @@
             }
             let isMultiSelect = this._model.isArrayType();
             [...this.widget].forEach((option) => {
+                // clear of any selection, and re-add selection (otherwise HTML shows stale state if it already existed)
+                option.removeAttribute('selected');
                 if(this.#checkIfEqual(value, option.value, isMultiSelect)) {
                     option.setAttribute('selected', 'selected');
-                } else {
-                    option.removeAttribute('selected');
                 }
             });
             super.updateEmptyStatus();
diff --git a/ui.tests/test-module/specs/datepicker/datepicker.runtime.persian.locale.spec.js b/ui.tests/test-module/specs/datepicker/datepicker.runtime.persian.locale.spec.js
@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * Copyright 2024 Adobe
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ ******************************************************************************/
+describe("Form Runtime with Date Picker", () => {
+
+    const pagePath = "content/forms/af/core-components-it/samples/datepicker/basic.html"
+    const bemBlock = 'cmp-adaptiveform-datepicker'
+
+    let formContainer = null
+    const fmPropertiesUI = "/libs/fd/fm/gui/content/forms/formmetadataeditor.html/content/dam/formsanddocuments/core-components-it/samples/datepicker/basic"
+    const themeRef = 'input[name="./jcr:content/metadata/themeRef"]'
+    const propertiesSaveBtn = '#shell-propertiespage-doneactivator'
+    // enabling theme for this test case as without theme there is a bug in custom widget css
+    before(() => {
+        cy.openPage(fmPropertiesUI).then(() => {
+            cy.get(themeRef).should('be.visible').clear().type('/libs/fd/af/themes/canvas').then(() => {
+                cy.get(propertiesSaveBtn).click();
+            })
+        })
+    })
+
+    beforeEach(() => {
+        cy.previewForm(pagePath, {"params" : ["afAcceptLang=fa"]}).then(p => {
+            formContainer = p;
+        })
+    });
+
+    // Year should be in Buddhist calendar year for Thai language
+    it("Test localisation for date picker for Persian", () => {
+        const [datePicker8, datePicker7FieldView] = Object.entries(formContainer._fields)[8];
+        cy.get(`#${datePicker8}`).find(".cmp-adaptiveform-datepicker__calendar-icon").should("be.visible").click().then(() => {
+            let todayDate = new Date();
+            cy.get(".dp-caption").invoke("text").should("eq", "مارس, 2024");
+            cy.get(".dp-caption").click();
+            cy.get(".dp-caption").invoke("text").should("eq", '2024');
+            cy.get(".dp-rightnav").click();
+        });
+    });
+
+
+
+
+
+})
diff --git a/ui.tests/test-module/specs/datepicker/datepicker.runtime.spec.js b/ui.tests/test-module/specs/datepicker/datepicker.runtime.spec.js
@@ -256,4 +256,16 @@ describe("Form Runtime with Date Picker", () => {
         }
     });
 
+    it.only("Test custom error message when incorrect date format is entered", () => {
+        const [datePicker7, datePicker7FieldView] = Object.entries(formContainer._fields)[6];
+        const incorrectInputs = ["adfasdfa", "29/2/2023", "32/1/2023", "1/32/23", "1-1-2023"];
+        incorrectInputs.forEach(incorrectInput => {
+            cy.get(`#${datePicker7}`).find("input").should('have.attr',"type", "text");
+            cy.get(`#${datePicker7}`).find("input").clear().wait(1000).type(incorrectInput).trigger('input').blur()
+                .then(x => {
+                cy.get(`#${datePicker7}`).find("input").should('have.value', incorrectInput); // Check if the input is the same
+                cy.get(`#${datePicker7}`).find(".cmp-adaptiveform-datepicker__errormessage").should('have.text',"Date format expected is d/M/y")
+            });
+        });
+    });
 })

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`"es",`
`13`	`13`	`"ru-ru",`
`14`	`14`	`"hi",`
`15`		`- "th"`
	`15`	`+ "th",`
	`16`	`+ "fa"`
`16`	`17`	`]`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -117,10 +117,10 @@`
`117`	`117`	`}`
`118`	`118`	`let isMultiSelect = this._model.isArrayType();`
`119`	`119`	`[...this.widget].forEach((option) => {`
	`120`	`+ // clear of any selection, and re-add selection (otherwise HTML shows stale state if it already existed)`
	`121`	`+ option.removeAttribute('selected');`
`120`	`122`	`if(this.#checkIfEqual(value, option.value, isMultiSelect)) {`
`121`	`123`	`option.setAttribute('selected', 'selected');`
`122`		`- } else {`
`123`		`- option.removeAttribute('selected');`
`124`	`124`	`}`
`125`	`125`	`});`
`126`	`126`	`super.updateEmptyStatus();`