contentoh-components-library 21.4.122 → 21.4.124

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

@@ -21,7 +21,7 @@ export const InputGroup = ({
   compare,
   groupData = [],
   setUpdatedBoxData,
-  activeRetailer,
+  activeRetailer
 }) => {
   const inputTypeValue = (type) => {
     switch (type) {
@@ -41,11 +41,7 @@ export const InputGroup = ({
   };
 
   useEffect(() => {
-    if (
-      inputGroup.groupId === "16" &&
-      activeRetailer &&
-      activeRetailer?.retailer?.id
-    ) {
+    if (inputGroup.groupId === "16" && activeRetailer && activeRetailer?.retailer?.id) {
       if (activeRetailer?.retailer?.id === 68) {
         setShowBox(true);
       } else {
@@ -54,127 +50,127 @@ export const InputGroup = ({
     }
   }, [activeRetailer, inputGroup.groupId]);
 
+  // useEffect(() => {
+  //   if (showBox) {
+  //     // Realiza la acción que deseas cuando showBox es true
+  //     console.log("showBox es true");
+  //   } else {
+  //     // Realiza la acción que deseas cuando showBox es false
+  //     console.log("showBox es false");
+  //   }
+  // }, [showBox]);
+
   return (
     <>
       {inputGroup.groupId === "16" && activeRetailer?.retailer?.id === 68 && (
         <Container
-          className={
-            activeSection === "Ficha técnica"
-              ? "datasheets-layout"
-              : "descriptions-layout"
-          }
-        >
-          <Box
-            inputGroup={inputGroup}
-            dataInputs={dataInputs}
-            onChange={setUpdatedBoxData}
-          />
-        </Container>
-      )}
-      {inputGroup.groupId !== "16" && (
-        <Container
-          className={
-            activeSection === "Ficha técnica"
-              ? "datasheets-layout"
-              : "descriptions-layout"
-          }
-        >
-          {inputGroup?.dataGroup && (
-            <ScreenHeader
-              headerType={"retailer-name-header"}
-              text={`${inputGroup?.dataGroup}`}
+            className={
+              activeSection === "Ficha técnica"
+                ? "datasheets-layout"
+                : "descriptions-layout"
+            }
+          >
+            <Box
+              inputGroup={inputGroup}
+              dataInputs={dataInputs}
+              onChange={setUpdatedBoxData}
             />
+          </Container>
+        )}
+      {(inputGroup.groupId !== "16") && (
+      <Container
+        className={
+          activeSection === "Ficha técnica"
+            ? "datasheets-layout"
+            : "descriptions-layout"
+        }
+      >
+        {inputGroup?.dataGroup && (
+          <ScreenHeader
+            headerType={"retailer-name-header"}
+            text={`${inputGroup?.dataGroup}`}
+          />
+        )}
+        <div className="inputs-container">
+          {inputGroup?.inputs?.map((input, index) =>
+            activeSection === "Ficha técnica" ? (
+            <>
+              <TagAndInput
+                key={
+                  index +
+                  "-" +
+                  dataInputs[input]?.value +
+                  "-" +
+                  dataInputs[input]?.id +
+                  "-" +
+                  compare
+                }
+                //disabled={input === 40001}
+                disabled={false}
+                inputId={dataInputs[input]?.id}
+                version={version}
+                inputType={inputTypeValue(dataInputs[input]?.type)}
+                label={
+                  dataInputs[input]?.name +
+                  (dataInputs[input]?.required ? "*" : "")
+                }
+                value={
+                  compare ? auditInputs[input]?.value : dataInputs[input]?.value
+                }
+                inputPlaceHolder={input?.placeholder}
+                articleId={articleId}
+                isRequired={dataInputs[input]?.required}
+                updatedDatasheets={updatedDatasheets}
+                setUpdatedDatasheets={setUpdatedDatasheets}
+                maxChar={
+                  dataInputs[input]?.max_chars
+                    ? dataInputs[input]?.max_chars
+                    : 999
+                }
+                optionList={dataInputs[input]?.option_list}
+                description={dataInputs[input]?.description}
+                showTooltip={true}
+                auditClass={
+                  compare &&
+                  !isEquals(dataInputs[input].value, auditInputs[input].value)
+                    ? "audit-class"
+                    : ""
+                }
+              />
+            </>
+            ) : (
+              <TagAndInput
+                key={index + "-" + input?.value + "-" + compare}
+                inputId={input.id}
+                index={index}
+                inputType={"textarea"}
+                label={input?.name + (input.required ? "*" : "")}
+                value={
+                  compare ? auditInputGroup?.inputs[index]?.value : input?.value
+                }
+                isRequired={input.required}
+                maxChar={input.max_chars}
+                inputPlaceHolder={input?.placeholder}
+                updatedDescriptions={updatedDescriptions}
+                setUpdatedDescriptions={setUpdatedDescriptions}
+                articleId={articleId}
+                version={version}
+                dinamicHeight={dinamicHeight}
+                description={input?.description}
+                showTooltip={true}
+                auditClass={
+                  compare &&
+                  !isEquals(input?.value, auditInputGroup?.inputs[index]?.value)
+                    ? "audit-class"
+                    : ""
+                }
+              />            
+            )
           )}
-          <div className="inputs-container">
-            {inputGroup?.inputs?.map((input, index) =>
-              activeSection === "Ficha técnica" ? (
-                <>
-                  <TagAndInput
-                    key={
-                      index +
-                      "-" +
-                      dataInputs[input]?.value +
-                      "-" +
-                      dataInputs[input]?.id +
-                      "-" +
-                      compare
-                    }
-                    //disabled={input === 40001}
-                    disabled={false}
-                    inputId={dataInputs[input]?.id}
-                    version={version}
-                    inputType={inputTypeValue(dataInputs[input]?.type)}
-                    label={
-                      dataInputs[input]?.name +
-                      (dataInputs[input]?.required ? "*" : "")
-                    }
-                    value={
-                      compare
-                        ? auditInputs[input]?.value
-                        : dataInputs[input]?.value
-                    }
-                    inputPlaceHolder={input?.placeholder}
-                    articleId={articleId}
-                    isRequired={dataInputs[input]?.required}
-                    updatedDatasheets={updatedDatasheets}
-                    setUpdatedDatasheets={setUpdatedDatasheets}
-                    maxChar={
-                      dataInputs[input]?.max_chars
-                        ? dataInputs[input]?.max_chars
-                        : 999
-                    }
-                    optionList={dataInputs[input]?.option_list}
-                    description={dataInputs[input]?.description}
-                    showTooltip={true}
-                    auditClass={
-                      compare &&
-                      !isEquals(
-                        dataInputs[input].value,
-                        auditInputs[input].value
-                      )
-                        ? "audit-class"
-                        : ""
-                    }
-                  />
-                </>
-              ) : (
-                <TagAndInput
-                  key={index + "-" + input?.value + "-" + compare}
-                  inputId={input.id}
-                  index={index}
-                  inputType={"textarea"}
-                  label={input?.name + (input.required ? "*" : "")}
-                  value={
-                    compare
-                      ? auditInputGroup?.inputs[index]?.value
-                      : input?.value
-                  }
-                  isRequired={input.required}
-                  maxChar={input.max_chars}
-                  inputPlaceHolder={input?.placeholder}
-                  updatedDescriptions={updatedDescriptions}
-                  setUpdatedDescriptions={setUpdatedDescriptions}
-                  articleId={articleId}
-                  version={version}
-                  dinamicHeight={dinamicHeight}
-                  description={input?.description}
-                  showTooltip={true}
-                  auditClass={
-                    compare &&
-                    !isEquals(
-                      input?.value,
-                      auditInputGroup?.inputs[index]?.value
-                    )
-                      ? "audit-class"
-                      : ""
-                  }
-                />
-              )
-            )}
-          </div>
-        </Container>
+        </div>
+      </Container>
       )}
-      {inputGroup.groupId === "16" && activeRetailer?.retailer?.id === 74 && (
+       {(inputGroup.groupId === "16" && activeRetailer?.retailer?.id === 74) && (
         <Container
           className={
             activeSection === "Ficha técnica"
@@ -234,10 +230,7 @@ export const InputGroup = ({
                     onChange={setUpdatedBoxData}
                     auditClass={
                       compare &&
-                      !isEquals(
-                        dataInputs[input].value,
-                        auditInputs[input].value
-                      )
+                      !isEquals(dataInputs[input].value, auditInputs[input].value)
                         ? "audit-class"
                         : ""
                     }
@@ -251,9 +244,7 @@ export const InputGroup = ({
                   inputType={"textarea"}
                   label={input?.name + (input.required ? "*" : "")}
                   value={
-                    compare
-                      ? auditInputGroup?.inputs[index]?.value
-                      : input?.value
+                    compare ? auditInputGroup?.inputs[index]?.value : input?.value
                   }
                   isRequired={input.required}
                   maxChar={input.max_chars}
@@ -267,10 +258,7 @@ export const InputGroup = ({
                   showTooltip={true}
                   auditClass={
                     compare &&
-                    !isEquals(
-                      input?.value,
-                      auditInputGroup?.inputs[index]?.value
-                    )
+                    !isEquals(input?.value, auditInputGroup?.inputs[index]?.value)
                       ? "audit-class"
                       : ""
                   }

package/src/components/organisms/Modal/Modal.stories.js

@@ -6,7 +6,7 @@ export default {
   component: Modal,
   argTypes: {
     icon: {
-      options: [undefined, "error", "warning", "success", "successv2", "info"],
+      options: [undefined, "error", "warning", "success", "info"],
       control: { type: "select" },
     },
   },
@@ -19,7 +19,6 @@ modalDefault.args = {
   show: false,
   title: "Titulo del modal",
   icon: undefined,
-  image:undefined,
   message: `descripcion amplia sobre el componente 
 	modal white para saber como se ven varias lineas
 	de codigo`,

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

@@ -6,7 +6,6 @@ import {
   faCheck as successIcon,
   faExclamation as infoIcon,
 } from "@fortawesome/free-solid-svg-icons";
-
 import { FontAwesomeIcon as Icon } from "@fortawesome/react-fontawesome";
 import { Fade, Grow, Zoom, Modal as ModalMUI, Backdrop } from "@mui/material";
 import { ButtonV2 } from "../../atoms/ButtonV2";
@@ -18,8 +17,7 @@ export const Modal = (props) => {
     show, // boolean
     title, // string
     message, // string
-    icon, // "error" | "warning" | "success" | "successV2" | "info" (por default no icon)
-    image,
+    icon, // "error" | "warning" | "success" | "info" | (por default no icon)
     customComponent, // JSX
     buttons, // array<JSX>
     onClickModal, // (event) => {}
@@ -30,7 +28,6 @@ export const Modal = (props) => {
     warning: warningIcon,
     info: infoIcon,
     success: successIcon,
-    successv2: successIcon,
   };
 
   return (
@@ -40,7 +37,7 @@ export const Modal = (props) => {
       timeout={400}
       style={{
         backgroundColor: "transparent",
-        zIndex: 10100,
+        zIndex: 10,
       }}
       onClick={(event) => onClickModal && onClickModal(event)}
     >
@@ -54,10 +51,6 @@ export const Modal = (props) => {
               )}
             </header>
 
-            {/* imagen modal */}
-            {image && (
-              <img src={image} alt="img modal"></img>
-            )}
             {/* icono modal */}
             {icons[icon?.toLowerCase()] && (
               <CustomIcon

package/src/components/organisms/Modal/styles.js

@@ -31,6 +31,7 @@ export const ContainerModal = styled.div`
       align-items: center;
       justify-content: flex-start;
       gap: 6px;
+      margin-bottom: 20px;
 
       .label-title {
         width: 100%;
@@ -41,10 +42,6 @@ export const ContainerModal = styled.div`
         color: #262626;
         white-space: pre-wrap;
       }
-
-      & + * {
-        margin-top: 20px;
-      }
     }
 
     .iconModal {
@@ -72,10 +69,6 @@ export const ContainerModal = styled.div`
       }
       &.iconModal-success {
       }
-      &.iconModal-successv2{
-        border-color: #85BC5B;
-        color: #85BC5B;
-      }
     }
 
     .label-message {

package/src/components/organisms/OrderDetail/utils/Table/utils.js

@@ -1,31 +1,41 @@
 export const servicesCodeIcon = {
   datasheet: (
     <div key="datasheet" className="tooltip">
-      <span className="material-icons small">&#xf8ee;</span>
+      <span className="material-icons small">
+        &#xf8ee;
+      </span>
       <span className="tooltiptext">Ficha Técnica</span>
     </div>
   ),
   description: (
     <div key="description" className="tooltip">
-      <span className="material-icons small">&#xe873;</span>
+      <span className="material-icons small">
+          &#xe873;
+        </span>
       <span className="tooltiptext">Descripción</span>
     </div>
   ),
   image: (
     <div key="image" className="tooltip">
-      <span className="material-icons small">&#xe3f4;</span>
+      <span className="material-icons small">
+        &#xe3f4;
+      </span>
       <span className="tooltiptext">Imagen</span>
     </div>
   ),
   translate: (
     <div key="translate" className="tooltip">
-      <span className="material-icons small">&#xe8e2;</span>
+      <span className="material-icons small">
+        &#xe8e2;
+      </span>
       <span className="tooltiptext">Traducción</span>
     </div>
   ),
   build: (
-    <div key="build" className="tooltip">
-      <span className="material-icons small">&#xe1bd;</span>
+    <div key="build"  className="tooltip">
+      <span className="material-icons small">
+        &#xe1bd;
+      </span>
       <span className="tooltiptext">Construcción</span>
     </div>
   ),

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

@@ -9,54 +9,59 @@ const Template = (args) => <Dashboard {...args} />;
 export const DashboardDeafult = Template.bind({});
 DashboardDeafult.args = {
   user: {
-    id_user: 343,
-    name: "Jair",
-    last_name: "León",
-    email: "hleon@contentoh.com",
-    position: "Test States",
-    telephone: "+525555555555",
+    id_user: 37,
+    name: "José",
+    last_name: "Castañeda",
+    email: "ismael97lopez@gmail.com",
+    position: "Auditor",
+    telephone: "",
     country: "México",
-    id_company: 234,
-    id_cognito: "4512b5a5-366a-4bb5-916e-aafe05402992",
+    id_company: 2,
+    id_cognito: "9a213128-6482-4c16-a4b6-6e64f225b1bd",
     birth_Date: null,
     about_me: "",
     zip_code: "",
     address: "",
     job: "",
-    id_stripe: "cus_KuEt6R6vwmN09f",
-    id_role: 0,
+    id_stripe: "",
+    id_role: 6,
     active: 1,
     is_retailer: 0,
-    email_notify: 0,
-    is_user_tech: "ADMIN-AS",
+    email_notify: 1,
+    is_user_tech: null,
     membership: {
-      id: 139,
-      start_date: "2023-10-04T15:46:14.000Z",
-      end_date: "2024-10-04T08:46:09.000Z",
-      planID: 9,
-      plan: "prod_KtlkzZVGq6bRTO",
-      name: "Plan Enterprise Full",
-      user_limit: "30",
-      products_limit: "10000",
-      type: "Enterprise",
+      id: 2,
+      start_date: "2021-11-05T02:35:12.000Z",
+      end_date: "2022-11-05T02:34:49.000Z",
+      planID: 1,
+      plan: "prod_KtkvuFFLpOdP6e",
+      name: "Plan Free",
+      user_limit: "1",
+      products_limit: "3",
+      type: "PyMES",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-343/343.png?1699640943284",
+    src: "https://content-management-profile.s3.amazonaws.com/id-37/37.png?1684953973972",
   },
   company: {
-    id_company: 234,
-    trade_name: "L'ORÉAL",
-    company_name: "L'ORÉAL",
+    id_company: 1,
+    trade_name: "GRUPO BRAHMA",
+    company_name: "GRUPO BRAHMA",
     rfc: "XAXX010101000",
     adress: "AA",
-    about_company: " ",
-    telephone: " ",
-    web_site: " ",
-    zip_code: " ",
+    about_company: "",
+    telephone: "",
+    web_site: "",
+    zip_code: "",
     email: null,
-    social_link: " ",
+    social_link: "",
     is_retailer: 0,
-    financedRetailers: [],
-    retailers: [],
+    retailers: [
+      {
+        id: null,
+        name: null,
+        country: null,
+      },
+    ],
   },
-  jwt: "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI0NTEyYjVhNS0zNjZhLTRiYjUtOTE2ZS1hYWZlMDU0MDI5OTIiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjQ1MTJiNWE1LTM2NmEtNGJiNS05MTZlLWFhZmUwNTQwMjk5MiIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI4YTJhOTE3ZS0xZWU2LTQ5ODAtODZiZS0yZTEzMGI4ZTcyMmIiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY5OTY0MDk0MSwibmFtZSI6IkphaXIgTGXDs24iLCJwaG9uZV9udW1iZXIiOiIrNTI1NTU1NTU1NTU1IiwiZXhwIjoxNjk5NjQ0NTQxLCJpYXQiOjE2OTk2NDA5NDEsImVtYWlsIjoiaGxlb25AY29udGVudG9oLmNvbSJ9.YrLhtF5cee0S_iWX1gXBTJPxF8zls25SMK9GfCWoCpAabGRy9HtGSZ9KUuZlXICz13TTvgOfxFIv5duwS2vxYIlE1ZuLPHXSm2L4FuwJHcppedxssPNgfmxmVu-4B0SaMNWynjIWwbt_wumb2spwe3ONTcuRI-UgmJo_Rfa_cKUOiL-oNCQwkX6KhuWRGcfcpoUkfhi6tfOAgkA8VT5D8h-Dgawg5ibRnbjRMQejfNg1vVh_d2MpYhX9ve5SM9r1JdRCowgxMjb3ii6eXnng_UqjRdrB4008wkG8iZbz2C_NVJjJGrt1B454MZZmRvHbRogs-uu6U1JUsDW09qhcCg",
+  jwt: "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJmNTkyN2Y4ZS1jYmY3LTQ5MjItOWUwOS1lNjllYzBiMjczMWEiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6ImY1OTI3ZjhlLWNiZjctNDkyMi05ZTA5LWU2OWVjMGIyNzMxYSIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI3ZjNkZTM4Mi03NWE2LTRlNDAtYTI3NC00YmM5ODg2Nzk0YjYiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4NDk1NTYzOCwibmFtZSI6IklzbWFlbCBMb3BleiIsInBob25lX251bWJlciI6Iis1MjMxMTEzNjYzMzYiLCJleHAiOjE2ODQ5NTkyMzcsImlhdCI6MTY4NDk1NTYzOCwiZW1haWwiOiJpbG9wZXpAY29udGVudG9oLmNvbSJ9.ALvhpSGVv34JV8vLSg0CznmsIzRMJ_BFcmDI4qYXzr0qwgLLihon0M0xmODMhIHKcZK4jODC01guliB6fTPoCb8kfPHrBgLnHMBU8PxU1Fcc2EqF5U8lh4fJK6Mc7kiJ4lCreKJL3kT_1ytC-7FdRAlhNXzuJW6aMQQ785ODQ8-1RtHKW6U_b9x88-WFxjltEKuw734LGBSkz9iKZSumNBJBP8HTMgwOgmRTJ6lR-hPsujvl7aF3maXhftpk2fI8S_FzjVRMsxY3T8hQHIXEYwQUv-fC5SPOgc8XDuAp18MKfi0qkU1EYHQahC0qZmvgVGWEDcu5D36Xj0as4iAiFQ",
 };

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

@@ -40,8 +40,6 @@ export const Dashboard = ({ jwt, user, company }) => {
   const [applicantsFilter, setApplicantsFilter] = useState([]);
   const [totalCount, setTotalCount] = useState(0);
   const [isProviderFinanced] = useState(company?.financedRetailers?.length > 0);
-  const [trades, setTrades] = useState([]);
-  const [tradesSelected, setTradesSelected] = useState([]);
 
   const loadProductVersions = async (queryObject) => {
     const keys = Object.keys(queryObject);
@@ -86,10 +84,9 @@ export const Dashboard = ({ jwt, user, company }) => {
     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, ordersByActive, companyTrades } =
+    const { ordersBydate, ordersByStatus } =
       (await loadProductVersions(orderByStatus)) || {};
 
-    if (trades.length === 0) setTrades(companyTrades);
     const { total = 0, R = 0, PA = 0, Ex = 0, ACA = 0 } = ordersByStatus;
     let productsFinished = 0;
     if (isRetailer) productsFinished = Ex;
@@ -103,8 +100,6 @@ export const Dashboard = ({ jwt, user, company }) => {
           : prev,
       0
     );
-
-    const registeredProducts = ordersByActive.registered;
     let metricsArray = [
       metricsData[0]
         ? metricsData[0]
@@ -112,7 +107,6 @@ export const Dashboard = ({ jwt, user, company }) => {
     ];
 
     metricsArray.push(
-      { label: "Productos activos", value: registeredProducts },
       { label: "Productos filtrados", value: total },
       { label: "Productos sin asignar", value: PA + R },
       { label: "Productos en proceso", value: inProcess },
@@ -223,13 +217,10 @@ export const Dashboard = ({ jwt, user, company }) => {
   }, []);
 
   useEffect(() => {
-    if (
-      orderByRequired?.startDate &&
+    orderByRequired?.startDate &&
       orderByStatus?.endDate &&
-      metricsData.length > 0
-    ) {
+      metricsData.length > 0 &&
       setLoading(false);
-    }
   }, [orderByRequired, orderByStatus, metricsData]);
 
   useEffect(async () => {
@@ -238,23 +229,14 @@ export const Dashboard = ({ jwt, user, company }) => {
       startDate: startDate,
       endDate: endDate,
     };
-    if (companyId.length > 0) queryObject["companyId"] = companyId.join(",");
-    if (retailerId.length > 0) queryObject["retailerId"] = retailerId.join(",");
-    if (categoryId.length > 0) queryObject["categoryId"] = categoryId.join(",");
-    if (tradesSelected.length > 0)
-      queryObject["trades"] = encodeURIComponent(tradesSelected.join(","));
+    companyId.length > 0 && (queryObject["companyId"] = companyId.join(","));
+    retailerId.length > 0 && (queryObject["retailerId"] = retailerId.join(","));
+    categoryId.length > 0 && (queryObject["categoryId"] = categoryId.join(","));
     applicantsFilter.length > 0 &&
       (queryObject["requestedBy"] = applicantsFilter.join(","));
 
     await loadProductsByStatus(queryObject, true);
-  }, [
-    companyId,
-    retailerId,
-    categoryId,
-    datesRange,
-    applicantsFilter,
-    tradesSelected,
-  ]);
+  }, [companyId, retailerId, categoryId, datesRange, applicantsFilter]);
 
   return loading ? (
     <Loading />
@@ -319,17 +301,6 @@ export const Dashboard = ({ jwt, user, company }) => {
             defaultOption="Todos los solicitantes"
           />
         )}
-        {user.id_role === 0 && trades?.length > 0 && (
-          <CustomSelect
-            showSearchBar={true}
-            options={trades}
-            selectLabel="Todas las marcas"
-            placeHolder="Buscar marca"
-            customSelectId="trade-select"
-            parameterArray={tradesSelected}
-            setParameterArray={setTradesSelected}
-          />
-        )}
       </div>
       <div className="metric-cards">
         {metricsData.map((metric, index) => (