Merge pull request #102 from CAMAP-APP/fix/hot232

Fix/hot232

Author: renaudlonestone

packages/front-core/src/modules/csaCatalog/CsaCatalog.context.tsx

@@ -255,28 +255,33 @@ const CsaCatalogContextProvider = ({
     setUpdatedOrders(updatedOrders => {
       const upd = { ...updatedOrders };
       for (const d of distributions) {
-        if (d.state === RestDistributionState.NotYetOpen || d.state === RestDistributionState.Open) {
+        if (
+          (d.state === RestDistributionState.NotYetOpen || d.state === RestDistributionState.Open)
+          && !absenceDistributionsIds?.includes(d.id)
+        ) {
           upd[d.id] = { ...newDefaultOrder };
         }
       }
       return upd
     });
     setDefaultOrder(newDefaultOrder);
-  }, [distributions]);
+  }, [distributions, absenceDistributionsIds]);
 
   const remainingDistributions = React.useMemo(() => {
     return distributions.filter(
       d => {
         if (subscription) {
           return subscription.distributions.some(d2 => d2.id === d.id) &&
             isAfter(new Date(d.distributionStartDate), new Date()) &&
+            !absenceDistributionsIds?.includes(d.id) &&
             d.state !== RestDistributionState.Absent
         } else {
           return isAfter(new Date(d.distributionStartDate), new Date()) &&
+            !absenceDistributionsIds?.includes(d.id) &&
             d.state !== RestDistributionState.Absent
         }
       }).length;
-  }, [subscription, distributions]);
+  }, [subscription, distributions, absenceDistributionsIds]);
 
   const minSubscriptionOrder = React.useMemo(() => {
     return !!subscription

packages/front-core/src/modules/csaCatalog/CsaCatalogRouter.tsx

@@ -10,7 +10,6 @@ import CsaCatalogPresentation from './containers/CsaCatalogPresentation';
 import CsaCatalogSubscription from './containers/CsaCatalogSubscription';
 import MediumActionIcon from './containers/MediumActionIcon';
 import {
-  useRestCheckSubscriptionDefaultOrderPost,
   useRestSubscriptionPost,
   useRestUpdateSubscriptionDefaultOrderPost,
   useRestUpdateSubscriptionOrdersPost,
@@ -55,8 +54,6 @@ const CsaCatalogRouter = ({ userId }: CsaCatalogRouterProps) => {
     updateSubscriptionDefaultOrder,
     { data: updatedDefaultOrderData, error: updateDefaultOrderError },
   ] = useRestUpdateSubscriptionDefaultOrderPost();
-  const [checkSubscriptionDefaultOrder, { error: checkDefaultOrderError }] =
-    useRestCheckSubscriptionDefaultOrderPost(catalogId);
 
   React.useEffect(() => {
     if (
@@ -111,20 +108,23 @@ const CsaCatalogRouter = ({ userId }: CsaCatalogRouterProps) => {
         quantity: defaultOrder[parseInt(productId, 10)],
       })),
       absentDistribIds: absenceDistributionsIds,
-      initialOrders: Object.keys(updatedOrders).map((distributionId) => ({
-        id: parseInt(distributionId, 10),
-        orders: Object.keys(updatedOrders[parseInt(distributionId, 10)]).map((productId) => ({
-          productId: parseInt(productId, 10),
-          qty: updatedOrders[parseInt(distributionId, 10)][parseInt(productId, 10)],
-        })),
+      initialOrders: Object.keys(updatedOrders)
+        .filter((distributionId) => !absenceDistributionsIds?.includes(parseInt(distributionId, 10)))
+        .map((distributionId) => ({
+          id: parseInt(distributionId, 10),
+          orders: Object.keys(updatedOrders[parseInt(distributionId, 10)]).map((productId) => ({
+            productId: parseInt(productId, 10),
+            qty: updatedOrders[parseInt(distributionId, 10)][parseInt(productId, 10)],
+          })),
       }))
     });
 
-    if (!subscriptionSucceeded) return;
+    if (!subscriptionSucceeded) return false;
 
     window.scrollTo({ top: 0, behavior: 'smooth' });
 
     setStep('review');
+    return true;
   };
 
   React.useEffect(() => {
@@ -179,8 +179,7 @@ const CsaCatalogRouter = ({ userId }: CsaCatalogRouterProps) => {
     updatedSubscriptionError ||
     postSubscriptionError ||
     contextError ||
-    updateDefaultOrderError ||
-    checkDefaultOrderError;
+    updateDefaultOrderError;
 
   if (!catalog) return <CircularProgressBox />;
 
@@ -204,7 +203,7 @@ const CsaCatalogRouter = ({ userId }: CsaCatalogRouterProps) => {
       {step === 'presentation' && (
         <CsaCatalogPresentation onNext={gotoAbsences} />
       )}
-      {step === 'absences' && <CsaCatalogAbsences onNext={gotoDefaultOrder} adminMode={adminMode} />}
+      {step === 'absences' && <CsaCatalogAbsences onNext={async () => gotoDefaultOrder()} adminMode={adminMode} />}
       {step === 'requiredOrders' && (
         <Box
           width={'100%'}

packages/front-core/src/modules/csaCatalog/containers/CsaCatalogOrdersMobile.tsx

@@ -58,6 +58,7 @@ const CsaCatalogOrdersMobile = ({
     remainingDistributions,
     cancelOrder,
     minSubscriptionOrder,
+    absenceDistributionsIds,
   } = React.useContext(CsaCatalogContext);
 
   const isConstOrDefaults = (mode === 'defaultOrder') || isConstOrders;
@@ -70,10 +71,13 @@ const CsaCatalogOrdersMobile = ({
     if (mode === 'initialOrders') {
       return allDistributions
         .filter(d => [RestDistributionState.Open, RestDistributionState.NotYetOpen].includes(d.state))
-        .map(d => ({...d, state: RestDistributionState.Open}));
+        .map(d => ({
+          ...d,
+          state: absenceDistributionsIds?.includes(d.id) ? RestDistributionState.Absent : RestDistributionState.Open
+        }));
     }
     return allDistributions;
-  }, [allDistributions, mode]);
+  }, [allDistributions, mode, absenceDistributionsIds]);
 
   const [distributionIndex, setDistributionIndex] = React.useState(0);