contentoh-components-library 21.6.38 → 21.6.39

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

@@ -176,7 +176,7 @@ function _regenerateVideoThumbnails() {
 
           case 2:
             return _context18.abrupt("return", Promise.all(values.map( /*#__PURE__*/function () {
-              var _ref21 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(value) {
+              var _ref22 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee17(value) {
                 var base64, videoSrc, thumbnail;
                 return _regenerator.default.wrap(function _callee17$(_context17) {
                   while (1) {
@@ -221,7 +221,7 @@ function _regenerateVideoThumbnails() {
               }));
 
               return function (_x10) {
-                return _ref21.apply(this, arguments);
+                return _ref22.apply(this, arguments);
               };
             }())));
 
@@ -1073,26 +1073,35 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
 
     return ((_state$product5 = state.product) === null || _state$product5 === void 0 ? void 0 : _state$product5.id_auditor) === (user === null || user === void 0 ? void 0 : user.id_user);
   };
+  /**
+   * ¿Ocupo este slot EN ESTE producto?
+   *
+   * La calidad en la que actúas sale de la ASIGNACIÓN, no del rol. Con la
+   * estructura nueva de Creators, quien produce un servicio también lo valida:
+   * un especialista de textos puede ser el auditor del mismo producto y tiene
+   * que recorrer las dos fases, AS -> AC como especialista y AC -> AA como QA.
+   */
 
-  var isUserAssignedToService = function isUserAssignedToService(tab, rol) {
+
+  var isAssignedAs = function isAssignedAs(rol, concept) {
     var _state$product6;
 
+    var assigned = (_state$product6 = state.product) === null || _state$product6 === void 0 ? void 0 : _state$product6["id_".concat(concept, "_").concat(rol)];
+    return !!assigned && assigned === (user === null || user === void 0 ? void 0 : user.id_user);
+  };
+
+  var isUserAssignedToService = function isUserAssignedToService(tab, rol) {
     var concept = (0, _utils.getConceptByTab)(state.active_tab);
     var allowedRoles = [1, 4, 5, 6, 7, 8];
-    var validUser = allowedRoles.includes(user === null || user === void 0 ? void 0 : user.id_role); // Determinar rol por defecto si no se pasa
-
-    if (!rol) {
-      if (user.id_role === 4 || user.id_role === 5) {
-        rol = "facilitator";
-      } else if (user.id_role === 7 || user.id_role === 8) {
-        rol = "especialist";
-      }
-    }
-
+    var validUser = allowedRoles.includes(user === null || user === void 0 ? void 0 : user.id_role);
     var isAdmin = user.id_role === 1;
-    var idUserAssigned = (_state$product6 = state.product) === null || _state$product6 === void 0 ? void 0 : _state$product6["id_".concat(concept, "_").concat(rol)];
-    var isAssigned = idUserAssigned === user.id_user;
-    return isAdmin || isAssigned && validUser;
+    if (isAdmin) return true; // Sin `rol` explícito se prueba por asignación, no por rol. Antes se
+    // infería del `id_role`: un rol 6 caía en `id_<concept>_undefined` —columna
+    // inexistente, siempre falso— y un rol 7 solo podía ser especialista, nunca
+    // auditor. Es el mismo defecto que se corrigió en el backend.
+
+    var isAssigned = rol ? isAssignedAs(rol, concept) : isAssignedAs("especialist", concept) || isAssignedAs("facilitator", concept);
+    return isAssigned && validUser;
   };
 
   var canShowSingleEvaluationButtons = function canShowSingleEvaluationButtons(action) {
@@ -1103,10 +1112,13 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
       var _state$active_retaile2;
 
       return srv.id_retailer === ((_state$active_retaile2 = state.active_retailer) === null || _state$active_retaile2 === void 0 ? void 0 : _state$active_retaile2.id_retailer) && srv.service === concept;
-    })) === null || _state$services_data$ === void 0 ? void 0 : (_state$services_data$2 = _state$services_data$.status) === null || _state$services_data$2 === void 0 ? void 0 : _state$services_data$2.replace(/.*\//, "");
-    var adminFacilitatorCanEvaluate = retailerStatus === "IE" && [1, 4, 5].includes(user.id_role);
-    var adminAuditorCanEvaluate = ["AC", "RP", "RCA", "SAC"].includes(retailerStatus) && [1, 6].includes(user.id_role);
-    return adminFacilitatorCanEvaluate || adminAuditorCanEvaluate;
+    })) === null || _state$services_data$ === void 0 ? void 0 : (_state$services_data$2 = _state$services_data$.status) === null || _state$services_data$2 === void 0 ? void 0 : _state$services_data$2.replace(/.*\//, ""); // Se SUMA la vía por asignación a la que ya había por rol; no la
+    // reemplaza. Así los coordinadores y el administrador conservan su acceso
+    // tal cual, y el especialista que además es auditor alcanza la segunda fase.
+
+    var canEvaluateAsFacilitator = retailerStatus === "IE" && ([1, 4, 5].includes(user.id_role) || isAssignedAs("facilitator", concept));
+    var canEvaluateAsAuditor = ["AC", "RP", "RCA", "SAC"].includes(retailerStatus) && ([1, 6].includes(user.id_role) || isAuditorAssigned());
+    return canEvaluateAsFacilitator || canEvaluateAsAuditor;
   };
 
   var canShowBulkEvaluationButtons = function canShowBulkEvaluationButtons() {
@@ -1115,17 +1127,20 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
       var service = _ref7.service;
       return concepts.includes(service);
     });
