contentoh-components-library 21.5.71 → 21.5.72

package/dist/components/pages/RetailerProductEdition/context/provider-product-edition.context.js

@@ -310,9 +310,9 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
 
   var updateImages = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(token) {
-      var _state$product7, _state$images_values, _state$product8, _state$product9, _data$articleData, _data$updateImages;
+      var _state$images_values, _state$product7, _state$product8, _state$product9, _data$articleData, _data$updateImages;
 
-      var updatedImages, data, valid, promiseArray, res;
+      var updatedImages, attrForImgs, generalAttrs, retailerKey, retailerAttrs, mergedAttrs, data, valid, promiseArray, res;
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
           switch (_context3.prev = _context3.next) {
@@ -326,14 +326,33 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
 
             case 2:
               updatedImages = state.updated_images_values;
+              attrForImgs = ((_state$images_values = state.images_values) === null || _state$images_values === void 0 ? void 0 : _state$images_values.attrForImgs) || {};
+              generalAttrs = attrForImgs.general || [];
+              retailerKey = Object.keys(attrForImgs).find(function (key) {
+                return key !== "general";
+              });
+              retailerAttrs = retailerKey ? attrForImgs[retailerKey] : [];
+              mergedAttrs = retailerAttrs.map(function (retailerAttr) {
+                var generalAttr = generalAttrs.find(function (g) {
+                  return g.id === retailerAttr.id;
+                });
+
+                if (generalAttr && generalAttr.value !== retailerAttr.value) {
+                  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, retailerAttr), {}, {
+                    value: generalAttr.value
+                  });
+                }
+
+                return retailerAttr;
+              });
               data = {
                 articleId: (_state$product7 = state.product) === null || _state$product7 === void 0 ? void 0 : _state$product7.id_article,
-                attrReqImgs: Object.values((_state$images_values = state.images_values) === null || _state$images_values === void 0 ? void 0 : _state$images_values.attrForImgs).slice(0, -1).map(function (e) {
-                  var _e$, _e$0$value, _e$2;
+                attrReqImgs: mergedAttrs.map(function (e) {
+                  var _e$value;
 
                   return {
-                    attrId: (_e$ = e[0]) === null || _e$ === void 0 ? void 0 : _e$.id,
-                    value: (_e$0$value = (_e$2 = e[0]) === null || _e$2 === void 0 ? void 0 : _e$2.value) !== null && _e$0$value !== void 0 ? _e$0$value : ""
+                    attrId: e.id,
+                    value: (_e$value = e.value) !== null && _e$value !== void 0 ? _e$value : ""
                   };
                 }),
                 articleData: state.images_values.values.filter(function (e) {
@@ -354,7 +373,7 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
               });
 
               if (!valid) {
-                _context3.next = 33;
+                _context3.next = 38;
                 break;
               }
 
@@ -373,7 +392,7 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
                   isApproved: true
                 });
               });
-              _context3.prev = 11;
+              _context3.prev = 16;
               promiseArray = data.articleData.map(function (e) {
                 var file = Buffer.from(e.src.replace(/^data:image\/\w+;base64,/, ""), "base64");
                 var params = {
@@ -384,10 +403,10 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
                 };
                 return myBucket.putObject(params).promise();
               });
-              _context3.next = 15;
+              _context3.next = 20;
               return Promise.all(promiseArray);
 
-            case 15:
+            case 20:
               // Eliminar el buffer base64 antes de enviar al endpoint para evitar error 413
               data.articleData = data.articleData.map(function (_ref5) {
                 var src = _ref5.src,
@@ -399,7 +418,7 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
                     rest = (0, _objectWithoutProperties2.default)(_ref6, _excluded2);
                 return rest;
               });
-              _context3.next = 19;
+              _context3.next = 24;
               return _axios.default.put(process.env.REACT_APP_ARTICLE_DATA_ENDPOINT, data, {
                 params: {
                   image: true,
@@ -410,7 +429,7 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
                 }
               });
 
