From 9d7905e5d0e4b4028d633bc1db6f81daf581f5c6 Mon Sep 17 00:00:00 2001
From: SkoryUladzislau <uladzislau.skory@hpe.com>
Date: Mon, 7 Feb 2022 22:45:39 +0100
Subject: [PATCH 01/15] [EAK-280] Skeleton Template: Create empty template and
 add ability to create page through console

---
 .../main/content/META-INF/vault/filter.xml    |  1 +
 .../components/content/console/.content.xml   | 84 +++++++++++++++++++
 .../structure/page-trojan-horse/.content.xml  |  6 ++
 .../page-trojan-horse/_cq_dialog.xml          | 50 +++++++++++
 .../apps/wcm/core/content/sites/.content.xml  | 13 +++
 .../settings/wcm/templates/list/.content.xml  |  1 -
 .../wcm/templates/trojan-horse/.content.xml   |  8 ++
 .../trojan-horse/initial/.content.xml         | 10 +++
 .../trojan-horse/policies/.content.xml        | 13 +++
 .../trojan-horse/structure/.content.xml       | 14 ++++
 10 files changed, 199 insertions(+), 1 deletion(-)
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/.content.xml
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/_cq_dialog.xml
 create mode 100644 ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/.content.xml
 create mode 100644 ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/initial/.content.xml
 create mode 100644 ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/policies/.content.xml
 create mode 100644 ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/structure/.content.xml

diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml
index d6fedd0ff..90b35bdca 100644
--- a/ui.apps/src/main/content/META-INF/vault/filter.xml
+++ b/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -10,6 +10,7 @@
     <filter root="/apps/etoolbox-authoring-kit/depends-on-injector"/>
     <filter root="/apps/etoolbox-authoring-kit/install"/>
     <filter root="/apps/etoolbox-authoring-kit/lists"/>
+    <filter root="/apps/etoolbox-authoring-kit/trojan-horse"/>
 
     <!-- The following filters clear old directories in JCR content. They can be removed after v.2 release -->
     <filter root="/apps/authoring-toolkit"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml
new file mode 100644
index 000000000..d8f14d8b3
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed under the Apache License, Version 2.0 (the "License").
+  ~ You may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<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="cq:Page">
+    <createpagedialog
+            jcr:primaryType="nt:unstructured"
+            jcr:title="Create Trojan Horse"
+            sling:resourceType="granite/ui/components/coral/foundation/dialog">
+        <items jcr:primaryType="nt:unstructured">
+            <form jcr:primaryType="nt:unstructured"
+                  sling:resourceType="granite/ui/components/coral/foundation/form"
+                  action="/libs/wcm/core/content/sites/createpagewizard/jcr:content"
+                  foundationForm="{Boolean}true"
+                  method="post"
+                  style="vertical">
+                <successresponse
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Success"
+                        sling:resourceType="granite/ui/components/coral/foundation/form/responses/openprompt"
+                        open="/bin/wcmcommand?cmd=open&amp;_charset_=utf-8&amp;path={Path}"
+                        text="Your page has been created."/>
+                <items jcr:primaryType="nt:unstructured">
+                    <content jcr:primaryType="nt:unstructured"
+                             jcr:title="Package setup"
+                             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">
+                                    <charset
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                                            name="_charset_"
+                                            value="utf-8"/>
+                                    <parentPath
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                                            name="parentPath"
+                                            value="${requestPathInfo.suffix}"/>
+                                    <template
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                                            name="./cq:template"
+                                            value="/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse"/>
+                                    <resourceType
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                                            name="./sling:resourceType"
+                                            value="/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse"/>
+                                    <pageProps
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/coral/foundation/include"
+                                            resourceType="granite/ui/components/coral/foundation/container"
+                                            path="/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/cq:dialog/content/items/tabs/items/mainConfig"/>
+                                    <create
+                                            jcr:primaryType="nt:unstructured"
+                                            sling:resourceType="granite/ui/components/coral/foundation/button"
+                                            granite:class="lists-create-button"
+                                            text="Create"
+                                            type="submit"
+                                            variant="primary"/>
+                                </items>
+                            </column>
+                        </items>
+                    </content>
+                </items>
+            </form>
+        </items>
+    </createpagedialog>
+</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/.content.xml
new file mode 100644
index 000000000..9574612f0
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/.content.xml
@@ -0,0 +1,6 @@
+<?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="Trojan Horse Page"
+    sling:resourceSuperType="core/wcm/components/page/v2/page"
+    componentGroup=".hidden"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/_cq_dialog.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/_cq_dialog.xml
new file mode 100644
index 000000000..170cfe240
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/_cq_dialog.xml
@@ -0,0 +1,50 @@
+<?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"
+          xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+          xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+          jcr:primaryType="nt:unstructured"
+          jcr:title="Trojan Horse Page Properties"
+          sling:resourceType="cq/gui/components/authoring/dialog">
+    <content jcr:primaryType="nt:unstructured">
+        <items jcr:primaryType="nt:unstructured">
+            <tabs jcr:primaryType="nt:unstructured"
+                  sling:resourceType="granite/ui/components/coral/foundation/tabs">
+                <items jcr:primaryType="nt:unstructured">
+                    <mainConfig jcr:primaryType="nt:unstructured"
+                                cq:showOnCreate="true"
+                                granite:hidden="false"
+                                jcr:title="Main Config"
+                                sling:orderBefore="basic"
+                                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">
+                                    <pagetitle jcr:primaryType="nt:unstructured"
+                                               name="./jcr:title"
+                                               fieldLabel="Page Title"
+                                               required="{Boolean}true"
+                                               sling:resourceType="granite/ui/components/coral/foundation/form/textfield"/>
+                                    <pagename jcr:primaryType="nt:unstructured"
+                                              name="pageName"
+                                              cq:hideOnEdit="true"
+                                              validation="admin.pagename"
+                                              fieldLabel="Page Name"
+                                              sling:resourceType="granite/ui/components/coral/foundation/form/textfield"/>
+                                </items>
+                            </column>
+                        </items>
+                    </mainConfig>
+                    <basic jcr:primaryType="nt:unstructured" sling:hideResource="true"/>
+                    <advanced jcr:primaryType="nt:unstructured" sling:hideResource="true"/>
+                    <thumbnail jcr:primaryType="nt:unstructured" sling:hideResource="true"/>
+                    <socialmedia jcr:primaryType="nt:unstructured" sling:hideResource="true"/>
+                    <cloudservices jcr:primaryType="nt:unstructured" sling:hideResource="true"/>
+                    <personalization jcr:primaryType="nt:unstructured" sling:hideResource="true"/>
+                    <permissions jcr:primaryType="nt:unstructured" sling:hideResource="true"/>
+                </items>
+            </tabs>
+        </items>
+    </content>
+</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
index 21e7d6a4f..c4f50b3b1 100644
--- a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
@@ -25,6 +25,19 @@
                                   nesting="hide"
                                   src.uritemplate="/mnt/overlay/etoolbox-authoring-kit/lists/components/content/console/createpagedialog.html{+id}"/>
                         </createlist>
+                        <createTrojanHorse granite:rel="cq-siteadmin-admin-create-trojan-horse"
+                                    jcr:primaryType="nt:unstructured"
+                                    sling:resourceType="granite/ui/components/coral/foundation/collection/actionlink"
+                                    action="foundation.dialog"
+                                    icon="DataUpload"
+                                    rel="cq-siteadmin-admin-create-trojan-horse"
+                                    relScope="item"
+                                    target=".cq-siteadmin-admin-childpages"
+                                    text="Trojan Horse">
+                            <data jcr:primaryType="nt:unstructured"
+                                  nesting="hide"
+                                  src.uritemplate="/mnt/overlay/etoolbox-authoring-kit/trojan-horse/components/content/console/createpagedialog.html{+id}"/>
+                        </createTrojanHorse>
                     </items>
                 </create>
             </secondary>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/list/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/list/.content.xml
index 720502818..c391d29c1 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/list/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/list/.content.xml
@@ -2,7 +2,6 @@
 <jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
     jcr:primaryType="cq:Template">
     <jcr:content
-        cq:templateType="/conf/etoolbox-authoring-kit/settings/wcm/template-types/list"
         jcr:primaryType="cq:PageContent"
         jcr:title="Exadel Toolbox List page"
         status="enabled"/>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/.content.xml
new file mode 100644
index 000000000..b46275235
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/.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:Template">
+    <jcr:content
+        jcr:primaryType="cq:PageContent"
+        jcr:title="Exadel Trojan Horse page"
+        status="enabled"/>
+</jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/initial/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/initial/.content.xml
new file mode 100644
index 000000000..f9b2da2f3
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/initial/.content.xml
@@ -0,0 +1,10 @@
+<?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:Page">
+    <jcr:content
+        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse"
+        jcr:primaryType="cq:PageContent"
+        sling:resourceType="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse">
+    </jcr:content>
+</jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/policies/.content.xml
new file mode 100644
index 000000000..3723b14cb
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/policies/.content.xml
@@ -0,0 +1,13 @@
+<?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" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="cq:Page">
+    <jcr:content
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="wcm/core/components/policies/mappings">
+        <list cq:policy="wcm/foundation/components/responsivegrid/list"
+              jcr:primaryType="nt:unstructured"
+              sling:resourceType="wcm/core/components/policies/mapping">
+        </list>
+    </jcr:content>
+</jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/structure/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/structure/.content.xml
new file mode 100644
index 000000000..101d40c22
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/structure/.content.xml
@@ -0,0 +1,14 @@
+<?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" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="cq:Page">
+    <jcr:content
+            cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse"
+            jcr:primaryType="cq:PageContent"
+            sling:resourceType="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse">
+        <list jcr:primaryType="nt:unstructured"
+              sling:resourceType="wcm/foundation/components/responsivegrid"
+              editable="{Boolean}true">
+        </list>
+    </jcr:content>
+</jcr:root>

From ee206e4b75031b844ca1813a07869de11acf5023 Mon Sep 17 00:00:00 2001
From: SkoryUladzislau <uladzislau.skory@hpe.com>
Date: Tue, 8 Feb 2022 23:50:22 +0100
Subject: [PATCH 02/15] [EAK-280] Skeleton Template: Create toolbar action for
 skeleton import

---
 .../clientlib-injector/.content.xml           |  2 +-
 .../dialog/clientlibs/toolbar/.content.xml    |  6 ++
 .../clientlibs/toolbar/import-action.js       | 59 ++++++++++++++++++
 .../dialog/clientlibs/toolbar/importHelper.js | 60 +++++++++++++++++++
 .../content/dialog/clientlibs/toolbar/js.txt  |  2 +
 5 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/.content.xml
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/import-action.js
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/importHelper.js
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/js.txt

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml
index 9b9d25b57..645a9a876 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml
@@ -3,5 +3,5 @@
 		  xmlns:jcr="http://www.jcp.org/jcr/1.0"
           jcr:primaryType="cq:ClientLibraryFolder"
           categories="[cq.authoring.dialog]"
