contentoh-components-library 21.0.97 → 21.1.0

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

@@ -16,7 +16,7 @@ RetailerProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJjOTRhNzMwNS05MzY1LTQ2ZmYtYTQyMy00YjRiYzNiOGIxODAiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjp0cnVlLCJjb2duaXRvOnVzZXJuYW1lIjoiYzk0YTczMDUtOTM2NS00NmZmLWE0MjMtNGI0YmMzYjhiMTgwIiwiY29nbml0bzpyb2xlcyI6WyJhcm46YXdzOmlhbTo6ODk4NjcwMjMyODA3OnJvbGVcL2NvbnRlbnRvaC1kZXYtdXMtZWFzdC0xLWxhbWJkYVJvbGUiXSwiYXVkIjoiNWFjOHRwZ3M2Z2JzcTEzZnJ2cnBpZWVwNDAiLCJldmVudF9pZCI6IjcxNWU4ZTc3LTAwMmMtNGMyNC1hNjM2LTYxNDkxYzQ0MzI2MSIsInRva2VuX3VzZSI6ImlkIiwiYXV0aF90aW1lIjoxNjUyMzA3MTUzLCJuYW1lIjoiQ29sYWJvcmFkb3IiLCJwaG9uZV9udW1iZXIiOiIrNTIxMTExIiwiZXhwIjoxNjUyMzEwNzUzLCJpYXQiOjE2NTIzMDcxNTMsImVtYWlsIjoic2FsbWVyb24uNUBob3RtYWlsLmNvbSJ9.Ov1kjVt1sWrNu-8gPhBvnS6SpCuPmOYcqBwJVIoz-YJvuyNx0lMeRflG99cpgj4SojZqgMfPMQ8gJg5263fhj9oynolP7kh08AS_uoTf6_FK2KCaY8gVF4OJnoJJaX7J12JxzmRMI-lQJftvvoPxo5KYHCf7uZSj-5C5z6yIdk59T3U7vziYiKVtJFvVpA6IEB-oIS57MSdg27kwOtYjWvkfZ5vDRfkoOBGmBBELI9uFbKQS0cmWaLSBhd8ptbXWkAprxm-nkJnH9KQKmCsCLBthqmZTsMDw3ok0RsVpEE7_x4X0Hg0756ebqDe1kLCVuTIBpPx4ySvCdlewvi9bYA",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJjOTRhNzMwNS05MzY1LTQ2ZmYtYTQyMy00YjRiYzNiOGIxODAiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjp0cnVlLCJjb2duaXRvOnVzZXJuYW1lIjoiYzk0YTczMDUtOTM2NS00NmZmLWE0MjMtNGI0YmMzYjhiMTgwIiwiY29nbml0bzpyb2xlcyI6WyJhcm46YXdzOmlhbTo6ODk4NjcwMjMyODA3OnJvbGVcL2NvbnRlbnRvaC1kZXYtdXMtZWFzdC0xLWxhbWJkYVJvbGUiXSwiYXVkIjoiNWFjOHRwZ3M2Z2JzcTEzZnJ2cnBpZWVwNDAiLCJldmVudF9pZCI6IjZlYzkzZDk4LTU3Y2YtNDdhMS05MTBhLTk1ZWIxNjdhYjhjNyIsInRva2VuX3VzZSI6ImlkIiwiYXV0aF90aW1lIjoxNjU1NTAyMDg3LCJuYW1lIjoiQ29sYWJvcmFkb3IiLCJwaG9uZV9udW1iZXIiOiIrNTIxMTExIiwiZXhwIjoxNjU1NTA1Njg3LCJpYXQiOjE2NTU1MDIwODcsImVtYWlsIjoic2FsbWVyb24uNUBob3RtYWlsLmNvbSJ9.fxgw--POlE3fFg2QWJaSD6tWZB9je4bR-rX5MJGOSRH9dc2WvDROjS1x_bT41M-wx9q-_U2xcFTAIff76zd-PYFYuYD29pJzTNl3c8xpQYcg4LwCvsBueRN9-_qxDcGzdSwdzxVbbk8guGdu4FA9ll-nruVIJ5QWnt8yNkWKRfn_bDLWHuQ2fPHsvVScwdn4Q60wERB6GFy6xLuQtRD5zWOBMu-_gLIfvbTm-eEJu-pkB5WtBDQki-UY1yi3bIjk9mNVSM4cdEFA7_84zKWL1O2eUUCOVC7Cn2NXQ0OEgphYmSftTU7nVN_xvl8JSUXdqRpSpkCYka849zCL5OJV7Q",
   articleId: 238,
   category: 846,
   version: 2,
@@ -26,18 +26,18 @@ RetailerProductEditionDefault.args = {
       descriptions: 1,
       images: 1,
     },
-    orderId: 4,
-    status: "ASSIGNED",
-    datasheet_status: null,
+    orderId: 1,
+    status: "AF",
+    datasheet_status: "AF",
     prio: "none",
