contentoh-components-library 21.1.23 → 21.1.26

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

@@ -33,6 +33,13 @@ import { Link } from "react-router-dom";
 import face from "../../../assets/images/defaultImages/defaultProfileImage.svg";
 import errorModal from "../../../assets/images/genericModal/errorModal.svg";
 import { GlobalModal } from "../../organisms/GlobalModal/index";
+import { SliderToolTip } from "../../atoms/SliderToolTip";
+import InfoIcon from "../../../assets/images/sliderToolTip/infoIcon.svg";
+import Slide1_1 from "../../../assets/images/sliderToolTip/slide1.svg";
+import Slide1_2 from "../../../assets/images/sliderToolTip/slide2.svg";
+import Slide1_3 from "../../../assets/images/sliderToolTip/slide3.svg";
+import Slide1_4 from "../../../assets/images/sliderToolTip/slide4.svg";
+import Slide1_5 from "../../../assets/images/sliderToolTip/slide5.svg";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs } = state;
@@ -406,7 +413,6 @@ export const ProviderProductEdition = ({
 
   const saveDescriptions = async () => {
     setLoading(true);
-    const productTemp = product;
     const dataObject = {
       articleId: product?.id_article,
       articleData: updatedDescriptions,
@@ -422,12 +428,6 @@ export const ProviderProductEdition = ({
           },
         }
       );
-      if (productTemp.status === "ASSIGNED") {
-        productTemp.status = "IN_PROGRESS";
-        setProduct(productTemp);
-        sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
-      }
-
       setMessage("Descripciones guardadas con éxito");
       loadData();
     } catch (error) {
@@ -453,11 +453,6 @@ export const ProviderProductEdition = ({
         }
       );
       setMessage("Fichas técnicas guardadas");
-      if (productTemp.status === "ASSIGNED") {
-        productTemp.status = "IN_PROGRESS";
-        setProduct(productTemp);
-        sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
-      }
       loadData();
     } catch (error) {
       console.log(error);
@@ -699,14 +694,23 @@ export const ProviderProductEdition = ({
   };
 
   const downloadImages = () => {
-    selectedImages.forEach((e) => {
-      if (e.id) {
-        saveAs(
-          `https://${process.env.REACT_APP_IMAGES_BUCKET}.s3.amazonaws.com/${e.srcDB}`,
-          `${product.article.upc}_${e.name}.${e.ext}`
-        );
-      }
-    });
+    selectedImages.length > 0
+      ? selectedImages.forEach((e) => {
+          if (e.id) {
+            saveAs(
+              `https://${process.env.REACT_APP_IMAGES_BUCKET}.s3.amazonaws.com/${e.srcDB}`,
+              `${product.upc || product.article.upc}_${e.name}.${e.ext}`
+            );
+          }
+        })
+      : images?.values?.forEach((e) => {
+          if (e.id) {
+            saveAs(
+              `https://${process.env.REACT_APP_IMAGES_BUCKET}.s3.amazonaws.com/${e.srcDB}`,
+              `${product.upc || product.article.upc}_${e.name}.${e.ext}`
+            );
+          }
+        });
   };
 
   const deleteImages = () => {
@@ -782,26 +786,6 @@ export const ProviderProductEdition = ({
     }
   };
 
-  const specialistValid = (tab) => {
-    let concept = "";
-    switch (tab) {
-      case "Ficha técnica":
-        concept = "datasheet";
-        break;
-      case "Imágenes":
-        concept = "images";
-        break;
-      case "Descripción":
-        concept = "description";
-        break;
-    }
-    return (
-      product[`${concept}_status`] === "IN_PROGRESS" ||
-      product[`${concept}_status`] === "RF" ||
-      product[`${concept}_status`] === "RA"
-    );
-  };
-
   const confirmStatusComplete = () => {
     const { datasheet_status, description_status, images_status } = product;
     const completionStates =
@@ -842,7 +826,6 @@ export const ProviderProductEdition = ({
         articleId: product.id_article,
         orderId: product.id_order ?? product.orderId,
         concept,
-        retailerId,
       };
       axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
         headers: {
@@ -869,6 +852,52 @@ export const ProviderProductEdition = ({
     showSurvey && showSurvey(confirmStatusComplete());
   };
 
+  const validateAll = async (result) => {
+    try {
+      const evaluationArray = [];
+      const sendAll = [];
+      const conceptArray = ["description", "datasheet", "images"];
+      console.log(servicesData);
+
+      servicesData?.forEach((ret) => {
+        let data = {
+          articleId: product.id_article,
+          orderId: product.id_order ?? product.orderId,
+          concept: ret.service,
+          result: result,
+          retailerId: ret.id_retailer,
+        };
+        evaluationArray.push(
+          axios.put(`${process.env.REACT_APP_EVALUATION_ENDPOINT}`, data, {
+            headers: {
+              Authorization: token,
+            },
+          })
+        );
+      });
+
+      conceptArray.forEach((concept) => {
+        let data = {
+          articleId: product.id_article,
+          orderId: product.id_order ?? product.orderId,
+          concept,
+        };
+        sendAll.push(
+          axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
+            headers: {
+              Authorization: token,
+            },
+          })
+        );
+      });
+
+      Promise.all(conceptArray);
+      Promise.all(sendAll);
+    } catch (error) {
+      console.log(error);
+    }
+  };
+
   const evaluationToRetailer = async (result) => {
     const data = {
       articleId: product.id_article,
@@ -919,10 +948,47 @@ export const ProviderProductEdition = ({
     }
   };
 
+  const slidefront = [
+    {
+      slide: Slide1_1,
+      description:
+        "Creamos tu contenido, y todo lo que haga falta para tu producto, cada sección puedes socilitar contenido enriquecido, y nosotros lo haremos por ti.",
+    },
+    {
+      slide: Slide1_2,
+      description:
+        "Puedes agregar solicitudes de contenido enriquecido a tu carrito de compra las veces que sean necesarias. Una vez completada tu lista con los servicios necesitados sigue el proceso de compra en checkout.",
+    },
+    {
+      slide: Slide1_3,
+      description:
+        "Revisa el contenido que deseas solicilitar, valida y tambien puedes agregar contenido extra, traducciones, o simplemente completar el checkout.",
+    },
+    {
+      slide: Slide1_4,
+      description:
+        "Elige el tipo de entrega de tu producto, puedes ser recolección en el lugar o por el contrario puedes dejarlo en nuestras oficinas.",
+    },
+    {
+      slide: Slide1_5,
+      title: "Bienvenido al modo Content-oh!",
+      description:
+        "Finalmente elige la forma de pago que más te guste, procede con el pago y listo.",
+    },
+  ];
+
   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} />
@@ -956,6 +1022,14 @@ 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={() => {
               if (
                 origin[activeTab] === "RequestWithoutContentoh" &&
@@ -1197,14 +1271,22 @@ export const ProviderProductEdition = ({
                   </Link>
                 </button>
               ) : (
-                <Button
-                  onClick={() => {
-                    setShowContentohRequestModal &&
-                      setShowContentohRequestModal(true);
-                  }}
-                  buttonType="general-default-button"
-                  label="Enviar a Content-oh!"
-                />
+                <>
+                  <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!"
+                  />
+                </>
               )}
             </div>
           )}

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

@@ -16,7 +16,7 @@ RetailerProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJhNmM0ZDNkNi0yNGE0LTQxZDQtYWQwZi1kMDg3NDM4YWI1YjYiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6ImE2YzRkM2Q2LTI0YTQtNDFkNC1hZDBmLWQwODc0MzhhYjViNiIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiIxMDEyMmE5OC0wMDc1LTQxYmMtYjkxMi02NjBiNTE2MzMxMDQiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY1NTc1NDEyNSwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY1NTc1NzcyNSwiaWF0IjoxNjU1NzU0MTI1LCJlbWFpbCI6ImV0Y0Bjb250ZW50b2guY29tIn0.KFEGYLEDArzX7rXRsXo4wCc6nuSxATU6E8aL_XSCJyvYk3F2fn-cslstPX-zEgG1uybmzXfxMvSfnhjMGe1hCdxpHXXrcq4Khm6jlHcnsF62QUdIz5gPqZDoXjegctkCqQtTYhuZEhxhXmHn9Ijj3rSdk2_5-4AKYx89l9p1_G3u1EN8Vs1jH6BuE2v7u1wv45QQ9KB6h7s8DLZF_SfmivlJbQrqKmOzbwlDBpll94rRffKjHXzJtXx0YmKM--zU0E3dzAEdq-UcfEnM7GpC-SV__xMoLK7Rj7yTAq1fTHEfcMnAFBzkSoPjNAUi5xBw9GLCxt55DmZlVfvKyfzx6Q",
+    "eyJraWQiOiJEV3owZnNieXg2MXNFcVduN3RCXC81bVhod3ZNbFZIOTgwUnZcL3RjT0lKdEk9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIwYjY2YTRhOS03NzkwLTQwMzQtYTMwYS1jMDA4MDg5NjI4NjciLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfbFN6UVo0WjdSIiwiY29nbml0bzp1c2VybmFtZSI6IjBiNjZhNGE5LTc3OTAtNDAzNC1hMzBhLWMwMDgwODk2Mjg2NyIsImF1ZCI6IjUyZDlza2tkY2c4cWpwODhvb2sxdXNlNm1rIiwiZXZlbnRfaWQiOiJkMjc2ZGUwMy01YmM3LTRkZjEtYTk4MC1jYmYwYjkyOGU3MDEiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY1NjEwMDM2MSwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY1NjEwMzk2MSwiaWF0IjoxNjU2MTAwMzYxLCJlbWFpbCI6ImJheWFkaTE1MzhAbW5xbG0uY29tIn0.WmbNT419c79ZIIZIxT8bW6YjSAvlGW_36cehBQWtdPPIeeRWO1ZVOkJeimGNm9dKwIVzdieg13mUPmJOcFZMQGtNoj4yOYOhSrQBEOg4Gr3Rv94RAEa-AcoFNns55Cl98krqF42qoYYeFRV9nH1iZrMU2sEML6kxwWgxAza5eXFie_MioMphXxMsWj3BT5Fmzk8SSHsAuf8jIjUTdGtFsNv2TOOU8YjTlljYij9cvLpu9Udlaj6tVnnElCcGskQk-U7QXqjHYDpOgeEkdWZU-Cy-vm4bT6qYCQHNtMxVCu_RZPpNm_p3vSWgkhj__baJsffhsb-PAETQKPTLuT690w",
   articleId: 238,
   category: 846,
   version: 2,
@@ -26,39 +26,39 @@ RetailerProductEditionDefault.args = {
       descriptions: 1,
       images: 1,
     },
-    orderId: 83,
-    status: "ASSIGNED",
-    datasheet_status: "IN_PROGRESS",
-    prio: "none",
+    orderId: 1213,
+    status: "AA",
+    datasheet_status: "AA",
+    prio: "low",
     version: 2,
-    description_status: "IN_PROGRESS",
-    images_status: "IN_PROGRESS",
+    description_status: "AA",
+    images_status: "AA",
     article: {
-      id_article: 55150,
-      id_category: "697",
-      name: "Shampoo hidratante",
-      upc: "4116665",
-      timestamp: "2022-06-21T19:47:57.000Z",
-      id_user: 28,
-      status: "NULL",
+      id_article: 17517,
+      id_category: "691",
+      name: "Antitranspirante Lady Speed Stick Clinical Complete en Barra para Dama 45 g",
+      upc: "7509546066172",
+      timestamp: "2021-10-09T16:33:17.000Z",
+      id_user: 203,
+      status: "RECEPTION",
       active: 1,
-      company_id: 1,
-      company_name: "COMPANY DEV",
-      country: "México",
-      id_order: 83,
-      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_auditor: 30,
+      company_id: 226,
+      company_name: "Prueba Test S.A de C.V.",
+      country: "null",
+      id_order: 1213,
+      id_datasheet_especialist: 334,
+      id_datasheet_facilitator: 158,
+      id_description_especialist: 334,
+      id_description_facilitator: 158,
+      id_images_especialist: 366,
+      id_images_facilitator: 14,
+      id_auditor: 94,
       id_recepcionist: null,
       category:
-        "SALUD Y BELLEZA|CUIDADO DEL CABELLO|SHAMPOOS Y ACONDICIONADORES",
-      missingAttributes: 31,
-      missingDescriptions: 6,
-      missingImages: 3,
+        "SALUD Y BELLEZA|CUIDADO CORPORAL|DESODORANTES CABALLERO Y DAMA",
+      missingAttributes: 1,
+      missingDescriptions: 0,
+      missingImages: -4,
     },
     retailers: [
       {
@@ -69,49 +69,57 @@ RetailerProductEditionDefault.args = {
         active: 1,
       },
       {
-        id: 26,
-        name: "Mercado Libre",
+        id: 6,
+        name: "HEB",
+        country: "México",
+        id_region: 1,
+        active: 1,
+      },
+      {
+        id: 29,
+        name: "Farmacias del Ahorro",
         country: "México",
         id_region: 1,
         active: 1,
       },
     ],
-    country: "México",
-    upc: "4116665",
+    country: "null",
+    upc: "7509546066172",
   },
   location: {
     product: { articleId: 109485, versionId: 3 },
   },
   user: {
-    id_user: 51,
-    name: "ADMIN PRUEBA",
-    last_name: "",
-    email: "etc@contentoh.com",
-    position: null,
+    id_user: 423,
+    name: "Facilitador Textos",
+    last_name: " ",
+    email: "bayadi1538@mnqlm.com",
+    position: "Tester",
     telephone: null,
     country: null,
-    id_company: 2,
-    id_cognito: "a6c4d3d6-24a4-41d4-ad0f-d087438ab5b6",
+    id_company: 254,
+    id_cognito: "0b66a4a9-7790-4034-a30a-c00808962867",
     birth_Date: null,
     about_me: null,
     zip_code: null,
     address: null,
     job: null,
     id_stripe: null,
-    id_role: 1,
+    id_role: 4,
     active: 1,
     is_retailer: 0,
+    email_notify: 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: 750,
+      start_date: "2022-01-07T21:32:54.000Z",
+      end_date: "2023-01-07T21:32:54.000Z",
+      planID: 6,
+      plan: "prod_KvGd6YSTJyR3AP",
+      name: "Plan Small",
+      user_limit: "10",
+      products_limit: "1000",
+      type: "Enterprise",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-51/51.png?1655754126500",
+    src: "https://content-management-profile-prod.s3.amazonaws.com/id-423/423.png?1656100361978",
   },
 };

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

@@ -174,6 +174,7 @@ export const RetailerProductEdition = ({
     try {
       const services = await getRetailerServices(
         product?.article?.id_article,
+        product?.article?.category,
         parseInt(product?.article?.id_category),
         product?.version
       );
@@ -956,14 +957,23 @@ export const RetailerProductEdition = ({
   };
 
   const downloadImages = () => {
-    selectedImages.forEach((e) => {
-      if (e.id) {
-        saveAs(
-          `https://${process.env.REACT_APP_IMAGES_BUCKET}.s3.amazonaws.com/${e.srcDB}`,
-          `${product.article.upc}_${e.name}.${e.ext}`
-        );
-      }
-    });
+    selectedImages.length > 0
+      ? selectedImages.forEach((e) => {
+          if (e.id) {
+            saveAs(
+              `https://${process.env.REACT_APP_IMAGES_BUCKET}.s3.amazonaws.com/${e.srcDB}`,
+              `${product.article.upc}_${e.name}.${e.ext}`
+            );
+          }
+        })
+      : images?.values?.forEach((e) => {
+          if (e.id) {
+            saveAs(
+              `https://${process.env.REACT_APP_IMAGES_BUCKET}.s3.amazonaws.com/${e.srcDB}`,
+              `${product.article.upc}_${e.name}.${e.ext}`
+            );
+          }
+        });
   };
 
   const deleteImages = () => {

package/src/global-files/data.js

@@ -2,29 +2,41 @@ import axios from "axios";
 import { Base64 } from "js-base64";
 import { v4 as uuidv4 } from "uuid";
 
-export const getRetailerServices = async (articleId, category, version) => {
-  const responseArray = await Promise.all([
-    axios.post(
-      `${process.env.REACT_APP_ARTICLE_DATA_DATASHEET_ENDPOINT}?idCategory=${category}&articleId=${articleId}&version=${version}`
-    ),
-    axios.get(
-      `${process.env.REACT_APP_ARTICLE_DATA_DESCRIPTION_ENDPOINT}?idCategory=${category}&articleId=${articleId}&version=${version}`
-    ),
-    axios.post(
-      `${process.env.REACT_APP_ARTICLE_DATA_IMAGES_ENDPOINT}?idCategory=${category}&articleId=${articleId}&version=${version}`
-    ),
-  ]);
+export const getRetailerServices = async (
+  articleId,
+  category,
+  categoryId,
+  version
+) => {
+  try {
+    const responseArray = await Promise.all([
+      axios.post(
+        `${process.env.REACT_APP_ARTICLE_DATA_DATASHEET_ENDPOINT}?idCategory=${categoryId}&articleId=${articleId}&version=${version}`
+      ),
+      axios.get(
+        `${process.env.REACT_APP_ARTICLE_DATA_DESCRIPTION_ENDPOINT}?idCategory=${categoryId}&articleId=${articleId}&version=${version}`
+      ),
+      axios.post(
+        `${process.env.REACT_APP_ARTICLE_DATA_IMAGES_ENDPOINT}?articleId=${articleId}&version=${version}`,
+        {
+          category,
+        }
+      ),
+    ]);
 
-  const datasheets = JSON.parse(responseArray[0].data.body).data;
-  const descriptions = JSON.parse(responseArray[1].data.body).data;
-  const images = JSON.parse(responseArray[2].data.body).data;
+    const datasheets = JSON.parse(responseArray[0].data.body).data;
+    const descriptions = JSON.parse(responseArray[1].data.body).data;
+    const images = JSON.parse(responseArray[2].data.body).data;
 
-  images.values = images?.values?.map((value) => {
-    value.name = images.inputs.find((e) => e.id === value.image_id).name;
-    return getImage(value);
-  });
+    images.values = images?.values?.map((value) => {
+      value.name = images.inputs.find((e) => e.id === value.image_id)?.name;
+      return getImage(value);
+    });
 
-  return [datasheets, descriptions, images];
+    return [datasheets, descriptions, images];
+  } catch (error) {
+    console.log(error);
+  }
 };
 
 export const getImage = (imageGeneral, width = 250, height = 250) => {

package/src/index.js

@@ -22,7 +22,6 @@ export * from "./components/atoms/SliderToolTip/index";
 export * from "./components/atoms/StatusTag/index";
 export * from "./components/atoms/TabSection/index";
 export * from "./components/atoms/ValidationPanel/index";
-export * from "./components/atoms/VerticalSideMenuMainPage/index";
 
 //molecules
 export * from "./components/molecules/AvatarAndValidation/index";