contentoh-components-library 21.4.73 → 21.4.74

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

@@ -548,7 +548,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
 
   var loadData = /*#__PURE__*/function () {
     var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
-      var _product$article4, _product$article5, _product$article6, _services$, _services$$values, _services;
+      var _product$article4, _product$article5, _product$article6, _services$, _services$$values, _product$retailersAva, _services, data, headers;
 
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
@@ -573,26 +573,39 @@ 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);
+              data = [{
+                id_article: product.article.id_article,
+                id_category: product.article.id_category,
+                version: product.version,
+                id_retailer_array: ((_product$retailersAva = product.retailersAvailable) !== null && _product$retailersAva !== void 0 ? _product$retailersAva : product.retailers).map(function (_ref6) {
+                  var id = _ref6.id;
+                  return id;
+                })
+              }];
+              headers = {
+                Authorization: token
+              };
               (0, _data.getPercentage)({
-                data: [product]
+                data: data,
+                headers: headers
               }).then(function (res) {
-                return setPercentages(res[0]);
+                setPercentages(res[0]);
               });
               setLoading(false);
-              _context3.next = 16;
+              _context3.next = 18;
               break;
 
-            case 13:
-              _context3.prev = 13;
+            case 15:
+              _context3.prev = 15;
               _context3.t0 = _context3["catch"](0);
               console.log(_context3.t0);
 
-            case 16:
+            case 18:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[0, 13]]);
+      }, _callee3, null, [[0, 15]]);
     }));
 
     return function loadData() {
@@ -601,7 +614,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   }();
 
   var getServices = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
+    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4() {
       var _product$article7, _product$article8, _servicesResponse$dat;
 
       var servicesResponse, parsedResponse, retailers, retailerResponse, active;
@@ -634,7 +647,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function getServices() {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
 
@@ -648,7 +661,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   };
 
   var getComments = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
       var _product$article9, _product$article10, _product$article11;
 
       var tab,
@@ -683,7 +696,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function getComments() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
 
@@ -854,7 +867,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   };
 
   var saveDescriptions = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
