mcdev 7.2.0 → 7.3.1

package/lib/metadataTypes/SendClassification.js

@@ -88,13 +88,15 @@ class SendClassification extends MetadataType {
             this.definition.sendClassificationTypeMapping[metadata.c__classification];
         delete metadata.c__classification;
 
+        const spId = cache.searchForField(
+            'senderProfile',
+            metadata.r__senderProfile_key,
+            'CustomerKey',
+            'ObjectID'
+        );
         metadata.SenderProfile = {
-            CustomerKey: cache.searchForField(
-                'senderProfile',
-                metadata.r__senderProfile_key,
-                'CustomerKey',
-                'CustomerKey'
-            ),
+            ObjectID: spId,
+            CustomerKey: metadata.r__senderProfile_key,
         };
         delete metadata.r__senderProfile_key;
 
@@ -127,8 +129,8 @@ class SendClassification extends MetadataType {
         try {
             metadata.r__senderProfile_key = cache.searchForField(
                 'senderProfile',
-                metadata.SenderProfile.CustomerKey,
-                'CustomerKey',
+                metadata.SenderProfile.ObjectID,
+                'ObjectID',
                 'CustomerKey'
             );
             delete metadata.SenderProfile;

package/lib/metadataTypes/TriggeredSend.js

@@ -168,36 +168,36 @@ class TriggeredSend extends MetadataType {
         }
 
         // sender profile
-        if (metadata.SenderProfile?.CustomerKey) {
+        if (metadata.SenderProfile?.ObjectID) {
             try {
-                cache.searchForField(
+                const spKey = cache.searchForField(
                     'senderProfile',
-                    metadata.SenderProfile.CustomerKey,
-                    'CustomerKey',
+                    metadata.SenderProfile.ObjectID,
+                    'ObjectID',
                     'CustomerKey'
                 );
-                metadata.r__senderProfile_key = metadata.SenderProfile.CustomerKey;
+                metadata.r__senderProfile_key = spKey;
                 delete metadata.SenderProfile;
             } catch (ex) {
                 Util.logger.warn(
-                    ` - ${this.definition.type} ${metadata.CustomerKey}: ${ex.message}`
+                    ` - ${this.definition.type} ${metadata.CustomerKey}: ${ex.message} (senderProfile key ${metadata.SenderProfile.CustomerKey})`
                 );
             }
         }
         // send classification
-        if (metadata.SendClassification?.CustomerKey) {
+        if (metadata.SendClassification?.ObjectID) {
             try {
-                cache.searchForField(
+                const scKey = cache.searchForField(
                     'sendClassification',
-                    metadata.SendClassification.CustomerKey,
-                    'CustomerKey',
+                    metadata.SendClassification.ObjectID,
+                    'ObjectID',
                     'CustomerKey'
                 );
-                metadata.r__sendClassification_key = metadata.SendClassification.CustomerKey;
+                metadata.r__sendClassification_key = scKey;
                 delete metadata.SendClassification;
             } catch (ex) {
                 Util.logger.warn(
-                    ` - ${this.definition.type} ${metadata.CustomerKey}: ${ex.message}`
+                    ` - ${this.definition.type} ${metadata.CustomerKey}: ${ex.message} (sendClassification key ${metadata.SendClassification.CustomerKey})`
                 );
             }
         }
@@ -268,26 +268,28 @@ class TriggeredSend extends MetadataType {
         }
         // sender profile
         if (metadata.r__senderProfile_key) {
-            cache.searchForField(
+            const spId = cache.searchForField(
                 'senderProfile',
                 metadata.r__senderProfile_key,
                 'CustomerKey',
-                'CustomerKey'
+                'ObjectID'
             );
             metadata.SenderProfile = {
+                ObjectID: spId,
                 CustomerKey: metadata.r__senderProfile_key,
             };
             delete metadata.r__senderProfile_key;
         }
         // send classification
         if (metadata.r__sendClassification_key) {
-            cache.searchForField(
+            const scId = cache.searchForField(
                 'sendClassification',
                 metadata.r__sendClassification_key,
                 'CustomerKey',
-                'CustomerKey'
+                'ObjectID'
             );
             metadata.SendClassification = {
+                ObjectID: scId,
                 CustomerKey: metadata.r__sendClassification_key,
             };
             delete metadata.r__sendClassification_key;

package/lib/metadataTypes/definitions/DataExtension.definition.js

@@ -123,8 +123,8 @@ export default {
             template: false,
         },
         CreatedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: false,
         },
@@ -189,8 +189,8 @@ export default {
             template: true,
         },
         ModifiedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: false,
         },

package/lib/metadataTypes/definitions/EmailSend.definition.js

@@ -81,8 +81,8 @@ export default {
             templating: false,
         },
         CreatedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             templating: false,
         },
@@ -333,8 +333,8 @@ export default {
             templating: false,
         },
         ModifiedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             templating: false,
         },

package/lib/metadataTypes/definitions/Event.definition.js

@@ -275,8 +275,8 @@ export default {
             template: true,
         },
         'configurationArguments.salesforceTriggerCriteria': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: true,
         },
@@ -389,33 +389,33 @@ export default {
             template: true,
         },
         'metaData.automationData.automationType': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.categoryId': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.createdBy.email': {
             isCreateable: false,
             isUpdateable: false,
-            retrieving: true,
+            retrieving: false,
             template: false,
         },
         'metaData.automationData.createdBy.id': {
             isCreateable: false,
             isUpdateable: false,
-            retrieving: true,
+            retrieving: false,
             template: false,
         },
         'metaData.automationData.createdBy.name': {
             isCreateable: false,
             isUpdateable: false,
-            retrieving: true,
+            retrieving: false,
             template: false,
         },
         'metaData.automationData.createdDate': {
@@ -425,34 +425,34 @@ export default {
             template: false,
         },
         'metaData.automationData.description': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.folderPath': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.guidId': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.id': {
             isCreateable: true,
             isUpdateable: true,
-            retrieving: false,
+            retrieving: true,
             template: true,
         },
         'metaData.automationData.isPlatformObject': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.key': {
             isCreateable: true,
@@ -481,13 +481,13 @@ export default {
         'metaData.automationData.lastSavedBy.email': {
             isCreateable: false,
             isUpdateable: false,
-            retrieving: true,
+            retrieving: false,
             template: false,
         },
         'metaData.automationData.lastSavedBy.id': {
             isCreateable: false,
             isUpdateable: false,
-            retrieving: true,
+            retrieving: false,
             template: false,
         },
         'metaData.automationData.lastSavedBy.name': {
@@ -497,8 +497,8 @@ export default {
             template: false,
         },
         'metaData.automationData.memberId': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: false,
         },
@@ -509,28 +509,28 @@ export default {
             template: false,
         },
         'metaData.automationData.name': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.notifications': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.processes': {
-            isCreateable: false,
-            isUpdateable: false,
-            retrieving: false,
-            template: false,
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
+            template: true,
         },
         'metaData.automationData.schedule': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.scheduleObject.createdBy': {
             isCreateable: false,
@@ -545,16 +545,16 @@ export default {
             template: false,
         },
         'metaData.automationData.scheduleObject.description': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.scheduleObject.iCalRecur': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.scheduleObject.id': {
             isCreateable: false,
@@ -581,46 +581,46 @@ export default {
             template: false,
         },
         'metaData.automationData.scheduleObject.name': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.scheduleObject.scheduleState': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.scheduleObject.scheduleStatus': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.scheduleObject.startDate': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.scheduleObject.timeZone': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.scheduleObject.timeZoneId': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.scheduledTime': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.selectedCategoryId': {
             isCreateable: false,
@@ -635,10 +635,10 @@ export default {
             template: false,
         },
         'metaData.automationData.status': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'metaData.automationData.updateInProgress': {
             isCreateable: false,
@@ -833,46 +833,46 @@ export default {
             template: true,
         },
         'schedule.monday': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'schedule.tuesday': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'schedule.wednesday': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'schedule.thursday': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'schedule.friday': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'schedule.saturday': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'schedule.sunday': {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
-            template: false,
+            template: true,
         },
         'schema.fields': {
             isCreateable: true,

package/lib/metadataTypes/definitions/Journey.definition.js

@@ -294,6 +294,7 @@ export default {
             isCreateable: false,
             isUpdateable: false,
             retrieving: true,
+            /* dont include in templates, we rather want this to be re-created from the journey */
             template: false,
         },
         'activities[].configurationArguments.triggeredSend.senderProfileId': {

package/lib/metadataTypes/definitions/Role.definition.js

@@ -32,8 +32,8 @@ export default {
     typeName: 'Role',
     fields: {
         CreatedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: false,
         },
@@ -50,8 +50,8 @@ export default {
             template: false,
         },
         ModifiedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: false,
         },

package/lib/metadataTypes/definitions/SendClassification.definition.js

@@ -35,14 +35,14 @@ export default {
             template: false,
         },
         CreatedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: false,
         },
         ModifiedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: false,
         },
@@ -133,9 +133,9 @@ export default {
             template: false,
         },
         'SenderProfile.ObjectID': {
-            isCreateable: false,
-            isUpdateable: false,
-            retrieving: false,
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
             template: false,
         },
         SendPriority: {

package/lib/metadataTypes/definitions/SenderProfile.definition.js

@@ -26,14 +26,14 @@ export default {
             template: false,
         },
         CreatedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: false,
         },
         ModifiedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             template: false,
         },

package/lib/metadataTypes/definitions/TriggeredSend.definition.js

@@ -103,8 +103,8 @@ export default {
             templating: false,
         },
         CreatedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             templating: false,
         },
@@ -129,7 +129,7 @@ export default {
         'DeliveryProfile.ObjectID': {
             isCreateable: true,
             isUpdateable: true,
-            retrieving: false,
+            retrieving: true,
             templating: false,
         },
         Description: {
@@ -301,8 +301,8 @@ export default {
             templating: false,
         },
         ModifiedDate: {
-            isCreateable: false,
-            isUpdateable: false,
+            isCreateable: true,
+            isUpdateable: true,
             retrieving: true,
             templating: false,
         },
@@ -434,9 +434,9 @@ export default {
             templating: true,
         },
         'SendClassification.ObjectID': {
-            isCreateable: false,
-            isUpdateable: false,
-            retrieving: false,
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
             templating: false,
         },
         'SendClassification.PartnerKey': {
@@ -452,9 +452,9 @@ export default {
             templating: true,
         },
         'SenderProfile.ObjectID': {
-            isCreateable: false,
-            isUpdateable: false,
-            retrieving: false,
+            isCreateable: true,
+            isUpdateable: true,
+            retrieving: true,
             templating: false,
         },
         'SenderProfile.PartnerKey': {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mcdev",
-    "version": "7.2.0",
+    "version": "7.3.1",
     "description": "Accenture Salesforce Marketing Cloud DevTools",
     "author": "Accenture: joern.berkefeld, douglas.midgley, robert.zimmermann, maciej.barnas",
     "license": "MIT",
@@ -59,6 +59,10 @@
         "lint-and-test": "run-s lint test",
         "test": "mocha --reporter-option maxDiffSize=25000",
         "coverage": "c8 npm run test",
+        "prepare-release:audit-fix": "npm audit fix",
+        "prepare-release:git-stage": "git add .",
+        "prepare-release:git-commit": "git commit -n -m \"prepare-release changes\"",
+        "prepare-release": "run-s prepare-release:audit-fix lint-ts lint:fix prepare-release:git-stage prepare-release:git-commit",
         "version:major": "npm version --no-commit-hooks major",
         "version:minor": "npm version --no-commit-hooks minor",
         "version:patch": "npm version --no-commit-hooks patch"
@@ -83,7 +87,8 @@
         "toposort": "2.0.2",
         "update-notifier": "7.2.0",
         "winston": "3.14.2",
-        "yargs": "17.7.2"
+        "yargs": "17.7.2",
+        "yocto-spinner": "0.1.0"
     },
     "devDependencies": {
         "@eslint/js": "9.9.0",