From 64dd80cbb8dda7693ce44317ebf62163557412b8 Mon Sep 17 00:00:00 2001
From: Andreas Schaefer <hea76404@adobe.com>
Date: Fri, 12 Aug 2022 16:49:45 -0700
Subject: [PATCH 1/3] Added support for Allowed Node Types on Objects Folders

---
 .../jcr_root/content/themecleanflex/objects/.content.xml      | 4 +++-
 .../jcr_root/content/themecleanflex/objects/tags/.content.xml | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/.content.xml b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/.content.xml
index e4405043f..01a9471e6 100644
--- a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/.content.xml
@@ -4,7 +4,9 @@
   xmlns:jcr="http://www.jcp.org/jcr/1.0"
   jcr:primaryType="per:Page"
   jcr:title="themecleanflex root object"
-  jcr:description="themecleanflex Objects Root">
+  jcr:description="themecleanflex Objects Root"
+  allowedNodeTypes="[per:ObjectDefinition]"
+>
 
   <jcr:content
     jcr:primaryType="per:PageContent"
diff --git a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml
index 83565eb11..bae6255ce 100644
--- a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
   jcr:primaryType="sling:OrderedFolder"
-  allowedObjects="[tag]"/>
+  allowedObjects="[tag]"
+  allowedNodeTypes="[per:Tag]"
+/>

From 792c6190a0af3085eb93572a3dc7a4575d4dc249 Mon Sep 17 00:00:00 2001
From: Andreas Schaefer <hea76404@adobe.com>
Date: Thu, 18 Aug 2022 17:22:26 -0700
Subject: [PATCH 2/3] Removed allowed tags from objects - tag folder

---
 .../jcr_root/content/themecleanflex/objects/tags/.content.xml    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml
index bae6255ce..270dd9ba7 100644
--- a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
   jcr:primaryType="sling:OrderedFolder"
-  allowedObjects="[tag]"
   allowedNodeTypes="[per:Tag]"
 />

From bb9b99abcecd3250c7ebcbd50c4588d05f7fae29 Mon Sep 17 00:00:00 2001
From: Andreas Schaefer <hea76404@adobe.com>
Date: Fri, 9 Sep 2022 11:28:18 -0700
Subject: [PATCH 3/3] Added Title to the Folders

---
 .../jcr_root/content/themecleanflex/objects/.content.xml    | 2 +-
 .../themecleanflex/objects/sampleFolder/.content.xml        | 6 ++++++
 .../content/themecleanflex/objects/tags/.content.xml        | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/sampleFolder/.content.xml

diff --git a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/.content.xml b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/.content.xml
index 01a9471e6..5ed2a6a57 100644
--- a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/.content.xml
@@ -5,7 +5,7 @@
   jcr:primaryType="per:Page"
   jcr:title="themecleanflex root object"
   jcr:description="themecleanflex Objects Root"
-  allowedNodeTypes="[per:ObjectDefinition]"
+  allowedObjects="[]"
 >
 
   <jcr:content
diff --git a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/sampleFolder/.content.xml b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/sampleFolder/.content.xml
new file mode 100644
index 000000000..d13915648
--- /dev/null
+++ b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/sampleFolder/.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:jcr="http://www.jcp.org/jcr/1.0"
+  jcr:primaryType="sling:OrderedFolder"
+  jcr:title="Sample Folder"
+  allowedObjects="[example-form-all,example-form-contact]"
+/>
diff --git a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml
index 270dd9ba7..387bc8aff 100644
--- a/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml
+++ b/ui.apps/src/main/content/jcr_root/content/themecleanflex/objects/tags/.content.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <jcr:root xmlns:sling="http://sling.apache.org/jcr/sling/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"
   jcr:primaryType="sling:OrderedFolder"
-  allowedNodeTypes="[per:Tag]"
+  jcr:title="Tags Folder"
+  allowedObjects="[tag]"
 />