contentoh-components-library 21.4.81 → 21.4.83

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

@@ -1,106 +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 } 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";
+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/ProviderProductEdition/ProviderProductEdition.stories.js

@@ -21,54 +21,38 @@ ProviderProductEditionDefault.args = {
   category: 287,
   version: 1,
   productSelected: {
-    category: "Accesorios Decorativos|Accesorios Decorativos",
-    company_name: "Demo",
-    company_id: 923,
-    id_category: "2028",
-    id_article: 118465,
-    name: "VELA AROMA 18 OZ MAN/CAN",
-    upc: "Modelo6",
-    isVisible: 1,
-    retailers: [
-      {
-        id: 68,
-        name: "The Home Depot Onboarding",
-      },
-    ],
+    id_article: 39550,
+    upc: 43654697,
+    name: "Campana de Cocina",
+    timestamp: "2023-08-04T22:23:40.000Z",
+    categoryName:
+      "Ferretería|Ferretería General|Tornillos, Tuercas y Arandelas",
+    id_category: 287,
     version: 1,
     retailersAvailable: [
-      {
-        id: 68,
-        name: "The Home Depot Onboarding",
-      },
+      { name: "The Home Depot Golden", id: 58 },
+      { name: "The Home Depot Onboarding", id: 68 },
     ],
+    percentage: "89",
   },
   productToEdit: {
-    idCategory: "2028",
-    ArticleId: 118465,
+    idCategory: 287,
+    ArticleId: 39550,
     product: [
       {
-        category: "Accesorios Decorativos|Accesorios Decorativos",
-        company_name: "Demo",
-        company_id: 923,
-        id_category: "2028",
-        id_article: 118465,
-        name: "VELA AROMA 18 OZ MAN/CAN",
-        upc: "Modelo6",
-        isVisible: 1,
-        retailers: [
-          {
-            id: 68,
-            name: "The Home Depot Onboarding",
-          },
-        ],
+        id_article: 39550,
+        upc: 43654697,
+        name: "Campana de Cocina",
+        timestamp: "2023-08-04T22:23:40.000Z",
+        categoryName:
+          "Ferretería|Ferretería General|Tornillos, Tuercas y Arandelas",
+        id_category: 287,
         version: 1,
         retailersAvailable: [
-          {
-            id: 68,
-            name: "The Home Depot Onboarding",
-          },
+          { name: "The Home Depot Golden", id: 58, percentage: 100 },
+          { name: "The Home Depot Onboarding", id: 68, percentage: 78 },
         ],
+        percentage: "89",
       },
     ],
   },
@@ -115,7 +99,7 @@ ProviderProductEditionDefault.args = {
       products_limit: "5000",
       type: "Enterprise",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-191/191.png?1701729602068",
+    src: "https://content-management-profile.s3.amazonaws.com/id-191/191.png?1697171804447",
   },
   company: {
     id_company: 923,
@@ -135,6 +119,9 @@ ProviderProductEditionDefault.args = {
         id: 68,
         name: "The Home Depot Onboarding",
         country: "México",
+        id_region: 1,
+        active: 1,
+        flow: 1,
       },
     ],
     retailers: [
@@ -142,6 +129,9 @@ ProviderProductEditionDefault.args = {
         id: 68,
         name: "The Home Depot Onboarding",
         country: "México",
+        id_region: 1,
+        active: 1,
+        flow: 1,
       },
     ],
   },

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