-          dependencies="[cq.authoring.dependson,cq.authoring.dependson.fixes,lists.item-dialog]"
+          dependencies="[cq.authoring.dependson,cq.authoring.dependson.fixes,lists.item-dialog,trojan-horse.toolbar-action]"
 />
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/.content.xml
new file mode 100644
index 000000000..2dd472e4d
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/.content.xml
@@ -0,0 +1,6 @@
+<?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"
+          allowProxy="{Boolean}true"
+          categories="[trojan-horse.toolbar-action]"
+          jsProcessor="[min:gcc;languageIn=ECMASCRIPT_2015,compilationLevel=advanced,languageOut=ECMASCRIPT5]"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/import-action.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/import-action.js
new file mode 100644
index 000000000..9cb0ebb30
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/import-action.js
@@ -0,0 +1,59 @@
+/**
+ *  Import Toolbar Action to import "template" page content into current position
+ **/
+(function ($document, author, ns) {
+    const IMPORT_ACTION = 'import-action';
+
+    const JCR_CONTENT = '/jcr:content/';
+    const NEWPAR_TYPES = ['foundation/components/parsys/newpar', 'wcm/foundation/components/parsys/newpar'];
+    const IMPORT_DIALOG_PATH = '/mnt/override/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/_cq_dialog.html';
+
+    function condition(editable) {
+        return author.pageInfoHelper.canModify() && editable.hasAction('INSERT');
+    }
+
+    function openImportDialog(editable) {
+        const target = editable.getParent();
+        const path = target.path;
+        const order = NEWPAR_TYPES.includes(editable.type) ? 'last' : `after ${editable.name}`;
+        const parentType = editable.getParent().type;
+
+        const page = path.substr(0, path.indexOf(JCR_CONTENT) + JCR_CONTENT.length);
+        const dialogPath = ns.EToolboxTrojanHorse.joinJCRPath(IMPORT_DIALOG_PATH, page);
+        const dialogConfig = {
+            src: Granite.HTTP.externalize(dialogPath.replace(/\*\//, '')),
+            loadingMode: 'auto',
+            layout: 'auto'
+        };
+        const dlg = new author.ui.Dialog({
+            getConfig: () => dialogConfig,
+            getRequestData: () => ({ order, parentType, path }),
+            onSuccess: () => setTimeout(() => {
+                author.editableHelper.actions.REFRESH.execute(target);
+            }, 250)
+        });
+
+        author.DialogFrame.openDialog(dlg);
+    }
+
+    $document.off('cq-layer-activated.import-action').on('cq-layer-activated.import-action', function (ev) {
+        if (ev.layer === 'Edit') {
+            author.EditorFrame.editableToolbar.registerAction(IMPORT_ACTION, {
+                icon: 'coral-Icon--DataDownload',
+                text: Granite.I18n.get('Import Trojan Horse'),
+                handler: openImportDialog,
+                condition: condition,
+                isNonMulti: false
+            });
+            // Restore custom action after MSM
+            setTimeout(() => {
+                const action = author.EditorFrame.editableToolbar.config.actions[IMPORT_ACTION];
+                if (action && action.decoratedCondition) {
+                    action.condition = action.decoratedCondition;
+                    delete action.decoratedCondition;
+                    console.log('Action "', action.name, '" undecorated');
+                }
+            });
+        }
+    });
+})($(document), Granite.author, Granite);
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/importHelper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/importHelper.js
new file mode 100644
index 000000000..4d683d1be
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/importHelper.js
@@ -0,0 +1,60 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+Granite.EToolboxTrojanHorse = Granite.EToolboxTrojanHorse || (function () {
+
+    return {
+        /** Join JCR path parts */
+        joinJCRPath: function (path1, path2, ...rest) {
+            if (rest.length > 0) return HPEUtils.joinJCRPath(HPEUtils.joinJCRPath(path1, path2), ...rest);
+            return (path1 + '/' + path2).replace(/\/(\/)+/g, '/');
+        },
+        /** Join and normalize JCR path. Removes ending '/' */
+        resolveJCRPath: function (path, ...rest) {
+            if (rest.length > 0) return HPEUtils.resolveJCRPath(HPEUtils.joinJCRPath(path, ...rest));
+            return path.replace(/\/$/, '').replace(/\/_jcr_content\//g, '/jcr:content/');
+        },
+        /** Resolve path to the JCR content */
+        resolveJCRContentPath: function (path) {
+            return path ? HPEUtils.joinJCRPath(path, '/_jcr_content/') : '';
+        },
+
+        /** Check if the passed resource type can be placed inside of passed path */
+        canInsert: function (resourceType, parentPath) {
+            if (!resourceType) return 'No component to insert';
+            if (!parentPath) return 'Insertion target is incorrect';
+
+            const component = Granite.author.components.find({resourceType})[0];
+            if (!component) return 'Component resourceType is not is the list';
+
+            const componentPath = component.getPath();
+            const componentRelativePath = componentPath.replace(/^\/[a-z]+\//, '');
+            const componentGroup = 'group:' + component.getGroup();
+
+            const resolvedPath = HPEUtils.resolveJCRPath(parentPath);
+            const allowedComponents = Granite.author.components.allowedComponentsFor[resolvedPath];
+
+            if (!allowedComponents || !allowedComponents.length) {
+                return `No allowed components found for '${resolvedPath}'`;
+            }
+
+            if (allowedComponents.indexOf(componentPath) === -1 &&
+                allowedComponents.indexOf(componentRelativePath) === -1 &&
+                allowedComponents.indexOf(componentGroup) === -1) {
+                return `Component '${component.getTitle()}' is not allowed for current target`;
+            }
+            return true;
+        }
+    };
+})();
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/js.txt b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/js.txt
new file mode 100644
index 000000000..71440e64c
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/js.txt
@@ -0,0 +1,2 @@
+importHelper.js
+import-action.js

From 8c29c3295b5677c492b39d7ceefa276a2d6d9928 Mon Sep 17 00:00:00 2001
From: SkoryUladzislau <uladzislau.skory@hpe.com>
Date: Wed, 9 Feb 2022 23:04:45 +0100
Subject: [PATCH 03/15] [EAK-280] Skeleton Template: Create importing dialog
 for trojan horse action

---
 .../content/dialog/importdlg/.content.xml     |  4 +
 .../dialog/importdlg/_cq_dialog/.content.xml  | 99 +++++++++++++++++++
 .../apps/wcm/core/content/sites/.content.xml  |  2 +-
 .../settings/wcm/policies/.content.xml        | 12 +++
 .../trojan-horse/structure/.content.xml       | 15 +--
 5 files changed, 124 insertions(+), 8 deletions(-)
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/.content.xml
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/_cq_dialog/.content.xml

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/.content.xml
new file mode 100644
index 000000000..c37d95dc0
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/.content.xml
@@ -0,0 +1,4 @@
+<?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="cq:Component"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/_cq_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/_cq_dialog/.content.xml
new file mode 100644
index 000000000..3ba353a2f
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/_cq_dialog/.content.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root
+    fileName="_cq_dialog.xml"
+    jcr:title="Import template"
+    jcr:primaryType="nt:unstructured"
+    sling:resourceType="cq/gui/components/authoring/dialog"
+    xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
+    xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+    xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
+    height="{Decimal}150">
+    <content jcr:primaryType="nt:unstructured"
+             sling:resourceType="granite/ui/components/coral/foundation/container">
+        <layout jcr:primaryType="nt:unstructured"
+                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">
+                    <!-- Hidden field to replace form action with the ending '/' and store action path -->
+                    <action jcr:primaryType="nt:unstructured"
+                            sling:resourceType="granite/ui/components/coral/foundation/form/hidden">
+                        <granite:data jcr:primaryType="nt:unstructured"
+                                      dependsOnRef="targetPath"
+                                      dependsOn="Granite.EToolboxTrojanHorse.setupInsertionFormTarget(this, '${param.path}')"
+                                      dependsOnAction="set"/>
+                    </action>
+
+                    <!-- Import path field -->
+                    <importPath
+                        jcr:primaryType="nt:unstructured"
+                        sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
+                        rootPath="/content"
+                        fieldLabel="Link Skeleton"
+                        fieldDescription="Provide link to the custom skeleton page.">
+                        <granite:data jcr:primaryType="nt:unstructured"
+                                      dependsOnRef="importPath"
+                                      dependsOn="Granite.EToolboxTrojanHorse.canInsert(@importNode.type, @targetPath)"
+                                      dependsOnAction="validate"/>
+                    </importPath>
+
+                    <!-- Hidden JSON field to store resolved first child component from template -->
+                    <node jcr:primaryType="nt:unstructured"
+                          sling:resourceType="granite/ui/components/coral/foundation/form/hidden">
+                        <granite:data jcr:primaryType="nt:unstructured"
+                                      dependsOnRef="importNode"
+                                      dependsOnRefType="json"
+                                      dependsOn="Granite.EToolboxTrojanHorse.resolveJCRContentPath(@importPath)"
+                                      dependsOnAction="fetch"
+                                      dependsOn-fetch-map="Granite.EToolboxTrojanHorse.mapImportResourcePath"
+                                      dependsOn-fetch-err="Granite.EToolboxTrojanHorse.mapImportResourcePathError"
+                                      dependsOn-fetch-postfix=".2.json"/>
+                    </node>
+
+                    <!-- Sling instruction to define copy target -->
+                    <copyFrom jcr:primaryType="nt:unstructured"
+                              sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                              name="./@CopyFrom"
+                              required="{Boolean}true">
+                        <granite:data jcr:primaryType="nt:unstructured"
+                                      dependsOn="@importNode.path || ''"
+                                      dependsOnAction="set"/>
+                    </copyFrom>
+
+                    <!-- Readonly field to define copy resource type. Contains allowed component validation -->
+                    <resType jcr:primaryType="nt:unstructured"
+                             sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                             name="./sling:resourceType">
+                        <granite:data jcr:primaryType="nt:unstructured"
+                                      dependsOn="@importNode.type || ''"
+                                      dependsOnAction="set"/>
+                    </resType>
+
+                    <!-- Hidden field to send parent resource type -->
+                    <parentType jcr:primaryType="nt:unstructured"
+                                sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                                name="parentResourceType"
+                                value="${param.parentType}">
+                    </parentType>
+
+                    <!-- Hidden field to send insertion order -->
+                    <order jcr:primaryType="nt:unstructured"
+                           sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                           name=":order" value="${param.order}">
+                    </order>
+
+                    <!-- Hidden field to send recommended name for new node -->
+                    <nameHint jcr:primaryType="nt:unstructured"
+                              sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
+                              name=":nameHint">
+                        <granite:data jcr:primaryType="nt:unstructured"
+                                      dependsOn="@importNode.name ? (@importNode.name + ' copy') : ''"
+                                      dependsOnAction="set"/>
+                    </nameHint>
+                </items>
+            </column>
+        </items>
+    </content>
+</jcr:root>
diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
index c4f50b3b1..b6c835c58 100644
--- a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
@@ -29,7 +29,7 @@
                                     jcr:primaryType="nt:unstructured"
                                     sling:resourceType="granite/ui/components/coral/foundation/collection/actionlink"
                                     action="foundation.dialog"
-                                    icon="DataUpload"
+                                    icon="dataUpload"
                                     rel="cq-siteadmin-admin-create-trojan-horse"
                                     relScope="item"
                                     target=".cq-siteadmin-admin-childpages"
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
index cb95920da..9063eeb6e 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
@@ -21,6 +21,18 @@
                         cq:styleDefaultClasses="etoolbox-list"
                         policyResourceType="wcm/foundation/components/responsivegrid">
                     </list>
+                    <trojan-horse
+                        cq:lastReplicated="{Date}2021-02-09T12:00:00.347Z"
+                        cq:lastReplicatedBy="admin"
+                        cq:lastReplicationAction="Activate"
+                        jcr:mixinTypes="[cq:ReplicationStatus]"
+                        jcr:description="Policy for Exadel Trojan Horse"
+                        jcr:primaryType="nt:unstructured"
+                        jcr:title="Trojan Horse"
+                        sling:resourceType="wcm/core/components/policy/policy"
+                        components="[group:HPE Content]"
+                        policyResourceType="wcm/foundation/components/responsivegrid">
+                    </trojan-horse>
                 </responsivegrid>
             </components>
         </foundation>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/structure/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/structure/.content.xml
index 101d40c22..b75a590e3 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/structure/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/structure/.content.xml
@@ -3,12 +3,13 @@
           xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
           jcr:primaryType="cq:Page">
     <jcr:content
-            cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse"
-            jcr:primaryType="cq:PageContent"
-            sling:resourceType="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse">
-        <list jcr:primaryType="nt:unstructured"
-              sling:resourceType="wcm/foundation/components/responsivegrid"
-              editable="{Boolean}true">
-        </list>
+        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse"
+        jcr:primaryType="cq:PageContent"
+        sling:resourceType="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse">
+        <trojan-horse-parsys
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/foundation/components/responsivegrid"
+            editable="{Boolean}true">
+        </trojan-horse-parsys>
     </jcr:content>
 </jcr:root>

From 3af9eff5aa209871fae83254a31ca5175dc82cc6 Mon Sep 17 00:00:00 2001
From: SkoryUladzislau <uladzislau.skory@hpe.com>
Date: Fri, 18 Feb 2022 14:24:05 +0100
Subject: [PATCH 04/15] [EAK-280] Skeleton Template: Create template type and
 simple implementation of template

---
 .../components/content/console/.content.xml   |   2 +-
 .../dialog/clientlibs/toolbar/importHelper.js |  60 ----------
 .../clientlibs/action}/.content.xml           |   0
 .../clientlibs/action}/import-action.js       |  10 +-
 .../clientlibs/action/import-helper.js        | 104 ++++++++++++++++++
 .../clientlibs/action}/js.txt                 |   2 +-
 .../clientlibs/limit-parsys/.content.xml      |   6 +
 .../toolbar/clientlibs/limit-parsys/js.txt    |   1 +
 .../limit-parsys/limit-parsys-helper.js       |  24 ++++
 .../importdlg => toolbar/dialog}/.content.xml |   0
 .../dialog}/_cq_dialog/.content.xml           |   0
 .../apps/wcm/core/content/sites/.content.xml  |   2 +-
 .../settings/wcm/policies/.content.xml        |  22 +++-
 .../settings/wcm/template-types/.content.xml  |   6 +
 .../wcm/template-types/_rep_policy.xml        |  20 ++++
 .../template-types/trojan-horse/.content.xml  |   8 ++
 .../trojan-horse/initial/.content.xml         |   0
 .../trojan-horse/policies/.content.xml        |  10 +-
 .../trojan-horse/structure/.content.xml       |   0
 .../.content.xml                              |   2 +-
 .../simple-trojan-horse/initial/.content.xml  |  10 ++
 .../simple-trojan-horse/policies/.content.xml |  15 +++
 .../structure/.content.xml                    |  15 +++
 23 files changed, 245 insertions(+), 74 deletions(-)
 delete mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/importHelper.js
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/{dialog/clientlibs/toolbar => toolbar/clientlibs/action}/.content.xml (100%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/{dialog/clientlibs/toolbar => toolbar/clientlibs/action}/import-action.js (83%)
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-helper.js
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/{dialog/clientlibs/toolbar => toolbar/clientlibs/action}/js.txt (50%)
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/.content.xml
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/js.txt
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/{dialog/importdlg => toolbar/dialog}/.content.xml (100%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/{dialog/importdlg => toolbar/dialog}/_cq_dialog/.content.xml (100%)
 create mode 100644 ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/.content.xml
 create mode 100644 ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/_rep_policy.xml
 create mode 100644 ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/.content.xml
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/{templates => template-types}/trojan-horse/initial/.content.xml (100%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/{templates => template-types}/trojan-horse/policies/.content.xml (53%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/{templates => template-types}/trojan-horse/structure/.content.xml (100%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/{trojan-horse => simple-trojan-horse}/.content.xml (85%)
 create mode 100644 ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/initial/.content.xml
 create mode 100644 ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/policies/.content.xml
 create mode 100644 ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/structure/.content.xml

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml
index d8f14d8b3..9604e499f 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml
@@ -55,7 +55,7 @@
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
                                             name="./cq:template"
-                                            value="/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse"/>
+                                            value="/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse"/>
                                     <resourceType
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/importHelper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/importHelper.js
deleted file mode 100644
index 4d683d1be..000000000
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/importHelper.js
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-Granite.EToolboxTrojanHorse = Granite.EToolboxTrojanHorse || (function () {
-
-    return {
-        /** Join JCR path parts */
-        joinJCRPath: function (path1, path2, ...rest) {
-            if (rest.length > 0) return HPEUtils.joinJCRPath(HPEUtils.joinJCRPath(path1, path2), ...rest);
-            return (path1 + '/' + path2).replace(/\/(\/)+/g, '/');
-        },
-        /** Join and normalize JCR path. Removes ending '/' */
-        resolveJCRPath: function (path, ...rest) {
-            if (rest.length > 0) return HPEUtils.resolveJCRPath(HPEUtils.joinJCRPath(path, ...rest));
-            return path.replace(/\/$/, '').replace(/\/_jcr_content\//g, '/jcr:content/');
-        },
-        /** Resolve path to the JCR content */
-        resolveJCRContentPath: function (path) {
-            return path ? HPEUtils.joinJCRPath(path, '/_jcr_content/') : '';
-        },
-
-        /** Check if the passed resource type can be placed inside of passed path */
-        canInsert: function (resourceType, parentPath) {
-            if (!resourceType) return 'No component to insert';
-            if (!parentPath) return 'Insertion target is incorrect';
-
-            const component = Granite.author.components.find({resourceType})[0];
-            if (!component) return 'Component resourceType is not is the list';
-
-            const componentPath = component.getPath();
-            const componentRelativePath = componentPath.replace(/^\/[a-z]+\//, '');
-            const componentGroup = 'group:' + component.getGroup();
-
-            const resolvedPath = HPEUtils.resolveJCRPath(parentPath);
-            const allowedComponents = Granite.author.components.allowedComponentsFor[resolvedPath];
-
-            if (!allowedComponents || !allowedComponents.length) {
-                return `No allowed components found for '${resolvedPath}'`;
-            }
-
-            if (allowedComponents.indexOf(componentPath) === -1 &&
-                allowedComponents.indexOf(componentRelativePath) === -1 &&
-                allowedComponents.indexOf(componentGroup) === -1) {
-                return `Component '${component.getTitle()}' is not allowed for current target`;
-            }
-            return true;
-        }
-    };
-})();
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/.content.xml
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/.content.xml
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/import-action.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-action.js
similarity index 83%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/import-action.js
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-action.js
index 9cb0ebb30..121d73132 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/import-action.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-action.js
@@ -2,11 +2,11 @@
  *  Import Toolbar Action to import "template" page content into current position
  **/
 (function ($document, author, ns) {
-    const IMPORT_ACTION = 'import-action';
+    const IMPORT_ACTION = 'trojan-horse-import-action';
 
     const JCR_CONTENT = '/jcr:content/';
-    const NEWPAR_TYPES = ['foundation/components/parsys/newpar', 'wcm/foundation/components/parsys/newpar'];
-    const IMPORT_DIALOG_PATH = '/mnt/override/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/_cq_dialog.html';
+    const NEWPAR_TYPES = ['wcm/foundation/components/parsys/newpar', 'wcm/foundation/components/responsivegrid/new'];
+    const IMPORT_DIALOG_PATH = '/mnt/override/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/_cq_dialog.html';
 
     function condition(editable) {
         return author.pageInfoHelper.canModify() && editable.hasAction('INSERT');
@@ -36,10 +36,10 @@
         author.DialogFrame.openDialog(dlg);
     }
 
-    $document.off('cq-layer-activated.import-action').on('cq-layer-activated.import-action', function (ev) {
+    $document.off('cq-layer-activated.trojan-horse-import-action').on('cq-layer-activated.trojan-horse-import-action', function (ev) {
         if (ev.layer === 'Edit') {
             author.EditorFrame.editableToolbar.registerAction(IMPORT_ACTION, {
-                icon: 'coral-Icon--DataDownload',
+                icon: 'coral-Icon--dataUpload',
                 text: Granite.I18n.get('Import Trojan Horse'),
                 handler: openImportDialog,
                 condition: condition,
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-helper.js
new file mode 100644
index 000000000..6a2a1f44a
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-helper.js
@@ -0,0 +1,104 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+(function (author, ns) {
+    'use strict';
+
+    ns.EToolboxTrojanHorse = ns.EToolboxTrojanHorse || {}
+
+    /** Join JCR path parts */
+    ns.EToolboxTrojanHorse.joinJCRPath = function (path1, path2, ...rest) {
+        if (rest.length > 0) return ns.EToolboxTrojanHorse.joinJCRPath(ns.EToolboxTrojanHorse.joinJCRPath(path1, path2), ...rest);
+        return (path1 + '/' + path2).replace(/\/(\/)+/g, '/');
+    };
+
+    /** Join and normalize JCR path. Removes ending '/' */
+    ns.EToolboxTrojanHorse.resolveJCRPath = function (path, ...rest) {
+        if (rest.length > 0) return ns.EToolboxTrojanHorse.resolveJCRPath(ns.EToolboxTrojanHorse.joinJCRPath(path, ...rest));
+        return path.replace(/\/$/, '').replace(/\/_jcr_content\//g, '/jcr:content/');
+    }
+
+    /** Resolve path to the JCR content */
+    ns.EToolboxTrojanHorse.resolveJCRContentPath = function (path) {
+        return path ? ns.EToolboxTrojanHorse.joinJCRPath(path, '/_jcr_content/') : '';
+    };
+
+    /** Check if the passed resource type can be placed inside of passed path */
+    ns.EToolboxTrojanHorse.canInsert = function (resourceType, parentPath) {
+        if (!resourceType) return 'No component to insert';
+        if (!parentPath) return 'Insertion target is incorrect';
+
+        const component = Granite.author.components.find({resourceType})[0];
+        if (!component) return 'Component resourceType is not is the list';
+
+        const componentPath = component.getPath();
+        const componentRelativePath = componentPath.replace(/^\/[a-z]+\//, '');
+        const componentGroup = 'group:' + component.getGroup();
+
+        const resolvedPath = ns.EToolboxTrojanHorse.resolveJCRPath(parentPath);
+        const allowedComponents = Granite.author.components.allowedComponentsFor[resolvedPath];
+
+        if (!allowedComponents || !allowedComponents.length) {
+            return `No allowed components found for '${resolvedPath}'`;
+        }
+
+        if (allowedComponents.indexOf(componentPath) === -1 &&
+            allowedComponents.indexOf(componentRelativePath) === -1 &&
+            allowedComponents.indexOf(componentGroup) === -1) {
+            return `Component '${component.getTitle()}' is not allowed for current target`;
+        }
+        return true;
+    };
+
+    const isValidComponentNode = (item) => {
+        return item && item['sling:resourceType'];
+    };
+
+    const findRootName = (content) => {
+        if (Object.hasOwnProperty.call(content, 'trojan-horse-parsys')) return 'trojan-horse-parsys';
+        return null;
+    };
+
+    /**
+     * Add ending '/' to the form action.
+     * @returns result path
+     * */
+    ns.EToolboxTrojanHorse.setupInsertionFormTarget = function ($el, path) {
+        path = ns.EToolboxTrojanHorse.joinJCRPath(path, '/');
+        $el.closest('form[action]').attr('action', path);
+        return path;
+    };
+
+    /** Fetch action successful response handler to resolve first content component */
+    ns.EToolboxTrojanHorse.mapImportResourcePath = function (response, parentName, parentPath) {
+        try {
+            const rootName = findRootName(response);
+            if (!rootName) return '';
+            const root = response[rootName];
+            const nodeNames = Object.keys(root);
+            for (const name of nodeNames) {
+                const node = root[name];
+                if (!isValidComponentNode(node)) continue;
+                const path = ns.EToolboxTrojanHorse.resolveJCRPath(parentPath, '/', rootName, '/', name);
+                const type = node['sling:resourceType'];
+                return JSON.stringify({type, path, name});
+            }
+        } catch {
+            // no action
+        }
+        return '';
+    };
+    /** Fetch action unsuccessful response handler stub */
+    ns.EToolboxTrojanHorse.mapImportResourcePathError = () => '';
+
+}(Granite.author, Granite));
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/js.txt b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/js.txt
similarity index 50%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/js.txt
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/js.txt
index 71440e64c..539cd2948 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/clientlibs/toolbar/js.txt
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/js.txt
@@ -1,2 +1,2 @@
-importHelper.js
+import-helper.js
 import-action.js
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/.content.xml
new file mode 100644
index 000000000..8e00a9a95
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/.content.xml
@@ -0,0 +1,6 @@
+<?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"
+          allowProxy="{Boolean}true"
+          categories="[trojan-horse.limit-parsys]"
+          jsProcessor="[min:gcc;languageIn=ECMASCRIPT_2015,compilationLevel=advanced,languageOut=ECMASCRIPT5]"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/js.txt b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/js.txt
new file mode 100644
index 000000000..7829480e1
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/js.txt
@@ -0,0 +1 @@
+limit-parsys-helper.js
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
new file mode 100644
index 000000000..97076e789
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
@@ -0,0 +1,24 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+(function (author, ns) {
+    'use strict';
+
+    ns.EToolboxTrojanHorseParsys = ns.EToolboxTrojanHorseParsys || {}
+
+    /** Limit parsys */
+    ns.EToolboxTrojanHorseParsys.limitParsys = function () {
+
+    };
+
+}(Granite.author, Granite));
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/.content.xml
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/.content.xml
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/_cq_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/_cq_dialog/.content.xml
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/dialog/importdlg/_cq_dialog/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/_cq_dialog/.content.xml
diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
index b6c835c58..6c785319a 100644
--- a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
@@ -29,7 +29,7 @@
                                     jcr:primaryType="nt:unstructured"
                                     sling:resourceType="granite/ui/components/coral/foundation/collection/actionlink"
                                     action="foundation.dialog"
-                                    icon="dataUpload"
+                                    icon="dataDownload"
                                     rel="cq-siteadmin-admin-create-trojan-horse"
                                     relScope="item"
                                     target=".cq-siteadmin-admin-childpages"
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
index 9063eeb6e..3c7fe45a4 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
@@ -30,11 +30,31 @@
                         jcr:primaryType="nt:unstructured"
                         jcr:title="Trojan Horse"
                         sling:resourceType="wcm/core/components/policy/policy"
-                        components="[group:HPE Content]"
+                        components=""
                         policyResourceType="wcm/foundation/components/responsivegrid">
                     </trojan-horse>
                 </responsivegrid>
             </components>
         </foundation>
     </wcm>
+    <etoolbox-authoring-kit jcr:primaryType="nt:unstructured">
+        <trojan-horse jcr:primaryType="nt:unstructured">
+            <components jcr:primaryType="nt:unstructured">
+                <structure jcr:primaryType="nt:unstructured">
+                    <page-trojan-horse jcr:primaryType="nt:unstructured">
+                        <trojan-horse-page-policy
+                            cq:lastReplicated="{Date}2021-02-09T12:00:00.347Z"
+                            cq:lastReplicatedBy="admin"
+                            cq:lastReplicationAction="Activate"
+                            jcr:mixinTypes="[cq:ReplicationStatus]"
+                            jcr:primaryType="nt:unstructured"
+                            jcr:title="Trojan Horse Page Policy"
+                            sling:resourceType="wcm/core/components/policy/policy"
+                            clientlibs="trojan-horse.limit-parsys">
+                        </trojan-horse-page-policy>
+                    </page-trojan-horse>
+                </structure>
+            </components>
+        </trojan-horse>
+    </etoolbox-authoring-kit>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/.content.xml
new file mode 100644
index 000000000..4b4875a77
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/.content.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:cq="http://www.day.com/jcr/cq/1.0" xmlns:rep="internal" xmlns:jcr="http://www.jcp.org/jcr/1.0"
+    jcr:mixinTypes="[rep:AccessControllable]"
+    jcr:primaryType="cq:Page">
+    <rep:policy/>
+</jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/_rep_policy.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/_rep_policy.xml
new file mode 100644
index 000000000..949da4a0e
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/_rep_policy.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jcr:root xmlns:crx="http://www.day.com/crx/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:rep="internal"
+    jcr:primaryType="rep:ACL">
+    <allow
+        jcr:primaryType="rep:GrantACE"
+        rep:principalName="everyone"
+        rep:privileges="{Name}[jcr:read]"/>
+    <allow1
+        jcr:primaryType="rep:GrantACE"
+        rep:principalName="content-authors"
+        rep:privileges="{Name}[crx:replicate]"/>
+    <allow2
+        jcr:primaryType="rep:GrantACE"
+        rep:principalName="template-authors"
+        rep:privileges="{Name}[jcr:versionManagement,crx:replicate,rep:write,jcr:lockManagement]"/>
+    <allow3
+        jcr:primaryType="rep:GrantACE"
+        rep:principalName="version-manager-service"
+        rep:privileges="{Name}[jcr:versionManagement,rep:write]"/>
+</jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/.content.xml
new file mode 100644
index 000000000..04f30a0ec
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/.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:Template">
+    <jcr:content
+        jcr:primaryType="cq:PageContent"
+        jcr:title="Exadel Trojan Horse Template Type"
+        status="enabled"/>
+</jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/initial/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/initial/.content.xml
similarity index 100%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/initial/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/initial/.content.xml
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/policies/.content.xml
similarity index 53%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/policies/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/policies/.content.xml
index 3723b14cb..8341028e5 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/policies/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/policies/.content.xml
@@ -3,11 +3,13 @@
           xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
           jcr:primaryType="cq:Page">
     <jcr:content
+        cq:policy="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/trojan-horse-page-policy"
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
-        <list cq:policy="wcm/foundation/components/responsivegrid/list"
-              jcr:primaryType="nt:unstructured"
-              sling:resourceType="wcm/core/components/policies/mapping">
-        </list>
+        <trojan-horse-parsys
+            cq:policy="wcm/foundation/components/responsivegrid/trojan-horse"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/core/components/policies/mapping">
+        </trojan-horse-parsys>
     </jcr:content>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/structure/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/structure/.content.xml
similarity index 100%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/structure/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/structure/.content.xml
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/.content.xml
similarity index 85%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/.content.xml
index b46275235..f146abb4c 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/.content.xml
@@ -3,6 +3,6 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         jcr:primaryType="cq:PageContent"
-        jcr:title="Exadel Trojan Horse page"
+        jcr:title="Simple Trojan Horse Page"
         status="enabled"/>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/initial/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/initial/.content.xml
new file mode 100644
index 000000000..a9570e20a
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/initial/.content.xml
@@ -0,0 +1,10 @@
+<?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:Page">
+    <jcr:content
+        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse"
+        jcr:primaryType="cq:PageContent"
+        sling:resourceType="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse">
+    </jcr:content>
+</jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/policies/.content.xml
new file mode 100644
index 000000000..8341028e5
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/policies/.content.xml
@@ -0,0 +1,15 @@
+<?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" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:policy="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/trojan-horse-page-policy"
+        jcr:primaryType="nt:unstructured"
+        sling:resourceType="wcm/core/components/policies/mappings">
+        <trojan-horse-parsys
+            cq:policy="wcm/foundation/components/responsivegrid/trojan-horse"
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/core/components/policies/mapping">
+        </trojan-horse-parsys>
+    </jcr:content>
+</jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/structure/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/structure/.content.xml
new file mode 100644
index 000000000..90a811b19
--- /dev/null
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/structure/.content.xml
@@ -0,0 +1,15 @@
+<?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" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
+          jcr:primaryType="cq:Page">
+    <jcr:content
+        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse"
+        jcr:primaryType="cq:PageContent"
+        sling:resourceType="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse">
+        <trojan-horse-parsys
+            jcr:primaryType="nt:unstructured"
+            sling:resourceType="wcm/foundation/components/responsivegrid"
+            editable="{Boolean}true">
+        </trojan-horse-parsys>
+    </jcr:content>
+</jcr:root>

From 8ac2a6892a8995662ce3b71b38578bb474210104 Mon Sep 17 00:00:00 2001
From: SkoryUladzislau <uladzislau.skory@hpe.com>
Date: Fri, 4 Mar 2022 21:55:05 +0100
Subject: [PATCH 05/15] [EAK-280] Content Blueprint Template: rename 'skeleton
 template' into Content Blueprint Template

---
 .../main/content/META-INF/vault/filter.xml    |  2 +-
 .../clientlib-injector/.content.xml           |  2 +-
 .../components/content/console/.content.xml   |  8 +--
 .../toolbar/clientlibs/action}/.content.xml   |  2 +-
 .../clientlibs/action/import-action.js        | 10 ++--
 .../clientlibs/action/import-helper.js        | 50 +++++++++++--------
 .../content/toolbar/clientlibs/action/js.txt  |  0
 .../clientlibs/limit-parsys}/.content.xml     |  2 +-
 .../toolbar/clientlibs/limit-parsys/js.txt    |  0
 .../limit-parsys/limit-parsys-helper.js       |  4 +-
 .../content/toolbar/dialog/.content.xml       |  0
 .../toolbar/dialog/_cq_dialog/.content.xml    | 14 +++---
 .../page-content-blueprint}/.content.xml      |  2 +-
 .../page-content-blueprint}/_cq_dialog.xml    |  2 +-
 .../apps/wcm/core/content/sites/.content.xml  | 10 ++--
 .../settings/wcm/policies/.content.xml        | 24 ++++-----
 .../.content.xml                              |  2 +-
 .../initial/.content.xml                      |  4 +-
 .../policies/.content.xml                     |  8 +--
 .../structure/.content.xml                    |  8 +--
 .../.content.xml                              |  2 +-
 .../initial/.content.xml                      |  4 +-
 .../policies/.content.xml                     |  8 +--
 .../structure/.content.xml                    |  8 +--
 24 files changed, 93 insertions(+), 83 deletions(-)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse => content-blueprints}/components/content/console/.content.xml (93%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse/components/content/toolbar/clientlibs/limit-parsys => content-blueprints/components/content/toolbar/clientlibs/action}/.content.xml (84%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse => content-blueprints}/components/content/toolbar/clientlibs/action/import-action.js (82%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse => content-blueprints}/components/content/toolbar/clientlibs/action/import-helper.js (61%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse => content-blueprints}/components/content/toolbar/clientlibs/action/js.txt (100%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse/components/content/toolbar/clientlibs/action => content-blueprints/components/content/toolbar/clientlibs/limit-parsys}/.content.xml (85%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse => content-blueprints}/components/content/toolbar/clientlibs/limit-parsys/js.txt (100%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse => content-blueprints}/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js (81%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse => content-blueprints}/components/content/toolbar/dialog/.content.xml (100%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse => content-blueprints}/components/content/toolbar/dialog/_cq_dialog/.content.xml (92%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse/components/structure/page-trojan-horse => content-blueprints/components/structure/page-content-blueprint}/.content.xml (86%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{trojan-horse/components/structure/page-trojan-horse => content-blueprints/components/structure/page-content-blueprint}/_cq_dialog.xml (97%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/{trojan-horse => content-blueprint}/.content.xml (81%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/{trojan-horse => content-blueprint}/initial/.content.xml (72%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/{trojan-horse => content-blueprint}/policies/.content.xml (72%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/{trojan-horse => content-blueprint}/structure/.content.xml (72%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/{simple-trojan-horse => simple-content-blueprint}/.content.xml (81%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/{simple-trojan-horse => simple-content-blueprint}/initial/.content.xml (71%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/{simple-trojan-horse => simple-content-blueprint}/policies/.content.xml (72%)
 rename ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/{simple-trojan-horse => simple-content-blueprint}/structure/.content.xml (72%)

diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml
index 90b35bdca..5cbc9116d 100644
--- a/ui.apps/src/main/content/META-INF/vault/filter.xml
+++ b/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -10,7 +10,7 @@
     <filter root="/apps/etoolbox-authoring-kit/depends-on-injector"/>
     <filter root="/apps/etoolbox-authoring-kit/install"/>
     <filter root="/apps/etoolbox-authoring-kit/lists"/>
-    <filter root="/apps/etoolbox-authoring-kit/trojan-horse"/>
+    <filter root="/apps/etoolbox-authoring-kit/content-blueprints"/>
 
     <!-- The following filters clear old directories in JCR content. They can be removed after v.2 release -->
     <filter root="/apps/authoring-toolkit"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml
index 645a9a876..d198a19cb 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml
@@ -3,5 +3,5 @@
 		  xmlns:jcr="http://www.jcp.org/jcr/1.0"
           jcr:primaryType="cq:ClientLibraryFolder"
           categories="[cq.authoring.dialog]"
-          dependencies="[cq.authoring.dependson,cq.authoring.dependson.fixes,lists.item-dialog,trojan-horse.toolbar-action]"
+          dependencies="[cq.authoring.dependson,cq.authoring.dependson.fixes,lists.item-dialog,content-blueprints.toolbar-action]"
 />
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/console/.content.xml
similarity index 93%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/console/.content.xml
index 9604e499f..27f299572 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/console/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/console/.content.xml
@@ -18,7 +18,7 @@
           jcr:primaryType="cq:Page">
     <createpagedialog
             jcr:primaryType="nt:unstructured"
-            jcr:title="Create Trojan Horse"
+            jcr:title="Create EToolbox Content Blueprint"
             sling:resourceType="granite/ui/components/coral/foundation/dialog">
         <items jcr:primaryType="nt:unstructured">
             <form jcr:primaryType="nt:unstructured"
@@ -55,17 +55,17 @@
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
                                             name="./cq:template"
-                                            value="/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse"/>
+                                            value="/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint"/>
                                     <resourceType
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/form/hidden"
                                             name="./sling:resourceType"
-                                            value="/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse"/>
+                                            value="/apps/etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint"/>
                                     <pageProps
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/include"
                                             resourceType="granite/ui/components/coral/foundation/container"
-                                            path="/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/cq:dialog/content/items/tabs/items/mainConfig"/>
+                                            path="/apps/etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint/cq:dialog/content/items/tabs/items/mainConfig"/>
                                     <create
                                             jcr:primaryType="nt:unstructured"
                                             sling:resourceType="granite/ui/components/coral/foundation/button"
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/.content.xml
similarity index 84%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/.content.xml
index 8e00a9a95..5be96c98f 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/.content.xml
@@ -2,5 +2,5 @@
 <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"
           allowProxy="{Boolean}true"
-          categories="[trojan-horse.limit-parsys]"
+          categories="[content-blueprints.toolbar-action]"
           jsProcessor="[min:gcc;languageIn=ECMASCRIPT_2015,compilationLevel=advanced,languageOut=ECMASCRIPT5]"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-action.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js
similarity index 82%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-action.js
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js
index 121d73132..669a905d3 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-action.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js
@@ -2,11 +2,11 @@
  *  Import Toolbar Action to import "template" page content into current position
  **/
 (function ($document, author, ns) {
-    const IMPORT_ACTION = 'trojan-horse-import-action';
+    const IMPORT_ACTION = 'content-blueprint-import-action';
 
     const JCR_CONTENT = '/jcr:content/';
     const NEWPAR_TYPES = ['wcm/foundation/components/parsys/newpar', 'wcm/foundation/components/responsivegrid/new'];
-    const IMPORT_DIALOG_PATH = '/mnt/override/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/_cq_dialog.html';
+    const IMPORT_DIALOG_PATH = '/mnt/override/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/dialog/_cq_dialog.html';
 
     function condition(editable) {
         return author.pageInfoHelper.canModify() && editable.hasAction('INSERT');
@@ -19,7 +19,7 @@
         const parentType = editable.getParent().type;
 
         const page = path.substr(0, path.indexOf(JCR_CONTENT) + JCR_CONTENT.length);
-        const dialogPath = ns.EToolboxTrojanHorse.joinJCRPath(IMPORT_DIALOG_PATH, page);
+        const dialogPath = ns.EToolboxContentBlueprints.joinJCRPath(IMPORT_DIALOG_PATH, page);
         const dialogConfig = {
             src: Granite.HTTP.externalize(dialogPath.replace(/\*\//, '')),
             loadingMode: 'auto',
@@ -36,11 +36,11 @@
         author.DialogFrame.openDialog(dlg);
     }
 
-    $document.off('cq-layer-activated.trojan-horse-import-action').on('cq-layer-activated.trojan-horse-import-action', function (ev) {
+    $document.off('cq-layer-activated.content-blueprint-import-action').on('cq-layer-activated.content-blueprint-import-action', function (ev) {
         if (ev.layer === 'Edit') {
             author.EditorFrame.editableToolbar.registerAction(IMPORT_ACTION, {
                 icon: 'coral-Icon--dataUpload',
-                text: Granite.I18n.get('Import Trojan Horse'),
+                text: Granite.I18n.get('Import from EToolbox Content Blueprint'),
                 handler: openImportDialog,
                 condition: condition,
                 isNonMulti: false
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
similarity index 61%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-helper.js
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
index 6a2a1f44a..3dc4bb5d3 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/import-helper.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
@@ -14,27 +14,35 @@
 (function (author, ns) {
     'use strict';
 
-    ns.EToolboxTrojanHorse = ns.EToolboxTrojanHorse || {}
+    ns.EToolboxContentBlueprints = ns.EToolboxContentBlueprints || {}
 
-    /** Join JCR path parts */
-    ns.EToolboxTrojanHorse.joinJCRPath = function (path1, path2, ...rest) {
-        if (rest.length > 0) return ns.EToolboxTrojanHorse.joinJCRPath(ns.EToolboxTrojanHorse.joinJCRPath(path1, path2), ...rest);
+    /**
+     * Join JCR path parts
+     * */
+    ns.EToolboxContentBlueprints.joinJCRPath = function (path1, path2, ...rest) {
+        if (rest.length > 0) return ns.EToolboxContentBlueprints.joinJCRPath(ns.EToolboxContentBlueprints.joinJCRPath(path1, path2), ...rest);
         return (path1 + '/' + path2).replace(/\/(\/)+/g, '/');
     };
 
-    /** Join and normalize JCR path. Removes ending '/' */
-    ns.EToolboxTrojanHorse.resolveJCRPath = function (path, ...rest) {
-        if (rest.length > 0) return ns.EToolboxTrojanHorse.resolveJCRPath(ns.EToolboxTrojanHorse.joinJCRPath(path, ...rest));
+    /**
+     * Join and normalize JCR path. Removes ending '/'
+     * */
+    ns.EToolboxContentBlueprints.resolveJCRPath = function (path, ...rest) {
+        if (rest.length > 0) return ns.EToolboxContentBlueprints.resolveJCRPath(ns.EToolboxContentBlueprints.joinJCRPath(path, ...rest));
         return path.replace(/\/$/, '').replace(/\/_jcr_content\//g, '/jcr:content/');
     }
 
-    /** Resolve path to the JCR content */
-    ns.EToolboxTrojanHorse.resolveJCRContentPath = function (path) {
-        return path ? ns.EToolboxTrojanHorse.joinJCRPath(path, '/_jcr_content/') : '';
+    /**
+     * Resolve path to the JCR content
+     * */
+    ns.EToolboxContentBlueprints.resolveJCRContentPath = function (path) {
+        return path ? ns.EToolboxContentBlueprints.joinJCRPath(path, '/_jcr_content/') : '';
     };
 
-    /** Check if the passed resource type can be placed inside of passed path */
-    ns.EToolboxTrojanHorse.canInsert = function (resourceType, parentPath) {
+    /**
+     * Check if the passed resource type can be placed inside of passed path
+     * */
+    ns.EToolboxContentBlueprints.canInsert = function (resourceType, parentPath) {
         if (!resourceType) return 'No component to insert';
         if (!parentPath) return 'Insertion target is incorrect';
 
@@ -45,7 +53,7 @@
         const componentRelativePath = componentPath.replace(/^\/[a-z]+\//, '');
         const componentGroup = 'group:' + component.getGroup();
 
-        const resolvedPath = ns.EToolboxTrojanHorse.resolveJCRPath(parentPath);
+        const resolvedPath = ns.EToolboxContentBlueprints.resolveJCRPath(parentPath);
         const allowedComponents = Granite.author.components.allowedComponentsFor[resolvedPath];
 
         if (!allowedComponents || !allowedComponents.length) {
@@ -65,7 +73,7 @@
     };
 
     const findRootName = (content) => {
-        if (Object.hasOwnProperty.call(content, 'trojan-horse-parsys')) return 'trojan-horse-parsys';
+        if (Object.hasOwnProperty.call(content, 'content-blueprints-parsys')) return 'content-blueprints-parsys';
         return null;
     };
 
@@ -73,14 +81,16 @@
      * Add ending '/' to the form action.
      * @returns result path
      * */
-    ns.EToolboxTrojanHorse.setupInsertionFormTarget = function ($el, path) {
-        path = ns.EToolboxTrojanHorse.joinJCRPath(path, '/');
+    ns.EToolboxContentBlueprints.setupInsertionFormTarget = function ($el, path) {
+        path = ns.EToolboxContentBlueprints.joinJCRPath(path, '/');
         $el.closest('form[action]').attr('action', path);
         return path;
     };
 
-    /** Fetch action successful response handler to resolve first content component */
-    ns.EToolboxTrojanHorse.mapImportResourcePath = function (response, parentName, parentPath) {
+    /**
+     * Fetch action successful response handler to resolve first content component
+     * */
+    ns.EToolboxContentBlueprints.mapImportResourcePath = function (response, parentName, parentPath) {
         try {
             const rootName = findRootName(response);
             if (!rootName) return '';
@@ -89,7 +99,7 @@
             for (const name of nodeNames) {
                 const node = root[name];
                 if (!isValidComponentNode(node)) continue;
-                const path = ns.EToolboxTrojanHorse.resolveJCRPath(parentPath, '/', rootName, '/', name);
+                const path = ns.EToolboxContentBlueprints.resolveJCRPath(parentPath, '/', rootName, '/', name);
                 const type = node['sling:resourceType'];
                 return JSON.stringify({type, path, name});
             }
@@ -99,6 +109,6 @@
         return '';
     };
     /** Fetch action unsuccessful response handler stub */
-    ns.EToolboxTrojanHorse.mapImportResourcePathError = () => '';
+    ns.EToolboxContentBlueprints.mapImportResourcePathError = () => '';
 
 }(Granite.author, Granite));
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/js.txt b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/js.txt
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/js.txt
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/js.txt
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/.content.xml
similarity index 85%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/.content.xml
index 2dd472e4d..51cf9b205 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/action/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/.content.xml
@@ -2,5 +2,5 @@
 <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"
           allowProxy="{Boolean}true"
-          categories="[trojan-horse.toolbar-action]"
+          categories="[content-blueprints.limit-parsys]"
           jsProcessor="[min:gcc;languageIn=ECMASCRIPT_2015,compilationLevel=advanced,languageOut=ECMASCRIPT5]"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/js.txt b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/js.txt
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/js.txt
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/js.txt
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
similarity index 81%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
index 97076e789..a46f69920 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
@@ -14,10 +14,10 @@
 (function (author, ns) {
     'use strict';
 
-    ns.EToolboxTrojanHorseParsys = ns.EToolboxTrojanHorseParsys || {}
+    ns.EToolboxContentBlueprintsParsys = ns.EToolboxContentBlueprintsParsys || {}
 
     /** Limit parsys */
-    ns.EToolboxTrojanHorseParsys.limitParsys = function () {
+    ns.EToolboxContentBlueprintsParsys.limitParsys = function () {
 
     };
 
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/dialog/.content.xml
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/dialog/.content.xml
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/_cq_dialog/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/dialog/_cq_dialog/.content.xml
similarity index 92%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/_cq_dialog/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/dialog/_cq_dialog/.content.xml
index 3ba353a2f..01149be18 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/content/toolbar/dialog/_cq_dialog/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/dialog/_cq_dialog/.content.xml
@@ -22,7 +22,7 @@
                             sling:resourceType="granite/ui/components/coral/foundation/form/hidden">
                         <granite:data jcr:primaryType="nt:unstructured"
                                       dependsOnRef="targetPath"
-                                      dependsOn="Granite.EToolboxTrojanHorse.setupInsertionFormTarget(this, '${param.path}')"
+                                      dependsOn="Granite.EToolboxContentBlueprints.setupInsertionFormTarget(this, '${param.path}')"
                                       dependsOnAction="set"/>
                     </action>
 
@@ -31,11 +31,11 @@
                         jcr:primaryType="nt:unstructured"
                         sling:resourceType="granite/ui/components/coral/foundation/form/pathfield"
                         rootPath="/content"
-                        fieldLabel="Link Skeleton"
-                        fieldDescription="Provide link to the custom skeleton page.">
+                        fieldLabel="Link to EToolBox Content Blueprint"
+                        fieldDescription="Provide link to the EToolBox Content Blueprint page.">
                         <granite:data jcr:primaryType="nt:unstructured"
                                       dependsOnRef="importPath"
-                                      dependsOn="Granite.EToolboxTrojanHorse.canInsert(@importNode.type, @targetPath)"
+                                      dependsOn="Granite.EToolboxContentBlueprints.canInsert(@importNode.type, @targetPath)"
                                       dependsOnAction="validate"/>
                     </importPath>
 
@@ -45,10 +45,10 @@
                         <granite:data jcr:primaryType="nt:unstructured"
                                       dependsOnRef="importNode"
                                       dependsOnRefType="json"
-                                      dependsOn="Granite.EToolboxTrojanHorse.resolveJCRContentPath(@importPath)"
+                                      dependsOn="Granite.EToolboxContentBlueprints.resolveJCRContentPath(@importPath)"
                                       dependsOnAction="fetch"
-                                      dependsOn-fetch-map="Granite.EToolboxTrojanHorse.mapImportResourcePath"
-                                      dependsOn-fetch-err="Granite.EToolboxTrojanHorse.mapImportResourcePathError"
+                                      dependsOn-fetch-map="Granite.EToolboxContentBlueprints.mapImportResourcePath"
+                                      dependsOn-fetch-err="Granite.EToolboxContentBlueprints.mapImportResourcePathError"
                                       dependsOn-fetch-postfix=".2.json"/>
                     </node>
 
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint/.content.xml
similarity index 86%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint/.content.xml
index 9574612f0..7373bc2b2 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint/.content.xml
@@ -1,6 +1,6 @@
 <?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="Trojan Horse Page"
+    jcr:title="EToolbox Content Blueprint Page"
     sling:resourceSuperType="core/wcm/components/page/v2/page"
     componentGroup=".hidden"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/_cq_dialog.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint/_cq_dialog.xml
similarity index 97%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/_cq_dialog.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint/_cq_dialog.xml
index 170cfe240..cf7d552d0 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/_cq_dialog.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint/_cq_dialog.xml
@@ -4,7 +4,7 @@
           xmlns:sling="http://sling.apache.org/jcr/sling/1.0"
           xmlns:granite="http://www.adobe.com/jcr/granite/1.0"
           jcr:primaryType="nt:unstructured"
-          jcr:title="Trojan Horse Page Properties"
+          jcr:title="EToolbox Content Blueprint Page Properties"
           sling:resourceType="cq/gui/components/authoring/dialog">
     <content jcr:primaryType="nt:unstructured">
         <items jcr:primaryType="nt:unstructured">
diff --git a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
index 6c785319a..b0b2406f5 100644
--- a/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/wcm/core/content/sites/.content.xml
@@ -25,19 +25,19 @@
                                   nesting="hide"
                                   src.uritemplate="/mnt/overlay/etoolbox-authoring-kit/lists/components/content/console/createpagedialog.html{+id}"/>
                         </createlist>
-                        <createTrojanHorse granite:rel="cq-siteadmin-admin-create-trojan-horse"
+                        <createcontentblueprint granite:rel="cq-siteadmin-admin-create-content-blueprint"
                                     jcr:primaryType="nt:unstructured"
                                     sling:resourceType="granite/ui/components/coral/foundation/collection/actionlink"
                                     action="foundation.dialog"
                                     icon="dataDownload"
-                                    rel="cq-siteadmin-admin-create-trojan-horse"
+                                    rel="cq-siteadmin-admin-create-content-blueprint"
                                     relScope="item"
                                     target=".cq-siteadmin-admin-childpages"
-                                    text="Trojan Horse">
+                                    text="EToolbox Content Blueprint">
                             <data jcr:primaryType="nt:unstructured"
                                   nesting="hide"
-                                  src.uritemplate="/mnt/overlay/etoolbox-authoring-kit/trojan-horse/components/content/console/createpagedialog.html{+id}"/>
-                        </createTrojanHorse>
+                                  src.uritemplate="/mnt/overlay/etoolbox-authoring-kit/content-blueprints/components/content/console/createpagedialog.html{+id}"/>
+                        </createcontentblueprint>
                     </items>
                 </create>
             </secondary>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
index 3c7fe45a4..b348d3b06 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
@@ -21,40 +21,40 @@
                         cq:styleDefaultClasses="etoolbox-list"
                         policyResourceType="wcm/foundation/components/responsivegrid">
                     </list>
-                    <trojan-horse
+                    <content-blueprints
                         cq:lastReplicated="{Date}2021-02-09T12:00:00.347Z"
                         cq:lastReplicatedBy="admin"
                         cq:lastReplicationAction="Activate"
                         jcr:mixinTypes="[cq:ReplicationStatus]"
-                        jcr:description="Policy for Exadel Trojan Horse"
+                        jcr:description="Policy for Exadel EToolbox Content Blueprint"
                         jcr:primaryType="nt:unstructured"
-                        jcr:title="Trojan Horse"
+                        jcr:title="EToolbox Content Blueprints"
                         sling:resourceType="wcm/core/components/policy/policy"
                         components=""
                         policyResourceType="wcm/foundation/components/responsivegrid">
-                    </trojan-horse>
+                    </content-blueprints>
                 </responsivegrid>
             </components>
         </foundation>
     </wcm>
     <etoolbox-authoring-kit jcr:primaryType="nt:unstructured">
-        <trojan-horse jcr:primaryType="nt:unstructured">
+        <content-blueprints jcr:primaryType="nt:unstructured">
             <components jcr:primaryType="nt:unstructured">
                 <structure jcr:primaryType="nt:unstructured">
-                    <page-trojan-horse jcr:primaryType="nt:unstructured">
-                        <trojan-horse-page-policy
+                    <page-content-blueprint jcr:primaryType="nt:unstructured">
+                        <content-blueprints-page-policy
                             cq:lastReplicated="{Date}2021-02-09T12:00:00.347Z"
                             cq:lastReplicatedBy="admin"
                             cq:lastReplicationAction="Activate"
                             jcr:mixinTypes="[cq:ReplicationStatus]"
                             jcr:primaryType="nt:unstructured"
-                            jcr:title="Trojan Horse Page Policy"
+                            jcr:title="EToolbox Content Blueprint Page Policy"
                             sling:resourceType="wcm/core/components/policy/policy"
-                            clientlibs="trojan-horse.limit-parsys">
-                        </trojan-horse-page-policy>
-                    </page-trojan-horse>
+                            clientlibs="content-blueprints.limit-parsys">
+                        </content-blueprints-page-policy>
+                    </page-content-blueprint>
                 </structure>
             </components>
-        </trojan-horse>
+        </content-blueprints>
     </etoolbox-authoring-kit>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/.content.xml
similarity index 81%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/.content.xml
index 04f30a0ec..d554e0e07 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/.content.xml
@@ -3,6 +3,6 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         jcr:primaryType="cq:PageContent"
-        jcr:title="Exadel Trojan Horse Template Type"
+        jcr:title="EToolbox Content Blueprint Template Type"
         status="enabled"/>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/initial/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/initial/.content.xml
similarity index 72%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/initial/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/initial/.content.xml
index f9b2da2f3..24ca17f23 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/initial/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/initial/.content.xml
@@ -3,8 +3,8 @@
           xmlns:jcr="http://www.jcp.org/jcr/1.0"
           jcr:primaryType="cq:Page">
     <jcr:content
-        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse"
+        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/content-blueprint"
         jcr:primaryType="cq:PageContent"
-        sling:resourceType="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse">
+        sling:resourceType="etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint">
     </jcr:content>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/policies/.content.xml
similarity index 72%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/policies/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/policies/.content.xml
index 8341028e5..14bc431ca 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/policies/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/policies/.content.xml
@@ -3,13 +3,13 @@
           xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
           jcr:primaryType="cq:Page">
     <jcr:content
-        cq:policy="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/trojan-horse-page-policy"
+        cq:policy="etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint/content-blueprints-page-policy"
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
-        <trojan-horse-parsys
-            cq:policy="wcm/foundation/components/responsivegrid/trojan-horse"
+        <content-blueprints-parsys
+            cq:policy="wcm/foundation/components/responsivegrid/content-blueprints"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping">
-        </trojan-horse-parsys>
+        </content-blueprints-parsys>
     </jcr:content>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/structure/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/structure/.content.xml
similarity index 72%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/structure/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/structure/.content.xml
index b75a590e3..d6f48ddbe 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/trojan-horse/structure/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/template-types/content-blueprint/structure/.content.xml
@@ -3,13 +3,13 @@
           xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
           jcr:primaryType="cq:Page">
     <jcr:content
-        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/trojan-horse"
+        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/content-blueprint"
         jcr:primaryType="cq:PageContent"
-        sling:resourceType="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse">
-        <trojan-horse-parsys
+        sling:resourceType="etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint">
+        <content-blueprints-parsys
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/foundation/components/responsivegrid"
             editable="{Boolean}true">
-        </trojan-horse-parsys>
+        </content-blueprints-parsys>
     </jcr:content>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/.content.xml
similarity index 81%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/.content.xml
index f146abb4c..8eed3a4a0 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/.content.xml
@@ -3,6 +3,6 @@
     jcr:primaryType="cq:Template">
     <jcr:content
         jcr:primaryType="cq:PageContent"
-        jcr:title="Simple Trojan Horse Page"
+        jcr:title="Simple EToolbox Content Blueprint Page"
         status="enabled"/>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/initial/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/initial/.content.xml
similarity index 71%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/initial/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/initial/.content.xml
index a9570e20a..4feacae32 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/initial/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/initial/.content.xml
@@ -3,8 +3,8 @@
           xmlns:jcr="http://www.jcp.org/jcr/1.0"
           jcr:primaryType="cq:Page">
     <jcr:content
-        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse"
+        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint"
         jcr:primaryType="cq:PageContent"
-        sling:resourceType="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse">
+        sling:resourceType="etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint">
     </jcr:content>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/policies/.content.xml
similarity index 72%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/policies/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/policies/.content.xml
index 8341028e5..ae78a74cb 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/policies/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/policies/.content.xml
@@ -3,13 +3,13 @@
           xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
           jcr:primaryType="cq:Page">
     <jcr:content
-        cq:policy="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse/trojan-horse-page-policy"
+        cq:policy="etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint/content-blueprint-page-policy"
         jcr:primaryType="nt:unstructured"
         sling:resourceType="wcm/core/components/policies/mappings">
-        <trojan-horse-parsys
-            cq:policy="wcm/foundation/components/responsivegrid/trojan-horse"
+        <content-blueprints-parsys
+            cq:policy="wcm/foundation/components/responsivegrid/content-blueprints"
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/core/components/policies/mapping">
-        </trojan-horse-parsys>
+        </content-blueprints-parsys>
     </jcr:content>
 </jcr:root>
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/structure/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/structure/.content.xml
similarity index 72%
rename from ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/structure/.content.xml
rename to ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/structure/.content.xml
index 90a811b19..4bd7572aa 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse/structure/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint/structure/.content.xml
@@ -3,13 +3,13 @@
           xmlns:jcr="http://www.jcp.org/jcr/1.0" xmlns:nt="http://www.jcp.org/jcr/nt/1.0"
           jcr:primaryType="cq:Page">
     <jcr:content
-        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-trojan-horse"
+        cq:template="/conf/etoolbox-authoring-kit/settings/wcm/templates/simple-content-blueprint"
         jcr:primaryType="cq:PageContent"
-        sling:resourceType="etoolbox-authoring-kit/trojan-horse/components/structure/page-trojan-horse">
-        <trojan-horse-parsys
+        sling:resourceType="etoolbox-authoring-kit/content-blueprints/components/structure/page-content-blueprint">
+        <content-blueprints-parsys
             jcr:primaryType="nt:unstructured"
             sling:resourceType="wcm/foundation/components/responsivegrid"
             editable="{Boolean}true">
-        </trojan-horse-parsys>
+        </content-blueprints-parsys>
     </jcr:content>
 </jcr:root>

From bd00adafce27ad035ce0576e13e455f2f8fc5d13 Mon Sep 17 00:00:00 2001
From: nharshunova <nharshunova@exadel.com>
Date: Wed, 9 Mar 2022 16:05:23 +0300
Subject: [PATCH 06/15] [EAK-280] Content Blueprint Template: add ui activities
 to limit template insert action

---
 .../clientlib-injector/.content.xml           |  2 +-
 .../limit-parsys/limit-parsys-helper.js       | 57 +++++++++++++++++--
 2 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml
index d198a19cb..e16bbfe53 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/clientlib-injector/.content.xml
@@ -3,5 +3,5 @@
 		  xmlns:jcr="http://www.jcp.org/jcr/1.0"
           jcr:primaryType="cq:ClientLibraryFolder"
           categories="[cq.authoring.dialog]"
-          dependencies="[cq.authoring.dependson,cq.authoring.dependson.fixes,lists.item-dialog,content-blueprints.toolbar-action]"
+          dependencies="[cq.authoring.dependson,cq.authoring.dependson.fixes,lists.item-dialog,content-blueprints.toolbar-action,content-blueprints.limit-parsys]"
 />
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
index a46f69920..91bd69aad 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
@@ -11,14 +11,59 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-(function (author, ns) {
+(function ($document, author) {
     'use strict';
+    const INSERT_ACTION = 'INSERT';
+    const COMPONENTS_LIMIT = 1;
 
-    ns.EToolboxContentBlueprintsParsys = ns.EToolboxContentBlueprintsParsys || {}
+    let rootEditable;
+    let rootPath;
 
-    /** Limit parsys */
-    ns.EToolboxContentBlueprintsParsys.limitParsys = function () {
+    function templateInsertCondition(editableBefore) {
+        let canInsert = true;
+        const parentPath = editableBefore.getParentPath();
+        // Check if we are trying to insert to the root component
+        if (parentPath === rootPath) {
+            canInsert = isRootChildrenInLimit();
+        }
+        return canInsert;
+    }
 
-    };
+    function isRootChildrenInLimit() {
+        const children = author.editables.getChildren(rootEditable, false);
+        return (children.length <= COMPONENTS_LIMIT);
+    }
 
-}(Granite.author, Granite));
+    function toggleInsertParsys() {
+        const insertEditable = author.editables.find(rootPath + '/*')[0];
+        insertEditable && insertEditable.overlay.setVisible(isRootChildrenInLimit());
+    }
+
+    $document.on('cq-layer-activated', function (ev) {
+        if (ev.layer === 'Edit') {
+            rootEditable = author.editables.getRoot();
+            rootPath = rootEditable.path;
+
+            const action = author.edit.EditableActions[INSERT_ACTION];
+            const defaultInsertActionCondition = action.condition;
+            action.condition = function (editableBefore, componentPath, componentGroup) {
+                return templateInsertCondition(editableBefore) && defaultInsertActionCondition(editableBefore, componentPath, componentGroup);
+            };
+
+            // set initial visibility state
+            toggleInsertParsys();
+
+            rootEditable.afterChildInsert = function () {
+                toggleInsertParsys();
+            };
+
+            rootEditable.afterChildDelete = function () {
+                toggleInsertParsys();
+            };
+
+            $document.on('cq-overlays-repositioned', function () {
+                toggleInsertParsys();
+            });
+        }
+    });
+}($(document), Granite.author));

From 93d6ea086c0076912901d0256ae4c653465b2f1a Mon Sep 17 00:00:00 2001
From: nharshunova <nharshunova@exadel.com>
Date: Wed, 9 Mar 2022 16:57:22 +0300
Subject: [PATCH 07/15] [EAK-280] fix eslint errors

---
 .../content/toolbar/clientlibs/action/import-helper.js   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
index 3dc4bb5d3..67d55dba0 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
@@ -14,7 +14,7 @@
 (function (author, ns) {
     'use strict';
 
-    ns.EToolboxContentBlueprints = ns.EToolboxContentBlueprints || {}
+    ns.EToolboxContentBlueprints = ns.EToolboxContentBlueprints || {};
 
     /**
      * Join JCR path parts
@@ -30,7 +30,7 @@
     ns.EToolboxContentBlueprints.resolveJCRPath = function (path, ...rest) {
         if (rest.length > 0) return ns.EToolboxContentBlueprints.resolveJCRPath(ns.EToolboxContentBlueprints.joinJCRPath(path, ...rest));
         return path.replace(/\/$/, '').replace(/\/_jcr_content\//g, '/jcr:content/');
-    }
+    };
 
     /**
      * Resolve path to the JCR content
@@ -46,7 +46,7 @@
         if (!resourceType) return 'No component to insert';
         if (!parentPath) return 'Insertion target is incorrect';
 
-        const component = Granite.author.components.find({resourceType})[0];
+        const component = Granite.author.components.find({ resourceType })[0];
         if (!component) return 'Component resourceType is not is the list';
 
         const componentPath = component.getPath();
@@ -101,7 +101,7 @@
                 if (!isValidComponentNode(node)) continue;
                 const path = ns.EToolboxContentBlueprints.resolveJCRPath(parentPath, '/', rootName, '/', name);
                 const type = node['sling:resourceType'];
-                return JSON.stringify({type, path, name});
+                return JSON.stringify({ type, path, name });
             }
         } catch {
             // no action
@@ -110,5 +110,4 @@
     };
     /** Fetch action unsuccessful response handler stub */
     ns.EToolboxContentBlueprints.mapImportResourcePathError = () => '';
-
 }(Granite.author, Granite));

From 59300399e652230119b6ed79551393e9c5d13400 Mon Sep 17 00:00:00 2001
From: nharshunova <nharshunova@exadel.com>
Date: Wed, 9 Mar 2022 23:02:03 +0300
Subject: [PATCH 08/15] [EAK-280] Limited Parsys: reimplementation

---
 .../limit-parsys/limit-parsys-helper.js       | 69 --------------
 .../clientlibs => }/limit-parsys/.content.xml |  0
 .../clientlibs => }/limit-parsys/js.txt       |  0
 .../limit-parsys/limit-parsys-helper.js       | 92 +++++++++++++++++++
 .../settings/wcm/policies/.content.xml        |  1 +
 5 files changed, 93 insertions(+), 69 deletions(-)
 delete mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{content-blueprints/components/content/toolbar/clientlibs => }/limit-parsys/.content.xml (100%)
 rename ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/{content-blueprints/components/content/toolbar/clientlibs => }/limit-parsys/js.txt (100%)
 create mode 100644 ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
deleted file mode 100644
index 91bd69aad..000000000
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/limit-parsys-helper.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Licensed under the Apache License, Version 2.0 (the "License").
- * You may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-(function ($document, author) {
-    'use strict';
-    const INSERT_ACTION = 'INSERT';
-    const COMPONENTS_LIMIT = 1;
-
-    let rootEditable;
-    let rootPath;
-
-    function templateInsertCondition(editableBefore) {
-        let canInsert = true;
-        const parentPath = editableBefore.getParentPath();
-        // Check if we are trying to insert to the root component
-        if (parentPath === rootPath) {
-            canInsert = isRootChildrenInLimit();
-        }
-        return canInsert;
-    }
-
-    function isRootChildrenInLimit() {
-        const children = author.editables.getChildren(rootEditable, false);
-        return (children.length <= COMPONENTS_LIMIT);
-    }
-
-    function toggleInsertParsys() {
-        const insertEditable = author.editables.find(rootPath + '/*')[0];
-        insertEditable && insertEditable.overlay.setVisible(isRootChildrenInLimit());
-    }
-
-    $document.on('cq-layer-activated', function (ev) {
-        if (ev.layer === 'Edit') {
-            rootEditable = author.editables.getRoot();
-            rootPath = rootEditable.path;
-
-            const action = author.edit.EditableActions[INSERT_ACTION];
-            const defaultInsertActionCondition = action.condition;
-            action.condition = function (editableBefore, componentPath, componentGroup) {
-                return templateInsertCondition(editableBefore) && defaultInsertActionCondition(editableBefore, componentPath, componentGroup);
-            };
-
-            // set initial visibility state
-            toggleInsertParsys();
-
-            rootEditable.afterChildInsert = function () {
-                toggleInsertParsys();
-            };
-
-            rootEditable.afterChildDelete = function () {
-                toggleInsertParsys();
-            };
-
-            $document.on('cq-overlays-repositioned', function () {
-                toggleInsertParsys();
-            });
-        }
-    });
-}($(document), Granite.author));
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/.content.xml b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/.content.xml
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/.content.xml
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/.content.xml
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/js.txt b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/js.txt
similarity index 100%
rename from ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/limit-parsys/js.txt
rename to ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/js.txt
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
new file mode 100644
index 000000000..caa70b622
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
@@ -0,0 +1,92 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License").
+ * You may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+(function ($document, author) {
+    'use strict';
+    const INSERT_ACTION = 'INSERT';
+
+    const LIMIT_PROPERTY = 'childrenLimit';
+
+    function findPropertyFromPolicy(editable, propertyName) {
+        const cell = author.util.resolveProperty(author.pageDesign, editable.config.policyPath);
+        return cell && cell[propertyName] ? cell[propertyName] : null;
+    }
+
+    /**
+     * @see /libs/cq/gui/components/authoring/editors/clientlibs/core/js/storage/components.js _findAllowedComponentsFromDesign
+     * Returns the value of the given property from design object
+     */
+    function findPropertyFromDesign(editable, propertyName) {
+        const cellSearchPaths = editable.config.cellSearchPath;
+
+        if (cellSearchPaths) {
+            for (let i = 0; i < cellSearchPaths.length; i++) {
+                const cell = author.util.resolveProperty(author.pageDesign, cellSearchPaths[i]);
+
+                if (cell && cell[propertyName]) {
+                    return cell[propertyName];
+                }
+            }
+        }
+
+        return null;
+    }
+
+    function findPropertyFromConfig(editable, propertyName) {
+        if (editable && editable.config) {
+            if (editable.config.policyPath) {
+                return findPropertyFromPolicy(editable, propertyName);
+            } else {
+                return findPropertyFromDesign(editable, propertyName);
+            }
+        }
+        return null;
+    }
+
+    function templateInsertCondition(editableBefore) {
+        return isChildrenInLimit(editableBefore.getParent());
+    }
+
+    function isChildrenInLimit(editable) {
+        const limitCfg = findPropertyFromConfig(editable, LIMIT_PROPERTY);
+        const limit = limitCfg === null ? Number.POSITIVE_INFINITY : +limitCfg;
+        const children = author.editables.getChildren(editable, false);
+        return (children.length <= limit);
+    }
+
+    function toggleInsertParsys() {
+        author.editables.forEach((editable) => {
+            const insertEditable = author.editables.find(editable.path + '/*')[0];
+            insertEditable && insertEditable.overlay.setVisible(isChildrenInLimit(editable));
+        });
+    }
+
+    const toggleInsertParsysDebounced = $.debounce(100, toggleInsertParsys);
+
+    $document.on('cq-layer-activated', function (ev) {
+        if (ev.layer === 'Edit') {
+            const action = author.edit.EditableActions[INSERT_ACTION];
+            const defaultInsertActionCondition = action.condition;
+            action.condition = function (editableBefore, componentPath, componentGroup) {
+                return templateInsertCondition(editableBefore) && defaultInsertActionCondition(editableBefore, componentPath, componentGroup);
+            };
+
+            // set initial visibility state
+            toggleInsertParsysDebounced();
+
+            $document
+                .off('cq-editables-updated.limited-parsys cq-overlays-repositioned.limited-parsys')
+                .on('cq-editables-updated.limited-parsys cq-overlays-repositioned.limited-parsys', toggleInsertParsysDebounced);
+        }
+    });
+}($(document), Granite.author));
diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
index b348d3b06..404d4af1e 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
@@ -31,6 +31,7 @@
                         jcr:title="EToolbox Content Blueprints"
                         sling:resourceType="wcm/core/components/policy/policy"
                         components=""
+                        childrenLimit="1"
                         policyResourceType="wcm/foundation/components/responsivegrid">
                     </content-blueprints>
                 </responsivegrid>

From 6a6261bb5e35a8ec286ad9249edb0836253ca1c3 Mon Sep 17 00:00:00 2001
From: SkoryUladzislau <uskory@exadel.com>
Date: Wed, 9 Mar 2022 23:43:07 +0100
Subject: [PATCH 09/15] [EAK-280] Content Blueprint Template: Delete useless
 page policy

---
 .../settings/wcm/policies/.content.xml        | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
index 404d4af1e..c12cc614d 100644
--- a/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
+++ b/ui.content/src/main/content/jcr_root/conf/etoolbox-authoring-kit/settings/wcm/policies/.content.xml
@@ -38,24 +38,4 @@
             </components>
         </foundation>
     </wcm>
-    <etoolbox-authoring-kit jcr:primaryType="nt:unstructured">
-        <content-blueprints jcr:primaryType="nt:unstructured">
-            <components jcr:primaryType="nt:unstructured">
-                <structure jcr:primaryType="nt:unstructured">
-                    <page-content-blueprint jcr:primaryType="nt:unstructured">
-                        <content-blueprints-page-policy
-                            cq:lastReplicated="{Date}2021-02-09T12:00:00.347Z"
-                            cq:lastReplicatedBy="admin"
-                            cq:lastReplicationAction="Activate"
-                            jcr:mixinTypes="[cq:ReplicationStatus]"
-                            jcr:primaryType="nt:unstructured"
-                            jcr:title="EToolbox Content Blueprint Page Policy"
-                            sling:resourceType="wcm/core/components/policy/policy"
-                            clientlibs="content-blueprints.limit-parsys">
-                        </content-blueprints-page-policy>
-                    </page-content-blueprint>
-                </structure>
-            </components>
-        </content-blueprints>
-    </etoolbox-authoring-kit>
 </jcr:root>

From a421ab142ea4f5751ebe23bc4c625cf6d71f2aa4 Mon Sep 17 00:00:00 2001
From: SkoryUladzislau <uskory@exadel.com>
Date: Wed, 9 Mar 2022 23:43:58 +0100
Subject: [PATCH 10/15] [EAK-280] Content Blueprint Template: Fix filters for
 limit-parsys clientlib and new par type

---
 ui.apps/src/main/content/META-INF/vault/filter.xml             | 3 ++-
 .../content/toolbar/clientlibs/action/import-action.js         | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui.apps/src/main/content/META-INF/vault/filter.xml b/ui.apps/src/main/content/META-INF/vault/filter.xml
index 5cbc9116d..faef05235 100644
--- a/ui.apps/src/main/content/META-INF/vault/filter.xml
+++ b/ui.apps/src/main/content/META-INF/vault/filter.xml
@@ -5,12 +5,13 @@
 
     <filter root="/apps/etoolbox-authoring-kit/clientlib-injector"/>
     <filter root="/apps/etoolbox-authoring-kit/components"/>
+    <filter root="/apps/etoolbox-authoring-kit/content-blueprints"/>
     <filter root="/apps/etoolbox-authoring-kit/coral-overlay"/>
     <filter root="/apps/etoolbox-authoring-kit/depends-on"/>
     <filter root="/apps/etoolbox-authoring-kit/depends-on-injector"/>
     <filter root="/apps/etoolbox-authoring-kit/install"/>
+    <filter root="/apps/etoolbox-authoring-kit/limit-parsys"/>
     <filter root="/apps/etoolbox-authoring-kit/lists"/>
-    <filter root="/apps/etoolbox-authoring-kit/content-blueprints"/>
 
     <!-- The following filters clear old directories in JCR content. They can be removed after v.2 release -->
     <filter root="/apps/authoring-toolkit"/>
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js
index 669a905d3..008607b12 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js
@@ -5,7 +5,7 @@
     const IMPORT_ACTION = 'content-blueprint-import-action';
 
     const JCR_CONTENT = '/jcr:content/';
-    const NEWPAR_TYPES = ['wcm/foundation/components/parsys/newpar', 'wcm/foundation/components/responsivegrid/new'];
+    const NEWPAR_TYPES = ['foundation/components/parsys/newpar', 'wcm/foundation/components/parsys/newpar', 'wcm/foundation/components/responsivegrid/new'];
     const IMPORT_DIALOG_PATH = '/mnt/override/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/dialog/_cq_dialog.html';
 
     function condition(editable) {

From b9010028582c67e0d287cbf2f983b46a71cf83cf Mon Sep 17 00:00:00 2001
From: nharshunova <nharshunova@exadel.com>
Date: Thu, 10 Mar 2022 03:03:26 +0300
Subject: [PATCH 11/15] [EAK-280] Content Blueprints: import helpers refactor
 namespace

---
 .../clientlibs/action/import-action.js        |  2 +-
 .../clientlibs/action/import-helper.js        | 34 +++++++++----------
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js
index 669a905d3..49d000112 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-action.js
@@ -21,7 +21,7 @@
         const page = path.substr(0, path.indexOf(JCR_CONTENT) + JCR_CONTENT.length);
         const dialogPath = ns.EToolboxContentBlueprints.joinJCRPath(IMPORT_DIALOG_PATH, page);
         const dialogConfig = {
-            src: Granite.HTTP.externalize(dialogPath.replace(/\*\//, '')),
+            src: ns.HTTP.externalize(dialogPath.replace(/\*\//, '')),
             loadingMode: 'auto',
             layout: 'auto'
         };
diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
index 67d55dba0..bb05119d4 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
@@ -14,47 +14,45 @@
 (function (author, ns) {
     'use strict';
 
-    ns.EToolboxContentBlueprints = ns.EToolboxContentBlueprints || {};
-
     /**
      * Join JCR path parts
      * */
-    ns.EToolboxContentBlueprints.joinJCRPath = function (path1, path2, ...rest) {
-        if (rest.length > 0) return ns.EToolboxContentBlueprints.joinJCRPath(ns.EToolboxContentBlueprints.joinJCRPath(path1, path2), ...rest);
+    ns.joinJCRPath = function (path1, path2, ...rest) {
+        if (rest.length > 0) return ns.joinJCRPath(ns.joinJCRPath(path1, path2), ...rest);
         return (path1 + '/' + path2).replace(/\/(\/)+/g, '/');
     };
 
     /**
      * Join and normalize JCR path. Removes ending '/'
      * */
-    ns.EToolboxContentBlueprints.resolveJCRPath = function (path, ...rest) {
-        if (rest.length > 0) return ns.EToolboxContentBlueprints.resolveJCRPath(ns.EToolboxContentBlueprints.joinJCRPath(path, ...rest));
+    ns.resolveJCRPath = function (path, ...rest) {
+        if (rest.length > 0) return ns.resolveJCRPath(ns.joinJCRPath(path, ...rest));
         return path.replace(/\/$/, '').replace(/\/_jcr_content\//g, '/jcr:content/');
     };
 
     /**
      * Resolve path to the JCR content
      * */
-    ns.EToolboxContentBlueprints.resolveJCRContentPath = function (path) {
-        return path ? ns.EToolboxContentBlueprints.joinJCRPath(path, '/_jcr_content/') : '';
+    ns.resolveJCRContentPath = function (path) {
+        return path ? ns.joinJCRPath(path, '/_jcr_content/') : '';
     };
 
     /**
      * Check if the passed resource type can be placed inside of passed path
      * */
-    ns.EToolboxContentBlueprints.canInsert = function (resourceType, parentPath) {
+    ns.canInsert = function (resourceType, parentPath) {
         if (!resourceType) return 'No component to insert';
         if (!parentPath) return 'Insertion target is incorrect';
 
-        const component = Granite.author.components.find({ resourceType })[0];
+        const component = author.components.find({ resourceType })[0];
         if (!component) return 'Component resourceType is not is the list';
 
         const componentPath = component.getPath();
         const componentRelativePath = componentPath.replace(/^\/[a-z]+\//, '');
         const componentGroup = 'group:' + component.getGroup();
 
-        const resolvedPath = ns.EToolboxContentBlueprints.resolveJCRPath(parentPath);
-        const allowedComponents = Granite.author.components.allowedComponentsFor[resolvedPath];
+        const resolvedPath = ns.resolveJCRPath(parentPath);
+        const allowedComponents = author.components.allowedComponentsFor[resolvedPath];
 
         if (!allowedComponents || !allowedComponents.length) {
             return `No allowed components found for '${resolvedPath}'`;
@@ -81,8 +79,8 @@
      * Add ending '/' to the form action.
      * @returns result path
      * */
-    ns.EToolboxContentBlueprints.setupInsertionFormTarget = function ($el, path) {
-        path = ns.EToolboxContentBlueprints.joinJCRPath(path, '/');
+    ns.setupInsertionFormTarget = function ($el, path) {
+        path = ns.joinJCRPath(path, '/');
         $el.closest('form[action]').attr('action', path);
         return path;
     };
@@ -90,7 +88,7 @@
     /**
      * Fetch action successful response handler to resolve first content component
      * */
-    ns.EToolboxContentBlueprints.mapImportResourcePath = function (response, parentName, parentPath) {
+    ns.mapImportResourcePath = function (response, parentName, parentPath) {
         try {
             const rootName = findRootName(response);
             if (!rootName) return '';
@@ -99,7 +97,7 @@
             for (const name of nodeNames) {
                 const node = root[name];
                 if (!isValidComponentNode(node)) continue;
-                const path = ns.EToolboxContentBlueprints.resolveJCRPath(parentPath, '/', rootName, '/', name);
+                const path = ns.resolveJCRPath(parentPath, '/', rootName, '/', name);
                 const type = node['sling:resourceType'];
                 return JSON.stringify({ type, path, name });
             }
@@ -109,5 +107,5 @@
         return '';
     };
     /** Fetch action unsuccessful response handler stub */
-    ns.EToolboxContentBlueprints.mapImportResourcePathError = () => '';
-}(Granite.author, Granite));
+    ns.mapImportResourcePathError = () => '';
+}(Granite.author, Granite.EToolboxContentBlueprints = (Granite.EToolboxContentBlueprints || {})));

From 7379fdcc0642be19b099931baaed5bfdda073504 Mon Sep 17 00:00:00 2001
From: nharshunova <nharshunova@exadel.com>
Date: Thu, 10 Mar 2022 17:36:20 +0300
Subject: [PATCH 12/15] [EAK-280] Content Blueprints: add i18n to labels

---
 .../content/toolbar/clientlibs/action/import-helper.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
index bb05119d4..296d88303 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/content-blueprints/components/content/toolbar/clientlibs/action/import-helper.js
@@ -41,11 +41,11 @@
      * Check if the passed resource type can be placed inside of passed path
      * */
     ns.canInsert = function (resourceType, parentPath) {
-        if (!resourceType) return 'No component to insert';
-        if (!parentPath) return 'Insertion target is incorrect';
+        if (!resourceType) return Granite.I18n.get('No component to insert');
+        if (!parentPath) return Granite.I18n.get('Insertion target is incorrect');
 
         const component = author.components.find({ resourceType })[0];
-        if (!component) return 'Component resourceType is not is the list';
+        if (!component) return Granite.I18n.get('Component resourceType is not is the list');
 
         const componentPath = component.getPath();
         const componentRelativePath = componentPath.replace(/^\/[a-z]+\//, '');
@@ -55,13 +55,13 @@
         const allowedComponents = author.components.allowedComponentsFor[resolvedPath];
 
         if (!allowedComponents || !allowedComponents.length) {
-            return `No allowed components found for '${resolvedPath}'`;
+            return Granite.I18n.get('No allowed components found for {0}').replace('{0}', resolvedPath);
         }
 
         if (allowedComponents.indexOf(componentPath) === -1 &&
             allowedComponents.indexOf(componentRelativePath) === -1 &&
             allowedComponents.indexOf(componentGroup) === -1) {
-            return `Component '${component.getTitle()}' is not allowed for current target`;
+            return Granite.I18n.get('Component {0} is not allowed for current target').replace('{0}', component.getTitle());
         }
         return true;
     };

From 09ca44312e5997b982926b25a63f1b3b98d4dcb9 Mon Sep 17 00:00:00 2001
From: nharshunova <nharshunova@exadel.com>
Date: Sat, 12 Mar 2022 17:30:39 +0300
Subject: [PATCH 13/15] [DOCS] Limit Parsys: add comments

---
 .../limit-parsys/limit-parsys-helper.js       | 27 ++++++++++++++-----
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
index caa70b622..0eedb2c34 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
@@ -11,12 +11,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+/**
+ *  A simple clientlib that disables insert, drag/drop and copy/paste to an editable more components than defined
+ *  in 'childrenLimit' property and hides insertion parsys
+ */
 (function ($document, author) {
     'use strict';
     const INSERT_ACTION = 'INSERT';
-
     const LIMIT_PROPERTY = 'childrenLimit';
 
+    /**
+     * Returns the value of the given property from policy
+     */
     function findPropertyFromPolicy(editable, propertyName) {
         const cell = author.util.resolveProperty(author.pageDesign, editable.config.policyPath);
         return cell && cell[propertyName] ? cell[propertyName] : null;
@@ -42,6 +49,9 @@
         return null;
     }
 
+    /**
+     * Returns the value of the given property of an editable from policy or design configuration
+     */
     function findPropertyFromConfig(editable, propertyName) {
         if (editable && editable.config) {
             if (editable.config.policyPath) {
@@ -53,10 +63,9 @@
         return null;
     }
 
-    function templateInsertCondition(editableBefore) {
-        return isChildrenInLimit(editableBefore.getParent());
-    }
-
+    /**
+     * Checks if editable contains no more children, than defined in 'childrenLimit' property
+     */
     function isChildrenInLimit(editable) {
         const limitCfg = findPropertyFromConfig(editable, LIMIT_PROPERTY);
         const limit = limitCfg === null ? Number.POSITIVE_INFINITY : +limitCfg;
@@ -64,6 +73,9 @@
         return (children.length <= limit);
     }
 
+    /**
+     * Show/hide all editables' insert parsys depending on {@link isChildrenInLimit} function
+     */
     function toggleInsertParsys() {
         author.editables.forEach((editable) => {
             const insertEditable = author.editables.find(editable.path + '/*')[0];
@@ -77,13 +89,16 @@
         if (ev.layer === 'Edit') {
             const action = author.edit.EditableActions[INSERT_ACTION];
             const defaultInsertActionCondition = action.condition;
+
+            // override of the original action condition by adding children amount check
             action.condition = function (editableBefore, componentPath, componentGroup) {
-                return templateInsertCondition(editableBefore) && defaultInsertActionCondition(editableBefore, componentPath, componentGroup);
+                return isChildrenInLimit(editableBefore) && defaultInsertActionCondition(editableBefore, componentPath, componentGroup);
             };
 
             // set initial visibility state
             toggleInsertParsysDebounced();
 
+            // track editables and overlays updates to hide insert parsys
             $document
                 .off('cq-editables-updated.limited-parsys cq-overlays-repositioned.limited-parsys')
                 .on('cq-editables-updated.limited-parsys cq-overlays-repositioned.limited-parsys', toggleInsertParsysDebounced);

From f218f830c80e7256ed73b142d89f07f0a10dad2c Mon Sep 17 00:00:00 2001
From: nharshunova <nharshunova@exadel.com>
Date: Mon, 14 Mar 2022 14:04:00 +0300
Subject: [PATCH 14/15] [DOCS] Limit Parsys: refactor comments

---
 .../limit-parsys/limit-parsys-helper.js                | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
index 0eedb2c34..3c606e499 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
@@ -14,7 +14,7 @@
 
 /**
  *  A simple clientlib that disables insert, drag/drop and copy/paste to an editable more components than defined
- *  in 'childrenLimit' property and hides insertion parsys
+ *  in 'childrenLimit' property
  */
 (function ($document, author) {
     'use strict';
@@ -22,7 +22,7 @@
     const LIMIT_PROPERTY = 'childrenLimit';
 
     /**
-     * Returns the value of the given property from policy
+     * @returns the value of the given property defined in the policy
      */
     function findPropertyFromPolicy(editable, propertyName) {
         const cell = author.util.resolveProperty(author.pageDesign, editable.config.policyPath);
@@ -31,7 +31,7 @@
 
     /**
      * @see /libs/cq/gui/components/authoring/editors/clientlibs/core/js/storage/components.js _findAllowedComponentsFromDesign
-     * Returns the value of the given property from design object
+     * @returns the value of the given property from design object
      */
     function findPropertyFromDesign(editable, propertyName) {
         const cellSearchPaths = editable.config.cellSearchPath;
@@ -50,7 +50,7 @@
     }
 
     /**
-     * Returns the value of the given property of an editable from policy or design configuration
+     * @returns the value of the given property of an editable from policy or design configuration
      */
     function findPropertyFromConfig(editable, propertyName) {
         if (editable && editable.config) {
@@ -64,7 +64,7 @@
     }
 
     /**
-     * Checks if editable contains no more children, than defined in 'childrenLimit' property
+     * Checks if editable contains equal or less children than defined in 'childrenLimit' property
      */
     function isChildrenInLimit(editable) {
         const limitCfg = findPropertyFromConfig(editable, LIMIT_PROPERTY);

From a6b1b2be5cba02734a069711988d8e2690e2bf00 Mon Sep 17 00:00:00 2001
From: nharshunova <nharshunova@exadel.com>
Date: Wed, 16 Mar 2022 17:00:48 +0300
Subject: [PATCH 15/15] [REFACTOR] Limit Parsys: universal condition decorating

---
 .../limit-parsys/limit-parsys-helper.js                       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
index 3c606e499..42eb96ef7 100644
--- a/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
+++ b/ui.apps/src/main/content/jcr_root/apps/etoolbox-authoring-kit/limit-parsys/limit-parsys-helper.js
@@ -91,8 +91,8 @@
             const defaultInsertActionCondition = action.condition;
 
             // override of the original action condition by adding children amount check
-            action.condition = function (editableBefore, componentPath, componentGroup) {
-                return isChildrenInLimit(editableBefore) && defaultInsertActionCondition(editableBefore, componentPath, componentGroup);
+            action.condition = function (editableBefore) {
+                return isChildrenInLimit(editableBefore) && defaultInsertActionCondition.apply(this, arguments);
             };
 
             // set initial visibility state