contentoh-components-library 21.5.96 → 21.5.98

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

@@ -243,16 +243,24 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
           type: "SET_PRODUCT",
           payload: productNormalized
         });
-        dispatch({
-          type: "SET_ACTIVE_RETAILER",
-          payload: productNormalized.categoryRetailer[0]
-        });
-        var firstRetailerStatus = productNormalized.statusByRetailer[productNormalized.categoryRetailerInOrder[0].id_retailer];
-        var initialTab = firstRetailerStatus.description ? "Descripción" : firstRetailerStatus.datasheet ? "Ficha técnica" : firstRetailerStatus.images ? "Imágenes" : "Imágenes";
-        dispatch({
-          type: "SET_ACTIVE_TAB",
-          payload: initialTab
-        });
+
+        if (productNormalized.categoryRetailerInOrder.length > 0 && productNormalized.statusByRetailer) {
+          dispatch({
+            type: "SET_ACTIVE_RETAILER",
+            payload: productNormalized.categoryRetailerInOrder[0]
+          });
+          var firstRetailerStatus = productNormalized.statusByRetailer[productNormalized.categoryRetailerInOrder[0].id_retailer];
+          var initialTab = firstRetailerStatus.description ? "Descripción" : firstRetailerStatus.datasheet ? "Ficha técnica" : firstRetailerStatus.images ? "Imágenes" : "Imágenes";
+          dispatch({
+            type: "SET_ACTIVE_TAB",
+            payload: initialTab
+          });
+        } else {
+          dispatch({
+            type: "SET_ACTIVE_RETAILER",
+            payload: productNormalized.categoryRetailer[0]
+          });
+        }
       } catch (error) {
         console.log("Error setting product data: ", error);
       }
