contentoh-components-library 21.4.21 → 21.4.23

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,11 +218,6 @@ 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 || {};
@@ -572,7 +561,6 @@ export const RetailerProductEdition = ({
       active: images?.values?.some((value) => value?.image_id === e?.id),
     }));
     setSocketType(imageInputs);
-    console.log(images);
   }, [images]);
 
   const updateImages = useCallback(async () => {
@@ -828,26 +816,27 @@ export const RetailerProductEdition = ({
       const articleId = product.article.id_article;
       const orderId = product.orderId;
 
-      let data = {
-        articleId,
-        orderId,
-        concept,
-        evalStatus,
-        retailerId: activeRetailer.id,
+      const body = {
+        orderArticleRetailers: [
+          { orderId, articleId, retailersIds: [activeRetailer.id] },
+        ],
+        isAproved: false,
+        service: concept,
       };
       let res;
       let message;
       if (result) {
-        data.result = result;
-        res = await axios.put(
-          `${process.env.REACT_APP_EVALUATION_ENDPOINT}`,
-          data,
+        body.isAproved = result === "A";
+        res = await axios.post(
+          `${process.env.REACT_APP_EVALUATION_REFACTOR}`,
+          body,
           {
             headers: {
               Authorization: token,
             },
           }
         );
+        console.log(JSON.parse(res.data.body), "res");
         getServices();
       } else {
         const specialistDone = ["RC", "RA", "CA"].includes(evalStatus);
@@ -859,37 +848,22 @@ export const RetailerProductEdition = ({
           message = "Evaluación enviada";
           getSectionIcon();
         }
-        res = await axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
-          headers: {
-            Authorization: token,
-          },
-        });
+        res = await axios.post(
+          `${process.env.REACT_APP_EVALUATION_REFACTOR}`,
+          body,
+          {
+            headers: {
+              Authorization: token,
+            },
+          }
+        );
       }
       if (res.data.statusCode === 200) {
-        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;
+        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));
@@ -930,19 +904,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) => {
@@ -1194,7 +1184,6 @@ export const RetailerProductEdition = ({
   };
 
   useEffect(() => {
-    console.log(servicesData, "servicesData");
     let status = getRetailerStatus(servicesData, activeTab);
     setRetailerStatus(status);
   }, [activeTab, servicesData, activeRetailer]);
@@ -1211,7 +1200,7 @@ export const RetailerProductEdition = ({
     try {
       setLoading(true);
       const evaluationArray = [];
-      let conceptArray = [];
+      let conceptArray = ["description", "datasheet", "images"];
       switch (user.id_role) {
         case 4:
           conceptArray = ["description", "datasheet"];
@@ -1225,55 +1214,45 @@ export const RetailerProductEdition = ({
           break;
       }
 
-      const messages = [];
-
+      const isAproved = result === "A";
+      const retailersIds = [];
       servicesData?.forEach((ret) => {
-        if (conceptArray.includes(ret.service)) {
-          let data = {
-            articleId: product.article.id_article,
+        if (!retailersIds.includes(ret.id_retailer))
+          retailersIds.push(ret.id_retailer);
+      });
+      const body = {
+        orderArticleRetailers: [
+          {
             orderId: product.id_order ?? product.orderId,
-            concept: ret.service,
-            result: result,
-            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: {
-                Authorization: token,
-              },
-            })
-          );
-        }
+            articleId: product.article.id_article,
+            retailersIds,
+          },
+        ],
+        isAproved,
+      };
+      conceptArray.forEach((concept) => {
+        body.service = concept;
+        evaluationArray.push(
+          axios.post(`${process.env.REACT_APP_EVALUATION_REFACTOR}`, body, {
+            headers: {
+              Authorization: token,
+            },
+          })
+        );
       });
+
       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) {
@@ -1289,10 +1268,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">
@@ -1332,7 +1309,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())
@@ -1342,8 +1348,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
@@ -1359,12 +1393,6 @@ 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}
@@ -1479,6 +1507,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={
@@ -1536,49 +1605,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/index.js

@@ -33,13 +33,6 @@ 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";
@@ -70,12 +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";
-export * from "./components/molecules/GridItem/index";
-export * from "./components/molecules/HeaderItem/index";
-export * from "./components/molecules/RowItem/index";
-export * from "./components/molecules/RetailerSelector/index";
 
 //organisms
 export * from "./components/organisms/ChangePassword/index";
@@ -92,9 +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";
-export * from "./components/organisms/GridProducts/index";
-export * from "./components/organisms/PanelLayout";
 
 //pages
 export * from "./components/pages/ChangePasswordLogin";

package/src/components/atoms/ImageCarousel/ImgeSlider.stories.js

@@ -1,76 +0,0 @@
-import { ImageCarousel } from ".";
-
-export default {
-  title: "Components/atoms/ImageCarousel",
-  component: ImageCarousel,
-};
-
-const Template = (args) => <ImageCarousel {...args} />;
-export const ImageCarouselDefault = Template.bind({});
-ImageCarouselDefault.args = {
-  imageArray: [
-    {
-      id: 35596,
-      status: null,
-      image_id: 1,
-      packing_type: "3",
-      image_type: "1",
-      article_id: "38443",
-      src: "https://d24s337exbt5zr.cloudfront.net/eyJidWNrZXQiOiJjb250ZW50LW1hbmFnZW1lbnQtaW1hZ2VzIiwia2V5IjoiaWQtMzg0NDMvMTUvMS1kNDQ2ZjIwNy0wYTkzLTQyNzgtYWZjNi01MTY2ZjIyY2EzNDMucG5nIiwiZWRpdHMiOnsicmVzaXplIjp7IndpZHRoIjoxMDAwLCJoZWlnaHQiOjEwMDAsImZpdCI6ImNvbnRhaW4iLCJiYWNrZ3JvdW5kIjp7InIiOjI1NSwiZyI6MjU1LCJiIjoyNTUsImFscGhhIjoxfX19fQ==",
-      timestamp: "2023-05-30T03:01:12.000Z",
-      id_version: 15,
-      width: null,
-      height: null,
-      scene_type: null,
-      image_shot_type: null,
-      last_modified: "2023-06-05T23:49:49.000Z",
-      name: "Central (Frente Comercial)",
-      version: 15,
-      ext: "png",
-      uuid: "d446f207-0a93-4278-afc6-5166f22ca343",
-      srcDB: "id-38443/15/1-d446f207-0a93-4278-afc6-5166f22ca343.png",
-    },
-    {
-      id: 35597,
-      status: null,
-      image_id: 3,
-      packing_type: "3",
-      image_type: "1",
-      article_id: "38443",
-      src: "https://d24s337exbt5zr.cloudfront.net/eyJidWNrZXQiOiJjb250ZW50LW1hbmFnZW1lbnQtaW1hZ2VzIiwia2V5IjoiaWQtMzg0NDMvMTUvMy0yOTZkMzU3ZC00OTUzLTRiMzktYjFjMy04YWZmZDI2NDgwMWIucG5nIiwiZWRpdHMiOnsicmVzaXplIjp7IndpZHRoIjoxMDAwLCJoZWlnaHQiOjEwMDAsImZpdCI6ImNvbnRhaW4iLCJiYWNrZ3JvdW5kIjp7InIiOjI1NSwiZyI6MjU1LCJiIjoyNTUsImFscGhhIjoxfX19fQ==",
-      timestamp: "2023-05-30T03:01:12.000Z",
-      id_version: 15,
-      width: null,
-      height: null,
-      scene_type: null,
-      image_shot_type: null,
-      last_modified: "2023-06-05T23:49:49.000Z",
-      name: "Trasera (Back)",
-      version: 15,
-      ext: "png",
-      uuid: "296d357d-4953-4b39-b1c3-8affd264801b",
-      srcDB: "id-38443/15/3-296d357d-4953-4b39-b1c3-8affd264801b.png",
-    },
-    {
-      id: 35598,
-      status: null,
-      image_id: 16,
-      packing_type: "3",
-      image_type: "1",
-      article_id: "38443",
-      src: "https://d24s337exbt5zr.cloudfront.net/eyJidWNrZXQiOiJjb250ZW50LW1hbmFnZW1lbnQtaW1hZ2VzIiwia2V5IjoiaWQtMzg0NDMvMTUvMTYtOGMzNDIzM2YtZTRiMC00MjU0LWFlYzUtZjEyN2ZiYjhkYmVkLnBuZyIsImVkaXRzIjp7InJlc2l6ZSI6eyJ3aWR0aCI6MTAwMCwiaGVpZ2h0IjoxMDAwLCJmaXQiOiJjb250YWluIiwiYmFja2dyb3VuZCI6eyJyIjoyNTUsImciOjI1NSwiYiI6MjU1LCJhbHBoYSI6MX19fX0=",
-      timestamp: "2023-05-30T03:01:12.000Z",
-      id_version: 15,
-      width: null,
-      height: null,
-      scene_type: null,
-      image_shot_type: null,
-      last_modified: "2023-06-05T23:49:49.000Z",
-      name: "Detalle / Características 1",
-      version: 15,
-      ext: "png",
-      uuid: "8c34233f-e4b0-4254-aec5-f127fbb8dbed",
-      srcDB: "id-38443/15/16-8c34233f-e4b0-4254-aec5-f127fbb8dbed.png",
-    },
-  ],
-};