From f84c7b2149abb61c5ea8099d2481877139514119 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 21 Jun 2021 12:46:12 +1000
Subject: [PATCH 01/24] add contact links.

---
 .../main/java/design/aem/models/v2/details/ContactDetails.java  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
index c786b86ea..3daa3c869 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
@@ -70,6 +70,8 @@ protected void setFields() {
             {"email", StringUtils.EMPTY},
             {"contactNumber", StringUtils.EMPTY},
             {"contactNumberMobile", StringUtils.EMPTY},
+            {"linksType", new String[]{}},
+            {"linksContent", new String[]{}},
             {DETAILS_DATA_SCHEMA_ITEMSCOPE, DETAILS_DATA_SCHEMA_ITEMSCOPE, DETAILS_DATA_SCHEMA_ITEMSCOPE},
             {DETAILS_DATA_SCHEMA_ITEMTYPE, "http://schema.org/Person", DETAILS_DATA_SCHEMA_ITEMTYPE},
         });

From c1ebb772aa63b122d0fffeded359c3aabced67e4 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 21 Jun 2021 12:46:53 +1000
Subject: [PATCH 02/24] add search criteria for all tags in known components.

---
 .../main/java/design/aem/models/v2/lists/List.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
index a9ab0d035..9192ddae8 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
@@ -773,11 +773,15 @@ protected void populateTagListItems() {
                     childMap.put(groupPrefix + offset + tagIdSuffix, tag);
                     childMap.put(groupPrefix + offset + tagIdSuffix + ".property", JcrConstants.JCR_CONTENT.concat("/cq:tags"));
 
-                    // Offset the Page Details group by one so we don't conflict with the page properties query
-                    offset++;
+                    //add search criteria for all tags in known components.
+                    for (String path : DEFAULT_LIST_PAGE_CONTENT) {
+                        // Offset the any details group by one so we don't conflict with the page properties query
+                        offset++;
 
-                    childMap.put(groupPrefix + offset + tagIdSuffix, tag);
-                    childMap.put(groupPrefix + offset + tagIdSuffix + "property", JcrConstants.JCR_CONTENT.concat("/article/par/page_details/cq:tags"));
+                        childMap.put(groupPrefix + offset + tagIdSuffix, tag);
+                        childMap.put(groupPrefix + offset + tagIdSuffix + ".property", JcrConstants.JCR_CONTENT.concat(path).concat("/*/cq:tags"));
+
+                    }
                 }
 
                 populateListItemsFromMap(childMap);

From 7cbcde42d4b0fc5af610d8f83051236c953d926b Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 21 Jun 2021 13:10:17 +1000
Subject: [PATCH 03/24] add links to dialog.

---
 .../clientlibs/js/behaviour.js                | 49 ++++++++++++++++-
 .../contact-details/_cq_dialog/.content.xml   | 52 +++++++++++++++++++
 2 files changed, 100 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/clientlibs/js/behaviour.js b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/clientlibs/js/behaviour.js
index 6f7bff4a2..51df3cf69 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/clientlibs/js/behaviour.js
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/clientlibs/js/behaviour.js
@@ -16,13 +16,15 @@ window.AEMDESIGN.components.authoring.contactdetails = AEMDESIGN.components.auth
 
             console.log(["dialog-"+componentName+"-behaviour","loading"]);
 
-            //load content into field
+            //load content into pagedetails-pagemetadata field
             if ($("#dialog-"+componentName+"").find(".pagedetails-pagemetadata")[0]) {
 
+                console.log(["dialog-"+componentName+"-behaviour","loading", "pagedetails-pagemetadata"]);
                 var $form = $("#dialog-"+componentName+"").closest('form');
                 console.log(['$form', $form]);
                 var formUrl = $form[0].action;
                 $.getJSON(formUrl + '.json').done(function (data) {
+                    console.log(["pagedetails-pagemetadata",data]);
                     console.log(data);
                     var
                         fieldconfigKey = data.pageMetaProperty,
@@ -61,6 +63,51 @@ window.AEMDESIGN.components.authoring.contactdetails = AEMDESIGN.components.auth
                 console.log(["dialog-"+componentName+"-behaviour","pagedetails-pagemetadata","not found"]);
             }
 
+            //load content into pagedetails-sociallink field
+            if ($("#dialog-"+componentName+"").find(".pagedetails-sociallink")[0]) {
+              console.log(["dialog-"+componentName+"-behaviour","loading", "pagedetails-sociallink"]);
+              var $form = $("#dialog-"+componentName+"").closest('form');
+              console.log(['$form', $form, $form[0].action]);
+              var formUrl = $form[0].action;
+              $.getJSON(formUrl + '.json').done(function (data) {
+                console.log(["pagedetails-sociallink",formUrl,data]);
+                var
+                  fieldconfigKey = data.linksType,
+                  fieldconfigValue = data.linksContent;
+
+
+                if (fieldconfigKey) {
+                  //turn plain string into array
+                  if (typeof fieldconfigKey === 'string') {
+                    fieldconfigKey = [fieldconfigKey];
+                  }
+                  //turn plain string into array
+                  if (fieldconfigValue && (typeof fieldconfigValue === 'string')) {
+                    fieldconfigValue = [fieldconfigValue];
+                  }
+
+
+                  fieldconfigKey.forEach(function (key, index) {
+                    console.log(['field', fieldconfigKey[index], fieldconfigValue[index]]);
+                    var curr = $("#dialog-"+componentName+"").find(".pagedetails-sociallink")[0].items.add();
+                    Coral.commons.ready(curr, function (readyCurr) {
+                      $(readyCurr).find('[name="./linksType"]')[0].value = fieldconfigKey[index];
+                      $(readyCurr).find('[name="./linksContent"]')[0].value = fieldconfigValue[index];
+
+                    });
+                  });
+                }
+                else {
+                  //add empty row if needed
+                  //$(".pagedetails-pagemetadata")[0].items.add();
+                }
+
+
+              });
+
+            } else {
+              console.log(["dialog-"+componentName+"-behaviour","pagedetails-pagemetadata","not found"]);
+            }
 
         }
     });
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/_cq_dialog/.content.xml
index 5baeef5ce..a28843ea3 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/_cq_dialog/.content.xml
@@ -146,6 +146,58 @@
                                         resourceType="granite/ui/components/foundation/form/hidden"
                                         sling:resourceType="granite/ui/components/coral/foundation/include"/>
 
+
+                                    <fieldlinksmultifield
+                                        granite:class="pagedetails-sociallink"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
+                                        composite="{Boolean}false"
+                                        fieldLabel="Links">
+                                        <field
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/coral/foundation/container">
+                                            <items jcr:primaryType="nt:unstructured">
+                                                <linksType
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/coral/foundation/form/select"
+                                                    fieldLabel="Field"
+                                                    name="./linksType"
+                                                    emptyOption="{Boolean}true"
+                                                    required="{Boolean}true">
+                                                    <datasource
+                                                        jcr:primaryType="nt:unstructured"
+                                                        sling:resourceType="aemdesign/components/coral/datasources/tags"
+                                                        variant="valuelist"
+                                                        path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/sociallink/type"/>
+                                                </linksType>
+
+                                                <linksContent
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/textfield"
+                                                    fieldLabel="Content"
+                                                    name="./linksContent"
+                                                    required="{Boolean}true"/>
+                                            </items>
+                                        </field>
+                                    </fieldlinksmultifield>
+                                    <fieldlinksDelete
+                                        granite:hidden="{Boolean}true"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <pageMetaProperty
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/foundation/form/hidden"
+                                                name="./linksType@Delete"
+                                                value="{Boolean}true"/>
+                                            <pageMetaPropertyContent
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/foundation/form/hidden"
+                                                name="./linksContent@Delete"
+                                                value="{Boolean}true"/>
+                                        </items>
+                                    </fieldlinksDelete>
+
                                 </items>
                             </advanced>
 

From 64b439976d4ce723bbb39db712a7b3c3b91e3eb5 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 21 Jun 2021 13:32:36 +1000
Subject: [PATCH 04/24] add field for links content output.

---
 .../v1/generic-details/field/links.html             | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/links.html

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/links.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/links.html
new file mode 100644
index 000000000..1b9ae8062
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/links.html
@@ -0,0 +1,13 @@
+<template data-sly-template.field="${@ componentProperties}">
+  <div data-sly-test="${componentProperties.linksType && componentProperties.linksContent}"
+       class="card-links">
+    <ul data-sly-list.linkitem="${componentProperties.category}"
+        class="list">
+      <li class="list__item ${componentProperties.linksType[linkitem].value}">
+        <a href="${componentProperties.linksContent[linkitem] @ context='attribute'}"
+           title="${componentProperties.linksType[linkitem].title @ context='attribute'}"
+          >${componentProperties.linksType[linkitem].title @ context='text'}</a>
+      </li>
+    </ul>
+  </div>
+</template>

From bf5cefa2e9c012f3a4976a9b4d16e98a8afaf268 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 21 Jun 2021 13:37:17 +1000
Subject: [PATCH 05/24] convert links tags to tag map.

---
 .../java/design/aem/models/v2/details/ContactDetails.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
index 3daa3c869..2ae21ceda 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/details/ContactDetails.java
@@ -13,7 +13,7 @@
 import static design.aem.utils.components.CommonUtil.getPageCreated;
 import static design.aem.utils.components.ComponentsUtil.*;
 import static design.aem.utils.components.ConstantsUtil.*;
-import static design.aem.utils.components.TagUtil.getTagValueAsAdmin;
+import static design.aem.utils.components.TagUtil.*;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 public class ContactDetails extends GenericDetails {
@@ -106,6 +106,10 @@ protected Map<String, Object> processComponentFields() {
                 slingScriptHelper
             ).trim());
 
+            //convert links tags to tag content map
+            String[] tags = componentProperties.get("linksType", new String[]{});
+            componentProperties.put("linksType", getTagsAsAdmin(getSlingScriptHelper(), tags, getRequest().getLocale()));
+
         } catch (Exception ex) {
             LOGGER.error("Could not process component fields in {}", COMPONENT_DETAILS_NAME);
         }

From c2bb0b2c7af75932aa96c9a6729e8c7840e312bc Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 21 Jun 2021 14:01:04 +1000
Subject: [PATCH 06/24] add dialog type hints.

---
 .../v3/contact-details/_cq_dialog/.content.xml      | 13 ++++++++++++-
 .../global/dialog/touch/pageMetadata/.content.xml   | 10 ++++++++++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/_cq_dialog/.content.xml
index a28843ea3..8d4df376d 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/contact-details/v3/contact-details/_cq_dialog/.content.xml
@@ -167,9 +167,14 @@
                                                     <datasource
                                                         jcr:primaryType="nt:unstructured"
                                                         sling:resourceType="aemdesign/components/coral/datasources/tags"
-                                                        variant="valuelist"
+                                                        variant="tagidvalue"
                                                         path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/sociallink/type"/>
                                                 </linksType>
+                                                <linksTypeHint
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/hidden"
+                                                    name="./linksType@TypeHint"
+                                                    value="String[]"/>
 
                                                 <linksContent
                                                     jcr:primaryType="nt:unstructured"
@@ -177,6 +182,12 @@
                                                     fieldLabel="Content"
                                                     name="./linksContent"
                                                     required="{Boolean}true"/>
+                                                <linksContentHint
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/hidden"
+                                                    name="./linksContent@TypeHint"
+                                                    value="String[]"/>
+
                                             </items>
                                         </field>
                                     </fieldlinksmultifield>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/pageMetadata/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/pageMetadata/.content.xml
index 847dfe7c3..4d497c455 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/pageMetadata/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/global/dialog/touch/pageMetadata/.content.xml
@@ -68,6 +68,11 @@
                                                             variant="valuelist"
                                                             path="/content/cq:tags/${(empty tenant.id and empty tenantId) ? 'aemdesign' : (empty tenant.id ? tenantId : tenant.id )}/component-dialog/html/metadata/properties"/>
                                                 </pageMetaProperty>
+                                                <pageMetaPropertyHint
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/hidden"
+                                                    name="./pageMetaProperty@TypeHint"
+                                                    value="String[]"/>
 
                                                 <pageMetaPropertyContent
                                                         jcr:primaryType="nt:unstructured"
@@ -75,6 +80,11 @@
                                                         fieldLabel="Content"
                                                         name="./pageMetaPropertyContent"
                                                         required="{Boolean}true"/>
+                                                <pageMetaPropertyContentHint
+                                                    jcr:primaryType="nt:unstructured"
+                                                    sling:resourceType="granite/ui/components/foundation/form/hidden"
+                                                    name="./pageMetaPropertyContent@TypeHint"
+                                                    value="String[]"/>
                                             </items>
                                         </field>
                                     </fieldconfigmultifield>

From 62a046fc7aa51507cf1cf4ca32593d8367808ec4 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Mon, 21 Jun 2021 16:06:39 +1000
Subject: [PATCH 07/24] update link field output.

---
 .../v1/generic-details/field/links.html               | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/links.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/links.html
index 1b9ae8062..5cfa0e2ac 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/links.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/details/generic-details/v1/generic-details/field/links.html
@@ -1,12 +1,11 @@
 <template data-sly-template.field="${@ componentProperties}">
   <div data-sly-test="${componentProperties.linksType && componentProperties.linksContent}"
        class="card-links">
-    <ul data-sly-list.linkitem="${componentProperties.category}"
-        class="list">
-      <li class="list__item ${componentProperties.linksType[linkitem].value}">
-        <a href="${componentProperties.linksContent[linkitem] @ context='attribute'}"
-           title="${componentProperties.linksType[linkitem].title @ context='attribute'}"
-          >${componentProperties.linksType[linkitem].title @ context='text'}</a>
+    <ul data-sly-list="${componentProperties.linksType}" class="list">
+      <li class="list__item ${componentProperties.linksType[item].value}">
+        <a href="${componentProperties.linksContent[itemList.index] @ context='attribute'}"
+           title="${componentProperties.linksType[item].title @ context='attribute'}"
+        >${componentProperties.linksType[item].title @ context='text'}</a>
       </li>
     </ul>
   </div>

From 8384a8883b1af880b19615674d174f652f2cd590 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 22 Jun 2021 10:32:07 +1000
Subject: [PATCH 08/24] add container badge so that it can be selected easier
 in authoring.

---
 .../apps/aemdesign/components/layout/container/container.html | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/container.html

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/container.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/container.html
new file mode 100644
index 000000000..8611ea265
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/layout/container/container.html
@@ -0,0 +1,4 @@
+<sly data-sly-include="/libs/wcm/foundation/components/responsivegrid/responsivegrid.html"></sly>
+<!--/* print component info in edit mode */-->
+<sly data-sly-use.info="aemdesign/global/templates/component-info-simple.html"
+    data-sly-call="${info.variant @ title='Responsive Grid'}"></sly>

From 103a9d62fc05229ab63905653181e8b3752fe89c Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 22 Jun 2021 10:40:34 +1000
Subject: [PATCH 09/24] add tab for allowing author to import paragraphs using
 dialog.

---
 .../contentfragment/_cq_dialog/.content.xml   | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/_cq_dialog/.content.xml

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/_cq_dialog/.content.xml
new file mode 100644
index 000000000..bb9f8ff40
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/_cq_dialog/.content.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:granite="http://www.adobe.com/jcr/granite/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    jcr:primaryType="nt:unstructured"
+    jcr:title="Content Fragment"
+    sling:resourceType="cq/gui/components/authoring/dialog"
+    extraClientlibs="[core.wcm.components.contentfragment.v1.dialog]"
+    helpPath="https://www.adobe.com/go/aem_cmp_contentfragment_v1"
+    trackingFeature="core-components:contentfragment:v1">
+    <content
+        granite:class="cmp-contentfragment__editor"
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="granite/ui/components/coral/foundation/container">
+        <items jcr:primaryType="nt:unstructured">
+            <tabs
+                jcr:primaryType="nt:unstructured"
+                sling:resourceType="granite/ui/components/coral/foundation/tabs"
+                maximized="{Boolean}true">
+                <items jcr:primaryType="nt:unstructured">
+                    <paragraphcontentimport
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Paragraph Content Import"
+                        sling:resourceType="granite/ui/components/coral/foundation/container"
+                        margin="{Boolean}true"
+                        granite:hidden="{Boolean}true">
+                        <granite:rendercondition
+                            jcr:primaryType="nt:unstructured"
+                            sling:resourceType="granite/ui/components/coral/foundation/renderconditions/simple"
+                            expression="false">
+                        </granite:rendercondition>
+                        <items jcr:primaryType="nt:unstructured">
+                            <paragraphcontentimport
+                                granite:class="cmp-contentfragment__editor-paragraph-content-import"
+                                jcr:primaryType="nt:unstructured"
+                                sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                <granite:data
+                                    jcr:primaryType="nt:unstructured"
+                                    field-path="${requestPathInfo.resourcePath}"/>
+                                <items jcr:primaryType="nt:unstructured">
+                                    <content
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <paragraphcontentimport
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/button"
+                                                granite:class="js-contentfragment-importassets"
+                                                text="Import Paragraph Content"
+                                                formId="./paragraphContentImportAction"/>
+                                            <paragraphcontentimportinfo
+                                                granite:class="paragraphcontentimportinfo"
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/text"
+                                                text="Import paragraph assets content into page."/>
+                                        </items>
+                                    </content>
+                                </items>
+                            </paragraphcontentimport>
+                        </items>
+                    </paragraphcontentimport>
+                </items>
+            </tabs>
+        </items>
+    </content>
+</jcr:root>

