contentoh-components-library 21.4.122 → 21.4.124

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

@@ -11,8 +11,8 @@ export const ProviderProductEditionDefault = Template.bind({});
 
 ProviderProductEditionDefault.args = {
   tabsSections: {
-    Descripción: false,
-    "Ficha técnica": true,
+    Descripción: true,
+    "Ficha técnica": false,
     Imágenes: false,
   },
   token:
@@ -21,46 +21,57 @@ ProviderProductEditionDefault.args = {
   category: 287,
   version: 1,
   productSelected: {
-    id_article: 121067,
-    upc: "2342341",
-    name: "asd",
-    timestamp: "2024-01-03T19:42:59.000Z",
-    categoryName: "Abarrotes|Abarrotes Secos|Alimentos Deshidratados",
-    id_category: 4,
+    category: "Accesorios Decorativos|Accesorios Decorativos",
+    company_name: "Demo",
+    company_id: 923,
+    id_category: "2028",
+    id_article: 118465,
+    name: "VELA AROMA 18 OZ MAN/CAN",
+    upc: "Modelo6",
+    isVisible: 1,
+    retailers: [
+      {
+        id: 68,
+        name: "The Home Depot Onboarding",
+      },
+    ],
     version: 1,
-    value: null,
     retailersAvailable: [
       {
-        "name": "Walmart Marketplace",
-        "id": 75
-      }
+        id: 68,
+        name: "The Home Depot Onboarding",
+      },
     ],
-    percentage: 1.33
   },
   productToEdit: {
-    idCategory: 4,
-    ArticleId: 121067,
+    idCategory: "2028",
+    ArticleId: 118465,
     product: [
-        {
-            id_article: 121067,
-            upc: "2342341",
-            name: "asd",
-            timestamp: "2024-01-03T19:42:59.000Z",
-            categoryName: "Abarrotes|Abarrotes Secos|Alimentos Deshidratados",
-            id_category: 4,
-            version: 1,
-            value: null,
-            retailersAvailable: [
-                {
-                    name: "Walmart Marketplace",
-                    id: 75,
-                    percentage: 1.33
-                }
-            ],
-            percentage: 1.33
-        }
-    ]
-},
+      {
+        category: "Accesorios Decorativos|Accesorios Decorativos",
+        company_name: "Demo",
+        company_id: 923,
+        id_category: "2028",
+        id_article: 118465,
+        name: "VELA AROMA 18 OZ MAN/CAN",
+        upc: "Modelo6",
+        isVisible: 1,
+        retailers: [
+          {
+            id: 68,
+            name: "The Home Depot Onboarding",
+          },
+        ],
+        version: 1,
+        retailersAvailable: [
+          {
+            id: 68,
+            name: "The Home Depot Onboarding",
+          },
+        ],
+      },
+    ],
+  },
   location: {
     pathname: "/EditProducts",
     search: "",
@@ -73,54 +84,66 @@ ProviderProductEditionDefault.args = {
     key: "24vwut",
   },
   user: {
-    id_user: 28,
-    name: "Ismael",
-    last_name: "López",
-    email: "ilopez@contentoh.com",
-    position: "Test States",
-    telephone: "+523111366336",
+    id_user: 191,
+    name: "Demo",
+    last_name: "Demo",
+    email: "merchants24feb@allfreemail.net",
+    position: "Test",
+    telephone: "+52123456789",
     country: "México",
-    id_company: 1,
-    id_cognito: "f5927f8e-cbf7-4922-9e09-e69ec0b2731a",
+    id_company: 923,
+    id_cognito: "c3cd160c-76c2-497c-9357-5ef949307e1e",
     birth_Date: null,
-    about_me: "",
-    zip_code: "",
-    address: "",
-    job: "",
-    id_stripe: "cus_KuEt6R6vwmN09f",
+    about_me: null,
+    zip_code: null,
+    address: null,
+    job: null,
+    id_stripe: null,
     id_role: 0,
     active: 1,
     is_retailer: 0,
     email_notify: 1,
-    is_user_tech: "ADMIN-AS",
+    is_user_tech: null,
     membership: {
-        id: 76,
-        start_date: "2022-01-18T17:25:35.000Z",
-        end_date: "2023-01-18T17:25:35.000Z",
-        planID: 8,
-        plan: "prod_KtlhECVSFG2iro",
-        name: "Plan Pro",
-        user_limit: "50",
-        products_limit: "5000",
-        type: "Enterprise"
+      id: 114,
+      start_date: "2023-02-24T18:14:43.000Z",
+      end_date: "2024-02-24T18:14:43.000Z",
+      planID: 8,
+      plan: "prod_KtlhECVSFG2iro",
+      name: "Plan Pro",
+      user_limit: "50",
+      products_limit: "5000",
+      type: "Enterprise",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-28/28.png?1704310718113"
+    src: "https://content-management-profile.s3.amazonaws.com/id-191/191.png?1701729602068",
   },
   company: {
-    id_company: 1,
-    trade_name: "GRUPO BRAHMA",
-    company_name: "GRUPO BRAHMA",
-    rfc: "XAXX010101000",
-    adress: "AA",
-    about_company: "",
-    telephone: "",
-    web_site: "",
-    zip_code: "",
+    id_company: 923,
+    trade_name: "Demo",
+    company_name: "Demo",
+    rfc: "Demo",
+    adress: "Demo",
+    about_company: null,
+    telephone: null,
+    web_site: null,
+    zip_code: null,
     email: null,
-    social_link: "",
+    social_link: null,
     is_retailer: 0,
-    financedRetailers: [],
-    retailers: []
-},
+    financedRetailers: [
+      {
+        id: 68,
+        name: "The Home Depot Onboarding",
+        country: "México",
+      },
+    ],
+    retailers: [
+      {
+        id: 68,
+        name: "The Home Depot Onboarding",
+        country: "México",
+      },
+    ],
+  },
   showSurvey: (v) => v && alert("se muestra"),
 };

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;
@@ -151,7 +147,7 @@ export const ProviderProductEdition = ({
   const [datasheets, setDatasheets] = useState([]);
   const [images, setImages] = useReducer(reducerImages, {});
   const [showModal, setShowModal] = useState(false);
-  const [boxData, setBoxData] = useState({});
+  const [boxData, setBoxData] = useState();
   const { getRootProps, getInputProps } = useDropzone({
     accept: "image/*",
     noKeyboard: true,
@@ -226,7 +222,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,
@@ -356,6 +351,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;
@@ -529,9 +546,7 @@ export const ProviderProductEdition = ({
       );
       setServicesData(parsedResponse);
     }
-    retailers &&
-      !activeRetailer.id &&
-      setActiveRetailer(active ? active : retailers[0]);
+    !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
   };
 
   const isRevision = () => {
@@ -609,7 +624,7 @@ export const ProviderProductEdition = ({
       });
     }
     setProduct(productTemp);
-    retailers && setActivePercentage(retailers[0]?.percentage);
+    setActivePercentage(retailers[0]?.percentage);
   }, [percentages]);
 
   const loadInputs = () => {
@@ -674,7 +689,7 @@ export const ProviderProductEdition = ({
     }));
     setSocketType(imageInputs);
   }, [images]);
