Skip to content

Commit 138ba4a

Browse files
authored
Merge branch 'prerelease/develop-ga' into u/pallavi-das/security_scan_fixes
2 parents 78c1ee1 + f50c99a commit 138ba4a

19 files changed

+925
-337
lines changed

messages/assess.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,10 +142,6 @@
142142
"relatedObjectsToProcess": "Objects to process are",
143143
"consentForExperienceSites": "By proceeding further, you hereby consent to enable digital experience metadata api(y/n). If y sites will be processed, if n expsites will not be processed",
144144
"failedToGetConsentError": "Failed to get user consent: %s",
145-
"settingDesignersToStandardModel": "Setting designers to use the standard data model",
146-
"errorSettingDesignersToStandardModel": "Error occurred while setting designers to use the standard data model",
147-
"designersSetToStandardModel": "Successfully executed setDesignersToUseStandardDataModel",
148-
"exceptionSettingDesignersToStandardModel": "Exception occurred while setting designers to use the standard data model",
149145
"noRelatedObjects": "No related objects to process",
150146
"turnOffExperienceBundleAPI": "Since ExperienceSiteMetadata API was programatically enabled, turing it off",
151147
"errorRevertingExperienceBundleMetadataAPI": "Exception occurred while reverting metadata API. Please do that manually",
@@ -177,7 +173,7 @@
177173
"flexcardStorageProcessingStarted": "Started preparing storage for flexcards",
178174
"errorWhileProcessingFlexcardStorage": "Error occurred while processing key for flexcard storage",
179175
"missingInfo": "Info is missing",
180-
"errorCheckingGlobalAutoNumber": "We couldnt check whether the Global Auto Number setting is enabled: %s. Try again later.",
176+
"errorCheckingGlobalAutoNumber": "We couldn't check whether the Global Auto Number setting is enabled: %s. Try again later.",
181177
"errorMigrationMessage": "Error migrating object: %s",
182178
"nameMappingUndefined": "Name Mapping is undefined",
183179
"experienceSiteException": "Exception occurred while processing experience sites",

messages/migrate.json

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,6 @@
111111
"errorParsingData": "Error while parsing data for template",
112112
"errorGeneratingHTML": "Error while generating HTML from template for %s with properties %s",
113113
"errorEvaluatingExpression": "Error evaluating expression: %s, %s",
114-
"manuallySwitchDesignerToStandardDataModel": "To complete the setup, please manually run the required Apex code to configure OmniStudio Designers to use the Standard Data Model <br> https://help.salesforce.com/s/articleView?id=xcloud.os_migrate_change_the_sobject_data_model_after_migration.htm&type=5",
115114
"labelStatusSkipped": "Skipped",
116115
"labelStatusFailed": "Failed",
117116
"labelStatusComplete": "Complete",
@@ -155,10 +154,6 @@
155154
"relatedObjectsToProcess": "Objects to process are",
156155
"consentForExperienceSites": "'By proceeding further, you hereby consent to enable digital experience metadata api(y/n). If y sites will be processed, if n expsites will not be processed';",
157156
"failedToGetConsentError": "Failed to get user consent: %s",
158-
"settingDesignersToStandardModel": "Setting designers to use the standard data model",
159-
"errorSettingDesignersToStandardModel": "Error occurred while setting designers to use the standard data model",
160-
"designersSetToStandardModel": "Successfully executed setDesignersToUseStandardDataModel",
161-
"exceptionSettingDesignersToStandardModel": "Exception occurred while setting designers to use the standard data model",
162157
"noRelatedObjects": "No related objects to process",
163158
"turnOffExperienceBundleAPI": "Since ExperienceSiteMetadata API was programatically enabled, turing it off",
164159
"errorRevertingExperienceBundleMetadataAPI": "Exception occurred while reverting metadata API. Please do that manually",
@@ -210,13 +205,30 @@
210205
"startingComponentPreProcessing": "Pre-processing components for name mapping",
211206
"completeComponentMappingMessage": "Registered name mappings for %s components",
212207
"componentMappingNotFound": "No registry mapping found for %s component: %s, using fallback cleaning",
213-
"flexCardWithAngularOmniScriptWarning": "FlexCard has dependencies on Angular OmniScript(s) which are not migrated. Please convert OmniScript(s) to LWC before migrating this FlexCard.",
214-
"angularOmniScriptDependencyWarning": "Element '%s' references Angular OmniScript '%s' which will not be migrated. Consider converting the referenced OmniScript to LWC",
215-
"skipFlexcardAngularOmniScriptDependencyWarning": "Skipping FlexCard %s due to Angular OmniScript dependencies",
208+
"flexCardWithAngularOmniScriptWarning": "FlexCard has dependencies on Angular Omniscript(s) which are not migrated. Please convert OmniScript(s) to LWC before migrating this FlexCard.",
209+
"angularOmniScriptDependencyWarning": "Element '%s' references Angular Omniscript '%s' which will not be migrated. Consider converting the referenced OmniScript to LWC",
210+
"skipFlexcardAngularOmniScriptDependencyWarning": "Skipping FlexCard %s due to Angular Omniscript dependencies",
216211
"flexCardMigrationProcessingMessage": "Processing %s FlexCards for migration (%s skipped due to Angular dependencies)",
217212
"noMetadataToDeploy": "No metadata to deploy",
218213
"manifestDeployementStarted": "Manifest deployment started with id: %s",
219214
"migrationConsentMessage": "Make sure that all records listed in the Assessment Status column in the Assessment Report are marked as Green before proceeding with the migration. Do you want to proceed? Yes or No?",
220215
"truncationFailed": "Truncation failed for %s: %s",
221-
"invalidTypeMigrateErrorMessage": "We couldn't migrate your Omnistudio components in the %s namespace. Select the correct namespace and try again"
216+
"invalidTypeMigrateErrorMessage": "We couldn't migrate your Omnistudio components in the %s namespace. Select the correct namespace and try again",
217+
"errorCheckingStandardRuntime": "We couldn't check whether the Standard OmniStudio Runtime setting is enabled: %s. Try again later.",
218+
"checkingStandardRuntimeStatus": "Checking Standard OmniStudio Runtime status...",
219+
"standardRuntimeAlreadyEnabled": "Standard OmniStudio Runtime is already enabled, no action needed.",
220+
"standardRuntimeEnabled": "Standard OmniStudio Runtime has been successfully enabled.",
221+
"errorEnablingStandardRuntime": "Failed to enable Standard OmniStudio Runtime: %s",
222+
"exceptionEnablingStandardRuntime": "Exception occurred while enabling Standard OmniStudio Runtime: %s",
223+
"manuallyEnableStandardRuntime": "Please manually enable the Standard OmniStudio Runtime setting in your org's OmniStudio Settings.",
224+
"standardDesignerAlreadyEnabled": "Standard OmniStudio designer is already enabled, no action needed for package: %s",
225+
"settingDesignersToStandardModel": "Setting OmniStudio designers to use standard data model",
226+
"designersSetToStandardModel": "OmniStudio designers have been successfully set to use standard data model.",
227+
"errorSettingDesignersToStandardModel": "Failed to set designers to standard data model: %s",
228+
"exceptionSettingDesignersToStandardModel": "Exception occurred while setting designers to standard data model: %s",
229+
"manuallySwitchDesignerToStandardDataModel": "Please manually switch the OmniStudio designer to use standard data model in your org. Follow the documentation <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_migrate_change_the_sobject_data_model_after_migration.htm&type=5' target='_blank'>here</a>.",
230+
"checkingStandardDesignerStatus": "Checking if standard designer is already enabled for package: %s",
231+
"enableStandardRuntimeAfterDesigner": "Standard designer setup successful, proceeding with Standard Runtime enablement",
232+
"skipStandardRuntimeDueToFailure": "Skipping Standard Runtime enablement due to designer setup failure",
233+
"errorCheckingStandardDesigner": "Failed to check standard designer status for package %s: %s"
222234
}