@@ -275,7 +283,7 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
 
     var fetchData = /*#__PURE__*/function () {
       var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee2() {
-        var _JSON$parse$0$relatio, _JSON$parse, _JSON$parse$, _percentageRes$, data, headers, _yield$Promise$all, _yield$Promise$all2, services, percentageRes, servicesDataRes, percentages, orderMap, orderedValues, updatedStatusByRetailer;
+        var _JSON$parse$0$relatio, _JSON$parse, _JSON$parse$, _percentageRes$, _services$2$inputsByR, _services$2$values, data, headers, _yield$Promise$all, _yield$Promise$all2, services, percentageRes, servicesDataRes, percentages, orderMap, orderedValues, updatedStatusByRetailer;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
@@ -315,11 +323,11 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
                 percentageRes = _yield$Promise$all2[1];
                 servicesDataRes = _yield$Promise$all2[2];
                 percentages = (_JSON$parse$0$relatio = (_JSON$parse = JSON.parse(percentageRes === null || percentageRes === void 0 ? void 0 : (_percentageRes$ = percentageRes[0]) === null || _percentageRes$ === void 0 ? void 0 : _percentageRes$.body)) === null || _JSON$parse === void 0 ? void 0 : (_JSON$parse$ = _JSON$parse[0]) === null || _JSON$parse$ === void 0 ? void 0 : _JSON$parse$.relations) !== null && _JSON$parse$0$relatio !== void 0 ? _JSON$parse$0$relatio : [];
-                orderMap = services[2].inputsByRetailer.flat().reduce(function (acc, item) {
+                orderMap = (_services$2$inputsByR = services[2].inputsByRetailer) !== null && _services$2$inputsByR !== void 0 ? _services$2$inputsByR : [].flat().reduce(function (acc, item) {
                   acc[item.id_image] = item.order;
                   return acc;
                 }, {});
-                orderedValues = (0, _toConsumableArray2.default)(services[2].values).sort(function (a, b) {
+                orderedValues = (0, _toConsumableArray2.default)((_services$2$values = services[2].values) !== null && _services$2$values !== void 0 ? _services$2$values : []).sort(function (a, b) {
                   var _orderMap$a$image_id, _orderMap$b$image_id;
 
                   var orderA = (_orderMap$a$image_id = orderMap[a.image_id]) !== null && _orderMap$a$image_id !== void 0 ? _orderMap$a$image_id : Number.MAX_SAFE_INTEGER;
@@ -454,30 +462,35 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
     var _state$product8;
 
     if (!((_state$product8 = state.product) !== null && _state$product8 !== void 0 && _state$product8.statusByRetailer)) return false;
-    var currentService = (0, _utils.getConceptByTab)(state.active_tab); // const currentStatus = state.product[`${currentService}_status`];
 
-    var currentRetailer = state.active_retailer.id_retailer; //Información del servicio de la cadena seleccionada
+    try {
+      var currentService = (0, _utils.getConceptByTab)(state.active_tab); // const currentStatus = state.product[`${currentService}_status`];
+
+      var currentRetailer = state.active_retailer.id_retailer; //Información del servicio de la cadena seleccionada
 
-    var _state$services_data$ = state.services_data.find(function (service) {
-      return service.service === currentService && service.id_retailer === currentRetailer;
-    }),
-        currentStatus = _state$services_data$.status;
+      var _state$services_data$ = state.services_data.find(function (service) {
+        return service.service === currentService && service.id_retailer === currentRetailer;
+      }),
+          currentStatus = _state$services_data$.status;
 
-    var originTab = origin[state.active_tab];
-    var isRetailerUser = (user === null || user === void 0 ? void 0 : user.is_retailer) === 1;
-    var validStatuses = ["AA", "AP", "R", "CA", "RCA"];
-    if (!validStatuses.includes(currentStatus)) return false;
-    var validOrigins = ["RequestWithContentoh", "RequestWithoutContentoh", "Contentoh"];
-    if (!validOrigins.includes(originTab)) return false; // Retailer: solo AP
+      var originTab = origin[state.active_tab];
+      var isRetailerUser = (user === null || user === void 0 ? void 0 : user.is_retailer) === 1;
+      var validStatuses = ["AA", "AP", "R", "CA", "RCA"];
+      if (!validStatuses.includes(currentStatus)) return false;
+      var validOrigins = ["RequestWithContentoh", "RequestWithoutContentoh", "Contentoh"];
+      if (!validOrigins.includes(originTab)) return false; // Retailer: solo AP
 
-    if (isRetailerUser) {
-      return currentStatus === "AP";
-    } // No retailer
+      if (isRetailerUser) {
+        return currentStatus === "AP";
+      } // No retailer
 
 
-    var hasNoOrder = !state.product.id_order && !state.product.orderId;
-    var condition = originTab === "RequestWithoutContentoh" && (["R", "CA"].includes(currentStatus) || currentStatus === "RCA" && hasNoOrder) || ["RequestWithContentoh", "Contentoh"].includes(originTab) && currentStatus === "AA";
-    return condition;
+      var hasNoOrder = !state.product.id_order && !state.product.orderId;
+      var condition = originTab === "RequestWithoutContentoh" && (["R", "CA"].includes(currentStatus) || currentStatus === "RCA" && hasNoOrder) || ["RequestWithContentoh", "Contentoh"].includes(originTab) && currentStatus === "AA";
+      return condition;
+    } catch (error) {
+      return false;
+    }
   };
 
   var canShowSaveButton = function canShowSaveButton(version_status) {
@@ -495,10 +508,10 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
 
   var getStatusByCurrentServiceAndRetailer = function getStatusByCurrentServiceAndRetailer() {
     var statusByRetailer = state.product.statusByRetailer;
-    if (!statusByRetailer) return "-";
+    if (!statusByRetailer || Object.keys(statusByRetailer).length === 0) return "-";
     var currentService = (0, _utils.getConceptByTab)(state.active_tab);
     var currentRetailer = state.active_retailer.id_retailer;
-    var currentStatus = statusByRetailer[currentRetailer][currentService] || "ERR";
+    var currentStatus = statusByRetailer[currentRetailer][currentService] || "N/S";
     return currentStatus;
   };
 
@@ -819,7 +832,7 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
               _context3.prev = 8;
 
               if (!result) {
-                _context3.next = 23;
+                _context3.next = 22;
                 break;
               }
 
@@ -835,13 +848,7 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
             case 14:
               res = _context3.sent;
               newStatuses = JSON.parse(res.data.body);
-              serviceStatus = newStatuses.newServiceStatus[articleId]["".concat(concept, "Status")];
-              console.log({
-                product: state.product,
-                newStatuses: newStatuses,
-                serviceStatus: serviceStatus,
-                servicesData: state.services_data
-              }); // Actualizar el producto con los nuevos estados
+              serviceStatus = newStatuses.newServiceStatus[articleId]["".concat(concept, "Status")]; // Actualizar el producto con los nuevos estados
 
               updatedProduct = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.product), {}, {
                 statusByRetailer: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.product.statusByRetailer), {}, (0, _defineProperty2.default)({}, retailerId, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.product.statusByRetailer[retailerId]), {}, (0, _defineProperty2.default)({}, concept, (_newStatuses$newStatu = newStatuses === null || newStatuses === void 0 ? void 0 : newStatuses.newStatus) !== null && _newStatuses$newStatu !== void 0 ? _newStatuses$newStatu : serviceStatus))))
@@ -873,12 +880,12 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
                 }
               });
 
-            case 23:
-              _context3.next = 29;
+            case 22:
+              _context3.next = 28;
               break;
 
-            case 25:
-              _context3.prev = 25;
+            case 24:
+              _context3.prev = 24;
               _context3.t0 = _context3["catch"](8);
               console.error("Error sending evaluation:", _context3.t0);
               dispatch({
@@ -891,20 +898,20 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
                 }
               });
 