-            case 19:
+            case 24:
               res = _context3.sent;
 
               if (res.data.statusCode === 200) {
@@ -418,10 +437,6 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
                 dispatch({
                   type: "SET_UPDATED_IMAGES_VALUES",
                   payload: []
-                });
-                dispatch({
-                  type: "SET_UPDATED_ATTR_FOR_IMGS",
-                  payload: []
                 }); // Mostrar modal de éxito
 
                 dispatch({
@@ -435,12 +450,12 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
                 });
               }
 
-              _context3.next = 28;
+              _context3.next = 33;
               break;
 
-            case 23:
-              _context3.prev = 23;
-              _context3.t0 = _context3["catch"](11);
+            case 28:
+              _context3.prev = 28;
+              _context3.t0 = _context3["catch"](16);
               console.log(_context3.t0);
               dispatch({
                 type: "SET_ERRORS",
@@ -456,19 +471,19 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
                 }
               });
 
-            case 28:
-              _context3.prev = 28;
+            case 33:
+              _context3.prev = 33;
               dispatch({
                 type: "SET_SAVING",
                 payload: false
               });
-              return _context3.finish(28);
+              return _context3.finish(33);
 
-            case 31:
-              _context3.next = 34;
+            case 36:
+              _context3.next = 39;
               break;
 
-            case 33:
+            case 38:
               dispatch({
                 type: "SET_MODAL",
                 payload: {
@@ -479,12 +494,12 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
                 }
               });
 
-            case 34:
+            case 39:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[11, 23, 28, 31]]);
+      }, _callee3, null, [[16, 28, 33, 36]]);
     }));
 
     return function updateImages(_x3) {
@@ -519,11 +534,11 @@ var ProviderProductEditionProvider = function ProviderProductEditionProvider(_re
               data = {
                 articleId: (_state$product10 = state.product) === null || _state$product10 === void 0 ? void 0 : _state$product10.id_article,
                 attrReqImgs: attrForImgs.map(function (e) {
-                  var _e$value;
+                  var _e$value2;
 
                   return {
                     attrId: e.id,
-                    value: (_e$value = e.value) !== null && _e$value !== void 0 ? _e$value : "-"
+                    value: (_e$value2 = e.value) !== null && _e$value2 !== void 0 ? _e$value2 : "-"
                   };
                 }),
                 articleData: [],

package/package.json

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

package/src/components/pages/RetailerProductEdition/context/provider-product-edition.context.jsx

@@ -231,14 +231,27 @@ export const ProviderProductEditionProvider = ({ children }) => {
     if (state.updated_images_values.length === 0) return;
     const updatedImages = state.updated_images_values;
 
+    const attrForImgs = state.images_values?.attrForImgs || {};
+    const generalAttrs = attrForImgs.general || [];
+    const retailerKey = Object.keys(attrForImgs).find(
+      (key) => key !== "general",
+    );
+    const retailerAttrs = retailerKey ? attrForImgs[retailerKey] : [];
+
+    const mergedAttrs = retailerAttrs.map((retailerAttr) => {
+      const generalAttr = generalAttrs.find((g) => g.id === retailerAttr.id);
+      if (generalAttr && generalAttr.value !== retailerAttr.value) {
+        return { ...retailerAttr, value: generalAttr.value };
+      }
+      return retailerAttr;
+    });
+
     const data = {
       articleId: state.product?.id_article,
-      attrReqImgs: Object.values(state.images_values?.attrForImgs)
-        .slice(0, -1)
-        .map((e) => ({
-          attrId: e[0]?.id,
-          value: e[0]?.value ?? "",
-        })),
+      attrReqImgs: mergedAttrs.map((e) => ({
+        attrId: e.id,
+        value: e.value ?? "",
+      })),
       articleData: state.images_values.values.filter((e) => !e.id),
       updateImages: state.images_values.values.filter((e) => e.id),
     };
@@ -306,11 +319,6 @@ export const ProviderProductEditionProvider = ({ children }) => {
             type: "SET_UPDATED_IMAGES_VALUES",
             payload: [],
           });
-          dispatch({
-            type: "SET_UPDATED_ATTR_FOR_IMGS",
-            payload: [],
-          });
-
           // Mostrar modal de éxito
           dispatch({
             type: "SET_MODAL",