package.json

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@salesforce/plugin-omnistudio-migration-tool",
33
"description": "This SFDX plugin migrates FlexCard, OmniScript, DataRaptor, and Integration Procedure custom objects to standard objects.",
4-
"version": "2.0.0-rc.16",
4+
"version": "2.0.0-rc.20",
55
"author": "Salesforce",
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"dependencies": {
@@ -22,10 +22,11 @@
2222
"lodash.chunk": "^4.2.0",
2323
"open": "^8.4.2",
2424
"shelljs": "^0.8.5",
25-
"tslib": "^2"
25+
"tslib": "^2",
26+
"@babel/parser": "^7.25.6",
27+
"@babel/traverse": "^7.25.6"
2628
},
2729
"devDependencies": {
28-
"@babel/parser": "^7.25.6",
2930
"@oclif/dev-cli": "^1",
3031
"@oclif/plugin-command-snapshot": "^3.3.15",
3132
"@oclif/plugin-help": "^3",
@@ -159,4 +160,4 @@
159160
"pre-push": "sf-husky-pre-push"
160161
}
161162
}
162-
}
163+
}

src/commands/omnistudio/migration/migrate.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ export default class Migrate extends OmniStudioBaseCommand {
208208
);
209209

210210
if (!migrateOnly) {
211-
await postMigrate.setDesignersToUseStandardDataModel(namespace, actionItems);
211+
await postMigrate.executeTasks(namespace, actionItems);
212212
}
213213
// From here also actionItems need to be collected
214214
await postMigrate.restoreExperienceAPIMetadataSettings(
@@ -437,7 +437,7 @@ export default class Migrate extends OmniStudioBaseCommand {
437437
allVersions
438438
),
439439
new CardMigrationTool(namespace, conn, this.logger, messages, this.ux, allVersions),
440-
new GlobalAutoNumberMigrationTool(namespace, conn, this.logger, messages, this.ux),
440+
// new GlobalAutoNumberMigrationTool(namespace, conn, this.logger, messages, this.ux),
441441
];
442442
} else {
443443
// For single component migration, the order doesn't matter as much

src/migration/dataraptor.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
302302
}
303303
if (existingDataRaptorNames.has(existingDRNameVal.cleanName())) {
304304
warnings.push(this.messages.getMessage('duplicatedName') + ' ' + existingDRNameVal.cleanName());
305-
assessmentStatus = 'Need Manual Intervention';
305+
assessmentStatus = 'Needs Manual Intervention';
306306
} else {
307307
existingDataRaptorNames.add(existingDRNameVal.cleanName());
308308
}

0 commit comments

Comments
 (0)