@@ -82,26 +82,19 @@ const reducerImages = (state, action) => {
       );
       return { ...state, values };
     case "orderImages": {
-      let {
-        inputsByRetailer = {},
-        valuesInitial,
-        inputsInitial,
-        inputs,
-      } = state;
+      let { inputsByRetailer, valuesInitial, inputsInitial, inputs } = state;
       try {
         const orderedImages = [];
         const imageIdArray = [];
-        if (action?.retailerId && !inputsByRetailer[action.retailerId]) {
+        if (action?.retailerId && !inputsByRetailer[action.retailerId])
           inputsByRetailer[action.retailerId] = [];
-        }
-        if (action.retailerId) {
+        action.retailerId &&
           inputsByRetailer[action.retailerId]?.filter((input) => {
             imageIdArray.push(input.id_image);
             valuesInitial.forEach((value) => {
               if (value.image_id === input.id_image) orderedImages.push(value);
             });
           });
-        }
 
         inputs = inputsInitial?.filter((input) =>
           imageIdArray.includes(input.id)
@@ -109,7 +102,7 @@ const reducerImages = (state, action) => {
 
         values = orderedImages.length > 0 ? orderedImages : [];
       } catch (error) {
-        console.log(action.action, error);
+        console.log(error);
       }
       return { ...state, values, inputs };
     }
@@ -492,20 +485,7 @@ export const ProviderProductEdition = ({
 
     setImages({ action: "init", init: services[2] });
     if (services[2]?.values?.length > 0) setActiveImage(0);
-    const data = [
-      {
-        id_article: product.id_article,
-        id_category: product.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]);
-    });
+    getPercentage({ data: [product] }).then((res) => setPercentages(res[0]));
     setLoading(false);
   };
 
@@ -565,14 +545,12 @@ export const ProviderProductEdition = ({
   };
 
   const getCart = async () => {
-    const res = await axios.get(`${process.env.REACT_APP_CART}/general/`, {
+    const res = await axios.get(process.env.REACT_APP_CART, {
       headers: {
         Authorization: token,
       },
     });
-    const arr = Object.values(JSON.parse(res.data.body).data)
-      ?.map((e) => e.article_id)
-      .filter(Boolean);
+    const arr = JSON.parse(res.data.body).data.map((e) => e.article_id);
     setInCart(arr.some((e) => e.articleId === product.id_article));
   };
 
@@ -670,7 +648,7 @@ export const ProviderProductEdition = ({
       value: e?.id,
       name: e?.name,
       required: e?.required,
-      active: images?.values?.some((value) => value?.image_id === e?.id),
+      active: images?.values.some((value) => value?.image_id === e?.id),
     }));
     setSocketType(imageInputs);
   }, [images]);
@@ -714,7 +692,7 @@ export const ProviderProductEdition = ({
           attributeId,
           value: valueOfAtribute,
           boxId,
-        });
+        })
       });
     });
 
