contentoh-components-library 21.4.74 → 21.4.77

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

@@ -24,15 +24,20 @@ 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 } from "./utils";
+import {
+  getAuditVersion,
+  getInputsData,
+  createMessage,
+  sendMessage,
+} from "./utils";
+import { Modal } from "../../organisms/Modal";
+import { ButtonV2 } from "../../atoms/ButtonV2";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs, inputsByRetailer } = state;
@@ -132,6 +137,7 @@ 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,
@@ -218,6 +224,12 @@ 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([]);
+  const [fich, setFich] = useState([]);
+  const [imag, setImag] = useState([]);
 
   useEffect(async () => {
     const { id_article } = product?.article || {};
@@ -441,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 &&
@@ -576,6 +588,7 @@ export const RetailerProductEdition = ({
       active: images?.values?.some((value) => value?.image_id === e?.id),
     }));
     setSocketType(imageInputs);
+    console.log(images);
   }, [images]);
 
   const updateImages = useCallback(async () => {
@@ -821,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 {
@@ -950,6 +885,25 @@ 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();
@@ -992,35 +946,19 @@ export const RetailerProductEdition = ({
     return product?.article[`id_auditor`] === user.id_user;
   };
 
-  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 createComment = async (messages = [], retailerId) => {
     const data = {
-      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,
+      paramsBody: {
+        id: product.article.id_article,
+        version: version,
+        items: messages,
+        retailerId: retailerId,
+        status: product.status,
       },
-    });
-    await getComments(tab);
+      paramsHeader: { Authorization: token },
+    };
     setMessage("");
-    setComponentsArray([]);
+    return sendMessage(data);
   };
 
   const getRequired = (services) => {
@@ -1272,6 +1210,7 @@ export const RetailerProductEdition = ({
   };
 
   useEffect(() => {
+    console.log(servicesData, "servicesData");
     let status = getRetailerStatus(servicesData, activeTab);
     setRetailerStatus(status);
   }, [activeTab, servicesData, activeRetailer]);
@@ -1284,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);
@@ -1366,6 +1241,8 @@ export const RetailerProductEdition = ({
           break;
       }
 
+      const messages = [];
+
       servicesData?.forEach((ret) => {
         if (conceptArray.includes(ret.service)) {
           let data = {
@@ -1385,19 +1262,19 @@ export const RetailerProductEdition = ({
           );
         }
       });
-
       await Promise.all(evaluationArray);
 
       const productTemp = product;
       productTemp.status = `${result}A`;
       productTemp.datasheet_status =
-        productTemp.datasheet_status === "NA" ? "NA" : `${result}A`;
+        productTemp.datasheet_status === "NS" ? "NS" : `${result}A`;
       productTemp.description_status =
-        productTemp.description_status === "NA" ? "NA" : `${result}A`;
+        productTemp.description_status === "NS" ? "NS" : `${result}A`;
       productTemp.images_status =
-        productTemp.images_status === "NA" ? "NA" : `${result}A`;
+        productTemp.images_status === "NS" ? "NS" : `${result}A`;
       sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
       setProduct(productTemp);
+      const messagesResponse = await Promise.all(messages);
 
       await loadData();
     } catch (error) {
@@ -1405,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
@@ -1413,8 +1305,10 @@ export const RetailerProductEdition = ({
         setCompare={setCompare}
         isAuditor={[1, 6].includes(user.id_role)}
         withChat={location?.state?.withChat}
-        productSelected={productSelected}
+        chatType={location?.state?.chatType}
+        productSelected={product}
         token={token}
+        activeRetailer={activeRetailer}
       />
       <div className="data-container">
         <div className="image-data-panel">
@@ -1445,6 +1339,7 @@ export const RetailerProductEdition = ({
         <div className="product-information">
           <FullProductNameHeader
             headerData={product}
+            productObservation= {observation}
             percent={activePercentage}
             activeRetailer={activeRetailer}
             servicesData={servicesData}
@@ -1454,36 +1349,7 @@ export const RetailerProductEdition = ({
               sendToFacilitator("A");
             }}
             reject={() => {
-              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
-                    )
-                  }
-                />,
-              ]);
+              setShowRejectModal(true);
             }}
             showApproveRejectAll={
               approveRejectAllButtons() && (auditorAssigned() || userAssigned())
@@ -1493,36 +1359,8 @@ export const RetailerProductEdition = ({
             }
             approveAll={() => validateAll("A")}
             rejectAll={() => {
-              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
-                    )
-                  }
-                />,
-              ]);
+              setShowRejectModal(true);
+              setValRejAll(true);
             }}
           />
           <FullTabsMenu
@@ -1538,6 +1376,12 @@ export const RetailerProductEdition = ({
             isRetailer={isRetailer}
             showSaveButton={auditorAssigned() || userAssigned()}
             version={version}
+            desc={desc}
+            setDesc={setDesc}
+            fich={fich}
+            setFich={setFich}
+            imag={imag}
+            setImag={setImag}
             updatedDescriptions={updatedDescriptions}
             setUpdatedDescriptions={setUpdatedDescriptions}
             updatedDatasheets={updatedDatasheets}
@@ -1652,47 +1496,6 @@ 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={
@@ -1750,6 +1553,49 @@ 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,6 +89,10 @@ 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,4 +1,5 @@
 import axios from "axios";
+import { fetchPOST } from "../../../global-files/handle_http";
 
 export const getAuditVersion = async (articleId, setState, token) => {
   const auditResponse = await axios.get(
@@ -32,3 +33,39 @@ 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/data.js

@@ -7,27 +7,23 @@ export const getRetailerServices = async (
   category,
   categoryId,
   version,
-  token
+  Authorization
 ) => {
   try {
     const responseArray = await Promise.all([
       axios.post(
         `${process.env.REACT_APP_ARTICLE_DATA_DATASHEET_ENDPOINT}?idCategory=${categoryId}&articleId=${articleId}&version=${version}`,
         {},
-        {
-          headers: {
-            Authorization: token,
-          },
-        }
+        { headers: { Authorization } }
       ),
       axios.get(
-        `${process.env.REACT_APP_ARTICLE_DATA_DESCRIPTION_ENDPOINT}?idCategory=${categoryId}&articleId=${articleId}&version=${version}`
+        `${process.env.REACT_APP_ARTICLE_DATA_DESCRIPTION_ENDPOINT}?idCategory=${categoryId}&articleId=${articleId}&version=${version}`,
+        { headers: { Authorization } }
       ),
       axios.post(
         `${process.env.REACT_APP_ARTICLE_DATA_IMAGES_ENDPOINT}?articleId=${articleId}&version=${version}`,
-        {
-          category,
-        }
+        { category },
+        { headers: { Authorization } }
       ),
     ]);
 

package/src/global-files/variables.js

@@ -15,6 +15,12 @@ export const GlobalColors = {
   finished: "#18A0FB",
   exported: "#71DE56",
   white: "#FFFFFF",
+  gray_light: "#F0F0F0",
+  gray:"#707070",
+  blue_light:"#F7F7FC",
+  purple:"#8A6CAA",
+  gray_medium:"#CBCBCB",
+  black:"#262626",
 };
 
 export const FontFamily = {

package/src/index.js

@@ -33,6 +33,13 @@ export * from "./components/atoms/ImagePreview/index";
 export * from "./components/atoms/InputText/index";
 export * from "./components/atoms/NotFound/index";
 export * from "./components/atoms/Tooltip/index";
+export * from "./components/atoms/UserOption/index";
+export * from "./components/atoms/UserCatalog/index";
+export * from "./components/atoms/UserSelector/index";
+export * from "./components/atoms/ImageCarousel/index";
+export * from "./components/atoms/RetailersList/index";
+export * from "./components/atoms/RetailerOption/index";
+export * from "./components/atoms/RetailerCatalog/index";
 
 //molecules
 export * from "./components/molecules/AvatarAndValidation/index";
@@ -65,6 +72,9 @@ export * from "./components/molecules/SelectV2/index";
 export * from "./components/molecules/Dropdown/index";
 export * from "./components/molecules/StripeCardForm/index";
 export * from "./components/molecules/StripeCardSelector/index";
+export * from "./components/molecules/GridItem/index";
+export * from "./components/molecules/HeaderItem/index";
+export * from "./components/molecules/RowItem/index";
 
 //organisms
 export * from "./components/organisms/ChangePassword/index";
@@ -82,6 +92,7 @@ export * from "./components/organisms/OrderDetail/index";
 export * from "./components/organisms/RangeCalendar";
 export * from "./components/organisms/TableResizable";
 export * from "./components/organisms/SideModal/index";
+export * from "./components/organisms/GridProducts/index";
 export * from "./components/organisms/PanelLayout";
 
 //pages