contentoh-components-library 21.4.27 → 21.4.29

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

@@ -37,7 +37,7 @@ var _GalleryElement = require("../../molecules/GalleryElement");
 
 var _fileSaver = require("file-saver");
 
-var _data2 = require("../../../global-files/data");
+var _data = require("../../../global-files/data");
 
 var _GalleryHeader = require("../../molecules/GalleryHeader");
 
@@ -541,7 +541,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
               }
 
               _context2.next = 3;
-              return (0, _data2.getRetailerServices)(product === null || product === void 0 ? void 0 : (_product$article = product.article) === null || _product$article === void 0 ? void 0 : _product$article.id_article, product === null || product === void 0 ? void 0 : (_product$article2 = product.article) === null || _product$article2 === void 0 ? void 0 : _product$article2.category, parseInt(product === null || product === void 0 ? void 0 : (_product$article3 = product.article) === null || _product$article3 === void 0 ? void 0 : _product$article3.id_category), auditableVersion.version);
+              return (0, _data.getRetailerServices)(product === null || product === void 0 ? void 0 : (_product$article = product.article) === null || _product$article === void 0 ? void 0 : _product$article.id_article, product === null || product === void 0 ? void 0 : (_product$article2 = product.article) === null || _product$article2 === void 0 ? void 0 : _product$article2.category, parseInt(product === null || product === void 0 ? void 0 : (_product$article3 = product.article) === null || _product$article3 === void 0 ? void 0 : _product$article3.id_category), auditableVersion.version);
 
             case 3:
               _auditServices = _context2.sent;
@@ -581,7 +581,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
             case 0:
               _context3.prev = 0;
               _context3.next = 3;
-              return (0, _data2.getRetailerServices)(product === null || product === void 0 ? void 0 : (_product$article4 = product.article) === null || _product$article4 === void 0 ? void 0 : _product$article4.id_article, product === null || product === void 0 ? void 0 : (_product$article5 = product.article) === null || _product$article5 === void 0 ? void 0 : _product$article5.category, parseInt(product === null || product === void 0 ? void 0 : (_product$article6 = product.article) === null || _product$article6 === void 0 ? void 0 : _product$article6.id_category), version);
+              return (0, _data.getRetailerServices)(product === null || product === void 0 ? void 0 : (_product$article4 = product.article) === null || _product$article4 === void 0 ? void 0 : _product$article4.id_article, product === null || product === void 0 ? void 0 : (_product$article5 = product.article) === null || _product$article5 === void 0 ? void 0 : _product$article5.category, parseInt(product === null || product === void 0 ? void 0 : (_product$article6 = product.article) === null || _product$article6 === void 0 ? void 0 : _product$article6.id_category), version);
 
             case 3:
               _services = _context3.sent;
@@ -598,7 +598,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
                 init: _services[2]
               });
               if (((_services$ = _services[2]) === null || _services$ === void 0 ? void 0 : (_services$$values = _services$.values) === null || _services$$values === void 0 ? void 0 : _services$$values.length) > 0) setActiveImage(0);
