Master to650

.circleci/ci/accessibility-axe.js

@@ -27,7 +27,7 @@ const calculateAccessibility = async () => {
 
     const options = new chrome.Options();
     const driver = new WebDriver.Builder().forBrowser('chrome').setChromeOptions(options).build();
-    const ACCESSIBILITY_COLLATERAL_URL = "http://localhost:4502/content/dam/formsanddocuments/core-components-it/samples/wizard/repeatability/jcr:content?wcmmode=disabled"
+    const ACCESSIBILITY_COLLATERAL_URL = "http://localhost:4502/content/dam/formsanddocuments/core-components-it/samples/accessibility/jcr:content?wcmmode=disabled"
     const aemUsername = ci.sh('mvn --file ui.tests help:evaluate -Dexpression=AEM_AUTHOR_USERNAME -q -DforceStdout', true);
     const aemPassword = ci.sh('mvn --file ui.tests help:evaluate -Dexpression=AEM_AUTHOR_PASSWORD -q -DforceStdout', true);
 

.circleci/ci/accessibilityConfig.json

@@ -1,8 +1,3 @@
 {
-  "accessibilityExceptionList": [
-    "label",
-    "landmark-one-main",
-    "page-has-heading-one",
-    "region"
-  ]
+  "accessibilityExceptionList": []
 }

.circleci/ci/it-tests.js

@@ -59,6 +59,8 @@ try {
             preleaseOpts = "--cmd-options \\\"-r prerelease\\\"";
         }
     }
