Merge pull request #452 from sf-aastha-paruthi/u/aparuthi/release260OmnistudioPackageBlitzFixes

chore: blitz fixes

Author: sf-aastha-paruthi

messages/assess.json

@@ -19,7 +19,7 @@
   "invalidOrRepeatingOmniscriptElementNames": "Omniscript with invalid or duplicate element names found. Rename your Omniscript elements and try again.",
   "duplicatedCardName": "Flexcard with duplicate name found in this org. Modify your Flexcard and try again.",
   "duplicatedDrName": "Data Mapper with duplicate name found in this org. Rename your Data Mapper and try again.",
-  "duplicatedOSName": "Omniscript with duplicate name, type, subtype, or language found in this org. Modify your Omniscript and try again.",
+  "duplicatedOSName": "%s with duplicate name, type, subtype, or language found in this org. Modify your %s and try again.",
   "duplicatedName": "Duplicated name %s",
   "lowerVersionDuplicateOmniscriptName": "A %s with name \"%s\" will not be migrated because lower version of same %s will be marked as duplicate, which could lead to conflicts during migration.",
   "errorWhileActivatingOs": "We couldn't activate your %s:",
@@ -174,7 +174,7 @@
   "manualInterventionForExperienceSite": "We couldn’t process the %s component because no key was found.",
   "manualInterventionForExperienceSiteAsFailure": "We couldn’t process the %s component. ",
   "manualInterventionForExperienceSiteAsDuplicateKey": "We couldn’t process the %s component because a duplicate key was found. ",
-  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because of the error %s in the Experience Cloud site configuration.",
+  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because of error in the Experience Cloud site configuration.",
   "updatingStorageForOmniscipt": "Preparing storage for Omniscripts",
   "keyAlreadyInStorage": "The %s %s name already exists in storage.",
   "flexcardStorageProcessingStarted": "Preparing storage for Flexcards.",

messages/migrate.json

@@ -22,7 +22,7 @@
   "lowerVersionDuplicateCardName": "Flexcard with name %s can't be migrated because lower version of same card is probable duplicate. Rename your Flexcard and try again.",
   "duplicatedCardName": "Flexcard with duplicate name %s found in this org. Rename your Flexcard and try again.",
   "duplicatedDrName": "Data Mapper with duplicate name found in this org. Rename your Data Mapper and try again.",
-  "duplicatedOSName": "Omniscript with duplicate name, type, subtype, or language found in this org. Modify your Omniscript and try again.",
+  "duplicatedOSName": "%s with duplicate name, type, subtype, or language found in this org. Modify your %s and try again.",
   "lowerVersionDuplicateOSName": "%s with name %s can't be migrated because lower version of same %s is probable duplicate. Rename your %s and try again.",
   "errorWhileActivatingOs": "We couldn't activate your %s:",
   "errorWhileActivatingCard": "We couldn't activate your Flexcard:",
@@ -166,7 +166,7 @@
   "emptyTargetData": "The Target Name is empty. Check your Experience Cloud site configuration",
   "manualInterventionForExperienceSiteAsFailure": "We couldn’t process the %s component.",
   "manualInterventionForExperienceSiteAsDuplicateKey": "We couldn’t process the %s component because a duplicate key was found.",
-  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because of the error %s in the Experience Cloud site configuration.",
+  "manualInterventionForExperienceSiteConfiguration": "We couldn’t process the %s Experience site because of error in the Experience Cloud site configuration.",
   "updatingStorageForOmniscipt": "Preparing storage for Omniscripts %s",
   "keyAlreadyInStorage": "The %s %s name already exists in storage.",
   "flexcardStorageProcessingStarted": "Preparing storage for Flexcards.",

src/commands/omnistudio/migration/migrate.ts

@@ -227,11 +227,6 @@ export default class Migrate extends OmniStudioBaseCommand {
     if (!migrateOnly) {
       await postMigrate.executeTasks(namespace, actionItems);
     }
-    // From here also actionItems need to be collected
-    await postMigrate.restoreExperienceAPIMetadataSettings(
-      isExperienceBundleMetadataAPIProgramaticallyEnabled,
-      actionItems
-    );
 
     const migrationActionItems = this.collectActionItems(objectMigrationResults);
     actionItems = [...actionItems, ...migrationActionItems];

src/error/errorInterfaces.ts

@@ -28,3 +28,14 @@ export class TargetPropertyNotFoundError extends Error {
     this.componentName = componentName;
   }
 }
+
+export class ProcessingError extends Error {
+  public componentType: string;
+  public key: string;
+
+  public constructor(key: string, componentType: string) {
+    super(`Key ${key} can not be processed`);
+    this.key = key;
+    this.componentType = componentType;
+  }
+}

src/migration/related/ExperienceSiteMigration.ts

