#1967: remove folder info from sub-contentblocks in assets to avoid d…

…eployment blockers
Accenture · Jan 8, 2025 · bb1b026 · bb1b026
1 parent db8d0d3
commit bb1b026
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/@types/lib/metadataTypes/Asset.d.ts.map b/@types/lib/metadataTypes/Asset.d.ts.map
diff --git a/lib/metadataTypes/Asset.js b/lib/metadataTypes/Asset.js
@@ -1196,9 +1196,8 @@ class Asset extends MetadataType {
                                 };
                             }
                             if (asset.r__folder_Path) {
-                                // more often than not, folders get replaced but that change is not updated in the snapshot of the content block here in another contentblock
-                                // therefore, if we couldn't resolve the folder during retrieve (and hence no r__folder_Path was set), we would also fail here
-                                this.setFolderId(asset);
+                                // if we convert this into a folder path then renamed folders might end up blocking deployments, therefore, we instead omit this detail from now on
+                                delete asset.r__folder_Path;
                             }
                             await this._preDeployTasksBocks(asset);
                         }
@@ -1886,7 +1885,8 @@ class Asset extends MetadataType {
                             }
                         }
                         if (asset.category?.id) {
-                            this.setFolderPath(asset, true);
+                            // if we convert this into a folder path then renamed folders might end up blocking deployments, therefore, we instead omit this detail from now on
+                            delete asset.category;
                         }
 
                         if (asset.slots) {

diff --git a/test/resources/9999999/asset/build-templatebasedemail-expected.json b/test/resources/9999999/asset/build-templatebasedemail-expected.json
@@ -65,7 +65,6 @@
                     "blocks": {
                         "hy6ik0ftsb4": {
                             "r__asset_key": "testTemplated_asset_htmlblock",
-                            "r__folder_Path": "Content Builder",
                             "assetType": {
                                 "id": 197,
                                 "name": "htmlblock",

diff --git a/test/resources/9999999/asset/retrieve-templatebasedemail-expected.json b/test/resources/9999999/asset/retrieve-templatebasedemail-expected.json
@@ -68,7 +68,6 @@
                     "blocks": {
                         "hy6ik0ftsb4": {
                             "r__asset_key": "testExisting_asset_htmlblock",
-                            "r__folder_Path": "Content Builder",
                             "assetType": {
                                 "id": 197,
                                 "name": "htmlblock",

diff --git a/test/resources/9999999/asset/template-templatebasedemail-expected.json b/test/resources/9999999/asset/template-templatebasedemail-expected.json
@@ -65,7 +65,6 @@
                     "blocks": {
                         "hy6ik0ftsb4": {
                             "r__asset_key": "{{{prefix}}}asset_htmlblock",
-                            "r__folder_Path": "Content Builder",
                             "assetType": {
                                 "id": 197,
                                 "name": "htmlblock",