contentoh-components-library 21.1.29 → 21.1.32

package/src/components/pages/ProviderProductEdition/index.js

@@ -216,6 +216,7 @@ export const ProviderProductEdition = ({
   const loadData = async () => {
     const services = await getRetailerServices(
       product?.id_article || product?.article?.id_article,
+      product?.article?.company_name || product?.categoryName,
       parseInt(product?.article?.id_category || product?.id_category),
       product?.version
     );
@@ -232,11 +233,8 @@ export const ProviderProductEdition = ({
       );
     }
 
-    //setActiveRetailer(product?.retailers[0]);
-    setImages({
-      action: "init",
-      init: services[2],
-    });
+    // setActiveRetailer(product?.retailers[0]);
+    setImages({ action: "init", init: services[2] });
     if (services[2]?.values?.length > 0) setActiveImage(0);
 
     getPercentage({ data: [product] }).then((res) => setPercentages(res));
@@ -255,10 +253,11 @@ export const ProviderProductEdition = ({
         }&end=true`
       );
       const parsedResponse = JSON.parse(servicesResponse?.data?.body).data;
+      const retailerResponse = parsedResponse?.map((srv) => srv.id_retailer);
       let retailers = product.retailers || product.retailersAvailable;
-      let active = retailers?.filter((retailer) =>
-        parsedResponse?.map((srv) => srv.id_retailer).includes(retailer.id)
-      )[0];
+      let active = retailers?.find((retailer) =>
+        retailerResponse.includes(retailer.id)
+      );
       !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
       setServicesData(parsedResponse);
     }
@@ -279,15 +278,15 @@ export const ProviderProductEdition = ({
         if (revision && currentService === "AP") return true;
       } else {
         const { product } = productEdit;
-        if (
-          orgn === "Contentoh" ||
-          (["RECEIVED", "IN_PROGRESS"].includes(currentService) &&
-            orgn === "RequestWithoutContentoh") ||
-          (currentService === "AA" && orgn === "RequestWithContentoh") ||
-          (currentService === "RC" &&
-            orgn === "RequestWithoutContentoh" &&
-            (!product.id_order || !product.orderId))
-        )
+        const isRequestWithoutContentoh =
+          orgn === "RequestWithoutContentoh" &&
+          (["R", "CA"].includes(currentService) ||
+            (currentService === "RCA" &&
+              (!product.id_order || !product.orderId)));
+        const isRequestWithContentoh =
+          orgn === "RequestWithContentoh" && currentService === "AA";
+        const isContentoh = orgn === "Contentoh" && currentService === "AA";
+        if (isContentoh || isRequestWithoutContentoh || isRequestWithContentoh)
           return true;
       }
     }
@@ -304,26 +303,26 @@ export const ProviderProductEdition = ({
     setInCart(arr.some((e) => e.articleId === product.id_article));
   };
 
-  useEffect(async () => {
+  useEffect(() => {
     sessionStorage.setItem("user", JSON.stringify(user));
     loadData();
     getCart();
-    setUserGroups(await fetchUsers(token));
+    fetchUsers(token).then((res) => setUserGroups(res));
     let arr = [];
+    // ?? Que sentido tiene verificar los roles de colaborador en la app de proveedor
     switch (user.id_role) {
       case 7:
       case 8:
-        arr = ["IN_PROGRESS", "RF", "RA"];
+        arr = ["CA", "RC", "RA"];
         break;
       case 4:
       case 5:
-        arr = ["RF", "AF", "AA", "AP", "AC"];
+        arr = ["RC", "AC", "AA", "AP", "ACA"];
         break;
       case 6:
-        arr = ["RP", "RC", "AF"];
+        arr = ["RP", "RCA", "AC"];
         break;
       default:
-        arr = [];
         break;
     }
     setStatusArray(arr);
@@ -341,9 +340,9 @@ export const ProviderProductEdition = ({
     const productTemp = product;
     const retailers = productTemp?.retailersAvailable || productTemp?.retailers;
     retailers?.forEach((retailer) => {
-      retailer["percentage"] = percentages?.filter(
+      retailer["percentage"] = percentages?.find(
         (percent) => retailer?.id === percent?.id_retailer
-      )[0]?.percentage;
+      )?.percentage;
     });
 
     setProduct(productTemp);
@@ -419,7 +418,7 @@ export const ProviderProductEdition = ({
     };
     if (product?.orderId) dataObject["orderId"] = product?.orderId;
     try {
-      await axios.put(
+      const res = await axios.put(
         `${process.env.REACT_APP_ARTICLE_DATA_ENDPOINT}?description=true&version=${version}`,
         dataObject,
         {
@@ -428,8 +427,10 @@ export const ProviderProductEdition = ({
           },
         }
       );
-      setMessage("Descripciones guardadas con éxito");
-      loadData();
+      if (res.data.statusCode === 200) {
+        setMessage("Descripciones guardadas con éxito");
+        await loadData();
+      }
     } catch (error) {
       console.log(error);
     }
@@ -452,8 +453,10 @@ export const ProviderProductEdition = ({
           },
         }
       );
-      setMessage("Fichas técnicas guardadas");
-      loadData();
+      if (res.data.statusCode === 200) {
+        setMessage("Fichas técnicas guardadas");
+        await loadData();
+      }
     } catch (error) {
       console.log(error);
     }
@@ -551,7 +554,7 @@ export const ProviderProductEdition = ({
         return e;
       });
       try {
-        await axios.put(
+        const res = await axios.put(
           `${process.env.REACT_APP_ARTICLE_DATA_ENDPOINT}?image=true&version=${version}`,
           dataImages,
           {
@@ -560,9 +563,11 @@ export const ProviderProductEdition = ({
             },
           }
         );
-        setMessage("Imágenes guardadas con éxito");
-        sessionStorage.removeItem("imagesList");
-        loadData();
+        if (res.data.statusCode === 200) {
+          setMessage("Imágenes guardadas con éxito");
+          sessionStorage.removeItem("imagesList");
+          await loadData();
+        }
       } catch (error) {
         console.log(error);
       }
@@ -664,12 +669,12 @@ export const ProviderProductEdition = ({
         },
       ],
       concept: concept,
-      [`${assignationType}Id`]: assignationId,
+      userId: assignationId,
     };
-    axios({
+    await axios({
       method: "post",
       url: process.env.REACT_APP_ASSIGNATIONS_ENDPOINT,
-      data: data,
+      data,
       headers: {
         Authorization: token,
       },
@@ -687,7 +692,7 @@ export const ProviderProductEdition = ({
       serv = serv.filter((f) => f.id_retailer === activeRetailer.id);
     }
     const statusArray =
-      user.is_retailer === 1 ? ["AC", "RC"] : ["AP", "RP", "AC"];
+      user.is_retailer === 1 ? ["ACA", "RCA"] : ["AP", "RP", "ACA"];
     return (
       serv.length > 0 && serv.every((item) => statusArray.includes(item.status))
     );
@@ -790,7 +795,7 @@ export const ProviderProductEdition = ({
     const { datasheet_status, description_status, images_status } = product;
     const completionStates =
       user.is_retailer === 1
-        ? ["AC", "Evaluated", "NS"]
+        ? ["ACA", "Evaluated", "NS"]
         : ["AP", "Evaluated", "NS"];
     const dsEvaluated = completionStates.includes(datasheet_status);
     const descsEvaluated = completionStates.includes(description_status);
@@ -803,61 +808,61 @@ export const ProviderProductEdition = ({
 
   const sendEvaluation = async (result) => {
     setLoading(true);
-    let data = {};
+    const concept = getConcept(activeTab);
+    const productTemp = product;
+    const articleId = productTemp.id_article;
+    const orderId = productTemp.id_order ?? productTemp.orderId;
+    const evalStatus =
+      product[`${getConcept(activeTab)}_status`] || product?.version_status;
+    let data = { articleId, orderId, concept, evalStatus };
     const retailerId = activeRetailer?.id;
-    if (result) {
-      data = {
-        articleId: product.id_article,
-        orderId: product.id_order ?? product.orderId,
-        concept: getConcept(activeTab),
-        result: result,
-        retailerId,
-      };
-      await axios.put(`${process.env.REACT_APP_EVALUATION_ENDPOINT}`, data, {
-        headers: {
-          Authorization: token,
-        },
-      });
-    } else {
-      const productTemp = product;
-      const concept = getConcept(activeTab);
-      productTemp[`${concept}_status`] = "Evaluated";
-      data = {
-        articleId: product.id_article,
-        orderId: product.id_order ?? product.orderId,
-        concept,
-      };
-      axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
-        headers: {
-          Authorization: token,
-        },
-      });
-      setProduct(productTemp);
-      setProductEdit({
-        ArticleId: productTemp.id_article,
-        idCategory: productTemp.article.id_category,
-        product: productTemp,
-      });
-      sessionStorage.setItem(
-        "productEdit",
-        JSON.stringify({
-          ArticleId: productTemp.id_article,
+    let res;
+    try {
+      if (result) {
+        data.result = result;
+        data.retailerId = retailerId;
+        res = await axios.put(
+          `${process.env.REACT_APP_EVALUATION_ENDPOINT}`,
+          data,
+          {
+            headers: {
+              Authorization: token,
+            },
+          }
+        );
+      } else {
+        res = await axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
+          headers: {
+            Authorization: token,
+          },
+        });
+      }
+      if (res.data.statusCode === 200) {
+        productTemp[`${concept}_status`] = "Evaluated";
+        setProduct(productTemp);
+        sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
+        const newProductEdit = {
+          ArticleId: articleId,
           idCategory: productTemp.article.id_category,
           product: productTemp,
-        })
-      );
-      setOrigin((prev) => ({ ...prev, [concept]: "Evaluated" }));
+        };
+        setProductEdit(newProductEdit);
+        sessionStorage.setItem("productEdit", JSON.stringify(newProductEdit));
+        setOrigin((prev) => ({ ...prev, [concept]: "Evaluated" }));
+        await loadData();
+        showSurvey && showSurvey(confirmStatusComplete());
+      }
+    } catch (err) {
+      console.log(err);
     }
-    loadData();
-    showSurvey && showSurvey(confirmStatusComplete());
   };
 
   const validateAll = async (result) => {
     try {
+      setLoading(true);
       const evaluationArray = [];
       const sendAll = [];
       const conceptArray = ["description", "datasheet", "images"];
-      console.log(servicesData);
 
       servicesData?.forEach((ret) => {
         let data = {
@@ -876,7 +881,9 @@ export const ProviderProductEdition = ({
         );
       });
 
-      conceptArray.forEach((concept) => {
+      await Promise.all(evaluationArray);
+
+      conceptArray?.forEach((concept) => {
         let data = {
           articleId: product.id_article,
           orderId: product.id_order ?? product.orderId,
@@ -891,8 +898,32 @@ export const ProviderProductEdition = ({
         );
       });
 
-      Promise.all(conceptArray);
-      Promise.all(sendAll);
+      await Promise.all(sendAll);
+      const productTemp = product;
+      productTemp.article_status = `${result}CA`;
+      productTemp.datasheet_status =
+        productTemp.datasheet_status === "NA" ? "NA" : `${result}CA`;
+      productTemp.description_status =
+        productTemp.description_status === "NA" ? "NA" : `${result}CA`;
+      productTemp.images_status =
+        productTemp.images_status === "NA" ? "NA" : `${result}CA`;
+      setProduct(productTemp);
+      sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
+      setProductEdit({
+        ArticleId: productTemp.id_article,
+        idCategory: productTemp.article.id_category,
+        product: productTemp,
+      });
+      sessionStorage.setItem(
+        "productEdit",
+        JSON.stringify({
+          ArticleId: productTemp.id_article,
+          idCategory: productTemp.article.id_category,
+          product: productTemp,
+        })
+      );
+
+      await loadData();
     } catch (error) {
       console.log(error);
     }
@@ -913,7 +944,7 @@ export const ProviderProductEdition = ({
       },
     });
     const prod = productEdit;
-    const statusComplete = user.is_retailer ? `${result}C` : `${result}P`;
+    const statusComplete = user.is_retailer ? `${result}CA` : `${result}P`;
     prod.product.datasheet_status = statusComplete;
     prod.product.description_status = statusComplete;
     prod.product.images_status = statusComplete;
@@ -922,24 +953,22 @@ export const ProviderProductEdition = ({
     sessionStorage.setItem("productEdit", JSON.stringify(prod));
     setProduct(prod);
     setShowGenericModal && setShowGenericModal(false);
-    loadData();
+    await loadData();
   };
 
   const getSectionStatus = () => {
     const concept = getConcept(activeTab);
-    return ["AA", "AP", "RECEIVED", "IN_PROGRESS", "RC"].includes(
+    return ["AA", "AP", "R", "CA", "RCA"].includes(
       productEdit.product[`${concept}_status`]
     );
   };
 
   const enableActions = (versionStatus) => {
     try {
-      const userIsRetailer = user.is_retailer;
-
-      if (userIsRetailer) return false;
+      if (user.is_retailer) return false;
 
       if (versionStatus) {
-        return ["AP", "AC", "RC", null].includes(versionStatus);
+        return ["AP", "ACA", "RCA", null].includes(versionStatus);
       }
       return true;
     } catch (err) {
@@ -948,6 +977,10 @@ export const ProviderProductEdition = ({
     }
   };
 
+  useEffect(() => {
+    setSaving(loading);
+  }, [loading]);
+
   const slidefront = [
     {
       slide: Slide1_1,
@@ -977,18 +1010,6 @@ export const ProviderProductEdition = ({
     },
   ];
 
-  useEffect(() => {
-    setSaving(loading);
-  }, [loading]);
-
-  console.log(
-    user.is_retailer === 1,
-    product.id_order || product.orderId,
-    isRevision(),
-    getSectionStatus(),
-    "XD"
-  );
-
   return (
     <Container headerTop={headerTop}>
       <HeaderTop setHeaderTop={setHeaderTop} />
@@ -1022,17 +1043,10 @@ export const ProviderProductEdition = ({
             setActiveRetailer={setActiveRetailer}
             showValidationButtons={isRevision() && getSectionStatus()}
             servicesData={servicesData ? servicesData : null}
-            showApproveRejectAll={
-              user.is_retailer === 1 &&
-              (product.id_order || product.orderId) &&
-              isRevision() &&
-              getSectionStatus()
-            }
-            approveAll={() => validateAll("A")}
-            rejectAll={() => validateAll("R")}
-            approve={() => {
+            showApproveRejectAll={isRevision() && getSectionStatus()}
+            approveAll={() => {
               if (
-                origin[activeTab] === "RequestWithoutContentoh" &&
+                originProp === "RequestWithoutContentoh" &&
                 !user.is_retailer &&
                 (!product.id_order || !product.orderId)
               ) {
@@ -1044,23 +1058,78 @@ export const ProviderProductEdition = ({
                   },
                 }));
                 setShowGenericModal(true);
+              } else if (user.is_retailer) {
+                if (product.id_order || product.orderId) {
+                  validateAll("A");
+                } else {
+                  setDataGenericModal((prev) => ({
+                    ...prev,
+                    button2: {
+                      name: "Continuar",
+                      action: () => evaluationToRetailer("A"),
+                    },
+                  }));
+                  setShowGenericModal(true);
+                }
               } else {
-                if (user.is_retailer) {
-                  if (product.id_order || product.orderId) {
-                    sendEvaluation("A");
-                  } else {
-                    setDataGenericModal((prev) => ({
-                      ...prev,
-                      button2: {
-                        name: "Continuar",
-                        action: () => evaluationToRetailer("A"),
-                      },
-                    }));
-                    setShowGenericModal(true);
-                  }
+                validateAll("A");
+              }
+            }}
+            rejectAll={() => {
+              if (
+                originProp === "RequestWithoutContentoh" &&
+                !user.is_retailer &&
+                (!product.id_order || !product.orderId)
+              ) {
+                return;
+              } else if (user.is_retailer) {
+                if (product.id_order || product.orderId) {
+                  validateAll("R");
+                  setModalViewError(true);
                 } else {
+                  setDataGenericModal((prev) => ({
+                    ...prev,
+                    button2: {
+                      name: "Continuar",
+                      action: () => evaluationToRetailer("R"),
+                    },
+                  }));
+                  setShowGenericModal(true);
+                }
+              } else {
+                validateAll("R");
+                setModalViewError(true);
+              }
+            }}
+            approve={() => {
+              if (
+                origin[activeTab] === "RequestWithoutContentoh" &&
+                !user.is_retailer &&
+                (!product.id_order || !product.orderId)
+              ) {
+                setDataGenericModal((prev) => ({
+                  ...prev,
+                  button2: {
+                    name: "Continuar",
+                    action: () => evaluationToRetailer("A"),
+                  },
+                }));
+                setShowGenericModal(true);
+              } else if (user.is_retailer) {
+                if (product.id_order || product.orderId) {
                   sendEvaluation("A");
+                } else {
+                  setDataGenericModal((prev) => ({
+                    ...prev,
+                    button2: {
+                      name: "Continuar",
+                      action: () => evaluationToRetailer("A"),
+                    },
+                  }));
+                  setShowGenericModal(true);
                 }
+              } else {
+                sendEvaluation("A");
               }
             }}
             reject={() => {
@@ -1070,25 +1139,23 @@ export const ProviderProductEdition = ({
                 (!product.id_order || !product.orderId)
               ) {
                 return;
-              } else {
-                if (user.is_retailer) {
-                  if (product.id_order || product.orderId) {
-                    sendEvaluation("R");
-                    setModalViewError(true);
-                  } else {
-                    setDataGenericModal((prev) => ({
-                      ...prev,
-                      button2: {
-                        name: "Continuar",
-                        action: () => evaluationToRetailer("R"),
-                      },
-                    }));
-                    setShowGenericModal(true);
-                  }
-                } else {
+              } else if (user.is_retailer) {
+                if (product.id_order || product.orderId) {
                   sendEvaluation("R");
                   setModalViewError(true);
+                } else {
+                  setDataGenericModal((prev) => ({
+                    ...prev,
+                    button2: {
+                      name: "Continuar",
+                      action: () => evaluationToRetailer("R"),
+                    },
+                  }));
+                  setShowGenericModal(true);
                 }
+              } else {
+                sendEvaluation("R");
+                setModalViewError(true);
               }
             }}
           />
@@ -1239,20 +1306,21 @@ export const ProviderProductEdition = ({
                   />
                 </div>
               )}
-              <Button
-                buttonType={
-                  evaluationComplete(activeTab) &&
-                  (productEdit.product.id_order || productEdit.product.orderId)
-                    ? "general-green-button"
-                    : "general-button-disabled"
-                }
-                label={"Enviar evaluación"}
-                onClick={() => {
-                  //setModalSent(true);
-                  sendEvaluation();
-                  setMessage(`¡Evaluación de ${activeTab} completada!`);
-                }}
-              />
+              {/* <Button
+                  buttonType={
+                    evaluationComplete(activeTab) &&
+                    (productEdit.product.id_order ||
+                      productEdit.product.orderId)
+                      ? "general-green-button"
+                      : "general-button-disabled"
+                  }
+                  label={"Enviar evaluación"}
+                  onClick={() => {
+                    //setModalSent(true);
+                    sendEvaluation();
+                    setMessage(`¡Evaluación de ${activeTab} completada!`);
+                  }}
+                /> */}
             </div>
           ) : revision ? null : (
             <div className="required-inputs-message">
@@ -1272,20 +1340,20 @@ export const ProviderProductEdition = ({
                 </button>
               ) : (
                 <>
-                  <SliderToolTip
+                <SliderToolTip
                     infoIcon={InfoIcon}
                     slidefront={slidefront}
                     iconSize={"big-image"}
                     slidePosition={"top-slide"}
                   ></SliderToolTip>
-                  <Button
-                    onClick={() => {
-                      setShowContentohRequestModal &&
-                        setShowContentohRequestModal(true);
-                    }}
-                    buttonType="general-default-button"
-                    label="Enviar a Content-oh!"
-                  />
+                <Button
+                  onClick={() => {
+                    setShowContentohRequestModal &&
+                      setShowContentohRequestModal(true);
+                  }}
+                  buttonType="general-default-button"
+                  label="Enviar a Content-oh!"
+                />
                 </>
               )}
             </div>
@@ -1367,4 +1435,4 @@ export const ProviderProductEdition = ({
       )}
     </Container>
   );
-};
+};

package/src/components/pages/ProviderProductEdition/styles.js

@@ -115,4 +115,4 @@ export const Container = styled.div`
       width: 100%;
     }
   }
-`;
+`;