Merge pull request #393 from sf-kishore-kurri/u/kkurri/W-19268842

feat: @W-19268842 : Feedback and filter pop up issue

Author: snehaljha-sf

messages/assess.json

@@ -1,10 +1,11 @@
 {
   "examples": [
-    "omnistudio:migration:assess -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE",
-    "omnistudio:migration:assess -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE --only=dr",
-    "omnistudio:migration:assess -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE --only=ip",
-    "omnistudio:migration:assess -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE --only=os",
-    "omnistudio:migration:assess -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE --only=fc"
+    "omnistudio:migration:assess -u [email protected]",
+    "omnistudio:migration:assess -u [email protected] --only=dm",
+    "omnistudio:migration:assess -u [email protected] --only=ip",
+    "omnistudio:migration:assess -u [email protected] --only=os",
+    "omnistudio:migration:assess -u [email protected] --only=fc",
+    "omnistudio:migration:assess -u [email protected] -r apex"
   ],
   "commandDescription": "Assess migration of omnistudio components from custom objects to standard objects",
   "namespaceFlagDescription": "The namespaced of the package",
@@ -42,27 +43,27 @@
   "processingFlexCard": "Processing FlexCard: %s",
   "processingDataRaptor": "Processing DataMapper: %s",
   "processingOmniScript": "Processing OmniScript: %s",
-  "foundDataRaptorsToAssess": "Found %s DataMappers to assess",
+  "foundDataRaptorsToAssess": "Found %s Data Mappers to assess",
   "foundOmniScriptsToAssess": "Found %s %s to assess",
-  "startingDataRaptorAssessment": "Starting DataMappers assessment",
+  "startingDataRaptorAssessment": "Starting Data Mappers assessment",
   "startingOmniScriptAssessment": "Starting %s assessment",
   "allVersionsInfo": "allVersions : %s",
   "assessmentInitialization": "Assessment Initialization: Using namespace: %s",
   "apiVersionInfo": "API Version: %s",
   "assessmentTargets": "Assessment targets: %s",
   "relatedObjectsInfo": "Related objects: %s",
   "allVersionsFlagInfo": "All versions: %s",
-  "assessedDataRaptorsCount": "Assessed %s DataMappers",
-  "dataRaptorAssessmentCompleted": "DataMappers assessment completed",
-  "flexCardAssessment": "FlexCard Assessment",
-  "assessedFlexCardsCount": "Assessed %s FlexCards",
-  "flexCardAssessmentCompleted": "FlexCard assessment completed",
+  "assessedDataRaptorsCount": "Assessed %s Data Mappers",
+  "dataRaptorAssessmentCompleted": "Data Mappers assessment completed",
+  "flexCardAssessment": "Flexcards Assessment",
+  "assessedFlexCardsCount": "Assessed %s Flexcards",
+  "flexCardAssessmentCompleted": "Flexcards assessment completed",
   "omniScriptAssessment": "%s Assessment",
   "assessedOmniScriptsCount": "Assessed %s OmniScripts",
   "assessedIntegrationProceduresCount": "Assessed %s Integration Procedures",
   "omniScriptAssessmentCompleted": "%s assessment completed",
-  "startingFlexCardAssessment": "Starting FlexCard assessment",
-  "foundFlexCardsToAssess": "Found %s FlexCards to assess",
+  "startingFlexCardAssessment": "Starting Flexcards assessment",
+  "foundFlexCardsToAssess": "Found %s Flexcards to assess",
   "startingApexAssessment": "Starting Apex assessment in project path: %s",
   "processingApexFilesForAssessment": "Processing Apex files for assessment",
   "successfullyProcessedApexFilesForAssessment": "Successfully processed %s Apex files for assessment",
@@ -116,5 +117,6 @@
   "errorGeneratingHTML": "Error while generating HTML from template for %s with properties %s",
   "unexpectedError": "Unexpected Assessment error",
   "errorEvaluatingExpression": "Error evaluating expression: %s, %s",
-  "invalidTypeAssessErrorMessage": "We couldn't assess your Omnistudio components in the %s namespace. Select the correct namespace and try again"
+  "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

@@ -1,20 +1,18 @@
 {
   "examples": [
-    "omnistudio:migration:migrate -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE",
-    "omnistudio:migration:migrate -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE --only=dr",
-    "omnistudio:migration:migrate -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE --only=ip",
-    "omnistudio:migration:migrate -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE --only=os",
-    "omnistudio:migration:migrate -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE --only=fc",
-    "omnistudio:migration:migrate -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE -r apex,lwc",
-    "omnistudio:migration:migrate -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE -r apex",
-    "omnistudio:migration:migrate -u [email protected] --namespace=YOUR_PACKAGE_NAMESPACE -r lwc"
+    "omnistudio:migration:migrate -u [email protected]",
+    "omnistudio:migration:migrate -u [email protected] --only=dm",
+    "omnistudio:migration:migrate -u [email protected] --only=ip",
+    "omnistudio:migration:migrate -u [email protected] --only=os",
+    "omnistudio:migration:migrate -u [email protected] --only=fc",
+    "omnistudio:migration:migrate -u [email protected] -r apex"
   ],
   "commandDescription": "Migrate omnistudio components from custom objects to standard objects",
   "namespaceFlagDescription": "The namespace of the package",
   "apiVersionFlagDescription": "The Salesforce API version to use",
   "errorNoOrgResults": "No results found for the org '%s'.",
-  "onlyFlagDescription": "Migrate a single element: os | ip | fc | dr",
-  "invalidOnlyFlag": "Invalid flag, valid options are: os | ip | fc | dr",
+  "onlyFlagDescription": "Migrate a single element: os | ip | fc | dm",
+  "invalidOnlyFlag": "Invalid flag, valid options are: os | ip | fc | dm",
   "couldNotDeactivateOmniProcesses": "Could not deactivate current OmniProcesses",
   "couldNotTruncate": "Could not truncate %s",
   "couldNotTruncateOmnniProcess": "Could not truncate OmniProcess. Please make sure your OS/IP is not referenced in an OmniScrirpt or Flex Card.",
@@ -114,7 +112,8 @@
   "labelStatusFailed": "Failed",
   "labelStatusComplete": "Complete",
   "migrationConsentNotGiven": "Couldn't confirm whether assessment errors are resolved",
-  "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?",
+  "migrationConsentMessage": "Make sure that all records listed in the Assessment Status column in the Assessment Report are marked as Ready for migration before proceeding with the migration. Do you want to proceed? Yes or No?",
   "truncationFailed": "Truncation failed for %s: %s",
-  "invalidTypeMigrateErrorMessage": "We couldn't migrate your Omnistudio components in the %s namespace. Select the correct namespace and try again"
+  "invalidTypeMigrateErrorMessage": "We couldn't migrate your Omnistudio components in the %s namespace. Select the correct namespace and try again",
+  "migrationSuccessfulMessage": "Migration process for org %s is complete and reports are ready for review in the folder %s"
 }

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';
@@ -155,6 +156,12 @@ export default class Assess extends OmniStudioBaseCommand {
       Logger.log((error as Error).stack);
     }
     await AssessmentReporter.generate(assesmentInfo, conn.instanceUrl, orgs, assessOnly, objectsToProcess, messages);
+    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 { Messages } from '@salesforce/core';
@@ -198,7 +199,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) {
@@ -153,6 +179,40 @@ document.addEventListener('DOMContentLoaded', () => {
   document.querySelectorAll('.rpt-table-container').forEach((tableContainer) => {
     filterAndSearchTable(tableContainer.id);
   });
+
+  // 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) {
@@ -164,30 +224,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/migration/dataraptor.ts

@@ -302,7 +302,7 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
     }
     if (existingDataRaptorNames.has(existingDRNameVal.cleanName())) {
       warnings.push(this.messages.getMessage('duplicatedName') + '  ' + existingDRNameVal.cleanName());
-      assessmentStatus = 'Need Manual Intervention';
+      assessmentStatus = 'Needs Manual Intervention';
     } else {
       existingDataRaptorNames.add(existingDRNameVal.cleanName());
     }

src/migration/flexcard.ts

@@ -192,7 +192,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
     // Check for duplicate names
     if (uniqueNames.has(cleanedName)) {
       flexCardAssessmentInfo.warnings.push(this.messages.getMessage('duplicateCardNameMessage', [cleanedName]));
-      assessmentStatus = 'Need Manual Intervention';
+      assessmentStatus = 'Needs Manual Intervention';
     }
     uniqueNames.add(cleanedName);
 
@@ -260,7 +260,7 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
           flexCardAssessmentInfo.warnings.push(
             this.messages.getMessage('integrationProcedureManualUpdateMessage', [originalIpMethod])
           );
-          flexCardAssessmentInfo.migrationStatus = 'Need Manual Intervention';
+          flexCardAssessmentInfo.migrationStatus = 'Needs Manual Intervention';
         }
       }
     } else if (dataSource.type === Constants.ApexRemoteComponentName) {

src/migration/omniscript.ts

@@ -291,7 +291,7 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
         let migrationStatus = 'Ready for migration';
         if (type === 'Angular') {
           omniAssessmentInfo.warnings.unshift(this.messages.getMessage('angularOSWarning'));
-          migrationStatus = 'Need Manual Intervention';
+          migrationStatus = 'Needs Manual Intervention';
         }
         const osAssessmentInfo: OSAssessmentInfo = {
           name: omniAssessmentInfo.name,

src/templates/assessmentReport.template

@@ -39,7 +39,6 @@
           <div class="report-page-header">
             <div class="slds-text-heading_large">
               <span>{{heading}}</span>
-              <span>&nbsp;Assessment Report</span>
             </div>
           </div>
 

src/utils/constants/stringContants.ts

@@ -17,4 +17,8 @@ export const Constants = {
   DataRaptorComponentName: 'DataRaptor',
   DataRaptorPluralName: 'DataRaptors',
   ApexRemoteComponentName: 'ApexRemote',
+
+  // artifacts persistance folder names
+  AssessmentReportsFolderName: 'assessment_reports',
+  MigrationReportsFolderName: 'migration_report',
 };