contentoh-components-library 21.4.75 → 21.4.78

package/src/components/organisms/VersionSelector/index.js

@@ -1,105 +1,106 @@
-import { Container } from "./styles";
-import axios from "axios";
-import { useEffect, useState } from "react";
-import { ScreenHeader } from "../../atoms/ScreenHeader";
-import { Button } from "../../atoms/GeneralButton";
-import addVersion from "../../../assets/images/versionSelector/addVersion.svg";
-import closeIcon from "../../../assets/images/versionSelector/closeVersionSelector.svg";
-import { GlobalColors, FontFamily } from "../../../global-files/variables";
-import { VersionItem } from "../../molecules/VersionItem";
-import { CreateVersion } from "../../organisms/CreateVersion";
-import { useCloseModal } from "../../../global-files/customHooks";
+// import { Container } from "./styles";
+// import axios from "axios";
+// import { useEffect, useState } from "react";
+// import { ScreenHeader } from "../../atoms/ScreenHeader";
+// import { Button } from "../../atoms/GeneralButton";
+// import addVersion from "../../../assets/images/versionSelector/addVersion.svg";
+// import closeIcon from "../../../assets/images/versionSelector/closeVersionSelector.svg";
+// import { GlobalColors } from "../../../../dist/global-files/variables";
+// import { FontFamily } from "../../../global-files/variables";
+// import { VersionItem } from "../../molecules/VersionItem";
+// import { CreateVersion } from "../../organisms/CreateVersion";
+// import { useCloseModal } from "../../../global-files/customHooks";
 
-export const VersionSelector = ({
-  modalId,
-  articleId,
-  setVersion,
-  companyName,
-  currentVersion,
-  setShowVersionSelector,
-  jwt,
-}) => {
-  const [versions, setVersions] = useState([]);
-  const [showCreateVersion, setShowCreateVersion] =
-    useCloseModal("create-version");
-  const [reload, setReload] = useState(false);
+// export const VersionSelector = ({
+//   modalId,
+//   articleId,
+//   setVersion,
+//   companyName,
+//   currentVersion,
+//   setShowVersionSelector,
+//   jwt,
+// }) => {
+//   const [versions, setVersions] = useState([]);
+//   const [showCreateVersion, setShowCreateVersion] =
+//     useCloseModal("create-version");
+//   const [reload, setReload] = useState(false);
 
-  const loadProductVersions = async (articleId) => {
-    try {
-      const response = await axios.get(
-        `${process.env.REACT_APP_VERSIONS_ENDPOINT}?articleId=${articleId}&provider=true`,
-        {
-          headers: {
-            Authorization: jwt,
-          },
-        }
-      );
+//   const loadProductVersions = async (articleId) => {
+//     try {
+//       const response = await axios.get(
+//         `${process.env.REACT_APP_VERSIONS_ENDPOINT}?articleId=${articleId}&provider=true`,
+//         {
+//           headers: {
+//             Authorization: jwt,
+//           },
+//         }
+//       );
 
-      const versionList = JSON.parse(response.data.body).data;
-      setVersions(versionList);
-    } catch (error) {
-      console.log(error);
-    }
-  };
+//       const versionList = JSON.parse(response.data.body).data;
+//       setVersions(versionList);
+//     } catch (error) {
+//       console.log(error);
+//     }
+//   };
 
-  useEffect(() => {
-    const ac = new AbortController();
-    loadProductVersions(articleId);
+//   useEffect(() => {
+//     const ac = new AbortController();
+//     loadProductVersions(articleId);
 
-    return () => {
-      setVersions([]);
-      setShowCreateVersion(false);
-      return () => ac.abort(); // Abort both fetches on unmount
-    };
-  }, [reload]);
+//     return () => {
+//       setVersions([]);
+//       setShowCreateVersion(false);
+//       return () => ac.abort(); // Abort both fetches on unmount
+//     };
+//   }, [reload]);
 
-  return (
-    <Container id={modalId}>
-      <div className="versions-header">
-        <ScreenHeader
-          text={"Versión del producto"}
-          headerType={"input-name-header"}
-          color={GlobalColors.white}
-          fontFamily={FontFamily.Lato}
-        />
-        <div className="buttons-container">
-          <Button
-            image={addVersion}
-            buttonType={"circular-button"}
-            onClick={() => setShowCreateVersion(true)}
-            id="add-version"
-          />
-          <Button
-            image={closeIcon}
-            buttonType={"circular-button"}
-            onClick={() => setShowVersionSelector(false)}
-            id="close-button"
-          />
-        </div>
-      </div>
-      <div className="versions-container">
-        {versions?.map((item) => (
-          <VersionItem
-            key={item.version}
-            version={item.version}
-            articleStatus={item.article_status}
-            currentVersion={item.version === currentVersion}
-            productOwner={companyName}
-            setVersion={setVersion}
-            timestamp={item.timestamp}
-          />
-        ))}
-      </div>
-      {showCreateVersion && (
-        <CreateVersion
-          articleId={articleId}
-          version={currentVersion}
-          versionsList={versions}
-          setShowCreateVersion={setShowCreateVersion}
-          realoadVersion={() => setReload(!reload)}
-          jwt={jwt}
-        />
-      )}
-    </Container>
-  );
-};
+//   return (
+//     <Container id={modalId}>
+//       <div className="versions-header">
+//         <ScreenHeader
+//           text={"Versión del producto"}
+//           headerType={"input-name-header"}
+//           color={GlobalColors.white}
+//           fontFamily={FontFamily.Lato}
+//         />
+//         <div className="buttons-container">
+//           <Button
+//             image={addVersion}
+//             buttonType={"circular-button"}
+//             onClick={() => setShowCreateVersion(true)}
+//             id="add-version"
+//           />
+//           <Button
+//             image={closeIcon}
+//             buttonType={"circular-button"}
+//             onClick={() => setShowVersionSelector(false)}
+//             id="close-button"
+//           />
+//         </div>
+//       </div>
+//       <div className="versions-container">
+//         {versions?.map((item) => (
+//           <VersionItem
+//             key={item.version}
+//             version={item.version}
+//             articleStatus={item.article_status}
+//             currentVersion={item.version === currentVersion}
+//             productOwner={companyName}
+//             setVersion={setVersion}
+//             timestamp={item.timestamp}
+//           />
+//         ))}
+//       </div>
+//       {showCreateVersion && (
+//         <CreateVersion
+//           articleId={articleId}
+//           version={currentVersion}
+//           versionsList={versions}
+//           setShowCreateVersion={setShowCreateVersion}
+//           realoadVersion={() => setReload(!reload)}
+//           jwt={jwt}
+//         />
+//       )}
+//     </Container>
+//   );
+// };

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

