Merge pull request #1319 from Accenture/feature/1318-auto-enable-allo…

…wchildren-on-folders-during-deployment-of-subfolders Feature/1318 auto enable allowchildren on folders during deployment of subfolders
Accenture · May 14, 2024 · fd9a363 · fd9a363
2 parents 16fb9ee + edcdffe
commit fd9a363
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 18 deletions.
diff --git a/lib/Deployer.js b/lib/Deployer.js
@@ -478,11 +478,11 @@ class Deployer {
                 folderMetadata[`on-the-fly-${i}`] = {
                     Path: folder,
                     Name: folder.split('/').pop(),
-                    Description: '',
+                    // Description: '', // not setting this does not break the deployment and also could not override its existing value in case we need to run an update
                     ContentType: contentType,
-                    IsActive: true,
-                    IsEditable: true,
-                    AllowChildren: true,
+                    IsActive: true, // would be auto-updated for existing folders if needed
+                    IsEditable: true, // would be auto-updated for existing folders if needed
+                    AllowChildren: true, // would be auto-updated for existing folders if needed
                     _generated: true,
                 };
             }

diff --git a/lib/metadataTypes/Folder.js b/lib/metadataTypes/Folder.js
@@ -223,13 +223,12 @@ class Folder extends MetadataType {
                                 );
                                 if (
                                     existingId &&
-                                    (metadata[metadataKey]._generated || // of generated, never "update"
-                                        !this.hasChangedGeneric(
-                                            cachedVersion,
-                                            metadata[metadataKey],
-                                            'Path',
-                                            true
-                                        ))
+                                    !this.hasChangedGeneric(
+                                        cachedVersion,
+                                        metadata[metadataKey],
+                                        'Path',
+                                        true
+                                    )
                                 ) {
                                     Util.logger.verbose(
                                         ` - skipping ${this.definition.type} ${
@@ -246,13 +245,12 @@ class Folder extends MetadataType {
                                 existingId = cachedVersion?.ID;
                                 if (
                                     existingId &&
-                                    (metadata[metadataKey]._generated || // of generated, never "update"
-                                        !this.hasChangedGeneric(
-                                            cachedVersion,
-                                            metadata[metadataKey],
-                                            'Path',
-                                            true
-                                        ))
+                                    !this.hasChangedGeneric(
+                                        cachedVersion,
+                                        metadata[metadataKey],
+                                        'Path',
+                                        true
+                                    )
                                 ) {
                                     Util.logger.verbose(
                                         ` - skipping ${this.definition.type} ${