From 8966f42500bebb0573430cad18795438b3b4867a Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 22 Jun 2021 10:41:03 +1000
Subject: [PATCH 10/24] remove duplicate badge.

---
 .../components/content/contentfragment/templates.html         | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/templates.html b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/templates.html
index 9138c6b14..0de072906 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/templates.html
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/templates.html
@@ -30,10 +30,6 @@
     </div>
   </div>
 
-  <!--/* print component info in edit mode */-->
-  <sly data-sly-use.info="aemdesign/global/templates/component-info-simple.html"
-       data-sly-call="${info.variant @ title='Content Fragment'}"></sly>
-
 </template>
 
 <template data-sly-template.elements="${@ fragment='The content fragment', wcmmode='WCM mode'}">

From 3998d5a0037a63f91f274686f698d6844818df1b Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 22 Jun 2021 10:42:03 +1000
Subject: [PATCH 11/24] add clientlibs for allowing author to import paragraphs
 using dialog.

---
 .../clientlibs-import/.content.xml            |   3 +
 .../clientlibs-import/editor/.content.xml     |   3 +
 .../editor/dialog/.content.xml                |   4 +
 .../clientlibs-import/editor/dialog/js.txt    |   2 +
 .../editor/dialog/js/import-content.js        | 329 ++++++++++++++++++
 5 files changed, 341 insertions(+)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/js.txt
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/js/import-content.js

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/.content.xml
new file mode 100644
index 000000000..491392d53
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/.content.xml
@@ -0,0 +1,3 @@
+<?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"
+    jcr:primaryType="sling:Folder"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/.content.xml
new file mode 100644
index 000000000..491392d53
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/.content.xml
@@ -0,0 +1,3 @@
+<?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"
+    jcr:primaryType="sling:Folder"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/.content.xml
new file mode 100644
index 000000000..04103836f
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/.content.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:primaryType="cq:ClientLibraryFolder"
+    categories="[core.wcm.components.contentfragment.v1.dialog]"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/js.txt b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/js.txt
new file mode 100644
index 000000000..116acb4dd
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/js.txt
@@ -0,0 +1,2 @@
+#base=js
+import-content.js
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/js/import-content.js b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/js/import-content.js
new file mode 100644
index 000000000..b40acc301
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/clientlibs-import/editor/dialog/js/import-content.js
@@ -0,0 +1,329 @@
+(function(window, $, channel, Granite, Coral) {
+    "use strict";
+
+    // class of the edit dialog content
+    var CLASS_EDIT_DIALOG = "cmp-contentfragment__editor";
+
+    // field selectors
+    var SELECTOR_FRAGMENT_PATH = "[name='./fragmentPath']";
+    var SELECTOR_ELEMENT_NAMES_CONTAINER = "[data-element-names-container='true']";
+    var SELECTOR_ELEMENT_NAMES = "[data-granite-coral-multifield-name='./elementNames']";
+    var SELECTOR_SINGLE_TEXT_ELEMENT = "[data-single-text-selector='true']";
+    var SELECTOR_VARIATION_NAME = "[name='./variationName']";
+    var SELECTOR_DISPLAY_MODE_RADIO_GROUP = "[data-display-mode-radio-group='true']";
+    var SELECTOR_DISPLAY_MODE_CHECKED = "[name='./displayMode']:checked";
+    var SELECTOR_PARAGRAPH_CONTENT_IMPORT_CONTROLS = ".cmp-contentfragment__editor-paragraph-content-import";
+    var SELECTOR_PARAGRAPH_IMPORT_ACTION = ".js-contentfragment-importassets";
+    var SELECTOR_PARAGRAPH_IMPORT_ACTION_INFO = ".paragraphcontentimportinfo";
+
+    // mode in which only one multiline text element could be selected for display
+    var SINGLE_TEXT_DISPLAY_MODE = "singleText";
+
+    // ui helper
+    var ui = $(window).adaptTo("foundation-ui");
+
+    // dialog texts
+    var confirmationDialogTitle = Granite.I18n.get("Warning");
+    var confirmationDialogMessage = Granite.I18n.get("Please confirm replacing the current content fragment and its configuration");
+    var confirmationDialogCancel = Granite.I18n.get("Cancel");
+    var confirmationDialogConfirm = Granite.I18n.get("Confirm");
+    var errorDialogTitle = Granite.I18n.get("Error");
+    var errorDialogMessage = Granite.I18n.get("Failed to load the elements of the selected content fragment");
+
+    // the fragment path field (foundation autocomplete)
+    var fragmentPath;
+
+    // the paragraph controls (field set)
+    var contentImportControls;
+    // the tab containing paragraph control
+    var contentImportControlsTab;
+
+    // keeps track of the current fragment path
+    var currentFragmentPath;
+
+    var editDialog;
+
+    var elementsController;
+
+    var importAssetsAction;
+    var importAssetsActionInfo;
+
+    /**
+     * A class which encapsulates the logic related to element selectors and variation name selector.
+     */
+    var ElementsController = function() {
+        this._updateFields();
+    };
+
+    /**
+     * Updates the member fields of this class according to current dom of dialog.
+     */
+    ElementsController.prototype._updateFields = function() {
+        this.elementImportContentAction = editDialog.querySelector(SELECTOR_PARAGRAPH_IMPORT_ACTION);
+        this.singleTextSelector = editDialog.querySelector(SELECTOR_SINGLE_TEXT_ELEMENT);
+    };
+
+  /**
+   * Disable all the fields of this controller.
+   */
+  ElementsController.prototype.toggleFields = function() {
+    console.log(["this.singleTextSelector",this.singleTextSelector]);
+    if (this.singleTextSelector == null) {
+      this.disableFields();
+    } else if (this.singleTextSelector.value === "") {
+      this.disableFields();
+    } else {
+      this.enableFields();
+    }
+  };
+
+    /**
+     * Disable all the fields of this controller.
+     */
+    ElementsController.prototype.disableFields = function() {
+        if (this.elementImportContentAction && this.singleTextSelector.value === "") {
+            this.elementImportContentAction.setAttribute("disabled", "");
+        }
+    };
+
+    /**
+     * Enable all the fields of this controller.
+     */
+    ElementsController.prototype.enableFields = function() {
+        if (this.elementImportContentAction && this.singleTextSelector.value !== "") {
+            this.elementImportContentAction.removeAttribute("disabled");
+        }
+    };
+
+    /**
+     * Resets all the fields of this controller.
+     */
+    ElementsController.prototype.resetFields = function() {
+    };
+
+    /**
+     * Creates an http request object for retrieving fragment's element names or variation names and returns it.
+     *
+     * @param {String} displayMode - displayMode parameter for element name request. Should be "singleText" or "multi"
+     * @param {String} type - type of request. It can have the following values -
+     * 1. "variation" for getting variation names
+     * 2. "elements" for getting element names
+     * @returns {Object} the resulting request
+     */
+    ElementsController.prototype.prepareRequest = function(displayMode, type) {
+        if (typeof displayMode === "undefined") {
+            displayMode = editDialog.querySelector(SELECTOR_DISPLAY_MODE_CHECKED).value;
+        }
+        var data = {
+            fragmentPath: fragmentPath.value,
+            displayMode: displayMode
+        };
+        var url;
+        if (type === "variation") {
+            url = Granite.HTTP.externalize(this.variationNamePath) + ".html";
+        } else if (type === "elements") {
+            url = Granite.HTTP.externalize(this.elementsContainerPath) + ".html";
+        }
+        var request = $.get({
+            url: url,
+            data: data
+        });
+        return request;
+    };
+
+    /**
+     * Retrieve element names and update the current element names with the retrieved data.
+     *
+     * @param {String} displayMode - selected display mode of the component
+     */
+    ElementsController.prototype.fetchAndUpdateElementsHTML = function(displayMode) {
+        var elementNamesRequest = this.prepareRequest(displayMode, "elements");
+        var self = this;
+        // wait for requests to load
+        $.when(elementNamesRequest).then(function(result) {
+            self._updateElementsHTML(result);
+        }, function() {
+            // display error dialog if one of the requests failed
+            ui.prompt(errorDialogTitle, errorDialogMessage, "error");
+        });
+    };
+
+    /**
+     * Updates inner html of element container.
+     *
+     * @param {String} html - outerHTML value for elementNamesContainer
+     */
+    ElementsController.prototype._updateElementsHTML = function(html) {
+        //this.elementNamesContainer.innerHTML = $(html)[0].innerHTML;
+        this._updateFields();
+    };
+
+    /**
+     * Updates dom of element container with the passed dom. If the passed dom is multifield, the current multifield
+     * template would be replaced with the dom's template otherwise the dom would used as the new singleTextSelector
+     * member.
+     *
+     * @param {HTMLElement} dom - new dom
+     */
+    ElementsController.prototype._updateElementsDOM = function(dom) {
+        if (dom.tagName === "CORAL-MULTIFIELD") {
+            // replace the element names multifield's template
+            this.elementNames.template = dom.template;
+        } else {
+            dom.value = this.singleTextSelector.value;
+            this.singleTextSelector.parentNode.replaceChild(dom, this.singleTextSelector);
+            this.singleTextSelector = dom;
+            this.singleTextSelector.removeAttribute("disabled");
+        }
+        this._updateFields();
+    };
+
+    /**
+     * Updates dom of variation name select dropdown.
+     *
+     * @param {HTMLElement} dom - dom for variation name dropdown
+     */
+    ElementsController.prototype._updateVariationDOM = function(dom) {
+        // replace the variation name select, keeping its value
+        dom.value = this.variationName.value;
+        this.variationName.parentNode.replaceChild(dom, this.variationName);
+        this.variationName = dom;
+        this.variationName.removeAttribute("disabled");
+        this._updateFields();
+    };
+
+    /**
+     * Executes after the fragment path has changed. Shows a confirmation dialog to the user if the current
+     * configuration is to be reset and updates the fields to reflect the newly selected content fragment.
+     */
+    function onFragmentPathChange() {
+        console.log(["onFragmentPathChange",fragmentPath]);
+
+        // if the fragment was reset (i.e. the fragment path was deleted)
+        if (!fragmentPath.value) {
+            currentFragmentPath = fragmentPath.value;
+            elementsController.disableFields();
+        } else {
+          console.log(["onFragmentPathChange",fragmentPath]);
+          currentFragmentPath = fragmentPath.value;
+          elementsController.enableFields();
+        }
+
+
+    }
+
+    /**
+     * Compares two arrays containing select items, returning true if the arrays have the same size and all contained
+     * items have the same value and label.
+     *
+     * @param {Array} a1 - first array to compare
+     * @param {Array} a2 - second array to compare
+     * @returns {Boolean} true if both arrays are equal, false otherwise
+     */
+    function itemsAreEqual(a1, a2) {
+        // verify that the arrays have the same length
+        if (a1.length !== a2.length) {
+            return false;
+        }
+        for (var i = 0; i < a1.length; i++) {
+            var item1 = a1[i];
+            var item2 = a2[i];
+            if (item1.attributes.value.value !== item2.attributes.value.value ||
+                item1.textContent !== item2.textContent) {
+                // the values or labels of the current items didn't match
+                return false;
+            }
+        }
+        return true;
+    }
+
+    // Toggles the display of paragraph control tab depending on display mode
+    function updateParagraphImportTabState() {
+
+      var displayMode = editDialog.querySelector(SELECTOR_DISPLAY_MODE_CHECKED).value;
+      if (displayMode === SINGLE_TEXT_DISPLAY_MODE) {
+        contentImportControlsTab.hidden = false;
+        updateParagraphImportState();
+      } else {
+        contentImportControlsTab.hidden = true;
+      }
+
+    }
+
+    // Toggles the display of paragraph control tab depending on display mode
+    function updateParagraphImportState() {
+      elementsController._updateFields();
+      elementsController.toggleFields();
+    }
+
+    /**
+     * Initializes the dialog after it has loaded.
+     */
+    channel.on("foundation-contentloaded", function(e) {
+        if (e.target.getElementsByClassName(CLASS_EDIT_DIALOG).length > 0) {
+            Coral.commons.ready(e.target, function(dialog) {
+                initialize(dialog);
+            });
+        }
+    });
+
+
+    function initialize(dialog) {
+      // get path of component being edited
+      editDialog = dialog;
+      // get the fields
+      fragmentPath = dialog.querySelector(SELECTOR_FRAGMENT_PATH);
+
+      contentImportControls = dialog.querySelector(SELECTOR_PARAGRAPH_CONTENT_IMPORT_CONTROLS);
+      //get Content Import tab
+      contentImportControlsTab = dialog.querySelector("coral-tabview").tabList.items.getAll()[2];
+      // paragraphControlsTab = dialog.querySelector("coral-tabview").tabList.items.getAll()[2];
+
+      importAssetsAction = dialog.querySelector(SELECTOR_PARAGRAPH_IMPORT_ACTION);
+      importAssetsActionInfo = dialog.querySelector(SELECTOR_PARAGRAPH_IMPORT_ACTION_INFO);
+
+      console.log(["fragmentPath",fragmentPath]);
+      console.log(["contentImportControls",contentImportControls]);
+      console.log(["contentImportControlsTab",contentImportControlsTab]);
+      console.log(["importAssetsAction",importAssetsAction]);
+      console.log(["importAssetsActionInfo",importAssetsActionInfo]);
+
+
+      // initialize state variables
+      currentFragmentPath = fragmentPath.value;
+      elementsController = new ElementsController();
+
+      console.log(["importAssetsActionInfo",elementsController.singleTextSelector]);
+
+      // disable add button and variation name if no content fragment is currently set
+      if (!currentFragmentPath) {
+        elementsController.disableFields();
+      }
+      // register change listener
+      $(fragmentPath).on("foundation-field-change", onFragmentPathChange);
+
+      //update state when Single Element is updated
+      $(document).on("change", SELECTOR_SINGLE_TEXT_ELEMENT, updateParagraphImportState);
+
+      //update state when Single or Multiple is changed
+      var $radioGroup = $(dialog).find(SELECTOR_DISPLAY_MODE_RADIO_GROUP);
+      $radioGroup.on("change", function(e) {
+        updateParagraphImportTabState();
+      });
+
+      //when activated allow asset import
+      if (importAssetsAction) {
+
+        $(document).on("click", ".js-contentfragment-importassets", function (e) {
+          console.log("import assets.");
+        });
+
+        console.log("activated on: "+ importAssetsAction);
+      }
+
+      console.log("aemdesign content fragment dialog extension loaded")
+
+    }
+
+
+})(window, jQuery, jQuery(document), Granite, Coral);

From c4e7da7500471ea8d32f7ebf5d25a0e5ece50fb3 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Tue, 22 Jun 2021 10:42:36 +1000
Subject: [PATCH 12/24] update content after export.

---
 .../content/contentfragment/.content.xml        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/.content.xml
index a5af36f9c..377301a63 100755
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/content/contentfragment/.content.xml
@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0"
-          xmlns:jcr="http://www.jcp.org/jcr/1.0"
-          jcr:primaryType="cq:Component"
-          jcr:title="Content Fragment"
-          jcr:description="Component that allows to display a single text element or multiple elements of a content fragment."
-          cq:isContainer="{Boolean}true"
-          cq:icon="fileTemplate"
-          sling:resourceSuperType="core/wcm/components/contentfragment/v1/contentfragment"
-          componentGroup="AEM.Design - Content"/>
+<jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    cq:icon="fileTemplate"
+    cq:isContainer="{Boolean}true"
+    jcr:description="Component that allows to display a single text element or multiple elements of a content fragment."
+    jcr:primaryType="cq:Component"
+    jcr:title="Content Fragment"
+    sling:resourceSuperType="core/wcm/components/contentfragment/v1/contentfragment"
+    componentGroup="AEM.Design - Content"/>

From fab3b07a5f60c53c7bd2ae14c557d7f38dacb7d4 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 23 Jun 2021 11:56:22 +1000
Subject: [PATCH 13/24] update dialog.

---
 .../_cq_dialog/.content.xml                   | 367 +++++++++++++++---
 1 file changed, 321 insertions(+), 46 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
index ccc661028..41a34c243 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
@@ -7,7 +7,7 @@
           sling:resourceType="cq/gui/components/authoring/dialog"
           extraClientlibs="[cq.workflow-util]">
     <content
-        granite:id="worfklow-processpayload"
+        granite:id="worfklow-contentfragmentpagegen"
         jcr:primaryType="nt:unstructured"
         sling:resourceType="granite/ui/components/coral/foundation/tabs">
         <items jcr:primaryType="nt:unstructured">
@@ -61,63 +61,112 @@
                                         name="./metaData/PROCESS_AUTO_ADVANCE"
                                         text="Handler Advance"
                                         value="true"/>
+
                                 </items>
                             </advanced>
+
                         </items>
                     </column>
                 </items>
             </processcommon>
-            <processargs
+
+            <segmentation
                 jcr:primaryType="nt:unstructured"
-                jcr:title="Config"
+                jcr:title="Segmentation"
                 sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns">
                 <items jcr:primaryType="nt:unstructured">
                     <column
                         jcr:primaryType="nt:unstructured"
                         sling:resourceType="granite/ui/components/coral/foundation/container">
                         <items jcr:primaryType="nt:unstructured">
-                            <arguments
+                            <segmentation
                                 jcr:primaryType="nt:unstructured"
