Dev to master8 sep

ui.af.apps/src/main/content/jcr_root/apps/core/fd/components/form/container/v2/container/clientlibs/editorhook/js/toolbaractionhook.js

@@ -42,12 +42,15 @@
     };
 
     const correctEditableEditorType = function (editable, name) {
-        if (name == "EDIT") {
-            var hasRichTextLabel = editable.dom.find("[class$='__label']")[0] && editable.dom.find("[class$='__label']")[0].getAttribute("data-richtext") != null,
-                hasRichTextAttribute = editable.dom.find("[class$='__text']")[0] && editable.dom.find("[class$='__text']")[0].getAttribute("data-richtext") != null;
-            // We are checking for data-richtext in component to decide whether open rich-text inplace editor or plain text editor
-            if(!(hasRichTextLabel || hasRichTextAttribute)){
-                editable.config.editConfig.inplaceEditingConfig.editorType="plaintext";
+        if (name === "EDIT") {
+            const isAFComponent = editable.dom.find("[data-cmp-is^='adaptiveForm']")[0] != null;
+            if (isAFComponent) {
+                const hasRichTextLabel = editable.dom.find("[class$='__label']")[0] && editable.dom.find("[class$='__label']")[0].getAttribute("data-richtext") != null,
+                    hasRichTextAttribute = editable.dom.find("[class$='__text']")[0] && editable.dom.find("[class$='__text']")[0].getAttribute("data-richtext") != null;
+                // We are checking for data-richtext in component to decide whether open rich-text inplace editor or plain text editor
+                if (!(hasRichTextLabel || hasRichTextAttribute)) {
+                    editable.config.editConfig.inplaceEditingConfig.editorType = "plaintext";
+                }
             }
         }
     };

ui.apps/src/main/content/jcr_root/apps/core/fd/components/aemform/v2/aemform/aemform.html

@@ -68,15 +68,12 @@
 <sly data-sly-use.clientLib="${'/libs/granite/sightly/templates/clientlib.html'}"/>
 <sly data-sly-test.useIframe="${form.useIframe != 'false'}">
     <sly data-sly-test.formLocaleString="${form.locale || 'en'}"/>
-    <sly data-sly-set.dataRef="${request.requestParameterMap['dataRef'] ? request.requestParameterMap['dataRef'][0].toString :'' @ context='attribute'}"/>
-    <sly data-sly-set.wcmmode="${!wcmmode.edit?'wcmmode=DISABLED':''}"/>
-    <sly data-sly-set.formUrlParams="${wcmmode ? '?':''}${wcmmode}${dataRef ? '&dataRef=' :''}${dataRef}"/>
-     <iframe title="${form.title}"
-             role="${form.roleAttribute || ''}"
-             class="cmp-aemform__iframecontent"
-                src="${request.contextPath}${resource.path}.iframe.${formLocaleString}.html${formUrlParams}"
-                width="100%;"
-                data-form-page-path="${form.formEditPagePath}"></iframe>
+        <iframe title="${form.title}"
+                role="${form.roleAttribute || ''}"
+                class="cmp-aemform__iframecontent"
+            src="${request.contextPath}${resource.path}.iframe.${formLocaleString}.html?dataRef=${request.requestParameterMap['dataRef'] != null ? request.requestParameterMap['dataRef'][0].toString : '' @ context='attribute'}${!wcmmode.edit ? '&wcmmode={0}':'' @ format=[wcmmode.toString]}"
+            width="100%;"
+            data-form-page-path="${form.formEditPagePath}"></iframe>
     <sly data-sly-test="${form.useIframe != 'false' && form.height == 'auto'}"
          data-sly-call="${clientLib.all @ categories=['core.forms.components.aemform.v2.iframeResizer']}"/>
 </sly>

ui.frontend/src/constants.js

@@ -37,7 +37,7 @@ export const Constants = {
      * @property {object} event - The event object.
      * @property {object} event.detail - Instance of FormContainer that is initialized.
      * @example
-     * document.on("AF_FormContainerInitialised" , function(event) {
+     * document.addEventListener("AF_FormContainerInitialised" , function(event) {
      *      var formContainer = event.detail;
      *      // Handle the event
      * });
@@ -50,10 +50,15 @@ export const Constants = {
      * @property {object} event - The event object.
      * @property {object} event.detail - Instance of child view that is added.
      * @example
-     * formcontainer.getFormElement().on("AF_PanelInstanceAdded" , function(event) {
-     *      var childView = event.detail;
+     * document.addEventListener("AF_FormContainerInitialised" , function(event) {
+     *      var formContainer = event.detail;
      *      // Handle the event
+     *      formcontainer.getFormElement().addEventListener("AF_PanelInstanceAdded" , function(event) {
+     *          var childView = event.detail;
+     *          // Handle the event
+     *       });
      * });
+     *
      */
     PANEL_INSTANCE_ADDED : "AF_PanelInstanceAdded",
 
@@ -63,9 +68,13 @@ export const Constants = {
      * @property {object} event - The event object.
      * @property {object} event.detail - Instance of child view that was removed.
      * @example
-     * formcontainer.getFormElement().on("AF_PanelInstanceRemoved" , function(event) {
-     *      var childView = event.detail;
+     * document.addEventListener("AF_FormContainerInitialised" , function(event) {
+     *      var formContainer = event.detail;
      *      // Handle the event
+     *      formcontainer.getFormElement().addEventListener("AF_PanelInstanceRemoved" , function(event) {
+     *          var childView = event.detail;
+     *          // Handle the event
+     *      });
      * });
      */
     PANEL_INSTANCE_REMOVED : "AF_PanelInstanceRemoved",
@@ -76,7 +85,7 @@ export const Constants = {
      * @property {object} event - The event object.
      * @property {object} event.detail - The locale that has loaded.
      * @example
-     * document.on("AF_LanguageInitialised" , function(event) {
+     * document.addEventListener("AF_LanguageInitialised" , function(event) {
      *      var locale = event.detail;
      *      // Handle the event
      * });

ui.tests/test-module/specs/aemEmbedContainer/aemEmbedContainer.runtime.spec.js

@@ -48,15 +48,6 @@ describe("Sites with Aem Embed Container", () => {
             cy.get('.cmp-adaptiveform-container').should('have.length', 1);
             cy.get('.cmp-adaptiveform-container').find('.cmp-adaptiveform-textinput__widget').should('have.length', 11);
         })
-
-        it('Test iframe src with dataRef', () => {
-            cy.visit(pagePath+"?dataRef='testingDataRef'")
-            cy.get('.cmp-aemform__iframecontent').should('have.attr', 'src').should('include', "?wcmmode=DISABLED&dataRef='testingDataRef'");
-          });
-
-          it('Test iframe src without dataRef', () => {
-            cy.get('.cmp-aemform__iframecontent').should('have.attr', 'src').should('include', "?wcmmode=DISABLED");
-          });
     })
 
     context('aem embed container in iframe mode with custom height ', function () {

ui.tests/test-module/specs/formcontainer.spec.js

@@ -69,7 +69,7 @@ describe('Page/Form Authoring', function () {
         cy.openEditableToolbar(sitesSelectors.overlays.overlay.component + formContainerEditPathSelector);
         cy.invokeEditableAction("[data-action='CONFIGURE']");
         // Open auto save tab
-        cy.get('.cmp-adaptiveform-container'+'__editdialog').contains('Auto-save').click({force:true});
+        cy.get('.cmp-adaptiveform-container'+'__editdialog').contains('Drafts').click({force:true});
         cy.get("coral-checkbox[name='./fd:enableAutoSave']").should("exist");
         cy.get("coral-checkbox[name='./fd:enableAutoSave']").click({force:true});
         cy.get("coral-select[name='./fd:autoSaveStrategyType']").should("exist");