-            case 29:
-              _context3.prev = 29;
+            case 28:
+              _context3.prev = 28;
               dispatch({
                 type: "SET_SAVING",
                 payload: false
               });
-              return _context3.finish(29);
+              return _context3.finish(28);
 
-            case 32:
+            case 31:
             case "end":
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[8, 25, 29, 32]]);
+      }, _callee3, null, [[8, 24, 28, 31]]);
     }));
 
     return function sendEvaluation(_x2) {

package/package.json

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

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

@@ -153,26 +153,35 @@ const ProviderProductEditionView = ({
           type: "SET_PRODUCT",
           payload: productNormalized,
         });
-        dispatch({
-          type: "SET_ACTIVE_RETAILER",
-          payload: productNormalized.categoryRetailer[0],
-        });
-
-        const firstRetailerStatus =
-          productNormalized.statusByRetailer[
-            productNormalized.categoryRetailerInOrder[0].id_retailer
-          ];
-        const initialTab = firstRetailerStatus.description
-          ? "Descripción"
-          : firstRetailerStatus.datasheet
-          ? "Ficha técnica"
-          : firstRetailerStatus.images
-          ? "Imágenes"
-          : "Imágenes";
-        dispatch({
-          type: "SET_ACTIVE_TAB",
-          payload: initialTab,
-        });
+        if (
+          productNormalized.categoryRetailerInOrder.length > 0 &&
+          productNormalized.statusByRetailer
+        ) {
+          dispatch({
+            type: "SET_ACTIVE_RETAILER",
+            payload: productNormalized.categoryRetailerInOrder[0],
+          });
+          const firstRetailerStatus =
+            productNormalized.statusByRetailer[
+              productNormalized.categoryRetailerInOrder[0].id_retailer
+            ];
+          const initialTab = firstRetailerStatus.description
+            ? "Descripción"
+            : firstRetailerStatus.datasheet
+            ? "Ficha técnica"
+            : firstRetailerStatus.images
+            ? "Imágenes"
+            : "Imágenes";
+          dispatch({
+            type: "SET_ACTIVE_TAB",
+            payload: initialTab,
+          });
+        } else {
+          dispatch({
+            type: "SET_ACTIVE_RETAILER",
+            payload: productNormalized.categoryRetailer[0],
+          });
+        }
       } catch (error) {
         console.log("Error setting product data: ", error);
       }