-                                jcr:title="Basic"
+                                jcr:title="Segmentation"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
                                 <items jcr:primaryType="nt:unstructured">
                                     <info
                                         granite:class="fieldDescription"
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/text"
-                                        text="When you define a field and its relevant path in payload, it will be collected from playload and saved into the workflow for processing and usage in other steps, such as Email."/>
-                                    <templatePage
+                                        text="Do you want to segment pages to match content fragment hierarchy?&#xa;"/>
+
+                                    <segmentationUsingPaths
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/foundation/form/select"
+                                        fieldDescription="Create content component in page root, default: false"
+                                        fieldLabel="Create Content Fragment Component"
+                                        name="./metaData/segmentationUsingPaths"
+                                        emptyOption="{Boolean}true"
+                                        value="">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <true
+                                                jcr:primaryType="nt:unstructured"
+                                                text="Yes"
+                                                value="true"/>
+                                            <false
+                                                jcr:primaryType="nt:unstructured"
+                                                text="No"
+                                                value="false"/>
+                                        </items>
+                                    </segmentationUsingPaths>
+
+                                    <contentFragmentRootPath
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
-                                        fieldDescription="Please select template to use when generating pages."
-                                        fieldLabel="Page Template"
+                                        fieldDescription="Select root path of content fragments."
+                                        fieldLabel="Content Fragments Root Path"
                                         filter="hierarchyNotFile"
-                                        name="./metaData/templatePage"
+                                        name="./metaData/contentFragmentRootPath"
                                         required="{Boolean}true"
-                                        rootPath="/"/>
-                                    <outputLocation
+                                        rootPath="/content/dam"/>
+                                    <contentFragmentRootPathInfo
+                                        granite:class="fieldDescription"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/text"
+                                        text="Select root path of content fragments.&#xa; - Hierarchy leading up to the content fragment will be used as segmentation when making new pages.&#xa; - This should be the path that workflow will be watching using launcher.&#xa;"/>
+
+                                    <segmentationTemplatePage
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
-                                        fieldDescription="Please select output location for generated pages."
-                                        fieldLabel="Output Location"
+                                        fieldDescription="Select template to use when creating intermediate pages."
+                                        fieldLabel="Segmentation Page Template"
                                         filter="hierarchyNotFile"
-                                        name="./metaData/outputLocation"
+                                        name="./metaData/segmentationTemplatePage"
                                         required="{Boolean}true"
-                                        rootPath="/"/>
-
+                                        rootPath="/conf"/>
+                                    <segmentationTemplatePageInfo
+                                        granite:class="fieldDescription"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/text"
+                                        text="Select template to use when creating intermediate pages."/>
 
                                 </items>
-                            </arguments>
+                            </segmentation>
+                        </items>
+                    </column>
+                </items>
+            </segmentation>
+
+            <config
+                jcr:primaryType="nt:unstructured"
+                jcr:title="CF Config"
+                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns">
+                <items jcr:primaryType="nt:unstructured">
+                    <column
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
                             <common
                                 jcr:primaryType="nt:unstructured"
-                                jcr:title="Common"
+                                jcr:title="Content Fragment Config"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
                                 <items jcr:primaryType="nt:unstructured">
                                     <info
                                         granite:class="fieldDescription"
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/text"
-                                        text="Defaults for this items are configured by system administrator."/>
+                                        text="What attribute should be used when adding reference to content fragment being used.&#xa;"/>
+
 
                                     <contentFragmentAttributeName
                                         jcr:primaryType="nt:unstructured"
@@ -125,21 +174,113 @@
                                         fieldDescription="Attribute Name for path to content fragment, default: fragmentPath"
                                         fieldLabel="Content Fragment Attribute Name"
                                         default=""
+                                        emptyText="fragmentPath"
                                         name="./metaData/contentFragmentAttributeName"/>
 
+                                    <info2
+                                        granite:class="fieldDescription"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/text"
+                                        text="Do you want to segment pages to match content fragment hierarchy?&#xa;"/>
+
+                                    <arguments
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Template"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <templatePage
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
+                                                fieldDescription="Select template to use when generating pages."
+                                                fieldLabel="Page Template"
+                                                filter="hierarchyNotFile"
+                                                name="./metaData/templatePage"
+                                                required="{Boolean}true"
+                                                rootPath="/conf"/>
+                                            <templatePageInfo
+                                                granite:class="fieldDescription"
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/text"
+                                                text="Select template to use for creating new pages."/>
+
+                                            <outputLocation
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
+                                                fieldDescription="Select output location for generated pages."
+                                                fieldLabel="Output Location"
+                                                filter="hierarchyNotFile"
+                                                name="./metaData/outputLocation"
+                                                required="{Boolean}true"
+                                                rootPath="/content"/>
+                                            <outputLocationInfo
+                                                granite:class="fieldDescription"
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/text"
+                                                text="Select location where you would like to create new pages."/>
+
+                                        </items>
+                                    </arguments>
+
+                                    <throttle
+                                        jcr:primaryType="nt:unstructured"
+                                        jcr:title="Throttle"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                        <items jcr:primaryType="nt:unstructured">
+
+                                            <throttle
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/foundation/form/select"
+                                                fieldDescription="Process will throttle it self depending on system resources."
+                                                fieldLabel="Throttle execution of page generation."
+                                                name="./metaData/throttle"
+                                                emptyOption="{Boolean}true"
+                                                value="">
+                                                <items jcr:primaryType="nt:unstructured">
+                                                    <true
+                                                        jcr:primaryType="nt:unstructured"
+                                                        text="Yes"
+                                                        value="true"/>
+                                                    <false
+                                                        jcr:primaryType="nt:unstructured"
+                                                        text="No"
+                                                        value="false"/>
+                                                </items>
+                                            </throttle>
+                                        </items>
+                                    </throttle>
+
+
                                 </items>
                             </common>
+                        </items>
+                    </column>
+                </items>
+            </config>
+            <create
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Create"
+                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns">
+                <items jcr:primaryType="nt:unstructured">
+                    <column
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
                             <create
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Create"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
                                 <items jcr:primaryType="nt:unstructured">
+                                    <info
+                                        granite:class="fieldDescription"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/text"
+                                        text="Create a new content fragment in the new page?&#xa;"/>
 
                                     <contentFragmentComponentCreate
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/foundation/form/select"
                                         fieldDescription="Create content component in page root, default: false"
-                                        fieldLabel="Create Content Fragment Component"
+                                        fieldLabel="Create new Content Fragment Component"
                                         name="./metaData/contentFragmentComponentCreate"
                                         emptyOption="{Boolean}true"
                                         value="">
@@ -166,14 +307,16 @@
                                         fieldDescription="Resource type for Content Fragment component, default: aemdesign/components/content/contentfragment"
                                         fieldLabel="Content Fragment Component Resource Type"
                                         default=""
+                                        emptyText="aemdesign/components/content/contentfragment"
                                         name="./metaData/contentFragmentComponentResourceType"/>
 
                                     <contentFragmentComponentPageRootPath
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                        fieldDescription="Resource type for Content Fragment component, default: aemdesign/components/content/contentfragment"
+                                        fieldDescription="Path for the new Content Fragment component, default: root/article/par"
                                         fieldLabel="Content Fragment Component Resource Type"
                                         default=""
+                                        emptyText="root/article/par"
                                         name="./metaData/contentFragmentComponentPageRootPath"/>
 
                                     <contentFragmentComponentNodeName
@@ -182,33 +325,36 @@
                                         fieldDescription="Name of new content fragment component node, default: contentfragment"
                                         fieldLabel="Content Fragment Component Node Name"
                                         default=""
+                                        emptyText="contentfragment"
                                         name="./metaData/contentFragmentComponentNodeName"/>
 
 
                                 </items>
                             </create>
+                        </items>
+                    </column>
+                </items>
+            </create>
+            <update
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Update"
+                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns">
+                <items jcr:primaryType="nt:unstructured">
+                    <column
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
                             <update
                                 jcr:primaryType="nt:unstructured"
                                 jcr:title="Update"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
                                 <items jcr:primaryType="nt:unstructured">
 
-
-                                    <updateExistingRootPath
-                                        jcr:primaryType="nt:unstructured"
-                                        sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
-                                        fieldDescription="Page root paths that will be used to check for components to update, default: article/par"
-                                        fieldLabel="Page Root Paths to check for components">
-                                        <field
-                                            jcr:primaryType="nt:unstructured"
-                                            name="./metaData/updateExistingRootPath"
-                                            sling:resourceType="granite/ui/components/coral/foundation/form/textfield"/>
-                                    </updateExistingRootPath>
-                                    <updateExistingRootPathTypeHint
+                                    <info
+                                        granite:class="fieldDescription"
                                         jcr:primaryType="nt:unstructured"
-                                        sling:resourceType="granite/ui/components/foundation/form/hidden"
-                                        name="./updateExistingRootPath@TypeHint"
-                                        value="String[]"/>
+                                        sling:resourceType="granite/ui/components/coral/foundation/text"
+                                        text="Update existing component in the new page."/>
 
                                     <updateExistingComponent
                                         jcr:primaryType="nt:unstructured"
@@ -235,6 +381,24 @@
                                         name="./updateExistingComponent@TypeHint"
                                         value="Boolean"/>
 
+                                    <updateExistingRootPath
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
+                                        fieldDescription="Page root paths that will be used to check for components to update, default: root/article/par"
+                                        fieldLabel="Page Root Paths to check for components">
+                                        <field
+                                            jcr:primaryType="nt:unstructured"
+                                            name="./metaData/updateExistingRootPath"
+                                            emptyText="root/article/par"
+                                            sling:resourceType="granite/ui/components/coral/foundation/form/textfield"/>
+                                    </updateExistingRootPath>
+                                    <updateExistingRootPathTypeHint
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/foundation/form/hidden"
+                                        name="./updateExistingRootPath@TypeHint"
+                                        value="String[]"/>
+
+
                                     <updateComponentResourceType
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/coral/foundation/form/multifield"
@@ -243,6 +407,7 @@
                                         <field
                                             jcr:primaryType="nt:unstructured"
                                             name="./metaData/updateComponentResourceType"
+                                            emptyText="aemdesign/components/details/generic-details"
                                             sling:resourceType="granite/ui/components/coral/foundation/form/textfield"/>
                                     </updateComponentResourceType>
                                     <updateComponentResourceTypeTypeHint
@@ -254,18 +419,36 @@
 
                                 </items>
                             </update>
-                            <advanced
+                        </items>
+                    </column>
+                </items>
+            </update>
+            <generate
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Generate"
+                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns">
+                <items jcr:primaryType="nt:unstructured">
+                    <column
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
+                            <generate
                                 jcr:primaryType="nt:unstructured"
-                                jcr:title="Advanced"
+                                jcr:title="Generate Rich Text Paragraphs"
                                 sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
                                 <items jcr:primaryType="nt:unstructured">
+                                    <info
+                                        granite:class="fieldDescription"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/text"
+                                        text="Create paragraphs entries for the content fragment from following fields."/>
 
-                                    <throttle
+                                    <generateContentFragmentParagraphContent
                                         jcr:primaryType="nt:unstructured"
                                         sling:resourceType="granite/ui/components/foundation/form/select"
-                                        fieldDescription="Process will throttle it self depending on system resources."
-                                        fieldLabel="Throttle execution of page generation."
-                                        name="./metaData/throttle"
+                                        fieldDescription="Add content fragment sub paragraphs with components, default: false"
+                                        fieldLabel="Generate Paragraphs for Content Fragment"
+                                        name="./metaData/generateContentFragmentParagraphContent"
                                         emptyOption="{Boolean}true"
                                         value="">
                                         <items jcr:primaryType="nt:unstructured">
@@ -278,13 +461,105 @@
                                                 text="No"
                                                 value="false"/>
                                         </items>
-                                    </throttle>
+                                    </generateContentFragmentParagraphContent>
+
+                                    <generateContentFragmentComponentPath
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                        fieldDescription="Path of content fragment component where to generate paragraph entries, default: root/article/par/contentfragment"
+                                        fieldLabel="Content Fragment Component Path"
+                                        default=""
+                                        emptyText="root/article/par/contentfragment"
+                                        name="./metaData/generateContentFragmentComponentPath"/>
+
+                                    <generateFromField
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                        fieldDescription="Name of field that has the rich text that will be used, default: text"
+                                        fieldLabel="Field to use"
+                                        default=""
+                                        emptyText="text"
+                                        name="./metaData/generateFromField"/>
+
+                                    <generateFieldConfig
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/foundation/container">
+                                        <layout
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/foundation/layouts/well"/>
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <generateFromFieldAssets
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                fieldDescription="Name of field that has the rich text that will be used, default: text__assets"
+                                                fieldLabel="Model Content"
+                                                default=""
+                                                emptyText="text__assets"
+                                                name="./metaData/generateFromFieldAssets"/>
+
+                                            <generateFromFieldAssetsIndex
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                fieldDescription="Name of field that has the rich text asset list index, default: text__assetsindex"
+                                                fieldLabel="Paragraph Asset Index"
+                                                default=""
+                                                emptyText="text__assetsindex"
+                                                name="./metaData/generateFromFieldAssetsIndex"/>
+
+                                            <generateFromFieldAssetsType
+                                                jcr:primaryType="nt:unstructured"
+                                                sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                                fieldDescription="Name of field that has the rich text asset list index, default: text__assetstype"
+                                                fieldLabel="Paragraph Content Index"
+                                                default=""
+                                                emptyText="text__assetstype"
+                                                name="./metaData/generateFromFieldAssetsType"/>
+
+                                        </items>
+                                    </generateFieldConfig>
+
+                                    <generateParagraphNodeIndexPrefix
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                        fieldDescription="Prefix to use when creating nodes {prefix}{0..n}, default: par"
+                                        fieldLabel="Paragraph Node Index Prefix"
+                                        default=""
+                                        emptyText="par"
+                                        name="./metaData/generateParagraphNodeIndexPrefix"/>
+
+                                    <generateParagraphNodeResourceType
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                        fieldDescription="Paragraph Node to use when creating sub nodes, default: dam/cfm/components/grid"
+                                        fieldLabel="Paragraph Node Resource Type"
+                                        default=""
+                                        emptyText="dam/cfm/components/grid"
+                                        name="./metaData/generateParagraphNodeResourceType"/>
+
+                                    <generateParagraphSubComponentResourceType
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                        fieldDescription="Add a component into paragraph with following resource type, default: aemdesign/components/media/image"
+                                        fieldLabel="Default Paragraph Sub Component Resource Type"
+                                        default=""
+                                        emptyText="aemdesign/components/media/image"
+                                        name="./metaData/generateParagraphSubComponentResourceType"/>
+
+                                    <generateParagraphSubComponentAttributeName
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
+                                        fieldDescription="Set path to content into following attribute, default: fileReference"
+                                        fieldLabel="Default Paragraph Sub Component Attribute Name"
+                                        default=""
+                                        emptyText="fileReference"
+                                        name="./metaData/generateParagraphSubComponentAttributeName"/>
+
                                 </items>
-                            </advanced>
+                            </generate>
                         </items>
                     </column>
                 </items>
-            </processargs>
+            </generate>
         </items>
     </content>
 </jcr:root>

From 046ddf34f25a8c3137240e241b70849dfa35f2b2 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 23 Jun 2021 11:57:32 +1000
Subject: [PATCH 14/24] add class fieldDescription to add padding to dialog
 fields.

---
 .../core/clientlibs-author-workflow-editor/.content.xml   | 8 ++++++++
 .../core/clientlibs-author-workflow-editor/css.txt        | 2 ++
 .../core/clientlibs-author-workflow-editor/css/dialog.css | 5 +++++
 3 files changed, 15 insertions(+)
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/.content.xml
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/css.txt
 create mode 100644 aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/css/dialog.css

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/.content.xml
new file mode 100644
index 000000000..6f44ac40e
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/.content.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+	jcr:primaryType="cq:ClientLibraryFolder"
+	jcr:description="used to load helpers for authoring mode directly into classic ui workflow editor clientlibs"
+	allowProxy="{Boolean}true"
+	jsProcessor="[default:none,min:none]"
+	cssProcessor="[default:none,min:none]"
+	categories="[cq.authoring.editor.workflow]"/>
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/css.txt b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/css.txt
new file mode 100644
index 000000000..c726e147c
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/css.txt
@@ -0,0 +1,2 @@
+#base=css
+dialog.css
diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/css/dialog.css b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/css/dialog.css
new file mode 100644
index 000000000..08c996d9f
--- /dev/null
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/clientlibs/core/clientlibs-author-workflow-editor/css/dialog.css
@@ -0,0 +1,5 @@
+.fieldDescription {
+  white-space: pre-line;
+  display: block;
+  padding-bottom: 15px;
+}

From da55bb17377cfcf6bdb89291ffe35a6fb20cb530 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 23 Jun 2021 13:51:28 +1000
Subject: [PATCH 15/24] update dialog tab order. update labels.

---
 .../_cq_dialog/.content.xml                   | 154 +++++++++---------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
index 41a34c243..be4eaa916 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
@@ -70,83 +70,6 @@
                 </items>
             </processcommon>
 