-    var adminFacilitatorCanEvaluate = services.every(function (srv) {
+    var canEvaluateAsFacilitator = services.every(function (srv) {
       var _srv$status;
 
       return (srv === null || srv === void 0 ? void 0 : (_srv$status = srv.status) === null || _srv$status === void 0 ? void 0 : _srv$status.replace(/.*\//, "")) === "IE";
-    }) && [1, 4, 5].includes(user.id_role);
-    var adminAuditorCanEvaluate = state.services_data.every(function (srv) {
+    }) && ([1, 4, 5].includes(user.id_role) || services.some(function (_ref8) {
+      var service = _ref8.service;
+      return isAssignedAs("facilitator", service);
+    }));
+    var canEvaluateAsAuditor = state.services_data.every(function (srv) {
       var _srv$status2;
 
       return ["AC", "RP", "RCA"].includes(srv === null || srv === void 0 ? void 0 : (_srv$status2 = srv.status) === null || _srv$status2 === void 0 ? void 0 : _srv$status2.replace(/.*\//, ""));
-    }) && [1, 6].includes(user.id_role);
-    return adminFacilitatorCanEvaluate || adminAuditorCanEvaluate;
+    }) && ([1, 6].includes(user.id_role) || isAuditorAssigned());
+    return canEvaluateAsFacilitator || canEvaluateAsAuditor;
   };
 
   var getStatusByCurrentServiceAndRetailer = function getStatusByCurrentServiceAndRetailer() {
@@ -1156,7 +1171,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
 
 
   var loadFamily = /*#__PURE__*/function () {
-    var _ref8 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
+    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5() {
       var forzar,
           _state$product8,
           res,
@@ -1213,7 +1228,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     }));
 
     return function loadFamily() {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   /*
@@ -1321,8 +1336,8 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
   };
 
   var openFamilyMember = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(articleId) {
-      var _readPayload, res, _ref10, data, encontrado;
+    var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee6(articleId) {
+      var _readPayload, res, _ref11, data, encontrado;
 
       return _regenerator.default.wrap(function _callee6$(_context6) {
         while (1) {
@@ -1347,7 +1362,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
               // read-order-services responde { total, data: [...] }. La vista trae una
               // fila por orden, así que puede haber varias del mismo artículo; llegan
               // ordenadas por order_id DESC y la primera es la orden más reciente.
-              _ref10 = (_readPayload = (0, _api.readPayload)(res)) !== null && _readPayload !== void 0 ? _readPayload : {}, data = _ref10.data;
+              _ref11 = (_readPayload = (0, _api.readPayload)(res)) !== null && _readPayload !== void 0 ? _readPayload : {}, data = _ref11.data;
               encontrado = (data !== null && data !== void 0 ? data : []).find(function (item) {
                 var _item$article;
 
@@ -1394,7 +1409,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     }));
 
     return function openFamilyMember(_x3) {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   /*
@@ -1483,7 +1498,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
 
 
   var handleOnRestoreInheritance = /*#__PURE__*/function () {
-    var _ref11 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(attributeId) {
+    var _ref12 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(attributeId) {
       var _state$product14;
 
       var kind,
@@ -1569,7 +1584,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     }));
 
     return function handleOnRestoreInheritance(_x4) {
-      return _ref11.apply(this, arguments);
+      return _ref12.apply(this, arguments);
     };
   }();
   /*
@@ -1596,7 +1611,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
   };
 
   var handleOnClickSave = /*#__PURE__*/function () {
-    var _ref12 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
+    var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee8() {
       var _familia$variants, cambios, familia, hijos;
 
       return _regenerator.default.wrap(function _callee8$(_context8) {
@@ -1751,7 +1766,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     }));
 
     return function handleOnClickSave() {
-      return _ref12.apply(this, arguments);
+      return _ref13.apply(this, arguments);
     };
   }();
 
@@ -1819,7 +1834,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
   };
 
   var handleOnApproveSingleService = /*#__PURE__*/function () {
-    var _ref13 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
+    var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee9() {
       return _regenerator.default.wrap(function _callee9$(_context9) {
         while (1) {
           switch (_context9.prev = _context9.next) {
@@ -1836,7 +1851,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     }));
 
     return function handleOnApproveSingleService() {
-      return _ref13.apply(this, arguments);
+      return _ref14.apply(this, arguments);
     };
   }();
 
@@ -1845,7 +1860,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
   };
 
   var sendSingleEvaluation = /*#__PURE__*/function () {
-    var _ref14 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(result) {
+    var _ref15 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee10(result) {
       var _state$product$id_ord, _state$active_retaile4;
 
       var concept, articleId, orderId, sectionStatusKey, evalStatus, retailerId, data, res, message, icon, activeTab, newStatuses, serviceStatus, articleStatus, updatedStatusByRetailer, updatedProduct, specialistDone, _objectSpread2, _state$services_data2, _JSON$parse2, newStatus, newOrderStatus, newArticleStatus, _articleStatus, updatedStatusByRetailerForSend, _updatedProduct, updatedServicesData, sessionProduct, _objectSpread3, productInSession, updatedProductInSession;
@@ -2071,12 +2086,12 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     }));
 
     return function sendSingleEvaluation(_x5) {
-      return _ref14.apply(this, arguments);
+      return _ref15.apply(this, arguments);
     };
   }();
 
   var handleOnApproveAllServices = /*#__PURE__*/function () {
-    var _ref15 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
+    var _ref16 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee11() {
       return _regenerator.default.wrap(function _callee11$(_context11) {
         while (1) {
           switch (_context11.prev = _context11.next) {
@@ -2093,7 +2108,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     }));
 
     return function handleOnApproveAllServices() {
-      return _ref15.apply(this, arguments);
+      return _ref16.apply(this, arguments);
     };
   }();
 
@@ -2103,7 +2118,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
   };
 
   var sendBulkEvaluation = /*#__PURE__*/function () {
-    var _ref16 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(result) {
+    var _ref17 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee12(result) {
       var _state$services_data3, evaluationArray, conceptArray, status, updatedStatusByRetailer, updatedProduct, updatedServicesData;
 
       return _regenerator.default.wrap(function _callee12$(_context12) {
@@ -2219,12 +2234,12 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     }));
 
     return function sendBulkEvaluation(_x6) {
-      return _ref16.apply(this, arguments);
+      return _ref17.apply(this, arguments);
     };
   }();
 
   var handleOnChangeAssignations = /*#__PURE__*/function () {
-    var _ref17 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(assignationType, assignationId) {
+    var _ref18 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee13(assignationType, assignationId) {
       var concept, data, updatedProduct;
       return _regenerator.default.wrap(function _callee13$(_context13) {
         while (1) {
@@ -2265,7 +2280,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     }));
 
     return function handleOnChangeAssignations(_x7, _x8) {
-      return _ref17.apply(this, arguments);
+      return _ref18.apply(this, arguments);
     };
   }();
 
@@ -2300,7 +2315,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
   };
 
   var handleOnSubmitComment = /*#__PURE__*/function () {
-    var _ref18 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14(e) {
+    var _ref19 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee14(e) {
       var commentText;
       return _regenerator.default.wrap(function _callee14$(_context14) {
         while (1) {
@@ -2348,7 +2363,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     }));
 
     return function handleOnSubmitComment(_x9) {
-      return _ref18.apply(this, arguments);
+      return _ref19.apply(this, arguments);
     };
   }();
 

package/package.json

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

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

@@ -707,26 +707,38 @@ const RetailerProductEditionView = ({
     return state.product?.id_auditor === user?.id_user;
   };
 
+  /**
+   * ¿Ocupo este slot EN ESTE producto?
+   *
+   * La calidad en la que actúas sale de la ASIGNACIÓN, no del rol. Con la
+   * estructura nueva de Creators, quien produce un servicio también lo valida:
+   * un especialista de textos puede ser el auditor del mismo producto y tiene
+   * que recorrer las dos fases, AS -> AC como especialista y AC -> AA como QA.
+   */
+  const isAssignedAs = (rol, concept) => {
+    const assigned = state.product?.[`id_${concept}_${rol}`];
+    return !!assigned && assigned === user?.id_user;
+  };
+
   const isUserAssignedToService = (tab, rol) => {
     const concept = getConceptByTab(state.active_tab);
 
     const allowedRoles = [1, 4, 5, 6, 7, 8];
     const validUser = allowedRoles.includes(user?.id_role);
 
-    // Determinar rol por defecto si no se pasa
-    if (!rol) {
-      if (user.id_role === 4 || user.id_role === 5) {
-        rol = "facilitator";
-      } else if (user.id_role === 7 || user.id_role === 8) {
-        rol = "especialist";
-      }
-    }
-
     const isAdmin = user.id_role === 1;
-    const idUserAssigned = state.product?.[`id_${concept}_${rol}`];
-    const isAssigned = idUserAssigned === user.id_user;
-
-    return isAdmin || (isAssigned && validUser);
+    if (isAdmin) return true;
+
+    // Sin `rol` explícito se prueba por asignación, no por rol. Antes se
+    // infería del `id_role`: un rol 6 caía en `id_<concept>_undefined` —columna
+    // inexistente, siempre falso— y un rol 7 solo podía ser especialista, nunca
+    // auditor. Es el mismo defecto que se corrigió en el backend.
+    const isAssigned = rol
+      ? isAssignedAs(rol, concept)
+      : isAssignedAs("especialist", concept) ||
+        isAssignedAs("facilitator", concept);
+
+    return isAssigned && validUser;
   };
 
   const canShowSingleEvaluationButtons = (action) => {
@@ -740,13 +752,19 @@ const RetailerProductEditionView = ({
       )
       ?.status?.replace(/.*\//, "");
 
-    const adminFacilitatorCanEvaluate =
-      retailerStatus === "IE" && [1, 4, 5].includes(user.id_role);
-    const adminAuditorCanEvaluate =
+    // Se SUMA la vía por asignación a la que ya había por rol; no la
+    // reemplaza. Así los coordinadores y el administrador conservan su acceso
+    // tal cual, y el especialista que además es auditor alcanza la segunda fase.
+    const canEvaluateAsFacilitator =
+      retailerStatus === "IE" &&
+      ([1, 4, 5].includes(user.id_role) ||
+        isAssignedAs("facilitator", concept));
+
+    const canEvaluateAsAuditor =
       ["AC", "RP", "RCA", "SAC"].includes(retailerStatus) &&
-      [1, 6].includes(user.id_role);
+      ([1, 6].includes(user.id_role) || isAuditorAssigned());
 
-    return adminFacilitatorCanEvaluate || adminAuditorCanEvaluate;
+    return canEvaluateAsFacilitator || canEvaluateAsAuditor;
   };
 
   const canShowBulkEvaluationButtons = () => {
@@ -756,15 +774,17 @@ const RetailerProductEditionView = ({
       concepts.includes(service),
     );
 
-    const adminFacilitatorCanEvaluate =
+    const canEvaluateAsFacilitator =
       services.every((srv) => srv?.status?.replace(/.*\//, "") === "IE") &&
-      [1, 4, 5].includes(user.id_role);
+      ([1, 4, 5].includes(user.id_role) ||
+        services.some(({ service }) => isAssignedAs("facilitator", service)));
 
-    const adminAuditorCanEvaluate =
+    const canEvaluateAsAuditor =
       state.services_data.every((srv) =>
         ["AC", "RP", "RCA"].includes(srv?.status?.replace(/.*\//, "")),
-      ) && [1, 6].includes(user.id_role);
-    return adminFacilitatorCanEvaluate || adminAuditorCanEvaluate;
+      ) && ([1, 6].includes(user.id_role) || isAuditorAssigned());
+
+    return canEvaluateAsFacilitator || canEvaluateAsAuditor;
   };
 
   const getStatusByCurrentServiceAndRetailer = () => {