@@ -216,7 +225,7 @@ const ProviderProductEditionView = ({
             id_category,
             version,
             token,
-            id_retailer
+            id_retailer,
           ),
           getPercentage({ data, headers }),
           getServicesData({
@@ -230,14 +239,14 @@ const ProviderProductEditionView = ({
         const percentages =
           JSON.parse(percentageRes?.[0]?.body)?.[0]?.relations ?? [];
 
-        const orderMap = services[2].inputsByRetailer
-          .flat()
-          .reduce((acc, item) => {
+        const orderMap =
+          services[2].inputsByRetailer ??
+          [].flat().reduce((acc, item) => {
             acc[item.id_image] = item.order;
             return acc;
           }, {});
 
-        const orderedValues = [...services[2].values].sort((a, b) => {
+        const orderedValues = [...(services[2].values ?? [])].sort((a, b) => {
           const orderA = orderMap[a.image_id] ?? Number.MAX_SAFE_INTEGER;
           const orderB = orderMap[b.image_id] ?? Number.MAX_SAFE_INTEGER;
 
@@ -286,7 +295,7 @@ const ProviderProductEditionView = ({
         dispatch({
           type: "SET_ACTIVE_PERCENTAGES",
           payload: percentages.find(
-            ({ id_retailer: rId }) => rId === id_retailer
+            ({ id_retailer: rId }) => rId === id_retailer,
           ),
         });
       } catch (error) {
@@ -306,7 +315,7 @@ const ProviderProductEditionView = ({
     state.product?.percentages,
     state.product?.version,
     state.active_retailer,
-    token
+    token,
   ]);
 
   // Actualizador de campos del ui para que coincidan con el retailer activo
@@ -368,50 +377,51 @@ const ProviderProductEditionView = ({
   const canShowValidationButtons = () => {
     if (!state.product?.statusByRetailer) return false;
 
-    const currentService = getConceptByTab(state.active_tab);
-    // const currentStatus = state.product[`${currentService}_status`];
-    const currentRetailer = state.active_retailer.id_retailer;
-
-    //Información del servicio de la cadena seleccionada
-    const { status: currentStatus } = state.services_data.find(
-      (service) =>
-        service.service === currentService &&
-        service.id_retailer === currentRetailer,
-    );
+    try {
+      const currentService = getConceptByTab(state.active_tab);
+      // const currentStatus = state.product[`${currentService}_status`];
+      const currentRetailer = state.active_retailer.id_retailer;
+
+      //Información del servicio de la cadena seleccionada
+      const { status: currentStatus } = state.services_data.find(
+        (service) =>
+          service.service === currentService &&
+          service.id_retailer === currentRetailer,
+      );
 
-    const originTab = origin[state.active_tab];
-    const isRetailerUser = user?.is_retailer === 1;
+      const originTab = origin[state.active_tab];
+      const isRetailerUser = user?.is_retailer === 1;
 
-    const validStatuses = ["AA", "AP", "R", "CA", "RCA"];
-    if (!validStatuses.includes(currentStatus)) return false;
+      const validStatuses = ["AA", "AP", "R", "CA", "RCA"];
+      if (!validStatuses.includes(currentStatus)) return false;
 
-    const validOrigins = [
-      "RequestWithContentoh",
-      "RequestWithoutContentoh",
-      "Contentoh",
-    ];
+      const validOrigins = [
+        "RequestWithContentoh",
+        "RequestWithoutContentoh",
+        "Contentoh",
+      ];
 
-    if (!validOrigins.includes(originTab)) return false;
+      if (!validOrigins.includes(originTab)) return false;
 
-    // Retailer: solo AP
-    if (isRetailerUser) {
-      return currentStatus === "AP";
-    }
+      // Retailer: solo AP
+      if (isRetailerUser) {
+        return currentStatus === "AP";
+      }
 
-    // No retailer
-    const hasNoOrder = !state.product.id_order && !state.product.orderId;
+      // No retailer
+      const hasNoOrder = !state.product.id_order && !state.product.orderId;
 
-    const condition =
-      (
-        originTab === "RequestWithoutContentoh" && (
-          ["R", "CA"].includes(currentStatus) || (currentStatus === "RCA" && hasNoOrder)
-        )
-      ) ||
-      (
-        ["RequestWithContentoh", "Contentoh"].includes(originTab) && currentStatus === "AA"
-      )
+      const condition =
+        (originTab === "RequestWithoutContentoh" &&
+          (["R", "CA"].includes(currentStatus) ||
+            (currentStatus === "RCA" && hasNoOrder))) ||
+        (["RequestWithContentoh", "Contentoh"].includes(originTab) &&
+          currentStatus === "AA");
 
-    return condition;
+      return condition;
+    } catch (error) {
+      return false;
+    }
   };
 
   const canShowSaveButton = (version_status) => {
@@ -428,13 +438,14 @@ const ProviderProductEditionView = ({
 
   const getStatusByCurrentServiceAndRetailer = () => {
     const { statusByRetailer } = state.product;
-    if (!statusByRetailer) return "-";
+    if (!statusByRetailer || Object.keys(statusByRetailer).length === 0)
+      return "-";
 
     const currentService = getConceptByTab(state.active_tab);
     const currentRetailer = state.active_retailer.id_retailer;
 
     const currentStatus =
-      statusByRetailer[currentRetailer][currentService] || "ERR";
+      statusByRetailer[currentRetailer][currentService] || "N/S";
     return currentStatus;
   };
 
@@ -444,7 +455,7 @@ const ProviderProductEditionView = ({
       name: e?.name,
       required: e?.required,
       active: state.images_values?.values?.some(
-        (value) => value?.image_id === e?.id
+        (value) => value?.image_id === e?.id,
       ),
     }));
     const imageType = state.images_values?.imageType?.map((e) => ({
@@ -455,7 +466,7 @@ const ProviderProductEditionView = ({
       (e) => ({
         value: e?.id,
         name: e?.name,
-      })
+      }),
     );
 
     return state.images_values?.values?.map((image, index) => (
@@ -711,15 +722,13 @@ const ProviderProductEditionView = ({
             headers: {
               Authorization: token,
             },
-          }
+          },
         );
 
         const newStatuses = JSON.parse(res.data.body);
         const serviceStatus =
           newStatuses.newServiceStatus[articleId][`${concept}Status`];
 
-        console.log({product: state.product, newStatuses, serviceStatus, servicesData: state.services_data});
-
         // Actualizar el producto con los nuevos estados
         const updatedProduct = {
           ...state.product,
@@ -732,9 +741,12 @@ const ProviderProductEditionView = ({
           },
         };
 
-        const updatedServicesData = state.services_data?.map(service => ({
+        const updatedServicesData = state.services_data?.map((service) => ({
           ...service,
-          status: service?.id_retailer === retailerId && service?.service === concept ? (newStatuses?.newStatus ?? serviceStatus) : service?.status
+          status:
+            service?.id_retailer === retailerId && service?.service === concept
+              ? newStatuses?.newStatus ?? serviceStatus
+              : service?.status,
         }));
 
         dispatch({ type: "SET_SERVICES_DATA", payload: updatedServicesData });
@@ -968,7 +980,7 @@ const ProviderProductEditionView = ({
             headers: {
               Authorization: token,
             },
-          })
+          }),
         );
       });
 
@@ -1013,7 +1025,7 @@ const ProviderProductEditionView = ({
           ArticleId: updatedProduct.id_article,
           idCategory: updatedProduct.id_category,
           product: updatedProduct,
-        })
+        }),
       );
 
       // Mostrar modal de éxito
@@ -1079,10 +1091,7 @@ const ProviderProductEditionView = ({
   if (state.loading || !state.services || !state.product) return <Loading />;
 
   return (
-    <AiProductEditionProvider
-      isCreatorsEdition={false}
-      state={state}
-    >
+    <AiProductEditionProvider isCreatorsEdition={false} state={state}>
       <Container headerTop={headerTop}>
         {showVersionSelector && (
           <VersionSelector