-            <segmentation
-                jcr:primaryType="nt:unstructured"
-                jcr:title="Segmentation"
-                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns">
-                <items jcr:primaryType="nt:unstructured">
-                    <column
-                        jcr:primaryType="nt:unstructured"
-                        sling:resourceType="granite/ui/components/coral/foundation/container">
-                        <items jcr:primaryType="nt:unstructured">
-                            <segmentation
-                                jcr:primaryType="nt:unstructured"
-                                jcr:title="Segmentation"
-                                sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
-                                <items jcr:primaryType="nt:unstructured">
-                                    <info
-                                        granite:class="fieldDescription"
-                                        jcr:primaryType="nt:unstructured"
-                                        sling:resourceType="granite/ui/components/coral/foundation/text"
-                                        text="Do you want to segment pages to match content fragment hierarchy?&#xa;"/>
-
-                                    <segmentationUsingPaths
-                                        jcr:primaryType="nt:unstructured"
-                                        sling:resourceType="granite/ui/components/foundation/form/select"
-                                        fieldDescription="Create content component in page root, default: false"
-                                        fieldLabel="Create Content Fragment Component"
-                                        name="./metaData/segmentationUsingPaths"
-                                        emptyOption="{Boolean}true"
-                                        value="">
-                                        <items jcr:primaryType="nt:unstructured">
-                                            <true
-                                                jcr:primaryType="nt:unstructured"
-                                                text="Yes"
-                                                value="true"/>
-                                            <false
-                                                jcr:primaryType="nt:unstructured"
-                                                text="No"
-                                                value="false"/>
-                                        </items>
-                                    </segmentationUsingPaths>
-
-                                    <contentFragmentRootPath
-                                        jcr:primaryType="nt:unstructured"
-                                        sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
-                                        fieldDescription="Select root path of content fragments."
-                                        fieldLabel="Content Fragments Root Path"
-                                        filter="hierarchyNotFile"
-                                        name="./metaData/contentFragmentRootPath"
-                                        required="{Boolean}true"
-                                        rootPath="/content/dam"/>
-                                    <contentFragmentRootPathInfo
-                                        granite:class="fieldDescription"
-                                        jcr:primaryType="nt:unstructured"
-                                        sling:resourceType="granite/ui/components/coral/foundation/text"
-                                        text="Select root path of content fragments.&#xa; - Hierarchy leading up to the content fragment will be used as segmentation when making new pages.&#xa; - This should be the path that workflow will be watching using launcher.&#xa;"/>
-
-                                    <segmentationTemplatePage
-                                        jcr:primaryType="nt:unstructured"
-                                        sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
-                                        fieldDescription="Select template to use when creating intermediate pages."
-                                        fieldLabel="Segmentation Page Template"
-                                        filter="hierarchyNotFile"
-                                        name="./metaData/segmentationTemplatePage"
-                                        required="{Boolean}true"
-                                        rootPath="/conf"/>
-                                    <segmentationTemplatePageInfo
-                                        granite:class="fieldDescription"
-                                        jcr:primaryType="nt:unstructured"
-                                        sling:resourceType="granite/ui/components/coral/foundation/text"
-                                        text="Select template to use when creating intermediate pages."/>
-
-                                </items>
-                            </segmentation>
-                        </items>
-                    </column>
-                </items>
-            </segmentation>
-
             <config
                 jcr:primaryType="nt:unstructured"
                 jcr:title="CF Config"
@@ -256,6 +179,83 @@
                     </column>
                 </items>
             </config>
+
+
+            <segmentation
+                jcr:primaryType="nt:unstructured"
+                jcr:title="Segmentation"
+                sling:resourceType="granite/ui/components/coral/foundation/fixedcolumns">
+                <items jcr:primaryType="nt:unstructured">
+                    <column
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="granite/ui/components/coral/foundation/container">
+                        <items jcr:primaryType="nt:unstructured">
+                            <segmentation
+                                jcr:primaryType="nt:unstructured"
+                                jcr:title="Segmentation"
+                                sling:resourceType="granite/ui/components/coral/foundation/form/fieldset">
+                                <items jcr:primaryType="nt:unstructured">
+                                    <info
+                                        granite:class="fieldDescription"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/text"
+                                        text="Do you want to segment pages to match content fragment hierarchy?&#xa;"/>
+
+                                    <segmentationUsingPaths
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/foundation/form/select"
+                                        fieldDescription="Create intermediate pages based on the hierarchy that leading up to the content fragment, default: false"
+                                        fieldLabel="Create Segmentation Pages "
+                                        name="./metaData/segmentationUsingPaths"
+                                        emptyOption="{Boolean}true"
+                                        value="">
+                                        <items jcr:primaryType="nt:unstructured">
+                                            <true
+                                                jcr:primaryType="nt:unstructured"
+                                                text="Yes"
+                                                value="true"/>
+                                            <false
+                                                jcr:primaryType="nt:unstructured"
+                                                text="No"
+                                                value="false"/>
+                                        </items>
+                                    </segmentationUsingPaths>
+
+                                    <contentFragmentRootPath
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
+                                        fieldDescription="Select root path of content fragments from which to calculate segmentation, structure leading up to the content Fragment will be replicated in Output Location."
+                                        fieldLabel="Content Fragments Root Path"
+                                        name="./metaData/segmentationContentFragmentRootPath"
+                                        required="{Boolean}true"
+                                        rootPath="/content/dam"/>
+                                    <contentFragmentRootPathInfo
+                                        granite:class="fieldDescription"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/text"
+                                        text="Select root path of content fragments.&#xa; - Hierarchy leading up to the content fragment will be used as segmentation when making new pages.&#xa; - This should be the path that workflow will be watching using launcher.&#xa;"/>
+
+                                    <segmentationTemplatePage
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
+                                        fieldDescription="Select template to use when creating intermediate pages."
+                                        fieldLabel="Intermediate Page Template"
+                                        name="./metaData/segmentationTemplatePage"
+                                        required="{Boolean}true"
+                                        rootPath="/conf"/>
+                                    <segmentationTemplatePageInfo
+                                        granite:class="fieldDescription"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/text"
+                                        text="This template will be used to create intermediate pages from start of Content Fragments Root Path to the content fragment."/>
+                                </items>
+                            </segmentation>
+                        </items>
+                    </column>
+                </items>
+            </segmentation>
+
+
             <create
                 jcr:primaryType="nt:unstructured"
                 jcr:title="Create"

From 5d35e66de42481d990125c6d221bd8745818840b Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 23 Jun 2021 13:51:48 +1000
Subject: [PATCH 16/24] add segmentation logic. add generation logic.

---
 .../process/ContentFragmentPageGenerator.java | 535 +++++++++++++++++-
 1 file changed, 516 insertions(+), 19 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java b/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java
index 2a3ea238d..63068cc38 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java
@@ -10,12 +10,17 @@
 import com.adobe.granite.workflow.exec.WorkItem;
 import com.adobe.granite.workflow.exec.WorkflowProcess;
 import com.adobe.granite.workflow.metadata.MetaDataMap;
+import com.adobe.xfa.Bool;
 import com.day.cq.wcm.api.NameConstants;
 import com.day.cq.wcm.api.Page;
 import com.day.cq.wcm.api.PageManager;
+import com.google.common.collect.Iterables;
 import design.aem.utils.components.CommonUtil;
+import org.apache.commons.jexl3.*;
+import org.apache.commons.lang3.ArrayUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.felix.scr.annotations.Service;
-import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.vault.util.JcrConstants;
 import org.apache.jackrabbit.commons.JcrUtils;
 import org.apache.sling.api.resource.Resource;
 import org.apache.sling.api.resource.ResourceResolver;
@@ -35,9 +40,15 @@
 
 import javax.jcr.Node;
 import javax.jcr.Session;
+import java.util.Arrays;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import static design.aem.utils.components.CommonUtil.tryParseInt;
+import static design.aem.utils.components.ComponentsUtil.evaluateExpressionWithValue;
+import static design.aem.utils.components.ComponentsUtil.isStringRegex;
 import static org.apache.commons.lang3.StringUtils.isNotEmpty;
 
 /**
@@ -79,57 +90,178 @@ public class ContentFragmentPageGenerator implements WorkflowProcess {
     )
     public @interface Config {
 
+        /* config start */
+
+        //dialog field: ./metaData/contentFragmentAttributeName
         @AttributeDefinition(
-            name = "Content Fragment Attribute Name",
+            name = "Config - Content Fragment Attribute Name",
             description = "Attribute Name for path to content fragment, default: fragmentPath"
         )
         String content_fragment_attribute_name() default "fragmentPath";
 
+        /* config end */
+
+        /* segmentation start */
+
+        //dialog field: ./metaData/segmentationUsingPaths
         @AttributeDefinition(
-            name = "Content Fragment Component Node Name",
-            description = "Name of new content fragment component node, default: contentfragment"
+            name = "Segmentation - Create Content Fragment Component",
+            description = "Create content component in page root, default: false",
+            type = AttributeType.BOOLEAN
         )
-        String content_fragment_component_node_name() default "contentfragment";
+        boolean segmentation_using_paths() default false;
+
+        //dialog field: ./metaData/segmentationContentFragmentRootPath
+        @AttributeDefinition(
+            name = "Segmentation - Content Fragments Root Path",
+            description = "Select root path of content fragments.",
+            type = AttributeType.STRING
+        )
+        String segmentation_content_fragment_root_path() default "";
+
+        //dialog field: ./metaData/segmentationTemplatePage
+        @AttributeDefinition(
+            name = "Segmentation - Intermediate Page Template",
+            description = "Select template to use when creating intermediate pages.",
+            type = AttributeType.STRING
+        )
+        String segmentation_template_page() default "";
 
 
+        /* segmentation end */
+
+        /* update start */
+
+        //dialog field: ./metaData/updateExistingComponent
         @AttributeDefinition(
-            name = "Update Existing Component",
+            name = "Update - Existing Component",
             description = "Add reference to existing component, default: true",
             type = AttributeType.BOOLEAN
         )
         boolean update_existing_component() default true;
 
+        //dialog field: ./metaData/updateExistingRootPath
         @AttributeDefinition(
-            name = "Update Page Root Path",
-            description = "Path of root nodes in page to use, default: article/par"
+            name = "Update - Page Root Path",
+            description = "Path of root nodes in page to use, default: root/article/par"
         )
-        String[] update_page_root_path() default {"article/par"};
+        String[] update_page_root_path() default {"root/article/par"};
 
+        //dialog field: ./metaData/updateComponentResourceType
         @AttributeDefinition(
-            name = "Update Existing Component Resource Types",
+            name = "Update - Existing Component Resource Types",
             description = "Resource type for Component to Update, default: aemdesign/components/details/generic-details"
         )
         String[] update_existing_component_resourcetype() default {"aemdesign/components/details/generic-details"};
 
+        /* update end */
+
+        /* create start */
+
+        //dialog field: ./metaData/contentFragmentComponentCreate
         @AttributeDefinition(
-            name = "Create Content Fragment Component",
+            name = "Create - Content Fragment Component",
             description = "Create content component in page root, default: false",
             type = AttributeType.BOOLEAN
         )
         boolean content_fragment_component_create() default false;
 
+        //dialog field: ./metaData/contentFragmentComponentResourceType
         @AttributeDefinition(
-            name = "Create Content Fragment Resource Type",
+            name = "Create - Content Fragment Resource Type",
             description = "Resource type for Content Fragment component default: aemdesign/components/content/contentfragment"
         )
         String content_fragment_component_resourcetype() default "aemdesign/components/content/contentfragment";
 
+        //dialog field: ./metaData/contentFragmentComponentPageRootPath
         @AttributeDefinition(
-            name = "Create Content Fragment Page Root Path",
-            description = "Path of root node where to create Content Fragment, default: article/par"
+            name = "Create - Content Fragment Page Root Path",
+            description = "Path of root node where to create Content Fragment, default: root/article/par"
         )
-        String content_fragment_component_page_root_path() default "article/par";
+        String content_fragment_component_page_root_path() default "root/article/par";
 
+        //dialog field: ./metaData/contentFragmentComponentNodeName
+        @AttributeDefinition(
+            name = "Create - Fragment Component Node Name",
+            description = "Name of new content fragment component node, default: contentfragment"
+        )
+        String content_fragment_component_node_name() default "contentfragment";
+
+        /* create end */
+
+        /* generate start - generate par0's that represent assets in the model  */
+
+        //dialog field: ./metaData/generateContentFragmentParagraphContent
+        @AttributeDefinition(
+            name = "Generate - Paragraphs for Content Fragment",
+            description = "Add content fragment sub paragraphs with components, default: false"
+        )
+        boolean generate_content_fragment_paragraph_content() default false;
+
+        //dialog field: ./metaData/generateContentFragmentComponentPath
+        @AttributeDefinition(
+            name = "Generate - Content Fragment Component Path",
+            description = "Path of content fragment component where to generate paragraph entries, default: root/article/par/contentfragment"
+        )
+        String generate_content_fragment_component_path() default "root/article/par/contentfragment";
+
+        //dialog field: ./metaData/generateFromField
+        @AttributeDefinition(
+            name = "Generate - Field to use",
+            description = "Name of field that has the rich text that will be used, default: text"
+        )
+        String generate_from_field() default "text";
+
+        //dialog field: ./metaData/generateFromFieldAssets
+        @AttributeDefinition(
+            name = "Generate Paragraph Node Index Prefix",
+            description = "Name of field that has the rich text that will be used, default: text__assets"
+        )
+        String generate_from_field_assets() default "text__assets";
+
+        //dialog field: ./metaData/generateFromFieldAssetsIndex
+        @AttributeDefinition(
+            name = "Generate - Paragraph Asset Index",
+            description = "Name of field that has the rich text asset list index, default: text__assetsindex"
+        )
+        String generate_from_field_assets_index() default "text__assetsindex";
+
+        //dialog field: ./metaData/generateFromFieldAssetsType
+        @AttributeDefinition(
+            name = "Generate - Paragraph Asset Type",
+            description = "Name of field that has the rich text asset list index, default: text__assetstype"
+        )
+        String generate_from_field_assets_type() default "text__assetstype";
+
+        //dialog field: ./metaData/generateParagraphNodeIndexPrefix
+        @AttributeDefinition(
+            name = "Generate - Paragraph Node Index Prefix",
+            description = "Prefix to use when creating nodes {prefix}{0..n}, default: par"
+        )
+        String generate_paragraph_node_index_prefix() default "par";
+
+        //dialog field: ./metaData/generateParagraphNodeResourceType
+        @AttributeDefinition(
+            name = "Generate - Paragraph Node Resource Type",
+            description = "Paragraph Node to use when creating sub nodes, default: dam/cfm/components/grid"
+        )
+        String generate_paragraph_node_resource_type() default "dam/cfm/components/grid";
+
+        //dialog field: ./metaData/generateParagraphSubComponentResourceType
+        @AttributeDefinition(
+            name = "Generate - Paragraph Sub Component Resource Type",
+            description = "Add a component into paragraph with following resource type, default: aemdesign/components/media/image"
+        )
+        String generate_paragraph_sub_component_resource_type() default "aemdesign/components/media/image";
+
+        //dialog field: ./metaData/generateParagraphSubComponentAttributeName
+        @AttributeDefinition(
+            name = "Generate - Paragraph Sub Component Attribute Name",
+            description = "Set path to content into following attribute, default: fileReference"
+        )
+        String generate_paragraph_sub_component_attribute_name() default "fileReference";
+
+        /* generate end */
 
     }
 
