contentoh-components-library 21.3.94 → 21.3.96

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

@@ -39,6 +39,9 @@ import Slide1_4 from "../../../assets/images/sliderToolTip/slide4.svg";
 import Slide1_5 from "../../../assets/images/sliderToolTip/slide5.svg";
 import { VersionSelector } from "../../organisms/VersionSelector";
 import { useCloseModal } from "../../../global-files/customHooks";
+import { createMessage, sendMessage } from "../RetailerProductEdition/utils";
+import { Modal } from "../../organisms/Modal";
+import { ButtonV2 } from "../../atoms/ButtonV2";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs, inputsByRetailer } = state;
@@ -214,6 +217,7 @@ export const ProviderProductEdition = ({
   const isRetailer = user?.is_retailer;
   const [loading, setLoading] = useState(true);
   const [validatedAll, setValidatedAll] = useState(false);
+  const [showRejectModal, setShowRejectModal] = useState(false);
 
   const [origin, setOrigin] = useState({
     "Ficha técnica": null,
@@ -343,28 +347,6 @@ export const ProviderProductEdition = ({
     (type) => {
       const formatter = new Intl.ListFormat("es", { type: "conjunction" });
       switch (type) {
-        case "error":
-          setGlobalModal({
-            message: `${activeTab} rechazada`,
-            detail: "Agrega tu comentarios para enviar el rechazo",
-            img: errorModal,
-            textArea: true,
-            button1: {
-              name: "Enviar",
-              action: (e) => {
-                const textArea = document.querySelector("#area");
-                if (textArea.value) {
-                  textArea.style.border = "none";
-                  createComment(e, textArea.value);
-                  showGlobalModal("commentsSent");
-                  validatedAll ? validateAll("R") : sendEvaluation("R");
-                } else {
-                  textArea.style.border = "2px solid red";
-                }
-              },
-            },
-          });
-          break;
         case "generic":
           setGlobalModal(dataGenericModal);
           break;
@@ -524,7 +506,9 @@ export const ProviderProductEdition = ({
       );
       setServicesData(parsedResponse);
     }
-    !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
+    retailers &&
+      !activeRetailer.id &&
+      setActiveRetailer(active ? active : retailers[0]);
   };
 
   const isRevision = () => {
@@ -600,7 +584,7 @@ export const ProviderProductEdition = ({
       });
     }
     setProduct(productTemp);
-    setActivePercentage(retailers[0]?.percentage);
+    retailers && setActivePercentage(retailers[0]?.percentage);
   }, [percentages]);
 
   const loadInputs = () => {
@@ -841,32 +825,19 @@ export const ProviderProductEdition = ({
     }
   };
 
-  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?.id_article,
-      orderId: product?.orderId,
-      message: body,
-      concept: concept,
-      version: version,
-    };
-    await axios.post(`${process.env.REACT_APP_COMMENTS_ENDPOINT}`, data, {
-      headers: {
-        Authorization: token,
+      paramsBody: {
+        id: product.article.id_article || productEdit.ArticleId,
+        version: version,
+        items: messages,
+        retailerId: retailerId,
+        status: product.status || productEdit.product.status,
       },
-    });
+      paramsHeader: { Authorization: token },
+    };
+    setMessage("");
+    return sendMessage(data);
   };
 
   useEffect(() => {
@@ -1066,6 +1037,27 @@ export const ProviderProductEdition = ({
         const { newArticleStatus, newServiceStatus, newStatus } = JSON.parse(
           res.data.body
         );
+
+        const message = createMessage(
+          product.retailers || product.retailersAvailable,
+          activeRetailer.id,
+          product[sectionStatusKey],
+          newStatus,
+          activeTab
+        );
+
+        const messageData = {
+          paramsBody: {
+            id: product.article.id_article || productEdit.ArticleId,
+            version: version,
+            items: [{ type: "status", value: message }],
+            retailerId: activeRetailer.id,
+            status: product.status || productEdit.product.status,
+          },
+          paramsHeader: { Authorization: token },
+        };
+        await sendMessage(messageData);
+
         if (newArticleStatus) productTemp.status = newArticleStatus[articleId];
         const retailerStatusCopy = { ...retailerStatus };
         retailerStatusCopy[activeRetailer.id][concept] = newStatus;
@@ -1097,6 +1089,7 @@ export const ProviderProductEdition = ({
         result,
         isAproved: result === "A",
       };
+      const messages = [];
       servicesData?.forEach((ret) => {
         const { service, id_retailer } = ret;
         let data = {};
@@ -1113,6 +1106,18 @@ export const ProviderProductEdition = ({
             },
           })
         );
+        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)
+          );
+        }
       });
       await Promise.all(evaluationArray);
       const userType = user.is_retailer === 1 ? "CA" : "P";
@@ -1152,6 +1157,7 @@ export const ProviderProductEdition = ({
           product: productTemp,
         })
       );
+      await Promise.all(messages);
 
       await loadData();
     } catch (error) {
@@ -1280,8 +1286,7 @@ export const ProviderProductEdition = ({
         return;
       } else if (user.is_retailer) {
         if (product.id_order || product.orderId) {
-          setValidatedAll(true);
-          showGlobalModal("error");
+          sendEvaluation("R");
         } else {
           setDataGenericModal((prev) => ({
             ...prev,
@@ -1293,8 +1298,7 @@ export const ProviderProductEdition = ({
           showGlobalModal("generic");
         }
       } else {
-        setValidatedAll(true);
-        showGlobalModal("error");
+        sendEvaluation("R");
       }
     }
   };
@@ -1304,6 +1308,7 @@ export const ProviderProductEdition = ({
       <HeaderTop
         setHeaderTop={setHeaderTop}
         withChat={location?.state?.withChat}
+        chatType={location?.state?.chatType}
         productSelected={productSelected}
         token={token}
         activeRetailer={activeRetailer}
@@ -1382,7 +1387,7 @@ export const ProviderProductEdition = ({
               } else if (user.is_retailer) {
                 if (product.id_order || product.orderId) {
                   setValidatedAll(true);
-                  showGlobalModal("error");
+                  setShowRejectModal(true);
                 } else {
                   setDataGenericModal((prev) => ({
                     ...prev,
@@ -1394,12 +1399,14 @@ export const ProviderProductEdition = ({
                   showGlobalModal("generic");
                 }
               } else {
+                setShowRejectModal(true);
                 setValidatedAll(true);
-                showGlobalModal("error");
               }
             }}
             approve={() => sendToEvaluation("A")}
-            reject={() => sendToEvaluation("R")}
+            reject={() => {
+              setShowRejectModal(true);
+            }}
           />
           <FullTabsMenu
             tabsSections={tabsSections}
@@ -1422,12 +1429,11 @@ export const ProviderProductEdition = ({
             showSaveButton={enableActions(product.version_status)}
             version={version}
             updatedDescriptions={updatedDescriptions}
-            setUpdatedDescriptions={setUpdatedDescriptions}
             updatedDatasheets={updatedDatasheets}
-            setUpdatedDatasheets={setUpdatedDatasheets}
             images={images}
-            setImages={setImages}
             selectedImages={selectedImages}
+            setUpdatedDescriptions={setUpdatedDescriptions}
+            setUpdatedDatasheets={setUpdatedDatasheets}
             setSelectedImages={setSelectedImages}
             setShowVersionSelector={setShowVersionSelector}
             onClickSave={() => {
@@ -1519,87 +1525,41 @@ export const ProviderProductEdition = ({
               </>
             )}
           </div>
-          {isRevision() && getSectionStatus() ? (
-            <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(
-                            "#description-commentary-box-0 .ql-container .ql-editor > p"
-                          ).innerHTML,
-                          activeTab
-                        )
-                      }
-                    />
-                  </div>
-                </div>
+          {!(isRevision() && getSectionStatus()) && !revision && (
+            <div className="required-inputs-message">
+              <div>
+                <p>
+                  Los atributos son requeridos por las plataformas de las
+                  cadenas, es muy importante completar los campos requeridos ya
+                  que pueden rechazar el producto por falta de información.
+                </p>
+              </div>
+              {inCart ? (
+                <button type="button">
+                  <Link to="/checkout">
+                    <p>Articulo en carrito</p>
+                    <p>Ir a checkout</p>
+                  </Link>
+                </button>
               ) : (
-                <div className="feedback-box">
-                  <Commentary
-                    comment={comment.message}
-                    reviewed={crossComment}
+                <>
+                  <SliderToolTip
+                    infoIcon={InfoIcon}
+                    slidefront={slidefront}
+                    iconSize={"big-image"}
+                    slidePosition={"top-slide"}
                   />
                   <Button
-                    buttonType={"circular-button accept-button"}
-                    onClick={async () => {
-                      setCrossComment(true);
-                      commentRevised();
+                    onClick={() => {
+                      setShowContentohRequestModal &&
+                        setShowContentohRequestModal(true);
                     }}
+                    buttonType="general-default-button"
+                    label="Enviar a Content-oh!"
                   />
-                </div>
+                </>
               )}
             </div>
-          ) : (
-            !revision && (
-              <div className="required-inputs-message">
-                <div>
-                  <p>
-                    Los atributos son requeridos por las plataformas de las
-                    cadenas, es muy importante completar los campos requeridos
-                    ya que pueden rechazar el producto por falta de información.
-                  </p>
-                </div>
-                {inCart ? (
-                  <button type="button">
-                    <Link to="/checkout">
-                      <p>Articulo en carrito</p>
-                      <p>Ir a checkout</p>
-                    </Link>
-                  </button>
-                ) : (
-                  <>
-                    <SliderToolTip
-                      infoIcon={InfoIcon}
-                      slidefront={slidefront}
-                      iconSize={"big-image"}
-                      slidePosition={"top-slide"}
-                    />
-                    <Button
-                      onClick={() => {
-                        setShowContentohRequestModal &&
-                          setShowContentohRequestModal(true);
-                      }}
-                      buttonType="general-default-button"
-                      label="Enviar a Content-oh!"
-                    />
-                  </>
-                )}
-              </div>
-            )
           )}
         </div>
       </div>
@@ -1642,6 +1602,48 @@ export const ProviderProductEdition = ({
           jwt={token}
         />
       )}
+      {showRejectModal && (
+        <Modal
+          title={"Agregar mensaje de rechazo"}
+          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);
+                validatedAll ? validateAll("R") : sendToEvaluation("R");
+                setShowRejectModal(false);
+              }}
+            />,
+          ]}
+        />
+      )}
     </Container>
   );
 };

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

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

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

@@ -16,65 +16,95 @@ RetailerProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJhNmM0ZDNkNi0yNGE0LTQxZDQtYWQwZi1kMDg3NDM4YWI1YjYiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6ImE2YzRkM2Q2LTI0YTQtNDFkNC1hZDBmLWQwODc0MzhhYjViNiIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiIyYjU3MjZlMy04MjM2LTRmYzMtODBkMi05NWVmYmU4ODdjOTYiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4MjAxNjI5MSwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY4MjAxOTg5MSwiaWF0IjoxNjgyMDE2MjkxLCJlbWFpbCI6ImV0Y0Bjb250ZW50b2guY29tIn0.SCj_yp1NkGCED59JHoDSdFAOakIOvZVeC0yLwt9z0BtenDXlU0m5cUofQQonnWPM8Q70yMFEkyMGI9kQs_fz1gxrmrSc2FGefn3B_1Vymq3pQ_S1JrY_syYf88m_GtJKOywEnE6--Ef9lZhFBFKGtqRJ4H8JBa9Xb96uCjAKyEMCSURDlw37pk2RQdULlZPj17Zb6Xrqi2lwrhpI1ByptX3__UoTiZklnTXwIxM4JdU7yuhXLznaEH8NOSd2Jw-CV6FCUbYBHlnRYBQg7B5mwyVKtDQm6QpRgBTBPCvljJJpFjRKUcnon8WZiFXx1qVbkWPt2vCT1TZqqoSLdlP6lA",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI5YTIxMzEyOC02NDgyLTRjMTYtYTRiNi02ZTY0ZjIyNWIxYmQiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6IjlhMjEzMTI4LTY0ODItNGMxNi1hNGI2LTZlNjRmMjI1YjFiZCIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI5OGE0NzYxMy04ZGIyLTRlZjUtYjA0Mi01ZDU3MWRkZjIwMWIiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4Mzg3NTIyNiwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY4Mzg3ODgyNiwiaWF0IjoxNjgzODc1MjI2LCJlbWFpbCI6ImlzbWFlbDk3bG9wZXpAZ21haWwuY29tIn0.EtgmT_THMx-Zy_zB5yZK4gz6TXNTVVJEKFt5X0JK2UkGVrp_q_92YCEuejS4n976fyTez0jkwOee6IkVHLV71uZWRBDFt-3Yw4ZxfsZYPNJWhoHXGNxhMU8MCkSntfu597esBTk-VsUpstT5R7L-WJfN8viE7R-qVo-42RlPTG0TFrWA9q0oTcqjv8vbxLpOBUjiEpjmqRhg4blJZwgkGNta6MOlw1vfmisOVbo9wMvqwnCZ9xx9KMKoH9U4uNObK_JomjbvPmTmkcUXsE-wGSD7XcoSwtuhBngLC7-jiu1u8MvL_ff5Z0Qp70sSpLdUglcSS8d1Xf7j_fcZuJ5jKA",
   productSelected: {
-    orderId: 15160,
-    status: "SAC",
-    datasheet_status: "SAC",
+    orderId: 14606,
+    status: "RA",
+    datasheet_status: "RA",
     prio: "none",
-    version: 7,
-    description_status: "SAC",
-    images_status: "SAC",
-    brand: null,
-    retailerOrder: 1,
-    missing: {
-      datasheet: null,
-      descriptions: null,
-      images: null,
+    version: 3,
+    description_status: "RA",
+    images_status: "RA",
+    statusByRetailer: {
+      4: {
+        datasheet: "RA/AC",
+        description: "RA/AC",
+        images: "RA/AC",
+      },
+      5: {
+        datasheet: "RA/AC",
+        description: "RA/AC",
+        images: "RA/AC",
+      },
+      6: {
+        description: "RA/AC",
+        images: "RA/AC",
+        datasheet: "RA/AC",
+      },
+      12: {
+        datasheet: "RA/AC",
+        description: "RA/AC",
+        images: "RA/AC",
+      },
+      17: {
+        datasheet: "RA/AC",
+        description: "RA/AC",
+        images: "RA/AC",
+      },
     },
-    services: {
-      datasheets: 1,
-      descriptions: 1,
-      images: 1,
+    orderId: 15209,
+    status: "ACA",
+    datasheet_status: "ACA",
+    prio: "none",
+    version: 3,
+    description_status: "ACA",
+    images_status: "ACA",
+    statusByRetailer: {
+      70: {
+        datasheet: "ACA",
+        description: "ACA",
+        images: "ACA",
+      },
     },
     article: {
-      category: "Puertas y Ventanas|Molduras|Molduras Madera Blanda",
-      company_name: "Demo",
+      id_article: 39390,
+      id_category: "4311",
+      name: "test demo 1",
+      upc: "2312312313",
+      timestamp: "2023-05-12T20:07:42.000Z",
+      id_user: 133,
+      status: "NULL",
+      active: 1,
+      company_id: 912,
+      company_name: "GRUPO BRAHMA",
       country: "México",
-      id_category: "2366",
-      id_datasheet_especialist: null,
-      id_datasheet_facilitator: null,
-      id_description_especialist: null,
-      id_description_facilitator: null,
-      id_images_especialist: null,
-      id_images_facilitator: null,
-      id_order: 15160,
-      id_article: 39290,
-      id_auditor: 37,
-      name: "MOLDURA MARCO MODER 11X4X244 CM",
-      timestamp: "2023-04-19T21:36:02.000Z",
-      upc: "100030",
+      id_order: 15209,
+      id_datasheet_especialist: 232,
+      id_datasheet_facilitator: 52,
+      id_description_especialist: 232,
+      id_description_facilitator: 52,
+      id_images_especialist: 196,
+      id_images_facilitator: 53,
+      id_auditor: 195,
+      id_recepcionist: null,
+      category: "Ropa Interior Dama|Ropa Interior|Ropa Interior",
+      missingAttributes: 0,
+      missingDescriptions: 0,
+      missingImages: 0,
     },
     retailers: [
       {
-        id: 58,
-        name: "The Home Depot Golden",
-      },
-      {
-        id: 68,
-        name: "The Home Depot Merchants",
+        id: 70,
+        name: "Bodega Aurrera",
       },
     ],
-    statusByRetailer: {
-      58: {
-        datasheet: "SAC",
-        description: "SAC",
-        images: "SAC",
-      },
-    },
   },
   location: {
-    product: { articleId: 39290, versionId: 7 },
+    product: { articleId: 354, versionId: 3 },
+    state: {
+      withChat: true,
+      chatType: "product_status",
+    },
   },
   user: {
     id_user: 51,