Merge branch 'prerelease/develop-ga' into u/kkurri/W-19081579

Author: sf-kishore-kurri

messages/assess.json

@@ -42,7 +42,7 @@
   "errorDuringFlexCardAssessment": "Error during FlexCard assessment",
   "errorDuringOmniScriptAssessment": "Error during Omniscript assessment",
   "errorDuringGlobalAutoNumberAssessment": "Error during GlobalAutoNumber assessment",
-  "processingFlexCard": "Processing FlexCards: %s",
+  "processingFlexCard": "Processing Flexcards: %s",
   "processingDataRaptor": "Processing Data Mappers: %s",
   "processingOmniScript": "Processing Omniscripts: %s",
   "processingGlobalAutoNumber": "Processing Omni Global Auto Numbers: %s",
@@ -60,9 +60,9 @@
   "allVersionsFlagInfo": "All versions: %s",
   "assessedDataRaptorsCount": "Assessed %s Data Mappers",
   "dataRaptorAssessmentCompleted": "Data Mappers assessment completed",
-  "flexCardAssessment": "FlexCard Assessment",
-  "assessedFlexCardsCount": "Assessed %s FlexCards",
-  "flexCardAssessmentCompleted": "FlexCard assessment completed",
+  "flexCardAssessment": "Flexcards Assessment",
+  "assessedFlexCardsCount": "Assessed %s Flexcards",
+  "flexCardAssessmentCompleted": "Flexcards assessment completed",
   "globalAutoNumberAssessment": "GlobalAutoNumber Assessment",
   "assessedGlobalAutoNumbersCount": "Assessed %s GlobalAutoNumbers",
   "globalAutoNumberAssessmentCompleted": "The assessment for Omni Global Auto Number is complete.",
@@ -195,7 +195,6 @@
   "dataMapperNamePrefixedWithDM": "DataMapper name '%s' starts with a number. Prefixing with 'DM_' to create valid name: %s",
   "integrationProcedureTypeEmptyAfterCleaning": "Integration Procedure Type '%s' becomes empty after name cleaning. Please provide a valid Type value.",
   "integrationProcedureSubtypeEmptyAfterCleaning": "Integration Procedure SubType '%s' becomes empty after name cleaning. Please provide a valid SubType value.",
-  "invalidTypeAssessErrorMessage": "We couldn't assess your Omnistudio components in the %s namespace. Select the correct namespace and try again",
   "apexFileAlreadyHasCallMethod": "File %s already has call method, thus keeping the existing call method intact",
   "errorFetchingCustomLabels": "Error fetching custom labels: %s",
   "customLabelAssessmentSummary": "Custom Label with same name and different value is already exist without namespace.",
@@ -206,5 +205,7 @@
   "manualDeploymentSteps": "<a href='%s' target='_blank'>Please refer to this documentation for manual deployment process</a>",
   "varDeclarationUpdated": "Variable initialization will be updated for target name",
   "ipNameUpdateFailed": "IP reference %s can’t be updated",
-  "dmNameUpdateFailed": "DM reference %s can’t be updated"
+  "dmNameUpdateFailed": "DM reference %s can’t be updated",
+  "invalidTypeAssessErrorMessage": "We couldn't assess your Omnistudio components in the %s namespace. Select the correct namespace and try again",
+  "assessmentSuccessfulMessage": "Migration assessment for org %s is complete and reports are ready for review in the folder %s"
 }

messages/migrate.json

@@ -70,7 +70,7 @@
   "migrationFailed": "Migration failed: %s",
   "formulaSyntaxError": "There was some problem while updating the formula syntax, please check the all the formula's syntax once : %s",
   "foundDataRaptorsToMigrate": "Found %s Data Mappers to migrate",
-  "foundFlexCardsToMigrate": "Found %s FlexCards to migrate",
+  "foundFlexCardsToMigrate": "Found %s Flexcards to migrate",
   "foundOmniScriptsToMigrate": "Found %s %s to migrate",
   "foundGlobalAutoNumbersToMigrate": "Found %s GlobalAutoNumbers to migrate",
   "foundCustomLabelsToMigrate": "Found %s Custom Labels to migrate",