@@ -148,6 +280,19 @@ public class ContentFragmentPageGenerator implements WorkflowProcess {
     protected static final String ARG_UPDATE_EXISTING_COMPONENT_RESOURCE_TYPE = "updateComponentResourceType";
     protected static final String ARG_UPDATE_EXISTING_ROOT_PATHS = "updateExistingRootPath";
     protected static final String ARG_CONTENT_FRAGMENT_ATTRIBUTE_NAME = "contentFragmentAttributeName";
+    protected static final String ARG_GENERATE_CONTENT_FRAGMENT_PARAGRAPH_CONTENT = "generateContentFragmentParagraphContent";
+    protected static final String ARG_GENERATE_CONTENT_FRAGMENT_COMPONENT_PATH = "generateContentFragmentComponentPath";
+    protected static final String ARG_GENERATE_FROM_FIELD = "generateFromField";
+    protected static final String ARG_GENERATE_FROM_FIELD_ASSETS = "generateFromFieldAssets";
+    protected static final String ARG_GENERATE_FROM_FIELD_ASSETS_INDEX = "generateFromFieldAssetsIndex";
+    protected static final String ARG_GENERATE_FROM_FIELD_ASSETS_TYPE = "generateFromFieldAssetsType"; //tag template path
+    protected static final String ARG_GENERATE_PARAGRAPH_NODE_INDEX_PREFIX = "generateParagraphNodeIndexPrefix";
+    protected static final String ARG_GENERATE_PARAGRAPH_NODE_RESOURCE_TYPE = "generateParagraphNodeIndexPrefix";
+    protected static final String ARG_GENERATE_PARAGRAPH_SUB_COMPONENT_RESOURCE_TYPE = "generateParagraphSubComponentResourceType";
+    protected static final String ARG_GENERATE_PARAGRAPH_SUB_COMPONENT_ATTRIBUTE_NAME = "generateParagraphSubComponentAttributeName";
+    protected static final String ARG_SEGMENTATION_USING_PATHS = "segmentationUsingPaths";
+    protected static final String ARG_SEGMENTATION_CONTENT_FRAGMENT_ROOT_PATH = "segmentationContentFragmentRootPath";
+    protected static final String ARG_SEGMENTATION_TEMPLATE_PATH = "segmentationTemplatePage";
 
     @Reference
     private WorkflowPackageManager workflowPackageManager;
@@ -209,8 +354,59 @@ public void run(final Resource resource) throws Exception {
                             return;
                         }
 
+                        Page parentPage = null;
+                        //segementation
+                        if (processArgs.isSegmentationUsingPaths()) {
+                            if (StringUtils.isNotEmpty(processArgs.getSegmentationContentFragmentRootPath()) && resource.getPath().startsWith(processArgs.getSegmentationContentFragmentRootPath())) {
+                                String segmentPath = resource.getPath().replace(processArgs.getSegmentationContentFragmentRootPath(),"");
+                                String[] segmentPaths = segmentPath.split("/");
+
+                                //ensure segmentation path existing in output location
+                                Resource segmentParent = null;
+                                for (String path: segmentPaths) {
+                                    if (isNotEmpty(path)) {
+
+                                        //get segment parent
+                                        String segmentParentPath = (segmentParent == null ? processArgs.getSegmentationContentFragmentRootPath() : segmentParent.getPath()) + "/" + path;
+                                        segmentParent = resource.getResourceResolver().getResource(segmentParentPath);
+                                        if (segmentParent != null && !ResourceUtil.isNonExistingResource(segmentParent)) {
+                                            //get segment parent title
+                                            String segmentPathResourceTitle = path;
+                                            Resource segmentPathResourceContent = segmentParent.getChild(JcrConstants.JCR_CONTENT);
+                                            if (segmentPathResourceContent != null && !ResourceUtil.isNonExistingResource(segmentPathResourceContent)) {
+                                                segmentPathResourceTitle = segmentPathResourceContent.getValueMap().get(JcrConstants.JCR_TITLE, "");
+                                            }
+
+                                            //get segment path in output location, create if does not exist
+                                            String targetSegmentPath = (parentPage == null ? processArgs.getOutputLocation() : parentPage.getPath()) + "/" + path;
+                                            Resource segmentPageResource = resource.getResourceResolver().getResource(targetSegmentPath);
+                                            if (segmentPageResource == null || ResourceUtil.isNonExistingResource(segmentPageResource)) {
+                                                parentPage = pageManager.create(
+                                                    parentPage == null ? processArgs.getOutputLocation() : parentPage.getPath(),
+                                                    path,
+                                                    processArgs.getSegmentationTemplatePage(),
+                                                    isNotEmpty(segmentPathResourceTitle) ? segmentPathResourceTitle : path,
+                                                    false
+                                                );
+                                            } else {
+                                                parentPage = segmentPageResource.adaptTo(Page.class);
+                                                warn("Segment path already exist {}.", (Object)targetSegmentPath);
+                                            }
+                                        } else {
+                                            warn("Can't continue segmentation as segment path does not exist {}.", (Object)segmentParentPath);
+                                            break;
+                                        }
+                                    }
+                                }
+
+                            } else {
+                                warn("Can't generate segmentation as the specified root path [{}] for content fragments its does not match current resource {}.", (Object)processArgs.getSegmentationContentFragmentRootPath(), (Object)resource.getPath());
+                            }
+                        }
+
+                        //create new page
                         Page newPage = pageManager.create(
-                            processArgs.getOutputLocation(),
+                            parentPage == null ? processArgs.getOutputLocation() : parentPage.getPath(),
                             contentFragment.getName(),
                             processArgs.getTemplatePath(),
                             contentFragment.getTitle(),
@@ -243,11 +439,11 @@ public void run(final Resource resource) throws Exception {
                                             if (componentNode != null) {
                                                 componentNode.setProperty(processArgs.getContentFragmentAttributeName(), resource.getPath());
                                             } else {
-                                                failed("Could not get component node to update at path {}", containerPath);
+                                                failed("Update - Could not get component node to update at path {}", containerPath);
                                             }
 
                                         } else {
-                                            failed("Could not find component in root paths {} with resource type {}", processArgs.getUpdateExistingRootPaths(), processArgs.getUpdateComponentResourceType());
+                                            failed("Update - Could not find component in root paths {} with resource type {}", processArgs.getUpdateExistingRootPaths(), processArgs.getUpdateComponentResourceType());
                                         }
                                     }
 
@@ -265,7 +461,135 @@ public void run(final Resource resource) throws Exception {
                                             }
 
                                         } else {
-                                            failed("Page does not have required root node at path {}", (Object) processArgs.getUpdateExistingRootPaths());
+                                            failed("Create - Page does not have required root node at path {}", (Object) processArgs.getContentFragmentComponentPageRootPath());
+                                        }
+                                    }
+
+                                    if (processArgs.isGenerateContentFragmentParagraphContent()) {
+
+                                        if (contentNode.hasNode(processArgs.getGenerateContentFragmentComponentPath())) {
+
+                                            //get content fragment node
+                                            Node contentFragmentNode = contentNode.getNode(processArgs.getGenerateContentFragmentComponentPath());
+
+                                            if (contentFragmentNode != null) {
+
+                                                //get content from model
+                                                Map contentFragmentData = contentFragment.getMetaData();
+
+                                                //get the
+                                                String generateFromField = (String)contentFragmentData.get(processArgs.getGenerateFromField());
+                                                if (StringUtils.isEmpty(generateFromField)) {
+                                                    failed("Generate - Content fragment does not have this field {}", (Object) processArgs.getGenerateFromField());
+                                                }
+
+                                                String[] generateFromFieldAssets = (String[])contentFragmentData.get(processArgs.getGenerateFromFieldAssets());
+                                                if (ArrayUtils.isEmpty(generateFromFieldAssets)) {
+                                                    failed("Generate - Content fragment does not have this field {}", (Object) processArgs.getGenerateFromFieldAssets());
+                                                }
+
+                                                String[] generateFromFieldAssetsIndex = (String[])contentFragmentData.get(processArgs.getGenerateFromFieldAssetsIndex());
+                                                if (ArrayUtils.isEmpty(generateFromFieldAssetsIndex)) {
+                                                    failed("Generate - Content fragment does not have this field {}", (Object) processArgs.getGenerateFromFieldAssetsIndex());
+                                                }
+
+                                                String[] generateFromFieldAssetsType = (String[])contentFragmentData.get(processArgs.getGenerateFromFieldAssetsType());
+                                                if (ArrayUtils.isEmpty(generateFromFieldAssetsType)) {
+                                                    failed("Generate - Content fragment does not have this field {}", (Object) processArgs.getGenerateFromFieldAssetsType());
+                                                }
+                                                if (generateFromFieldAssets.length == generateFromFieldAssetsIndex.length && generateFromFieldAssetsIndex.length == generateFromFieldAssetsType.length) {
+                                                    failed("Generate - Assets[{}], Index[{}] and Types[{}] need to be of the same size.", (Object) generateFromFieldAssets.length, (Object) generateFromFieldAssetsIndex.length, (Object) generateFromFieldAssetsType.length);
+                                                }
+
+                                                //use this no idex and type defined
+                                                String defaultType = processArgs.getGenerateParagraphSubComponentResourceType();
+                                                String defaultAttributeName = processArgs.getGenerateParagraphSubComponentAttributeName();
+
+                                                JexlEngine jexl = new JexlBuilder().create();
+                                                JxltEngine jxlt = jexl.createJxltEngine();
+                                                Map<String,Object> values = new HashMap<>();
+                                                values.put("asset",resource.getPath());
+                                                JexlContext jc = new MapContext(values);
+
+                                                int assetIndex = 0;
+                                                for (String asset: generateFromFieldAssets) {
+                                                    //check if does not exist then create par and sub asset
+                                                    int index = 0;
+
+                                                    //get index for asset
+                                                    if (ArrayUtils.isNotEmpty(generateFromFieldAssetsIndex) && generateFromFieldAssetsIndex.length == generateFromFieldAssets.length) {
+                                                        index = tryParseInt(generateFromFieldAssetsIndex[assetIndex],0);
+                                                    }
+
+                                                    Node fragmentNode = JcrUtils.getOrCreateUniqueByPath(contentFragmentNode, processArgs.getGenerateParagraphNodeIndexPrefix() + index, JcrConstants.NT_UNSTRUCTURED);
+
+                                                    if (fragmentNode != null) {
+                                                        //is a new node, then add resource type
+                                                        if (!fragmentNode.hasProperty(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY)) {
+                                                            fragmentNode.setProperty(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY, processArgs.getGenerateParagraphNodeResourceType());
+                                                        }
+
+                                                        String type = defaultType;
+                                                        String attributeName = defaultAttributeName;
+                                                        String attributeValue = "";
+                                                        String assetTypeTemplatePath = "";
+
+
+                                                        String assetNodeName = type.substring(type.lastIndexOf("/"));
+                                                        Node assetNode = JcrUtils.getOrCreateUniqueByPath(fragmentNode, assetNodeName, JcrConstants.NT_UNSTRUCTURED);
+                                                        if (assetNode != null) {
+                                                            //set type if does not exist
+                                                            if (!assetNode.hasProperty(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY)) {
+                                                                assetNode.setProperty(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY, type);
+                                                            } else {
+                                                                warn("Generate - Node with name {} already exists with type {}", (Object) assetNodeName, (Object) type);
+                                                            }
+                                                            //set attribute if does not exist
+                                                            if (!assetNode.hasProperty(attributeName)) {
+                                                                assetNode.setProperty(attributeName, asset);
+                                                            } else {
+                                                                warn("Generate - Node already has attribute {}", (Object) attributeName);
+                                                            }
+
+                                                            //copy fields from template into resource
+                                                            if (ArrayUtils.isNotEmpty(generateFromFieldAssetsType) && generateFromFieldAssetsType.length == generateFromFieldAssets.length) {
+                                                                assetTypeTemplatePath = generateFromFieldAssetsType[assetIndex];
+                                                                Resource assetTypeTemplateResource = resource.getResourceResolver().getResource(assetTypeTemplatePath);
+                                                                if (!ResourceUtil.isNonExistingResource(assetTypeTemplateResource)) {
+                                                                    Node assetTypeTemplateResourceNode = assetTypeTemplateResource.adaptTo(Node.class);
+                                                                    if (assetTypeTemplateResourceNode.hasProperty("fields") && assetTypeTemplateResourceNode.hasProperty("fieldsValues")) {
+                                                                        String[] fields = Arrays.stream(assetTypeTemplateResourceNode.getProperty("fields").getValues()).toArray(String[]::new);
+                                                                        String[] fieldsValues = Arrays.stream(assetTypeTemplateResourceNode.getProperty("fieldsValues").getValues()).toArray(String[]::new);
+                                                                        if (fields.length == fieldsValues.length) {
+                                                                            for (int i = 0; i < fields.length; i++) {
+                                                                                String fieldValue = fieldsValues[i];
+                                                                                //if field has regex parse it
+                                                                                if (isStringRegex(fieldValue) ) {
+                                                                                    fieldValue = (String)evaluateExpressionWithValue(jxlt, jc, fieldValue, resource.getPath());
+                                                                                }
+                                                                                assetNode.setProperty(fields[i],fieldValue);
+                                                                            }
+                                                                        } else {
+                                                                            warn("Need to have fields[{}] and fieldsValues[{}] match in length.", (Object)fields.length, (Object)fieldsValues.length);
+                                                                        }
+
+                                                                    } else {
+                                                                        warn("Need to have fields and fieldsValues in template {}.", (Object)assetTypeTemplateResource.getPath());
+                                                                    }
+
+                                                                }
+
+                                                            }
+
+
+                                                        }
+                                                    }
+                                                    assetIndex++;
+                                                }
+                                            }
+
+                                        } else {
+                                            failed("Generate - Page does not have required root node at path {}", (Object) processArgs.getGenerateContentFragmentComponentPath());
                                         }
                                     }
                                 }
@@ -288,6 +612,9 @@ private void failed(String message, Object... error) {
                     failCount.incrementAndGet();
                     LOGGER.error(message, error);
                 }
+                private void warn(String message, Object... error) {
+                    LOGGER.error(message, error);
+                }
             };
 
             final ContentVisitor visitor = new ContentVisitor(generatorRunnable);
