contentoh-components-library 21.2.19 → 21.2.22

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

@@ -615,7 +615,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
             break;
 
           case 12:
-            arr = ["CA", "RC", "RA"];
+            arr = ["AS", "CA", "RC", "RA"];
             return _context4.abrupt("break", 20);
 
           case 14:
@@ -1163,6 +1163,41 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     return adminFacilitatorCanEvaluate || adminAuditorCanEvaluate;
   };
 
+  var approveRejectAllButtons = function approveRejectAllButtons() {
+    var concepts = [];
+
+    switch (user.id_role) {
+      case 4:
+        concepts = ["description", "datasheet"];
+        break;
+
+      case 5:
+        concepts = ["images"];
+        break;
+
+      default:
+        concepts = ["description", "datasheet", "images"];
+        break;
+    }
+
+    var services = servicesData.filter(function (_ref10) {
+      var service = _ref10.service;
+      return concepts.includes(service);
+    });
+    var adminFacilitatorCanEvaluate = services.every(function (srv) {
+      var _srv$status;
+
+      return (srv === null || srv === void 0 ? void 0 : (_srv$status = srv.status) === null || _srv$status === void 0 ? void 0 : _srv$status.replace(/.*\//, "")) === "IE";
+    }) && [1, 4, 5].includes(user.id_role); //sessionStorage product
+
+    var adminAuditorCanEvaluate = servicesData.every(function (srv) {
+      var _srv$status2;
+
+      return ["AC", "RP", "RCA"].includes(srv === null || srv === void 0 ? void 0 : (_srv$status2 = srv.status) === null || _srv$status2 === void 0 ? void 0 : _srv$status2.replace(/.*\//, ""));
+    }) && [1, 6].includes(user.id_role);
+    return adminFacilitatorCanEvaluate || adminAuditorCanEvaluate;
+  };
+
   var getSectionIcon = function getSectionIcon() {
     switch (activeTab) {
       case "Ficha técnica":
@@ -1173,7 +1208,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
         setIcon(_descriptionSent.default);
         break;
 
-      case "Imágenes0,,":
+      case "Imágenes":
         setIcon(_uploadingImages.default);
         break;
 
@@ -1183,7 +1218,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   };
 
   var sendToFacilitator = /*#__PURE__*/function () {
-    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(result) {
+    var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9(result) {
       var concept, productTemp, evalStatus, _articleId, orderId, data, res, _message, specialistDone, _JSON$parse5, newStatus, newOrderStatus, newArticleStatus;
 
       return _regenerator.default.wrap(function _callee9$(_context9) {
@@ -1283,7 +1318,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function sendToFacilitator(_x) {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
 
@@ -1314,7 +1349,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   };
 
   var createComment = /*#__PURE__*/function () {
-    var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(e, body, tab) {
+    var _ref12 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(e, body, tab) {
       var _product$article12;
 
       var concept, data;
@@ -1371,7 +1406,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function createComment(_x2, _x3, _x4) {
-      return _ref11.apply(this, arguments);
+      return _ref12.apply(this, arguments);
     };
   }();
 
@@ -1449,7 +1484,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   }, [activeTab]);
 
   var commentRevised = /*#__PURE__*/function () {
-    var _ref12 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
+    var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
       var data;
       return _regenerator.default.wrap(function _callee11$(_context11) {
         while (1) {
@@ -1479,12 +1514,12 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function commentRevised() {
-      return _ref12.apply(this, arguments);
+      return _ref13.apply(this, arguments);
     };
   }();
 
   var setAssignation = /*#__PURE__*/function () {
-    var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(assignationType, assignationId) {
+    var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(assignationType, assignationId) {
       var _product$article13;
 
       var concept, productTemp, data;
@@ -1543,7 +1578,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function setAssignation(_x5, _x6) {
-      return _ref13.apply(this, arguments);
+      return _ref14.apply(this, arguments);
     };
   }();
 
@@ -1655,8 +1690,9 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   }, [loading]);
 
   var validateAll = /*#__PURE__*/function () {
-    var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(result) {
-      var evaluationArray, sendAll, conceptArray, productTemp;
+    var _ref15 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(result) {
+      var _conceptArray, evaluationArray, sendAll, conceptArray, productTemp;
+
       return _regenerator.default.wrap(function _callee13$(_context13) {
         while (1) {
           switch (_context13.prev = _context13.next) {
@@ -1665,29 +1701,48 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
               setLoading(true);
               evaluationArray = [];
               sendAll = [];
+              conceptArray = [];
+              _context13.t0 = user.id_role;
+              _context13.next = _context13.t0 === 4 ? 8 : _context13.t0 === 5 ? 10 : 12;
+              break;
+
+            case 8:
+              conceptArray = ["description", "datasheet"];
+              return _context13.abrupt("break", 14);
+
+            case 10:
+              conceptArray = ["images"];
+              return _context13.abrupt("break", 14);
+
+            case 12:
               conceptArray = ["description", "datasheet", "images"];
-              servicesData === null || servicesData === void 0 ? void 0 : servicesData.forEach(function (ret) {
-                var _product$id_order;
+              return _context13.abrupt("break", 14);
 
-                var data = {
-                  articleId: product.article.id_article,
-                  orderId: (_product$id_order = product.id_order) !== null && _product$id_order !== void 0 ? _product$id_order : product.orderId,
-                  concept: ret.service,
-                  result: result,
-                  evalStatus: product["".concat(ret.service, "_status")],
-                  retailerId: ret.id_retailer
-                };
-                evaluationArray.push(_axios.default.put("".concat(process.env.REACT_APP_EVALUATION_ENDPOINT), data, {
-                  headers: {
-                    Authorization: token
-                  }
-                }));
+            case 14:
+              servicesData === null || servicesData === void 0 ? void 0 : servicesData.forEach(function (ret) {
+                if (conceptArray.includes(ret.service)) {
+                  var _product$id_order;
+
+                  var data = {
+                    articleId: product.article.id_article,
+                    orderId: (_product$id_order = product.id_order) !== null && _product$id_order !== void 0 ? _product$id_order : product.orderId,
+                    concept: ret.service,
+                    result: result,
+                    evalStatus: product["".concat(ret.service, "_status")],
+                    retailerId: ret.id_retailer
+                  };
+                  evaluationArray.push(_axios.default.put("".concat(process.env.REACT_APP_EVALUATION_ENDPOINT), data, {
+                    headers: {
+                      Authorization: token
+                    }
+                  }));
+                }
               });
-              _context13.next = 8;
+              _context13.next = 17;
               return Promise.all(evaluationArray);
 
-            case 8:
-              conceptArray === null || conceptArray === void 0 ? void 0 : conceptArray.forEach(function (concept) {
+            case 17:
+              (_conceptArray = conceptArray) === null || _conceptArray === void 0 ? void 0 : _conceptArray.forEach(function (concept) {
                 var _product$id_order2;
 
                 var data = {
@@ -1702,10 +1757,10 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
                   }
                 }));
               });
-              _context13.next = 11;
+              _context13.next = 20;
               return Promise.all(sendAll);
 
-            case 11:
+            case 20:
               productTemp = product;
               productTemp.status = "".concat(result, "A");
               productTemp.datasheet_status = productTemp.datasheet_status === "NA" ? "NA" : "".concat(result, "A");
@@ -1713,28 +1768,28 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
               productTemp.images_status = productTemp.images_status === "NA" ? "NA" : "".concat(result, "A");
               sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
               setProduct(productTemp);
-              _context13.next = 20;
+              _context13.next = 29;
               return loadData();
 
-            case 20:
-              _context13.next = 25;
+            case 29:
+              _context13.next = 34;
               break;
 
-            case 22:
-              _context13.prev = 22;
-              _context13.t0 = _context13["catch"](0);
-              console.log(_context13.t0);
+            case 31:
+              _context13.prev = 31;
+              _context13.t1 = _context13["catch"](0);
+              console.log(_context13.t1);
 
-            case 25:
+            case 34:
             case "end":
               return _context13.stop();
           }
         }
-      }, _callee13, null, [[0, 22]]);
+      }, _callee13, null, [[0, 31]]);
     }));
 
     return function validateAll(_x7) {
-      return _ref14.apply(this, arguments);
+      return _ref15.apply(this, arguments);
     };
   }();
 
@@ -1805,9 +1860,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
               }
             })]);
           },
-          showApproveRejectAll: isAuditor && servicesData.every(function (serv) {
-            return ["RA", "AA", "AP", "ACA", "AC"].includes(serv.status);
-          }) && approveRejectButtons() && (auditorAssigned() || userAssigned()),
+          showApproveRejectAll: approveRejectAllButtons() && (auditorAssigned() || userAssigned()),
           showValidationButtons: approveRejectButtons() && (auditorAssigned() || userAssigned()),
           approveAll: function approveAll() {
             return validateAll("A");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentoh-components-library",
-  "version": "21.2.19",
+  "version": "21.2.22",
   "dependencies": {
     "@aws-amplify/auth": "^4.5.3",
     "@aws-amplify/datastore": "^3.11.0",

package/src/components/atoms/InputFormatter/index.js

@@ -22,7 +22,10 @@ export const InputFormatter = ({
   const maxLength = maxChar ? maxChar : 999;
 
   const getValue = (value) => {
-    let temp = value.replace(/\n/gm, "<br>").replace(/\&(nbsp;|amp;)/gm, " ");
+    let temp = value
+      .replace(/\n/gm, "<br>")
+      .replace(/\&nbsp;/gm, " ")
+      .replace(/\&amp;/gm, "&");
     return temp;
   };
 
@@ -37,7 +40,8 @@ export const InputFormatter = ({
     return value
       .replace(/<\/p><p>/gm, "\n")
       .replace(/<\/?br>|<\/?p>/gm, "")
-      .replace(/\&(nbsp;|amp;)/gm, " ");
+      .replace(/\&nbsp;/gm, " ")
+      .replace(/\&amp;/gm, "&");
   };
 
   const onChange = (valueInput, delta, user, h) => {
@@ -49,7 +53,8 @@ export const InputFormatter = ({
           .replace(/<\/li>/gm, "\n")
           .replace(/<\/p><p>/gm, "\n")
           .replaceAll(/<\/?(?!\/?strong).*?>/gm, "")
-          .replace(/\&(nbsp;|amp;)/gm, " ");
+          .replace(/\&nbsp;/gm, " ")
+          .replace(/\&amp;/gm, "&");
         setInputValue(valueInput);
         value = unformattedText;
       } else {

package/src/components/atoms/VerticalSideMenuMainPage/index.js

@@ -1,15 +1,18 @@
 import { Container } from "./styles";
 import iconLogoContentoh from "../../../assets/images/verticalSideMenuMainPage/iconLogoContentoh.svg";
 import iconLogo from "../../../assets/images/verticalSideMenuMainPage/iconLogo.svg";
-import openMenu from "../../../assets/images/verticalSideMenuMainPage/openMenu.svg";
-import closeMenu from "../../../assets/images/verticalSideMenuMainPage/closeMenu.svg";
 import React, { useState } from "react";
+import { NavLink } from "react-router-dom";
 
 export const VerticalSideMenuMainPage = ({ menuoption }) => {
-  const [trueBar, setTrueBar] = useState("");
-  let sub;
+  const [trueBar, setTrueBar] = useState();
   return (
-    <Container className={trueBar} bar={trueBar}>
+    <Container
+      className={trueBar}
+      bar={trueBar}
+      onMouseOver={() => setTrueBar(true)}
+      onMouseOut={() => setTrueBar(false)}
+    >
       <div className="navbar-top">
         <img
           src={trueBar ? iconLogoContentoh : iconLogo}
@@ -17,45 +20,29 @@ export const VerticalSideMenuMainPage = ({ menuoption }) => {
           className="logo"
         ></img>
         <div className="option">
-          {menuoption.map((item) => (
-            <>
-              <div
-                className="option-link"
-                exact
-                activeClassName="active"
-                to={item.path}
-              >
-                <img src={item.icon} alt={item.title} width={"25px"}></img>
+          {menuoption.map((item, index) => (
+            <div key={index}>
+              <NavLink to={item.path} className="option-link">
+                <img src={item.icon} alt={item.title}></img>
                 {trueBar && <p>{item.title}</p>}
-              </div>
+              </NavLink>
               {item.suboption === undefined ? (
                 ""
               ) : (
                 <>
-                  {menuoption[1].suboption.map((subitem) => (
+                  {item?.suboption?.map((subitem) => (
                     <div className="sub-option">
-                      <div exact activeClassName="active" to={subitem.path}>
+                      <NavLink to={subitem.path} className="sub-option-link">
                         {trueBar && <p>{subitem.title}</p>}
-                      </div>
+                      </NavLink>
                     </div>
                   ))}
                 </>
               )}
-            </>
+            </div>
           ))}
         </div>
       </div>
-      <div className="menu-bottom">
-        <img
-          src={trueBar ? closeMenu : openMenu}
-          alt="Open Menu"
-          onClick={() => {
-            {
-              trueBar ? setTrueBar("") : setTrueBar("actived");
-            }
-          }}
-        ></img>
-      </div>
     </Container>
   );
 };

package/src/components/atoms/VerticalSideMenuMainPage/styles.js

@@ -1,43 +1,44 @@
 import styled from "styled-components";
-import { NavLink } from "react-router-dom"; 
-//styled(NavLink)
+
 export const Container = styled.div`
-  height: 100%;
-  width: 58px;
+  height: 98%;
   box-sizing: border-box;
   padding: 23px 10px 70px 10px;
   flex-direction: column;
   justify-content: space-between;
   overflow: auto;
-  border-radius: 50px;
+  width: ${({ bar }) => (bar ? 270 : 58)}px;
+  border-radius: ${({ bar }) => (bar ? 20 : 50)}px;
   background: linear-gradient(180deg, #e33aa9 0%, #3b1366 100%);
   scrollbar-width: none;
   display: flex;
   text-align: center;
-  &.actived {
-    width: 200px;
-    padding: 23px 10px 15px 10px;
-    border-radius: 20px;
+  transition: width 0.3s linear;
+  margin: 10px 0 10px 20px;
+  & + * {
+    margin-left: 30px;
   }
   .navbar-top {
-    .logo {
-      & + * {
-        margin-top: ${({ bar }) => (bar === "" ? 145 : 50)}%;
-      }
-    }
+    transition: all 0.3s linear;
     .option {
       display: flex;
       flex-direction: column;
       align-items: flex-start;
+      margin-top: ${({ bar }) => (bar === "" ? 145 : 50)}%;
       padding-left: ${({ bar }) => (bar ? 5 : 0)}px;
-      div {
+      .active {
+        background: #e33aa9;
+      }
+      & + div {
+        margin-top: 5px;
+      }
+      a {
         height: ${({ bar }) => (bar ? 32 : 38)}px;
-        width: ${({ bar }) => (bar ? 165 : 38)}px;
         display: flex;
         justify-content: ${({ bar }) => (bar ? "flex-start" : "center")};
         border-radius: ${({ bar }) => (bar ? 18 : 100)}px;
         align-items: center;
-        font-family: "Raleway";
+        font-family: sans-serif;
         font-style: normal;
         font-weight: 400;
         font-size: 18px;
@@ -47,13 +48,17 @@ export const Container = styled.div`
         text-decoration: none;
         &.option-link {
           cursor: pointer;
-          margin-top: 12px;
+          width: ${({ bar }) => (bar ? "160" : "38")}px;
+          margin: 5px 0;
           padding-left: ${({ bar }) => (bar ? 15 : 0)}px;
         }
         p {
           cursor: pointer;
+          margin: 0%;
+          pointer-events: none;
         }
         img {
+          width: 22px;
           & + * {
             margin-left: 12px;
           }
@@ -68,7 +73,7 @@ export const Container = styled.div`
         padding-left: ${({ bar }) => (bar ? 28 : 20)}px;
         height: auto;
         width: auto;
-        div {
+        a {
           display: flex;
           justify-content: flex-start;
           text-decoration: none;
@@ -77,7 +82,7 @@ export const Container = styled.div`
           border-left: 1px solid #f0eef2;
           border-radius: 0;
           color: #f0eef2;
-          padding-top: 20px;
+          padding-top: 14px;
           padding-left: 12px;
           height: 25px;
           &::before {
@@ -88,16 +93,17 @@ export const Container = styled.div`
             height: 10px;
             background-color: white;
             position: absolute;
-            left: ${({ bar }) => (bar ? -4 : -16)}%;
-            bottom: 1%;
+            bottom: 0;
+            left: ${({ bar }) => (bar ? -4 : -34)}%;
+          }
+          &.active {
+            background: none;
+            &::before {
+              background-color: #e33aa9;
+            }
           }
         }
       }
     }
   }
-  .menu-bottom {
-    display: flex;
-    justify-content: ${({ bar }) => (bar ? "flex-end" : "center")};
-    cursor: pointer;
-  }
-`;
+`;