contentoh-components-library 21.3.4 → 21.3.6

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

@@ -42,7 +42,7 @@ 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 { CreateVersion } from "../../organisms/CreateVersion";
+import { number } from "prop-types";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs, inputsByRetailer } = state;
@@ -114,8 +114,8 @@ const S3_BUCKET = process.env.REACT_APP_IMAGES_BUCKET;
 const REGION = "us-east-1";
 
 AWS.config.update({
-  accessKeyId: process.env.REACT_APP_KEY_UPLOAD_TO_S3,
-  secretAccessKey: process.env.REACT_APP_ACCESS_KEY_UPLOAD_TO_S3,
+  accessKeyId: process.env.REACT_APP_KUTS3,
+  secretAccessKey: process.env.REACT_APP_AKUTS3,
 });
 
 const myBucket = new AWS.S3({
@@ -252,7 +252,6 @@ export const ProviderProductEdition = ({
   const [retailerStatus, setRetailerStatus] = useState(
     product.statusByRetailer
   );
-  const [showCreateVersion, setShowCreateVersion] = useState(false);
   const [showVersionSelector, setShowVersionSelector] =
     useCloseModal("version-selector");
 
@@ -272,19 +271,10 @@ export const ProviderProductEdition = ({
     setServices(services);
     await getServices();
 
-    // if (!originProp) {
-    //   setActiveRetailer(
-    //     product?.retailers
-    //       ? product?.retailers[0]
-    //       : product?.retailersAvailable[0]
-    //   );
-    // }
-
-    // setActiveRetailer(product?.retailers[0]);
     setImages({ action: "init", init: services[2] });
     if (services[2]?.values?.length > 0) setActiveImage(0);
 
-    getPercentage({ data: [product] }).then((res) => setPercentages(res));
+    getPercentage({ data: [product] }).then((res) => setPercentages(res[0]));
     setLoading(false);
   };
 
@@ -374,11 +364,13 @@ export const ProviderProductEdition = ({
   useEffect(() => {
     const productTemp = product;
     const retailers = productTemp?.retailersAvailable || productTemp?.retailers;
-    retailers?.forEach((retailer) => {
-      retailer["percentage"] = percentages?.find(
-        (percent) => retailer?.id === percent?.id_retailer
-      )?.percentage;
-    });
+    if (Object.keys(percentages?.retailers ?? {})?.length > 0) {
+      retailers?.forEach((retailer) => {
+        retailer["percentage"] = Number(
+          percentages?.retailers[retailer.id].percentageRequired
+        );
+      });
+    }
 
     setProduct(productTemp);
     setActivePercentage(retailers[0]?.percentage);
@@ -481,7 +473,7 @@ export const ProviderProductEdition = ({
     };
     if (product?.orderId) dataObject["orderId"] = product?.orderId;
     try {
-      await axios.put(
+      const res = await axios.put(
         `${process.env.REACT_APP_ARTICLE_DATA_ENDPOINT}?datasheet=true&version=${version}`,
         dataObject,
         {
@@ -1497,18 +1489,10 @@ export const ProviderProductEdition = ({
           setVersion={setVersion}
           companyName={company.company_name}
           currentVersion={version}
-          setShowCreateVersion={setShowCreateVersion}
           setShowVersionSelector={setShowVersionSelector}
           jwt={token}
         />
       )}
-      {showCreateVersion && (
-        <CreateVersion
-          idArticle={product.id_article}
-          version={version}
-          setShowCreateVersion={setShowCreateVersion}
-        />
-      )}
     </Container>
   );
 };

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

@@ -12,108 +12,97 @@ export const RetailerProductEditionDefault = Template.bind({});
 RetailerProductEditionDefault.args = {
   tabsSections: {
     Descripción: true,
-    "Ficha técnica": false,
-    Imágenes: false,
+    "Ficha técnica": true,
+    Imágenes: true,
   },
   token:
-    "eyJraWQiOiJEV3owZnNieXg2MXNFcVduN3RCXC81bVhod3ZNbFZIOTgwUnZcL3RjT0lKdEk9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI4ZDAxMDIxNC01YmZhLTQzYzMtOTZmYi1jNTU2ZGMwNTc3NGIiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfbFN6UVo0WjdSIiwiY29nbml0bzp1c2VybmFtZSI6IjhkMDEwMjE0LTViZmEtNDNjMy05NmZiLWM1NTZkYzA1Nzc0YiIsImF1ZCI6IjUyZDlza2tkY2c4cWpwODhvb2sxdXNlNm1rIiwiZXZlbnRfaWQiOiI2ZWY3Y2UxYy0xYjBjLTRkNGYtYTc3Yy1jMWIwYTk0ZjIwOWEiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY2NzMyMTQ5NCwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY2NzMyNTA5NCwiaWF0IjoxNjY3MzIxNDk0LCJlbWFpbCI6ImthcmFmZTMyMThAbW9tMmtpZC5jb20ifQ.GjBtY-LW5eYzvNfrIJOdb9pDMU_CZlIxRAn1ZszjMfWNU9s8s_j6o4_2x0J7AyiSjgu9TaLRcRpF6FZ5pzwNGs8G5AxnO3r_PIg2mznM44QLnt5PTfdoFx2jJmU53UA8GZU1SFDvDlR1QZR-EtANz2wfNs8RqY_mKTz5WjY7RdGTFVkowTv-Y1Q9T7x_fpv_5o-nB5GzLBQoHwTLQ_vjguSLH17l2BUn0QxLi2WJVs-qWX4ze4QysADVxYOlMkAQql328oqoqdXRbZrntnxYxa5EMpmref1bGbSOFk4qgHax4qa3gD2_h291NLjCZS7IMGDSIhOk9r7irItbojM01Q",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI1ODg0YWUzNC01OWQ2LTQ0NTQtYjk4ZS04MjE1MThiY2MzYTciLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjU4ODRhZTM0LTU5ZDYtNDQ1NC1iOThlLTgyMTUxOGJjYzNhNyIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiJmMzY2YTdjYi02YjA0LTRiMzAtOTJmYy1iMzY0MmY3ZjEzNmEiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY3MTc0MzE0OSwibmFtZSI6IkNhZGVuYSBJc21hZWwiLCJwaG9uZV9udW1iZXIiOiIrNTIzMTExMzY2MzM2IiwiZXhwIjoxNjcxNzQ2NzQ5LCJpYXQiOjE2NzE3NDMxNDksImVtYWlsIjoiY2FkZW5hLmlzbWFlbEBhbGxmcmVlbWFpbC5uZXQifQ.J8kTv1sEotxoicaRclaK1r0tjVbwHPDxIzdDfxYo9J4XwBYYfS180__KYYE0Dh1AfUK_K0mrk2_78_rhTNxCQT85W7XS3ZEcxIOUekqoxaKFl8LSVN_eWz3SlsGG0yRflhJGt6d4gBVByXZbdNiyp1rkjgMln6fhwlRUnuGRbG1WKQvdAPli3qfH8mLzgoTz-6HWs1Jf2Ujheavf3ipGMNtj-OSUdQsh04Ov7jehDWdnPNn2s2DAl4eubgjdXrwIiBPCRkbuFeYZZJpzj1wy__a0nCM7bzly5uTZ2aWujgEJvf9bJb-Y4gkS8TxyJaggJ01ZsMki36aEpIt8J1tJag",
   productSelected: {
-    services: {
-      datasheets: 1,
-      descriptions: 1,
-      images: 1,
-    },
-    orderId: 3321,
-    status: "PA",
-    datasheet_status: "AC",
-    prio: "none",
-    version: 2,
-    description_status: "AC",
-    images_status: "PA",
-    statusByRetailer: {
-      58: {
-        datasheet: "AC",
-        description: "AC",
-        images: "PA",
-      },
-    },
+    articleStatus: "AA",
+    version: 3,
+    missing: {},
     article: {
-      id_article: 85655,
-      id_category: "2052",
-      name: "EXTENSION P/ EXTERIOR 3X10 AWG 10M ROJO",
-      upc: "165679",
-      timestamp: "2022-11-01T15:46:51.000Z",
-      id_user: 1436,
-      status: null,
-      active: 1,
-      company_id: 409,
-      SKU: null,
-      Descripcion: null,
-      Proveedor: null,
-      id_proveedor: 0,
-      company_name: "HIGHLINE-WARREN LLC",
-      country: null,
-      id_order: 3321,
-      id_datasheet_especialist: 1248,
-      id_datasheet_facilitator: null,
-      id_description_especialist: 1248,
-      id_description_facilitator: null,
-      id_images_especialist: null,
-      id_images_facilitator: null,
-      id_auditor: null,
-      id_recepcionist: null,
       category:
-        "Eléctrico|Extensiones y Multicontactos|Extensiones y Multicontactos",
-      missingAttributes: null,
-      missingDescriptions: null,
-      missingImages: null,
+        "Ventilación y Calefacción|Ventiladores de Techo|Ventiladores de Techo",
+      company_name: "GRUPO BRAHMA",
+      company_id: 1,
+      id_category: "2416",
+      id_article: 221,
+      name: 'DEMO VENTILADOR DE TECHO TRIBECA 52"',
+      upc: "147259",
     },
+    asignations: [],
     retailers: [
       {
-        id: 58,
-        name: "The Home Depot Golden",
+        id: 59,
+        name: "The Home Depot Platinum",
+        country: "México",
+        id_region: 1,
+        active: 1,
+      },
+    ],
+    retailersAvailable: [
+      {
+        id: 59,
+        name: "The Home Depot Platinum",
         country: "México",
         id_region: 1,
         active: 1,
       },
     ],
-    country: null,
-    upc: "165679",
+    upc: "147259",
+    name: 'DEMO VENTILADOR DE TECHO TRIBECA 52"',
+    categoryName:
+      "Ventilación y Calefacción|Ventiladores de Techo|Ventiladores de Techo",
+    id_category: "2416",
+    id_article: 221,
+    services: [
+      {
+        id_article: 221,
+        service: "datasheet",
+        quantity: 1,
+        price: 0,
+        id_user: 59,
+        datasheet_common: null,
+        discount: null,
+      },
+    ],
   },
   location: {
-    product: { articleId: 109485, versionId: 3 },
+    product: { articleId: 221, versionId: 3 },
   },
   user: {
-    id_user: 426,
-    name: "Especialista Textos",
-    last_name: " ",
-    email: "karafe3218@mom2kid.com",
-    position: "Tester",
-    telephone: null,
-    country: null,
-    id_company: 254,
-    id_cognito: "8d010214-5bfa-43c3-96fb-c556dc05774b",
+    id_user: 59,
+    name: "The Home",
+    last_name: "Depot",
+    email: "cadena.ismael@allfreemail.net",
+    position: "Admin",
+    telephone: "+523111366336",
+    country: "México",
+    id_company: 817,
+    id_cognito: "5884ae34-59d6-4454-b98e-821518bcc3a7",
     birth_Date: null,
-    about_me: null,
-    zip_code: null,
-    address: null,
-    job: null,
-    id_stripe: null,
-    id_role: 7,
+    about_me: "",
+    zip_code: "",
+    address: "",
+    job: "",
+    id_stripe: "",
+    id_role: 0,
     active: 1,
-    is_retailer: 0,
-    email_notify: null,
+    is_retailer: 1,
+    email_notify: 0,
+    is_user_tech: null,
     membership: {
-      id: 750,
-      start_date: "2022-01-07T21:32:54.000Z",
-      end_date: "2023-01-07T21:32:54.000Z",
-      planID: 6,
-      plan: "prod_KvGd6YSTJyR3AP",
-      name: "Plan Small",
-      user_limit: "10",
-      products_limit: "1000",
-      type: "Enterprise",
+      id: 47,
+      start_date: "2022-05-25T14:31:12.000Z",
+      end_date: "2023-05-25T14:31:12.000Z",
+      planID: 5,
+      plan: "prod_Ktl6B5Ou2gqTB2",
+      name: "Plan Pro",
+      user_limit: "5",
+      products_limit: "500",
+      type: "PyMES",
     },
-    src: "https://content-management-profile-prod.s3.amazonaws.com/id-426/426.png?1667321494598",
+    src: "https://content-management-profile.s3.amazonaws.com/id-59/59.png?1671735033010",
   },
 };

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

@@ -32,7 +32,6 @@ import succes from "../../../assets/images/genericModal/genericModalCheck.svg";
 import errorModal from "../../../assets/images/genericModal/errorModal.svg";
 import { VersionSelector } from "../../organisms/VersionSelector";
 import { useCloseModal } from "../../../global-files/customHooks";
-import { CreateVersion } from "../../organisms/CreateVersion";
 
 const reducerImages = (state, action) => {
   let { values, attrForImgs, inputsByRetailer } = state;
@@ -108,8 +107,8 @@ const S3_BUCKET = process.env.REACT_APP_IMAGES_BUCKET;
 const REGION = "us-east-1";
 
 AWS.config.update({
-  accessKeyId: process.env.REACT_APP_KEY_UPLOAD_TO_S3,
-  secretAccessKey: process.env.REACT_APP_ACCESS_KEY_UPLOAD_TO_S3,
+  accessKeyId: process.env.REACT_APP_KUTS3,
+  secretAccessKey: process.env.REACT_APP_AKUTS3,
 });
 
 const myBucket = new AWS.S3({
@@ -176,6 +175,7 @@ export const RetailerProductEdition = ({
   const [percentages, setPercentages] = useState(
     new Array(product?.retailers?.length).fill({ percentage: 0 })
   );
+  // const [percentages, setPercentages] = useState([{ retailers: {} }]);
   const [activePercentage, setActivePercentage] = useState(0);
   const [activeRetailer, setActiveRetailer] = useState({});
   const [services, setServices] = useState([]);
@@ -206,10 +206,7 @@ export const RetailerProductEdition = ({
   const [retailerStatus, setRetailerStatus] = useState("-");
   const [statusArray, setStatusArray] = useState([]);
   const [socketType, setSocketType] = useState(null);
-  const [servicesStatus, setServicesStatus] = useState([]);
   const [saving, setSaving] = useState(loading);
-  const isAuditor = user.id_role === 6;
-  const [showCreateVersion, setShowCreateVersion] = useState(false);
   const [showVersionSelector, setShowVersionSelector] =
     useCloseModal("version-selector");
   const shotThd = [58, 59, 60, 61].includes(activeRetailer.id);
@@ -229,12 +226,9 @@ export const RetailerProductEdition = ({
       //Converts the data inside the datasheets object to array
       setServices(services);
       getServices();
-
-      // setActiveRetailer(product?.retailers[0]);
       setImages({ action: "init", init: services[2] });
       if (services[2]?.values?.length > 0) setActiveImage(0);
-
-      getPercentage({ data: [product] }).then((res) => setPercentages(res));
+      getPercentage({ data: [product] }).then((res) => setPercentages(res[0]));
       setLoading(false);
     } catch (error) {
       console.log(error);
@@ -375,12 +369,16 @@ export const RetailerProductEdition = ({
   }, [userGroups]);
 
   useEffect(() => {
-    product?.retailers?.forEach((retailer) => {
-      retailer["percentage"] = percentages?.filter(
-        (percent) => retailer?.id === percent?.id_retailer
-      )[0]?.percentage;
-    });
-    setActivePercentage(product?.retailers[0]?.percentage);
+    const retailers = product?.retailersAvailable || product?.retailers;
+    if (Object.keys(percentages?.retailers ?? {})?.length > 0) {
+      retailers?.forEach((retailer) => {
+        retailer["percentage"] = Number(
+          percentages?.retailers[retailer.id].percentageRequired
+        );
+      });
+    }
+
+    setActivePercentage(retailers[0]?.percentage);
   }, [percentages]);
 
   useEffect(() => {
@@ -1549,18 +1547,10 @@ export const RetailerProductEdition = ({
           setVersion={setVersion}
           companyName={product.article.company_name}
           currentVersion={version}
-          setShowCreateVersion={setShowCreateVersion}
           setShowVersionSelector={setShowVersionSelector}
           jwt={token}
         />
       )}
-      {showCreateVersion && (
-        <CreateVersion
-          idArticle={product.article.id_article}
-          version={version}
-          setShowCreateVersion={setShowCreateVersion}
-        />
-      )}
     </Container>
   );
 };

package/src/global-files/customHooks.js

@@ -1,5 +1,4 @@
-import { useState } from "react";
-import { useEffect } from "react";
+import { useState, useEffect } from "react";
 
 export const useCloseModal = (id) => {
   const [showModal, setShowModal] = useState(false);
@@ -11,6 +10,7 @@ export const useCloseModal = (id) => {
       setShowModal(false);
     }
   };
+
   useEffect(() => {
     if (showModal) {
       document.addEventListener("click", closeModal, false);