@@ -336,6 +663,19 @@ protected static class ProcessArgs {
         private final String[] updateExistingRootPaths;
         private final String contentFragmentAttributeName;
         private final String contentFragmentComponentNodeName;
+        private final boolean generateContentFragmentParagraphContent;
+        private final String generateContentFragmentComponentPath;
+        private final String generateFromField;
+        private final String generateFromFieldAssets;
+        private final String generateFromFieldAssetsIndex;
+        private final String generateFromFieldAssetsType;
+        private final String generateParagraphNodeIndexPrefix;
+        private final String generateParagraphNodeResourceType;
+        private final String generateParagraphSubComponentResourceType;
+        private final String generateParagraphSubComponentAttributeName;
+        private final boolean segmentationUsingPaths;
+        private final String segmentationContentFragmentRootPath;
+        private final String segmentationTemplatePage;
 
         ProcessArgs(MetaDataMap map, Config config) throws WorkflowException {
             if (map.get(ARG_TEMPLATE_PAGE, String.class) == null) {
@@ -389,6 +729,107 @@ protected static class ProcessArgs {
             }
             updateExistingRootPaths = map.get(ARG_UPDATE_EXISTING_ROOT_PATHS, config.update_page_root_path());
 
+            // generate config
+
+            generateContentFragmentParagraphContent = (Boolean)getConfigItem(map,config,
+                "Generate Content Fragment Paragraph Content",
+                ARG_GENERATE_CONTENT_FRAGMENT_PARAGRAPH_CONTENT,
+                config.generate_content_fragment_paragraph_content(),
+                Boolean.class
+            );
+
+
+            generateContentFragmentComponentPath = (String)getConfigItem(map,config,
+                "Generate Content Fragment Component Path",
+                ARG_GENERATE_CONTENT_FRAGMENT_COMPONENT_PATH,
+                config.generate_content_fragment_component_path(),
+                String.class
+            );
+
+            generateFromField = (String)getConfigItem(map,config,
+                "Generate From Field field",
+                ARG_GENERATE_FROM_FIELD,
+                config.generate_from_field(),
+                String.class
+            );
+
+            generateFromFieldAssets = (String)getConfigItem(map,config,
+                "Generate From Field Assets field",
+                ARG_GENERATE_FROM_FIELD_ASSETS,
+                config.generate_from_field_assets(),
+                String.class
+            );
+
+            generateFromFieldAssetsIndex = (String)getConfigItem(map,config,
+                "Generate From Field Assets Index field",
+                ARG_GENERATE_FROM_FIELD_ASSETS_INDEX,
+                config.generate_from_field_assets_index(),
+                String.class
+            );
+
+            generateFromFieldAssetsType = (String)getConfigItem(map,config,
+                "Generate From Field Assets Type field",
+                ARG_GENERATE_FROM_FIELD_ASSETS_TYPE,
+                config.generate_from_field_assets_type(),
+                String.class
+            );
+
+
+            generateParagraphNodeIndexPrefix = (String)getConfigItem(map,config,
+                "Generate Paragraph Node Index Prefix",
+                ARG_GENERATE_PARAGRAPH_NODE_INDEX_PREFIX,
+                config.generate_paragraph_node_index_prefix(),
+                String.class
+            );
+
+
+            generateParagraphNodeResourceType = (String)getConfigItem(map,config,
+                "Generate Paragraph Node Resource Type",
+                ARG_GENERATE_PARAGRAPH_NODE_RESOURCE_TYPE,
+                config.generate_paragraph_node_resource_type(),
+                String.class
+            );
+
+            generateParagraphSubComponentResourceType = (String)getConfigItem(map,config,
+                "Generate Paragraph Sub Component Resource Type",
+                ARG_GENERATE_PARAGRAPH_SUB_COMPONENT_RESOURCE_TYPE,
+                config.generate_paragraph_sub_component_resource_type(),
+                String.class
+            );
+
+            generateParagraphSubComponentAttributeName = (String)getConfigItem(map,config,
+                "Generate Paragraph Sub Component Attribute Name",
+                ARG_GENERATE_PARAGRAPH_SUB_COMPONENT_ATTRIBUTE_NAME,
+                config.generate_paragraph_sub_component_attribute_name(),
+                String.class
+                );
+
+
+            //segmentation
+
+            segmentationUsingPaths = (boolean)getConfigItem(map,config,
+                "Segmentation Content Fragment Component",
+                ARG_SEGMENTATION_USING_PATHS,
+                config.segmentation_using_paths(),
+                Boolean.class
+                );
+
+            segmentationContentFragmentRootPath = (String)getConfigItem(map,config,
+                "Segmentation Content Fragments Root Path",
+                ARG_SEGMENTATION_CONTENT_FRAGMENT_ROOT_PATH,
+                config.segmentation_content_fragment_root_path(),
+                String.class
+            );
+
+            segmentationTemplatePage = (String)getConfigItem(map,config,
+                "Segmentation Intermediate Page Template",
+                ARG_SEGMENTATION_TEMPLATE_PATH,
+                config.segmentation_template_page(),
+                String.class
+            );
+
+
+
             // common config
 
             if (map.get(ARG_CONTENT_FRAGMENT_ATTRIBUTE_NAME, String.class) == null) {
@@ -405,6 +846,26 @@ protected static class ProcessArgs {
 
         }
 
+        /***
+         * check if config is specified, if log a warning and return value or default.
+         * @param map step attribute map
+         * @param config defaults config
+         * @param warningPrefix warning text
+         * @param configName config name
+         * @param configDefault default value
+         * @param configType value type
+         * @return return value or default
+         */
+        private Object getConfigItem(MetaDataMap map, Config config, String warningPrefix, String configName, Object configDefault, Class<?> configType) {
+
+            if (map.get(configName, configType) == null) {
+                LOGGER.warn("{} not specified using default: {}.", warningPrefix, configDefault);
+            }
+
+            return map.get(configName, configDefault);
+
+        }
+
         public String getTemplatePath() {
             return templatePage;
         }
@@ -449,5 +910,41 @@ public String getContentFragmentAttributeName() {
         public boolean isThrottle() {
             return throttle;
         }
+
+        public boolean isGenerateContentFragmentParagraphContent() { return generateContentFragmentParagraphContent; }
+
+        public String getGenerateContentFragmentComponentPath() { return generateContentFragmentComponentPath; }
+
+        public String getGenerateFromField() { return generateFromField; }
+
+        public String getGenerateFromFieldAssetsIndex() { return generateFromFieldAssetsIndex; }
+
+        public String getGenerateParagraphNodeIndexPrefix() { return generateParagraphNodeIndexPrefix; }
+
+        public String getGenerateParagraphNodeResourceType() { return generateParagraphNodeResourceType; }
+
+        public String getGenerateParagraphSubComponentResourceType() { return generateParagraphSubComponentResourceType; }
+
+        public String getGenerateParagraphSubComponentAttributeName() { return generateParagraphSubComponentAttributeName; }
+
+        public String getGenerateFromFieldAssets() {
+            return generateFromFieldAssets;
+        }
+
+        public String getGenerateFromFieldAssetsType() {
+            return generateFromFieldAssetsType;
+        }
+
+        public boolean isSegmentationUsingPaths() {
+            return segmentationUsingPaths;
+        }
+
+        public String getSegmentationContentFragmentRootPath() {
+            return segmentationContentFragmentRootPath;
+        }
+
+        public String getSegmentationTemplatePage() {
+            return segmentationTemplatePage;
+        }
     }
 }

From 0f323ddc65c7b4fdf592007c028c8af5cdb74305 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 23 Jun 2021 14:24:53 +1000
Subject: [PATCH 17/24] update class activate annotation.

---
 .../aem/workflow/process/ContentFragmentPageGenerator.java       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java b/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java
index 63068cc38..4ae2c6db5 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java
@@ -304,7 +304,6 @@ public class ContentFragmentPageGenerator implements WorkflowProcess {
     private ThrottledTaskRunner throttledTaskRunner;
 
     @Activate
-    @Modified
     protected void activate(Config config) {
         LOGGER.info("activate: resourceResolverFactory={}", resourceResolverFactory);
         this.config = config;

From dab390789a2be3469a51f6ab1d9cfef509e5191e Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Wed, 23 Jun 2021 14:26:30 +1000
Subject: [PATCH 18/24] update version. bump acs commons version.

---
 aemdesign-aem-author/pom.xml      | 4 ++--
 aemdesign-aem-common/pom.xml      | 4 ++--
 aemdesign-aem-core-deploy/pom.xml | 4 ++--
 aemdesign-aem-services/pom.xml    | 4 ++--
 pom.xml                           | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml
index 3aaf461db..63f46f288 100755
--- a/aemdesign-aem-author/pom.xml
+++ b/aemdesign-aem-author/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.207</version>
+        <version>2.1.299</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.1.207</version>
+    <version>2.1.299</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>AEM.Design extensions and libraries that enhance the default authoring UI</description>
diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml
index 83f10c918..471c4dd72 100755
--- a/aemdesign-aem-common/pom.xml
+++ b/aemdesign-aem-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.207</version>
+        <version>2.1.299</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.1.207</version>
+    <version>2.1.299</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM.Design components and base templates</description>
diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml
index 32c2fff37..89e67d543 100644
--- a/aemdesign-aem-core-deploy/pom.xml
+++ b/aemdesign-aem-core-deploy/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.207</version>
+        <version>2.1.299</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
     <packaging>content-package</packaging>
     <name>AEM Design - Core - Deployment Package</name>
     <description>AEM.Design deployment package for all packages</description>
-    <version>2.1.207</version>
+    <version>2.1.299</version>
     <url>https://aem.design</url>
 
     <developers>
diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml
index 5160047eb..3d366bf50 100755
--- a/aemdesign-aem-services/pom.xml
+++ b/aemdesign-aem-services/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.207</version>
+        <version>2.1.299</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-services</artifactId>
-    <version>2.1.207</version>
+    <version>2.1.299</version>
     <packaging>jar</packaging>
     <name>AEM Design - Core - AEM Services</name>
     <description>Project for all AEM and OSGI Services</description>
diff --git a/pom.xml b/pom.xml
index 5c555e2c3..11a935425 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>design.aem</groupId>
     <artifactId>aemdesign-aem-core</artifactId>
-    <version>2.1.207</version>
+    <version>2.1.299</version>
     <packaging>pom</packaging>
 
     <name>AEM Design - Core Project</name>
@@ -65,7 +65,7 @@
         <aem.uberjar.version>6.4.8</aem.uberjar.version>
         <bundleFileName>aemdesign-aem-services</bundleFileName>
         <bundleName>design.aem.aemdesign-aem-services</bundleName>
-        <adobe.acs.version>4.11.2</adobe.acs.version>
+        <adobe.acs.version>5.0.4</adobe.acs.version>
         <core.wcm.components.version>2.8.0</core.wcm.components.version>
         <sonar.organization>aem-design</sonar.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>

From ab074c57ad54d860b23b32b7f7ab4014786b0f9a Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Thu, 24 Jun 2021 11:09:13 +1000
Subject: [PATCH 19/24] add field hint.

---
 .../_cq_dialog/.content.xml                     | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
index be4eaa916..3594b782c 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
@@ -415,6 +415,11 @@
                                         sling:resourceType="granite/ui/components/foundation/form/hidden"
                                         name="./updateComponentResourceType@TypeHint"
                                         value="String[]"/>
+                                    <updateComponentResourceTypeInfo
+                                        granite:class="fieldDescription"
+                                        jcr:primaryType="nt:unstructured"
+                                        sling:resourceType="granite/ui/components/coral/foundation/text"
+                                        text="If count of entries in field [Update Component Resource Type] and [Page Root Paths to check for components] are the same, each root path will be checked for corresponding resource type."/>
 
 
                                 </items>
@@ -491,28 +496,28 @@
                                             <generateFromFieldAssets
                                                 jcr:primaryType="nt:unstructured"
                                                 sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                fieldDescription="Name of field that has the rich text that will be used, default: text__assets"
+                                                fieldDescription="Name of field that has the rich text that will be used, default: text__asset"
                                                 fieldLabel="Model Content"
                                                 default=""
-                                                emptyText="text__assets"
+                                                emptyText="text__asset"
                                                 name="./metaData/generateFromFieldAssets"/>
 
                                             <generateFromFieldAssetsIndex
                                                 jcr:primaryType="nt:unstructured"
                                                 sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                fieldDescription="Name of field that has the rich text asset list index, default: text__assetsindex"
+                                                fieldDescription="Name of field that has the rich text asset list index, default: text__assetindex"
                                                 fieldLabel="Paragraph Asset Index"
                                                 default=""
-                                                emptyText="text__assetsindex"
+                                                emptyText="text__assetindex"
                                                 name="./metaData/generateFromFieldAssetsIndex"/>
 
                                             <generateFromFieldAssetsType
                                                 jcr:primaryType="nt:unstructured"
                                                 sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                fieldDescription="Name of field that has the rich text asset list index, default: text__assetstype"
+                                                fieldDescription="Name of field that has the rich text asset list index, default: text__assettype"
                                                 fieldLabel="Paragraph Content Index"
                                                 default=""
-                                                emptyText="text__assetstype"
+                                                emptyText="text__assettype"
                                                 name="./metaData/generateFromFieldAssetsType"/>
 
                                         </items>

From a417c42e62fe3bbb071029afc1162bc9869ba685 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Thu, 24 Jun 2021 12:39:52 +1000
Subject: [PATCH 20/24] ensure list has a path set to current page or resource
 when its empty.

---
 .../src/main/java/design/aem/models/v2/lists/List.java      | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
index 9192ddae8..24defde4b 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/models/v2/lists/List.java
@@ -727,7 +727,11 @@ protected void populateChildListItems(String path, Boolean flat) {
             childMap.put("path", rootPage.getPath());
         } else {
             LOGGER.error("populateChildListItems: could not find path {}", path);
-            childMap.put("path", path);
+        }
+
+        //if no path specified use current page as root or current resource
+        if (isEmpty(path)) {
+            childMap.put("path", getCurrentPage() != null ? getCurrentPage().getPath() : getResource().getPath());
         }
 
         if (flat) {

From 1839dbcbe4efdb8eeff9b847520ca1b226a9f3b5 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Thu, 24 Jun 2021 21:12:01 +1000
Subject: [PATCH 21/24] update field names.

---
 .../workflow/contentfragmentpagegen/_cq_dialog/.content.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
index 3594b782c..014ec43d7 100644
--- a/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
+++ b/aemdesign-aem-common/src/main/content/jcr_root/apps/aemdesign/components/workflow/contentfragmentpagegen/_cq_dialog/.content.xml
@@ -497,7 +497,7 @@
                                                 jcr:primaryType="nt:unstructured"
                                                 sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
                                                 fieldDescription="Name of field that has the rich text that will be used, default: text__asset"
-                                                fieldLabel="Model Content"
+                                                fieldLabel="Paragraph Asset"
                                                 default=""
                                                 emptyText="text__asset"
                                                 name="./metaData/generateFromFieldAssets"/>
@@ -514,7 +514,7 @@
                                             <generateFromFieldAssetsType
                                                 jcr:primaryType="nt:unstructured"
                                                 sling:resourceType="granite/ui/components/coral/foundation/form/textfield"
-                                                fieldDescription="Name of field that has the rich text asset list index, default: text__assettype"
+                                                fieldDescription="Array of field templates. Path to tag template with fields and fieldsValues arrays for fields to use when creating sub components in par, can have asset[Paragraph Asset] and cfpath[Path to CF] expression variable. , default: text__assettype"
                                                 fieldLabel="Paragraph Content Index"
                                                 default=""
                                                 emptyText="text__assettype"

From 82b3e043d924aab720981bdaab75e9968d675e1e Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 25 Jun 2021 02:03:19 +1000
Subject: [PATCH 22/24] update expression logic processing. ensure defaults
 only happen when asset type templates are not used. fix reading data from
 content fragment. update logic for updating root paths in a page to find a
 component per root path. update logic to only create a new page when it does
 not exist. update logic to ensure segmentation does not include current
 fragment path.

---
 .../process/ContentFragmentPageGenerator.java | 182 ++++++++++++------
 1 file changed, 125 insertions(+), 57 deletions(-)

diff --git a/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java b/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java
index 4ae2c6db5..9600da88a 100644
--- a/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java
+++ b/aemdesign-aem-services/src/main/java/design/aem/workflow/process/ContentFragmentPageGenerator.java
@@ -5,16 +5,15 @@
 import com.adobe.acs.commons.util.visitors.ResourceRunnable;
 import com.adobe.acs.commons.workflow.WorkflowPackageManager;
 import com.adobe.cq.dam.cfm.ContentFragment;
+import com.adobe.cq.dam.cfm.ContentVariation;
 import com.adobe.granite.workflow.WorkflowException;
 import com.adobe.granite.workflow.WorkflowSession;
 import com.adobe.granite.workflow.exec.WorkItem;
 import com.adobe.granite.workflow.exec.WorkflowProcess;
 import com.adobe.granite.workflow.metadata.MetaDataMap;
-import com.adobe.xfa.Bool;
 import com.day.cq.wcm.api.NameConstants;
 import com.day.cq.wcm.api.Page;
 import com.day.cq.wcm.api.PageManager;
-import com.google.common.collect.Iterables;
 import design.aem.utils.components.CommonUtil;
 import org.apache.commons.jexl3.*;
 import org.apache.commons.lang3.ArrayUtils;
@@ -215,23 +214,23 @@ public class ContentFragmentPageGenerator implements WorkflowProcess {
         //dialog field: ./metaData/generateFromFieldAssets
         @AttributeDefinition(
             name = "Generate Paragraph Node Index Prefix",
-            description = "Name of field that has the rich text that will be used, default: text__assets"
+            description = "Name of field that has the rich text that will be used, default: text__asset"
         )
-        String generate_from_field_assets() default "text__assets";
+        String generate_from_field_asset() default "text__asset";
 
         //dialog field: ./metaData/generateFromFieldAssetsIndex
         @AttributeDefinition(
             name = "Generate - Paragraph Asset Index",
-            description = "Name of field that has the rich text asset list index, default: text__assetsindex"
+            description = "Name of field that has the rich text asset list index, default: text__assetindex"
         )
-        String generate_from_field_assets_index() default "text__assetsindex";
+        String generate_from_field_asset_index() default "text__assetindex";
 
         //dialog field: ./metaData/generateFromFieldAssetsType
         @AttributeDefinition(
             name = "Generate - Paragraph Asset Type",
-            description = "Name of field that has the rich text asset list index, default: text__assetstype"
+            description = "Name of field that has the rich text asset list index, default: text__assettype"
         )
-        String generate_from_field_assets_type() default "text__assetstype";
+        String generate_from_field_asset_type() default "text__assettype";
 
         //dialog field: ./metaData/generateParagraphNodeIndexPrefix
         @AttributeDefinition(
@@ -357,7 +356,12 @@ public void run(final Resource resource) throws Exception {
                         //segementation
                         if (processArgs.isSegmentationUsingPaths()) {
                             if (StringUtils.isNotEmpty(processArgs.getSegmentationContentFragmentRootPath()) && resource.getPath().startsWith(processArgs.getSegmentationContentFragmentRootPath())) {
-                                String segmentPath = resource.getPath().replace(processArgs.getSegmentationContentFragmentRootPath(),"");
+                                Resource parentResource = resource.getParent();
+                                String parentPath = resource.getPath();
+                                if (parentResource != null && !ResourceUtil.isNonExistingResource(parentResource)) {
+                                    parentPath = parentResource.getPath();
+                                }
+                                String segmentPath = parentPath.replace(processArgs.getSegmentationContentFragmentRootPath(),"");
                                 String[] segmentPaths = segmentPath.split("/");
 
                                 //ensure segmentation path existing in output location
@@ -403,14 +407,22 @@ public void run(final Resource resource) throws Exception {
                             }
                         }
 
-                        //create new page
-                        Page newPage = pageManager.create(
-                            parentPage == null ? processArgs.getOutputLocation() : parentPage.getPath(),
-                            contentFragment.getName(),
-                            processArgs.getTemplatePath(),
-                            contentFragment.getTitle(),
-                            false
-                        );
+                        //get or create new page
+                        Page newPage = null;
+                        String contentFragmentPagePath = parentPage == null ? processArgs.getOutputLocation() : parentPage.getPath() + "/" + resource.getName();
+                        Resource contentFragmentPage = resource.getResourceResolver().getResource(contentFragmentPagePath);
+                        if (contentFragmentPage == null || ResourceUtil.isNonExistingResource(contentFragmentPage)) {
+                            //create new page
+                            newPage = pageManager.create(
+                                parentPage == null ? processArgs.getOutputLocation() : parentPage.getPath(),
+                                contentFragment.getName(),
+                                processArgs.getTemplatePath(),
+                                contentFragment.getTitle(),
+                                false
+                            );
+                        } else {
+                            newPage = contentFragmentPage.adaptTo(Page.class);
+                        }
 
                         if (newPage != null) {
                             Resource contentResource = newPage.getContentResource();
@@ -429,20 +441,43 @@ public void run(final Resource resource) throws Exception {
                                     }
 
                                     if (processArgs.isUpdateComponent()) {
+                                        //for each processArgs.getUpdateExistingRootPaths() and processArgs.getUpdateComponentResourceType()
+                                        String[] rootPaths = processArgs.getUpdateExistingRootPaths();
+                                        String[] resourceTypes = processArgs.getUpdateComponentResourceType();
 
-                                        String containerPath = CommonUtil.findComponentInPage(newPage, processArgs.getUpdateComponentResourceType(), processArgs.getUpdateExistingRootPaths());
+                                        if (rootPaths.length == resourceTypes.length) {
+                                            for (int i = 0; i < resourceTypes.length; i++) {
 
-                                        if (isNotEmpty(containerPath)) {
+                                                String containerPath = CommonUtil.findComponentInPage(newPage, new String[] {resourceTypes[i]} , new String[] {rootPaths[i]});
+                                                if (isNotEmpty(containerPath)) {
 
-                                            Node componentNode = JcrUtils.getNodeIfExists(containerPath, session);
-                                            if (componentNode != null) {
-                                                componentNode.setProperty(processArgs.getContentFragmentAttributeName(), resource.getPath());
-                                            } else {
-                                                failed("Update - Could not get component node to update at path {}", containerPath);
+                                                    Node componentNode = JcrUtils.getNodeIfExists(containerPath, session);
+                                                    if (componentNode != null) {
+                                                        componentNode.setProperty(processArgs.getContentFragmentAttributeName(), resource.getPath());
+                                                    } else {
+                                                        failed("Update - Could not get component node to update at path {}", containerPath);
+                                                    }
+
+                                                } else {
+                                                    failed("Update - Could not find component in root path {} with resource type {}", rootPaths[i], resourceTypes[i]);
+                                                }
                                             }
 
                                         } else {
-                                            failed("Update - Could not find component in root paths {} with resource type {}", processArgs.getUpdateExistingRootPaths(), processArgs.getUpdateComponentResourceType());
+                                            String containerPath = CommonUtil.findComponentInPage(newPage, processArgs.getUpdateComponentResourceType(), processArgs.getUpdateExistingRootPaths());
+
+                                            if (isNotEmpty(containerPath)) {
+
+                                                Node componentNode = JcrUtils.getNodeIfExists(containerPath, session);
+                                                if (componentNode != null) {
+                                                    componentNode.setProperty(processArgs.getContentFragmentAttributeName(), resource.getPath());
+                                                } else {
+                                                    failed("Update - Could not get component node to update at path {}", containerPath);
+                                                }
+
+                                            } else {
+                                                failed("Update - Could not find component in root paths {} with resource type {}", processArgs.getUpdateExistingRootPaths(), processArgs.getUpdateComponentResourceType());
+                                            }
                                         }
                                     }
 
@@ -474,29 +509,30 @@ public void run(final Resource resource) throws Exception {
                                             if (contentFragmentNode != null) {
 
                                                 //get content from model
-                                                Map contentFragmentData = contentFragment.getMetaData();
+//                                                Map contentFragmentData = contentFragment.getMetaData();
 
-                                                //get the
-                                                String generateFromField = (String)contentFragmentData.get(processArgs.getGenerateFromField());
-                                                if (StringUtils.isEmpty(generateFromField)) {
+                                                //get the fields
+                                                if (!contentFragment.hasElement(processArgs.getGenerateFromField())) {
                                                     failed("Generate - Content fragment does not have this field {}", (Object) processArgs.getGenerateFromField());
                                                 }
+                                                String generateFromField =  (String)contentFragment.getElement(processArgs.getGenerateFromField()).getContent();
 
-                                                String[] generateFromFieldAssets = (String[])contentFragmentData.get(processArgs.getGenerateFromFieldAssets());
-                                                if (ArrayUtils.isEmpty(generateFromFieldAssets)) {
+                                                if (!contentFragment.hasElement(processArgs.getGenerateFromFieldAssets())) {
                                                     failed("Generate - Content fragment does not have this field {}", (Object) processArgs.getGenerateFromFieldAssets());
                                                 }
+                                                String[] generateFromFieldAssets = (String[])contentFragment.getElement(processArgs.getGenerateFromFieldAssets()).getValue().getValue(String[].class);
 
-                                                String[] generateFromFieldAssetsIndex = (String[])contentFragmentData.get(processArgs.getGenerateFromFieldAssetsIndex());
-                                                if (ArrayUtils.isEmpty(generateFromFieldAssetsIndex)) {
+                                                if (!contentFragment.hasElement(processArgs.getGenerateFromFieldAssetsIndex())) {
                                                     failed("Generate - Content fragment does not have this field {}", (Object) processArgs.getGenerateFromFieldAssetsIndex());
                                                 }
+                                                String[] generateFromFieldAssetsIndex = (String[]) contentFragment.getElement(processArgs.getGenerateFromFieldAssetsIndex()).getValue().getValue(String[].class);
 
-                                                String[] generateFromFieldAssetsType = (String[])contentFragmentData.get(processArgs.getGenerateFromFieldAssetsType());
-                                                if (ArrayUtils.isEmpty(generateFromFieldAssetsType)) {
+                                                if (!contentFragment.hasElement(processArgs.getGenerateFromFieldAssetsType())) {
                                                     failed("Generate - Content fragment does not have this field {}", (Object) processArgs.getGenerateFromFieldAssetsType());
                                                 }
-                                                if (generateFromFieldAssets.length == generateFromFieldAssetsIndex.length && generateFromFieldAssetsIndex.length == generateFromFieldAssetsType.length) {
+                                                String[] generateFromFieldAssetsType = (String[])contentFragment.getElement(processArgs.getGenerateFromFieldAssetsType()).getValue().getValue(String[].class);
+
+                                                if (generateFromFieldAssets.length != generateFromFieldAssetsIndex.length && generateFromFieldAssetsIndex.length != generateFromFieldAssetsType.length) {
                                                     failed("Generate - Assets[{}], Index[{}] and Types[{}] need to be of the same size.", (Object) generateFromFieldAssets.length, (Object) generateFromFieldAssetsIndex.length, (Object) generateFromFieldAssetsType.length);
                                                 }
 
@@ -506,9 +542,6 @@ public void run(final Resource resource) throws Exception {
 
                                                 JexlEngine jexl = new JexlBuilder().create();
                                                 JxltEngine jxlt = jexl.createJxltEngine();
-                                                Map<String,Object> values = new HashMap<>();
-                                                values.put("asset",resource.getPath());
-                                                JexlContext jc = new MapContext(values);
 
                                                 int assetIndex = 0;
                                                 for (String asset: generateFromFieldAssets) {
@@ -537,18 +570,6 @@ public void run(final Resource resource) throws Exception {
                                                         String assetNodeName = type.substring(type.lastIndexOf("/"));
                                                         Node assetNode = JcrUtils.getOrCreateUniqueByPath(fragmentNode, assetNodeName, JcrConstants.NT_UNSTRUCTURED);
                                                         if (assetNode != null) {
-                                                            //set type if does not exist
-                                                            if (!assetNode.hasProperty(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY)) {
-                                                                assetNode.setProperty(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY, type);
-                                                            } else {
-                                                                warn("Generate - Node with name {} already exists with type {}", (Object) assetNodeName, (Object) type);
-                                                            }
-                                                            //set attribute if does not exist
-                                                            if (!assetNode.hasProperty(attributeName)) {
-                                                                assetNode.setProperty(attributeName, asset);
-                                                            } else {
-                                                                warn("Generate - Node already has attribute {}", (Object) attributeName);
-                                                            }
 
                                                             //copy fields from template into resource
                                                             if (ArrayUtils.isNotEmpty(generateFromFieldAssetsType) && generateFromFieldAssetsType.length == generateFromFieldAssets.length) {
@@ -557,14 +578,19 @@ public void run(final Resource resource) throws Exception {
                                                                 if (!ResourceUtil.isNonExistingResource(assetTypeTemplateResource)) {
                                                                     Node assetTypeTemplateResourceNode = assetTypeTemplateResource.adaptTo(Node.class);
                                                                     if (assetTypeTemplateResourceNode.hasProperty("fields") && assetTypeTemplateResourceNode.hasProperty("fieldsValues")) {
-                                                                        String[] fields = Arrays.stream(assetTypeTemplateResourceNode.getProperty("fields").getValues()).toArray(String[]::new);
-                                                                        String[] fieldsValues = Arrays.stream(assetTypeTemplateResourceNode.getProperty("fieldsValues").getValues()).toArray(String[]::new);
+                                                                        String[] fields = Arrays.stream(assetTypeTemplateResourceNode.getProperty("fields").getValues()).map(Object::toString).toArray(String[]::new);
+                                                                        String[] fieldsValues = Arrays.stream(assetTypeTemplateResourceNode.getProperty("fieldsValues").getValues()).map(Object::toString).toArray(String[]::new);
                                                                         if (fields.length == fieldsValues.length) {
                                                                             for (int i = 0; i < fields.length; i++) {
                                                                                 String fieldValue = fieldsValues[i];
                                                                                 //if field has regex parse it
                                                                                 if (isStringRegex(fieldValue) ) {
-                                                                                    fieldValue = (String)evaluateExpressionWithValue(jxlt, jc, fieldValue, resource.getPath());
+                                                                                    Map<String,Object> values = new HashMap<>();
+                                                                                    values.put("asset",asset);
+                                                                                    values.put("cfpath",resource.getPath());
+                                                                                    JexlContext jc = new MapContext(values);
+
+                                                                                    fieldValue = (String)evaluateExpressionWithValue(jxlt, jc, fieldValue, "");
                                                                                 }
                                                                                 assetNode.setProperty(fields[i],fieldValue);
                                                                             }
@@ -578,6 +604,20 @@ public void run(final Resource resource) throws Exception {
 
                                                                 }
 
+                                                            } else {
+                                                                //set type if does not exist
+                                                                if (!assetNode.hasProperty(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY)) {
+                                                                    assetNode.setProperty(JcrResourceConstants.SLING_RESOURCE_TYPE_PROPERTY, type);
+                                                                } else {
+                                                                    warn("Generate - Node with name {} already exists with type {}", (Object) assetNodeName, (Object) type);
+                                                                }
+                                                                //set attribute if does not exist
+                                                                if (!assetNode.hasProperty(attributeName)) {
+                                                                    assetNode.setProperty(attributeName, asset);
+                                                                } else {
+                                                                    warn("Generate - Node already has attribute {}", (Object) attributeName);
+                                                                }
+
                                                             }
 
 
@@ -755,21 +795,21 @@ protected static class ProcessArgs {
             generateFromFieldAssets = (String)getConfigItem(map,config,
                 "Generate From Field Assets field",
                 ARG_GENERATE_FROM_FIELD_ASSETS,
-                config.generate_from_field_assets(),
+                config.generate_from_field_asset(),
                 String.class
             );
 
             generateFromFieldAssetsIndex = (String)getConfigItem(map,config,
                 "Generate From Field Assets Index field",
                 ARG_GENERATE_FROM_FIELD_ASSETS_INDEX,
-                config.generate_from_field_assets_index(),
+                config.generate_from_field_asset_index(),
                 String.class
             );
 
             generateFromFieldAssetsType = (String)getConfigItem(map,config,
                 "Generate From Field Assets Type field",
                 ARG_GENERATE_FROM_FIELD_ASSETS_TYPE,
-                config.generate_from_field_assets_type(),
+                config.generate_from_field_asset_type(),
                 String.class
             );
 
@@ -845,6 +885,34 @@ protected static class ProcessArgs {
 
         }
 
+        /***
+         * return value of a field for a particular variation.
+         * @param contentFragment fragment to use
+         * @param variationName name of variant
+         * @param fieldName name of field
+         * @param returnType what type to return
+         * @return object with value or a null
+         */
+        public static Object getContentFragmentVariationValue(ContentFragment contentFragment, String variationName, String fieldName, Class<?> returnType) {
+
+            Object returnValue = null;
+
+            if (contentFragment.hasElement(fieldName)) {
+                ContentVariation contentVariation = contentFragment.getElement(fieldName).getVariation(variationName);
+                if (contentVariation != null) {
+                    returnValue = contentVariation.getValue().getValue(returnType);
+                } else {
+                    LOGGER.warn("Content Fragment field [{}] does not have the variation {}.", fieldName, variationName);
+                }
+
+
+            } else {
+                LOGGER.warn("Content Fragment does not have the field {}.", fieldName);
+            }
+
+            return returnValue;
+        }
+
         /***
          * check if config is specified, if log a warning and return value or default.
          * @param map step attribute map

From 6d3744d4fef6b1a65e99f975ce15230fb7c8ab89 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 25 Jun 2021 12:10:31 +1000
Subject: [PATCH 23/24] update scripts.

---
 aemdesign-aem-author/filevault-export.ps1 | 160 +++++++++++++++
 aemdesign-aem-author/filevault-import.ps1 | 225 ++++++++++++++++++++++
 aemdesign-aem-common/filevault-export.ps1 |   4 +-
 aemdesign-aem-common/filevault-import.ps1 |   2 +-
 4 files changed, 388 insertions(+), 3 deletions(-)
 create mode 100644 aemdesign-aem-author/filevault-export.ps1
 create mode 100644 aemdesign-aem-author/filevault-import.ps1

diff --git a/aemdesign-aem-author/filevault-export.ps1 b/aemdesign-aem-author/filevault-export.ps1
new file mode 100644
index 000000000..d6dbc5295
--- /dev/null
+++ b/aemdesign-aem-author/filevault-export.ps1
@@ -0,0 +1,160 @@
+Param(
+    #equivalent of using localhost in docker container
+    [string]$AEM_HOST = "localhost",
+    # TCP port SOURCE_CQ listens on
+    [string]$AEM_PORT = "4502",
+    # AEM Admin user for AEM_HOST
+    [string]$AEM_USER = "admin",
+    # AEM Admin password for AEM_HOST
+    [string]$AEM_PASSWORD = "admin",
+    # Server WebDav Path
+    #$AEM_WEBDAV_PATH = "/crx/server/crx.default/jcr:root/"
+    [string]$AEM_WEBDAV_PATH = "/crx",
+    [string]$AEM_SCHEMA = "http",
+    #to set additional flags if required
+    [string]$VLT_FLAGS = "--insecure -Xmx2g",
+    [string]$VLT_CMD = "../tools/vault-cli/bin/vlt",
+    # Root folder name for placing content
+    [string]$CONTENT_DESTINATION = (Resolve-Path -Path ".\src\main\content" -Relative),
+    [string]$FILTER_FILE = "${CONTENT_DESTINATION}\META-INF\vault\filter.xml",
+    [string]$FILTER_FILE_LOCATION = "${CONTENT_DESTINATION}\META-INF",
+    [string[]]$ROOT_PATHS,
+    [switch]$Silent = $false,
+    [string]$LOG_PATH = "..\logs"
+)
+
+Function Format-XMLIndent
+{
+    [Cmdletbinding()]
+    [Alias("IndentXML")]
+    param
+    (
+        [Parameter(ValueFromPipeline)]
+        [xml]$Content,
+        [int]$Indent
+    )
+
+    # String Writer and XML Writer objects to write XML to string
+    $StringWriter = New-Object System.IO.StringWriter
+    $XmlWriter = New-Object System.XMl.XmlTextWriter $StringWriter
+
+    # Default = None, change Formatting to Indented
+    $xmlWriter.Formatting = "indented"
+
+    # Gets or sets how many IndentChars to write for each level in
+    # the hierarchy when Formatting is set to Formatting.Indented
+    $xmlWriter.Indentation = $Indent
+
+    $Content.WriteContentTo($XmlWriter)
+    $XmlWriter.Flush();$StringWriter.Flush()
+    $StringWriter.ToString()
+}
+
+
+Function GetFilterList
+{
+    [Cmdletbinding()]
+    [Alias("filterList")]
+    param
+    (
+        [Parameter(ValueFromPipeline)]
+        [string]$FILTER_FILE = ".\src\main\content\META-INF\vault\filter.xml"
+    )
+    $FILTER_PATHS = [System.Collections.ArrayList]::new()
+
+    $FILTER_XML = [xml](Get-Content $FILTER_FILE)
+    $FILTER_XML_CONTENT = $FILTER_XML.SelectNodes("//workspaceFilter")
+    $FILTER_XML_ITEMS = $FILTER_XML_CONTENT.SelectNodes('//filter')
+    $FILTER_XML_ITEMS | ForEach-Object {
+        [void]$FILTER_PATHS.Add($_.root)
+    }
+
+    return $FILTER_PATHS
+}
+
+if (-not($ROOT_PATHS)) {
+    $ROOT_PATHS = GetFilterList
+}
+
+Write-Output "------- CONFIG ----------"
+Write-Output "AEM_SCHEMA: $AEM_SCHEMA"
+Write-Output "AEM_HOST: $AEM_HOST"
+Write-Output "AEM_PORT: $AEM_PORT"
+Write-Output "AEM_USER: $AEM_USER"
+Write-Output "CONTENT_DESTINATION: $CONTENT_DESTINATION"
+Write-Output "ROOT_PATHS: $ROOT_PATHS"
+Write-Output "FILTER_FILE: $FILTER_FILE"
+Write-Output "Silent: $Silent"
+Write-Output "VLT_FLAGS: $VLT_FLAGS"
+Write-Output "VLT_CMD:"
+
+$ROOT_PATHS | ForEach-Object {
+    Write-Output "${VLT_CMD} ${VLT_FLAGS} --credentials ${AEM_USER}:****** export -v ${AEM_SCHEMA}://${AEM_HOST}:${AEM_PORT}${AEM_WEBDAV_PATH} $_ ${CONTENT_DESTINATION}"
+}
+
+if (-not($Silent))
+{
+    $START = Read-Host -Prompt 'Do you want to start export with these settings? (y/n)'
+
+    if ($START -ne "y")
+    {
+        Write-Output "Quiting..."
+        Exit
+    }
+}
+
+Write-Output "------- START Exporting content ----------"
+$ROOT_PATHS_LAST = $ROOT_PATHS | Select-Object -Last 1
+$ROOT_PATHS | ForEach-Object {
+    Write-Output "START Export $_"
+    $LOG_FILENAME = "$_".Replace("/","-")
+
+    Write-Output "Remove Filer..."
+    Copy-Item ".\src\main\content\META-INF\vault\filter-blank.xml" -Destination "$FILTER_FILE"
+
+    Write-Output "Create filter for: $_"
+    $FILTER_XML = [xml](Get-Content $FILTER_FILE)
+    $FILTER_XML_CONTENT = $FILTER_XML.SelectNodes("//workspaceFilter")
+    $FILTER_XML_DELETE = $FILTER_XML_CONTENT.SelectNodes('//filter')
+    $FILTER_XML_DELETE | ForEach-Object{
+        $DELETE_STATUS = $FILTER_XML_CONTENT.RemoveChild($_)
+    }
+    $FILTER_XML_CONTENT_NEW = $FILTER_XML.CreateNode("element","filter","")
+    $FILTER_XML_CONTENT_NEW.SetAttribute("root",$_)
+    $FILTER_XML_CONTENT_NEW_ADD = $FILTER_XML_CONTENT.AppendChild($FILTER_XML_CONTENT_NEW)
+    Write-Output "Saving..."
+    $FILTER_XML.OuterXml | IndentXML -Indent 4 | Out-File $FILTER_FILE -encoding "UTF8"
+    Write-Output "Done..."
+
+    Write-Output "Running VLT..."
+    Invoke-Expression -Command "${VLT_CMD} ${VLT_FLAGS} --credentials ${AEM_USER}:${AEM_PASSWORD} export -v ${AEM_SCHEMA}://${AEM_HOST}:${AEM_PORT}${AEM_WEBDAV_PATH} $_ ${CONTENT_DESTINATION}" | Tee-Object -FilePath "${LOG_PATH}\filevailt-export-$LOG_FILENAME.log"
+
+    Write-Output "END Export $_"
+}
+
+Write-Output "------- END Exporting content ----------"
+
+Write-Output "------- START Updating ${FILTER_FILE} ----------"
+
+$FILTER_XML = [xml](Get-Content $FILTER_FILE)
+Write-Output "Removing Existing Filters..."
+$FILTER_XML_CONTENT = $FILTER_XML.SelectNodes("//workspaceFilter")
+$FILTER_XML_DELETE = $FILTER_XML_CONTENT.SelectNodes('//filter')
+$FILTER_XML_DELETE | ForEach-Object{
+    $DELETE_STATUS = $FILTER_XML_CONTENT.RemoveChild($_)
+}
+Write-Output "Adding Exported Filters..."
+$ROOT_PATHS | ForEach-Object {
+    $FILTER_XML_CONTENT_NEW = $FILTER_XML.CreateNode("element","filter","")
+    $FILTER_XML_CONTENT_NEW.SetAttribute("root",$_)
+    $FILTER_XML_CONTENT_NEW_ADD = $FILTER_XML_CONTENT.AppendChild($FILTER_XML_CONTENT_NEW)
+}
+Write-Output "Saving..."
+$FILTER_XML.OuterXml | IndentXML -Indent 4 | Out-File $FILTER_FILE -encoding "UTF8"
+Write-Output "Done."
+Write-Output "------- DONE Updating ${FILTER_FILE} ----------"
+
+Write-Output "------- Revert Filter.xml ----------"
+git checkout HEAD src/main/content/META-INF/
+git clean -fx src/main/content/META-INF
+Write-Output "------- Revert Filter.xml ----------"
diff --git a/aemdesign-aem-author/filevault-import.ps1 b/aemdesign-aem-author/filevault-import.ps1
new file mode 100644
index 000000000..88638cd0b
--- /dev/null
+++ b/aemdesign-aem-author/filevault-import.ps1
@@ -0,0 +1,225 @@
+Param(
+    #equivalent of using localhost in docker container
+    [string]$AEM_HOST = "localhost",
+    # TCP port SOURCE_CQ listens on
+    [string]$AEM_PORT = "4502",
+    # AEM Admin user for AEM_HOST
+    [string]$AEM_USER = "admin",
+    # AEM Admin password for AEM_HOST
+    [string]$AEM_PASSWORD = "admin",
+    # Root folder name for placing content
+    [string]$SOURCE_CONTENT_FOLDER = "localhost-author-export",
+    # Server WebDav Path
+    #$AEM_WEBDAV_PATH = "/crx/server/crx.default/jcr:root/"
+    [string]$AEM_WEBDAV_PATH = "/crx",
+    [string]$AEM_SCHEMA = "http",
+    #to set additional flags if required
+    [string]$VLT_FLAGS = "--insecure -Xmx2g",
+    [string]$VLT_CMD = "../tools/vault-cli/bin/vlt",
+    # Root folder name for placing content
+    [string]$CONTENT_DESTINATION = ".\src\main\content",
+    [string]$FILTER_FILE = "${CONTENT_DESTINATION}\META-INF\vault\filter.xml",
+    [string]$FILTER_FILE_LOCATION = "${CONTENT_DESTINATION}\META-INF",
+    #which filter paths to import
+    [string[]]$ROOT_PATHS,
+    [string]$ROOT_PATH = "/",
+    [string]$CONTENT_SOURCE = (Resolve-Path -Path "src\main\content\jcr_root" -Relative),
+    # connection timeout
+    [string]$TIMEOUT = "5",
+    # host address
+    [string]$ADDRESS = "${AEM_SCHEMA}://${AEM_HOST}:${AEM_PORT}",
+    # Disable services before import
+    [string[]]$SERVICES_TO_DISABLE = @(
+        "/system/console/bundles/com.day.cq.cq-mailer",
+        "/system/console/bundles/com.adobe.granite.workflow.core"
+    ),
+
+    [HashTable]$BODY_SERVICE_TO_DISABLE = @{
+        "action"="stop"
+    },
+    [HashTable]$BODY_SERVICE_TO_DISABLE_ENABLE = @{
+        "action"="start"
+    },
+    [switch]$Silent = $false,
+    [string]$LOG_PATH = "..\logs"
+)
+
+
+Function Format-XMLIndent
+{
+    [Cmdletbinding()]
+    [Alias("IndentXML")]
+    param
+    (
+        [Parameter(ValueFromPipeline)]
+        [xml]$Content,
+        [int]$Indent
+    )
+
+    # String Writer and XML Writer objects to write XML to string
+    $StringWriter = New-Object System.IO.StringWriter
+    $XmlWriter = New-Object System.XMl.XmlTextWriter $StringWriter
+
+    # Default = None, change Formatting to Indented
+    $xmlWriter.Formatting = "indented"
+
+    # Gets or sets how many IndentChars to write for each level in
+    # the hierarchy when Formatting is set to Formatting.Indented
+    $xmlWriter.Indentation = $Indent
+
+    $Content.WriteContentTo($XmlWriter)
+    $XmlWriter.Flush();$StringWriter.Flush()
+    $StringWriter.ToString()
+}
+
+
+function doSlingPost {
+    [CmdletBinding()]
+    Param (
+
+        [Parameter(Mandatory=$true)]
+        [string]$Url="http://localhost:4502",
+
+        [Parameter(Mandatory)]
+        [ValidateNotNullOrEmpty()]
+        [ValidateSet('Post','Delete')]
+        [string]$Method,
+
+        [Parameter(Mandatory=$false)]
+        [HashTable]$Body,
+
+        [Parameter(Mandatory=$false,
+                HelpMessage="Provide Basic Auth Credentials in following format: <user>:<pass>")]
+        [string]$BasicAuthCreds="",
+
+        [Parameter(Mandatory=$false)]
+        [string]$UserAgent="",
+
+        [Parameter(Mandatory=$false)]
+        [string]$Referer="",
+
+        [Parameter(Mandatory=$false)]
+        [string]$Timeout="5"
+
+    )
+
+
+
+    $HEADERS = @{
+    }
+
+    if (-not([string]::IsNullOrEmpty($UserAgent))) {
+        $HEADERS.add("User-Agent",$UserAgent)
+    }
+
+    if (-not([string]::IsNullOrEmpty($Referer))) {
+        $HEADERS.add("Referer",$Referer)
+    }
+
+
+    if (-not([string]::IsNullOrEmpty($BasicAuthCreds))) {
+        $BASICAUTH = [System.Convert]::ToBase64String([System.Text.Encoding]::ASCII.GetBytes($BasicAuthCreds))
+        $HEADERS.add("Authorization","Basic $BASICAUTH")
+    }
+
+
+    Write-Output "Performing action $Method on $Url."
+
+    $Response = Invoke-WebRequest -Method Post -Headers $HEADERS -TimeoutSec $Timeout -Uri "$Url" -Form $Body -ContentType "application/x-www-form-urlencoded"
+
+}
+
+Write-Output "------- CONFIG ----------"
+Write-Output "AEM_SCHEMA: $AEM_SCHEMA"
+Write-Output "AEM_HOST: $AEM_HOST"
+Write-Output "AEM_PORT: $AEM_PORT"
+Write-Output "AEM_USER: $AEM_USER"
+Write-Output "CONTENT_SOURCE: $CONTENT_SOURCE"
+Write-Output "ROOT_PATH: $ROOT_PATH"
+Write-Output "FILTER_FILE: $FILTER_FILE"
+Write-Output "Silent: $Silent"
+Write-Output "VLT_FLAGS: $VLT_FLAGS"
+Write-Output "VLT_CMD: $VLT_CMD"
+Write-Output "ROOT_PATHS:"
+$ROOT_PATHS | ForEach-Object {
+    Write-Output " - $_"
+}
+Write-Output "SERVICES_TO_DISABLE:"
+$SERVICES_TO_DISABLE | ForEach-Object {
+    Write-Output " - $_"
+}
+
+if (-not($Silent))
+{
+    $START = Read-Host -Prompt 'Do you want to start import with these settings? (y/n)'
+
+    if ($START -ne "y")
+    {
+        Write-Output "Quiting..."
+        Exit
+    }
+}
+
+Write-Output "------- Revert META-INF ----------"
+git checkout HEAD src/main/content/META-INF/
+git clean -fx src/main/content/META-INF
+Write-Output "------- Revert META-INF ----------"
+
+if ($ROOT_PATHS)
+{
+    Write-Output "------- START Update filter ----------"
+    $ROOT_PATHS_LAST = $ROOT_PATHS | Select-Object -Last 1
+    $ROOT_PATHS | ForEach-Object {
+        $LOG_FILENAME = "$_".Replace("/","-")
+
+        Write-Output "Remove exiting Filer..."
+        Copy-Item ".\src\main\content\META-INF\vault\filter-blank.xml" -Destination "$FILTER_FILE"
+
+        Write-Output "Create filter for: $_"
+        $FILTER_XML = [xml](Get-Content $FILTER_FILE)
+        $FILTER_XML_CONTENT = $FILTER_XML.SelectNodes("//workspaceFilter")
+        $FILTER_XML_DELETE = $FILTER_XML_CONTENT.SelectNodes('//filter')
+        $FILTER_XML_DELETE | ForEach-Object{
+            $DELETE_STATUS = $FILTER_XML_CONTENT.RemoveChild($_)
+        }
+        $FILTER_XML_CONTENT_NEW = $FILTER_XML.CreateNode("element","filter","")
+        $FILTER_XML_CONTENT_NEW.SetAttribute("root",$_)
+        $FILTER_XML_CONTENT_NEW_ADD = $FILTER_XML_CONTENT.AppendChild($FILTER_XML_CONTENT_NEW)
+        Write-Output "Saving..."
+        $FILTER_XML.OuterXml | IndentXML -Indent 4 | Out-File $FILTER_FILE -encoding "UTF8"
+        Write-Output "Done..."
+    }
+
+    Write-Output "------- END Update filter ----------"
+}
+
+if ($SERVICES_TO_DISABLE)
+{
+    Write-Output "------- Disable Services ----------"
+    $SERVICES_TO_DISABLE | ForEach-Object {
+        Write-Output "Stopping service: $_"
+        doSlingPost -Method Post -Referer $ADDRESS -UserAgent "curl" -Body $BODY_SERVICE_TO_DISABLE -Url "${ADDRESS}$_" -BasicAuthCreds ${AEM_USER}:${AEM_PASSWORD} -Timeout $TIMEOUT
+    }
+}
+
+Write-Output "------- START Importing content ----------"
+Write-Output "${VLT_CMD} ${VLT_FLAGS} --credentials ${AEM_USER}:****** import -v ${ADDRESS}${AEM_WEBDAV_PATH} ${CONTENT_SOURCE} ${ROOT_PATH}"
+
+Invoke-Expression -Command "${VLT_CMD} ${VLT_FLAGS} --credentials ${AEM_USER}:${AEM_PASSWORD} import -v ${ADDRESS}${AEM_WEBDAV_PATH} ${CONTENT_SOURCE} ${ROOT_PATH} " | Tee-Object -FilePath "${LOG_PATH}\filevailt-import.log"
+
+Write-Output "------- END Importing content ----------"
+
+
+if ($SERVICES_TO_DISABLE)
+{
+    Write-Output "------- Enable Services ----------"
+    $SERVICES_TO_DISABLE | ForEach-Object {
+        Write-Output "Stopping service: $_"
+        doSlingPost -Method Post -Referer $ADDRESS -UserAgent "curl" -Body $BODY_SERVICE_TO_DISABLE_ENABLE -Url "${ADDRESS}$_" -BasicAuthCreds ${AEM_USER}:${AEM_PASSWORD} -Timeout $TIMEOUT
+    }
+}
+
+Write-Output "------- Revert META-INF ----------"
+git checkout HEAD src/main/content/META-INF/
+git clean -fx src/main/content/META-INF
+Write-Output "------- Revert META-INF ----------"
diff --git a/aemdesign-aem-common/filevault-export.ps1 b/aemdesign-aem-common/filevault-export.ps1
index ef21a13d3..d6dbc5295 100644
--- a/aemdesign-aem-common/filevault-export.ps1
+++ b/aemdesign-aem-common/filevault-export.ps1
@@ -15,12 +15,12 @@
     [string]$VLT_FLAGS = "--insecure -Xmx2g",
     [string]$VLT_CMD = "../tools/vault-cli/bin/vlt",
     # Root folder name for placing content
-    [string]$CONTENT_DESTINATION = ".\src\main\content",
+    [string]$CONTENT_DESTINATION = (Resolve-Path -Path ".\src\main\content" -Relative),
     [string]$FILTER_FILE = "${CONTENT_DESTINATION}\META-INF\vault\filter.xml",
     [string]$FILTER_FILE_LOCATION = "${CONTENT_DESTINATION}\META-INF",
     [string[]]$ROOT_PATHS,
     [switch]$Silent = $false,
-    [string]$LOG_PATH = (Resolve-Path -Path "..\logs" -Relative)
+    [string]$LOG_PATH = "..\logs"
 )
 
 Function Format-XMLIndent
diff --git a/aemdesign-aem-common/filevault-import.ps1 b/aemdesign-aem-common/filevault-import.ps1
index 060a4af76..88638cd0b 100644
--- a/aemdesign-aem-common/filevault-import.ps1
+++ b/aemdesign-aem-common/filevault-import.ps1
@@ -41,7 +41,7 @@
         "action"="start"
     },
     [switch]$Silent = $false,
-    [string]$LOG_PATH = (Resolve-Path -Path "..\logs" -Relative)
+    [string]$LOG_PATH = "..\logs"
 )
 
 

From e8cf52ec905602b0a2e3a38951bc2dc87f9ce063 Mon Sep 17 00:00:00 2001
From: wildone <max.barrass@gmail.com>
Date: Fri, 25 Jun 2021 12:14:27 +1000
Subject: [PATCH 24/24] update poms.

---
 aemdesign-aem-author/pom.xml      | 4 ++--
 aemdesign-aem-common/pom.xml      | 4 ++--
 aemdesign-aem-core-deploy/pom.xml | 4 ++--
 aemdesign-aem-services/pom.xml    | 4 ++--
 pom.xml                           | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/aemdesign-aem-author/pom.xml b/aemdesign-aem-author/pom.xml
index 63f46f288..286e38eb6 100755
--- a/aemdesign-aem-author/pom.xml
+++ b/aemdesign-aem-author/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.299</version>
+        <version>2.1.306</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-author</artifactId>
-    <version>2.1.299</version>
+    <version>2.1.306</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Author UI Updates</name>
     <description>AEM.Design extensions and libraries that enhance the default authoring UI</description>
diff --git a/aemdesign-aem-common/pom.xml b/aemdesign-aem-common/pom.xml
index 471c4dd72..d630db27e 100755
--- a/aemdesign-aem-common/pom.xml
+++ b/aemdesign-aem-common/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.299</version>
+        <version>2.1.306</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -17,7 +17,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-common</artifactId>
-    <version>2.1.299</version>
+    <version>2.1.306</version>
     <packaging>content-package</packaging>
     <name>AEM Design - Core - AEM Common</name>
     <description>AEM.Design components and base templates</description>
diff --git a/aemdesign-aem-core-deploy/pom.xml b/aemdesign-aem-core-deploy/pom.xml
index 89e67d543..4455dbdf1 100644
--- a/aemdesign-aem-core-deploy/pom.xml
+++ b/aemdesign-aem-core-deploy/pom.xml
@@ -8,7 +8,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.299</version>
+        <version>2.1.306</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -20,7 +20,7 @@
     <packaging>content-package</packaging>
     <name>AEM Design - Core - Deployment Package</name>
     <description>AEM.Design deployment package for all packages</description>
-    <version>2.1.299</version>
+    <version>2.1.306</version>
     <url>https://aem.design</url>
 
     <developers>
diff --git a/aemdesign-aem-services/pom.xml b/aemdesign-aem-services/pom.xml
index 3d366bf50..4ef74fffa 100755
--- a/aemdesign-aem-services/pom.xml
+++ b/aemdesign-aem-services/pom.xml
@@ -9,7 +9,7 @@
     <parent>
         <groupId>design.aem</groupId>
         <artifactId>aemdesign-aem-core</artifactId>
-        <version>2.1.299</version>
+        <version>2.1.306</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -18,7 +18,7 @@
     <!-- ====================================================================== -->
 
     <artifactId>aemdesign-aem-services</artifactId>
-    <version>2.1.299</version>
+    <version>2.1.306</version>
     <packaging>jar</packaging>
     <name>AEM Design - Core - AEM Services</name>
     <description>Project for all AEM and OSGI Services</description>
diff --git a/pom.xml b/pom.xml
index 11a935425..19e51cc66 100755
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
 
     <groupId>design.aem</groupId>
     <artifactId>aemdesign-aem-core</artifactId>
-    <version>2.1.299</version>
+    <version>2.1.306</version>
     <packaging>pom</packaging>
 
     <name>AEM Design - Core Project</name>