@@ -133,15 +133,15 @@
   "flexipagesWithChanges": "Found %s FlexiPages with changes",
   "omniGlobalAutoNumberPrefEnabled": "Successfully enabled OmniGlobalAutoNumberPref org preference",
   "errorEnablingOmniGlobalAutoNumberPref": "We couldn't enable the Omni Global Auto Number setting. Turn on the Omni Global Auto Number setting manually, and try again. See <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_standard_global_auto_number.htm&type=5' target='_blank'>Set Up Omni Global Auto Number</a>.",
-  "performingPreMigrationChecks": "Performing pre-migration checks for Omni Global Auto Number...",
+  "performingPreMigrationChecks": "Performing pre-migration checks for Omni Global Auto Number",
   "preMigrationChecksPassed": "Pre-migration checks passed. Proceeding with Omni Global Auto Number migration.",
   "preMigrationChecksFailed": "Pre-migration checks failed. Migration cannot proceed.",
   "globalAutoNumberPrefEnabledError": "The Omni Global Auto Number setting is enabled and global auto numbers have already been migrated.",
   "bothRollbackFlagsEnabledError": "We couldn't turn on Omni Global Auto Number. Disable the RollBackDRChanges and RollBackIPChanges <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_standard_global_auto_number.htm&type=5' target='_blank'>Omni Interaction Configurations</a>, and try again.",
   "rollbackIPFlagEnabledError": "We couldn't turn on Omni Global Auto Number. Disable the RollBackIPChanges <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_standard_global_auto_number.htm&type=5' target='_blank'>Omni Interaction Configurations</a> and try again.",
   "rollbackDRFlagEnabledError": "We couldn't turn on Omni Global Auto Number. Disable the RollBackDRChanges <a href='https://help.salesforce.com/s/articleView?id=xcloud.os_standard_global_auto_number.htm&type=5' target='_blank'>Omni Interaction Configurations</a> and try again.",
   "errorCheckingRollbackFlags": "Error checking rollback flags status.",
-  "startingPostMigrationCleanup": "Starting post-migration cleanup for Omni Global Auto Number...",
+  "startingPostMigrationCleanup": "Starting post-migration cleanup for Omni Global Auto Number",
   "postMigrationCleanupCompleted": "Post-migration cleanup completed successfully.",
   "errorDuringPostMigrationCleanup": "We’ve encountered an error during the post-migration cleanup. Try again later.",
   "duplicatedGlobalAutoNumberName": "Duplicated Omni Global Auto Number name",
@@ -217,7 +217,7 @@
   "flexCardWithAngularOmniScriptWarning": "FlexCard has dependencies on Angular Omniscript(s) which are not migrated. Please convert Omniscript(s) to LWC before migrating this FlexCard.",
   "angularOmniScriptDependencyWarning": "Element '%s' references Angular Omniscript '%s' which will not be migrated. Consider converting the referenced Omniscript to LWC",
   "skipFlexcardAngularOmniScriptDependencyWarning": "Skipping FlexCard %s due to Angular Omniscript dependencies",
-  "flexCardMigrationProcessingMessage": "Processing %s FlexCards for migration (%s skipped due to Angular dependencies)",
+  "flexCardMigrationProcessingMessage": "Processing %s Flexcards for migration (%s skipped due to Angular dependencies)",
   "noMetadataToDeploy": "No metadata to deploy",
   "missingMandatoryField": "Missing mandatory field: %s for %s",
   "dataMapperMigrationFailed": "DataMapper migration failed for: %s",
@@ -268,5 +268,6 @@
   "errorFetchingCustomLabels": "Error fetching custom labels: %s",
   "customLabelAssessmentSummary": "Custom Label with same name and different value is already exist without namespace.",
   "generatedCustomLabelAssessmentReportPage": "Generated custom label assessment report page %s of %s with %s labels",
-  "varDeclarationUpdated": "Variable initialization has been updated for target name"
+  "varDeclarationUpdated": "Variable initialization has been updated for target name",
+  "migrationSuccessfulMessage": "Migration process for org %s is complete and reports are ready for review in the folder %s"
 }

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/plugin-omnistudio-migration-tool",
   "description": "This SFDX plugin migrates FlexCard, OmniScript, DataRaptor, and Integration Procedure custom objects to standard objects.",