+    // add feature toggle impl bundle to check FT on cloud ready or release/650 instance
+    extras += ` --install-file ${buildPath}/it/core/src/main/resources/com.adobe.granite.toggle.impl.dev-1.1.2.jar`;
 
     // Start CQ
     ci.sh(`./qp.sh -v start --id author --runmode author --port 4502 --qs-jar /home/circleci/cq/author/cq-quickstart.jar \

.circleci/ci/lighthouse.js

@@ -23,7 +23,7 @@ const checkLightHouse = async () => {
     const aemUsername = ci.sh('mvn --file ui.tests help:evaluate -Dexpression=AEM_AUTHOR_USERNAME -q -DforceStdout', true);
     const aemPassword = ci.sh('mvn --file ui.tests help:evaluate -Dexpression=AEM_AUTHOR_PASSWORD -q -DforceStdout', true);
 
-    const lighthouse = await import('lighthouse')
+    const {default: LHDesktopConfig} = await import('lighthouse/core/config/desktop-config.js')
     const chromeLauncher = await import('chrome-launcher')
     const chrome = await chromeLauncher.launch({chromeFlags: ['--headless']});
     const options = {
@@ -40,37 +40,60 @@ const checkLightHouse = async () => {
     };
     const lighthouseConfig = JSON.parse(fs.readFileSync('/home/circleci/build/.circleci/ci/lighthouseConfig.json'))
 
-    const runnerResult = await lighthouse.default(lighthouseConfig.urls[0], options);
-    // `.report` is the HTML report as a string
+    const desktopResult = await computeMedianScores(lighthouseConfig.urls[0], options,  LHDesktopConfig) // Running lighthouse for desktop
+    console.log('Lighthouse Report for desktop generated', desktopResult.lhr.finalDisplayedUrl);
+    console.log(getCommentText(desktopResult.lhr.categories, 'desktop'))
+    const desktopReportHtml = desktopResult.report;
 
-    const reportHtml = runnerResult.report;
-    console.log('Report is done for', runnerResult.lhr.finalDisplayedUrl);
-    console.log(getCommentText(runnerResult.lhr.categories))
+    const mobileResult = await computeMedianScores(lighthouseConfig.urls[0], options) // by default lighthouse scores are computed for mobile device
+    console.log('Lighthouse Report for desktop generated', mobileResult.lhr.finalDisplayedUrl);
+    console.log(getCommentText(mobileResult.lhr.categories, 'mobile'))
+    const mobileReportHtml = mobileResult.report;
 
     if(process.env.AEM === "addon"){ // posting lighthouse scores only in case of AEM is addon
-        await ci.postCommentToGitHubFromCI(getCommentText(runnerResult.lhr.categories))
+        await ci.postCommentToGitHubFromCI(getCommentText(desktopResult.lhr.categories, 'desktop'))
+        await ci.postCommentToGitHubFromCI(getCommentText(mobileResult.lhr.categories, 'mobile'))
     }
     ci.sh('mkdir artifacts');
     ci.dir("artifacts", () => {
-           fs.writeFileSync('LigthouseReport.html', reportHtml);
+        fs.writeFileSync('DesktopLigthouseReport.html', desktopReportHtml);
+        fs.writeFileSync('MobileLigthouseReport.html', mobileReportHtml);
         });
 
 
-    const thresholdResults = checkThresholds(runnerResult.lhr.categories, lighthouseConfig)
+    const thresholdResults = checkThresholds(mobileResult.lhr.categories, lighthouseConfig) // using mobile lighthouse scores as these are usually lower
     console.log("thresholdResults -->>>> ", thresholdResults)
     if(!thresholdResults.isThresholdPass && process.env.AEM === "addon"){
         console.log("Error: Lighthouse score for aem-core-forms-components, below the thresholds")
         await ci.postCommentToGitHubFromCI("Error: Lighthouse score for aem-core-forms-components, below the thresholds, check reports under artifacts in CircleCI")
         process.exit(1);
     }
     else if(thresholdResults.updateLighthouseConfig && ['master', 'dev', 'release/650'].includes(process.env.CIRCLE_BRANCH) && process.env.AEM === "addon"){ // only execute if branch name is 'master'
-        writeObjLighthouseConfig(runnerResult.lhr.categories, lighthouseConfig)
+        writeObjLighthouseConfig(mobileResult.lhr.categories, lighthouseConfig)
     }
     await chrome.kill();
 }
 
-const getCommentText = (resultCategories) => {
-  const commentText = `### Lighthouse scores\n\n|        | Performance | Accessibility | Best-Practices | SEO |\n| ------ | ----------- | ------------- | -------------- | --- |\n| Scores |     ${resultCategories.performance.score*100}      |       ${resultCategories.accessibility.score*100}       |       ${resultCategories['best-practices'].score*100}       |  ${resultCategories.seo.score*100} |`
+const computeMedianScores = async (url, options, config) => {
+    const {default:lighthouse} = await import('lighthouse');
+    const {computeMedianRun} = await import('lighthouse/core/lib/median-run.js');
+    const lhrs = [], results = [];
+    for(let i=0; i<5; i++) {
+        try {
+            const result = await lighthouse(url, options, config);
+            results.push(result);
+            lhrs.push(result.lhr);
+        } catch (e) {
+            console.log(e)
+        }
+    }
+    const median = computeMedianRun(lhrs);
+    const result = results[lhrs.indexOf(median)]
+    return result;
+}
+
+const getCommentText = (resultCategories, preset) => {
+  const commentText = `### Lighthouse scores (${preset})\n\n|        | Performance | Accessibility | Best-Practices | SEO |\n| ------ | ----------- | ------------- | -------------- | --- |\n| Scores |     ${resultCategories.performance.score*100}      |       ${resultCategories.accessibility.score*100}       |       ${resultCategories['best-practices'].score*100}       |  ${resultCategories.seo.score*100} |`
   return commentText
 }
 

.circleci/ci/lighthouseConfig.json

@@ -1,17 +1,17 @@
 {
     "urls": [
-        "http://localhost:4502/content/dam/formsanddocuments/core-components-it/samples/wizard/repeatability/jcr:content?wcmmode=disabled"
+        "http://localhost:4502/content/dam/formsanddocuments/core-components-it/samples/accessibility/jcr:content?wcmmode=disabled"
     ],
     "requiredScores": [
         {
             "performance": 80,
-            "accessibility": 90,
+            "accessibility": 100,
             "bestPractices": 100,
             "seo": 70
         },
         {
             "performance": 85,
-            "accessibility": 95,
+            "accessibility": 100,
             "bestPractices": 100,
             "seo": 75
         }

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2.1
 
 orbs:
   codecov: codecov/[email protected]
-  browser-tools: circleci/browser-tools@1.3.0
+  browser-tools: circleci/browser-tools@1.4.3
 
 common:
   restore_cache: &restore_cache
@@ -89,7 +89,7 @@ executors:
     docker:
       - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-qp:6.4.6-openjdk11
         <<: *docker_auth
-      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:12142-openjdk11
+      - image: docker-adobe-cif-release.dr-uw2.adobeitc.com/circleci-aem-cloudready:12441-openjdk11
         <<: *docker_auth
   test_executor_655:
       docker:
@@ -163,7 +163,8 @@ jobs:
       AEM: classic
       TYPE: cypress
       BROWSER: chrome
-    resource_class: large
+      PRERELEASE: 'true'
+    resource_class: xlarge
     working_directory: /home/circleci/build
     <<: *cypress_test_steps
 
@@ -241,6 +242,55 @@ jobs:
                 --data-binary @"$ARTIFACT" \
                 "$UPLOAD_URL?name=$(basename "$ARTIFACT")"
             done
+      - run:
+          name: Configure git user name
+          command: |
+            git config user.email "ci-build@aemforms"
+            git config user.name "ci-build"
+      - add_ssh_keys:
+          fingerprints:
+            - "ba:61:80:74:5e:67:7e:ee:15:4c:5d:58:8a:47:12:05"
+      - run:
+          name: Update VERSIONS.md and README.md with the new released version
+          command: |
+            RELEASE_BRANCH=$(git branch --contains ${CIRCLE_TAG} | awk 'FNR==2 {print $1}')
+
+            # Checkout branch
+            git checkout $RELEASE_BRANCH
+
+            # Retrieve the branch name
+            BRANCH_NAME=$(git rev-parse --abbrev-ref HEAD)
+
+            # Find the last two tags on the branch
+            LAST_TWO_TAGS=$(git log --pretty=format:"%D" --decorate=full ${BRANCH_NAME} | grep -o "tag: refs/tags/core-forms-components-reactor-[0-9.]*" | head -n 2)
+
+            # Extract the last released from the output
+            LAST_TAG=$(echo "$LAST_TWO_TAGS" | tail -n 1 | sed "s/tag: refs\/tags\///")
+
+            # If there is no previous release, use an empty string
+            if [[ -z "$LAST_TAG" ]]; then
+              LAST_TAG=""
+            fi
+
+            # Fetch the new version
+            NEW_VERSION=$(echo ${CIRCLE_TAG} | sed 's/^core-forms-components-reactor-//')
+
+            # Fetch the last released version
+            LAST_VERSION=$(echo "${LAST_TAG}" | sed 's/core-forms-components-reactor-//')
+
+            # Fetch the wcm core component version
+            WCM_CORE_COMPONENTS_VERSION=$(mvn help:evaluate -Dexpression=core.wcm.components.version -q -DforceStdout)
+
+            # update versions.md
+            sed -i "/$LAST_VERSION/ { p; b; }; 1,/$LAST_VERSION/ { p; d; }" VERSIONS.md
+            sed -i -E "0,/(\| $LAST_VERSION\s*\|) [0-9]+\.[0-9]+\.[0-9]+\s*\|/s//| $NEW_VERSION                \| $WCM_CORE_COMPONENTS_VERSION             |/" VERSIONS.md
+
+            # update readme.md
+            sed -i -E "s/(\| $LAST_VERSION\s*\|) [0-9]+\.[0-9]+\.[0-9]+ \s*\| /| $NEW_VERSION                | $WCM_CORE_COMPONENTS_VERSION             | /g" README.md
+
+            git add VERSIONS.md README.md
+            git commit -m "Update VERSIONS.md and README.md to include version ${NEW_VERSION}"
+            git push origin $RELEASE_BRANCH
 
 workflows:
   version: 2

bundles/af-core/pom.xml

@@ -89,6 +89,7 @@
 <!--                            javax.annotation;version=0.0.0,-->
                             <!-- https://github.com/jhy/jsoup/issues/1616 -->
                             javax.annotation;version=!;resolution:=optional,javax.annotation.meta;version=!;resolution:=optional,
+                            com.adobe.cq.wcm.core.components.models;version="[12.0.0,13.0.0)",
                             *
                         </Import-Package>
                         <Embed-Dependency>
@@ -165,7 +166,7 @@
                                                 <limit>
                                                     <counter>INSTRUCTION</counter>
                                                     <value>COVEREDRATIO</value>
-                                                    <minimum>0.60</minimum>
+                                                    <minimum>0.80</minimum>
                                                 </limit>
                                             </limits>
                                         </rule>
@@ -484,6 +485,7 @@
         <dependency>
             <groupId>com.adobe.aem</groupId>
             <artifactId>uber-jar</artifactId>
+            <classifier>apis</classifier>
         </dependency>
 
         <!-- End of AEM and forms sdk versions -->

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormConstants.java

@@ -103,5 +103,12 @@ private FormConstants() {
     /** The resource type for submit button v1 */
     public static final String RT_FD_FORM_RESET_BUTTON_V1 = RT_FD_FORM_PREFIX + "actions/reset/v1/reset";
 
+    /** The resource type for fragment v1 */
+    public static final String RT_FD_FORM_FRAGMENT_V1 = RT_FD_FORM_PREFIX + "fragment/v1/fragment";
+
+    public static final String RT_FD_FRAGMENT_CONTAINER_V1 = RT_FD_FORM_PREFIX + "fragmentcontainer/v1/fragmentcontainer";
+
     public static final String FORM_FIELD_TYPE = "form";
+
+    public static final String REQ_ATTR_FORMCONTAINER_PATH = "formContainerPath";
 }

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/form/FormStructureParserImpl.java

@@ -15,8 +15,10 @@
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
 package com.adobe.cq.forms.core.components.internal.form;
 
+import org.apache.sling.api.SlingHttpServletRequest;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.models.annotations.Model;
+import org.apache.sling.models.annotations.injectorspecific.InjectionStrategy;
 import org.apache.sling.models.annotations.injectorspecific.SlingObject;
 import org.jetbrains.annotations.Nullable;
 
@@ -25,10 +27,14 @@
 import com.adobe.cq.forms.core.components.util.ComponentUtils;
 
 @Model(
-    adaptables = Resource.class,
+    adaptables = { SlingHttpServletRequest.class, Resource.class },
     adapters = FormStructureParser.class)
 public class FormStructureParserImpl implements FormStructureParser {
 
+    @SlingObject(injectionStrategy = InjectionStrategy.OPTIONAL)
+    @Nullable
+    private SlingHttpServletRequest request;
+
     @SlingObject
     private Resource resource;
 
@@ -89,6 +95,9 @@ private FormContainer getFormContainer(@Nullable Resource resource) {
     }
 
     private String getFormContainerPath(Resource resource) {
+        if (request != null && request.getAttribute(FormConstants.REQ_ATTR_FORMCONTAINER_PATH) != null) {
+            return (String) request.getAttribute(FormConstants.REQ_ATTR_FORMCONTAINER_PATH);
+        }
         if (resource == null) {
             return null;
         }

bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImpl.java

@@ -33,6 +33,7 @@
 import com.adobe.cq.forms.core.components.internal.form.FormConstants;
 import com.adobe.cq.forms.core.components.models.form.CheckBox;
 import com.adobe.cq.forms.core.components.util.AbstractOptionsFieldImpl;
+import com.adobe.cq.forms.core.components.util.ComponentUtils;
 
 @Model(
     adaptables = { SlingHttpServletRequest.class, Resource.class },
@@ -67,4 +68,12 @@ public Orientation getOrientation() {
         return orientation;
     }
 
+    @Override
+    public Object[] getEnums() {
+        if (enums == null) {
+            return null;
+        } else {
+            return ComponentUtils.coerce(type, enums);
+        }
+    }
 }