contentoh-components-library 21.4.74 → 21.4.75

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

@@ -0,0 +1,154 @@
+import styled from "styled-components";
+import { FontFamily, GlobalColors } from "../../../global-files/variables";
+
+export const Container = styled.div`
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+  flex: 1;
+  overflow: auto;
+
+  .data-container {
+    display: flex;
+    flex-direction:row-reverse;
+    flex: 0%;
+    height: calc(100% - ${({ headerTop }) => headerTop}px);
+    margin-top:15px;
+    .image-data-panel {
+      width: 192px;
+      height: 192px;
+
+      & + * {
+        margin-left: 10px;
+      }
+    }
+
+    .product-information {
+      width: 100%;
+      display: flex;
+      flex-direction: column;
+
+      .services-information-container {
+        height: 100%;
+        overflow: auto;
+        padding: 0 20px;
+      }
+
+      .product-information-image{
+        display:flex;
+        width: 100%;
+        margin-bottom:10px;
+      }
+
+      .product-image{
+        display:flex;
+        flex-direction: column;
+        justify-content: space-between;
+        padding: 0 20px;
+        gap:20px;
+        width:100%;
+      }
+
+      .image-services {
+        aside {
+          display: grid;
+          grid-template-columns: repeat(auto-fill, 179px);
+          column-gap: 15px;
+          row-gap: 15px;
+          padding: 20px;
+        }
+      }
+
+      .commentary-box {
+        display: flex;
+        justify-content: space-between;
+        align-items: flex-end;
+        padding: 10px;
+        padding-left: 0;
+
+        .commentary {
+          display: flex;
+          align-items: flex-end;
+
+          .input-container {
+            width: 500px;
+
+            .quill {
+              height: 100px;
+            }
+
+            & + * {
+              margin-left: 5px;
+            }
+          }
+
+          .buttons-box {
+            display: flex;
+            width: 210px;
+            flex-wrap: wrap;
+
+            .general-transparent-button {
+              & + * {
+                margin-top: 5px;
+              }
+            }
+
+            .general-transparent-button,
+            .general-green-button,
+            .general-button-disabled {
+              width: fit-content;
+              min-width: 201px;
+              height: 40px;
+            }
+          }
+        }
+      }
+
+      .feedback-box {
+        display: flex;
+      }
+
+      .required-inputs-message {
+        font-family: ${FontFamily.AvenirNext};
+        font-size: 13px;
+        color: ${GlobalColors.s4};
+        padding: 10px;
+        display: flex;
+        align-items: center;
+
+        p + * {
+          margin-top: 10px;
+        }
+
+        button {
+          min-width: fit-content;
+        }
+      }
+    }
+  }
+  #modal-message-box {
+    width: 400px;
+    height: 100px;
+  }
+  .container {
+    width: 100%;
+    height: auto;
+    border:1px solid ${GlobalColors.gray_light};
+    .dropzone {
+      height: 100%;
+      width: 100%;
+    }
+  }
+
+  .container-imagesM{
+    display:flex;
+    flex-direction: column;
+    gap: 12px;
+  }
+
+  .container-bars{
+    display:flex;
+    gap:20px;
+    margin:10px 0;
+  }
+`;

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

@@ -39,6 +39,10 @@ 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";
+import { Box } from "../../organisms/Box";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs, inputsByRetailer } = state;
@@ -222,6 +226,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,
@@ -351,28 +356,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;
@@ -546,7 +529,9 @@ export const ProviderProductEdition = ({
       );
       setServicesData(parsedResponse);
     }
-    !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
+    retailers &&
+      !activeRetailer.id &&
+      setActiveRetailer(active ? active : retailers[0]);
   };
 
   const isRevision = () => {
@@ -624,7 +609,7 @@ export const ProviderProductEdition = ({
       });
     }
     setProduct(productTemp);
-    setActivePercentage(retailers[0]?.percentage);
+    retailers && setActivePercentage(retailers[0]?.percentage);
   }, [percentages]);
 
   const loadInputs = () => {
@@ -883,33 +868,21 @@ export const ProviderProductEdition = ({
         return "images";
     }
   };
+  
 
-  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(() => {
@@ -1238,8 +1211,6 @@ export const ProviderProductEdition = ({
 
   const enableActions = (versionStatus) => {
     try {
-      if (user.is_retailer) return false;
-
       if (versionStatus) {
         return ["AP", "ACA", "RCA", null].includes(versionStatus);
       }
@@ -1322,8 +1293,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,
@@ -1335,8 +1305,7 @@ export const ProviderProductEdition = ({
           showGlobalModal("generic");
         }
       } else {
-        setValidatedAll(true);
-        showGlobalModal("error");
+        sendEvaluation("R");
       }
     }
   };
@@ -1346,6 +1315,7 @@ export const ProviderProductEdition = ({
       <HeaderTop
         setHeaderTop={setHeaderTop}
         withChat={location?.state?.withChat}
+        chatType={location?.state?.chatType}
         productSelected={productSelected}
         token={token}
         activeRetailer={activeRetailer}
@@ -1424,7 +1394,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,
@@ -1436,12 +1406,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}
@@ -1544,6 +1516,7 @@ export const ProviderProductEdition = ({
                       setUpdatedDescriptions={setUpdatedDescriptions}
                       articleId={product?.id_article}
                       version={version}
+                      isShowbox={false}
                       dinamicHeight={true}
                     />
                   ) : (
@@ -1570,87 +1543,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>
@@ -1693,6 +1620,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

@@ -70,6 +70,10 @@ RetailerProductEditionDefault.args = {
   },
   location: {
     product: { articleId: 39364, versionId: 3 },
+    state: {
+      withChat: true,
+      chatType: "product_status",
+    },
   },
   user: {
     id_user: 37,