-    version: 3,
-    description_status: null,
-    images_status: null,
+    version: 2,
+    description_status: "AF",
+    images_status: "AF",
     article: {
-      id_article: 33249,
-      id_category: "684",
-      name: "Crema dental ",
-      upc: "232435",
+      id_article: 33250,
+      id_category: "689",
+      name: "crema antiarrugas",
+      upc: "2512651",
       timestamp: "2022-06-14T14:52:51.000Z",
       id_user: 28,
       status: "NULL",
@@ -45,19 +45,19 @@ RetailerProductEditionDefault.args = {
       company_id: 1,
       company_name: "COMPANY DEV",
       country: "México",
-      id_order: 4,
-      id_datasheet_especialist: null,
-      id_datasheet_facilitator: null,
-      id_description_especialist: null,
-      id_description_facilitator: null,
-      id_images_especialist: null,
-      id_images_facilitator: null,
-      id_auditor: 37,
+      id_order: 1,
+      id_datasheet_especialist: 54,
+      id_datasheet_facilitator: 52,
+      id_description_especialist: 54,
+      id_description_facilitator: 52,
+      id_images_especialist: 55,
+      id_images_facilitator: 53,
+      id_auditor: 30,
       id_recepcionist: null,
-      category: "SALUD Y BELLEZA|CUIDADO BUCAL|PASTAS DENTALES Y ASEO BUCAL",
-      missingAttributes: 13,
-      missingDescriptions: 4,
-      missingImages: 3,
+      category: "SALUD Y BELLEZA|CUIDADO CORPORAL|CREMAS FAMILIARES",
+      missingAttributes: null,
+      missingDescriptions: null,
+      missingImages: null,
     },
     retailers: [
       {
@@ -68,50 +68,36 @@ RetailerProductEditionDefault.args = {
         active: 1,
       },
       {
-        id: 9,
-        name: "Amazon",
+        id: 26,
+        name: "Mercado Libre",
         country: "México",
         id_region: 1,
         active: 1,
       },
-      {
-        id: 1013,
-        name: "Cencosud Colombia",
-        country: "Colombia",
-        id_region: 2,
-        active: 1,
-      },
-      {
-        id: 2005,
-        name: "ClubCo",
-        country: "Costa Rica",
-        id_region: 3,
-        active: 1,
-      },
     ],
     country: "México",
-    upc: "232435",
+    upc: "2512651",
   },
   location: {
     product: { articleId: 109485, versionId: 3 },
   },
   user: {
-    id_user: 54,
-    name: "ESPECIALISTA TXTS PRUEBA",
-    last_name: "",
-    email: "rlegorreta@contentoh.com",
-    position: null,
+    id_user: 30,
+    name: "Admin",
+    last_name: "Ulises",
+    email: "salmeron.5@hotmail.com",
+    position: "Admin",
     telephone: null,
-    country: null,
+    country: "México",
     id_company: 2,
-    id_cognito: "ca1d24ab-e992-4c19-b4e1-2fe6f720c16b",
+    id_cognito: "c94a7305-9365-46ff-a423-4b4bc3b8b180",
     birth_Date: null,
     about_me: null,
     zip_code: null,
     address: null,
     job: null,
     id_stripe: null,
-    id_role: 7,
+    id_role: 6,
     active: 1,
     is_retailer: 0,
     membership: {
@@ -125,6 +111,6 @@ RetailerProductEditionDefault.args = {
       products_limit: "3",
       type: "PyMES",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-54/54.png?1655433250522",
+    src: "https://content-management-profile.s3.amazonaws.com/id-30/30.png?1655502088129",
   },
 };

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

@@ -238,8 +238,12 @@ export const RetailerProductEdition = ({
     // getPercentage({ data: [product] }).then((res) =>
     //   setPercentages(res)
     // );
-    setActiveRetailer(
-      product.retailers ? product.retailers[0] : product.retailersAvailable[0]
+    setActiveRetailer((current) =>
+      current.id
+        ? current
+        : product.retailers
+        ? product.retailers[0]
+        : product.retailersAvailable[0]
     );
     getComments();
     setUserGroups(await fetchUsers(token));
@@ -567,6 +571,10 @@ export const RetailerProductEdition = ({
       product[`${getConcept(tab)}_status`] === "QF" ||
       product[`${getConcept(tab)}_status`] === "IN_PROGRESS";
 
+    const auditorUnvalidated = !["RA", "AA"].includes(
+      product[`${getConcept(tab)}_status`]
+    );
+
     switch (userId) {
       case 7:
       case 8:
@@ -588,7 +596,8 @@ export const RetailerProductEdition = ({
       case 6:
         return (
           statusArray.includes(product.status) &&
-          servicesData.every((serv) => ["RA", "AA"].includes(serv.status))
+          servicesData.every((serv) => ["RA", "AA"].includes(serv.status)) &&
+          auditorUnvalidated
         );
       default:
         break;
@@ -666,7 +675,7 @@ export const RetailerProductEdition = ({
             Authorization: token,
           },
         });
-        getServices();
+        //getServices();
       } else {
         const specialistDone =
           evalStatus === "RF" ||
@@ -729,8 +738,8 @@ export const RetailerProductEdition = ({
             Authorization: token,
           },
         });
-        getServices();
       }
+      loadData();
       sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
       setProduct(productTemp);
     } catch (error) {

package/src/global-files/data.js

@@ -194,5 +194,7 @@ export const getNewStatus = (statusArray) => {
   if (lookupString.includes("AA")) return "AA";
   if (lookupString.includes("AP")) return "AP";
   if (lookupString.includes("AC")) return "AC";
+  if (lookupString.includes("RECEIVED")) return "RECEIVED";
+  if (lookupString.includes("NA")) return "NA";
   return new Error("Status not found");
 };