contentoh-components-library 21.2.89 → 21.2.90

package/package.json

@@ -1,19 +1,11 @@
 {
   "name": "contentoh-components-library",
-  "version": "21.2.89",
+  "version": "21.2.90",
   "dependencies": {
     "@aws-amplify/auth": "^4.5.3",
     "@aws-amplify/datastore": "^3.11.0",
     "@aws-amplify/ui-react": "^2.17.0",
     "@babel/runtime": "^7.17.2",
-    "@emotion/react": "^11.10.4",
-    "@emotion/styled": "^11.10.4",
-    "@fortawesome/fontawesome-svg-core": "^6.2.0",
-    "@fortawesome/free-regular-svg-icons": "^6.2.0",
-    "@fortawesome/free-solid-svg-icons": "^6.2.0",
-    "@fortawesome/react-fontawesome": "^0.2.0",
-    "@mui/material": "^5.10.8",
-    "@mui/styled-engine-sc": "^5.10.6",
     "@storybook/addon-postcss": "^2.0.0",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
@@ -27,7 +19,6 @@
     "draft-js": "^0.11.7",
     "file-saver": "^2.0.5",
     "js-base64": "^3.7.2",
-    "moment": "^2.29.4",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
     "react-chartjs-2": "^4.0.1",
@@ -38,10 +29,7 @@
     "react-image-fallback": "^8.0.0",
     "react-quill": "^1.3.5",
     "react-router-dom": "^5.3.3",
-    "react-scroll": "^1.8.8",
-    "react-transition-group": "^4.4.5",
     "styled-components": "^5.3.3",
-    "swiper": "^8.4.4",
     "uuid": "^8.3.2",
     "web-vitals": "^1.0.1"
   },

package/src/components/atoms/ProgressBar/styles.js

@@ -16,12 +16,13 @@ export const Container = styled.div`
       ? GlobalColors.s4
       : GlobalColors.white};
 
-  &.status-CA {
+  &.status-CA,
+  &.status-AS,
+  &.status-PA {
     background-color: ${GlobalColors.in_progress};
   }
 
-  &.status-R,
-  &.status-AS {
+  &.status-R {
     background-color: ${GlobalColors.reception};
   }
 

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

@@ -2,7 +2,6 @@ import { Container } from "./styles";
 import { ScreenHeader } from "../../atoms/ScreenHeader/index";
 import { Button } from "../../atoms/GeneralButton/index";
 import { useEffect, useRef } from "react";
-import { Chat } from "../../organisms/Chat";
 
 export const HeaderTop = ({ setHeaderTop }) => {
   const headerTop = useRef();
@@ -14,16 +13,12 @@ export const HeaderTop = ({ setHeaderTop }) => {
   return (
     <Container ref={headerTop}>
       <ScreenHeader text="Edición de producto" />
-      <div className="buttons-top">
-        {/* <Chat /> */}
-
-        <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/pages/Dashboard/Dashboard.stories.js

@@ -9,29 +9,30 @@ const Template = (args) => <Dashboard {...args} />;
 export const DashboardDeafult = Template.bind({});
 DashboardDeafult.args = {
   user: {
-    id_user: 425,
-    name: "Auditor QA",
-    last_name: " ",
-    email: "ladiboh785@mi166.com",
-    position: "Tester",
-    telephone: null,
-    country: null,
-    id_company: 254,
-    id_cognito: "23a3f496-4e38-4e12-9bf5-7f90b77a2f35",
+    id_user: 1236,
+    name: "THD",
+    last_name: "Proveedor",
+    email: "thd@allfreemail.net",
+    position: "Prod test",
+    telephone: "+523111111111",
+    country: "México",
+    id_company: 816,
+    id_cognito: "d660ccca-f906-4970-892c-6d152e832e5d",
     birth_Date: null,
     about_me: null,
     zip_code: null,
     address: null,
     job: null,
     id_stripe: null,
-    id_role: 6,
+    id_role: 0,
     active: 1,
     is_retailer: 0,
-    email_notify: null,
+    email_notify: 1,
+    is_superadmin: 0,
     membership: {
-      id: 750,
-      start_date: "2022-01-07T21:32:54.000Z",
-      end_date: "2023-01-07T21:32:54.000Z",
+      id: 797,
+      start_date: "2022-06-19T04:18:39.000Z",
+      end_date: "2023-06-19T04:18:39.000Z",
       planID: 6,
       plan: "prod_KvGd6YSTJyR3AP",
       name: "Plan Small",
@@ -39,7 +40,37 @@ DashboardDeafult.args = {
       products_limit: "1000",
       type: "Enterprise",
     },
-    src: "https://content-management-profile-prod.s3.amazonaws.com/id-425/425.png?1666639556174",
+    src: "https://content-management-profile-prod.s3.amazonaws.com/id-1236/1236.png?1668676098688",
+  },
+  company: {
+    id_company: 816,
+    trade_name: "Prod Test",
+    company_name: "Prod Test",
+    rfc: "ASER12345",
+    adress: "Av. Insurgentes",
+    about_company: null,
+    telephone: null,
+    web_site: null,
+    zip_code: null,
+    email: null,
+    social_link: null,
+    is_retailer: 0,
+    financedRetailers: [
+      {
+        id: 58,
+        name: "The Home Depot Golden",
+        country: "México",
+        id_region: 1,
+        active: 1,
+      },
+      {
+        id: 59,
+        name: "The Home Depot Platinum",
+        country: "México",
+        id_region: 1,
+        active: 1,
+      },
+    ],
   },
-  jwt: "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI5YTIxMzEyOC02NDgyLTRjMTYtYTRiNi02ZTY0ZjIyNWIxYmQiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6IjlhMjEzMTI4LTY0ODItNGMxNi1hNGI2LTZlNjRmMjI1YjFiZCIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiJkYWVmODU5ZC00ODQyLTRkNDQtYTNiNC02ODZlNmJhNTVkMjgiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY2NzA3MjM5MCwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY2NzA3NTk5MCwiaWF0IjoxNjY3MDcyMzkwLCJlbWFpbCI6ImlzbWFlbDk3bG9wZXpAZ21haWwuY29tIn0.FbGtX1sC3b2c76hGcxkx-GSurEMKZSwNVEnuUOlV9Dhhqrre1VmtfjvodH_3Leipr4g38Sukb6Pr9lVgEy6DJ57MShpS63niXE7Y43FUJ4gVe4F6k8sYbXUaZYS2vw2_PibnycNsFrpD76fZ_ulTqlSuHNrnzf2mjcDFJ5Qlj8hcLlRnpu_DFVpIiXVyK9kvLE5jImHvo4oQZUSrnuIs-oUE7j8mX8-GH2e95Up2wnBMak6S6meMibKoUEFo2qdtDSFbS1JCMBq4vWw2DxToX-7AGXGp_CLxf-sjJ_UpLmFa0KyyxjhAE2cR9BGo8DM8LEUIqMvcz2KH-7e9QTgisA",
+  jwt: "eyJraWQiOiJEV3owZnNieXg2MXNFcVduN3RCXC81bVhod3ZNbFZIOTgwUnZcL3RjT0lKdEk9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJkNjYwY2NjYS1mOTA2LTQ5NzAtODkyYy02ZDE1MmU4MzJlNWQiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfbFN6UVo0WjdSIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6ImQ2NjBjY2NhLWY5MDYtNDk3MC04OTJjLTZkMTUyZTgzMmU1ZCIsImF1ZCI6IjUyZDlza2tkY2c4cWpwODhvb2sxdXNlNm1rIiwiZXZlbnRfaWQiOiI2NzYzN2VlZi1iMjE3LTRiYWEtODM4MC05NDMzODZjYTU5OTIiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY2ODY3NjA5OCwibmFtZSI6IlRIRCBQcm92ZWVkb3IiLCJwaG9uZV9udW1iZXIiOiIrNTIzMTExMTExMTExIiwiZXhwIjoxNjY4Njc5Njk3LCJpYXQiOjE2Njg2NzYwOTgsImVtYWlsIjoidGhkQGFsbGZyZWVtYWlsLm5ldCJ9.ghtkS2S6ipJgGDEkGVoEd2iaxD5iKkGL_HBQ6ay-Kp-nh0VWjYW9cUBQhv83Je6gBsYdywkRfAmW9bEeqW7IuOAV9-CcQtcg7NtARtPjm3XLwt-vZePHefNASS1GdkFjjb3wioSdHoxa5UR6Di-mCTvQPad7tUdDy5XZf--8HyuB2Ir-yGnBqQ5mcyUloIwKWA0U0kboKUb97j8wCxGGP4oArrNH9yuwlwCC5dW2eyF1MKBDb4zPAnKmKM3IR-iFuyl9kAuo88YAas8o8pJ3_oc49NJ6ti2yY2hUyDFiMYlhjo-nDGMK1hQqFqjTPvrCV71H7P2vVuFHkkln9G-MbQ",
 };

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

@@ -59,7 +59,7 @@ export const Dashboard = ({ jwt, user, company }) => {
   };
 
   const getRetailers = async () => {
-    const isTHDUser = [657, 818, 819].includes(user.id_company);
+    const isTHDUser = user.is_retailer && company.retailers;
     const retailersResponse = await axios.get(
       `${process.env.REACT_APP_RETAILER_ENDPOINT}`,
       {
@@ -78,13 +78,21 @@ export const Dashboard = ({ jwt, user, company }) => {
   };
 
   const loadProductsByStatus = async (orderByStatus, filter) => {
+    const isTHDUser = 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)) || {};
 
-    const { total = 0, R = 0, PA = 0, Ex = 0 } = ordersByStatus;
+    const { total = 0, R = 0, PA = 0, Ex = 0, ACA = 0 } = ordersByStatus;
+    let productsFinished = 0;
+    if (isTHDUser) productsFinished = Ex;
+    if (isProvider) productsFinished = ACA;
+    if (isCollaborator) productsFinished = Ex + ACA;
+
     const inProcess = Object.keys(ordersByStatus).reduce(
       (prev, curr) =>
-        !["total", "PA", "R", "Ex"].includes(curr)
+        !["total", "PA", "R", "Ex", "ACA"].includes(curr)
           ? prev + ordersByStatus[curr]
           : prev,
       0
@@ -94,11 +102,12 @@ export const Dashboard = ({ jwt, user, company }) => {
         ? metricsData[0]
         : { label: "Productos totales", value: total },
     ];
+
     metricsArray.push(
       { label: "Productos filtrados", value: total },
       { label: "Productos sin asignar", value: PA + R },
       { label: "Productos en proceso", value: inProcess },
-      { label: "Productos terminados", value: Ex }
+      { label: "Productos terminados", value: productsFinished }
     );
     setMetricsData(metricsArray);
     setTotalCount(total);

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

@@ -45,7 +45,7 @@ import { useCloseModal } from "../../../global-files/customHooks";
 import { CreateVersion } from "../../organisms/CreateVersion";
 
 const reducerImages = (state, action) => {
-  let { values = [], attrForImgs, inputsByRetailer } = state;
+  let { values, attrForImgs, inputsByRetailer } = state;
   switch (action.action) {
     case "init":
       const newInputsByRetailer = {};
@@ -100,7 +100,7 @@ const reducerImages = (state, action) => {
           imageIdArray.includes(input.id)
         );
 
-        if (orderedImages.length > 0) values = orderedImages;
+        values = orderedImages.length > 0 ? orderedImages : [];
       } catch (error) {
         console.log(error);
       }
@@ -877,10 +877,11 @@ export const ProviderProductEdition = ({
         const newProductEdit = productEdit;
         newProductEdit.product[sectionStatusKey] = serviceStatus;
         setProductEdit(newProductEdit);
-        const showSurveyByProvider = !user.is_retailer && orderStatus[orderId] === "AP";
-        const showSurveyByRetailer = user.is_retailer && orderStatus[orderId] === "ACA";
-        showSurvey && 
-          showSurvey(showSurveyByProvider || showSurveyByRetailer);
+        const showSurveyByProvider =
+          !user.is_retailer && orderStatus[orderId] === "AP";
+        const showSurveyByRetailer =
+          user.is_retailer && orderStatus[orderId] === "ACA";
+        showSurvey && showSurvey(showSurveyByProvider || showSurveyByRetailer);
       } else {
         res = await axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
           headers: {

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

@@ -35,7 +35,7 @@ import { useCloseModal } from "../../../global-files/customHooks";
 import { CreateVersion } from "../../organisms/CreateVersion";
 
 const reducerImages = (state, action) => {
-  let { values = [], attrForImgs, inputsByRetailer } = state;
+  let { values, attrForImgs, inputsByRetailer } = state;
   switch (action.action) {
     case "init":
       const newInputsByRetailer = {};
@@ -80,8 +80,9 @@ const reducerImages = (state, action) => {
       try {
         const orderedImages = [];
         const imageIdArray = [];
-        if (action?.retailerId && !inputsByRetailer[action.retailerId])
+        if (action?.retailerId && !inputsByRetailer[action.retailerId]) {
           inputsByRetailer[action.retailerId] = [];
+        }
         action.retailerId &&
           inputsByRetailer[action.retailerId]?.filter((input) => {
             imageIdArray.push(input.id_image);
@@ -89,12 +90,10 @@ const reducerImages = (state, action) => {
               if (value.image_id === input.id_image) orderedImages.push(value);
             });
           });
-
         inputs = inputsInitial?.filter((input) =>
           imageIdArray.includes(input.id)
         );
-
-        if (orderedImages.length > 0) values = orderedImages;
+        values = orderedImages.length > 0 ? orderedImages : [];
       } catch (error) {
         console.log(error);
       }

package/src/global-files/fonts.css

@@ -43,21 +43,3 @@
   src: url("../assets/fonts/raleway/Raleway-Black.ttf");
   font-weight: 900;
 }
-
-@font-face {
-  font-family: "RobotoMedium";
-  src: url("../assets/fonts/Roboto/Roboto-Medium.ttf");
-  font-weight: 500;
-}
-
-@font-face {
-  font-family: "RobotoRegular";
-  src: url("../assets/fonts/Roboto/Roboto-Regular.ttf");
-  font-weight: 400;
-}
-
-.prueba {
-  color: #9e3e26;
-  color: #b42983;
-  color: #e7e7e7;
-}

package/src/global-files/variables.js

@@ -26,8 +26,6 @@ export const FontFamily = {
   Raleway_700: "Raleway-700",
   Raleway_800: "Raleway-800",
   Raleway_900: "Raleway-900",
-  RobotoMedium: "RobotoMedium",
-  RobotoRegular: "RobotoRegular",
 };
 
 export const GlobalStatus = [

package/src/index.js

@@ -23,16 +23,6 @@ export * from "./components/atoms/Status/index";
 export * from "./components/atoms/TabSection/index";
 export * from "./components/atoms/ValidationPanel/index";
 export * from "./components/atoms/VerticalSideMenuMainPage/index";
-export * from "./components/atoms/ButtonFileChooser/index";
-export * from "./components/atoms/ButtonV2/index";
-export * from "./components/atoms/CustomIcon/index";
-export * from "./components/atoms/IconFile/index";
-export * from "./components/atoms/Image/index";
-export * from "./components/atoms/ImageLink/index";
-export * from "./components/atoms/ImagePreview/index";
-export * from "./components/atoms/InputText/index";
-export * from "./components/atoms/NotFound/index";
-export * from "./components/atoms/Tooltip/index";
 
 //molecules
 export * from "./components/molecules/AvatarAndValidation/index";
@@ -59,8 +49,6 @@ export * from "./components/molecules/TagAndInput/index";
 export * from "./components/molecules/VerificationCodeResetPasswordLogin/index";
 export * from "./components/molecules/RetailerSelector/index";
 export * from "./components/molecules/CustomSelect/index";
-export * from "./components/molecules/ButtonDownloadFile/index";
-export * from "./components/molecules/ImageTooltip/index";
 
 //organisms
 export * from "./components/organisms/ChangePassword/index";
@@ -72,8 +60,6 @@ export * from "./components/organisms/ImagePreviewer/index";
 export * from "./components/organisms/ImagesGroup/index";
 export * from "./components/organisms/InputGroup/index";
 export * from "./components/organisms/ProductImageModal/index";
-export * from "./components/organisms/Chat/index";
-export * from "./components/organisms/Modal/index";
 
 //pages
 export * from "./components/pages/ChangePasswordLogin";