contentoh-components-library 21.3.11 → 21.3.13

package/src/components/molecules/CustomSelect/CustomSelect.stories.js

@@ -1,5 +1,4 @@
 import { CustomSelect } from "./index";
-import iconStar from "../../../assets/images/customSelect/starIcon.svg";
 
 export default {
   title: "Components/molecules/CustomSelect",
@@ -9,27 +8,20 @@ export default {
 const Template = (args) => <CustomSelect {...args} />;
 export const CustomSelectDefault = Template.bind({});
 CustomSelectDefault.args = {
-  // selectLabel: "Todos los departamentos",
+  selectLabel: "Todos los departamentos",
   defaultOption: "Todos los departamentos",
   options: [
-    {
-      id: 47,
-      name: "Enero 2023",
-      isSelected: true,
-    },
-    {
-      id: 49,
-      name: "Mis Favoritos",
+      {
+      id: 1,
+      value: "Decoración",
+      subOptions: [
+        { id: 1, value: "Espejos" },
+        { id: 2, value: "Persianas" },
+  ],
     },
+    { id: 2, value: "Eléctrico" },
+    { id: 3, value: "Ferretería" },
+    { id: 4, value: "Herramientas" },
+    { id: 5, value: "Iluminación" },
   ],
-  onClickItem: (v, id) => {
-    if (v) {
-      console.log("Agregar a la lista", id);
-    } else {
-      console.log("Eliminar a la lista", id);
-    }
-  },
-  icon: iconStar,
-  showSearchBar: true,
-  customOptions: <p>Esto es un customOptions</p>
 };

package/src/components/molecules/CustomSelect/SelectItem.js

@@ -7,7 +7,6 @@ export const SelecItem = ({
   setParameterArray,
   activeFilters,
   setActiveFilters,
-  onClickItem,
 }) => {
   const [showSubOptions, setShowSubOptions] = useState(false);
   const [chkGlobal, setChkGlobal] = useState(false);
@@ -18,9 +17,6 @@ export const SelecItem = ({
           id={"main-item-" + option.id}
           label={option.name}
           onChange={(e) => {
-            if (onClickItem) {
-              onClickItem(e.target.checked, option.id)
-            }
             const subOptions = option.subOptions;
             const filtersCopy = { ...activeFilters };
             if (subOptions) {
@@ -81,9 +77,6 @@ export const SelecItem = ({
                   activeFilters[option.name][sub.name]
                 }
                 onChange={(e) => {
-                  if (onClickItem) {
-                    onClickItem(e.target.checked, sub.id)
-                  }
                   if (e.target.checked) {
                     setParameterArray((current) =>
                       [...current, sub.id].sort((a, b) => a - b)

package/src/components/molecules/HeaderTop/index.js

@@ -1,15 +1,9 @@
 import { Container } from "./styles";
 import { ScreenHeader } from "../../atoms/ScreenHeader/index";
 import { Button } from "../../atoms/GeneralButton/index";
-import { useEffect, useRef, useState } from "react";
-import { Chat } from "../../organisms/Chat";
+import { useEffect, useRef } from "react";
 
-export const HeaderTop = ({
-  setHeaderTop,
-  withChat,
-  productSelected,
-  token,
-}) => {
+export const HeaderTop = ({ setHeaderTop }) => {
   const headerTop = useRef();
 
   useEffect(() => {
@@ -19,27 +13,12 @@ export const HeaderTop = ({
   return (
     <Container ref={headerTop}>
       <ScreenHeader text="Edición de producto" />
-      <div className="buttons-top">
-        {withChat && (
-          <Chat
-            chatType="merchant_product"
-            chatContainerType="popUp"
-            chatData={{
-              userToken: token,
-              id: productSelected.id_article,
-              version: productSelected.version,
-            }}
-            size={18}
-          />
-        )}
-
-        <Button
-          buttonType="close-button"
-          onClick={() => {
-            window.location.href = `/products`;
-          }}
-        />
-      </div>
+      <Button
+        buttonType="close-button"
+        onClick={() => {
+          window.location.href = `/products`;
+        }}
+      />
     </Container>
   );
 };

package/src/components/molecules/HeaderTop/styles.js

@@ -3,8 +3,4 @@ import styled from "styled-components";
 export const Container = styled.div`
   display: flex;
   justify-content: space-between;
-  .buttons-top {
-    display: flex;
-    align-items: center;
-  }
 `;

package/src/components/molecules/ProductNameHeader/index.js

@@ -10,17 +10,12 @@ export const ProductNameHeader = ({
   percent,
   priority,
   date,
-  percentRequired,
 }) => {
   return (
     <Container>
       <ScreenHeader headerType={"product-name-header"} text={productName} />
-      {statusType && <Status statusType={statusType} />}
-      <ProgressBar
-        percent={percentRequired}
-        progressBarType={statusType}
-        percentRequired={percentRequired}
-      />
+      <Status statusType={statusType} />
+      <ProgressBar percent={percent} progressBarType={statusType} />
       <PriorityFlag priority={priority} />
       <ScreenHeader headerType={"date-header"} text={date} />
     </Container>

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

@@ -42,7 +42,6 @@ export const FullProductNameHeader = ({
           headerData?.status ||
           headerData?.article_status
         }
-        percentRequired={percent}
         percent={percent?.toFixed(0)}
         priority={headerData?.prio}
         date={new Date(

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

@@ -59,7 +59,7 @@ export const Dashboard = ({ jwt, user, company }) => {
   };
 
   const getRetailers = async () => {
-    const isTHDUser = user.is_retailer && company.retailers;
+    const isRetailer = user.is_retailer && company.retailers;
     const retailersResponse = await axios.get(
       `${process.env.REACT_APP_RETAILER_ENDPOINT}`,
       {
@@ -69,16 +69,18 @@ export const Dashboard = ({ jwt, user, company }) => {
       }
     );
     const parsed = JSON.parse(retailersResponse.data.body).data;
-    const retailers = isTHDUser
-      ? Object.values(parsed).filter((value) =>
-          [58, 59, 60, 61].includes(value.id)
-        )
-      : Object.values(parsed);
+    let retailers = Object.values(parsed);
+    if (isRetailer) {
+      const retailersValid = company.retailers.map((e) => e.id);
+      retailers = retailers.filter((value) =>
+        retailersValid.includes(value.id)
+      );
+    }
     setRetailers(retailers);
   };
 
-  const loadProductsByStatus = async (orderByStatus, filter) => {
-    const isTHDUser = user.is_retailer && company.retailers;
+  const loadProductsByStatus = async (orderByStatus) => {
+    const isRetailer = user.is_retailer && company.retailers;
     const isProvider = !user.is_retailer && user.id_role === 0;
     const isCollaborator = user.id_role > 0;
     const { ordersBydate, ordersByStatus } =
@@ -86,7 +88,7 @@ export const Dashboard = ({ jwt, user, company }) => {
 
     const { total = 0, R = 0, PA = 0, Ex = 0, ACA = 0 } = ordersByStatus;
     let productsFinished = 0;
-    if (isTHDUser) productsFinished = Ex;
+    if (isRetailer) productsFinished = Ex;
     if (isProvider) productsFinished = ACA;
     if (isCollaborator) productsFinished = Ex + ACA;
 
@@ -250,17 +252,19 @@ export const Dashboard = ({ jwt, user, company }) => {
           setParameterArray={setDatesRange}
           isSingleSelect
         />
-        <CustomSelect
-          showFilterString={true}
-          showSearchBar={true}
-          options={providers}
-          selectLabel="Todos los proveedores"
-          placeHolder="Buscar proveedor"
-          customSelectId="providers-select"
-          parameterArray={companyId}
-          setParameterArray={setCompanyId}
-          defaultOption="Todos los proveedores"
-        />
+        {providers?.length > 0 && (
+          <CustomSelect
+            showFilterString={true}
+            showSearchBar={true}
+            options={providers}
+            selectLabel="Todos los proveedores"
+            placeHolder="Buscar proveedor"
+            customSelectId="providers-select"
+            parameterArray={companyId}
+            setParameterArray={setCompanyId}
+            defaultOption="Todos los proveedores"
+          />
+        )}
         <CustomSelect
           showFilterString={true}
           showSearchBar={true}
@@ -272,17 +276,19 @@ export const Dashboard = ({ jwt, user, company }) => {
           setParameterArray={setCategoryId}
           defaultOption="Todas las categorías"
         />
-        <CustomSelect
-          showFilterString={true}
-          showSearchBar={true}
-          options={retailers}
-          selectLabel="Todas las cadenas"
-          placeHolder="Buscar cadena"
-          customSelectId="retailers-select"
-          parameterArray={retailerId}
-          setParameterArray={setRetailerId}
-          defaultOption="Todas las cadenas"
-        />
+        {retailers?.length > 1 && (
+          <CustomSelect
+            showFilterString={true}
+            showSearchBar={true}
+            options={retailers}
+            selectLabel="Todas las cadenas"
+            placeHolder="Buscar cadena"
+            customSelectId="retailers-select"
+            parameterArray={retailerId}
+            setParameterArray={setRetailerId}
+            defaultOption="Todas las cadenas"
+          />
+        )}
         {user.is_retailer === 1 && (
           <CustomSelect
             showFilterString={true}

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

@@ -16,76 +16,74 @@ ProviderProductEditionDefault.args = {
     Imágenes: true,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIwM2ViMjZhMC1hYjU2LTQ3NjctYjY0Zi04NDkyNTgwNzcwMmEiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjAzZWIyNmEwLWFiNTYtNDc2Ny1iNjRmLTg0OTI1ODA3NzAyYSIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiJmNmNkMzA1My1iODE4LTQzYzgtOGZhMC0yNTZmMTBhMDYwNjciLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY3NDU5OTgwNiwibmFtZSI6IlBydWViYSBNZXJjaGFudHMiLCJwaG9uZV9udW1iZXIiOiIrNTIxMjM0NTY3ODkxIiwiZXhwIjoxNjc0NjAzNDA2LCJpYXQiOjE2NzQ1OTk4MDYsImVtYWlsIjoibWVyY2hhbnRzMjRlbmVAYWxsZnJlZW1haWwubmV0In0.osGY8Rdr20hTwL86dZ_CzXxHLvPe-L0iaLtWVwJ78prdMlbDoEZWNePr-Di1rb8F2efV6FAsf9mELW6Tw3PETo_d5yeDEPVAGD0pXFvVntTlSrJGtfEDMnpNWTG2uaMlL1_zJ8BcFYmIUniZN8VvEKW6ezFOt01cK3We-Vrv92TqKa-ePQRkDnhKu52nnTgxs5aysGf-mYLxLumQ4TcOPXJ2x6OsszedJaujFDeCPN7JVGbg9HC68__WklpgocSasU6fQg4Glh1kXWQ-fy4XaFw6cBParJjkqic2Gg1iqwB5wGbrwD4E0crZyPkgwwPydTLLu6WguGWBuQHhcoG-xg",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJmNTkyN2Y4ZS1jYmY3LTQ5MjItOWUwOS1lNjllYzBiMjczMWEiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6ImY1OTI3ZjhlLWNiZjctNDkyMi05ZTA5LWU2OWVjMGIyNzMxYSIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiIyOWY3YWY3Zi0yNmQ0LTRiMWItODZmZS0zOWY2ZTUyMDFhNzAiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY2OTkyNzAyMSwibmFtZSI6IklzbWFlbCBMb3BleiIsInBob25lX251bWJlciI6Iis1MjMxMTEzNjYzMzYiLCJleHAiOjE2Njk5MzA2MjEsImlhdCI6MTY2OTkyNzAyMSwiZW1haWwiOiJpbG9wZXpAY29udGVudG9oLmNvbSJ9.NK6hVSiBksguboJ1m8yYqtDq19kzgE3GqYDEJHLUya_n_TsXriv6W1ypq7XiSo9zrqWcmHBpOoJQS7WbWzjGe__NlJEXjo8bykS8QBTTOiMrKxz1KzGRYJkwgG0axk-zVysUQH0_y-fbwgEgMPtd6qO46DB_KlFI_PEL1-uR5MJ9U0kNkS61gMbHwFQFs_DU-sS01NxjBsjUEp783rs1r-jm7TelZac1rGaFNUyi5vHdSozYzlnzfzGcuACZ0lHqvah2FHbDyurp-G_uhpUn5lNmcL4rVNh2lDd4TOnhJ3AtN1wGSmtErmhjmBHTvavh1ub9pklA1B9qjVuTRpYANw",
   articleId: 238,
   category: 846,
   version: 2,
   productSelected: {
-    category: "Decoración|Accesorios Decorativos|Accesorios Decorativos",
-    company_name: "merchants24ene@allfreemail.net",
-    company_id: 918,
-    id_category: "2028",
-    id_article: 432,
-    name: "VELA AROMA 18 OZ MAN/CAN",
-    upc: "102852",
+    id_article: 3,
+    id_category: 2032,
+    name: "CORTINA BLACKOUT DE POLIÉSTER CAFÉ 2.13 X 1.06 M",
+    upc: "161157",
+    timestamp: "2022-11-14T16:02:47.000Z",
+    categoryName: "Decoración|Cortinas y Persianas|Cortinas",
     version: 1,
     retailersAvailable: [
       {
-        id: 68,
-        name: "The Home Depot Merchants",
+        name: "The Home Depot Golden",
+        id: 58,
       },
     ],
   },
   productToEdit: {
-    idCategory: "2028",
-    ArticleId: 432,
+    idCategory: 2032,
+    ArticleId: 3,
     product: [
       {
-        category: "Decoración|Accesorios Decorativos|Accesorios Decorativos",
-        company_name: "merchants24ene@allfreemail.net",
-        company_id: 918,
-        id_category: "2028",
-        id_article: 432,
-        name: "VELA AROMA 18 OZ MAN/CAN",
-        upc: "102852",
+        id_article: 3,
+        id_category: 2032,
+        name: "CORTINA BLACKOUT DE POLIÉSTER CAFÉ 2.13 X 1.06 M",
+        upc: "161157",
+        timestamp: "2022-11-14T16:02:47.000Z",
+        categoryName: "Decoración|Cortinas y Persianas|Cortinas",
         version: 1,
         retailersAvailable: [
           {
-            id: 68,
-            name: "The Home Depot Merchants",
+            name: "The Home Depot Golden",
+            id: 58,
           },
         ],
       },
     ],
   },
   location: {
-    state: { origin: "Contentoh", withChat: true },
+    state: { origin: "Contentoh" },
   },
   user: {
-    id_user: 140,
-    name: "Prueba",
-    last_name: "Merchants",
-    email: "merchants24ene@allfreemail.net",
-    position: "merchants24ene@allfreemail.net",
-    telephone: "+521234567891",
+    id_user: 28,
+    name: "Ismael",
+    last_name: "López",
+    email: "ilopez@contentoh.com",
+    position: "Test States",
+    telephone: "+523111366336",
     country: "México",
-    id_company: 918,
-    id_cognito: "03eb26a0-ab56-4767-b64f-84925807702a",
+    id_company: 1,
+    id_cognito: "f5927f8e-cbf7-4922-9e09-e69ec0b2731a",
     birth_Date: null,
-    about_me: null,
-    zip_code: null,
-    address: null,
-    job: null,
-    id_stripe: null,
+    about_me: "",
+    zip_code: "",
+    address: "",
+    job: "",
+    id_stripe: "cus_KuEt6R6vwmN09f",
     id_role: 0,
     active: 1,
     is_retailer: 0,
-    email_notify: 1,
-    is_user_tech: null,
+    email_notify: 0,
+    is_user_tech: "AS",
     membership: {
-      id: 109,
-      start_date: "2023-01-24T22:07:34.000Z",
-      end_date: "2024-01-24T22:07:34.000Z",
+      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",
@@ -93,37 +91,21 @@ ProviderProductEditionDefault.args = {
       products_limit: "5000",
       type: "Enterprise",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-140/140.png?1674599807427",
+    src: "https://content-management-profile.s3.amazonaws.com/id-28/28.png?1669927021851",
   },
   company: {
-    id_company: 918,
-    trade_name: "merchants24ene@allfreemail.net",
-    company_name: "merchants24ene@allfreemail.net",
-    rfc: "merchants24ene@allfreemail.net",
-    adress: "merchants24ene@allfreemail.net",
-    about_company: null,
-    telephone: null,
-    web_site: null,
-    zip_code: null,
+    id_company: 1,
+    trade_name: "GRUPO BRAHMA",
+    company_name: "GRUPO BRAHMA",
+    rfc: "XAXX010101000",
+    adress: "AA",
+    about_company: "",
+    telephone: "",
+    web_site: "",
+    zip_code: "",
     email: null,
-    social_link: null,
+    social_link: "",
     is_retailer: 0,
-    financedRetailers: [
-      {
-        id: 68,
-        name: "The Home Depot Merchants",
-        country: "México",
-        id_region: 1,
-        active: 1,
-      },
-    ],
-    retailers: [
-      {
-        id: null,
-        name: null,
-        country: null,
-      },
-    ],
   },
   showSurvey: (v) => v && alert("se muestra"),
 };

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

@@ -42,7 +42,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 { number } from "prop-types";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs, inputsByRetailer } = state;
@@ -134,7 +133,6 @@ export const ProviderProductEdition = ({
   setShowContentohRequestModal,
   showSurvey,
   company,
-  withChat,
 }) => {
   const [activeTab, setActiveTab] = useState("Descripción");
   const [activeImage, setActiveImage] = useState();
@@ -275,7 +273,7 @@ export const ProviderProductEdition = ({
     setImages({ action: "init", init: services[2] });
     if (services[2]?.values?.length > 0) setActiveImage(0);
 
-    getPercentage({ data: [product] }).then((res) => setPercentages(res[0]));
+    getPercentage({ data: [product] }).then((res) => setPercentages(res));
     setLoading(false);
   };
 
@@ -365,13 +363,11 @@ export const ProviderProductEdition = ({
   useEffect(() => {
     const productTemp = product;
     const retailers = productTemp?.retailersAvailable || productTemp?.retailers;
-    if (Object.keys(percentages?.retailers ?? {})?.length > 0) {
-      retailers?.forEach((retailer) => {
-        retailer["percentage"] = Number(
-          percentages?.retailers[retailer.id].percentageRequired
-        );
-      });
-    }
+    retailers?.forEach((retailer) => {
+      retailer["percentage"] = percentages?.find(
+        (percent) => retailer?.id === percent?.id_retailer
+      )?.percentage;
+    });
 
     setProduct(productTemp);
     setActivePercentage(retailers[0]?.percentage);
@@ -1060,12 +1056,7 @@ export const ProviderProductEdition = ({
   ];
   return (
     <Container headerTop={headerTop}>
-      <HeaderTop
-        setHeaderTop={setHeaderTop}
-        withChat={location?.state?.withChat}
-        productSelected={productSelected}
-        token={token}
-      />
+      <HeaderTop setHeaderTop={setHeaderTop} />
       <div className="data-container">
         <div className="image-data-panel">
           <ImagePreviewer