+    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7() {
       var dataClean, _product$article12, productTemp, articleId, dataObject, res, _JSON$parse2, newStatus, newArticleStatus;
 
       return _regenerator.default.wrap(function _callee7$(_context7) {
@@ -922,12 +935,12 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function saveDescriptions() {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
 
   var saveDatasheets = /*#__PURE__*/function () {
-    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+    var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
       var dataClean, _product$article13, productTemp, articleId, dataObject, res, _JSON$parse3, newStatus, newArticleStatus;
 
       return _regenerator.default.wrap(function _callee8$(_context8) {
@@ -995,7 +1008,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function saveDatasheets() {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
 
@@ -1282,8 +1295,8 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
         break;
     }
 
-    var services = servicesData.filter(function (_ref13) {
-      var service = _ref13.service;
+    var services = servicesData.filter(function (_ref14) {
+      var service = _ref14.service;
       return concepts.includes(service);
     });
     var adminFacilitatorCanEvaluate = services.every(function (srv) {
@@ -1393,7 +1406,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
 
 
   var sendToFacilitator = /*#__PURE__*/function () {
-    var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11(result) {
+    var _ref15 = (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;
 
       return _regenerator.default.wrap(function _callee11$(_context11) {
@@ -1493,7 +1506,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function sendToFacilitator(_x) {
-      return _ref14.apply(this, arguments);
+      return _ref15.apply(this, arguments);
     };
   }();
 
@@ -1524,7 +1537,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   };
 
   var createComment = /*#__PURE__*/function () {
-    var _ref15 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(e, body, tab) {
+    var _ref16 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(e, body, tab) {
       var _product$article16;
 
       var concept, data;
@@ -1581,7 +1594,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function createComment(_x2, _x3, _x4) {
-      return _ref15.apply(this, arguments);
+      return _ref16.apply(this, arguments);
     };
   }();
 
@@ -1659,7 +1672,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   }, [activeTab]);
 
   var commentRevised = /*#__PURE__*/function () {
-    var _ref16 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13() {
+    var _ref17 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13() {
       var data;
       return _regenerator.default.wrap(function _callee13$(_context13) {
         while (1) {
@@ -1689,12 +1702,12 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function commentRevised() {
-      return _ref16.apply(this, arguments);
+      return _ref17.apply(this, arguments);
     };
   }();
 
   var setAssignation = /*#__PURE__*/function () {
-    var _ref17 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14(assignationType, assignationId) {
+    var _ref18 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14(assignationType, assignationId) {
       var _product$article17;
 
       var concept, productTemp, data;
@@ -1753,7 +1766,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function setAssignation(_x5, _x6) {
-      return _ref17.apply(this, arguments);
+      return _ref18.apply(this, arguments);
     };
   }();
 
@@ -1922,7 +1935,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   // };
 
   var validateAll = /*#__PURE__*/function () {
-    var _ref18 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15(result) {
+    var _ref19 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee15(result) {
       var evaluationArray, conceptArray, productTemp;
       return _regenerator.default.wrap(function _callee15$(_context15) {
         while (1) {
@@ -2000,7 +2013,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
     }));
 
     return function validateAll(_x7) {
-      return _ref18.apply(this, arguments);
+      return _ref19.apply(this, arguments);
     };
   }();
 

package/dist/global-files/data.js

@@ -126,46 +126,31 @@ var getPercentage = /*#__PURE__*/function () {
 
             func = /*#__PURE__*/function () {
               var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-                var dataToSend, arrayRetailers, retailers;
+                var _params$headers$Autho, _params$headers;
+
+                var headers;
                 return _regenerator.default.wrap(function _callee2$(_context2) {
                   while (1) {
                     switch (_context2.prev = _context2.next) {
                       case 0:
-                        dataToSend = [];
-                        arrayRetailers = [];
-                        retailers = params.data[0].retailers || params.data[0].retailersAvailable;
-                        params.data.forEach(function (product, i) {
-                          dataToSend.push(product.article ? {
-                            id_article: product.article.id_article,
-                            id_category: product.article.id_category,
-                            version: product.version
-                          } : {
-                            id_article: product.id_article,
-                            id_category: product.id_category,
-                            version: product.version
-                          });
-                          retailers.forEach(function (retailer) {
-                            arrayRetailers.push(retailer.id);
-                          });
-                          dataToSend[i].id_retailer_array = arrayRetailers;
-                        });
-                        _context2.next = 6;
+                        headers = {
+                          Authorization: (_params$headers$Autho = params === null || params === void 0 ? void 0 : (_params$headers = params.headers) === null || _params$headers === void 0 ? void 0 : _params$headers.Authorization) !== null && _params$headers$Autho !== void 0 ? _params$headers$Autho : sessionStorage.getItem("jwt")
+                        };
+                        _context2.next = 3;
                         return _axios.default.post(process.env.REACT_APP_VALID_EXPORT_ENDPOINT, {
-                          data: dataToSend
+                          data: params.data
                         }, {
-                          headers: {
-                            Authorization: sessionStorage.getItem("jwt")
-                          }
+                          headers: headers
                         }).then(function (response) {
                           return [response.data];
                         }).catch(function (err) {
                           return console.log(err, "Errror");
                         });
 
-                      case 6:
+                      case 3:
                         return _context2.abrupt("return", _context2.sent);
 
-                      case 7:
+                      case 4:
                       case "end":
                         return _context2.stop();
                     }

package/package.json

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

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

@@ -21,39 +21,57 @@ ProviderProductEditionDefault.args = {
   category: 287,
   version: 1,
   productSelected: {
-    id_article:39550,
-    upc:43654697,
-    name:"Campana de Cocina",
-    timestamp:"2023-08-04T22:23:40.000Z",
-    categoryName:"Ferretería|Ferretería General|Tornillos, Tuercas y Arandelas",
-    id_category:287,
-    version:1,
-    retailersAvailable:[
-      {name:"The Home Depot Golden","id":58},
-      {name:"The Home Depot Onboarding","id":68}],
-      percentage:"89"
-    },
+    category: "Accesorios Decorativos|Accesorios Decorativos",
+    company_name: "Demo",
+    company_id: 923,
+    id_category: "2028",
+    id_article: 118465,
+    name: "VELA AROMA 18 OZ MAN/CAN",
+    upc: "Modelo6",
+    isVisible: 1,
+    retailers: [
+      {
+        id: 68,
+        name: "The Home Depot Onboarding",
+      },
+    ],
+    version: 1,
+    retailersAvailable: [
+      {
+        id: 68,
+        name: "The Home Depot Onboarding",
+      },
+    ],
+  },
   productToEdit: {
-    idCategory:287,
-    ArticleId:39550,
-    product:[{
-      id_article:39550,
-      upc:43654697,
-      name:"Campana de Cocina",
-      timestamp:"2023-08-04T22:23:40.000Z",
-      categoryName:"Ferretería|Ferretería General|Tornillos, Tuercas y Arandelas",
-      id_category:287,
-      version:1,
-      retailersAvailable:[
-        {name:"The Home Depot Golden",
-        id:58,
-        percentage:100},
-        {name:"The Home Depot Onboarding",
-        id:68,
-        percentage:78}
-      ],
-      percentage:"89"}] 
-    },
+    idCategory: "2028",
+    ArticleId: 118465,
+    product: [
+      {
+        category: "Accesorios Decorativos|Accesorios Decorativos",
+        company_name: "Demo",
+        company_id: 923,
+        id_category: "2028",
+        id_article: 118465,
+        name: "VELA AROMA 18 OZ MAN/CAN",
+        upc: "Modelo6",
+        isVisible: 1,
+        retailers: [
+          {
+            id: 68,
+            name: "The Home Depot Onboarding",
+          },
+        ],
+        version: 1,
+        retailersAvailable: [
+          {
+            id: 68,
+            name: "The Home Depot Onboarding",
+          },
+        ],
+      },
+    ],
+  },
   location: {
     pathname: "/EditProducts",
     search: "",
@@ -66,57 +84,66 @@ ProviderProductEditionDefault.args = {
     key: "24vwut",
   },
   user: {
-    id_user:191,
-    name:"Demo",
-    last_name:"Demo",
-    email:"merchants24feb@allfreemail.net",
-    position:"Test",
-    telephone:"+52123456789",
-    country:"México",
-    id_company:923,
-    id_cognito:"c3cd160c-76c2-497c-9357-5ef949307e1e",
-    birth_Date:null,
-    about_me:null,
-    zip_code:null,
-    address:null,
-    job:null,
-    id_stripe:null,
-    id_role:0,
-    active:1,
-    is_retailer:0,
-    email_notify:1,
-    is_user_tech:null,
-    membership:
-    {id:114,
-      start_date:"2023-02-24T18:14:43.000Z",
-      end_date:"2024-02-24T18:14:43.000Z",
-      planID:8,
-      plan:"prod_KtlhECVSFG2iro",
-      name:"Plan Pro",
-      user_limit:"50",
-      products_limit:"5000",
-      type:"Enterprise"},
-      src:"https://content-management-profile.s3.amazonaws.com/id-191/191.png?1697171804447"},
+    id_user: 191,
+    name: "Demo",
+    last_name: "Demo",
+    email: "merchants24feb@allfreemail.net",
+    position: "Test",
+    telephone: "+52123456789",
+    country: "México",
+    id_company: 923,
+    id_cognito: "c3cd160c-76c2-497c-9357-5ef949307e1e",
+    birth_Date: null,
+    about_me: null,
+    zip_code: null,
+    address: null,
+    job: null,
+    id_stripe: null,
+    id_role: 0,
+    active: 1,
+    is_retailer: 0,
+    email_notify: 1,
+    is_user_tech: null,
+    membership: {
+      id: 114,
+      start_date: "2023-02-24T18:14:43.000Z",
+      end_date: "2024-02-24T18:14:43.000Z",
+      planID: 8,
+      plan: "prod_KtlhECVSFG2iro",
+      name: "Plan Pro",
+      user_limit: "50",
+      products_limit: "5000",
+      type: "Enterprise",
+    },
+    src: "https://content-management-profile.s3.amazonaws.com/id-191/191.png?1701729602068",
+  },
   company: {
-    id_company:923,
-    trade_name:"Demo",
-    company_name:"Demo",
-    rfc:"Demo",
-    adress:"Demo",
-    about_company:null,
-    telephone:null,
-    web_site:null,
-    zip_code:null,
-    email:null,
-    social_link:null,
-    is_retailer:0,
-    financedRetailers:
-    [{id:68,
-      name:"The Home Depot Onboarding",
-      country:"México",
-      id_region:1,
-      active:1,
-      flow:1}],
-      retailers:[{id:68,name:"The Home Depot Onboarding",country:"México",id_region:1,"active":1,flow:1}]},
+    id_company: 923,
+    trade_name: "Demo",
+    company_name: "Demo",
+    rfc: "Demo",
+    adress: "Demo",
+    about_company: null,
+    telephone: null,
+    web_site: null,
+    zip_code: null,
+    email: null,
+    social_link: null,
+    is_retailer: 0,
+    financedRetailers: [
+      {
+        id: 68,
+        name: "The Home Depot Onboarding",
+        country: "México",
+      },
+    ],
+    retailers: [
+      {
+        id: 68,
+        name: "The Home Depot Onboarding",
+        country: "México",
+      },
+    ],
+  },
   showSurvey: (v) => v && alert("se muestra"),
 };

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

@@ -78,19 +78,26 @@ const reducerImages = (state, action) => {
       );
       return { ...state, values };
     case "orderImages": {
-      let { inputsByRetailer, valuesInitial, inputsInitial, inputs } = state;
+      let {
+        inputsByRetailer = {},
+        valuesInitial,
+        inputsInitial,
+        inputs,
+      } = state;
       try {
         const orderedImages = [];
         const imageIdArray = [];
-        if (action?.retailerId && !inputsByRetailer[action.retailerId])
+        if (action?.retailerId && !inputsByRetailer[action.retailerId]) {
           inputsByRetailer[action.retailerId] = [];
-        action.retailerId &&
+        }
+        if (action.retailerId) {
           inputsByRetailer[action.retailerId]?.filter((input) => {
             imageIdArray.push(input.id_image);
             valuesInitial.forEach((value) => {
               if (value.image_id === input.id_image) orderedImages.push(value);
             });
           });
+        }
 
         inputs = inputsInitial?.filter((input) =>
           imageIdArray.includes(input.id)
@@ -98,7 +105,7 @@ const reducerImages = (state, action) => {
 
         values = orderedImages.length > 0 ? orderedImages : [];
       } catch (error) {
-        console.log(error);
+        console.log(action.action, error);
       }
       return { ...state, values, inputs };
     }
@@ -502,7 +509,20 @@ export const ProviderProductEdition = ({
 
     setImages({ action: "init", init: services[2] });
     if (services[2]?.values?.length > 0) setActiveImage(0);
-    getPercentage({ data: [product] }).then((res) => setPercentages(res[0]));
+    const data = [
+      {
+        id_article: product.id_article,
+        id_category: product.id_category,
+        version: product.version,
+        id_retailer_array: (
+          product.retailersAvailable ?? product.retailers
+        ).map(({ id }) => id),
+      },
+    ];
+    const headers = { Authorization: token };
+    getPercentage({ data, headers }).then((res) => {
+      setPercentages(res[0]);
+    });
     setLoading(false);
   };
 
@@ -560,12 +580,14 @@ export const ProviderProductEdition = ({
   };
 
   const getCart = async () => {
-    const res = await axios.get(process.env.REACT_APP_CART, {
+    const res = await axios.get(`${process.env.REACT_APP_CART}/general/`, {
       headers: {
         Authorization: token,
       },
     });
-    const arr = JSON.parse(res.data.body).data.map((e) => e.article_id);
+    const arr = Object.values(JSON.parse(res.data.body).data)
+      ?.map((e) => e.article_id)
+      .filter(Boolean);
     setInCart(arr.some((e) => e.articleId === product.id_article));
   };
 
@@ -663,7 +685,7 @@ export const ProviderProductEdition = ({
       value: e?.id,
       name: e?.name,
       required: e?.required,
-      active: images?.values.some((value) => value?.image_id === e?.id),
+      active: images?.values?.some((value) => value?.image_id === e?.id),
     }));
     setSocketType(imageInputs);
   }, [images]);
@@ -707,7 +729,7 @@ export const ProviderProductEdition = ({
           attributeId,
           value: valueOfAtribute,
           boxId,
-        })
+        });
       });
     });
 
@@ -715,8 +737,8 @@ export const ProviderProductEdition = ({
       articleId: product?.id_article,
       articleData: updatedDatasheets,
       ...(parseBoxData.length > 0 && { boxData: parseBoxData }),
-    };   
-    
+    };
+
     if (product?.orderId) dataObject["orderId"] = product?.orderId;
     try {
       const res = await axios.put(
@@ -735,8 +757,7 @@ export const ProviderProductEdition = ({
       }
     } catch (error) {
       console.log(error);
-    } 
-    console.log(dataObject)
+    }
   };
 
   const updateImages = useCallback(async () => {
@@ -1181,13 +1202,6 @@ export const ProviderProductEdition = ({
     }
   };
 
-
-
-
-
-
-
-
   const evaluationToRetailer = async (result) => {
     const data = {
       articleId: product.id_article,
@@ -1269,7 +1283,6 @@ export const ProviderProductEdition = ({
     },
   ];
   const sendToEvaluation = (result) => {
-    console.log({ result });
     if (result === "A") {
       if (
         origin[activeTab] === "RequestWithoutContentoh" &&