contentoh-components-library 21.0.7 → 21.0.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentoh-components-library",
-  "version": "21.0.7",
+  "version": "21.0.8",
   "dependencies": {
     "@babel/runtime": "^7.17.2",
     "@storybook/addon-postcss": "^2.0.0",

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

@@ -26,7 +26,7 @@ export const FullTabsMenu = ({
         setActiveTab={setActiveTab}
       />
       <StatusAsignationInfo
-        status={status[activeTab]}
+        status={status()}
         activeTab={activeTab}
         setImageLayout={setImageLayout}
         imagesSection={imagesSection}

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

@@ -44,7 +44,7 @@ RetailerProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJjOTRhNzMwNS05MzY1LTQ2ZmYtYTQyMy00YjRiYzNiOGIxODAiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjp0cnVlLCJjb2duaXRvOnVzZXJuYW1lIjoiYzk0YTczMDUtOTM2NS00NmZmLWE0MjMtNGI0YmMzYjhiMTgwIiwiY29nbml0bzpyb2xlcyI6WyJhcm46YXdzOmlhbTo6ODk4NjcwMjMyODA3OnJvbGVcL2NvbnRlbnRvaC1kZXYtdXMtZWFzdC0xLWxhbWJkYVJvbGUiXSwiYXVkIjoiNWFjOHRwZ3M2Z2JzcTEzZnJ2cnBpZWVwNDAiLCJldmVudF9pZCI6IjU2M2I0NTFlLTVhZDQtNGMzNy1iNjIzLTc3NjMwM2Y3YjJiNSIsInRva2VuX3VzZSI6ImlkIiwiYXV0aF90aW1lIjoxNjQ4NzYwODcwLCJuYW1lIjoiQ29sYWJvcmFkb3IiLCJwaG9uZV9udW1iZXIiOiIrNTIxMTExIiwiZXhwIjoxNjQ4NzY0NDcwLCJpYXQiOjE2NDg3NjA4NzAsImVtYWlsIjoic2FsbWVyb24uNUBob3RtYWlsLmNvbSJ9.Y2gmN-9KDeYyvvSJOzKJUP-WL8O4AmZhdLnfHxSB_9lAXQFns6uJUbX1nzE75cuqeQ3NeiNZy4hu8y5Y7hckPuQFy01nY3OoY3SfD06W0SciNz0txNSR7oN6KH_c_9FOwQiQ0mnOs9udo9nDM4faFFUuu9UD6RMVfeLW1gfZmtyc3lfmy6YO6feJcS3opSSQpXH4Mgh415fXFjbyz344ssd5nl7Onyh8jq5i-LAex3OPXhKzjrBnDRpGg3BQPIfpsquGZNKBiWqyos--CuohFBeyevMLGoKOcU-Ga-zIdEfonTtDVRe6CQLgOZJ2xTPdswlzRPby1gFoZjNebeeRVw",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJiMmNlNWIyYS02MDljLTRlNzktOWVhOS0yZjc0Y2ZmNDM4ODkiLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwiY29nbml0bzp1c2VybmFtZSI6ImIyY2U1YjJhLTYwOWMtNGU3OS05ZWE5LTJmNzRjZmY0Mzg4OSIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiJkMGQ0NDUxYS01ODg1LTQ0ZTctYjZhNi0xODdkY2NjNDI4MTgiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY1MTIyMDI2NiwibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY1MTIyMzg2NiwiaWF0IjoxNjUxMjIwMjY2LCJlbWFpbCI6ImF6YXJhdGVAY29udGVudG9oLmNvbSJ9.lhlgp4NoHgFu4LrpIWiGCTD08MIHo-mLQ17SNx1rAmyHP5YosGp9LKJXEgNcpAIaVfFiy4Zd-YGTf2QExMcP9kAYksoKHI1G6jSg87yh3Pg3V3aGE6X6JkuOOflz2M8jZgyYMRvbkJfG7oi6uj_nZ-tCjq7VMnmZyfWL4LjTvF5E0EqzVC93fcPViwW5ozqr51VvGhIoXGHiG01i4CPbsorp0jJjlU795cq4ETNw6i0d61Wz9pLDUttYmt5RCEMrbCp3ctSymtxHuz3eJTXzsF330KAmGL2SG4hJ8l-kdyoYRSlkGy3PTy4tYdFVrcubpHL3LOFzJWMrmLn98J3MoA",
   articleId: 238,
   category: 846,
   version: 2,
@@ -54,75 +54,75 @@ RetailerProductEditionDefault.args = {
       descriptions: 1,
       images: 1,
     },
-    orderId: 123,
+    orderId: 125,
     status: "IN_PROGRESS",
-    datasheet_status: "IN_PROGRESS",
+    datasheet_status: "QF",
     prio: "none",
     version: 2,
-    description_status: "IN_PROGRESS",
-    images_status: null,
+    description_status: "QF",
+    images_status: "IN_PROGRESS",
     article: {
-      id_article: 109481,
-      id_category: "9",
-      name: "Barrita de nuez",
-      upc: "168489",
-      timestamp: "2022-04-27T15:06:59.000Z",
+      id_article: 109483,
+      id_category: "2046",
+      name: "Celular",
+      upc: "31313131",
+      timestamp: "2022-04-28T21:42:27.000Z",
       id_user: 28,
       status: "NULL",
       active: 1,
       company_id: 1,
       company_name: "COMPANY DEV",
       country: "Colombia",
-      id_order: 123,
+      id_order: 125,
       id_datasheet_especialist: 54,
       id_datasheet_facilitator: 52,
       id_description_especialist: 54,
       id_description_facilitator: 52,
-      id_images_especialist: null,
-      id_images_facilitator: null,
+      id_images_especialist: 55,
+      id_images_facilitator: 53,
       id_auditor: 30,
       id_recepcionist: null,
-      category: "ABARROTES|ABARROTES SECOS|CEREALES Y BARRAS",
+      category: "ELÉCTRICO|ELECTRÓNICA|ANTENAS Y ACCESORIOS",
       missingAttributes: null,
       missingDescriptions: null,
       missingImages: null,
     },
     retailers: [
       {
-        id: 4,
-        name: "Walmart Super y Superama",
+        id: 58,
+        name: "The Home Depot",
         country: "México",
         id_region: 1,
         active: 1,
       },
       {
-        id: 6,
-        name: "HEB",
+        id: 59,
+        name: "Home Depot Platinum",
         country: "México",
         id_region: 1,
         active: 1,
       },
     ],
     country: "Colombia",
-    upc: "168489",
+    upc: "31313131",
   },
   user: {
-    id_user: 30,
-    name: "Admin",
-    last_name: "Ulises",
-    email: "salmeron.5@hotmail.com",
-    position: "Admin",
+    id_user: 52,
+    name: "FACILITADOR TXT PRUEBA",
+    last_name: "",
+    email: "azarate@contentoh.com",
+    position: null,
     telephone: null,
-    country: "México",
+    country: null,
     id_company: 2,
-    id_cognito: "c94a7305-9365-46ff-a423-4b4bc3b8b180",
+    id_cognito: "b2ce5b2a-609c-4e79-9ea9-2f74cff43889",
     birth_Date: null,
     about_me: null,
     zip_code: null,
     address: null,
     job: null,
     id_stripe: null,
-    id_role: 6,
+    id_role: 4,
     active: 1,
     is_retailer: 0,
     membership: {
@@ -136,6 +136,6 @@ RetailerProductEditionDefault.args = {
       products_limit: "3",
       type: "PyMES",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-30/30.png?1649896700986",
+    src: "https://content-management-profile.s3.amazonaws.com/id-52/52.png?1651207506986",
   },
 };

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

@@ -126,7 +126,11 @@ export const RetailerProductEdition = ({
   const [services, setServices] = useState([]);
   const [servicesData, setServicesData] = useState([]);
   const [message, setMessage] = useState("");
-  const [product, setProduct] = useState({});
+  const [product, setProduct] = useState(
+    JSON.parse(sessionStorage.getItem("productSelected"))
+      ? JSON.parse(sessionStorage.getItem("productSelected"))
+      : productSelected
+  );
   const [icon, setIcon] = useState(null);
   const [version, setVersion] = useState(productSelected?.version);
   const [comments, setComments] = useState({});
@@ -164,7 +168,7 @@ export const RetailerProductEdition = ({
       init: services[2],
     });
     if (services[2]?.values?.length > 0) setActiveImage(0);
-    setProduct(productSelected);
+
     getPercentage({ data: [productSelected] }).then((res) =>
       setPercentages(res)
     );
@@ -186,7 +190,7 @@ export const RetailerProductEdition = ({
     }
     const selected = productSelected;
     const servicesResponse = await axios.get(
-      `${process.env.REACT_APP_SERVICES_ENDPOINT}?articleId=${selected?.article?.id_article}&orderId=${selected?.article?.id_order}&end=true`
+      `${process.env.REACT_APP_SERVICES_ENDPOINT}?articleId=${product?.article?.id_article}&orderId=${product?.article?.id_order}&end=true`
     );
     const parsedResponse = JSON.parse(servicesResponse?.data?.body).data;
     setServicesData(parsedResponse);
@@ -530,11 +534,13 @@ export const RetailerProductEdition = ({
     }
     concept = action ? action : concept;
     return (
-      (productSelected[`${concept}_status`] === "QF" &&
+      (product[`${concept}_status`] === "QF" &&
         (user.id_role === 1 || user.id_role === 4 || user.id_role === 5)) ||
-      (productSelected[`${concept}_status`] === "AF" &&
+      (product[`${concept}_status`] === "AF" && //sessionStorage productSelected
         (user.id_role === 1 || user.id_role === 6)) ||
-      (productSelected[`${concept}_status`] === "RP" &&
+      (product[`${concept}_status`] === "RP" &&
+        (user.id_role === 1 || user.id_role === 6)) ||
+      (product[`${concept}_status`] === "RC" &&
         (user.id_role === 1 || user.id_role === 6))
     );
   };
@@ -557,7 +563,7 @@ export const RetailerProductEdition = ({
 
   const updateCompaniesList = (status, result, retailerId, concept) => {
     let serv = servicesData.slice();
-    let item = serv?.find(
+    let item = serv.find(
       (item) => item.id_retailer === retailerId && item.service === concept
     );
     let index = serv.indexOf(item);
@@ -631,12 +637,9 @@ export const RetailerProductEdition = ({
       case "Imágenes":
         concept = "images";
         break;
-      default:
-        break;
     }
-    let evalStatus = "";
-    let productTemp = productSelected;
-    evalStatus = productSelected[`${concept}_status`];
+    let productTemp = { ...product };
+    let evalStatus = product[`${concept}_status`];
     const specialistDone =
       evalStatus === "RF" ||
       evalStatus === "RA" ||
@@ -646,46 +649,51 @@ export const RetailerProductEdition = ({
       setMessage(`${activeTab} enviada a facilitador`);
       getSectionIcon();
       productTemp[`${concept}_status`] = "QF";
-      evalStatus = "QF";
     } else if (evalStatus === "QF") {
       setMessage("Evaluación enviada");
       getSectionIcon();
       productTemp[`${concept}_status`] = "AF";
-      evalStatus = "AF";
     } else if (evalStatus === "AF") {
       setMessage("Evaluación enviada");
       getSectionIcon();
       productTemp[`${concept}_status`] = "AA";
-      evalStatus = "AA";
     } else if (evalStatus === "RP") {
       setMessage("Evaluación enviada");
       getSectionIcon();
       productTemp[`${concept}_status`] = "AA";
-      evalStatus = "AA";
+    } else if (evalStatus === "RC") {
+      setMessage("Evaluación enviada");
+      getSectionIcon();
+      productTemp[`${concept}_status`] = "AP";
     }
+
     let data = {};
     if (result) {
       updateCompaniesList(evalStatus, result, activeRetailer.id, concept);
       data = {
-        articleId: productSelected.article.id_article,
-        orderId: productSelected.orderId,
+        articleId: product.article.id_article,
+        orderId: product.orderId,
         concept: concept,
         result: result,
         evalStatus: evalStatus,
         retailerId: activeRetailer.id,
       };
-      await axios.put(`${process.env.REACT_APP_EVALUATION_ENDPOINT}`, data, {
-        headers: {
-          Authorization: token,
-        },
-      });
+      try {
+        await axios.put(`${process.env.REACT_APP_EVALUATION_ENDPOINT}`, data, {
+          headers: {
+            Authorization: token,
+          },
+        });
+      } catch (error) {
+        console.log(error);
+      }
     } else {
       if (specialistDone) {
-        updateCompaniesList(evalStatus, result, activeRetailer.id);
+        updateCompaniesList(evalStatus, result, activeRetailer.id, concept);
       }
       data = {
-        articleId: productSelected.article.id_article,
-        orderId: productSelected.orderId,
+        articleId: product.article.id_article,
+        orderId: product.orderId,
         concept: concept,
         evalStatus: evalStatus,
         retailerId: activeRetailer.id,
@@ -704,11 +712,14 @@ export const RetailerProductEdition = ({
           break;
       }
 
+      console.log(data);
+
       axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
         headers: {
           Authorization: token,
         },
       });
+      sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
       setProduct(productTemp);
       //setModalSent(true);
     }
@@ -730,9 +741,21 @@ export const RetailerProductEdition = ({
     }
 
     const allowedRoles = [1, 4, 5, 6, 7, 8];
-
     const validUser = allowedRoles.indexOf(user?.id_role) !== -1;
 
+    if (!rol) {
+      switch (user.id_role) {
+        case 4:
+        case 5:
+          rol = "facilitator";
+          break;
+        case 7:
+        case 8:
+          rol = "especialist";
+          break;
+      }
+    }
+
     return (
       productSelected.article[`id_${concept}_${rol}`] === user.id_user &&
       validUser
@@ -872,20 +895,20 @@ export const RetailerProductEdition = ({
     sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
   };
 
-  const evaluationComplete = (tab) => {
+  const evaluationComplete = () => {
     let concept = "";
-    switch (tab) {
+    switch (activeTab) {
       case "Ficha técnica":
         concept = "datasheet";
         break;
       case "Imágenes":
         concept = "images";
         break;
-
-      default:
+      case "Descripción":
         concept = "description";
         break;
     }
+
     let serv = servicesData.filter((item) => item.service === concept);
     let approved = "";
     let rejected = "";
@@ -998,9 +1021,25 @@ export const RetailerProductEdition = ({
     }
   };
 
-  useEffect(() => {
-    console.log(requiredNull[activeTab], evaluationComplete(activeTab));
-  }, [activeTab]);
+  const specialistValid = (tab) => {
+    let concept = "";
+    switch (tab) {
+      case "Ficha técnica":
+        concept = "datasheet";
+        break;
+      case "Imágenes":
+        concept = "images";
+        break;
+      case "Descripción":
+        concept = "description";
+        break;
+    }
+    return (
+      product[`${concept}_status`] === "IN_PROGRESS" ||
+      product[`${concept}_status`] === "RF" ||
+      product[`${concept}_status`] === "RA"
+    );
+  };
 
   return (
     <Container headerTop={headerTop}>
@@ -1036,15 +1075,38 @@ export const RetailerProductEdition = ({
             approveRejectButtons={approveRejectButtons}
             sendToFacilitator={sendToFacilitator}
             auditorAssigned={auditorAssigned}
-            userAssigned={() => userAssigned(activeTab, "facilitator")}
+            userAssigned={() => userAssigned(activeTab)}
           />
           <FullTabsMenu
             tabsSections={tabsSections}
-            status={{
-              Descripción: product?.description_status,
-              "Ficha técnica": product?.datasheet_status,
-              Imágenes: product?.images_status,
-            }}
+            status={
+              //   {
+              //   Descripción: product?.description_status,
+              //   "Ficha técnica": product?.datasheet_status,
+              //   Imágenes: product?.images_status,
+              // }
+              () => {
+                let concept = "";
+                switch (activeTab) {
+                  case "Ficha técnica":
+                    concept = "datasheet";
+                    break;
+                  case "Imágenes":
+                    concept = "images";
+                    break;
+                  case "Descripción":
+                    concept = "description";
+                    break;
+                }
+                let retailerService = {};
+                [retailerService] = servicesData.filter(
+                  (service) =>
+                    service.id_retailer === activeRetailer.id &&
+                    service.service === concept
+                );
+                return retailerService?.status;
+              }
+            }
             activeTab={activeTab}
             setActiveTab={setActiveTab}
             setImageLayout={setImageLayout}
@@ -1144,8 +1206,7 @@ export const RetailerProductEdition = ({
               </>
             )}
           </div>
-          {(userAssigned(activeTab, "especialist" || "facilitator") ||
-            auditorAssigned()) && (
+          {(userAssigned(activeTab) || auditorAssigned()) && (
             <div className="commentary-box">
               {!comment ? (
                 <div className="commentary">
@@ -1190,9 +1251,9 @@ export const RetailerProductEdition = ({
               )}
               <Button
                 buttonType={
-                  approveRejectButtons() ||
-                  requiredNull[activeTab] === 0 ||
-                  evaluationComplete(activeTab)
+                  evaluationComplete() &&
+                  requiredNull[activeTab] === 0 &&
+                  approveRejectButtons()
                     ? "general-green-button"
                     : "general-button-disabled"
                 }