@@ -722,8 +700,8 @@ export const ProviderProductEdition = ({
       articleId: product?.id_article,
       articleData: updatedDatasheets,
       ...(parseBoxData.length > 0 && { boxData: parseBoxData }),
-    };
-
+    };   
+    
     if (product?.orderId) dataObject["orderId"] = product?.orderId;
     try {
       const res = await axios.put(
@@ -742,7 +720,8 @@ export const ProviderProductEdition = ({
       }
     } catch (error) {
       console.log(error);
-    }
+    } 
+    console.log(dataObject)
   };
 
   const updateImages = useCallback(async () => {
@@ -1175,6 +1154,13 @@ export const ProviderProductEdition = ({
     }
   };
 
+
+
+
+
+
+
+
   const evaluationToRetailer = async (result) => {
     const data = {
       articleId: product.id_article,
@@ -1254,6 +1240,7 @@ export const ProviderProductEdition = ({
     },
   ];
   const sendToEvaluation = (result) => {
+    console.log({ result });
     if (result === "A") {
       if (
         origin[activeTab] === "RequestWithoutContentoh" &&

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

@@ -16,60 +16,64 @@ RetailerProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI5YTIxMzEyOC02NDgyLTRjMTYtYTRiNi02ZTY0ZjIyNWIxYmQiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6IjlhMjEzMTI4LTY0ODItNGMxNi1hNGI2LTZlNjRmMjI1YjFiZCIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiIxMGZiNTE4Mi1jMGI5LTQyZGUtYTAyZC1lOTJlZWI2NWFlN2QiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTcwMTkwMjA4NywibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTcwMTkwNTY4NywiaWF0IjoxNzAxOTAyMDg3LCJlbWFpbCI6ImlzbWFlbDk3bG9wZXpAZ21haWwuY29tIn0.JpoKZHuzPZG2ttaT7Oz3CAPR7xZU19txSDyjGHIwya2zV9uOHxauS0-orNRry8lfpZHQt_ISF2W-XSARUvCG1SqTXi41-o53DsWfZhqe9dQk6DGDnvFzXFsaEbaxAPjTfYc491sHCpOjf4W98quBuzDZCRtdCsr9u3A0AnX8Lh1Jquvn83nrHN2ZeefpLyKc-xGGp50Oy6EnJgSK4PcAAV631nwYV9DfVaLb3SIWDrJIIuBjFjBBCXBcnGJBieErlnF-4gumHzsro_QqF-s7aq_3EJChAhfslFvczNSyDc-LXJVkpDuZW3TaYKlHwhoFxz1aMuYRFQ8xy5Pz8FDNKQ",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI5YTIxMzEyOC02NDgyLTRjMTYtYTRiNi02ZTY0ZjIyNWIxYmQiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6IjlhMjEzMTI4LTY0ODItNGMxNi1hNGI2LTZlNjRmMjI1YjFiZCIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI5OGE0NzYxMy04ZGIyLTRlZjUtYjA0Mi01ZDU3MWRkZjIwMWIiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4Mzg3NTIyNiwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY4Mzg3ODgyNiwiaWF0IjoxNjgzODc1MjI2LCJlbWFpbCI6ImlzbWFlbDk3bG9wZXpAZ21haWwuY29tIn0.EtgmT_THMx-Zy_zB5yZK4gz6TXNTVVJEKFt5X0JK2UkGVrp_q_92YCEuejS4n976fyTez0jkwOee6IkVHLV71uZWRBDFt-3Yw4ZxfsZYPNJWhoHXGNxhMU8MCkSntfu597esBTk-VsUpstT5R7L-WJfN8viE7R-qVo-42RlPTG0TFrWA9q0oTcqjv8vbxLpOBUjiEpjmqRhg4blJZwgkGNta6MOlw1vfmisOVbo9wMvqwnCZ9xx9KMKoH9U4uNObK_JomjbvPmTmkcUXsE-wGSD7XcoSwtuhBngLC7-jiu1u8MvL_ff5Z0Qp70sSpLdUglcSS8d1Xf7j_fcZuJ5jKA",
   productSelected: {
-    orderId: 15190,
-    status: "RA",
-    datasheet_status: "NS",
-    prio: "none",
-    version: 3,
-    description_status: "NS",
-    images_status: "RA",
-    brand: null,
-    retailerOrder: 0,
-    missing: {
-      datasheet: null,
-      descriptions: null,
-      images: null,
-    },
     services: {
-      datasheets: 0,
-      descriptions: 0,
+      datasheets: 1,
+      descriptions: 1,
       images: 1,
     },
+    orderId: 15275,
+    status: "AC",
+    datasheet_status: "AC",
+    prio: "none",
+    version: 3,
+    description_status: "AC",
+    images_status: "AC",
+    statusByRetailer: {
+      34: {
+        datasheet: "AC",
+        description: "AC",
+        images: "AC",
+      },
+    },
     article: {
-      category:
-        "Abarrotes Básicos|Abarrotes Básicos y Procesados|Abarrotes Básicos y Procesados",
+      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,
       company_name: "GRUPO BRAHMA",
       country: "México",
-      id_category: "4004",
-      id_datasheet_especialist: null,
-      id_datasheet_facilitator: null,
-      id_description_especialist: null,
-      id_description_facilitator: null,
+      id_order: 15275,
+      id_datasheet_especialist: 54,
+      id_datasheet_facilitator: 52,
+      id_description_especialist: 54,
+      id_description_facilitator: 52,
       id_images_especialist: 55,
       id_images_facilitator: 53,
-      id_order: 15190,
-      id_article: 39364,
       id_auditor: 37,
-      name: "test 2 img ba",
-      timestamp: "2023-05-05T02:56:16.000Z",
-      upc: "4353242",
+      id_recepcionist: null,
+      category: "Abarrotes|Abarrotes Secos|Frutos Secos",
+      missingAttributes: 0,
+      missingDescriptions: 0,
+      missingImages: 0,
     },
     retailers: [
       {
-        id: 70,
-        name: "Bodega Aurrera",
+        id: 34,
+        name: "San Pablo",
       },
     ],
-    statusByRetailer: {
-      70: {
-        images: "RA/AC",
-      },
-    },
+    country: "México",
+    upc: "7543453453",
   },
   location: {
-    product: { articleId: 39364, versionId: 3 },
+    product: { articleId: 354, versionId: 3 },
     state: {
       withChat: true,
       chatType: "product_status",
@@ -83,7 +87,7 @@ RetailerProductEditionDefault.args = {
     position: "Auditor",
     telephone: "",
     country: "México",
-    id_company: 254,
+    id_company: 2,
     id_cognito: "9a213128-6482-4c16-a4b6-6e64f225b1bd",
     birth_Date: null,
     about_me: "",
@@ -97,16 +101,16 @@ RetailerProductEditionDefault.args = {
     email_notify: 1,
     is_user_tech: null,
     membership: {
-      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",
+      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",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-37/37.png?1701902088068",
+    src: "https://content-management-profile.s3.amazonaws.com/id-37/37.png?1692750648813",
   },
 };