contentoh-components-library 21.4.67 → 21.4.68

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);
@@ -55,7 +53,6 @@ export const Dashboard = ({ jwt, user, company }) => {
           Authorization: jwt,
         },
       });
-      console.log({ res: JSON.parse(response.data.body).data });
       return JSON.parse(response.data.body).data;
     } catch (error) {
       console.log(error);
@@ -84,57 +81,42 @@ export const Dashboard = ({ jwt, user, company }) => {
   };
 
   const loadProductsByStatus = async (orderByStatus) => {
-    try {
-      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 } =
-        (await loadProductVersions(orderByStatus)) || {};
-      console.log({
-        ordersBydate,
-        ordersByStatus,
-        ordersByActive,
-        companyTrades,
-      });
+    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 } =
+      (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;
-      if (isProvider) productsFinished = ACA;
-      if (isCollaborator) productsFinished = Ex + ACA;
+    const { total = 0, R = 0, PA = 0, Ex = 0, ACA = 0 } = ordersByStatus;
+    let productsFinished = 0;
+    if (isRetailer) productsFinished = Ex;
+    if (isProvider) productsFinished = ACA;
+    if (isCollaborator) productsFinished = Ex + ACA;
 
-      const inProcess = Object.keys(ordersByStatus).reduce(
-        (prev, curr) =>
-          !["total", "PA", "R", "Ex", "ACA"].includes(curr)
-            ? prev + ordersByStatus[curr]
-            : prev,
-        0
-      );
-
-      const registeredProducts = ordersByActive.registered;
-      let metricsArray = [
-        metricsData[0]
-          ? metricsData[0]
-          : { label: "Productos totales", value: total },
-      ];
+    const inProcess = Object.keys(ordersByStatus).reduce(
+      (prev, curr) =>
+        !["total", "PA", "R", "Ex", "ACA"].includes(curr)
+          ? prev + ordersByStatus[curr]
+          : prev,
+      0
+    );
+    let metricsArray = [
+      metricsData[0]
+        ? metricsData[0]
+        : { label: "Productos totales", value: total },
+    ];
 
-      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 },
-        { label: "Productos terminados", value: productsFinished }
-      );
-      setMetricsData(metricsArray);
-      setTotalCount(total);
-      delete ordersByStatus.total;
-      console.log({ ordersBydate, ordersByStatus });
-      setRequiredProducts(ordersBydate);
-      setProductsByStatus(ordersByStatus);
-    } catch (err) {
-      console.log("Ismael", err);
-    }
+    metricsArray.push(
+      { label: "Productos filtrados", value: total },
+      { label: "Productos sin asignar", value: PA + R },
+      { label: "Productos en proceso", value: inProcess },
+      { label: "Productos terminados", value: productsFinished }
+    );
+    setMetricsData(metricsArray);
+    setTotalCount(total);
+    delete ordersByStatus.total;
+    setRequiredProducts(ordersBydate);
+    setProductsByStatus(ordersByStatus);
   };
 
   const datesSelect = () => {
@@ -235,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 () => {
@@ -250,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 />
@@ -331,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) => (

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

@@ -21,41 +21,39 @@ ProviderProductEditionDefault.args = {
   category: 287,
   version: 1,
   productSelected: {
-    id_article: 39550,
-    upc: 43654697,
-    name: "Campana de Cocina",
-    timestamp: "2023-08-04T22:23:40.000Z",
-    categoryName:
-      "Ferretería|Ferretería General|Tornillos, Tuercas y Arandelas",
-    id_category: 287,
-    version: 1,
-    retailersAvailable: [
-      { name: "The Home Depot Golden", id: 58 },
-      { name: "The Home Depot Onboarding", id: 68 },
-    ],
-    percentage: "89",
-  },
+    id_article:39550,
+    upc:43654697,
+    name:"Campana de Cocina",
+    timestamp:"2023-08-04T22:23:40.000Z",
+    categoryName:"Ferretería|Ferretería General|Tornillos, Tuercas y Arandelas",
+    id_category:287,
+    version:1,
+    retailersAvailable:[
+      {name:"The Home Depot Golden","id":58},
+      {name:"The Home Depot Onboarding","id":68}],
+      percentage:"89"
+    },
   productToEdit: {
-    idCategory: 287,
-    ArticleId: 39550,
-    product: [
-      {
-        id_article: 39550,
-        upc: 43654697,
-        name: "Campana de Cocina",
-        timestamp: "2023-08-04T22:23:40.000Z",
-        categoryName:
-          "Ferretería|Ferretería General|Tornillos, Tuercas y Arandelas",
-        id_category: 287,
-        version: 1,
-        retailersAvailable: [
-          { name: "The Home Depot Golden", id: 58, percentage: 100 },
-          { name: "The Home Depot Onboarding", id: 68, percentage: 78 },
-        ],
-        percentage: "89",
-      },
-    ],
-  },
+    idCategory:287,
+    ArticleId:39550,
+    product:[{
+      id_article:39550,
+      upc:43654697,
+      name:"Campana de Cocina",
+      timestamp:"2023-08-04T22:23:40.000Z",
+      categoryName:"Ferretería|Ferretería General|Tornillos, Tuercas y Arandelas",
+      id_category:287,
+      version:1,
+      retailersAvailable:[
+        {name:"The Home Depot Golden",
+        id:58,
+        percentage:100},
+        {name:"The Home Depot Onboarding",
+        id:68,
+        percentage:78}
+      ],
+      percentage:"89"}] 
+    },
   location: {
     pathname: "/EditProducts",
     search: "",
@@ -68,72 +66,57 @@ ProviderProductEditionDefault.args = {
     key: "24vwut",
   },
   user: {
-    id_user: 191,
-    name: "Demo",
-    last_name: "Demo",
-    email: "merchants24feb@allfreemail.net",
-    position: "Test",
-    telephone: "+52123456789",
-    country: "México",
-    id_company: 923,
-    id_cognito: "c3cd160c-76c2-497c-9357-5ef949307e1e",
-    birth_Date: null,
-    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: null,
-    membership: {
-      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-191/191.png?1697171804447",
-  },
+    id_user:191,
+    name:"Demo",
+    last_name:"Demo",
+    email:"merchants24feb@allfreemail.net",
+    position:"Test",
+    telephone:"+52123456789",
+    country:"México",
+    id_company:923,
+    id_cognito:"c3cd160c-76c2-497c-9357-5ef949307e1e",
+    birth_Date:null,
+    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:null,
+    membership:
+    {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-191/191.png?1697171804447"},
   company: {
-    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: null,
-    is_retailer: 0,
-    financedRetailers: [
-      {
-        id: 68,
-        name: "The Home Depot Onboarding",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        flow: 1,
-      },
-    ],
-    retailers: [
-      {
-        id: 68,
-        name: "The Home Depot Onboarding",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        flow: 1,
-      },
-    ],
-  },
+    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:null,
+    is_retailer:0,
+    financedRetailers:
+    [{id:68,
+      name:"The Home Depot Onboarding",
+      country:"México",
+      id_region:1,
+      active:1,
+      flow:1}],
+      retailers:[{id:68,name:"The Home Depot Onboarding",country:"México",id_region:1,"active":1,flow:1}]},
   showSurvey: (v) => v && alert("se muestra"),
 };