mcdev 7.0.4 → 7.1.0

package/test/mockRoot/.mcdevrc.json

@@ -100,5 +100,5 @@
             "verification"
         ]
     },
-    "version": "7.0.4"
+    "version": "7.1.0"
 }

package/test/mockRoot/deploy/testInstance/testBU/event/testNew_event_withExistingDE.event-meta.json

@@ -7,6 +7,7 @@
     "modifiedDate": "0001-01-01T00:00:00",
     "modifiedBy": 0,
     "eventDefinitionKey": "testNew_event_withExistingDE",
+    "sourceApplicationExtensionId": "7db1f972-f8b7-49b6-91b5-fa218e13953d",
     "schema": {
         "fields": [
             {

package/test/mockRoot/deploy/testInstance/testBU/event/testNew_event_withSchema.event-meta.json

@@ -4,6 +4,7 @@
     "description": "created on deploy",
     "mode": "Production",
     "eventDefinitionKey": "testNew_event_withSchema",
+    "sourceApplicationExtensionId": "7db1f972-f8b7-49b6-91b5-fa218e13953d",
     "schema": {
         "fields": [
             {

package/test/mockRoot/deploy/testInstance/testBU/mobileKeyword/4912312345678.TESTNEW_KEYWORD.mobileKeyword-meta.json

@@ -1,5 +1,6 @@
 {
     "c__codeKeyword": "4912312345678.TESTNEW_KEYWORD",
+    "r__mobileCode_key": "4912312345678",
     "status": "Active",
     "restriction": "NONE",
     "keywordType": "STOP",

package/test/mockRoot/deploy/testInstance/testBU/mobileKeyword/4912312345678.TESTNEW_KEYWORD_BLOCKED.mobileKeyword-meta.json

@@ -1,5 +1,6 @@
 {
     "c__codeKeyword": "4912312345678.TESTNEW_KEYWORD_BLOCKED",
+    "r__mobileCode_key": "4912312345678",
     "status": "Active",
     "restriction": "NONE",
     "keywordType": "NORMAL",

package/test/resourceFactory.js

@@ -37,12 +37,13 @@ if (Util.isRunViaVSCodeExtension) {
  * @param {string} type metadata Type
  * @param {string} mid of Business Unit
  * @param {object|string} filter likely for customer key
+ * @param {boolean} [QueryAllAccounts] get data from other BUs or not
  * @returns {Promise.<string>} relevant metadata stringified
  */
-async function loadSOAPRecords(mcdevAction, type, mid, filter) {
+async function loadSOAPRecords(mcdevAction, type, mid, filter, QueryAllAccounts) {
     type = type[0].toLowerCase() + type.slice(1);
     const testPath = path.join('test', 'resources', mid.toString(), type, mcdevAction);
-    const filterPath = typeof filter === 'string' && filter ? '-' + filter : filterToPath(filter);
+    const filterPath = getFilterPath(filter, QueryAllAccounts);
     if (await fs.pathExists(testPath + filterPath + '-response.xml')) {
         return fs.readFile(testPath + filterPath + '-response.xml', {
             encoding: 'utf8',
@@ -79,6 +80,26 @@ async function loadSOAPRecords(mcdevAction, type, mid, filter) {
         encoding: 'utf8',
     });
 }
+/**
+ * helper for {@link loadSOAPRecords} to get the filter path
+ *
+ * @param {object|string} filter likely for customer key
+ * @param {boolean} [QueryAllAccounts] get data from other BUs or not
+ * @param {number} [shorten] number of characters to shorten filters by to match windows max file length of 256 chars
+ * @returns {string} filterPath value
+ */
+function getFilterPath(filter, QueryAllAccounts, shorten) {
+    const filterPath =
+        (typeof filter === 'string' && filter ? '-' + filter : filterToPath(filter, shorten)) +
+        (QueryAllAccounts ? '-QAA' : '');
+    if ((filterPath + '-response.xml').length > 256) {
+        shorten ||= 10;
+        return getFilterPath(filter, QueryAllAccounts, --shorten);
+    } else {
+        return filterPath;
+    }
+}
+
 /**
  * main filter to path function
  *
@@ -89,11 +110,12 @@ async function loadSOAPRecords(mcdevAction, type, mid, filter) {
  * @param {object} filter.LeftOperand contains a filter object itself
  * @param {'AND'|'OR'} filter.LogicalOperator string representation of the comparison method
  * @param {object} filter.RightOperand field value to check for
+ * @param {number} [shorten] number of characters to shorten filters by to match windows max file length of 256 chars
  * @returns {string} string represenation of the entire filter
  */
-export function filterToPath(filter) {
+export function filterToPath(filter, shorten) {
     if (filter) {
-        return '-' + _filterToPath(filter);
+        return '-' + _filterToPath(filter, shorten);
     }
     return '';
 }
@@ -107,18 +129,27 @@ export function filterToPath(filter) {
  * @param {object} filter.LeftOperand contains a filter object itself
  * @param {'AND'|'OR'} filter.LogicalOperator string representation of the comparison method
  * @param {object} filter.RightOperand field value to check for
+ * @param {number} [shorten] number of characters to shorten filters by to match windows max file length of 256 chars
  * @returns {string} string represenation of the entire filter
  */
-function _filterToPath(filter) {
+function _filterToPath(filter, shorten) {
     if (filter.Property && filter.SimpleOperator) {
-        return `${filter.Property}${filter.SimpleOperator.replace('equals', '=')}${
-            filter.Value === undefined ? '' : filter.Value
-        }`;
+        let value;
+        if (filter.Value === undefined) {
+            value = '';
+        } else if (Array.isArray(filter.Value)) {
+            value = shorten
+                ? filter.Value.map((val) => val.slice(0, Math.max(0, shorten))).join(',')
+                : filter.Value.join(',');
+        } else {
+            value = shorten ? filter.Value.slice(0, Math.max(0, shorten)) : filter.Value;
+        }
+        return `${filter.Property}${filter.SimpleOperator.replace('equals', '=')}${value}`;
     } else if (filter.LeftOperand && filter.LogicalOperator && filter.RightOperand) {
         return (
-            _filterToPath(filter.LeftOperand) +
+            _filterToPath(filter.LeftOperand, shorten) +
             filter.LogicalOperator +
-            _filterToPath(filter.RightOperand)
+            _filterToPath(filter.RightOperand, shorten)
         );
     } else {
         throw new Error('unknown filter type');
@@ -141,7 +172,8 @@ export const handleSOAPRequest = async (config) => {
                 config.headers.SOAPAction.toLocaleLowerCase(),
                 jObj.Envelope.Body.RetrieveRequestMsg.RetrieveRequest.ObjectType,
                 jObj.Envelope.Header.fueloauth,
-                jObj.Envelope.Body.RetrieveRequestMsg.RetrieveRequest.Filter
+                jObj.Envelope.Body.RetrieveRequestMsg.RetrieveRequest.Filter,
+                jObj.Envelope.Body.RetrieveRequestMsg.RetrieveRequest.QueryAllAccounts
             );
 
             break;

package/test/resources/1111111/dataFolder/retrieve-ContentTypeINshared_data,shared_dataextension,shared_salesforcedataextension,synchronizeddataextension-response.xml

@@ -0,0 +1,364 @@
+<?xml version="1.0" encoding="utf-8"?>
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+    xmlns:wsa="http://schemas.xmlsoap.org/ws/2004/08/addressing"
+    xmlns:wsse="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd"
+    xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">
+    <soap:Header>
+        <wsa:Action>RetrieveResponse</wsa:Action>
+        <wsa:MessageID>urn:uuid:4d209b2f-d7ce-4e6e-916c-c8642d368866</wsa:MessageID>
+        <wsa:RelatesTo>urn:uuid:a850f043-1422-4d16-8443-702dd2f9f13a</wsa:RelatesTo>
+        <wsa:To>http://schemas.xmlsoap.org/ws/2004/08/addressing/role/anonymous</wsa:To>
+        <wsse:Security>
+            <wsu:Timestamp wsu:Id="Timestamp-5da63531-caa7-4ead-9f10-a33d9bf66745">
+                <wsu:Created>2023-08-11T13:15:46Z</wsu:Created>
+                <wsu:Expires>2023-08-11T13:20:46Z</wsu:Expires>
+            </wsu:Timestamp>
+        </wsse:Security>
+    </soap:Header>
+    <soap:Body>
+        <RetrieveResponseMsg xmlns="http://exacttarget.com/wsdl/partnerAPI">
+            <OverallStatus>OK</OverallStatus>
+            <RequestID>ba1b0c59-78c4-4608-8423-35dda2248d4d</RequestID>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2016-07-22T11:52:18.73</CreatedDate>
+                <ModifiedDate>2016-07-22T11:52:19.603</ModifiedDate>
+                <ID>89344</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>shared_data_default</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>0</ID>
+                    <ObjectID xsi:nil="true" />
+                </ParentFolder>
+                <Name>Shared Items</Name>
+                <Description />
+                <ContentType>shared_data</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>false</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2016-07-22T11:52:19.6</CreatedDate>
+                <ModifiedDate>2016-07-22T11:52:19.6</ModifiedDate>
+                <ID>89355</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>dataextension_default</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>0</ID>
+                    <ObjectID xsi:nil="true" />
+                </ParentFolder>
+                <Name>Data Extensions</Name>
+                <Description />
+                <ContentType>dataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2016-07-22T11:52:19.603</CreatedDate>
+                <ModifiedDate>2016-07-22T11:52:19.603</ModifiedDate>
+                <ID>89356</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>shared_dataextension_default</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>89344</ID>
+                    <ObjectID xsi:nil="true" />
+                    <CustomerKey>shared_data_default</CustomerKey>
+                </ParentFolder>
+                <Name>Shared Data Extensions</Name>
+                <Description />
+                <ContentType>shared_dataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2016-07-29T12:13:27.28</CreatedDate>
+                <ModifiedDate>2016-07-29T12:13:27.28</ModifiedDate>
+                <ID>90889</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>HiddenCategory_default</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>0</ID>
+                    <ObjectID xsi:nil="true" />
+                </ParentFolder>
+                <Name>HiddenCategory</Name>
+                <Description>Hidden folder to store Hidden items</Description>
+                <ContentType>Hidden</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2016-08-23T09:22:27.54</CreatedDate>
+                <ModifiedDate>2016-08-23T09:22:27.54</ModifiedDate>
+                <ID>93698</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>salesforcedataextension_default</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>0</ID>
+                    <ObjectID xsi:nil="true" />
+                </ParentFolder>
+                <Name>Salesforce Data Extensions</Name>
+                <Description />
+                <ContentType>salesforcedataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2016-08-23T09:22:27.55</CreatedDate>
+                <ModifiedDate>2016-08-23T09:22:27.55</ModifiedDate>
+                <ID>93699</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>shared_salesforcedataextension_defau</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>89344</ID>
+                    <ObjectID xsi:nil="true" />
+                    <CustomerKey>shared_data_default</CustomerKey>
+                </ParentFolder>
+                <Name>Shared Salesforce Data Extensions</Name>
+                <Description />
+                <ContentType>shared_salesforcedataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2020-01-27T10:50:46.573</CreatedDate>
+                <ModifiedDate>2020-01-27T10:50:46.573</ModifiedDate>
+                <ID>309082</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey />
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>89355</ID>
+                    <ObjectID xsi:nil="true" />
+                    <CustomerKey>dataextension_default</CustomerKey>
+                </ParentFolder>
+                <Name>QueryStudioResults</Name>
+                <Description />
+                <ContentType>dataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>true</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2020-04-17T08:14:19.763</CreatedDate>
+                <ModifiedDate>2020-04-17T08:14:19.763</ModifiedDate>
+                <ID>587750</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey />
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>89356</ID>
+                    <ObjectID xsi:nil="true" />
+                    <CustomerKey>shared_dataextension_default</CustomerKey>
+                </ParentFolder>
+                <Name>catalyst target 1</Name>
+                <Description />
+                <ContentType>shared_dataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>true</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2020-07-09T02:30:12.38</CreatedDate>
+                <ModifiedDate>2021-12-16T03:43:30.753</ModifiedDate>
+                <ID>605618</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>dataextension_default</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>89355</ID>
+                    <ObjectID xsi:nil="true" />
+                    <CustomerKey>dataextension_default</CustomerKey>
+                </ParentFolder>
+                <Name>Audiences</Name>
+                <Description />
+                <ContentType>dataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>true</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2020-12-25T06:11:40.107</CreatedDate>
+                <ModifiedDate>2021-12-23T10:51:24.393</ModifiedDate>
+                <ID>633441</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey />
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>89355</ID>
+                    <ObjectID xsi:nil="true" />
+                    <CustomerKey>dataextension_default</CustomerKey>
+                </ParentFolder>
+                <Name>System DEs</Name>
+                <Description />
+                <ContentType>dataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>true</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2021-01-30T11:54:36.11</CreatedDate>
+                <ModifiedDate>2021-01-30T11:54:36.11</ModifiedDate>
+                <ID>638814</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>0b72bf27-0678-484d-ac0b-a8762b9bec33</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>89356</ID>
+                    <ObjectID xsi:nil="true" />
+                    <CustomerKey>shared_dataextension_default</CustomerKey>
+                </ParentFolder>
+                <Name>Customer 360 Segments</Name>
+                <Description>All Customer 360 segments will be grouped here. Each sub-folder relates to an activation profile name.</Description>
+                <ContentType>shared_dataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2021-01-30T11:56:38.77</CreatedDate>
+                <ModifiedDate>2021-01-30T11:56:38.77</ModifiedDate>
+                <ID>638815</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>cedd206d-178e-41cb-8965-ce255975b046</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>638814</ID>
+                    <ObjectID xsi:nil="true" />
+                    <CustomerKey>0b72bf27-0678-484d-ac0b-a8762b9bec33</CustomerKey>
+                </ParentFolder>
+                <Name>FirstAudience360 Segment</Name>
+                <Description />
+                <ContentType>shared_dataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>false</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2021-08-04T15:17:18.533</CreatedDate>
+                <ModifiedDate>2021-08-04T15:17:18.567</ModifiedDate>
+                <ID>675203</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>A19F7E38-7369-497E-826F-D551F17FB0B4</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>0</ID>
+                    <ObjectID xsi:nil="true" />
+                </ParentFolder>
+                <Name>Synchronized Data Extensions</Name>
+                <Description />
+                <ContentType>synchronizeddataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2021-10-03T05:01:37.23</CreatedDate>
+                <ModifiedDate>2021-10-03T05:01:37.37</ModifiedDate>
+                <ID>688352</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>B80AE306-55BC-4C2E-A79F-8CCA486F0BA0</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>0</ID>
+                    <ObjectID xsi:nil="true" />
+                </ParentFolder>
+                <Name>Synchronized Data Extensions</Name>
+                <Description />
+                <ContentType>synchronizeddataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+            <Results xsi:type="DataFolder">
+                <Client>
+                    <ID>1111111</ID>
+                </Client>
+                <PartnerKey xsi:nil="true" />
+                <CreatedDate>2022-10-26T09:48:38.293</CreatedDate>
+                <ModifiedDate>2022-10-26T09:48:38.31</ModifiedDate>
+                <ID>757145</ID>
+                <ObjectID xsi:nil="true" />
+                <CustomerKey>0ACB800B-AA8B-4F0F-9642-4907592C919C</CustomerKey>
+                <ParentFolder>
+                    <PartnerKey xsi:nil="true" />
+                    <ID>0</ID>
+                    <ObjectID xsi:nil="true" />
+                </ParentFolder>
+                <Name>Synchronized Data Extensions</Name>
+                <Description />
+                <ContentType>synchronizeddataextension</ContentType>
+                <IsActive>true</IsActive>
+                <IsEditable>false</IsEditable>
+                <AllowChildren>true</AllowChildren>
+            </Results>
+        </RetrieveResponseMsg>
+    </soap:Body>
+</soap:Envelope>

package/test/resources/9999999/asset/{block-1157-retrieve-expected.html → build-asset_htmlblock-expected.html}

@@ -17,7 +17,7 @@
 </script>
 
             <div>my 2nd html</div>
-            <div>%%=TreatAsContent(ContentBlockByFake("Content Builder\my very long path\Content Blocks Library\COMMON\some other folder\my code snippet"))=%%</div>
+            <div>%%=ContentBlockById(1295065)=%%</div>
         </td>
     </tr>
 </table>

package/test/resources/9999999/asset/build-asset_htmlblock-expected.json

@@ -0,0 +1,29 @@
+{
+    "assetType": {
+        "displayName": "HTML Block",
+        "name": "htmlblock"
+    },
+    "availableViews": [],
+    "createdBy": {},
+    "customerKey": "testTemplated_asset_htmlblock",
+    "design": "",
+    "fileProperties": {
+        "fileName": "testTemplated_asset_htmlblock-Mcdev-strips-content"
+    },
+    "memberId": "1111111",
+    "meta": {
+        "wrapperStyles": {
+            "mobile": {
+                "visible": true
+            },
+            "styling": {}
+        }
+    },
+    "modelVersion": 2,
+    "modifiedBy": {},
+    "name": "testTemplated_asset_htmlblock-Mcdev-strips-content",
+    "r__folder_Path": "Content Builder",
+    "status": {
+        "name": "Draft"
+    }
+}

package/test/resources/9999999/asset/build-templatebasedemail-expected.json

@@ -57,6 +57,71 @@
         "html": {
             "thumbnail": {},
             "availableViews": [],
+            "slots": {
+                "banner": {
+                    "content": "<div data-type=\"block\" data-key=\"5v1vodxyvz\"></div><div data-type=\"block\" data-key=\"c2m5fa0c6ym\"></div><div data-type=\"block\" data-key=\"cdsuxkm6kyt\"></div><div data-type=\"block\" data-key=\"7xogokk59k\"></div><div data-type=\"block\" data-key=\"sf47b6tjg2m\"></div><div data-type=\"block\" data-key=\"hy6ik0ftsb4\"></div><div data-type=\"block\" data-key=\"csscq2x1lpr\"></div>",
+                    "design": "<p style=\"font-family:Arial;color:#ccc;font-size:12px;text-align:center;vertical-align:middle;font-weight:bold;height:150px;display:flex;flex-direction:column;justify-content:center;padding:10px;margin:0;border: #cccccc dashed 1px;\">Drop blocks or content here</p>",
+                    "availableViews": [],
+                    "blocks": {
+                        "hy6ik0ftsb4": {
+                            "r__asset_key": "testTemplated_asset_htmlblock",
+                            "r__folder_Path": "Content Builder",
+                            "assetType": {
+                                "id": 197,
+                                "name": "htmlblock",
+                                "displayName": "HTML Block"
+                            },
+                            "fileProperties": {
+                                "fileName": "testTemplated_asset_htmlblock-Mcdev-strips-content"
+                            },
+                            "name": "testTemplated_asset_htmlblock-Mcdev-strips-content",
+                            "owner": {
+                                "id": 700301950,
+                                "email": "joern.berkefeld@accenture.com",
+                                "name": "Jörn Berkefeld (ASGR)",
+                                "userId": "700301950"
+                            },
+                            "createdDate": "2024-01-08T08:26:58.277-06:00",
+                            "createdBy": {
+                                "id": 700301950,
+                                "email": "joern.berkefeld@accenture.com",
+                                "name": "Jörn Berkefeld (ASGR)",
+                                "userId": "700301950"
+                            },
+                            "modifiedDate": "2024-01-08T08:28:01.6-06:00",
+                            "modifiedBy": {
+                                "id": 700301950,
+                                "email": "joern.berkefeld@accenture.com",
+                                "name": "Jörn Berkefeld (ASGR)",
+                                "userId": "700301950"
+                            },
+                            "enterpriseId": 99991999,
+                            "memberId": 99991999,
+                            "status": {
+                                "id": 1,
+                                "name": "Draft"
+                            },
+                            "design": "",
+                            "meta": {
+                                "wrapperStyles": {
+                                    "mobile": {
+                                        "visible": true
+                                    },
+                                    "styling": {}
+                                }
+                            },
+                            "availableViews": [],
+                            "modelVersion": 2
+                        }
+                    },
+                    "data": {
+                        "email": {
+                            "options": {}
+                        }
+                    },
+                    "modelVersion": 2
+                }
+            },
             "template": {
                 "meta": { "contentHash": -166410261 },
                 "r__asset_key": "testTemplated_asset_template"

package/test/resources/9999999/asset/resolveId-1295064-noPath-expected.json

@@ -1,8 +1,8 @@
 {
     "folder": "Content Builder",
     "isShared": false,
-    "key": "mcdev-issue-1157",
+    "key": "testExisting_asset_htmlblock",
     "mid": 9999999,
-    "name": "mcdev-issue-1157-Mcdev-strips-content",
-    "path": "./retrieve/testInstance/testBU/asset/block/mcdev-issue-1157.asset-block-meta.html"
+    "name": "testExisting_asset_htmlblock-Mcdev-strips-content",
+    "path": "./retrieve/testInstance/testBU/asset/block/testExisting_asset_htmlblock.asset-block-meta.html"
 }

package/test/resources/9999999/asset/resolveId-1295064-withPath-expected.json

@@ -1,8 +1,8 @@
 {
     "folder": "Content Builder",
     "isShared": false,
-    "key": "mcdev-issue-1157",
+    "key": "testExisting_asset_htmlblock",
     "mid": 9999999,
-    "name": "mcdev-issue-1157-Mcdev-strips-content",
-    "path": "./retrieve/testInstance/testBU/asset/block/mcdev-issue-1157.asset-block-meta.html"
+    "name": "testExisting_asset_htmlblock-Mcdev-strips-content",
+    "path": "./retrieve/testInstance/testBU/asset/block/testExisting_asset_htmlblock.asset-block-meta.html"
 }