Check for null selectedIndex before calculating precedence options

googlemaps · Aug 24, 2023 · 4a0f78e · 4a0f78e
1 parent 0205c7b
commit 4a0f78e
Showing 1 changed file with 10 additions and 8 deletions.
diff --git a/...ntainers/pre-solve-shipment-model-settings/pre-solve-shipment-model-settings.component.ts b/...ntainers/pre-solve-shipment-model-settings/pre-solve-shipment-model-settings.component.ts
@@ -772,17 +772,19 @@ export class PreSolveShipmentModelSettingsComponent implements OnInit, OnDestroy
   }
 
   getPrecedenceRuleFirstIndexOptions(selectedIndex: number): Shipment[] {
-    return [
-      selectedIndex && this.scenarioShipments$.value[selectedIndex],
-      ...this.scenarioShipments$.value,
-    ];
+    const options = [...this.scenarioShipments$.value];
+    if (selectedIndex) {
+      options.push(this.scenarioShipments$.value[selectedIndex]);
+    }
+    return options;
   }
 
   getPrecendenceRuleSecondIndexOptions(firstIndex: number, selectedIndex: number): Shipment[] {
-    return [
-      selectedIndex && this.scenarioShipments$.value[selectedIndex],
-      ...this.scenarioShipments$.value.filter((_, i) => i !== firstIndex),
-    ];
+    const options = [...this.scenarioShipments$.value.filter((_, i) => i !== firstIndex)];
+    if (selectedIndex) {
+      options.push(this.scenarioShipments$.value[selectedIndex]);
+    }
+    return options;
   }
 
   getIndexOfShipment(shipment: Shipment): number {