-  
+
   const saveDescriptions = async () => {
     setLoading(true);
     const dataObject = {
@@ -724,8 +739,6 @@ export const ProviderProductEdition = ({
       ...(parseBoxData.length > 0 && { boxData: parseBoxData }),
     };
 
-    console.log({dataObject});
-    console.log(product?.orderId);
     if (product?.orderId) dataObject["orderId"] = product?.orderId;
     try {
       const res = await axios.put(
@@ -870,21 +883,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(() => {
@@ -1213,6 +1238,8 @@ export const ProviderProductEdition = ({
 
   const enableActions = (versionStatus) => {
     try {
+      if (user.is_retailer) return false;
+
       if (versionStatus) {
         return ["AP", "ACA", "RCA", null].includes(versionStatus);
       }
@@ -1295,7 +1322,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,
@@ -1307,7 +1335,8 @@ export const ProviderProductEdition = ({
           showGlobalModal("generic");
         }
       } else {
-        sendEvaluation("R");
+        setValidatedAll(true);
+        showGlobalModal("error");
       }
     }
   };
@@ -1317,7 +1346,6 @@ export const ProviderProductEdition = ({
       <HeaderTop
         setHeaderTop={setHeaderTop}
         withChat={location?.state?.withChat}
-        chatType={location?.state?.chatType}
         productSelected={productSelected}
         token={token}
         activeRetailer={activeRetailer}
@@ -1396,7 +1424,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,
@@ -1408,14 +1436,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}
@@ -1519,7 +1545,6 @@ export const ProviderProductEdition = ({
                       setUpdatedDescriptions={setUpdatedDescriptions}
                       articleId={product?.id_article}
                       version={version}
-                      isShowbox={false}
                       dinamicHeight={true}
                     />
                   ) : (
@@ -1546,41 +1571,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>
@@ -1623,48 +1694,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

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