npm - contentoh-components-library - Versions diffs - 21.2.8 → 21.2.11 - Mend

contentoh-components-library 21.2.8 → 21.2.11

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

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

@@ -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);
     };
   }();
@@ -2069,7 +2071,8 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
       setVersion: setVersion,
       companyName: company.company_name,
       currentVersion: version,
-      setShowCreateVersion: setShowCreateVersion
+      setShowCreateVersion: setShowCreateVersion,
+      setShowVersionSelector: setShowVersionSelector
     }), showCreateVersion && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CreateVersion.CreateVersion, {
       idArticle: product.id_article,
       version: version,

package/dist/components/pages/RetailerProductEdition/RetailerProductEdition.stories.js CHANGED Viewed

@@ -33,57 +33,63 @@ RetailerProductEditionDefault.args = {
   },
   token: "eyJraWQiOiJEV3owZnNieXg2MXNFcVduN3RCXC81bVhod3ZNbFZIOTgwUnZcL3RjT0lKdEk9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIwYjY2YTRhOS03NzkwLTQwMzQtYTMwYS1jMDA4MDg5NjI4NjciLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfbFN6UVo0WjdSIiwiY29nbml0bzp1c2VybmFtZSI6IjBiNjZhNGE5LTc3OTAtNDAzNC1hMzBhLWMwMDgwODk2Mjg2NyIsImF1ZCI6IjUyZDlza2tkY2c4cWpwODhvb2sxdXNlNm1rIiwiZXZlbnRfaWQiOiIzNmIxMmUwMy0xOWJhLTRiMDktYWJiYS1kZjk3ZTFkNThjZTQiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY2MDE4MjgzNywibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY2MDE4NjQzNywiaWF0IjoxNjYwMTgyODM3LCJlbWFpbCI6ImJheWFkaTE1MzhAbW5xbG0uY29tIn0.MM9nIHkrRIS2o8_s4BR6VTLgyw3ryvPrr-mf6RtnQ4smng2Q3fmtK07zInNcvcrv8EXO5J9z47_NZ5MOJDo1Pz1CV2cOYM7PT5tEn3F-W4SitqDbBw3KxfkqSMxdZUIHLWECGL-u2ATCYU2J4KRVQi8XSP1qbfv1hu9dh-vID8Fq641ccQwEqUDC13pshDPlR08legg7AAPJqoilV7wuvxqTYAK6fGqMS5jcdW2iDmU0ti9gkydXkYRIC-jg446VOmRCpwzKsk4UAPwlrGeodQ0LV1bfWn_-KVspWCRQd6U5WbFxHn0umYe3CvvPpyVmHzD3F_EMxaVyqV5aW5IoIQ",
   productSelected: {
-    "services": {
-      "datasheets": 1,
-      "descriptions": 1,
-      "images": 1
+    services: {
+      datasheets: 1,
+      descriptions: 1,
+      images: 1
     },
-    "orderId": 1810,
-    "status": "RP",
-    "datasheet_status": "RP",
-    "prio": "none",
-    "version": 2,
-    "description_status": "RP",
-    "images_status": "RP",
-    "article": {
-      "id_article": 68934,
-      "id_category": "2290",
-      "name": "SCOTCHBLUE  3PACK MASKING TAPE 24MMX55M",
-      "upc": "167907",
-      "timestamp": "2022-06-22T15:44:57.000Z",
-      "id_user": 704,
-      "status": "NULL",
-      "active": 1,
-      "company_id": 437,
-      "SKU": null,
-      "Descripcion": null,
-      "Proveedor": null,
-      "id_proveedor": 0,
-      "company_name": "",
-      "country": null,
-      "id_order": 1810,
-      "id_datasheet_especialist": 1248,
-      "id_datasheet_facilitator": 1252,
-      "id_description_especialist": 1248,
-      "id_description_facilitator": 1252,
-      "id_images_especialist": 1251,
-      "id_images_facilitator": 1286,
-      "id_auditor": 514,
-      "id_recepcionist": null,
-      "category": "Pinturas|Herramientas y accesorios para pintar|Cintas",
-      "missingAttributes": null,
-      "missingDescriptions": null,
-      "missingImages": null
+    orderId: 2611,
+    status: "CA",
+    datasheet_status: "CA",
+    prio: "none",
+    version: 2,
+    description_status: "CA",
+    images_status: "IE",
+    article: {
+      id_article: 79722,
+      id_category: "165",
+      name: "FS SUAVITEL Utra 8L CLB",
+      upc: "7509546684116",
+      timestamp: "2022-08-22T18:59:35.000Z",
+      id_user: 1258,
+      status: "NULL",
+      active: 1,
+      company_id: 226,
+      SKU: null,
+      Descripcion: null,
+      Proveedor: null,
+      id_proveedor: 0,
+      company_name: "COLGATE PALMOLIVE S.A. DE C.V.",
+      country: null,
+      id_order: 2611,
+      id_datasheet_especialist: 334,
+      id_datasheet_facilitator: 158,
+      id_description_especialist: 334,
+      id_description_facilitator: 158,
+      id_images_especialist: 366,
+      id_images_facilitator: 160,
+      id_auditor: 9,
+      id_recepcionist: null,
+      category: "Consumibles|Productos de Limpieza y Lavandería|Suavizantes",
+      missingAttributes: -44,
+      missingDescriptions: 0,
+      missingImages: 8
     },
-    "retailers": [{
-      "id": 58,
-      "name": "The Home Depot Golden",
-      "country": "México",
-      "id_region": 1,
-      "active": 1
+    retailers: [{
+      id: 3,
+      name: "Sam´s Club",
+      country: "México",
+      id_region: 1,
+      active: 1
+    }, {
+      id: 43,
+      name: "City Club",
+      country: "México",
+      id_region: 1,
+      active: 1
     }],
-    "country": null,
-    "upc": "167907"
+    country: null,
+    upc: "7509546684116"
   },
   location: {
     product: {
@@ -92,7 +98,7 @@ RetailerProductEditionDefault.args = {
     }
   },
   user: {
-    id_user: 1248,
+    id_user: 334,
     name: "Facilitador Textos",
     last_name: " ",
     email: "bayadi1538@mnqlm.com",

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

@@ -1098,11 +1098,11 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     switch (userId) {
       case 7:
       case 8:
-        return statusArray.includes(srvActive) && (["RA", "RC"].includes(product === null || product === void 0 ? void 0 : product.status) || srv.filter(function (serv) {
+        return statusArray.includes(srvActive) && statusArray.includes(product === null || product === void 0 ? void 0 : product.status) || srv.filter(function (serv) {
           var _serv$status;
-          return ["CA"].includes((_serv$status = serv.status) === null || _serv$status === void 0 ? void 0 : _serv$status.replace(/.*\//, ""));
-        }).length === srv.length);
+          return statusArray.includes((_serv$status = serv.status) === null || _serv$status === void 0 ? void 0 : _serv$status.replace(/.*\//, ""));
+        }).length === srv.length;
       case 4:
       case 5:

package/package.json CHANGED Viewed

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

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

@@ -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}`;
           }
         });
       });
@@ -1494,6 +1489,7 @@ export const ProviderProductEdition = ({
           companyName={company.company_name}
           currentVersion={version}
           setShowCreateVersion={setShowCreateVersion}
+          setShowVersionSelector={setShowVersionSelector}
         />
       )}
       {showCreateVersion && (

package/src/components/pages/RetailerProductEdition/RetailerProductEdition.stories.js CHANGED Viewed

@@ -18,65 +18,72 @@ RetailerProductEditionDefault.args = {
   token:
     "eyJraWQiOiJEV3owZnNieXg2MXNFcVduN3RCXC81bVhod3ZNbFZIOTgwUnZcL3RjT0lKdEk9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIwYjY2YTRhOS03NzkwLTQwMzQtYTMwYS1jMDA4MDg5NjI4NjciLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfbFN6UVo0WjdSIiwiY29nbml0bzp1c2VybmFtZSI6IjBiNjZhNGE5LTc3OTAtNDAzNC1hMzBhLWMwMDgwODk2Mjg2NyIsImF1ZCI6IjUyZDlza2tkY2c4cWpwODhvb2sxdXNlNm1rIiwiZXZlbnRfaWQiOiIzNmIxMmUwMy0xOWJhLTRiMDktYWJiYS1kZjk3ZTFkNThjZTQiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY2MDE4MjgzNywibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY2MDE4NjQzNywiaWF0IjoxNjYwMTgyODM3LCJlbWFpbCI6ImJheWFkaTE1MzhAbW5xbG0uY29tIn0.MM9nIHkrRIS2o8_s4BR6VTLgyw3ryvPrr-mf6RtnQ4smng2Q3fmtK07zInNcvcrv8EXO5J9z47_NZ5MOJDo1Pz1CV2cOYM7PT5tEn3F-W4SitqDbBw3KxfkqSMxdZUIHLWECGL-u2ATCYU2J4KRVQi8XSP1qbfv1hu9dh-vID8Fq641ccQwEqUDC13pshDPlR08legg7AAPJqoilV7wuvxqTYAK6fGqMS5jcdW2iDmU0ti9gkydXkYRIC-jg446VOmRCpwzKsk4UAPwlrGeodQ0LV1bfWn_-KVspWCRQd6U5WbFxHn0umYe3CvvPpyVmHzD3F_EMxaVyqV5aW5IoIQ",
   productSelected: {
-    "services": {
-        "datasheets": 1,
-        "descriptions": 1,
-        "images": 1
+    services: {
+      datasheets: 1,
+      descriptions: 1,
+      images: 1,
     },
-    "orderId": 1810,
-    "status": "RP",
-    "datasheet_status": "RP",
-    "prio": "none",
-    "version": 2,
-    "description_status": "RP",
-    "images_status": "RP",
-    "article": {
-        "id_article": 68934,
-        "id_category": "2290",
-        "name": "SCOTCHBLUE  3PACK MASKING TAPE 24MMX55M",
-        "upc": "167907",
-        "timestamp": "2022-06-22T15:44:57.000Z",
-        "id_user": 704,
-        "status": "NULL",
-        "active": 1,
-        "company_id": 437,
-        "SKU": null,
-        "Descripcion": null,
-        "Proveedor": null,
-        "id_proveedor": 0,
-        "company_name": "",
-        "country": null,
-        "id_order": 1810,
-        "id_datasheet_especialist": 1248,
-        "id_datasheet_facilitator": 1252,
-        "id_description_especialist": 1248,
-        "id_description_facilitator": 1252,
-        "id_images_especialist": 1251,
-        "id_images_facilitator": 1286,
-        "id_auditor": 514,
-        "id_recepcionist": null,
-        "category": "Pinturas|Herramientas y accesorios para pintar|Cintas",
-        "missingAttributes": null,
-        "missingDescriptions": null,
-        "missingImages": null
+    orderId: 2611,
+    status: "CA",
+    datasheet_status: "CA",
+    prio: "none",
+    version: 2,
+    description_status: "CA",
+    images_status: "IE",
+    article: {
+      id_article: 79722,
+      id_category: "165",
+      name: "FS SUAVITEL Utra 8L CLB",
+      upc: "7509546684116",
+      timestamp: "2022-08-22T18:59:35.000Z",
+      id_user: 1258,
+      status: "NULL",
+      active: 1,
+      company_id: 226,
+      SKU: null,
+      Descripcion: null,
+      Proveedor: null,
+      id_proveedor: 0,
+      company_name: "COLGATE PALMOLIVE S.A. DE C.V.",
+      country: null,
+      id_order: 2611,
+      id_datasheet_especialist: 334,
+      id_datasheet_facilitator: 158,
+      id_description_especialist: 334,
+      id_description_facilitator: 158,
+      id_images_especialist: 366,
+      id_images_facilitator: 160,
+      id_auditor: 9,
+      id_recepcionist: null,
+      category: "Consumibles|Productos de Limpieza y Lavandería|Suavizantes",
+      missingAttributes: -44,
+      missingDescriptions: 0,
+      missingImages: 8,
     },
-    "retailers": [
-        {
-            "id": 58,
-            "name": "The Home Depot Golden",
-            "country": "México",
-            "id_region": 1,
-            "active": 1
-        }
+    retailers: [
+      {
+        id: 3,
+        name: "Sam´s Club",
+        country: "México",
+        id_region: 1,
+        active: 1,
+      },
+      {
+        id: 43,
+        name: "City Club",
+        country: "México",
+        id_region: 1,
+        active: 1,
+      },
     ],
-    "country": null,
-    "upc": "167907"
-},
+    country: null,
+    upc: "7509546684116",
+  },
   location: {
     product: { articleId: 109485, versionId: 3 },
   },
   user: {
-    id_user: 1248,
+    id_user: 334,
     name: "Facilitador Textos",
     last_name: " ",
     email: "bayadi1538@mnqlm.com",

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

@@ -645,11 +645,11 @@ export const RetailerProductEdition = ({
       case 7:
       case 8:
         return (
-          statusArray.includes(srvActive) &&
-          (["RA", "RC"].includes(product?.status) ||
-            srv.filter((serv) =>
-              ["CA"].includes(serv.status?.replace(/.*\//, ""))
-            ).length === srv.length)
+          (statusArray.includes(srvActive) &&
+            statusArray.includes(product?.status)) ||
+          srv.filter((serv) =>
+            statusArray.includes(serv.status?.replace(/.*\//, ""))
+          ).length === srv.length
         );
       case 4:
       case 5: