contentoh-components-library 21.2.9 → 21.2.10

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

@@ -1509,7 +1509,7 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
 
   var validateAll = /*#__PURE__*/function () {
     var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(result) {
-      var _product$id_order2, evaluationArray, sendAll, conceptArray, dataGeneral, productTemp, retailerStatusCopy;
+      var _product$id_order2, evaluationArray, conceptArray, dataGeneral, evalResponse, userType, productTemp, retailerStatusCopy;
 
       return _regenerator.default.wrap(function _callee13$(_context13) {
         while (1) {
@@ -1518,17 +1518,18 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
               _context13.prev = 0;
               setLoading(true);
               evaluationArray = [];
-              sendAll = [];
               conceptArray = ["description", "datasheet", "images"];
               dataGeneral = {
                 articleId: product.id_article,
                 orderId: (_product$id_order2 = product.id_order) !== null && _product$id_order2 !== void 0 ? _product$id_order2 : product.orderId,
-                result: result
+                result: result,
+                isAproved: result === "A"
               };
               servicesData === null || servicesData === void 0 ? void 0 : servicesData.forEach(function (ret) {
                 var service = ret.service,
                     id_retailer = ret.id_retailer;
-                var data = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, dataGeneral), {}, {
+                var data = {};
+                data = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, dataGeneral), {}, {
                   concept: service,
                   retailerId: id_retailer,
                   evalStatus: retailerStatus[id_retailer][service]
@@ -1538,26 +1539,27 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
                     Authorization: token
                   }
                 }));
-                sendAll.push(_axios.default.put("".concat(process.env.REACT_APP_SEND_EVAL), data, {
-                  headers: {
-                    Authorization: token
-                  }
-                }));
               });
-              _context13.next = 9;
-              return Promise.all([].concat(evaluationArray, sendAll));
+              _context13.next = 8;
+              return Promise.all(evaluationArray);
 
-            case 9:
+            case 8:
+              evalResponse = _context13.sent;
+              console.log(evalResponse.map(function (_ref15) {
+                var data = _ref15.data;
+                return JSON.parse(data.body);
+              }));
+              userType = user.is_retailer === 1 ? "CA" : "P";
               productTemp = product;
-              productTemp.article_status = "".concat(result, "CA");
-              productTemp.datasheet_status = productTemp.datasheet_status === "NA" ? "NA" : "".concat(result, "CA");
-              productTemp.description_status = productTemp.description_status === "NA" ? "NA" : "".concat(result, "CA");
-              productTemp.images_status = productTemp.images_status === "NA" ? "NA" : "".concat(result, "CA");
+              productTemp.article_status = "".concat(result).concat(userType);
+              productTemp.datasheet_status = productTemp.datasheet_status === "NA" ? "NA" : "".concat(result).concat(userType);
+              productTemp.description_status = productTemp.description_status === "NA" ? "NA" : "".concat(result).concat(userType);
+              productTemp.images_status = productTemp.images_status === "NA" ? "NA" : "".concat(result).concat(userType);
               retailerStatusCopy = (0, _objectSpread3.default)({}, retailerStatus);
               Object.keys(retailerStatusCopy).forEach(function (key) {
                 conceptArray.forEach(function (concept) {
                   if (retailerStatusCopy[key][concept]) {
-                    retailerStatusCopy[key][concept] = "".concat(result, "CA");
+                    retailerStatusCopy[key][concept] = "".concat(result).concat(userType);
                   }
                 });
               });
@@ -1575,24 +1577,24 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
                 idCategory: productTemp.article.id_category,
                 product: productTemp
               }));
-              _context13.next = 24;
+              _context13.next = 26;
               return loadData();
 
-            case 24:
-              _context13.next = 29;
+            case 26:
+              _context13.next = 31;
               break;
 
-            case 26:
-              _context13.prev = 26;
+            case 28:
+              _context13.prev = 28;
               _context13.t0 = _context13["catch"](0);
               console.log(_context13.t0);
 
-            case 29:
+            case 31:
             case "end":
               return _context13.stop();
           }
         }
-      }, _callee13, null, [[0, 26]]);
+      }, _callee13, null, [[0, 28]]);
     }));
 
     return function validateAll(_x8) {
@@ -1601,7 +1603,7 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
   }();
 
   var evaluationToRetailer = /*#__PURE__*/function () {
-    var _ref15 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14(result) {
+    var _ref16 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14(result) {
       var data, prod, statusComplete;
       return _regenerator.default.wrap(function _callee14$(_context14) {
         while (1) {
@@ -1643,7 +1645,7 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
     }));
 
     return function evaluationToRetailer(_x9) {
-      return _ref15.apply(this, arguments);
+      return _ref16.apply(this, arguments);
     };
   }();
 

package/package.json

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

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

@@ -913,16 +913,17 @@ export const ProviderProductEdition = ({
     try {
       setLoading(true);
       const evaluationArray = [];
-      const sendAll = [];
       const conceptArray = ["description", "datasheet", "images"];
       const dataGeneral = {
         articleId: product.id_article,
         orderId: product.id_order ?? product.orderId,
         result,
+        isAproved: result === "A",
       };
       servicesData?.forEach((ret) => {
         const { service, id_retailer } = ret;
-        const data = {
+        let data = {};
+        data = {
           ...dataGeneral,
           concept: service,
           retailerId: id_retailer,
@@ -935,31 +936,25 @@ export const ProviderProductEdition = ({
             },
           })
         );
-        sendAll.push(
-          axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
-            headers: {
-              Authorization: token,
-            },
-          })
-        );
       });
-
-      await Promise.all([...evaluationArray, ...sendAll]);
+      const evalResponse = await Promise.all(evaluationArray);
+      console.log(evalResponse.map(({ data }) => JSON.parse(data.body)));
+      const userType = user.is_retailer === 1 ? "CA" : "P";
 
       const productTemp = product;
-      productTemp.article_status = `${result}CA`;
+      productTemp.article_status = `${result}${userType}`;
       productTemp.datasheet_status =
-        productTemp.datasheet_status === "NA" ? "NA" : `${result}CA`;
+        productTemp.datasheet_status === "NA" ? "NA" : `${result}${userType}`;
       productTemp.description_status =
-        productTemp.description_status === "NA" ? "NA" : `${result}CA`;
+        productTemp.description_status === "NA" ? "NA" : `${result}${userType}`;
       productTemp.images_status =
-        productTemp.images_status === "NA" ? "NA" : `${result}CA`;
+        productTemp.images_status === "NA" ? "NA" : `${result}${userType}`;
 
       const retailerStatusCopy = { ...retailerStatus };
       Object.keys(retailerStatusCopy).forEach((key) => {
         conceptArray.forEach((concept) => {
           if (retailerStatusCopy[key][concept]) {
-            retailerStatusCopy[key][concept] = `${result}CA`;
+            retailerStatusCopy[key][concept] = `${result}${userType}`;
           }
         });
       });