contentoh-components-library 21.4.56 → 21.4.58

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

@@ -39,10 +39,6 @@ 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;
@@ -144,7 +140,6 @@ export const ProviderProductEdition = ({
   const [datasheets, setDatasheets] = useState([]);
   const [images, setImages] = useReducer(reducerImages, {});
   const [showModal, setShowModal] = useState(false);
-  const [boxData, setBoxData] = useState();
   const { getRootProps, getInputProps } = useDropzone({
     accept: "image/*",
     noKeyboard: true,
@@ -219,7 +214,6 @@ 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,
@@ -349,6 +343,28 @@ 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;
@@ -475,8 +491,7 @@ export const ProviderProductEdition = ({
       product?.id_article || product?.article?.id_article,
       product?.article?.company_name || product?.categoryName,
       parseInt(product?.article?.id_category || product?.id_category),
-      version,
-      token
+      version
     );
 
     //Converts the data inside the datasheets object to array
@@ -509,9 +524,7 @@ export const ProviderProductEdition = ({
       );
       setServicesData(parsedResponse);
     }
-    retailers &&
-      !activeRetailer.id &&
-      setActiveRetailer(active ? active : retailers[0]);
+    !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
   };
 
   const isRevision = () => {
@@ -587,7 +600,7 @@ export const ProviderProductEdition = ({
       });
     }
     setProduct(productTemp);
-    retailers && setActivePercentage(retailers[0]?.percentage);
+    setActivePercentage(retailers[0]?.percentage);
   }, [percentages]);
 
   const loadInputs = () => {
@@ -681,27 +694,11 @@ export const ProviderProductEdition = ({
   };
 
   const saveDatasheets = async () => {
-    const parseBoxData = [];
-    Object.entries(boxData).forEach(([, box], index) => {
-      const { value } = box;
-      const attributesIds = Object.keys(value);
-      attributesIds.forEach((attributeId) => {
-        const boxId = index + 1;
-        const valueOfAtribute = value[attributeId];
-        parseBoxData.push({
-          attributeId,
-          value: valueOfAtribute,
-          boxId,
-        })
-      });
-    });
-
+    setLoading(true);
     const dataObject = {
       articleId: product?.id_article,
       articleData: updatedDatasheets,
-      ...(parseBoxData.length > 0 && { boxData: parseBoxData }),
-    };   
-    
+    };
     if (product?.orderId) dataObject["orderId"] = product?.orderId;
     try {
       const res = await axios.put(
@@ -720,8 +717,7 @@ export const ProviderProductEdition = ({
       }
     } catch (error) {
       console.log(error);
-    } 
-    console.log(dataObject)
+    }
   };
 
   const updateImages = useCallback(async () => {
@@ -847,21 +843,33 @@ export const ProviderProductEdition = ({
         return "images";
     }
   };
-  
 
-  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 || productEdit.ArticleId,
-        version: version,
-        items: messages,
-        retailerId: retailerId,
-        status: product.status || productEdit.product.status,
-      },
-      paramsHeader: { Authorization: token },
+      articleId: product?.id_article,
+      orderId: product?.orderId,
+      message: body,
+      concept: concept,
+      version: version,
     };
-    setMessage("");
-    return sendMessage(data);
+    await axios.post(`${process.env.REACT_APP_COMMENTS_ENDPOINT}`, data, {
+      headers: {
+        Authorization: token,
+      },
+    });
   };
 
   useEffect(() => {
@@ -1286,7 +1294,8 @@ export const ProviderProductEdition = ({
         return;
       } else if (user.is_retailer) {
         if (product.id_order || product.orderId) {
-          sendEvaluation("R");
+          setValidatedAll(true);
+          showGlobalModal("error");
         } else {
           setDataGenericModal((prev) => ({
             ...prev,
@@ -1298,7 +1307,8 @@ export const ProviderProductEdition = ({
           showGlobalModal("generic");
         }
       } else {
-        sendEvaluation("R");
+        setValidatedAll(true);
+        showGlobalModal("error");
       }
     }
   };
@@ -1308,7 +1318,6 @@ export const ProviderProductEdition = ({
       <HeaderTop
         setHeaderTop={setHeaderTop}
         withChat={location?.state?.withChat}
-        chatType={location?.state?.chatType}
         productSelected={productSelected}
         token={token}
         activeRetailer={activeRetailer}
@@ -1387,7 +1396,7 @@ export const ProviderProductEdition = ({
               } else if (user.is_retailer) {
                 if (product.id_order || product.orderId) {
                   setValidatedAll(true);
-                  setShowRejectModal(true);
+                  showGlobalModal("error");
                 } else {
                   setDataGenericModal((prev) => ({
                     ...prev,
@@ -1399,14 +1408,12 @@ export const ProviderProductEdition = ({
                   showGlobalModal("generic");
                 }
               } else {
-                setShowRejectModal(true);
                 setValidatedAll(true);
+                showGlobalModal("error");
               }
             }}
             approve={() => sendToEvaluation("A")}
-            reject={() => {
-              setShowRejectModal(true);
-            }}
+            reject={() => sendToEvaluation("R")}
           />
           <FullTabsMenu
             tabsSections={tabsSections}
@@ -1472,28 +1479,19 @@ export const ProviderProductEdition = ({
                 )}
                 {activeTab === "Ficha técnica" &&
                   (product?.datasheet_status !== "NS" ? (
-                    <div>
-                      {datasheets[0]?.data?.map((dataGroup, index) => (
-                        <InputGroup
-                          key={index + "-" + activeRetailer.name}
-                          articleId={product.id_article}
-                          version={version}
-                          activeSection={activeTab}
-                          inputGroup={dataGroup}
-                          dataInputs={datasheets[1]}
-                          updatedDatasheets={updatedDatasheets}
-                          setUpdatedDatasheets={setUpdatedDatasheets}
-                          isShowbox={true}
-                          activeRetailer={services[0][activeRetailer.id]}
-                          groupData={services[0][activeRetailer.id].data}
-                          setUpdatedBoxData={(e) => {
-                            setBoxData(e);
-                          }}
-                          index={index}
-                          //enableActions={enableActions(product.version_status)} ADD THIS VALIDATION
-                        ></InputGroup>
-                      ))}
-                    </div>
+                    datasheets[0]?.data?.map((dataGroup, index) => (
+                      <InputGroup
+                        key={index + "-" + activeRetailer.name}
+                        articleId={product.id_article}
+                        version={version}
+                        activeSection={activeTab}
+                        inputGroup={dataGroup}
+                        dataInputs={datasheets[1]}
+                        updatedDatasheets={updatedDatasheets}
+                        setUpdatedDatasheets={setUpdatedDatasheets}
+                        //enableActions={enableActions(product.version_status)} ADD THIS VALIDATION
+                      />
+                    ))
                   ) : (
                     <ScreenHeader
                       text={"No cuentas con este servicio"}
@@ -1509,7 +1507,6 @@ export const ProviderProductEdition = ({
                       setUpdatedDescriptions={setUpdatedDescriptions}
                       articleId={product?.id_article}
                       version={version}
-                      isShowbox={false}
                       dinamicHeight={true}
                     />
                   ) : (
@@ -1536,41 +1533,87 @@ export const ProviderProductEdition = ({
               </>
             )}
           </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>
+          {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>
               ) : (
-                <>
-                  <SliderToolTip
-                    infoIcon={InfoIcon}
-                    slidefront={slidefront}
-                    iconSize={"big-image"}
-                    slidePosition={"top-slide"}
+                <div className="feedback-box">
+                  <Commentary
+                    comment={comment.message}
+                    reviewed={crossComment}
                   />
                   <Button
-                    onClick={() => {
-                      setShowContentohRequestModal &&
-                        setShowContentohRequestModal(true);
+                    buttonType={"circular-button accept-button"}
+                    onClick={async () => {
+                      setCrossComment(true);
+                      commentRevised();
                     }}
-                    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>
@@ -1613,48 +1656,6 @@ 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,10 +107,6 @@ export const Container = styled.div`
       }
     }
   }
-  #modal-message-box {
-    width: 400px;
-    height: 100px;
-  }
   .container {
     width: 100%;
     height: 100%;
@@ -119,4 +115,4 @@ export const Container = styled.div`
       width: 100%;
     }
   }
-`;
+`;

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

@@ -16,7 +16,7 @@ RetailerProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI5YTIxMzEyOC02NDgyLTRjMTYtYTRiNi02ZTY0ZjIyNWIxYmQiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6IjlhMjEzMTI4LTY0ODItNGMxNi1hNGI2LTZlNjRmMjI1YjFiZCIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI5OGE0NzYxMy04ZGIyLTRlZjUtYjA0Mi01ZDU3MWRkZjIwMWIiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4Mzg3NTIyNiwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY4Mzg3ODgyNiwiaWF0IjoxNjgzODc1MjI2LCJlbWFpbCI6ImlzbWFlbDk3bG9wZXpAZ21haWwuY29tIn0.EtgmT_THMx-Zy_zB5yZK4gz6TXNTVVJEKFt5X0JK2UkGVrp_q_92YCEuejS4n976fyTez0jkwOee6IkVHLV71uZWRBDFt-3Yw4ZxfsZYPNJWhoHXGNxhMU8MCkSntfu597esBTk-VsUpstT5R7L-WJfN8viE7R-qVo-42RlPTG0TFrWA9q0oTcqjv8vbxLpOBUjiEpjmqRhg4blJZwgkGNta6MOlw1vfmisOVbo9wMvqwnCZ9xx9KMKoH9U4uNObK_JomjbvPmTmkcUXsE-wGSD7XcoSwtuhBngLC7-jiu1u8MvL_ff5Z0Qp70sSpLdUglcSS8d1Xf7j_fcZuJ5jKA",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI5YTIxMzEyOC02NDgyLTRjMTYtYTRiNi02ZTY0ZjIyNWIxYmQiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6IjlhMjEzMTI4LTY0ODItNGMxNi1hNGI2LTZlNjRmMjI1YjFiZCIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI0OTMyY2JhZC1lYzcyLTRjYWItODgyNS0wMzY2M2RkNmE2ODIiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY5Mjc1MDY0NywibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY5Mjc1NDI0NywiaWF0IjoxNjkyNzUwNjQ3LCJlbWFpbCI6ImlzbWFlbDk3bG9wZXpAZ21haWwuY29tIn0.eqOY-gcS-W99WcEC632Ewckcg3WJzKoV9fIGcn1AkEE44_odGTcEk8fhVs-6_evIJkfShQOP0RFX0d2Dn31F-xFh5Lez6LvbT9F41_rAmMb3ELyRvdcz42V4eMw2IBH-FGrpGhSsJOHKV2T3WuUyZxPJu-C04ZAadfFSoNBBWnxX6SFk_eefcp9KghNmnELSSnWDh6DD1XDrWqEaLOVlQ5H7q4ARJqBo07KcXHIQo056anVud-inUMiX9KDTaorXdBCD0doWgv8NkYWSEpUS_Ctj-NG6vAled9g-6oLnC6DLR_ay6PRnAKGVNCv8bRZJL0GqF8ZnWk02svDHfUPJ0Q",
   productSelected: {
     services: {
       datasheets: 1,
@@ -73,11 +73,7 @@ RetailerProductEditionDefault.args = {
     upc: "7543453453",
   },
   location: {
-    product: { articleId: 354, versionId: 3 },
-    state: {
-      withChat: true,
-      chatType: "product_status",
-    },
+    product: { articleId: 39290, versionId: 7 },
   },
   user: {
     id_user: 37,