-  "version": "2.0.0-rc.38",
+  "version": "2.0.0-rc.39",
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {

src/commands/omnistudio/migration/assess.ts

@@ -1,3 +1,4 @@
+import path from 'path';
 import * as os from 'os';
 import { flags } from '@salesforce/command';
 import { Messages, Connection } from '@salesforce/core';
@@ -202,6 +203,13 @@ export default class Assess extends OmniStudioBaseCommand {
       messages,
       userActionMessages
     );
+    Logger.log(
+      messages.getMessage('assessmentSuccessfulMessage', [
+        orgs.orgDetails?.Id,
+        path.join(process.cwd(), Constants.AssessmentReportsFolderName),
+      ])
+    );
+
     return assesmentInfo;
   }
 

src/commands/omnistudio/migration/migrate.ts

@@ -7,6 +7,7 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
+import path from 'path';
 import * as os from 'os';
 import { flags } from '@salesforce/command';
 import { Connection, Messages } from '@salesforce/core';
@@ -241,7 +242,12 @@ export default class Migrate extends OmniStudioBaseCommand {
       actionItems,
       objectsToProcess
     );
-
+    Logger.log(
+      messages.getMessage('migrationSuccessfulMessage', [
+        orgs.orgDetails?.Id,
+        path.join(process.cwd(), Constants.MigrationReportsFolderName),
+      ])
+    );
     // Return results needed for --json flag
     return { objectMigrationResults: [] };
   }

src/javascripts/reportGeneratorUtility.js

@@ -11,9 +11,35 @@ function toggleFilterDropdown(tableId) {
   }
 }
 
-function toggleDiffModal(name) {
-  const modal = document.getElementById(`myModal_${name}`);
-  modal.style.display = modal.style.display === 'none' ? 'flex' : 'none';
+function closeFilterDropdown(tableId) {
+  const reportTable = document.getElementById(tableId);
+  if (!reportTable) return;
+
+  const dropdown = reportTable.querySelector('#filter-dropdown');
+  const chevronUp = reportTable.querySelector('#chevron-up');
+  const chevronDown = reportTable.querySelector('#chevron-down');
+
+  if (dropdown && dropdown.classList.contains('show')) {
+    dropdown.classList.remove('show');
+    if (chevronUp) chevronUp.classList.add('hidden');
+    if (chevronDown) chevronDown.classList.remove('hidden');
+  }
+}
+
+function closeAllFilterDropdowns() {
+  const openDropdowns = document.querySelectorAll('.filter-dropdown.show');
+
+  openDropdowns.forEach((dropdown) => {
+    dropdown.classList.remove('show');
+    // Find and update chevron icons
+    const container = dropdown.closest('.filter-dropdown-container') || dropdown.parentElement;
+    if (container) {
+      const chevronUp = container.querySelector('#chevron-up');
+      const chevronDown = container.querySelector('#chevron-down');
+      if (chevronUp) chevronUp.classList.add('hidden');
+      if (chevronDown) chevronDown.classList.remove('hidden');
+    }
+  });
 }
 
 function toggleDiffModal(name) {
@@ -171,6 +197,40 @@ document.addEventListener('DOMContentLoaded', () => {
       });
     });
   });