@@ -224,6 +224,7 @@ export const RetailerProductEdition = ({
   const [auditDescriptions, setAuditDescriptions] = useState([]);
   const [auditImages, setAuditImages] = useState([]);
   const [compare, setCompare] = useState(false);
+  const [observation,setObservation] = useState();
   const [valRejAll, setValRejAll] = useState(false);
 
   const [desc, setDesc] = useState([]);
@@ -452,7 +453,7 @@ export const RetailerProductEdition = ({
   }, [percentages]);
 
   useEffect(() => {
-    getInputsData(services, activeRetailer, setDatasheets, setDescriptions);
+    //getInputsData(services, activeRetailer, setDatasheets, setDescriptions);
     auditableVersion && loadAuditableData();
     setActivePercentage(Math.round(activeRetailer?.percentage, 0));
     activeRetailer?.id &&
@@ -833,84 +834,6 @@ export const RetailerProductEdition = ({
     }
   };
 
-  // const sendToFacilitator = async (result) => {
-  //   setLoading(true);
-  //   try {
-  //     let concept = getConcept(activeTab);
-
-  //     const productTemp = { ...product };
-  //     const evalStatus = retailerStatus;
-  //     const articleId = product.article.id_article;
-  //     const orderId = product.orderId;
-
-  //     // const body = {
-  //     //   orderArticleRetailers: [
-  //     //     { orderId, articleId, retailersIds: [activeRetailer.id] },
-  //     //   ],
-  //     //   isAproved: false,
-  //     //   service: concept,
-  //     // };
-
-  //     const body = {
-  //       articleId: product.article.id_article,
-  //       orderId: product.orderId,
-  //       concept: concept,
-  //       result: result,
-  //       evalStatus: evalStatus,
-  //       retailerId: activeRetailer.id,
-  //     };
-
-  //     let res;
-  //     let message;
-  //     if (result) {
-  //       body.isAproved = result === "A";
-  //       res = await axios.put(
-  //         `${process.env.REACT_APP_EVALUATION_ENDPOINT}`,
-  //         body,
-  //         {
-  //           headers: {
-  //             Authorization: token,
-  //           },
-  //         }
-  //       );
-  //       console.log(JSON.parse(res.data.body), "res");
-  //       getServices();
-  //     } else {
-  //       const specialistDone = ["RC", "RA", "CA"].includes(evalStatus);
-
-  //       if (specialistDone) {
-  //         message = `${activeTab} enviada a facilitador`;
-  //         getSectionIcon();
-  //       } else if (["IE", "AC", "RP", "RCA"].includes(evalStatus)) {
-  //         message = "Evaluación enviada";
-  //         getSectionIcon();
-  //       }
-  //       res = await axios.put(
-  //         `${process.env.REACT_APP_EVALUATION_ENDPOINT}`,
-  //         body,
-  //         {
-  //           headers: {
-  //             Authorization: token,
-  //           },
-  //         }
-  //       );
-  //     }
-  //     if (res.data.statusCode === 200) {
-  //       const response = JSON.parse(res.data.body)?.successfulData;
-  //       const statusObject =
-  //         response[`${orderId}-${articleId}-${activeRetailer.id}`];
-  //       productTemp.status = statusObject["generalStatus"];
-  //       productTemp[`${concept}_status`] = statusObject[`${concept}Status`];
-  //       await loadData();
-  //       if (message) setMessage(message);
-  //       sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
-  //       setProduct(productTemp);
-  //     }
-  //   } catch (error) {
-  //     console.log(error);
-  //   }
-  //   setLoading(false);
-  // };
   const sendToFacilitator = async (result) => {
     setLoading(true);
     try {
@@ -1300,70 +1223,6 @@ export const RetailerProductEdition = ({
     setSaving(loading);
   }, [loading]);
 
-  // const validateAll = async (result) => {
-  //   try {
-  //     setLoading(true);
-  //     const evaluationArray = [];
-  //     let conceptArray = ["description", "datasheet", "images"];
-  //     switch (user.id_role) {
-  //       case 4:
-  //         conceptArray = ["description", "datasheet"];
-  //         break;
-  //       case 5:
-  //         conceptArray = ["images"];
-  //         break;
-
-  //       default:
-  //         conceptArray = ["description", "datasheet", "images"];
-  //         break;
-  //     }
-
-  //     const isAproved = result === "A";
-  //     const retailersIds = [];
-  //     servicesData?.forEach((ret) => {
-  //       if (!retailersIds.includes(ret.id_retailer))
-  //         retailersIds.push(ret.id_retailer);
-  //     });
-  //     const body = {
-  //       orderArticleRetailers: [
-  //         {
-  //           orderId: product.id_order ?? product.orderId,
-  //           articleId: product.article.id_article,
-  //           retailersIds,
-  //         },
-  //       ],
-  //       isAproved,
-  //     };
-  //     conceptArray.forEach((concept) => {
-  //       body.service = concept;
-  //       evaluationArray.push(
-  //         axios.put(`${process.env.REACT_APP_EVALUATION_ENDPOINT}`, body, {
-  //           headers: {
-  //             Authorization: token,
-  //           },
-  //         })
-  //       );
-  //     });
-
-  //     await Promise.all(evaluationArray);
-
-  //     const productTemp = product;
-  //     productTemp.status = `${result}A`;
-  //     productTemp.datasheet_status =
-  //       productTemp.datasheet_status === "NA" ? "NA" : `${result}A`;
-  //     productTemp.description_status =
-  //       productTemp.description_status === "NA" ? "NA" : `${result}A`;
-  //     productTemp.images_status =
-  //       productTemp.images_status === "NA" ? "NA" : `${result}A`;
-  //     sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
-  //     setProduct(productTemp);
-
-  //     await loadData();
-  //   } catch (error) {
-  //     console.log(error);
-  //   }
-  // };
-
   const validateAll = async (result) => {
     try {
       setLoading(true);
@@ -1423,6 +1282,21 @@ export const RetailerProductEdition = ({
     }
   };
 
+  const getObservation = async () => {
+    const response = await axios.get(
+      `${process.env.REACT_APP_READ_OBSERVATION}?articleId=${product.article.id_article}&orderId=${product?.orderId}`,
+      {
+        headers: {
+          Authorization: sessionStorage.getItem("jwt"),
+        },
+      }
+    );
+    const parseData = JSON.parse(response.data.body).data[0];
+    setObservation( parseData.observations);
+  };
+  useEffect(() => {
+    getObservation();
+  }, []);
   return (
     <Container headerTop={headerTop}>
       <HeaderTop
@@ -1465,6 +1339,7 @@ export const RetailerProductEdition = ({
         <div className="product-information">
           <FullProductNameHeader
             headerData={product}
+            productObservation= {observation}
             percent={activePercentage}
             activeRetailer={activeRetailer}
             servicesData={servicesData}