Merge pull request #169 from Accedia/#5288-The-Mitchell-RPA-should-insert-data-in-the-estimate-ordered-according-to-the-Master-Group-list-ordering

gbogomilov · web-flow · commit 77f44738a688 · 2026-01-22T15:19:31.000+02:00
#5288 the mitchell rpa should insert data in the estimate ordered according to the master group list ordering
diff --git a/electron-app/src/constants/ordered_group_ids.ts b/electron-app/src/constants/ordered_group_ids.ts
@@ -0,0 +1,57 @@
+export const ORDERED_GROUP_IDS: string[] = [
+  'frontbumper',
+  'grille',
+  'frontlamps',
+  'radiatorsupport',
+  'cooling',
+  'airconditioningheating',
+  'hood',
+  'fender',
+  'frontinnerstructure',
+  'frame',
+  'electrical',
+  'engine',
+  'enginetransmount',
+  'turbochargerintercooler',
+  'transmissioncooler',
+  'exhaustsystem',
+  'emissionsystem',
+  'wheels',
+  'frontsuspension',
+  'steeringgearlinkage',
+  'steeringcolumn',
+  'steeringwheel',
+  'windshield',
+  'cowl',
+  'cab',
+  'instrumentpanel',
+  'console',
+  'restraintsystem',
+  'seats',
+  'rollbarcomponents',
+  'removabletop',
+  'roof',
+  'pillarsrockerfloor',
+  'frontdoor',
+  'reardoor',
+  'sideloaddoor',
+  'quarterpanel',
+  'sidepanel',
+  'backglass',
+  'pickupbox',
+  'fuelsystem',
+  'rearsuspension',
+  'rearbodyfloor',
+  'decklid',
+  'liftgate',
+  'rearlamps',
+  'rearbumper',
+  'backdoor',
+  'colordocumentation',
+  'specificfasteners',
+  'specificfluids',
+  'stripetape',
+  'vehiclediagnostics',
+  'miscellaneousoperations',
+  'recycledassemblies',
+];
diff --git a/electron-app/src/interfaces/Forgettable.ts b/electron-app/src/interfaces/Forgettable.ts
@@ -16,6 +16,7 @@ export interface Forgettable {
 export interface MitchellForgettable {
   oper: string;
   description?: string;
+  groupId?: string;
   quantity?: string;
   partPrice?: string;
   extPrice?: string;
diff --git a/electron-app/src/main.ts b/electron-app/src/main.ts
@@ -15,6 +15,7 @@ import { FirebaseService, SessionStatus } from './utils/firebase';
 import mitchell_importer from './utils/mitchell_importer';
 import { spawn } from 'child_process';
 import * as os from 'os';
+import { sortForgettablesByGroupId } from './utils/sort_forgettables';
 
 const userHomeDir = os.homedir();
 const fitMitchellCloudPath = path.join(userHomeDir, 'AppData', 'Local', 'FIT-Mitchell_Cloud', 'FIT.bat');
@@ -70,16 +71,22 @@ class Main {
             const bat = spawn(fitMitchellCloudPath, [], { windowsHide: true });
             log.info('here');
             bat.on('error', (code) => {
-              dialog.showErrorBox('Error', `The specified file was not found: ${fitMitchellCloudPath}. Please make sure that file FIT.bat is in the specified directory`);
+              dialog.showErrorBox(
+                'Error',
+                `The specified file was not found: ${fitMitchellCloudPath}. Please make sure that file FIT.bat is in the specified directory`
+              );
               app.quit();
-            })
+            });
             bat.on('close', (code) => {
               log.info(`Child process exited with code ${code}`);
               app.quit();
             });
             return;
           } catch (error) {
-            dialog.showErrorBox('Error', 'The specified file was not found: C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat');
+            dialog.showErrorBox(
+              'Error',
+              'The specified file was not found: C:\\FIT-Mitchell-Cloud-RO-Import-Tool\\FIT.bat'
+            );
           }
         }
         this.finalUrl = url;