@@ -441,7 +441,8 @@ export class ExperienceSiteMigration extends BaseRelatedObjectMigration {
     // Look up in osStandardStorage using the object key
     const targetDataFromStorage: OmniScriptStorage = StorageUtil.getStandardOmniScript(storage, lookupKey);
 
-    if (this.shouldAddWarning(targetDataFromStorage)) {
+    if (targetDataFromStorage === undefined || targetDataFromStorage.migrationSuccess === false) {
+      // For the standard wrapper we only need to check the storage empty and migrationSuccess status
       const originalKey = `${currentType}_${currentSubType}_${currentLanguage}`;
       const warningMsg: string = this.getWarningMessage(originalKey, targetDataFromStorage);
       experienceSiteAssessmentInfo.warnings.push(warningMsg);

src/migration/related/FlexipageMigration.ts

@@ -16,7 +16,12 @@ import { XMLUtil } from '../../utils/XMLUtil';
 import { FileDiffUtil } from '../../utils/lwcparser/fileutils/FileDiffUtil';
 import { transformFlexipageBundle } from '../../utils/flexipage/flexiPageTransformer';
 import { Flexipage } from '../interfaces';
-import { DuplicateKeyError, KeyNotFoundInStorageError, TargetPropertyNotFoundError } from '../../error/errorInterfaces';
+import {
+  DuplicateKeyError,
+  KeyNotFoundInStorageError,
+  ProcessingError,
+  TargetPropertyNotFoundError,
+} from '../../error/errorInterfaces';
 import { BaseRelatedObjectMigration } from './BaseRealtedObjectMigration';
 
 /**
@@ -129,7 +134,7 @@ export class FlexipageMigration extends BaseRelatedObjectMigration {
         if (error instanceof KeyNotFoundInStorageError) {
           errors.add(`${error.componentType} ${error.key} can't be migrated`);
           status = mode === 'assess' ? 'Needs manual intervention' : 'Skipped';
-        } else if (error instanceof TargetPropertyNotFoundError) {
+        } else if (error instanceof TargetPropertyNotFoundError || error instanceof ProcessingError) {
           errors.add(error.message);
           status = mode === 'assess' ? 'Needs manual intervention' : 'Skipped';
         } else if (error instanceof DuplicateKeyError) {

src/utils/flexipage/flexiPageTransformer.ts

@@ -5,7 +5,12 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { DuplicateKeyError, KeyNotFoundInStorageError, TargetPropertyNotFoundError } from '../../error/errorInterfaces';
+import {
+  DuplicateKeyError,
+  KeyNotFoundInStorageError,
+  ProcessingError,
+  TargetPropertyNotFoundError,
+} from '../../error/errorInterfaces';
 import {
   Flexipage,
   FlexiComponentInstanceProperty,
@@ -177,6 +182,10 @@ function createNewPropsForOmniScript(
     throw new KeyNotFoundInStorageError(nameKey, 'Omniscript');
   }
 
+  if (!migratedScriptName.migrationSuccess) {
+    throw new ProcessingError(nameKey, 'Omniscript');
+  }
+
   if (migratedScriptName.isDuplicate) {
     throw new DuplicateKeyError(nameKey, 'Omniscript');
   }
@@ -215,6 +224,10 @@ function createNewPropsForFlexCard(
     throw new KeyNotFoundInStorageError(nameKey, 'Flexcard');
   }
 
+  if (!migratedCardName.migrationSuccess) {
+    throw new ProcessingError(nameKey, 'Flexcard');
+  }
+
   if (migratedCardName.isDuplicate) {
     throw new DuplicateKeyError(nameKey, 'Flexcard');
   }
@@ -253,8 +266,14 @@ function createNewPropsForStandardOmniScript(
   // Look up in osStandardStorage using the object key
   const targetDataFromStorage: OmniScriptStorage | undefined = StorageUtil.getStandardOmniScript(storage, lookupKey);
 
+  const nameKey = `${currentType}_${currentSubType}_${currentLanguage}`;
+
   if (!targetDataFromStorage) {
-    throw new KeyNotFoundInStorageError(`${currentType}_${currentSubType}_${currentLanguage}`, 'Omniscript');
+    throw new KeyNotFoundInStorageError(nameKey, 'Omniscript');
+  }
+
+  if (!targetDataFromStorage.migrationSuccess) {
+    throw new ProcessingError(nameKey, 'Omniscript');
   }
 
   // Return the new properties
@@ -287,6 +306,10 @@ function createNewPropsForStandardFlexCard(
     throw new DuplicateKeyError(currentFlexCardName, 'Flexcard');
   }
 
+  if (!targetDataFromStorage.migrationSuccess) {
+    throw new ProcessingError(currentFlexCardName, 'Flexcard');
+  }
+
   if (targetDataFromStorage.error) {
     throw new Error(targetDataFromStorage.error.join('\n\n'));
   }