contentoh-components-library 21.1.74 → 21.1.77

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

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

package/src/global-files/customHooks.js

@@ -4,20 +4,22 @@ import { useEffect } from "react";
 export const closeModals = (id) => {
   const [showModal, setShowModal] = useState(false);
 
-  const closeModal = (e) => {
-    e.stopPropagation();
-    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, false);
+      document.addEventListener("click", closeModal);
     }
-    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("RF")) return "RF";
+  if (lookupString.includes("RCA")) return "RCA";
+  if (lookupString.includes("RC")) return "RC";
   if (lookupString.includes("RA")) return "RA";
   if (lookupString.includes("RP")) return "RP";
-  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("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("AA")) return "AA";
   if (lookupString.includes("AP")) return "AP";
-  if (lookupString.includes("AC")) return "AC";
-  if (lookupString.includes("RECEIVED")) return "RECEIVED";
+  if (lookupString.includes("R")) return "R";
   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/StatusTag/index";
+export * from "./components/atoms/Status/index";
 export * from "./components/atoms/TabSection/index";
 export * from "./components/atoms/ValidationPanel/index";
 
@@ -65,7 +65,6 @@ 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/StatusTag/StatusTag.stories.js

@@ -1,48 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.StatusTagDefault = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
-
-var _index = require("./index");
-
-var _variables = require("../../../global-files/variables");
-
-var _jsxRuntime = require("react/jsx-runtime");
-
-var status = _variables.GlobalStatus;
-var _default = {
-  title: "Components/atoms/StatusTag",
-  component: _index.StatusTag,
-  argTypes: {
-    statusType: {
-      options: status,
-      control: {
-        type: "select"
-      }
-    },
-    ovalForm: {
-      options: [true, false],
-      control: {
-        type: "boolean"
-      }
-    }
-  }
-};
-exports.default = _default;
-
-var Template = function Template(args) {
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.StatusTag, (0, _objectSpread2.default)({}, args));
-};
-
-var StatusTagDefault = Template.bind({});
-exports.StatusTagDefault = StatusTagDefault;
-StatusTagDefault.args = {
-  statusType: "-",
-  ovalForm: false
-};