Merge pull request #439 from sf-aastha-paruthi/u/aparuthi/TestingIteration01Fix

@W-19821896 Testing fixes

Author: sf-aastha-paruthi

src/commands/omnistudio/migration/migrate.ts

@@ -180,17 +180,14 @@ export default class Migrate extends OmniStudioBaseCommand {
     const debugTimer = DebugTimer.getInstance();
     // We need to truncate the standard objects first (in reverse order for cleanup)
     let objectMigrationResults;
-    const IS_STANDARD_DATA_MODEL = isStandardDataModel();
 
-    if (!IS_STANDARD_DATA_MODEL) {
-      objectMigrationResults = await this.truncateObjects([...migrationObjects].reverse(), debugTimer);
-      const allTruncateComplete = objectMigrationResults.length === 0;
+    objectMigrationResults = await this.truncateObjects([...migrationObjects].reverse(), debugTimer);
+    const allTruncateComplete = objectMigrationResults.length === 0;
 
-      // Log truncation errors if any exist
-      if (!allTruncateComplete) {
-        this.logTruncationErrors(objectMigrationResults);
-        return;
-      }
+    // Log truncation errors if any exist
+    if (!allTruncateComplete) {
+      this.logTruncationErrors(objectMigrationResults);
+      return;
     }
 
     objectMigrationResults = await this.migrateObjects(migrationObjects, debugTimer, namespace);

src/javascripts/reportGeneratorUtility.js

@@ -318,7 +318,7 @@ function applySingleColumnFreeze(table, headerCell, columnWidth = 180) {
   // Default to 180px for Custom Labels, but can be overridden for other reports
 
   // Apply styles to first header cell
-  applyStickyStyles(headerCell, columnWidth, 0, 20, '#f3f3f3', true);
+  applyStickyStyles(headerCell, columnWidth, 0, 50, '#f3f3f3', true);
 
   // Ensure all other header cells in both rows are NOT sticky
   const thead = table.querySelector('thead');
@@ -336,17 +336,19 @@ function applySingleColumnFreeze(table, headerCell, columnWidth = 180) {
   if (tbody) {
     const rows = tbody.querySelectorAll('tr');
     rows.forEach((row) => {
-      const firstCell = row.querySelector('td:first-child');
+      // Use key="name" selector to handle rowspan correctly
+      const firstCell = row.querySelector('td[key="name"]');
       if (firstCell) {
-        applyStickyStyles(firstCell, columnWidth, 0, 10, '#fff', true);
+        applyStickyStyles(firstCell, columnWidth, 0, 30, '#fff', true);
       }
     });
 
     // Ensure all other columns are NOT sticky
     rows.forEach((row) => {
       const cells = Array.from(row.querySelectorAll('td'));
-      cells.forEach((cell, index) => {
-        if (index > 0) {
+      cells.forEach((cell) => {
+        // Remove sticky from any cell that's NOT the name column
+        if (cell.getAttribute('key') !== 'name') {
           removeStickyStyles(cell);
         }
       });
@@ -355,14 +357,14 @@ function applySingleColumnFreeze(table, headerCell, columnWidth = 180) {
     // Add hover effect for first column
     rows.forEach((row) => {
       row.addEventListener('mouseenter', () => {
-        const firstCell = row.querySelector('td:first-child');
+        const firstCell = row.querySelector('td[key="name"]');
         if (firstCell) {
           firstCell.style.setProperty('background-color', '#f3f3f3', 'important');
         }
       });
 
       row.addEventListener('mouseleave', () => {
-        const firstCell = row.querySelector('td:first-child');
+        const firstCell = row.querySelector('td[key="name"]');
         if (firstCell) {
           firstCell.style.setProperty('background-color', '#fff', 'important');
         }
@@ -419,7 +421,7 @@ function applyMultiColumnHeaderFreeze(firstHeaderCell, secondRow, colspan, baseC
       // Freeze this column
       const columnWidth = i === 0 ? firstColumnWidth : baseColumnWidth;
       const isLastFrozen = i === colspan - 1;
-      applyStickyStyles(header, columnWidth, cumulativeLeft, 20, '#f3f3f3', isLastFrozen);
+      applyStickyStyles(header, columnWidth, cumulativeLeft, 50, '#f3f3f3', isLastFrozen);
       cumulativeLeft += columnWidth;
     } else {
       // Ensure non-frozen columns are NOT sticky
@@ -455,7 +457,7 @@ function applyMultiColumnBodyFreeze(tbody, colspan, baseColumnWidth, firstColumn
         // Freeze this column
         const columnWidth = i === 0 ? firstColumnWidth : baseColumnWidth;
         const isLastFrozen = i === colspan - 1;
-        applyStickyStyles(cell, columnWidth, cumulativeLeft, 10, '#fff', isLastFrozen);
+        applyStickyStyles(cell, columnWidth, cumulativeLeft, 30, '#fff', isLastFrozen);
         cumulativeLeft += columnWidth;
       } else {
         // Ensure non-frozen columns are NOT sticky

src/migration/dataraptor.ts

@@ -56,6 +56,9 @@ export class DataRaptorMigrationTool extends BaseMigrationTool implements Migrat
   }
 
   async truncate(): Promise<void> {
+    if (this.IS_STANDARD_DATA_MODEL) {
+      return;
+    }
     await super.truncate(DataRaptorMigrationTool.OMNIDATATRANSFORM_NAME);
   }
 

src/migration/flexcard.ts

@@ -64,6 +64,9 @@ export class CardMigrationTool extends BaseMigrationTool implements MigrationToo
 
   // Perform Delete of OmniUiCard Records to start migration from scratch
   async truncate(): Promise<void> {
+    if (this.IS_STANDARD_DATA_MODEL) {
+      return;
+    }
     const objectName = CardMigrationTool.OMNIUICARD_NAME;
     DebugTimer.getInstance().lap('Truncating ' + objectName);
 

src/migration/omniscript.ts

@@ -118,6 +118,11 @@ export class OmniScriptMigrationTool extends BaseMigrationTool implements Migrat
   }
 
   async truncate(): Promise<void> {
+    // Truncation is needed when we migrate from custom to standard data model, when on custom data model, no truncation is required
+    if (this.IS_STANDARD_DATA_MODEL) {
+      return;
+    }
+
     const objectName = OmniScriptMigrationTool.OMNIPROCESS_NAME;
     const allIds = await this.deactivateRecord(objectName);
     await this.truncateElements(objectName, allIds.os.parents);

src/styles/reportGenerator.css

@@ -322,12 +322,13 @@ body {
 
 .expandModalButton {
   position: absolute;
-  top: 5px;
-  right: 1.5rem;
+  top: 8px;
+  right: 8px;
   width: 30px;
   height: 30px;
   opacity: 0.7;
   display: none;
+  z-index: 10;
 }
 
 .report-wrapper {
@@ -601,9 +602,18 @@ td {
 
 .diff-cell {
   min-width: 30rem;
+  max-width: none !important;
+  padding: 0 !important;
+  overflow: visible !important;
 }
 
-.diff-cell:hover .expandModalButton {
+.diff-content-wrapper {
+  position: relative;
+  display: block;
+  width: 100%;
+}
+
+.diff-content-wrapper:hover .expandModalButton {
   display: block;
 }
 

src/utils/lwcparser/fileutils/FileDiffUtil.ts

@@ -12,7 +12,9 @@ export class FileDiffUtil {
       return '';
     }
     const diffArray: DiffPair[] = JSON.parse(diff) as DiffPair[];
-    let result = '<div style="height: 120px; text-align: left; overflow-x: auto;">';
+    // Wrap everything in a positioned container so button positions correctly within table cell
+    let result = '<div class="diff-content-wrapper">';
+    result += '<div style="height: 120px; text-align: left; overflow-x: auto; padding: 0.5rem;">';
     if (diffArray.length <= 6) {
       result += this.getDiffContent(diff) + '</div>';
     } else {
@@ -30,6 +32,7 @@ export class FileDiffUtil {
         </div>
       </div>`;
     }
+    result += '</div>'; // Close diff-content-wrapper
     return result;
   }
 

src/utils/resultsbuilder/CustomLabelMigrationReporter.ts

@@ -75,6 +75,11 @@ export class CustomLabelMigrationReporter {
   }
 
   public static generateCustomTemplateForPage(page: number, totalPages: number): string {
+    // Don't show pagination if there's only 1 page
+    if (totalPages === 1) {
+      return '';
+    }
+
     // Calculate the range of pages to show around current page
     const range = 2; // Show 2 pages on each side of current page
     const start = Math.max(2, page - range);

src/utils/resultsbuilder/assessmentReporter.ts

@@ -305,7 +305,8 @@ export class AssessmentReporter {
   ): void {
     const pageSize = 1000;
     const totalLabels = customLabels.length;
-    const totalPages = Math.ceil(totalLabels / pageSize);
+    // Always generate at least 1 page, even if there are no labels with issues
+    const totalPages = Math.max(1, Math.ceil(totalLabels / pageSize));
 
     // Generate paginated reports
     for (let page = 1; page <= totalPages; page++) {
@@ -333,7 +334,8 @@ export class AssessmentReporter {
 
   private static getCustomLabelAssessmentFileName(totalLabels: number): string {
     const pageSize = 1000;
-    const totalPages = Math.ceil(totalLabels / pageSize);
+    // Always generate at least 1 page, even if there are no labels with issues
+    const totalPages = Math.max(1, Math.ceil(totalLabels / pageSize));
     return totalPages > 1 ? `customlabel_assessment_Page_1_of_${totalPages}.html` : this.customLabelAssessmentFileName;
   }
 

src/utils/resultsbuilder/index.ts

@@ -113,11 +113,14 @@ export class ResultsBuilder {
     // Determine which rollback flag to use based on component type
     let rollbackFlagNames: string[] = [];
     const componentName = result.name.toLowerCase();
+    const isGlobalAutoNumber =
+      componentName.includes('global auto number') || componentName.includes('globalautonumber');
+
     if (componentName.includes('datamapper') || componentName.includes('data mapper')) {
       rollbackFlagNames = ['RollbackDRChanges'];
     } else if (componentName.includes('omniscript') || componentName.includes('integration procedure')) {
       rollbackFlagNames = ['RollbackOSChanges', 'RollbackIPChanges'];
-    } else if (componentName.includes('global auto number') || componentName.includes('globalautonumber')) {
+    } else if (isGlobalAutoNumber) {
       rollbackFlagNames = ['RollbackDRChanges', 'RollbackIPChanges'];
     }
     const rollbackFlags = orgDetails.rollbackFlags || [];
@@ -134,15 +137,15 @@ export class ResultsBuilder {
       assessmentDate: new Date().toLocaleString(),
       total: result.data?.length || 0,
       filterGroups: [...this.getStatusFilterGroup(result.data?.map((item) => item.status) || [])],
-      headerGroups: [...this.getHeaderGroupsForReport(componentName)],
+      headerGroups: [...this.getHeaderGroupsForReport(componentName, isGlobalAutoNumber)],
       rows: [
         ...(result.data || []).map((item) => ({
           rowId: `${this.rowClass}${this.rowId++}`,
           data: [
             createRowDataParam('id', item.id, false, 1, 1, true, `${instanceUrl}/${item.id}`),
             createRowDataParam('name', item.name, true, 1, 1, false),
-            // Only include migratedId for custom data model
-            ...(isStandardDataModel()
+            // Include migratedId for custom data model OR Global Auto Number
+            ...(isStandardDataModel() && !isGlobalAutoNumber
               ? []
               : [
                   createRowDataParam(
@@ -198,9 +201,12 @@ export class ResultsBuilder {
     fs.writeFileSync(path.join(resultsDir, result.name.replace(/ /g, '_').replace(/\//g, '_') + '.html'), html);
   }
 
-  private static getHeaderGroupsForReport(componentName: string): ReportHeaderGroupParam[] {
+  private static getHeaderGroupsForReport(
+    componentName: string,
+    isGlobalAutoNumber: boolean
+  ): ReportHeaderGroupParam[] {
     const firstRowHeaders = [
-      ...this.getNameHeaders(componentName),
+      ...this.getNameHeaders(componentName, isGlobalAutoNumber),
       { name: 'Status', colspan: 1, rowspan: 2 },
       { name: 'Errors', colspan: 1, rowspan: 2 },
       { name: 'Summary', colspan: 1, rowspan: 2 },
@@ -221,19 +227,18 @@ export class ResultsBuilder {
       { name: nameLabel, colspan: 1, rowspan: 1 },
     ];
 
-    if (isStandardDataModel()) {
+    // Global Auto Number always needs 4 columns (Managed Package + Standard), even in standard data model
+    if (isStandardDataModel() && !isGlobalAutoNumber) {
       return [{ header: firstRowHeaders }, { header: secondRowHeadersForStandard }];
     } else {
       return [{ header: firstRowHeaders }, { header: secondRowHeadersForCustom }];
     }
   }
 
-  private static getNameHeaders(componentName: string): Array<{ name: string; colspan: number; rowspan: number }> {
-    let isGlobalAutoNumber = false;
-    if (componentName.includes('global auto number') || componentName.includes('globalautonumber')) {
-      isGlobalAutoNumber = true;
-    }
-
+  private static getNameHeaders(
+    componentName: string,
+    isGlobalAutoNumber: boolean
+  ): Array<{ name: string; colspan: number; rowspan: number }> {
     if (isStandardDataModel() && !isGlobalAutoNumber) {
       return [{ name: 'Standard', colspan: 3, rowspan: 1 }];
     } else {
@@ -287,7 +292,7 @@ export class ResultsBuilder {
 
     const pageSize = 1000; // Smaller page size for better performance
     const totalLabels = customLabelMigrationInfos.length;
-    const totalPages = Math.ceil(totalLabels / pageSize);
+    const totalPages = Math.max(1, Math.ceil(totalLabels / pageSize));
 
     Logger.logVerbose(messages.getMessage('generatingCustomLabelsReport', [totalLabels, totalPages, pageSize]));
 
@@ -827,7 +832,7 @@ export class ResultsBuilder {
             const totalLabels = result.totalCount || result.data?.length || 0;
             // Use actual processed records for file naming, not total count
             const processedRecords = result.data?.length || 0;
-            const totalPages = Math.ceil(processedRecords / 1000);
+            const totalPages = Math.max(1, Math.ceil(processedRecords / 1000));
             const fileName = totalPages > 1 ? `Custom_Labels_Page_1_of_${totalPages}.html` : 'Custom_Labels.html';
 
             return {