fix(ui): correct logic for determining which freight are promo eligib…

…le (#2024) Signed-off-by: Remington Breeze <[email protected]>
akuity · May 16, 2024 · dd3b715 · dd3b715
1 parent 828acc0
commit dd3b715
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/ui/src/features/freightline/freightline.tsx b/ui/src/features/freightline/freightline.tsx
@@ -70,6 +70,7 @@ export const Freightline = ({
 
   const promotionEligible = usePromotionEligibleFreight(
     availableFreightData?.groups['']?.freight || [],
+    state.action,
     state.stage,
     isLoadingAvailableFreight || !isPromoting(state)
   );

diff --git a/ui/src/features/project/pipelines/utils/use-promotion-eligible-freight.ts b/ui/src/features/project/pipelines/utils/use-promotion-eligible-freight.ts
@@ -2,19 +2,23 @@ import { useMemo } from 'react';
 
 import { Freight } from '@ui/gen/v1alpha1/generated_pb';
 
+import { FreightlineAction } from '../types';
+
 export const usePromotionEligibleFreight = (
   freight: Freight[],
+  action?: FreightlineAction,
   stage?: string,
   disabled?: boolean
 ) => {
   return useMemo(() => {
-    if (disabled) {
+    if (disabled || !action) {
       return {};
     }
-    const availableFreight = !stage
-      ? freight
-      : // if promoting subscribers, only include freight that has been verified in the promoting stage
-        freight.filter((f) => !!f?.status?.verifiedIn[stage]);
+    const availableFreight =
+      action === FreightlineAction.Promote || !stage
+        ? freight
+        : // if promoting subscribers, only include freight that has been verified in the promoting stage
+          freight.filter((f) => !!f?.status?.verifiedIn[stage]);
 
     const pe: { [key: string]: boolean } = {};
     ((availableFreight as Freight[]) || []).forEach((f: Freight) => {