@@ -174,6 +181,7 @@ class Main {
       /** Fetch the data. Replace localhost with [::1] because otherwise it does not work */
       url = url.replace('localhost', '[::1]');
       const { data } = await axios.get<ResponseData>(url);
+      console.log(data);
       this.automationIdToFinishRPA = data.automationIdToFinishRPA;
       this.finalUrl = url;
       const existingUrl = store.get('url') as string | null;
@@ -183,6 +191,11 @@ class Main {
       }
       await FirebaseService.setSessionStatus(data.automationId, SessionStatus.APP_STARTED);
 
+      /** Sort forgettables by groupId before processing */
+      if (data.forgettables && data.forgettables.length > 0) {
+        data.forgettables = sortForgettablesByGroupId(data.forgettables);
+      }
+      console.log('Sorted forgettables:', data.forgettables);
       /** Do the population (CCC || Mitchell) */
       if (data.dataSource === 'Mitchell') {
         // await importer.startMitchellPopulation(data, this.windowManager.mainWindow);
diff --git a/electron-app/src/utils/get_custom_protocol_url.ts b/electron-app/src/utils/get_custom_protocol_url.ts
@@ -22,4 +22,4 @@ export const getCustomProtocolUrl = (argv: any): string => {
 //   }
 
 //   return url;
-// };
+// };
diff --git a/electron-app/src/utils/mitchell_importer.ts b/electron-app/src/utils/mitchell_importer.ts
@@ -15,6 +15,7 @@ import { isDev } from './is_dev';
 import { MitchellForgettable } from '../interfaces/Forgettable';
 import { times } from './times_do';
 import { VERIFICATION_PROGRESS_BREAKPOINT } from '../constants/verification_progress_breakpoint';
+import { sortForgettablesByGroupId } from './sort_forgettables';
 
 enum MitchellButtons {
   commitButton = 'COMMIT',
@@ -303,18 +304,22 @@ export class Mitchell_Importer extends Importer {
     forgettables: MitchellForgettable[],
     selectedTypeForCommit: string
   ) => {
+    // Sort forgettables by groupId based on ORDERED_GROUP_IDS
+    const sortedForgettables = sortForgettablesByGroupId(forgettables);
+    console.log('Sorted forgettables:', sortedForgettables);
+
     const hasSelectedItemized = selectedTypeForCommit === 'Itemized';
     const hasSelectedBundled = selectedTypeForCommit === 'Bundled';
     const hasSeletedGrouped = selectedTypeForCommit === 'Grouped';
-    const numberOfInputs = forgettables.length * 8;
+    const numberOfInputs = sortedForgettables.length * 8;
     const percentagePerCell = VERIFICATION_PROGRESS_BREAKPOINT / numberOfInputs;
     this.progressUpdater.setStep(percentagePerCell);
     if (hasSelectedItemized) {
-      await this.populateItemized(forgettables);
+      await this.populateItemized(sortedForgettables);
     } else if (hasSelectedBundled) {
-      await this.populateBundled(forgettables);
+      await this.populateBundled(sortedForgettables);
     } else if (hasSeletedGrouped) {
-      await this.populateGrouped(forgettables);
+      await this.populateGrouped(sortedForgettables);
     }
   };
 
@@ -338,7 +343,6 @@ export class Mitchell_Importer extends Importer {
       await times(4).pressKey(Key.Tab);
       await times(2).pressKey(Key.Down); // Selecting Part Type to be Aftermarket New
 
-
       await keyboard.pressKey(Key.Enter); // Select it
       await keyboard.releaseKey(Key.Enter);
       await snooze(250);
@@ -353,7 +357,7 @@ export class Mitchell_Importer extends Importer {
       await keyboard.releaseKey(Key.LeftShift); // Release Left Shift
       await this.typeMitchellValue(partNumber); // Type Part Number
       this.progressUpdater.update();
-      await snooze(250)
+      await snooze(250);
 
       await this.pressTabButton(1); // Go to Quantity
       // // quantity is sometimes null if its a 0% and no update and it crashesh so we put default 1?
@@ -363,23 +367,22 @@ export class Mitchell_Importer extends Importer {
         await keyboard.type(quantity.toString());
       }
       this.progressUpdater.update();
-      await snooze(250)
-      await keyboard.pressKey(Key.Tab)
-      await keyboard.releaseKey(Key.Tab)
-      await snooze(250)
+      await snooze(250);
+      await keyboard.pressKey(Key.Tab);
+      await keyboard.releaseKey(Key.Tab);
+      await snooze(250);
       // await this.pressTabButton(1); // Go to price
 
       await this.typeMitchellValue(partPrice); // type totalPrice;
       this.progressUpdater.update();
-      await snooze(250)
+      await snooze(250);
 
       await this.pressTabButton(2); // go to (+More) button
       this.progressUpdater.update();
 
       await keyboard.pressKey(Key.Enter); // press Add Line with Enter to open Dropdown
       await keyboard.releaseKey(Key.Enter);
-      await snooze(250)
-
+      await snooze(250);
 
       await times(4).pressKey(Key.Down); // Select Add New explanation
       await keyboard.pressKey(Key.Enter); // Press Add new explanation to open the textarea
@@ -458,7 +461,6 @@ export class Mitchell_Importer extends Importer {
       await times(4).pressKey(Key.Tab);
       await times(2).pressKey(Key.Down); // Selecting Part Type to be Aftermarket New
 
-
       await keyboard.pressKey(Key.Enter); // Select it
       await keyboard.releaseKey(Key.Enter);
       this.progressUpdater.update();
@@ -474,18 +476,16 @@ export class Mitchell_Importer extends Importer {
       await keyboard.releaseKey(Key.LeftShift); // Release Left Shift
       this.progressUpdater.update();
 
-
       await this.typeMitchellValue(extPrice); // type totalPrice;
       this.progressUpdater.update();
-      await snooze(250)
+      await snooze(250);
 
       await this.pressTabButton(2); // go to (+More) button
       this.progressUpdater.update();
 
       await keyboard.pressKey(Key.Enter); // press Add Line with Enter to open Dropdown
       await keyboard.releaseKey(Key.Enter);
-      await snooze(250)
-
+      await snooze(250);
 
       await times(4).pressKey(Key.Down); // Select Add New explanation
       await keyboard.pressKey(Key.Enter); // Press Add new explanation to open the textarea
@@ -506,7 +506,6 @@ export class Mitchell_Importer extends Importer {
     }
   };
 
-
   private commitMitchellData = async (commitButtonCoordinates: Point, electronWindow: BrowserWindow) => {
     await mouse.setPosition(commitButtonCoordinates);
     await mouse.leftClick();
diff --git a/electron-app/src/utils/sort_forgettables.ts b/electron-app/src/utils/sort_forgettables.ts
@@ -0,0 +1,19 @@
+import { MitchellForgettable } from '../interfaces/Forgettable';
+import { ORDERED_GROUP_IDS } from '../constants/ordered_group_ids';
+
+/**
+ * Sorts forgettables by their groupId based on the order defined in ORDERED_GROUP_IDS.
+ * Items with groupIds not in the list will be placed at the end.
+ */
+export const sortForgettablesByGroupId = (forgettables: MitchellForgettable[]): MitchellForgettable[] => {
+  return [...forgettables].sort((a, b) => {
+    const indexA = ORDERED_GROUP_IDS.indexOf(a.groupId || '');
+    const indexB = ORDERED_GROUP_IDS.indexOf(b.groupId || '');
+
+    // If groupId not found in the ordered list, put it at the end
+    const orderA = indexA === -1 ? ORDERED_GROUP_IDS.length : indexA;
+    const orderB = indexB === -1 ? ORDERED_GROUP_IDS.length : indexB;
+
+    return orderA - orderB;
+  });
+};

-Original file line number
+Diff line change
 //   }
 //   return url;
 -// };
 +// };