contentoh-components-library 21.5.56 → 21.5.58

package/dist/components/atoms/Commentary/index.js

@@ -15,6 +15,9 @@ var Commentary = function Commentary(_ref) {
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.Container, {
     reviewed: reviewed,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
+      style: {
+        whiteSpace: "pre-wrap"
+      },
       children: comment
     })
   });

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

@@ -917,7 +917,7 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
 
   var loadData = /*#__PURE__*/function () {
     var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
-      var _ref7, _ref8, _product$categoryReta, _product$categoryReta2, _product$categoryReta3, _product$article, _product$article$cate, _product$article2, _product$article2$cat, _product$article3, _product$article4, _activeRetailer$id, _product$article5, _services$, _services$$values, _product$article6;
+      var _ref7, _ref8, _product$categoryReta, _product$categoryReta2, _product$categoryReta3, _product$article, _product$article$cate, _product$article2, _product$article2$cat, _product$article3, _product$article4, _product$article5, _services$, _services$$values, _product$article6;
 
       var categoryRetailer, categoryName, categoryId, category_name, category_id, retailer_id, services, data, headers;
       return _regenerator.default.wrap(function _callee8$(_context8) {
@@ -942,7 +942,7 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
 
               category_name = categoryName !== null && categoryName !== void 0 ? categoryName : (product === null || product === void 0 ? void 0 : (_product$article3 = product.article) === null || _product$article3 === void 0 ? void 0 : _product$article3.company_name) || (product === null || product === void 0 ? void 0 : product.categoryName);
               category_id = categoryId !== null && categoryId !== void 0 ? categoryId : parseInt((product === null || product === void 0 ? void 0 : (_product$article4 = product.article) === null || _product$article4 === void 0 ? void 0 : _product$article4.id_category) || (product === null || product === void 0 ? void 0 : product.id_category));
-              retailer_id = (_activeRetailer$id = activeRetailer === null || activeRetailer === void 0 ? void 0 : activeRetailer.id) !== null && _activeRetailer$id !== void 0 ? _activeRetailer$id : categoryRetailer === null || categoryRetailer === void 0 ? void 0 : categoryRetailer.id_retailer; // console.log({
+              retailer_id = (activeRetailer === null || activeRetailer === void 0 ? void 0 : activeRetailer.id) || (categoryRetailer === null || categoryRetailer === void 0 ? void 0 : categoryRetailer.retailer_id) || (categoryRetailer === null || categoryRetailer === void 0 ? void 0 : categoryRetailer.id_retailer); // console.log({
               //   categoryName,
               //   categoryId,
               //   category_name,
@@ -2486,34 +2486,53 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
         label: "Aceptar",
         size: 12,
         onClick: /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee21() {
-          var body, messages, container, existingAlert, alert;
+          var elements, brCounter, container, existingAlert, alert, fullMessage;
           return _regenerator.default.wrap(function _callee21$(_context21) {
             while (1) {
               switch (_context21.prev = _context21.next) {
                 case 0:
-                  body = document.querySelector("#modal-message-box .ql-container .ql-editor > p").innerHTML;
-                  messages = [{
-                    type: "message",
-                    value: body === null || body === void 0 ? void 0 : body.replace(/<.*?\/?>/gm, "")
-                  }];
-
-                  if (!(messages[0].value.length === 0 || !messages[0].value.trim())) {
-                    _context21.next = 13;
+                  elements = document.querySelectorAll("#modal-message-box .ql-container .ql-editor > p");
+
+                  if (!(!elements || elements.length === 0)) {
+                    _context21.next = 4;
                     break;
                   }
 
-                  container = document.querySelector(".container-customComponent"); // Verificar si ya existe una alerta
+                  console.error("Elemento no encontrado");
+                  return _context21.abrupt("return");
+
+                case 4:
+                  brCounter = 0;
+                  elements.forEach(function (el) {
+                    var body = el.innerHTML;
+
+                    if (typeof body !== "string") {
+                      console.log("El contenido de body no es una cadena", body);
+                      isMessageEmpty = true;
+                      return;
+                    }
+
+                    if (!body || body.replace(/<.*?\/?>/gm, "").trim() === "") {
+                      brCounter++;
+                    }
+                  });
+
+                  if (!(brCounter === elements.length)) {
+                    _context21.next = 17;
+                    break;
+                  }
 
+                  container = document.querySelector(".container-customComponent");
                   existingAlert = container.querySelector(".alert-error");
 
                   if (!existingAlert) {
-                    _context21.next = 7;
+                    _context21.next = 11;
                     break;
                   }
 
                   return _context21.abrupt("return");
 
-                case 7:
+                case 11:
                   // Crear alerta con estilos
                   alert = document.createElement("div");
                   alert.className = "alert-error";
@@ -2522,16 +2541,21 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
                   container.appendChild(alert);
                   return _context21.abrupt("return");
 
-                case 13:
-                  console.log("Mensaje de rechazo:", messages);
-                  _context21.next = 16;
-                  return createComment(messages[0].value);
+                case 17:
+                  fullMessage = "";
+                  elements.forEach(function (element) {
+                    var body = element.innerHTML;
+                    fullMessage += body;
+                  });
+                  fullMessage = fullMessage.replace(/<br\s*\/?>/gi, "\n");
+                  _context21.next = 22;
+                  return createComment(fullMessage);
 
-                case 16:
+                case 22:
                   validatedAll ? validateAll("R") : sendToEvaluation("R");
                   setShowRejectModal(false);
 
-                case 18:
+                case 24:
                 case "end":
                   return _context21.stop();
               }

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

@@ -295,7 +295,7 @@ var myBucket = new _awsSdk.default.S3({
 });
 
 var RetailerProductEdition = function RetailerProductEdition(_ref3) {
-  var _product$retailers, _location$state, _location$state2, _product$services2, _datasheets$, _datasheets$$data, _product$article22, _comment$message;
+  var _product$retailers, _location$state, _location$state2, _product$services2, _datasheets$, _datasheets$$data, _product$article22;
 
   var tabsSections = _ref3.tabsSections,
       _ref3$productSelected = _ref3.productSelected,
@@ -2485,7 +2485,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref3) {
           }) : /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
             className: "feedback-box",
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Commentary.Commentary, {
-              comment: comment === null || comment === void 0 ? void 0 : (_comment$message = comment.message) === null || _comment$message === void 0 ? void 0 : _comment$message.replace(/<.*?\/?>/gm, ""),
+              comment: comment === null || comment === void 0 ? void 0 : comment.message,
               reviewed: crossComment
             }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_GeneralButton.Button, {
               buttonType: "circular-button accept-button",
@@ -2562,14 +2562,14 @@ var RetailerProductEdition = function RetailerProductEdition(_ref3) {
         size: 12,
         onClick: /*#__PURE__*/function () {
           var _ref28 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee23(e) {
-            var element, body, container, existingAlert, alert;
+            var elements, brCounter, container, existingAlert, alert, fullMessage;
             return _regenerator.default.wrap(function _callee23$(_context23) {
               while (1) {
                 switch (_context23.prev = _context23.next) {
                   case 0:
-                    element = document.querySelector("#modal-message-box .ql-container .ql-editor > p");
+                    elements = document.querySelectorAll("#modal-message-box .ql-container .ql-editor > p");
 
-                    if (element) {
+                    if (!(!elements || elements.length === 0)) {
                       _context23.next = 4;
                       break;
                     }
@@ -2578,34 +2578,37 @@ var RetailerProductEdition = function RetailerProductEdition(_ref3) {
                     return _context23.abrupt("return");
 
                   case 4:
-                    body = element.innerHTML;
-
-                    if (!(typeof body !== "string")) {
-                      _context23.next = 8;
-                      break;
-                    }
-
-                    console.error("El contenido de body no es una cadena", body);
-                    return _context23.abrupt("return");
-
-                  case 8:
-                    if (!(!body || body.replace(/<.*?\/?>/gm, "").trim() === "")) {
-                      _context23.next = 19;
+                    brCounter = 0;
+                    elements.forEach(function (el) {
+                      var body = el.innerHTML;
+
+                      if (typeof body !== "string") {
+                        console.log("El contenido de body no es una cadena", body);
+                        isMessageEmpty = true;
+                        return;
+                      }
+
+                      if (!body || body.replace(/<.*?\/?>/gm, "").trim() === "") {
+                        brCounter++;
+                      }
+                    });
+
+                    if (!(brCounter === elements.length)) {
+                      _context23.next = 17;
                       break;
                     }
 
-                    container = document.querySelector(".container-customComponent"); // Verificar si ya existe una alerta
-
+                    container = document.querySelector(".container-customComponent");
                     existingAlert = container.querySelector(".alert-error");
 
                     if (!existingAlert) {
-                      _context23.next = 13;
+                      _context23.next = 11;
                       break;
                     }
 
                     return _context23.abrupt("return");
 
-                  case 13:
+                  case 11:
                     // Crear alerta con estilos
                     alert = document.createElement("div");
                     alert.className = "alert-error";
@@ -2614,16 +2617,22 @@ var RetailerProductEdition = function RetailerProductEdition(_ref3) {
                     container.appendChild(alert);
                     return _context23.abrupt("return");
 
-                  case 19:
-                    _context23.next = 21;
-                    return createComment(e, body, activeTab);
-
-                  case 21:
+                  case 17:
+                    fullMessage = "";
+                    elements.forEach(function (element) {
+                      var body = element.innerHTML;
+                      fullMessage += body;
+                    });
+                    fullMessage = fullMessage.replace(/<br\s*\/?>/gi, "\n");
+                    _context23.next = 22;
+                    return createComment(e, fullMessage, activeTab);
+
+                  case 22:
                     valRejAll ? validateAll("R") : sendToFacilitator("R");
                     setMessage("Rechazado");
                     setShowRejectModal(false);
 
-                  case 24:
+                  case 25:
                   case "end":
                     return _context23.stop();
                 }

package/package.json

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

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

@@ -3,7 +3,7 @@ import { Container } from "./styles";
 export const Commentary = ({ comment, reviewed }) => {
   return (
     <Container reviewed={reviewed}>
-      <p>{comment}</p>
+      <p style={{ whiteSpace: "pre-wrap" }}>{comment}</p>
     </Container>
   );
 };

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

@@ -522,7 +522,10 @@ export const ProviderProductEdition = ({
       categoryId ??
       parseInt(product?.article?.id_category || product?.id_category);
 
-    const retailer_id = activeRetailer?.id ?? categoryRetailer?.id_retailer;
+    const retailer_id =
+      activeRetailer?.id ||
+      categoryRetailer?.retailer_id ||
+      categoryRetailer?.id_retailer;
 
     // console.log({
     //   categoryName,
@@ -1864,22 +1867,36 @@ export const ProviderProductEdition = ({
               label={"Aceptar"}
               size={12}
               onClick={async () => {
-                const body = document.querySelector(
+                const elements = document.querySelectorAll(
                   "#modal-message-box .ql-container .ql-editor > p"
-                ).innerHTML;
-                const messages = [
-                  { type: "message", value: body?.replace(/<.*?\/?>/gm, "") },
-                ];
-
-                if (
-                  messages[0].value.length === 0 ||
-                  !messages[0].value.trim()
-                ) {
+                );
+
+                if (!elements || elements.length === 0) {
+                  console.error("Elemento no encontrado");
+                  return;
+                }
+
+                let brCounter = 0;
+
+                elements.forEach((el) => {
+                  const body = el.innerHTML;
+
+                  if (typeof body !== "string") {
+                    console.log("El contenido de body no es una cadena", body);
+                    isMessageEmpty = true;
+                    return;
+                  }
+
+                  if (!body || body.replace(/<.*?\/?>/gm, "").trim() === "") {
+                    brCounter++;
+                  }
+                });
+
+                if (brCounter === elements.length) {
                   const container = document.querySelector(
                     ".container-customComponent"
                   );
 
-                  // Verificar si ya existe una alerta
                   const existingAlert = container.querySelector(".alert-error");
                   if (existingAlert) {
                     return; // Si ya existe, no crear otra
@@ -1910,8 +1927,17 @@ export const ProviderProductEdition = ({
                   container.appendChild(alert);
                   return;
                 }
-                console.log("Mensaje de rechazo:", messages);
-                await createComment(messages[0].value);
+
+                let fullMessage = "";
+
+                elements.forEach((element) => {
+                  const body = element.innerHTML;
+
+                  fullMessage += body;
+                });
+
+                fullMessage = fullMessage.replace(/<br\s*\/?>/gi, "\n");
+                await createComment(fullMessage);
                 validatedAll ? validateAll("R") : sendToEvaluation("R");
                 setShowRejectModal(false);
               }}

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

@@ -1783,7 +1783,7 @@ export const RetailerProductEdition = ({
                 ) : (
                   <div className="feedback-box">
                     <Commentary
-                      comment={comment?.message?.replace(/<.*?\/?>/gm, "")}
+                      comment={comment?.message}
                       reviewed={crossComment}
                     />
                     <Button
@@ -1880,28 +1880,36 @@ export const RetailerProductEdition = ({
               label={"Aceptar"}
               size={12}
               onClick={async (e) => {
-                const element = document.querySelector(
+                const elements = document.querySelectorAll(
                   "#modal-message-box .ql-container .ql-editor > p"
                 );
 
-                if (!element) {
+                if (!elements || elements.length === 0) {
                   console.error("Elemento no encontrado");
                   return;
                 }
 
-                const body = element.innerHTML;
+                let brCounter = 0;
 
-                if (typeof body !== "string") {
-                  console.error("El contenido de body no es una cadena", body);
-                  return;
-                }
+                elements.forEach((el) => {
+                  const body = el.innerHTML;
+
+                  if (typeof body !== "string") {
+                    console.log("El contenido de body no es una cadena", body);
+                    isMessageEmpty = true;
+                    return;
+                  }
+
+                  if (!body || body.replace(/<.*?\/?>/gm, "").trim() === "") {
+                    brCounter++;
+                  }
+                });
 
-                if (!body || body.replace(/<.*?\/?>/gm, "").trim() === "") {
+                if (brCounter === elements.length) {
                   const container = document.querySelector(
                     ".container-customComponent"
                   );
 
-                  // Verificar si ya existe una alerta
                   const existingAlert = container.querySelector(".alert-error");
                   if (existingAlert) {
                     return; // Si ya existe, no crear otra
@@ -1933,7 +1941,17 @@ export const RetailerProductEdition = ({
                   return;
                 }
 
-                await createComment(e, body, activeTab);
+                let fullMessage = "";
+
+                elements.forEach((element) => {
+                  const body = element.innerHTML;
+
+                  fullMessage += body;
+                });
+
+                fullMessage = fullMessage.replace(/<br\s*\/?>/gi, "\n");
+
+                await createComment(e, fullMessage, activeTab);
                 valRejAll ? validateAll("R") : sendToFacilitator("R");
                 setMessage("Rechazado");
                 setShowRejectModal(false);