contentoh-components-library 21.3.82 → 21.3.83

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

@@ -24,20 +24,15 @@ import descriptionSent from "../../../assets/images/modalsSVGs/descriptionSent.s
 import imagesSent from "../../../assets/images/modalsSVGs/uploadingImages.svg";
 import { TagAndInput } from "../../molecules/TagAndInput/index";
 import { Button } from "../../atoms/GeneralButton";
+import { Commentary } from "../../atoms/Commentary";
 import { GenericModal } from "../../atoms/GenericModal";
 import { ScreenHeader } from "../../atoms/ScreenHeader";
 import { Loading } from "../../atoms/Loading";
 import succes from "../../../assets/images/genericModal/genericModalCheck.svg";
+import errorModal from "../../../assets/images/genericModal/errorModal.svg";
 import { VersionSelector } from "../../organisms/VersionSelector";
 import { useCloseModal } from "../../../global-files/customHooks";
-import {
-  getAuditVersion,
-  getInputsData,
-  createMessage,
-  sendMessage,
-} from "./utils";
-import { Modal } from "../../organisms/Modal";
-import { ButtonV2 } from "../../atoms/ButtonV2";
+import { getAuditVersion, getInputsData } from "./utils";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs, inputsByRetailer } = state;
@@ -137,7 +132,6 @@ export const RetailerProductEdition = ({
   const [datasheets, setDatasheets] = useState([]);
   const [images, setImages] = useReducer(reducerImages, {});
   const [showModal, setShowModal] = useState(false);
-  const [showRejectModal, setShowRejectModal] = useState(false);
   const { getRootProps, getInputProps } = useDropzone({
     accept: "image/*",
     noKeyboard: true,
@@ -224,7 +218,10 @@ export const RetailerProductEdition = ({
   const [auditDescriptions, setAuditDescriptions] = useState([]);
   const [auditImages, setAuditImages] = useState([]);
   const [compare, setCompare] = useState(false);
-  const [valRejAll, setValRejAll] = useState(false);
+
+  const [desc, setDesc] = useState([])
+  const [fich, setFich] = useState([])
+  const [imag, setImag] = useState([])
 
   useEffect(async () => {
     const { id_article } = product?.article || {};
@@ -862,25 +859,6 @@ export const RetailerProductEdition = ({
         const { newStatus, newOrderStatus, newArticleStatus } = JSON.parse(
           res.data.body
         );
-        const messageToChat = createMessage(
-          product.retailers,
-          activeRetailer.id,
-          evalStatus,
-          newStatus,
-          activeTab
-        );
-
-        const data = {
-          paramsBody: {
-            id: product.article.id_article,
-            version: version,
-            items: [{ type: "status", value: messageToChat }],
-            retailerId: activeRetailer.id,
-            status: product.status,
-          },
-          paramsHeader: { Authorization: token },
-        };
-        await sendMessage(data);
         if (newOrderStatus) productTemp.status = newArticleStatus[articleId];
         productTemp[`${concept}_status`] = newStatus;
         await loadData();
@@ -923,19 +901,35 @@ export const RetailerProductEdition = ({
     return product?.article[`id_auditor`] === user.id_user;
   };
 
-  const createComment = async (messages = [], retailerId) => {
+  const createComment = async (e, body, tab) => {
+    let concept = "";
+    switch (activeTab) {
+      case "Ficha técnica":
+        concept = "datasheet";
+        break;
+      case "Imágenes":
+        concept = "images";
+        break;
+
+      default:
+        concept = "description";
+        break;
+    }
     const data = {
-      paramsBody: {
-        id: product.article.id_article,
-        version: version,
-        items: messages,
-        retailerId: retailerId,
-        status: product.status,
-      },
-      paramsHeader: { Authorization: token },
+      articleId: product?.article?.id_article,
+      orderId: product?.orderId,
+      message: body?.replace(/<.*?\/?>/gm, ""),
+      concept: concept,
+      version: version,
     };
+    await axios.post(`${process.env.REACT_APP_COMMENTS_ENDPOINT}`, data, {
+      headers: {
+        Authorization: token,
+      },
+    });
+    await getComments(tab);
     setMessage("");
-    return sendMessage(data);
+    setComponentsArray([]);
   };
 
   const getRequired = (services) => {
@@ -1217,8 +1211,6 @@ export const RetailerProductEdition = ({
           break;
       }
 
-      const messages = [];
-
       servicesData?.forEach((ret) => {
         if (conceptArray.includes(ret.service)) {
           let data = {
@@ -1229,21 +1221,6 @@ export const RetailerProductEdition = ({
             evalStatus: ret.status,
             retailerId: ret.id_retailer,
           };
-          if (product[`${ret.service}_status`] !== "NS") {
-            const message = createMessage(
-              product.retailers,
-              ret.id_retailer,
-              product[`${ret.service}_status`],
-              `${result}A`,
-              ret.service
-            );
-            messages.push(
-              createComment(
-                [{ type: "status", value: message }],
-                ret.id_retailer
-              )
-            );
-          }
           evaluationArray.push(
             axios.put(`${process.env.REACT_APP_EVALUATION_ENDPOINT}`, data, {
               headers: {
@@ -1253,19 +1230,19 @@ export const RetailerProductEdition = ({
           );
         }
       });
+
       await Promise.all(evaluationArray);
 
       const productTemp = product;
       productTemp.status = `${result}A`;
       productTemp.datasheet_status =
-        productTemp.datasheet_status === "NS" ? "NS" : `${result}A`;
+        productTemp.datasheet_status === "NA" ? "NA" : `${result}A`;
       productTemp.description_status =
-        productTemp.description_status === "NS" ? "NS" : `${result}A`;
+        productTemp.description_status === "NA" ? "NA" : `${result}A`;
       productTemp.images_status =
-        productTemp.images_status === "NS" ? "NS" : `${result}A`;
+        productTemp.images_status === "NA" ? "NA" : `${result}A`;
       sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
       setProduct(productTemp);
-      const messagesResponse = await Promise.all(messages);
 
       await loadData();
     } catch (error) {
@@ -1281,10 +1258,8 @@ export const RetailerProductEdition = ({
         setCompare={setCompare}
         isAuditor={[1, 6].includes(user.id_role)}
         withChat={location?.state?.withChat}
-        chatType={location?.state?.chatType}
-        productSelected={product}
+        productSelected={productSelected}
         token={token}
-        activeRetailer={activeRetailer}
       />
       <div className="data-container">
         <div className="image-data-panel">
@@ -1324,7 +1299,36 @@ export const RetailerProductEdition = ({
               sendToFacilitator("A");
             }}
             reject={() => {
-              setShowRejectModal(true);
+              sendToFacilitator("R");
+              setMessage("Rechazado");
+              setComponentsArray([
+                <img src={errorModal} />,
+                <ScreenHeader
+                  text={"Agrega tu comentarios para enviar el rechazo"}
+                  headerType={"input-name-header"}
+                  color={"white"}
+                />,
+                <TagAndInput
+                  label={"Caja de Comentario"}
+                  inputType={"textarea"}
+                  inputId={"modal-commentary-box"}
+                  index={0}
+                  color={"white"}
+                />,
+                <Button
+                  buttonType={"general-default-button"}
+                  label={"Enviar comentario"}
+                  onClick={(e) =>
+                    createComment(
+                      e,
+                      document.querySelector(
+                        "#modal-commentary-box .ql-container .ql-editor > p"
+                      ).innerHTML,
+                      activeTab
+                    )
+                  }
+                />,
+              ]);
             }}
             showApproveRejectAll={
               approveRejectAllButtons() && (auditorAssigned() || userAssigned())
@@ -1334,8 +1338,36 @@ export const RetailerProductEdition = ({
             }
             approveAll={() => validateAll("A")}
             rejectAll={() => {
-              setShowRejectModal(true);
-              setValRejAll(true);
+              validateAll("R");
+              setMessage("Rechazado");
+              setComponentsArray([
+                <img src={errorModal} />,
+                <ScreenHeader
+                  text={"Agrega tu comentarios para enviar el rechazo"}
+                  headerType={"input-name-header"}
+                  color={"white"}
+                />,
+                <TagAndInput
+                  label={"Caja de Comentario"}
+                  inputType={"textarea"}
+                  inputId={"modal-commentary-box"}
+                  index={0}
+                  color={"white"}
+                />,
+                <Button
+                  buttonType={"general-default-button"}
+                  label={"Enviar comentario"}
+                  onClick={(e) =>
+                    createComment(
+                      e,
+                      document.querySelector(
+                        "#modal-commentary-box .ql-container .ql-editor > p"
+                      ).innerHTML,
+                      activeTab
+                    )
+                  }
+                />,
+              ]);
             }}
           />
           <FullTabsMenu
@@ -1351,13 +1383,20 @@ export const RetailerProductEdition = ({
             isRetailer={isRetailer}
             showSaveButton={auditorAssigned() || userAssigned()}
             version={version}
+
+            desc={ desc }
+            setDesc={ setDesc }
+            fich={fich}
+            setFich={setFich}
+            imag={imag}
+            setImag={setImag}
             updatedDescriptions={updatedDescriptions}
             updatedDatasheets={updatedDatasheets}
-            images={images}
             selectedImages={selectedImages}
             setUpdatedDescriptions={setUpdatedDescriptions}
             setUpdatedDatasheets={setUpdatedDatasheets}
             setSelectedImages={setSelectedImages}
+
             setShowVersionSelector={setShowVersionSelector}
             onClickSave={() => {
               switch (activeTab) {
@@ -1436,7 +1475,7 @@ export const RetailerProductEdition = ({
                       version={version}
                       dinamicHeight={true}
                       compare={compare}
-                    />
+                    />            
                   ) : (
                     <ScreenHeader
                       text={"No cuentas con este servicio"}
@@ -1464,6 +1503,47 @@ export const RetailerProductEdition = ({
           {(userAssigned(activeTab) || auditorAssigned()) &&
             product[`${getConcept(activeTab)}_status`] !== "NS" && (
               <div className="commentary-box">
+                {!comment ? (
+                  <div className="commentary">
+                    <TagAndInput
+                      label={"Caja de Comentario"}
+                      inputType={"textarea"}
+                      inputCols={80}
+                      inputRows={4}
+                      inputId={"commentary-box"}
+                      index={0}
+                    />
+                    <div className="buttons-box">
+                      <Button
+                        buttonType={"general-transparent-button"}
+                        label={"Enviar comentario"}
+                        onClick={(e) =>
+                          createComment(
+                            e,
+                            document.querySelector(
+                              "#commentary-box .ql-container .ql-editor > p"
+                            ).innerHTML,
+                            activeTab
+                          )
+                        }
+                      />
+                    </div>
+                  </div>
+                ) : (
+                  <div className="feedback-box">
+                    <Commentary
+                      comment={comment?.message?.replace(/<.*?\/?>/gm, "")}
+                      reviewed={crossComment}
+                    />
+                    <Button
+                      buttonType={"circular-button accept-button"}
+                      onClick={async () => {
+                        setCrossComment(true);
+                        commentRevised();
+                      }}
+                    />
+                  </div>
+                )}
                 {[7, 8].includes(user.id_role) && (
                   <Button
                     buttonType={
@@ -1521,49 +1601,6 @@ export const RetailerProductEdition = ({
           jwt={token}
         />
       )}
-      {showRejectModal && (
-        <Modal
-          title={`Agregar mensaje de rechazo para ${activeTab?.toLowerCase()}`}
-          show={showRejectModal}
-          customComponent={
-            <TagAndInput
-              inputType={"textarea"}
-              inputId={"modal-message-box"}
-              index={0}
-              color={"white"}
-            />
-          }
-          buttons={[
-            <ButtonV2
-              key={"btn-Cancelar"}
-              type={"white"}
-              label={"Cancelar"}
-              size={12}
-              onClick={() => {
-                setShowRejectModal(false);
-              }}
-            />,
-            <ButtonV2
-              key={"btn-Aceptar"}
-              type={"pink"}
-              label={"Aceptar"}
-              size={12}
-              onClick={async () => {
-                const body = document.querySelector(
-                  "#modal-message-box .ql-container .ql-editor > p"
-                ).innerHTML;
-                const messages = [
-                  { type: "message", value: body?.replace(/<.*?\/?>/gm, "") },
-                ];
-                await createComment(messages, activeRetailer.id);
-                valRejAll ? validateAll("R") : sendToFacilitator("R");
-                setMessage("Rechazado");
-                setShowRejectModal(false);
-              }}
-            />,
-          ]}
-        />
-      )}
     </Container>
   );
 };

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

@@ -89,10 +89,6 @@ export const Container = styled.div`
       }
     }
   }
-  #modal-message-box {
-    width: 400px;
-    height: 100px;
-  }
   .container {
     width: 100%;
     height: 100%;

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

@@ -1,5 +1,4 @@
 import axios from "axios";
-import { fetchPOST } from "../../../global-files/handle_http";
 
 export const getAuditVersion = async (articleId, setState, token) => {
   const auditResponse = await axios.get(
@@ -33,39 +32,3 @@ export const getInputsData = (
     setDescriptionState(descriptions);
   }
 };
-
-export const translateService = (tab) => {
-  switch (tab) {
-    case "description":
-    case "Descripción":
-      return "Descripciones";
-    case "datasheet":
-    case "Ficha técnica":
-      return "Fichas técnicas";
-    case "images":
-    case "Imágenes":
-      return "Imágenes";
-  }
-};
-
-export const createMessage = (
-  retailers,
-  idRetailer,
-  oldStatus,
-  newStatus,
-  service
-) => {
-  const [retailer] = retailers?.filter((ret) => ret.id === idRetailer) || [];
-  return `${translateService(service)} de ${
-    retailer.name
-  } |${oldStatus}| a |${newStatus}`;
-};
-
-export const sendMessage = async (data) => {
-  const { paramsBody, paramsHeader } = data;
-  return fetchPOST(
-    process.env.REACT_APP_CREATE_MESSAGES,
-    paramsBody,
-    paramsHeader
-  );
-};

package/src/global-files/handle_http.js

@@ -4,8 +4,7 @@ const objToQueryString = (obj) => {
   if (!Object.values(obj).length) return null;
   return Object.entries(obj)
     .map(
-      //([key, value]) => `${key}=${encodeURIComponent(JSON.stringify(value))}`
-      ([key, value]) => `${key}=${encodeURIComponent(value)}`
+      ([key, value]) => `${key}=${encodeURIComponent(JSON.stringify(value))}`
     )
     .join("&");
 };

package/src/index.js

@@ -63,8 +63,6 @@ export * from "./components/molecules/ButtonDownloadFile/index";
 export * from "./components/molecules/ImageTooltip/index";
 export * from "./components/molecules/SelectV2/index";
 export * from "./components/molecules/Dropdown/index";
-export * from "./components/molecules/StripeCardForm/index";
-export * from "./components/molecules/StripeCardSelector/index";
 
 //organisms
 export * from "./components/organisms/ChangePassword/index";
@@ -81,7 +79,6 @@ export * from "./components/organisms/Modal/index";
 export * from "./components/organisms/OrderDetail/index";
 export * from "./components/organisms/RangeCalendar";
 export * from "./components/organisms/TableResizable";
-export * from "./components/organisms/SideModal/index";
 
 //pages
 export * from "./components/pages/ChangePasswordLogin";

package/src/components/molecules/StripeCardForm/StripeCardForm.stories.js

@@ -1,13 +0,0 @@
-import { StripeCardForm } from ".";
-
-export default {
-  title: "Components/molecules/StripeCardForm",
-  component: StripeCardForm,
-};
-
-const Template = (args) => <StripeCardForm {...args} />;
-export const StripeCardFormDefault = Template.bind({});
-StripeCardFormDefault.args = {
-  customerId: "cus_KuEt6R6vwmN09f",
-  jwt: "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJmNTkyN2Y4ZS1jYmY3LTQ5MjItOWUwOS1lNjllYzBiMjczMWEiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6ImY1OTI3ZjhlLWNiZjctNDkyMi05ZTA5LWU2OWVjMGIyNzMxYSIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI5ZjQzNjAwMC0wYzgyLTRjNzYtYWEzNi1kM2Q1NGJjZTZiMTMiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4NTU2OTUyMywibmFtZSI6IklzbWFlbCBMb3BleiIsInBob25lX251bWJlciI6Iis1MjMxMTEzNjYzMzYiLCJleHAiOjE2ODU1NzMxMjMsImlhdCI6MTY4NTU2OTUyMywiZW1haWwiOiJpbG9wZXpAY29udGVudG9oLmNvbSJ9.EotcxmtkUpBxwlXa3bo25iLAmRcT0kj1G3PVITVB_0ZtF8UC19rJIMTNSc1hYkl8cbfCuB_vkjYCAxi4b2SOru5MdMTRhgNjcQTVbiwIYww-QdUWq0WSv84nW_HaRoxCJ8ezm-wBZgUTpcD3VFuynUICbODKKHUfxVdKdVoAM6GGE6ymSbO7-0C7ZumoWEqaZ22BF4G1H-JvLkR-tL5iqXa2N-QCnNoteFmHstBfH6Sp5UZhPav1VBEGRmwdFfUnC-Xc-aNeIFwgWCXMsOXFWbbmWeh0uNF-Btu-QEJ7VkCu4pbElqHWJKBYLCx1zqDBrKrsrNxyvQlxsJ9NSOae8Q",
-};

package/src/components/molecules/StripeCardForm/index.js

@@ -1,42 +0,0 @@
-import { Container } from "./styles";
-import { useEffect, useState } from "react";
-import { loadStripe } from "@stripe/stripe-js";
-import { Elements } from "@stripe/react-stripe-js";
-import { PaymentForm } from "./paymentForm";
-import { Loading } from "../../atoms/Loading";
-const stripeApiKey = loadStripe(`${process.env.REACT_APP_KEY_STRIPE}`);
-
-export const StripeCardForm = ({
-  setToken,
-  setCard,
-  setStripe,
-  setModalErrorCard,
-  setMsj,
-}) => {
-  const [stripeLoaded, setStripeLoaded] = useState(false);
-
-  const loadStripeJS = async () => {
-    await stripeApiKey;
-    setStripeLoaded(true);
-  };
-  useEffect(() => {
-    loadStripeJS();
-  }, []);
-
-  return stripeLoaded ? (
-    <Container>
-      <Elements stripe={stripeApiKey}>
-        <PaymentForm
-          labelForm={"Pago con tarjeta"}
-          setToken={setToken}
-          setCard={setCard}
-          setStripe={setStripe}
-          setModalErrorCard={setModalErrorCard}
-          setMsj={setMsj}
-        />
-      </Elements>
-    </Container>
-  ) : (
-    <Loading />
-  );
-};

package/src/components/molecules/StripeCardForm/paymentForm.js

@@ -1,124 +0,0 @@
-import { useState } from "react";
-import { PaymentFormContainer } from "./styles";
-import {
-  useStripe,
-  useElements,
-  CardNumberElement,
-  CardExpiryElement,
-  CardCvcElement,
-} from "@stripe/react-stripe-js";
-import { useEffect } from "react";
-
-export const PaymentForm = ({
-  labelForm = "Pago con tarjeta",
-  setToken,
-  setCard,
-  setStripe,
-  setModalErrorCard,
-  setMsj,
-}) => {
-  const stripe = useStripe();
-  const elements = useElements();
-  const [cardName, setCardName] = useState("");
-  const [valuesComplete, setValuesComplete] = useState({
-    name: false,
-    number: false,
-    cvc: false,
-    exp: false,
-  });
-
-  const handleIputChange = (event, key) => {
-    const temp = { ...valuesComplete };
-    if (key === "name") {
-      temp[key] = event?.length;
-      setValuesComplete(temp);
-    } else {
-      temp[key] = event.complete;
-      setValuesComplete(temp);
-    }
-  };
-
-  /**
-   * Este método crea un nuevo token que será enviado a la bd para generar una nueva tarjeta
-   */
-  const createToken = async () => {
-    /* isNew values
-      1: is new
-      0: use card existing
-      -1: use other payment metoh */
-    let token = "";
-    token = await stripe.createToken(elements.getElement(CardNumberElement));
-
-    const { error, paymentMethod } = await stripe.createPaymentMethod({
-      type: "card",
-      card: elements.getElement(CardNumberElement),
-      billing_details: {
-        name: cardName,
-      },
-    });
-
-    try {
-      if (token.token) {
-        token = token.token.id;
-      } else {
-        setModalErrorCard && setModalErrorCard(true);
-        setMsj && setMsj(token.error.message);
-      }
-
-      paymentMethod.isNew = 1;
-      setToken && setToken(token);
-      setCard && setCard(paymentMethod);
-    } catch (err) {
-      console.log(err, error);
-    }
-  };
-
-  useEffect(() => {
-    const valuesArray = Object.values(valuesComplete);
-    const allValuesComplete = valuesArray?.every((val) => val);
-    allValuesComplete ? createToken() : "le falta algo oiga";
-    setStripe && setStripe(stripe);
-  }, [valuesComplete]);
-
-  const handleCardNameChange = (event) => {
-    handleIputChange(event.target.value, "name");
-    setCardName(event.target.value);
-  };
-
-  return (
-    <PaymentFormContainer>
-      <h2>{labelForm}</h2>
-      <div className="card-fields">
-        <div className="element card-name">
-          <label>Nombre en la tarjeta</label>
-          <input
-            className="card-input"
-            value={cardName}
-            onChange={handleCardNameChange}
-          />
-        </div>
-        <div className="element card-number">
-          <label>No. de tarjeta</label>
-          <CardNumberElement
-            className="card-input"
-            onChange={(e) => handleIputChange(e, "number")}
-          />
-        </div>
-        <div className="element expiration-date">
-          <label>Fecha de expiración</label>
-          <CardExpiryElement
-            className="card-input"
-            onChange={(e) => handleIputChange(e, "exp")}
-          />
-        </div>
-        <div className="element cvc-code ">
-          <label>CVC</label>
-          <CardCvcElement
-            className="card-input"
-            onChange={(e) => handleIputChange(e, "cvc")}
-          />
-        </div>
-      </div>
-    </PaymentFormContainer>
-  );
-};