-              (0, _data2.getPercentage)({
+              (0, _data.getPercentage)({
                 data: [product]
               }).then(function (res) {
                 return setPercentages(res[0]);
@@ -723,7 +723,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
             getComments();
             _context6.t0 = setUserGroups;
             _context6.next = 6;
-            return (0, _data2.fetchUsers)(token);
+            return (0, _data.fetchUsers)(token);
 
           case 6:
             _context6.t1 = _context6.sent;
@@ -1347,7 +1347,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
 
   var sendToFacilitator = /*#__PURE__*/function () {
     var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11(result) {
-      var concept, productTemp, evalStatus, articleId, orderId, data, res, _message, specialistDone, _JSON$parse5, newStatus, newOrderStatus, newArticleStatus, messageToChat, _data;
+      var concept, productTemp, evalStatus, articleId, orderId, body, res, _message, specialistDone, _JSON$parse5, newStatus, newOrderStatus, newArticleStatus, messageToChat, data;
 
       return _regenerator.default.wrap(function _callee11$(_context11) {
         while (1) {
@@ -1360,22 +1360,24 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
               evalStatus = retailerStatus;
               articleId = product.article.id_article;
               orderId = product.orderId;
-              data = {
-                articleId: articleId,
-                orderId: orderId,
-                concept: concept,
-                evalStatus: evalStatus,
-                retailerId: activeRetailer.id
+              body = {
+                orderArticleRetailers: [{
+                  orderId: orderId,
+                  articleId: articleId,
+                  retailersIds: [activeRetailer.id]
+                }],
+                isAproved: false,
+                service: concept
               };
 
               if (!result) {
-                _context11.next = 16;
+                _context11.next = 17;
                 break;
               }
 
-              data.result = result;
+              body.isAproved = result === "A";
               _context11.next = 12;
-              return _axios.default.put("".concat(process.env.REACT_APP_EVALUATION_ENDPOINT), data, {
+              return _axios.default.post("".concat(process.env.REACT_APP_EVALUATION_REFACTOR), body, {
                 headers: {
                   Authorization: token
                 }
@@ -1383,11 +1385,12 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
 
             case 12:
               res = _context11.sent;
+              console.log(JSON.parse(res.data.body), "res");
               getServices();
-              _context11.next = 21;
+              _context11.next = 22;
               break;
 
-            case 16:
+            case 17:
               specialistDone = ["RC", "RA", "CA"].includes(evalStatus);
 
               if (specialistDone) {
@@ -1398,25 +1401,25 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
                 getSectionIcon();
               }
 
-              _context11.next = 20;
-              return _axios.default.put("".concat(process.env.REACT_APP_SEND_EVAL), data, {
+              _context11.next = 21;
+              return _axios.default.post("".concat(process.env.REACT_APP_EVALUATION_REFACTOR), body, {
                 headers: {
                   Authorization: token
                 }
               });
 
-            case 20:
+            case 21:
               res = _context11.sent;
 
-            case 21:
+            case 22:
               if (!(res.data.statusCode === 200)) {
-                _context11.next = 34;
+                _context11.next = 35;
                 break;
               }
 
               _JSON$parse5 = JSON.parse(res.data.body), newStatus = _JSON$parse5.newStatus, newOrderStatus = _JSON$parse5.newOrderStatus, newArticleStatus = _JSON$parse5.newArticleStatus;
               messageToChat = (0, _utils.createMessage)(product.retailers, activeRetailer.id, evalStatus, newStatus, activeTab);
-              _data = {
+              data = {
                 paramsBody: {
                   id: product.article.id_article,
                   version: version,
@@ -1431,38 +1434,38 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
                   Authorization: token
                 }
               };
-              _context11.next = 27;
-              return (0, _utils.sendMessage)(_data);
+              _context11.next = 28;
+              return (0, _utils.sendMessage)(data);
 
-            case 27:
+            case 28:
               if (newOrderStatus) productTemp.status = newArticleStatus[articleId];
               productTemp["".concat(concept, "_status")] = newStatus;
-              _context11.next = 31;
+              _context11.next = 32;
               return loadData();
 
-            case 31:
+            case 32:
               if (_message) setMessage(_message);
               sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
               setProduct(productTemp);
 
-            case 34:
-              _context11.next = 39;
+            case 35:
+              _context11.next = 40;
               break;
 
-            case 36:
-              _context11.prev = 36;
+            case 37:
+              _context11.prev = 37;
               _context11.t0 = _context11["catch"](1);
               console.log(_context11.t0);
 
-            case 39:
+            case 40:
               setLoading(false);
 
-            case 40:
+            case 41:
             case "end":
               return _context11.stop();
           }
         }
-      }, _callee11, null, [[1, 36]]);
+      }, _callee11, null, [[1, 37]]);
     }));
 
     return function sendToFacilitator(_x) {
@@ -1818,7 +1821,8 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
 
   var validateAll = /*#__PURE__*/function () {
     var _ref18 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15(result) {
-      var evaluationArray, conceptArray, messages, productTemp, messagesResponse;
+      var _product$id_order, evaluationArray, conceptArray, messages, body, productTemp, messagesResponse;
+
       return _regenerator.default.wrap(function _callee15$(_context15) {
         while (1) {
           switch (_context15.prev = _context15.next) {
@@ -1826,7 +1830,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
               _context15.prev = 0;
               setLoading(true);
               evaluationArray = [];
-              conceptArray = [];
+              conceptArray = ["description", "datasheet", "images"];
               _context15.t0 = user.id_role;
               _context15.next = _context15.t0 === 4 ? 7 : _context15.t0 === 5 ? 9 : 11;
               break;
@@ -1846,38 +1850,28 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
             case 13:
               messages = [];
               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: ret.status,
-                    retailerId: ret.id_retailer
-                  };
-
-                  if (product["".concat(ret.service, "_status")] !== "NS") {
-                    var _message2 = (0, _utils.createMessage)(product.retailers, ret.id_retailer, product["".concat(ret.service, "_status")], "".concat(result, "A"), ret.service);
-
-                    messages.push(createComment([{
-                      type: "status",
-                      value: _message2
-                    }], ret.id_retailer));
+                if (!retailersIds.includes(ret.id_retailer)) retailersIds.push(ret.id_retailer);
+              });
+              body = {
+                orderArticleRetailers: [{
+                  orderId: (_product$id_order = product.id_order) !== null && _product$id_order !== void 0 ? _product$id_order : product.orderId,
+                  articleId: product.article.id_article,
+                  retailersIds: retailersIds
+                }],
+                isAproved: isAproved
+              };
+              conceptArray.forEach(function (concept) {
+                body.service = concept;
+                evaluationArray.push(_axios.default.post("".concat(process.env.REACT_APP_EVALUATION_REFACTOR), body, {
+                  headers: {
+                    Authorization: token
                   }
-
-                  evaluationArray.push(_axios.default.put("".concat(process.env.REACT_APP_EVALUATION_ENDPOINT), data, {
-                    headers: {
-                      Authorization: token
-                    }
-                  }));
-                }
+                }));
               });
-              _context15.next = 17;
+              _context15.next = 19;
               return Promise.all(evaluationArray);
 
-            case 17:
+            case 19:
               productTemp = product;
               productTemp.status = "".concat(result, "A");
               productTemp.datasheet_status = productTemp.datasheet_status === "NS" ? "NS" : "".concat(result, "A");
@@ -1885,29 +1879,29 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
               productTemp.images_status = productTemp.images_status === "NS" ? "NS" : "".concat(result, "A");
               sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
               setProduct(productTemp);
-              _context15.next = 26;
+              _context15.next = 28;
               return Promise.all(messages);
 
-            case 26:
+            case 28:
               messagesResponse = _context15.sent;
-              _context15.next = 29;
+              _context15.next = 31;
               return loadData();
 
-            case 29:
-              _context15.next = 34;
+            case 31:
+              _context15.next = 36;
               break;
 
-            case 31:
-              _context15.prev = 31;
+            case 33:
+              _context15.prev = 33;
               _context15.t1 = _context15["catch"](0);
               console.log(_context15.t1);
 
-            case 34:
+            case 36:
             case "end":
               return _context15.stop();
           }
         }
-      }, _callee15, null, [[0, 31]]);
+      }, _callee15, null, [[0, 33]]);
     }));
 
     return function validateAll(_x4) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentoh-components-library",
-  "version": "21.4.27",
+  "version": "21.4.29",
   "dependencies": {
     "@aws-amplify/auth": "^4.5.3",
     "@aws-amplify/datastore": "^3.11.0",
@@ -16,8 +16,8 @@
     "@mui/material": "^5.12.0",
     "@mui/styled-engine-sc": "^5.12.0",
     "@storybook/addon-postcss": "^2.0.0",
-    "@stripe/react-stripe-js": "^2.1.1",
-    "@stripe/stripe-js": "^1.54.1",
+    "@stripe/react-stripe-js": "^2.2.0",
+    "@stripe/stripe-js": "^2.1.4",
     "@testing-library/jest-dom": "^5.11.4",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^12.1.10",

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

@@ -1,6 +1,6 @@
 import { Container } from "./styles";
 import { CheckBox } from "../CheckBox";
-import { CardCvcElement, useStripe } from "@stripe/react-stripe-js";
+import { useStripe } from "@stripe/react-stripe-js";
 
 export const Card = ({
   card = {},

package/src/components/molecules/StripeCardForm/StripeCardForm.stories.js

@@ -10,4 +10,5 @@ export const StripeCardFormDefault = Template.bind({});
 StripeCardFormDefault.args = {
   customerId: "cus_KuEt6R6vwmN09f",
   jwt: "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJmNTkyN2Y4ZS1jYmY3LTQ5MjItOWUwOS1lNjllYzBiMjczMWEiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6ImY1OTI3ZjhlLWNiZjctNDkyMi05ZTA5LWU2OWVjMGIyNzMxYSIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiI5ZjQzNjAwMC0wYzgyLTRjNzYtYWEzNi1kM2Q1NGJjZTZiMTMiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY4NTU2OTUyMywibmFtZSI6IklzbWFlbCBMb3BleiIsInBob25lX251bWJlciI6Iis1MjMxMTEzNjYzMzYiLCJleHAiOjE2ODU1NzMxMjMsImlhdCI6MTY4NTU2OTUyMywiZW1haWwiOiJpbG9wZXpAY29udGVudG9oLmNvbSJ9.EotcxmtkUpBxwlXa3bo25iLAmRcT0kj1G3PVITVB_0ZtF8UC19rJIMTNSc1hYkl8cbfCuB_vkjYCAxi4b2SOru5MdMTRhgNjcQTVbiwIYww-QdUWq0WSv84nW_HaRoxCJ8ezm-wBZgUTpcD3VFuynUICbODKKHUfxVdKdVoAM6GGE6ymSbO7-0C7ZumoWEqaZ22BF4G1H-JvLkR-tL5iqXa2N-QCnNoteFmHstBfH6Sp5UZhPav1VBEGRmwdFfUnC-Xc-aNeIFwgWCXMsOXFWbbmWeh0uNF-Btu-QEJ7VkCu4pbElqHWJKBYLCx1zqDBrKrsrNxyvQlxsJ9NSOae8Q",
+  isSelected: true,
 };

package/src/components/molecules/StripeCardForm/index.js

@@ -12,6 +12,8 @@ export const StripeCardForm = ({
   setStripe,
   setModalErrorCard,
   setMsj,
+  isSelected = false,
+  onClick,
 }) => {
   const [stripeLoaded, setStripeLoaded] = useState(false);
 
@@ -24,7 +26,7 @@ export const StripeCardForm = ({
   }, []);
 
   return stripeLoaded ? (
-    <Container>
+    <Container onClick={() => onClick && onClick()}>
       <Elements stripe={stripeApiKey}>
         <PaymentForm
           labelForm={"Pago con tarjeta"}
@@ -33,6 +35,7 @@ export const StripeCardForm = ({
           setStripe={setStripe}
           setModalErrorCard={setModalErrorCard}
           setMsj={setMsj}
+          isSelected={isSelected}
         />
       </Elements>
     </Container>

package/src/components/molecules/StripeCardForm/paymentForm.js

@@ -16,6 +16,7 @@ export const PaymentForm = ({
   setStripe,
   setModalErrorCard,
   setMsj,
+  isSelected = false,
 }) => {
   const stripe = useStripe();
   const elements = useElements();
@@ -86,7 +87,7 @@ export const PaymentForm = ({
   };
 
   return (
-    <PaymentFormContainer>
+    <PaymentFormContainer isSelected={isSelected}>
       <h2>{labelForm}</h2>
       <div className="card-fields">
         <div className="element card-name">

package/src/components/molecules/StripeCardForm/styles.js

@@ -12,7 +12,7 @@ export const PaymentFormContainer = styled.form`
     font-size: 15px;
     line-height: 20px;
     color: #262626;
-    font-family: ${FontFamily.Lato};
+    font-family: ${FontFamily.RobotoMedium};
 
     & + * {
       margin-top: 10px;
@@ -70,4 +70,5 @@ export const PaymentFormContainer = styled.form`
       }
     }
   }
+  ${({ isSelected }) => isSelected && `border-color: #E33AA9;`}
 `;

package/src/components/molecules/StripeCardSelector/index.js

@@ -7,7 +7,13 @@ import { Card } from "../../atoms/Card";
 import { Loading } from "../../atoms/Loading";
 const stripeApiKey = loadStripe(`${process.env.REACT_APP_KEY_STRIPE}`);
 
-export const CardSelector = ({ jwt, setCard, setStripe }) => {
+export const CardSelector = ({
+  jwt,
+  setCard,
+  setStripe,
+  isSelected = false,
+  onClick,
+}) => {
   const [stripeLoaded, setStripeLoaded] = useState(false);
   const [cards, setCards] = useState([]);
   const [selectedCard, setSelectedCard] = useState("");
@@ -18,12 +24,19 @@ export const CardSelector = ({ jwt, setCard, setStripe }) => {
     const cardsResponse = await getAllCards(jwt);
     setCards(cardsResponse);
   };
+
   useEffect(() => {
-    loadStripeJS();
+    // loadStripeJS();
+    stripeApiKey.then(() => {
+      setStripeLoaded(true);
+      getAllCards(jwt).then((cardsResponse) => {
+        setCards(cardsResponse);
+      });
+    });
   }, []);
 
   return stripeLoaded ? (
-    <Container>
+    <Container isSelected={isSelected} onClick={() => onClick && onClick()}>
       <h2>Tarjetas guardadas</h2>
       <Elements stripe={stripeApiKey}>
         {cards.map((card) => (

package/src/components/molecules/StripeCardSelector/styles.js

@@ -1,4 +1,6 @@
 import styled from "styled-components";
 import { PaymentFormContainer } from "../StripeCardForm/styles";
 
-export const Container = styled(PaymentFormContainer)``;
+export const Container = styled(PaymentFormContainer)`
+  ${({ isSelected }) => isSelected && `border-color: #E33AA9;`}
+`;

package/src/components/organisms/Chat/ContentChat/styles.js

@@ -38,7 +38,6 @@ export const Container = styled.div`
       color: #808080;
     }
   }
-
   @media (max-width: 600px) {
     min-width: 300px;
   }

package/src/components/organisms/Chat/Footer/styles.js

@@ -65,6 +65,10 @@ export const Container = styled.div`
     overflow: hidden;
     padding: 0px;
   }
+
+  @media (max-width: 600px) { 
+    width: 90%;
+  }
 `;
 
 export const ContainerMain = styled.div`

package/src/components/organisms/Chat/styles.js

@@ -12,7 +12,7 @@ export const ContainerFixed = styled.div`
   border: 1px solid #f0f0f0;
   z-index: 1000;
   padding: 0px;
-  @media (max-width: 1024px) { 
+  @media (max-width: 1024px) {
     width: auto;
     max-width: 100%;
   }