contentoh-components-library 21.1.95 → 21.1.96

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

@@ -179,7 +179,7 @@ var reducerImages = function reducerImages(state, action) {
         inputs = inputsInitial === null || inputsInitial === void 0 ? void 0 : inputsInitial.filter(function (input) {
           return imageIdArray.includes(input.id);
         });
-        values = orderedImages.length > 0 ? orderedImages : valuesInitial;
+        values = orderedImages.length > 0 ? orderedImages : [];
         return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, state), {}, {
           values: values,
           inputs: inputs
@@ -548,8 +548,10 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
               services = _context2.sent;
               //Converts the data inside the datasheets object to array
               setServices(services);
-              getServices();
+              _context2.next = 6;
+              return getServices();
 
+            case 6:
               if (!originProp) {
                 setActiveRetailer(product !== null && product !== void 0 && product.retailers ? product === null || product === void 0 ? void 0 : product.retailers[0] : product === null || product === void 0 ? void 0 : product.retailersAvailable[0]);
               } // setActiveRetailer(product?.retailers[0]);
@@ -567,7 +569,7 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
               });
               setLoading(false);
 
-            case 10:
+            case 11:
             case "end":
               return _context2.stop();
           }
@@ -584,7 +586,7 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
     var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3() {
       var _product$article4;
 
-      var productInOrder, idArticle, _product$id_order, _servicesResponse$dat, servicesResponse, parsedResponse, retailerResponse, retailers, active;
+      var productInOrder, idArticle, retailers, active, _product$id_order, _servicesResponse$dat, servicesResponse, parsedResponse, retailerResponse;
 
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
@@ -592,29 +594,32 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
             case 0:
               productInOrder = product.id_order || product.orderId;
               idArticle = (product === null || product === void 0 ? void 0 : product.id_article) || (product === null || product === void 0 ? void 0 : (_product$article4 = product.article) === null || _product$article4 === void 0 ? void 0 : _product$article4.id_article);
+              retailers = product.retailers || product.retailersAvailable;
+              active = null;
 
               if (!(isRevision() || productInOrder)) {
                 _context3.next = 12;
                 break;
               }
 
-              _context3.next = 5;
+              _context3.next = 7;
               return _axios.default.get("".concat(process.env.REACT_APP_SERVICES_ENDPOINT, "?articleId=").concat(idArticle, "&orderId=").concat((_product$id_order = product === null || product === void 0 ? void 0 : product.id_order) !== null && _product$id_order !== void 0 ? _product$id_order : product.orderId, "&end=true"));
 
-            case 5:
+            case 7:
               servicesResponse = _context3.sent;
               parsedResponse = JSON.parse(servicesResponse === null || servicesResponse === void 0 ? void 0 : (_servicesResponse$dat = servicesResponse.data) === null || _servicesResponse$dat === void 0 ? void 0 : _servicesResponse$dat.body).data;
               retailerResponse = parsedResponse === null || parsedResponse === void 0 ? void 0 : parsedResponse.map(function (srv) {
                 return srv.id_retailer;
               });
-              retailers = product.retailers || product.retailersAvailable;
               active = retailers === null || retailers === void 0 ? void 0 : retailers.find(function (retailer) {
                 return retailerResponse.includes(retailer.id);
               });
-              !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
               setServicesData(parsedResponse);
 
             case 12:
+              !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
+
+            case 13:
             case "end":
               return _context3.stop();
           }

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

@@ -157,7 +157,7 @@ var reducerImages = function reducerImages(state, action) {
         inputs = inputsInitial === null || inputsInitial === void 0 ? void 0 : inputsInitial.filter(function (input) {
           return imageIdArray.includes(input.id);
         });
-        values = orderedImages.length > 0 ? orderedImages : valuesInitial;
+        values = orderedImages.length > 0 ? orderedImages : [];
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
           values: values,
           inputs: inputs

package/package.json

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

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

@@ -97,7 +97,7 @@ const reducerImages = (state, action) => {
         imageIdArray.includes(input.id)
       );
 
-      values = orderedImages.length > 0 ? orderedImages : valuesInitial;
+      values = orderedImages.length > 0 ? orderedImages : [];
       return { ...state, values, inputs };
     }
     default:
@@ -263,7 +263,7 @@ export const ProviderProductEdition = ({
 
     //Converts the data inside the datasheets object to array
     setServices(services);
-    getServices();
+    await getServices();
 
     if (!originProp) {
       setActiveRetailer(
@@ -284,6 +284,8 @@ export const ProviderProductEdition = ({
   const getServices = async () => {
     const productInOrder = product.id_order || product.orderId;
     const idArticle = product?.id_article || product?.article?.id_article;
+    let retailers = product.retailers || product.retailersAvailable;
+    let active = null;
     if (isRevision() || productInOrder) {
       const servicesResponse = await axios.get(
         `${
@@ -294,13 +296,12 @@ export const ProviderProductEdition = ({
       );
       const parsedResponse = JSON.parse(servicesResponse?.data?.body).data;
       const retailerResponse = parsedResponse?.map((srv) => srv.id_retailer);
-      let retailers = product.retailers || product.retailersAvailable;
-      let active = retailers?.find((retailer) =>
+      active = retailers?.find((retailer) =>
         retailerResponse.includes(retailer.id)
       );
-      !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
       setServicesData(parsedResponse);
     }
+    !activeRetailer.id && setActiveRetailer(active ? active : retailers[0]);
   };
 
   const isRevision = () => {

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

@@ -87,7 +87,7 @@ const reducerImages = (state, action) => {
         imageIdArray.includes(input.id)
       );
 
-      values = orderedImages.length > 0 ? orderedImages : valuesInitial;
+      values = orderedImages.length > 0 ? orderedImages : [];
       return { ...state, values, inputs };
     }
     default: