contentoh-components-library 21.3.33 → 21.3.35

package/src/components/organisms/Chat/ContentChat/index.js

@@ -75,9 +75,17 @@ export const ContentChat = (props) => {
       if (processUpdateID !== undefined) clearTimeout(processUpdateID);
     };
   }, []);
+
+  const stopUpdate = () => {
+    if (processUpdateID !== undefined) {
+      clearTimeout(processUpdateID);
+      setProcessUpdateID(undefined);
+    }
+  };
+
   // al cargar el componente
   useEffect(() => {
-    if (dataChat) {
+    if (dataChat && showPopUpChat) {
       stopUpdate();
       if (dataChat.code) {
         setErrorChat({
@@ -93,12 +101,15 @@ export const ContentChat = (props) => {
       else if (chatType === "order_product") getInitialOrderProduct();
       else getInitialTicket();
     }
+    if (!showPopUpChat) {
+      stopUpdate();
+    }
   }, [dataChat, showPopUpChat]);
 
   // comenzar temporizador del update de 20s
   useEffect(() => {
-    //return;   -- descomentarizar para hacer pruebas sin update
-    if (startUpdate == 0) return;
+    // return; // -- descomentarizar para hacer pruebas sin update
+    if (startUpdate === 0) return;
     const processID = setTimeout(() => {
       setRunUpdate((prev) => prev + 1);
     }, 15000);
@@ -109,10 +120,10 @@ export const ContentChat = (props) => {
   // ejecutar update
   useEffect(() => {
     if (chatType === "merchant_product") {
-      if (singleChat.items) getUpdateLatestMerchantProduct();
+      if (singleChat.items) getUpdateLatestMerchantProduct(true);
       else getInitialMerchantProduct();
     } else if (chatType === "order_product") {
-      if (companies) getUpdateLatestOrderProduct();
+      if (companies) getUpdateLatestOrderProduct(true);
       else getInitialOrderProduct();
     } else {
       if (singleChat.items) getUpdateLatestTicket(true);
@@ -146,6 +157,7 @@ export const ContentChat = (props) => {
       return;
     }
     // success
+    setStartUpdate((prev) => prev + 1);
     setCurrentUser({
       id: response.body.data.currentUserId,
       companyId: response.body.data.currentCompanyId,
@@ -379,16 +391,18 @@ export const ContentChat = (props) => {
   /*=======================================================================
                 PETICION GET UPDATE_LATEST SEGUN EL TIPO DE CHAT
   ======================================================================= */
-  const getUpdateLatestMerchantProduct = async () => {
+  const getUpdateLatestMerchantProduct = async (fromUpdate = false) => {
     const paramsQuery = {
       getType: "updateLatest",
       id: JSON.stringify(dataChat.id),
       version: JSON.stringify(dataChat.version),
       date: encodeURIComponent(lastUpdateDate),
     };
+    const paramsHeaders = { Authorization: dataChat.userToken };
     const response = await fetchGET(
       process.env.REACT_APP_PRODUCTS_CHAT_ENDPOINT,
-      paramsQuery
+      paramsQuery,
+      paramsHeaders
     );
     if (!response.body) {
       console.log("ERROR updateLatest:", {
@@ -398,6 +412,7 @@ export const ContentChat = (props) => {
       return;
     }
     // success
+    setStartUpdate((prev) => prev + 1);
     setLastUpdateDate(response.body.data.lastUpdateDate);
     // actualizar la lista de los users
     updateAllUsers(response.body.users);
@@ -405,12 +420,13 @@ export const ContentChat = (props) => {
     let newSingleChat = { ...singleChat };
     newSingleChat.items = addNewItemsChat(
       newSingleChat.items,
-      response.body.items
+      response.body.items,
+      fromUpdate
     );
     setSingleChat(newSingleChat);
   };
 
-  const getUpdateLatestOrderProduct = async () => {
+  const getUpdateLatestOrderProduct = async (fromUpdate = false) => {
     const paramsQuery = {
       getType: "updateLatest",
       id: JSON.stringify(dataChat.id),
@@ -436,7 +452,7 @@ export const ContentChat = (props) => {
       return;
     }
     // success
-
+    setStartUpdate((prev) => prev + 1);
     // cuando cambie la lista de chats por un cambio de version o estatus
     if (response.body.data.status) {
       setIsLoading(true);
@@ -481,7 +497,8 @@ export const ContentChat = (props) => {
       Object.keys(response.body.companies).forEach((companyId) => {
         companiesList[companyId].items = addNewItemsChat(
           companiesList[companyId].items,
-          response.body.companies[companyId].items
+          response.body.companies[companyId].items,
+          fromUpdate
         );
       });
       setCompanies(companiesList);
@@ -609,15 +626,13 @@ export const ContentChat = (props) => {
   };
 
   const createItemsMerchantProduct = async (items = []) => {
-    const paramsBody = {
-      id: JSON.stringify(dataChat.id),
-      version: JSON.stringify(dataChat.version),
-      userId: JSON.stringify(currentUser.id),
-      items: JSON.stringify(items),
-    };
+    const { id, version } = dataChat;
+    const paramsBody = { id, version, items };
+    const paramsHeaders = { Authorization: dataChat.userToken };
     const response = await fetchPOST(
       process.env.REACT_APP_PRODUCTS_CHAT_ENDPOINT,
-      paramsBody
+      paramsBody,
+      paramsHeaders
     );
     if (!response.body) {
       return {
@@ -629,17 +644,16 @@ export const ContentChat = (props) => {
 
   const createItemsOrderProduct = async (items = []) => {
     const paramsBody = {
-      id: JSON.stringify(dataChat.id),
-      version: JSON.stringify(currentArticle.version),
-      userId: JSON.stringify(currentUser.id),
-      items: JSON.stringify(items),
-      orderId: JSON.stringify(dataChat.orderId),
-      sentCompanyId: JSON.stringify(currentUser.companyId),
-      receivedCompanyId: JSON.stringify(activeCompanyId),
+      id: dataChat.id,
+      version: currentArticle.version,
+      items,
+      orderId: dataChat.orderId,
     };
+    const paramsHeaders = { Authorization: dataChat.userToken };
     const response = await fetchPOST(
       process.env.REACT_APP_PRODUCTS_CHAT_ENDPOINT,
-      paramsBody
+      paramsBody,
+      paramsHeaders
     );
     if (!response.body) {
       return {
@@ -655,9 +669,11 @@ export const ContentChat = (props) => {
       userId: JSON.stringify(dataChat.currentUser.id),
       items: JSON.stringify(items),
     };
+    const paramsHeaders = { Authorization: dataChat.userToken };
     const response = await fetchPOST(
       process.env.REACT_APP_TICKETS_CHAT_ENDPOINT,
-      paramsBody
+      paramsBody,
+      paramsHeaders
     );
     if (!response.body) {
       return {
@@ -739,8 +755,8 @@ export const ContentChat = (props) => {
       }, 5000);
     }
     return Object.values(itemsId).sort((a, b) => {
-      if (a.id < b.id) return 1;
-      if (a.id > b.id) return -1;
+      if (a.id > b.id) return 1;
+      if (a.id < b.id) return -1;
       return 0;
     });
   };
@@ -755,13 +771,6 @@ export const ContentChat = (props) => {
     setAllUsers(currentUsers);
   };
 
-  const stopUpdate = () => {
-    if (processUpdateID !== undefined) {
-      clearTimeout(processUpdateID);
-      setProcessUpdateID(undefined);
-    }
-  };
-
   const renderBodyChat = () => {
     if (isLoading) return <Loading />;
     if (errorChat.existError) {

package/src/components/organisms/Chat/ContentChat/styles.js

@@ -1,5 +1,5 @@
 import styled from "styled-components";
-import { GlobalColors, FontFamily } from "../../../../global-files/variables";
+import { FontFamily } from "../../../../global-files/variables";
 
 export const Container = styled.div`
   width: 100%;

package/src/components/organisms/Chat/Footer/index.js

@@ -3,13 +3,11 @@ import {
   ContainerItemCarrousel,
   ContainerMain,
   ContainerSecondary,
-  ContainerTooltipFileName,
 } from "./styles";
 import { useEffect, useState, useRef } from "react";
 import AWS from "aws-sdk";
 import { v4 as uuidv4 } from "uuid";
 import { Image as CustomImage } from "../../../atoms/Image";
-import { ImageTooltip } from "../../../molecules/ImageTooltip";
 import {
   faArrowUp as IconSend,
   faImage as IconImage,
@@ -21,7 +19,7 @@ import { ButtonV2 } from "../../../atoms/ButtonV2";
 import { IconFile } from "../../../atoms/IconFile";
 import { Modal } from "../../Modal";
 import { Tooltip } from "../../../atoms/Tooltip";
-import { Fade, Tooltip as TooltipMUI, Zoom } from "@mui/material";
+import { Fade, Tooltip as TooltipMUI } from "@mui/material";
 import { ButtonFileChooser } from "../../../atoms/ButtonFileChooser";
 import { Slide } from "@mui/material";
 // carrousel
@@ -186,7 +184,7 @@ export const Footer = (props) => {
           }
           // enviar file a AWS
           customFiles.push({
-            itemType: file.type.split("/")[0] == "image" ? "img" : "file",
+            itemType: file.type.split("/")[0] === "image" ? "img" : "file",
             key: fileKey,
             errorOwn: errorMessage,
           });
@@ -208,6 +206,7 @@ export const Footer = (props) => {
           }
         });
       } catch (err) {
+        console.log(err);
         disableSecondaryContainer(false);
         setModalAlert({
           show: true,
@@ -236,10 +235,7 @@ export const Footer = (props) => {
               valueItem.height = imgSize.height;
             }
           }
-          items.push({
-            type: file.itemType,
-            value: JSON.stringify(valueItem),
-          });
+          items.push({ type: file.itemType, value: JSON.stringify(valueItem) });
         }
       }
 

package/src/components/organisms/Chat/index.js

@@ -166,7 +166,7 @@ export const Chat = (props) => {
 
     // convertir user TECH a NORMAL si es el propietario del ticket
     let isUserTech = currentUser.isUserTech;
-    if (isUserTech && currentUser.id == ticketOwnerUserId) {
+    if (isUserTech && currentUser.id === ticketOwnerUserId) {
       isUserTech = false;
     }
     setData({

package/src/components/organisms/FullProductNameHeader/index.js

@@ -19,6 +19,7 @@ export const FullProductNameHeader = ({
   showApproveRejectAll,
 }) => {
   const [retailers, setRetailers] = useState([]);
+
   useEffect(() => {
     const rtls = headerData?.retailers || headerData?.retailersAvailable;
     servicesData &&
@@ -33,6 +34,12 @@ export const FullProductNameHeader = ({
       });
     setRetailers(rtls);
   }, [servicesData]);
+
+  const getTime = (date) => {
+    if (!date) return "";
+    return new Date(date).toLocaleDateString();
+  };
+
   return (
     <Container>
       <ProductNameHeader
@@ -45,9 +52,7 @@ export const FullProductNameHeader = ({
         percentRequired={percent}
         percent={percent?.toFixed(0)}
         priority={headerData?.prio}
-        date={new Date(
-          headerData?.article?.timestamp || headerData?.timestamp
-        ).toLocaleDateString()}
+        date={getTime(headerData?.article?.timestamp || headerData?.timestamp)}
       />
       <div className="features-bar-container">
         <FeaturesBar

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

@@ -12,11 +12,11 @@ export const ProviderProductEditionDefault = Template.bind({});
 ProviderProductEditionDefault.args = {
   tabsSections: {
     Descripción: true,
-    "Ficha técnica": true,
-    Imágenes: true,
+    "Ficha técnica": false,
+    Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI1ODg0YWUzNC01OWQ2LTQ0NTQtYjk4ZS04MjE1MThiY2MzYTciLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjU4ODRhZTM0LTU5ZDYtNDQ1NC1iOThlLTgyMTUxOGJjYzNhNyIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiIwM2UyYWU3NS1hNzg0LTQwM2UtODE1YS0wOWUzYTZkYjg1M2UiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4MDAyNzUyNSwibmFtZSI6IkNhZGVuYSBJc21hZWwiLCJwaG9uZV9udW1iZXIiOiIrNTIzMTExMzY2MzM2IiwiZXhwIjoxNjgwMDMxMTI1LCJpYXQiOjE2ODAwMjc1MjUsImVtYWlsIjoiY2FkZW5hLmlzbWFlbEBhbGxmcmVlbWFpbC5uZXQifQ.cHoFb-dn2q9GkDfippwUGNLMMtn-1-36Jhuhi8zhHEKlvPf6QIqCzM7vs0WBAkCNlOLrE3pr00LwemQi9TMJENqnQ2d2mbZ9QrOwFDSxkk-8-J7wbcRdaLmQFebIJmx8Ta1mAJDqEXsx7LTWW8D1N28bA3DKUS7Jnw411kC-4C2nT-zr0jRD5D0998dOROkDg6_Rp27sPE-B3H3Su0Of4C6olqYLNdZSCRJBTiXs5zJqmvZxtDcr20EFTWfNzXjHP2BNsylUHe9AKZI_pNjA3zhApfddZiYHWt8IMsJCSoW8yp8orZkwNew0BaHCFCk2UjyQu3NlW8i6D4aVnullqQ",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI1ODg0YWUzNC01OWQ2LTQ0NTQtYjk4ZS04MjE1MThiY2MzYTciLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjU4ODRhZTM0LTU5ZDYtNDQ1NC1iOThlLTgyMTUxOGJjYzNhNyIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiJlZjViNDQzYi02ODc0LTQ2NGQtOWZiZS00Y2UwNWU4ZDQ3YTEiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4MDAzODYyNiwibmFtZSI6IkNhZGVuYSBJc21hZWwiLCJwaG9uZV9udW1iZXIiOiIrNTIzMTExMzY2MzM2IiwiZXhwIjoxNjgwMDQyMjI1LCJpYXQiOjE2ODAwMzg2MjYsImVtYWlsIjoiY2FkZW5hLmlzbWFlbEBhbGxmcmVlbWFpbC5uZXQifQ.rhufpJdUaJOpiKtXJgNoDq863ecFnLp63c9_6NeEbpYYNN19d_xac8aZADN-QMpkmz1oxtqfxf_-JN5jMJexi9gJCRb9O7-xL75v_G9UjdmE8sRA6qRNb_tFUCt1oee_ulgqm_2wTjb7qGMGvY1eb1J1IX2pBYKnBy64KM6J5xFfZ57ac_bGruYhCzUexPBWyZKc5ckoY2zJqK5m5Ok7ds0m1hC0t-eQSGX_8KMsGQKiHevQ07cZUQ9mxOGVweRuAqITNx8fVmpD9QTpoZJJ5STVVcKO2CS0ltyE_DNlyejO7mZqbKvGEeLYc4ga0nozK9aP8H2cN_topT0d4JZ5rA",
   articleId: 238,
   category: 846,
   version: 2,
@@ -59,7 +59,13 @@ ProviderProductEditionDefault.args = {
     ],
   },
   location: {
-    state: { origin: "Contentoh", withChat: true },
+    pathname: "/EditProducts",
+    search: "",
+    hash: "",
+    state: {
+      withChat: true,
+    },
+    key: "24vwut",
   },
   user: {
     id_user: 59,
@@ -93,7 +99,7 @@ ProviderProductEditionDefault.args = {
       products_limit: "500",
       type: "PyMES",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-59/59.png?1680027527535",
+    src: "https://content-management-profile.s3.amazonaws.com/id-59/59.png?1680038627077",
   },
   company: {
     id_company: 817,

package/src/global-files/handle_http.js

@@ -1,6 +1,14 @@
 import axios from "axios";
 
-//============================================================
+const objToQueryString = (obj) => {
+  if (!Object.values(obj).length) return null;
+  return Object.entries(obj)
+    .map(
+      ([key, value]) => `${key}=${encodeURIComponent(JSON.stringify(value))}`
+    )
+    .join("&");
+};
+
 /**
  *	funcion que realiza un axios GET
  *	
@@ -10,10 +18,7 @@ import axios from "axios";
  * 	body: {} | undefined , 
  * 	message: string, 
  * 	errorDetail: string
- * }> }
- *  
- */
-//============================================================
+ * }> } */
 export const fetchGET = (
   endpoint = "",
   paramsQuery = {},
@@ -21,16 +26,9 @@ export const fetchGET = (
 ) => {
   return new Promise(async (response) => {
     try {
-      let URL = endpoint;
+      let URL = `${endpoint}?${objToQueryString(paramsQuery)}`;
       const keysParamsQuery = Object.keys(paramsQuery);
       // agregar cada param query a la URL
-      keysParamsQuery.forEach((key, index) => {
-        if (index == 0) {
-          URL += `?${key}=${paramsQuery[key]}`;
-        } else {
-          URL += `&${key}=${paramsQuery[key]}`;
-        }
-      });
       const respHTTPjson = await axios.get(URL, { headers: paramsHeaders });
       // verificar si existe un error en la peticion realizada
       if (respHTTPjson.status !== 200) {