+
+  // Attach filter dropdown event listeners after DOM is loaded
+  // Close panel and filter dropdown on escape key
+  document.addEventListener('keydown', function (event) {
+    if (event.key === 'Escape' || event.keyCode === 27) {
+      event.preventDefault();
+
+      try {
+        closeCtaPanel();
+      } catch (error) {
+        // Silently handle error if CTA panel elements don't exist
+      }
+
+      try {
+        closeAllFilterDropdowns();
+      } catch (error) {
+        // Silently handle error if filter dropdown elements don't exist
+      }
+    }
+  });
+
+  // Close filter dropdown when clicking outside
+  document.addEventListener('click', function (event) {
+    // Find all open filter dropdowns
+    document.querySelectorAll('.filter-dropdown.show').forEach((dropdown) => {
+      const reportTable = dropdown.closest('.rpt-table-container');
+      const filterButton = reportTable?.querySelector('.filter-toggle-button');
+
+      // Check if click was outside the dropdown and not on the filter button
+      if (reportTable && !dropdown.contains(event.target) && !filterButton?.contains(event.target)) {
+        closeFilterDropdown(reportTable.id);
+      }
+    });
+  });
 });
 
 function openReport(ele) {
@@ -182,30 +242,33 @@ function toggleCtaPanel() {
   const panel = document.getElementById('ctaPanel');
   const overlay = document.getElementById('overlay');
 
-  if (panel.classList.contains('open')) {
-    closeCtaPanel();
-  } else {
-    panel.classList.add('open');
-    overlay.classList.add('open');
+  // Only try to toggle if elements exist
+  if (panel && overlay) {
+    if (panel.classList.contains('open')) {
+      closeCtaPanel();
+    } else {
+      panel.classList.add('open');
+      overlay.classList.add('open');
+    }
   }
 }
 
 function closeCtaPanel() {
   const panel = document.getElementById('ctaPanel');
   const overlay = document.getElementById('overlay');
 
-  panel.classList.remove('open');
-  overlay.classList.remove('open');
-}
-
-// Close panel on escape key
-document.addEventListener('keydown', function (event) {
-  if (event.key === 'Escape') {
-    closeCtaPanel();
+  // Only try to close if elements exist
+  if (panel) {
+    panel.classList.remove('open');
   }
-});
+  if (overlay) {
+    overlay.classList.remove('open');
+  }
+}
 
 // Expose globally so HTML inline event handlers can access them
 window.toggleFilterDropdown = toggleFilterDropdown;
+window.closeFilterDropdown = closeFilterDropdown;
+window.closeAllFilterDropdowns = closeAllFilterDropdowns;
 window.filterAndSearchTable = filterAndSearchTable;
 window.toggleCtaSummaryPanel = toggleCtaSummaryPanel;

src/utils/constants/stringContants.ts

@@ -27,4 +27,8 @@ export const Constants = {
   ApexComponentName: 'Apex Classes',
   CustomLabelComponentName: 'Custom Label',
   CustomLabelPluralName: 'Custom Labels',
+
+  // artifacts persistance folder names
+  AssessmentReportsFolderName: 'assessment_reports',
+  MigrationReportsFolderName: 'migration_report',
 };

src/utils/resultsbuilder/OSAssessmentReporter.ts

@@ -263,7 +263,7 @@ export class OSAssessmentReporter {
     const distinctStatuses = [...new Set(OSAssessmentInfos.map((info) => info.migrationStatus))];
     const statusFilterGroupParam: FilterGroupParam[] =
       distinctStatuses.length > 0 && distinctStatuses.filter((status) => status).length > 0
-        ? [createFilterGroupParam('Filter By Status', 'status', distinctStatuses)]
+        ? [createFilterGroupParam('Filter By Assessment Status', 'status', distinctStatuses)]
         : [];
 
     return [...typeFilterGroupParam, ...statusFilterGroupParam];

src/utils/resultsbuilder/assessmentReporter.ts

@@ -25,7 +25,7 @@ import { ExperienceSiteAssessmentReporter } from './ExperienceSiteAssessmentRepo
 import { CustomLabelAssessmentReporter } from './CustomLabelAssessmentReporter';
 
 export class AssessmentReporter {
-  private static basePath = path.join(process.cwd(), 'assessment_reports');
+  private static basePath = path.join(process.cwd(), Constants.AssessmentReportsFolderName);
   private static omniscriptAssessmentFileName = 'omniscript_assessment.html';
   private static flexcardAssessmentFileName = 'flexcard_assessment.html';
   private static integrationProcedureAssessmentFileName = 'integration_procedure_assessment.html';

src/utils/resultsbuilder/index.ts

@@ -32,7 +32,8 @@ import { Logger } from '../logger';
 import { getMigrationHeading } from '../stringUtils';
 import { Constants } from '../constants/stringContants';
 import { CustomLabelMigrationInfo, CustomLabelMigrationReporter } from './CustomLabelMigrationReporter';
-const resultsDir = path.join(process.cwd(), 'migration_report');
+
+const resultsDir = path.join(process.cwd(), Constants.MigrationReportsFolderName);
 const migrationReportHTMLfileName = 'dashboard.html';
 const flexipageFileName = 'flexipage.html';
 const templateDir = 'templates';