contentoh-components-library 21.1.76 → 21.1.79

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

@@ -29,9 +29,10 @@ import { GenericModal } from "../../atoms/GenericModal";
 import { ScreenHeader } from "../../atoms/ScreenHeader";
 import { Loading } from "../../atoms/Loading";
 import succes from "../../../assets/images/genericModal/genericModalCheck.svg";
+import { getNewStatus } from "../../../global-files/data";
 import errorModal from "../../../assets/images/genericModal/errorModal.svg";
 import { VersionSelector } from "../../organisms/VersionSelector";
-import { closeModals } from "../../../global-files/customHooks";
+import { useCloseModal } from "../../../global-files/customHooks";
 import { CreateVersion } from "../../organisms/CreateVersion";
 
 const reducerImages = (state, action) => {
@@ -169,7 +170,7 @@ export const RetailerProductEdition = ({
   const isAuditor = user.id_role === 6;
   const [showCreateVersion, setShowCreateVersion] = useState(false);
   const [showVersionSelector, setShowVersionSelector] =
-    closeModals("version-selector");
+    useCloseModal("version-selector");
 
   useEffect(() => {
     checkAll && setSelectedImages(images.values);
@@ -187,8 +188,11 @@ export const RetailerProductEdition = ({
       setServices(services);
       getServices();
 
-      // setActiveRetailer(product?.retailers[0]);
-      setImages({ action: "init", init: services[2] });
+      //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));
@@ -206,22 +210,24 @@ export const RetailerProductEdition = ({
     );
     const parsedResponse = JSON.parse(servicesResponse?.data?.body).data;
 
-    const retailers = product.retailers || product.retailersAvailable;
-    const retailerResponse = parsedResponse?.map((srv) => srv.id_retailer);
-    const active = retailers?.find((retailer) =>
-      retailerResponse.includes(retailer.id)
-    );
+    let retailers = product.retailers || product.retailersAvailable;
+    let active = retailers?.filter((retailer) =>
+      parsedResponse?.map((srv) => srv.id_retailer).includes(retailer.id)
+    )[0];
     !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
     setServicesData(parsedResponse);
   };
 
   const translateConcept = (concept) => {
-    const translation = {
-      datasheet: "Ficha técnica",
-      description: "Descripción",
-      images: "Imágenes",
-    };
-    return translation[concept];
+    let translation = "";
+    if (concept === "datasheet") {
+      translation = "Ficha técnica";
+    } else if (concept === "description") {
+      translation = "Descripción";
+    } else if (concept === "images") {
+      translation = "Imágenes";
+    }
+    return translation;
   };
 
   const getComments = async (tab = "Descripción") => {
@@ -258,14 +264,14 @@ export const RetailerProductEdition = ({
     switch (user.id_role) {
       case 7:
       case 8:
-        arr = ["CA", "RC", "RA"];
+        arr = ["IN_PROGRESS", "RF", "RA"];
         break;
       case 4:
       case 5:
-        arr = ["RC", "AC", "AA", "AP", "ACA"];
+        arr = ["RF", "AF", "AA", "AP", "AC"];
         break;
       case 6:
-        arr = ["RP", "RCA", "AC", "RA"];
+        arr = ["RP", "RC", "AF", "RA"];
         break;
       default:
         arr = [];
@@ -391,14 +397,13 @@ export const RetailerProductEdition = ({
   const saveDescriptions = async () => {
     setLoading(true);
     const productTemp = product;
-    const articleId = product?.article?.id_article;
     const dataObject = {
-      articleId,
+      articleId: product?.article?.id_article,
       articleData: updatedDescriptions,
     };
     if (product?.orderId) dataObject["orderId"] = product?.orderId;
     try {
-      const res = await axios.put(
+      await axios.put(
         `${process.env.REACT_APP_ARTICLE_DATA_ENDPOINT}?description=true&version=${version}`,
         dataObject,
         {
@@ -407,16 +412,14 @@ export const RetailerProductEdition = ({
           },
         }
       );
-      if (res.data.statusCode === 200) {
-        const { newStatus, newArticleStatus } = JSON.parse(res.data.body);
-        if (newArticleStatus) productTemp.status = newArticleStatus[articleId];
-        if (newStatus) productTemp.description_status = newStatus;
+      if (productTemp.status === "ASSIGNED") {
+        productTemp.status = "IN_PROGRESS";
         setProduct(productTemp);
         sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
-
-        setMessage("Descripciones guardadas con éxito");
-        await loadData();
       }
+
+      setMessage("Descripciones guardadas con éxito");
+      loadData();
     } catch (error) {
       console.log(error);
     }
@@ -425,14 +428,13 @@ export const RetailerProductEdition = ({
   const saveDatasheets = async () => {
     setLoading(true);
     const productTemp = product;
-    const articleId = product?.article?.id_article;
     const dataObject = {
-      articleId,
+      articleId: product?.article?.id_article,
       articleData: updatedDatasheets,
     };
     if (product?.orderId) dataObject["orderId"] = product?.orderId;
     try {
-      const res = await axios.put(
+      await axios.put(
         `${process.env.REACT_APP_ARTICLE_DATA_ENDPOINT}?datasheet=true&version=${version}`,
         dataObject,
         {
@@ -441,16 +443,13 @@ export const RetailerProductEdition = ({
           },
         }
       );
-      if (res.data.statusCode === 200) {
-        const { newStatus, newArticleStatus } = JSON.parse(res.data.body);
-        if (newArticleStatus) productTemp.status = newArticleStatus[articleId];
-        if (newStatus) productTemp.datasheet_status = newStatus;
+      setMessage("Fichas técnicas guardadas");
+      if (productTemp.status === "ASSIGNED") {
+        productTemp.status = "IN_PROGRESS";
         setProduct(productTemp);
         sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
-
-        setMessage("Fichas técnicas guardadas");
-        await loadData();
       }
+      loadData();
     } catch (error) {
       console.log(error);
     }
@@ -533,6 +532,15 @@ export const RetailerProductEdition = ({
         } else {
           setImagesUploaded(true);
         }
+        let productTemp = product;
+        if (productTemp.status === "ASSIGNED") {
+          productTemp.status = "IN_PROGRESS";
+          setProduct(productTemp);
+          sessionStorage.setItem(
+            "productSelected",
+            JSON.stringify(productTemp)
+          );
+        }
       } catch (err) {
         console.log(err);
         // setMainLoading(false);
@@ -557,7 +565,7 @@ export const RetailerProductEdition = ({
         return e;
       });
       try {
-        const res = await axios.put(
+        await axios.put(
           `${process.env.REACT_APP_ARTICLE_DATA_ENDPOINT}?image=true&version=${version}`,
           dataImages,
           {
@@ -566,21 +574,9 @@ export const RetailerProductEdition = ({
             },
           }
         );
-        if (res.data.statusCode === 200) {
-          let productTemp = product;
-          const { newStatus, newArticleStatus } = JSON.parse(res.data.body);
-          if (newArticleStatus)
-            productTemp.status = newArticleStatus[articleId];
-          if (newStatus) productTemp.images_status = newStatus;
-          setProduct(productTemp);
-          sessionStorage.setItem(
-            "productSelected",
-            JSON.stringify(productTemp)
-          );
-          setMessage("Imágenes guardadas con éxito");
-          sessionStorage.removeItem("imagesList");
-          await loadData();
-        }
+        setMessage("Imágenes guardadas con éxito");
+        sessionStorage.removeItem("imagesList");
+        loadData();
       } catch (error) {
         console.log(error);
       }
@@ -589,23 +585,24 @@ export const RetailerProductEdition = ({
 
   const evaluationFinished = (userId, tab, statusArray) => {
     const srv = servicesData.filter((serv) => serv.service === getConcept(tab));
-    const srvActive = srv
-      .find((serv) => serv.id_retailer === activeRetailer?.id)
-      ?.status?.replace(/.*\//, "");
-    const currStatus = product[`${getConcept(tab)}_status`]?.replace(
-      /.*\//,
-      ""
+    const [srvActive] = srv.filter(
+      (serv) => serv.id_retailer === activeRetailer?.id
     );
-    const unvalidated = ["IE", "CA"].includes(currStatus);
+    const unvalidated =
+      product[`${getConcept(tab)}_status`] === "QF" ||
+      product[`${getConcept(tab)}_status`] === "IN_PROGRESS";
 
-    const auditorUnvalidated = !["RA", "AA", "ACA", "AP"].includes(currStatus);
+    const auditorUnvalidated = !["RA", "AA", "AC", "AP"].includes(
+      product[`${getConcept(tab)}_status`]
+    );
 
     switch (userId) {
       case 7:
       case 8:
         return (
-          statusArray.includes(srvActive) &&
-          (["RA", "RC"].includes(product?.status) ||
+          (["RA", "RF"].includes(product?.status) && //"IN_PROGRESS", "RF", "RA"
+            statusArray.includes(srvActive?.status)) ||
+          (statusArray.includes(product.status) &&
             srv.filter((serv) => statusArray.includes(serv.status)).length ===
               srv.length)
         );
@@ -613,16 +610,14 @@ export const RetailerProductEdition = ({
       case 5:
         return (
           unvalidated &&
-          ["CA", "IE"].includes(product.status) && // "RC", "AC", "AA", "AP", "ACA"
+          ["IN_PROGRESS", "QF"].includes(product.status) && //"RF", "AF", "AA", "AP", "AC
           srv.filter((serv) => statusArray.includes(serv.status)).length ===
             srv.length
         );
       case 6:
         return (
-          statusArray.includes(product.status) && // RP, RCA, AC, RA true
-          srv.every((serv) =>
-            ["RA", "AA", "AP", "ACA"].includes(serv.status)
-          ) &&
+          statusArray.includes(product.status) && //RP, RC, AF, RA true
+          srv.every((serv) => ["RA", "AA", "AP", "AC"].includes(serv.status)) &&
           auditorUnvalidated
         );
       default:
@@ -644,20 +639,20 @@ export const RetailerProductEdition = ({
   const approveRejectButtons = (action) => {
     let concept = getConcept(action || activeTab);
 
-    const retailerStatus = servicesData
-      .find(
-        (srv) =>
-          srv.id_retailer === activeRetailer?.id && srv.service === concept
-      )
-      ?.status?.replace(/.*\//, "");
-
-    //sessionStorage product
-    const adminFacilitatorCanEvaluate =
-      retailerStatus === "IE" && [1, 4, 5].includes(user.id_role);
-    const adminAuditorCanEvaluate =
-      ["AC", "RP", "RCA"].includes(retailerStatus) &&
-      [1, 6].includes(user.id_role);
-    return adminFacilitatorCanEvaluate || adminAuditorCanEvaluate;
+    const [retailerStatus] = servicesData.filter(
+      (srv) => srv.id_retailer === activeRetailer?.id && srv.service === concept
+    );
+
+    return (
+      (retailerStatus?.status === "QF" &&
+        (user.id_role === 1 || user.id_role === 4 || user.id_role === 5)) ||
+      (retailerStatus?.status === "AF" && //sessionStorage product
+        (user.id_role === 1 || user.id_role === 6)) ||
+      (retailerStatus?.status === "RP" &&
+        (user.id_role === 1 || user.id_role === 6)) ||
+      (retailerStatus?.status === "RC" &&
+        (user.id_role === 1 || user.id_role === 6))
+    );
   };
 
   const getSectionIcon = () => {
@@ -681,57 +676,92 @@ export const RetailerProductEdition = ({
     try {
       let concept = getConcept(activeTab);
 
-      const productTemp = { ...product };
-      const evalStatus = retailerStatus;
-      const articleId = product.article.id_article;
-      const orderId = product.orderId;
-
-      let data = {
-        articleId,
-        orderId,
-        concept,
-        evalStatus,
-        retailerId: activeRetailer.id,
-      };
-      let res;
-      let message;
+      let productTemp = { ...product };
+      let evalStatus = product[`${concept}_status`];
+
+      let data = {};
       if (result) {
-        data.result = result;
-        res = await axios.put(
-          `${process.env.REACT_APP_EVALUATION_ENDPOINT}`,
-          data,
-          {
-            headers: {
-              Authorization: token,
-            },
-          }
-        );
+        data = {
+          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,
+          },
+        });
         getServices();
       } else {
-        const specialistDone = ["RC", "RA", "CA"].includes(evalStatus);
+        const specialistDone =
+          evalStatus === "RF" ||
+          evalStatus === "RA" ||
+          evalStatus === "IN_PROGRESS";
 
         if (specialistDone) {
-          message = `${activeTab} enviada a facilitador`;
+          setMessage(`${activeTab} enviada a facilitador`);
           getSectionIcon();
-        } else if (["IE", "AC", "RP", "RCA"].includes(evalStatus)) {
-          message = "Evaluación enviada";
+        } else if (evalStatus === "QF") {
+          setMessage("Evaluación enviada");
+          getSectionIcon();
+        } else if (evalStatus === "AF") {
+          setMessage("Evaluación enviada");
+          getSectionIcon();
+        } else if (evalStatus === "RP") {
+          setMessage("Evaluación enviada");
+          getSectionIcon();
+        } else if (evalStatus === "RC") {
+          setMessage("Evaluación enviada");
           getSectionIcon();
         }
-        res = await axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
+        let statusArr = [];
+        servicesData.forEach((srv) => {
+          srv.service === concept && statusArr.push(srv.status);
+        });
+
+        productTemp[`${concept}_status`] = getNewStatus(statusArr);
+
+        let newStatus = getNewStatus([
+          productTemp.datasheet_status,
+          productTemp.description_status,
+          productTemp.images_status,
+        ]);
+
+        productTemp.status = newStatus;
+
+        data = {
+          articleId: product.article.id_article,
+          orderId: product.orderId,
+          concept: concept,
+          evalStatus: evalStatus,
+          retailerId: activeRetailer.id,
+        };
+
+        switch (user.id_role) {
+          case 7:
+          case 8:
+            data.especialist = true;
+            break;
+          case 4:
+          case 5:
+            data.facilitator = true;
+            break;
+          default:
+            break;
+        }
+        await axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
           headers: {
             Authorization: token,
           },
         });
       }
-      if (res.data.statusCode === 200) {
-        const { newStatus, newOrderStatus } = JSON.parse(res.data.body);
-        if (newOrderStatus) productTemp.status = newOrderStatus[orderId];
-        productTemp[`${concept}_status`] = newStatus;
-        await loadData();
-        if (message) setMessage(message);
-        sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
-        setProduct(productTemp);
-      }
+      loadData();
+      sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
+      setProduct(productTemp);
     } catch (error) {
       console.log(error);
     }
@@ -829,23 +859,21 @@ export const RetailerProductEdition = ({
 
       objetcTemp["Ficha técnica"] = dsInputsRequired.length;
 
-      const regex = /(<\/?p>)|(<\/?strong>)|(<br>)/gm;
       descriptionsServicesArray.forEach((description) => {
         const [requested] = servicesData.filter(
           (srv) =>
             srv.id_retailer === description.id &&
             srv.service === getConcept(activeTab)
         );
-        if (requested) {
-          description.inputs.forEach((input) => {
-            if (
+        requested &&
+          description.inputs.forEach(
+            (input) =>
               input.required &&
-              (!input.value || input.value?.replace(regex, "") === "")
-            ) {
-              desInputsRequired++;
-            }
-          });
-        }
+              (!input.value ||
+                input.value.replace(/(<\/?p>)|(<\/?strong>)|(<br>)/gm, "") ===
+                  "") &&
+              desInputsRequired++
+          );
       });
 
       objetcTemp["Descripción"] = desInputsRequired;
@@ -919,12 +947,12 @@ export const RetailerProductEdition = ({
         },
       ],
       concept: concept,
-      userId: assignationId,
+      [`${assignationType}Id`]: assignationId,
     };
-    await axios({
+    axios({
       method: "post",
       url: process.env.REACT_APP_ASSIGNATIONS_ENDPOINT,
-      data,
+      data: data,
       headers: {
         Authorization: token,
       },
@@ -1113,7 +1141,7 @@ export const RetailerProductEdition = ({
       sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
       setProduct(productTemp);
 
-      await loadData();
+      loadData();
     } catch (error) {
       console.log(error);
     }
@@ -1191,7 +1219,7 @@ export const RetailerProductEdition = ({
             showApproveRejectAll={
               isAuditor &&
               servicesData.every((serv) =>
-                ["RA", "AA", "AP", "ACA", "AC"].includes(serv.status)
+                ["RA", "AA", "AP", "AC", "AF"].includes(serv.status)
               ) &&
               approveRejectButtons() &&
               (auditorAssigned() || userAssigned())
@@ -1234,6 +1262,7 @@ export const RetailerProductEdition = ({
             }}
           />
           <FullTabsMenu
+            canAssign={![7, 8].includes(user.id_role)}
             tabsSections={tabsSections}
             status={retailerStatus}
             activeTab={activeTab}
@@ -1386,21 +1415,16 @@ export const RetailerProductEdition = ({
                     />
                   </div>
                 )}
-                {[7, 8].includes(user.id_role) && (
-                  <Button
-                    buttonType={
-                      evaluationFinished(
-                        user.id_role,
-                        activeTab,
-                        statusArray
-                      ) && requiredNull[activeTab] === 0
-                        ? "general-green-button"
-                        : "general-button-disabled"
-                    }
-                    label={"Enviar evaluación"}
-                    onClick={() => sendToFacilitator()}
-                  />
-                )}
+                <Button
+                  buttonType={
+                    evaluationFinished(user.id_role, activeTab, statusArray) &&
+                    requiredNull[activeTab] === 0
+                      ? "general-green-button"
+                      : "general-button-disabled"
+                  }
+                  label={"Enviar evaluación"}
+                  onClick={() => sendToFacilitator()}
+                />
               </div>
             )}
         </div>
@@ -1440,6 +1464,7 @@ export const RetailerProductEdition = ({
           companyName={product.article.company_name}
           currentVersion={version}
           setShowCreateVersion={setShowCreateVersion}
+          setShowVersionSelector={setShowVersionSelector}
         />
       )}
       {showCreateVersion && (

package/src/global-files/customHooks.js

@@ -1,25 +1,25 @@
 import { useState } from "react";
 import { useEffect } from "react";
 
-export const closeModals = (id) => {
+export const useCloseModal = (id) => {
   const [showModal, setShowModal] = useState(false);
 
+  const closeModal = (e) => {
+    e.stopPropagation();
+    e.preventDefault();
+    console.log(e.target);
+    if (!e.target.closest(`#${id}`) && showModal) {
+      document.removeEventListener("click", closeModal, false);
+      setShowModal(false);
+    }
+  };
   useEffect(() => {
-    const closeModal = (e) => {
-      if (
-        (!e.target.closest(`#${id}`) ||
-          e.target.closest("#close-button") ||
-          e.target.closest("#add-version")) &&
-        showModal
-      ) {
-        document.removeEventListener("click", closeModal);
-        setShowModal(false);
-      }
-    };
-
     if (showModal) {
-      document.addEventListener("click", closeModal);
+      document.addEventListener("click", closeModal, false);
     }
+    return () => {
+      document.removeEventListener("click", closeModal, false);
+    };
   }, [showModal]);
 
   return [showModal, setShowModal];

package/src/global-files/data.js

@@ -195,18 +195,18 @@ export const fetchUsers = async (auth) => {
 export const getNewStatus = (statusArray) => {
   let lookupString = "";
   statusArray.forEach((element) => (lookupString += element + "/"));
-  if (lookupString.includes("RCA")) return "RCA";
-  if (lookupString.includes("RC")) return "RC";
+  if (lookupString.includes("RF")) return "RF";
   if (lookupString.includes("RA")) return "RA";
   if (lookupString.includes("RP")) return "RP";
-  if (lookupString.includes("ACA")) return "ACA";
-  if (lookupString.includes("PA")) return "PA";
-  if (lookupString.includes("CA")) return "CA";
-  if (lookupString.includes("IE")) return "IE";
-  if (lookupString.includes("AC")) return "AC";
+  if (lookupString.includes("RC")) return "RC";
+  if (lookupString.includes("UNASSIGNED")) return "IN_PROGRESS";
+  if (lookupString.includes("IN_PROGRESS")) return "IN_PROGRESS";
+  if (lookupString.includes("QF")) return "QF";
+  if (lookupString.includes("AF")) return "AF";
   if (lookupString.includes("AA")) return "AA";
   if (lookupString.includes("AP")) return "AP";
-  if (lookupString.includes("R")) return "R";
+  if (lookupString.includes("AC")) return "AC";
+  if (lookupString.includes("RECEIVED")) return "RECEIVED";
   if (lookupString.includes("NA")) return "NA";
   return new Error("Status not found");
 };

package/src/index.js

@@ -19,7 +19,7 @@ export * from "./components/atoms/ProgressBar/index";
 export * from "./components/atoms/ScreenHeader/index";
 export * from "./components/atoms/SideMenuButton/index";
 export * from "./components/atoms/SliderToolTip/index";
-export * from "./components/atoms/Status/index";
+export * from "./components/atoms/StatusTag/index";
 export * from "./components/atoms/TabSection/index";
 export * from "./components/atoms/ValidationPanel/index";
 
@@ -65,6 +65,7 @@ export * from "./components/pages/CustomerLogin";
 export * from "./components/pages/CustomerType";
 export * from "./components/pages/EmailResetPassword";
 export * from "./components/pages/OnboardPlan";
+export * from "./components/pages/RegistrationLoginFirstStep";
 export * from "./components/pages/RegistrationLoginSecondStep";
 export * from "./components/pages/RegistrationLoginThirdStep";
 export * from "./components/pages/RetailerProductEdition";

package/dist/components/atoms/Status/Status.stories.js

@@ -1,31 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.StatusDefault = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
-
-var _index = require("./index");
-
-var _jsxRuntime = require("react/jsx-runtime");
-
-var _default = {
-  title: "Components/atoms/Status",
-  component: _index.Status
-};
-exports.default = _default;
-
-var Template = function Template(args) {
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.Status, (0, _objectSpread2.default)({}, args));
-};
-
-var StatusDefault = Template.bind({});
-exports.StatusDefault = StatusDefault;
-StatusDefault.args = {
-  statusType: "IE",
-  ovalForm: false
-};