contentoh-components-library 21.4.83 → 21.4.85

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

@@ -16,64 +16,60 @@ RetailerProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI5YTIxMzEyOC02NDgyLTRjMTYtYTRiNi02ZTY0ZjIyNWIxYmQiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6IjlhMjEzMTI4LTY0ODItNGMxNi1hNGI2LTZlNjRmMjI1YjFiZCIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI5OGE0NzYxMy04ZGIyLTRlZjUtYjA0Mi01ZDU3MWRkZjIwMWIiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4Mzg3NTIyNiwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY4Mzg3ODgyNiwiaWF0IjoxNjgzODc1MjI2LCJlbWFpbCI6ImlzbWFlbDk3bG9wZXpAZ21haWwuY29tIn0.EtgmT_THMx-Zy_zB5yZK4gz6TXNTVVJEKFt5X0JK2UkGVrp_q_92YCEuejS4n976fyTez0jkwOee6IkVHLV71uZWRBDFt-3Yw4ZxfsZYPNJWhoHXGNxhMU8MCkSntfu597esBTk-VsUpstT5R7L-WJfN8viE7R-qVo-42RlPTG0TFrWA9q0oTcqjv8vbxLpOBUjiEpjmqRhg4blJZwgkGNta6MOlw1vfmisOVbo9wMvqwnCZ9xx9KMKoH9U4uNObK_JomjbvPmTmkcUXsE-wGSD7XcoSwtuhBngLC7-jiu1u8MvL_ff5Z0Qp70sSpLdUglcSS8d1Xf7j_fcZuJ5jKA",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI5YTIxMzEyOC02NDgyLTRjMTYtYTRiNi02ZTY0ZjIyNWIxYmQiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6IjlhMjEzMTI4LTY0ODItNGMxNi1hNGI2LTZlNjRmMjI1YjFiZCIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiIxMGZiNTE4Mi1jMGI5LTQyZGUtYTAyZC1lOTJlZWI2NWFlN2QiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTcwMTkwMjA4NywibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTcwMTkwNTY4NywiaWF0IjoxNzAxOTAyMDg3LCJlbWFpbCI6ImlzbWFlbDk3bG9wZXpAZ21haWwuY29tIn0.JpoKZHuzPZG2ttaT7Oz3CAPR7xZU19txSDyjGHIwya2zV9uOHxauS0-orNRry8lfpZHQt_ISF2W-XSARUvCG1SqTXi41-o53DsWfZhqe9dQk6DGDnvFzXFsaEbaxAPjTfYc491sHCpOjf4W98quBuzDZCRtdCsr9u3A0AnX8Lh1Jquvn83nrHN2ZeefpLyKc-xGGp50Oy6EnJgSK4PcAAV631nwYV9DfVaLb3SIWDrJIIuBjFjBBCXBcnGJBieErlnF-4gumHzsro_QqF-s7aq_3EJChAhfslFvczNSyDc-LXJVkpDuZW3TaYKlHwhoFxz1aMuYRFQ8xy5Pz8FDNKQ",
   productSelected: {
-    services: {
-      datasheets: 1,
-      descriptions: 1,
-      images: 1,
-    },
-    orderId: 15275,
-    status: "AC",
-    datasheet_status: "AC",
+    orderId: 15190,
+    status: "RA",
+    datasheet_status: "NS",
     prio: "none",
     version: 3,
-    description_status: "AC",
-    images_status: "AC",
-    statusByRetailer: {
-      34: {
-        datasheet: "AC",
-        description: "AC",
-        images: "AC",
-      },
+    description_status: "NS",
+    images_status: "RA",
+    brand: null,
+    retailerOrder: 0,
+    missing: {
+      datasheet: null,
+      descriptions: null,
+      images: null,
+    },
+    services: {
+      datasheets: 0,
+      descriptions: 0,
+      images: 1,
     },
     article: {
-      id_article: 39485,
-      id_category: "11",
-      name: "Mix de nueces",
-      upc: "7543453453",
-      timestamp: "2023-07-14T21:02:54.000Z",
-      id_user: 28,
-      status: "NULL",
-      active: 1,
-      company_id: 1,
+      category:
+        "Abarrotes Básicos|Abarrotes Básicos y Procesados|Abarrotes Básicos y Procesados",
       company_name: "GRUPO BRAHMA",
       country: "México",
-      id_order: 15275,
-      id_datasheet_especialist: 54,
-      id_datasheet_facilitator: 52,
-      id_description_especialist: 54,
-      id_description_facilitator: 52,
+      id_category: "4004",
+      id_datasheet_especialist: null,
+      id_datasheet_facilitator: null,
+      id_description_especialist: null,
+      id_description_facilitator: null,
       id_images_especialist: 55,
       id_images_facilitator: 53,
+      id_order: 15190,
+      id_article: 39364,
       id_auditor: 37,
-      id_recepcionist: null,
-      category: "Abarrotes|Abarrotes Secos|Frutos Secos",
-      missingAttributes: 0,
-      missingDescriptions: 0,
-      missingImages: 0,
+      name: "test 2 img ba",
+      timestamp: "2023-05-05T02:56:16.000Z",
+      upc: "4353242",
     },
     retailers: [
       {
-        id: 34,
-        name: "San Pablo",
+        id: 70,
+        name: "Bodega Aurrera",
       },
     ],
-    country: "México",
-    upc: "7543453453",
+    statusByRetailer: {
+      70: {
+        images: "RA/AC",
+      },
+    },
   },
   location: {
-    product: { articleId: 354, versionId: 3 },
+    product: { articleId: 39364, versionId: 3 },
     state: {
       withChat: true,
       chatType: "product_status",
@@ -87,7 +83,7 @@ RetailerProductEditionDefault.args = {
     position: "Auditor",
     telephone: "",
     country: "México",
-    id_company: 2,
+    id_company: 254,
     id_cognito: "9a213128-6482-4c16-a4b6-6e64f225b1bd",
     birth_Date: null,
     about_me: "",
@@ -101,16 +97,16 @@ RetailerProductEditionDefault.args = {
     email_notify: 1,
     is_user_tech: null,
     membership: {
-      id: 2,
-      start_date: "2021-11-05T02:35:12.000Z",
-      end_date: "2022-11-05T02:34:49.000Z",
-      planID: 1,
-      plan: "prod_KtkvuFFLpOdP6e",
-      name: "Plan Free",
-      user_limit: "1",
-      products_limit: "3",
-      type: "PyMES",
+      id: 137,
+      start_date: "2023-10-04T15:46:14.000Z",
+      end_date: "2024-10-04T08:46:09.000Z",
+      planID: 8,
+      plan: "prod_KtlhECVSFG2iro",
+      name: "Plan Pro",
+      user_limit: "50",
+      products_limit: "5000",
+      type: "Enterprise",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-37/37.png?1692750648813",
+    src: "https://content-management-profile.s3.amazonaws.com/id-37/37.png?1701902088068",
   },
 };

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([]);
@@ -283,7 +284,20 @@ export const RetailerProductEdition = ({
       getServices();
       setImages({ action: "init", init: services[2] });
       if (services[2]?.values?.length > 0) setActiveImage(0);
-      getPercentage({ data: [product] }).then((res) => setPercentages(res[0]));
+      const data = [
+        {
+          id_article: product.article.id_article,
+          id_category: product.article.id_category,
+          version: product.version,
+          id_retailer_array: (
+            product.retailersAvailable ?? product.retailers
+          ).map(({ id }) => id),
+        },
+      ];
+      const headers = { Authorization: token };
+      getPercentage({ data, headers }).then((res) => {
+        setPercentages(res[0]);
+      });
       setLoading(false);
     } catch (error) {
       console.log(error);
@@ -439,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 &&
@@ -820,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 {
@@ -1287,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);
@@ -1410,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
@@ -1452,6 +1339,7 @@ export const RetailerProductEdition = ({
         <div className="product-information">
           <FullProductNameHeader
             headerData={product}
+            productObservation= {observation}
             percent={activePercentage}
             activeRetailer={activeRetailer}
             servicesData={servicesData}

package/src/global-files/data.js

@@ -88,43 +88,17 @@ export const getImage = (imageGeneral, width = 250, height = 250) => {
 
 export const getPercentage = async (params = {}) => {
   const func = async () => {
-    const dataToSend = [];
-    const arrayRetailers = [];
-    let retailers =
-      params.data[0].retailers || params.data[0].retailersAvailable;
-    params.data.forEach((product, i) => {
-      dataToSend.push(
-        product.article
-          ? {
-              id_article: product.article.id_article,
-              id_category: product.article.id_category,
-              version: product.version,
-            }
-          : {
-              id_article: product.id_article,
-              id_category: product.id_category,
-              version: product.version,
-            }
-      );
-      retailers.forEach((retailer) => {
-        arrayRetailers.push(retailer.id);
-      });
-      dataToSend[i].id_retailer_array = arrayRetailers;
-    });
-
+    const headers = {
+      Authorization:
+        params?.headers?.Authorization ?? sessionStorage.getItem("jwt"),
+    };
     return await axios
       .post(
         process.env.REACT_APP_VALID_EXPORT_ENDPOINT,
-        { data: dataToSend },
-        {
-          headers: {
-            Authorization: sessionStorage.getItem("jwt"),
-          },
-        }
+        { data: params.data },
+        { headers }
       )
-      .then((response) => {
-        return [response.data];
-      })
+      .then((response) => [response.data])
       .catch((err) => console.log(err, "Errror"));
   };