contentoh-components-library 21.6.1 → 21.6.11

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

@@ -31,6 +31,8 @@ var _providerProductEdition = require("./context/provider-product-edition.contex
 
 var _utils = require("./utils");
 
+var _statusDictionary = require("../../../global-files/statusDictionary");
+
 var _data = require("../../../global-files/data");
 
 var _customHooks = require("../../../global-files/customHooks");
@@ -288,7 +290,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$, _services$2$inputsByR, _services$2$values, 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, getServiceMinorStatus, imagesMinorStatus, descriptionMinorStatus, datasheetMinorStatus;
 
         return _regenerator.default.wrap(function _callee2$(_context2) {
           while (1) {
@@ -348,10 +350,30 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
                   acc[id_retailer][service] = status;
                   return acc;
                 }, {});
+
+                getServiceMinorStatus = function getServiceMinorStatus(serviceName) {
+                  var records = servicesDataRes.filter(function (s) {
+                    return s.service === serviceName;
+                  });
+                  return records.length > 0 ? (0, _statusDictionary.getMinorStatus)(records.map(function (s) {
+                    return s.status;
+                  })) : undefined;
+                };
+
+                imagesMinorStatus = getServiceMinorStatus("images");
+                descriptionMinorStatus = getServiceMinorStatus("description");
+                datasheetMinorStatus = getServiceMinorStatus("datasheet");
                 dispatch({
                   type: "SET_PRODUCT",
-                  payload: (0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.product), {}, {
-                    statusByRetailer: updatedStatusByRetailer
+                  payload: (0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.product), {}, {
+                    statusByRetailer: updatedStatusByRetailer,
+                    status: (0, _statusDictionary.getMinorStatusFromRetailerMap)(updatedStatusByRetailer)
+                  }, imagesMinorStatus !== undefined && {
+                    images_status: imagesMinorStatus
+                  }), descriptionMinorStatus !== undefined && {
+                    description_status: descriptionMinorStatus
+                  }), datasheetMinorStatus !== undefined && {
+                    datasheet_status: datasheetMinorStatus
                   })
                 });
                 dispatch({
@@ -379,11 +401,11 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
                     return rId === id_retailer;
                   })
                 });
-                _context2.next = 26;
+                _context2.next = 30;
                 break;
 
-              case 22:
-                _context2.prev = 22;
+              case 26:
+                _context2.prev = 26;
                 _context2.t0 = _context2["catch"](1);
                 console.error("Error fetching data:", _context2.t0);
                 dispatch({
@@ -391,20 +413,20 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
                   payload: _context2.t0
                 });
 
-              case 26:
-                _context2.prev = 26;
+              case 30:
+                _context2.prev = 30;
                 dispatch({
                   type: "SET_LOADING",
                   payload: false
                 });
-                return _context2.finish(26);
+                return _context2.finish(30);
 
-              case 29:
+              case 33:
               case "end":
                 return _context2.stop();
             }
           }
-        }, _callee2, null, [[1, 22, 26, 29]]);
+        }, _callee2, null, [[1, 26, 30, 33]]);
       }));
 
       return function fetchData() {
@@ -810,9 +832,9 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
 
   var sendEvaluation = /*#__PURE__*/function () {
     var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(result) {
-      var _state$product$id_ord, _state$product10, _state$active_retaile2;
+      var _state$product$id_ord, _state$active_retaile2, _state$product$status, _state$product$status2, _state$product10;
 
-      var concept, articleId, orderId, sectionStatusKey, evalStatus, data, retailerId, _newStatuses$newStatu, _state$services_data, res, newStatuses, serviceStatus, updatedProduct, updatedServicesData;
+      var concept, articleId, orderId, retailerId, evalStatus, data, _newStatuses$newStatu, _state$services_data, res, newStatuses, serviceStatus, updatedStatusByRetailer, updatedProduct, updatedServicesData;
 
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
@@ -825,16 +847,15 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
               concept = (0, _utils.getConceptByTab)(state.active_tab);
               articleId = state.product.id_article;
               orderId = (_state$product$id_ord = state.product.id_order) !== null && _state$product$id_ord !== void 0 ? _state$product$id_ord : state.product.orderId;
-              sectionStatusKey = "".concat(concept, "_status");
-              evalStatus = state.product[sectionStatusKey] || ((_state$product10 = state.product) === null || _state$product10 === void 0 ? void 0 : _state$product10.version_status);
+              retailerId = (_state$active_retaile2 = state.active_retailer) === null || _state$active_retaile2 === void 0 ? void 0 : _state$active_retaile2.id_retailer;
+              evalStatus = ((_state$product$status = state.product.statusByRetailer) === null || _state$product$status === void 0 ? void 0 : (_state$product$status2 = _state$product$status[retailerId]) === null || _state$product$status2 === void 0 ? void 0 : _state$product$status2[concept]) || state.product["".concat(concept, "_status")] || ((_state$product10 = state.product) === null || _state$product10 === void 0 ? void 0 : _state$product10.version_status);
               data = {
                 articleId: articleId,
                 orderId: orderId,
                 concept: concept,
                 evalStatus: evalStatus
               };
-              retailerId = (_state$active_retaile2 = state.active_retailer) === null || _state$active_retaile2 === void 0 ? void 0 : _state$active_retaile2.id_retailer;
-              _context3.prev = 8;
+              _context3.prev = 7;
 
               if (!result) {
                 _context3.next = 22;
@@ -843,20 +864,22 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
 
               data.result = result;
               data.retailerId = retailerId;
-              _context3.next = 14;
+              _context3.next = 13;
               return _axios.default.put("".concat(process.env.REACT_APP_EVALUATION_ENDPOINT), data, {
                 headers: {
                   Authorization: token
                 }
               });
 
-            case 14:
+            case 13:
               res = _context3.sent;
               newStatuses = JSON.parse(res.data.body);
               serviceStatus = newStatuses.newServiceStatus[articleId]["".concat(concept, "Status")]; // Actualizar el producto con los nuevos estados
 
+              updatedStatusByRetailer = (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))));
               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))))
+                statusByRetailer: updatedStatusByRetailer,
+                status: (0, _statusDictionary.getMinorStatus)(Object.values(updatedStatusByRetailer).flatMap(Object.values))
               });
               updatedServicesData = (_state$services_data = state.services_data) === null || _state$services_data === void 0 ? void 0 : _state$services_data.map(function (service) {
                 var _newStatuses$newStatu2;
@@ -891,7 +914,7 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
 
             case 24:
               _context3.prev = 24;
-              _context3.t0 = _context3["catch"](8);
+              _context3.t0 = _context3["catch"](7);
               console.error("Error sending evaluation:", _context3.t0);
               dispatch({
                 type: "SET_MODAL",
@@ -916,7 +939,7 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
               return _context3.stop();
           }
         }
-      }, _callee3, null, [[8, 24, 28, 31]]);
+      }, _callee3, null, [[7, 24, 28, 31]]);
     }));
 
     return function sendEvaluation(_x2) {
@@ -1138,7 +1161,7 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
 
   var handleOnEvaluateAll = /*#__PURE__*/function () {
     var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee5(result) {
-      var _state$product$id_ord2, _state$services_data2, evaluationArray, conceptArray, dataGeneral, userType, status, updatedStatusByRetailer, updatedProduct;
+      var _state$product$id_ord2, _state$services_data2, evaluationArray, conceptArray, dataGeneral, isProvider, userType, status, updatedStatusByRetailer, updatedProduct;
 
       return _regenerator.default.wrap(function _callee5$(_context5) {
         while (1) {
@@ -1158,14 +1181,19 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
                 isAproved: result === "A"
               }; // Crear todas las evaluaciones para cada servicio y retailer
 
+              isProvider = !user.is_retailer;
               (_state$services_data2 = state.services_data) === null || _state$services_data2 === void 0 ? void 0 : _state$services_data2.forEach(function (ret) {
+                var _state$product$status3;
+
                 var service = ret.service,
                     id_retailer = ret.id_retailer;
-                var data = {};
-                data = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, dataGeneral), {}, {
+                var currentEvalStatus = (_state$product$status3 = state.product.statusByRetailer[id_retailer]) === null || _state$product$status3 === void 0 ? void 0 : _state$product$status3[service];
+                if (isProvider && currentEvalStatus !== _statusDictionary.STATUS_DICTIONARY.AA.status) return;
+                if (!isProvider && currentEvalStatus !== _statusDictionary.STATUS_DICTIONARY.AP.status) return;
+                var data = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, dataGeneral), {}, {
                   concept: service,
                   retailerId: id_retailer,
-                  evalStatus: state.product.statusByRetailer[id_retailer][service]
+                  evalStatus: currentEvalStatus
                 });
                 evaluationArray.push(_axios.default.put("".concat(process.env.REACT_APP_EVALUATION_ENDPOINT), data, {
                   headers: {
@@ -1174,10 +1202,10 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
                 }));
               }); // Ejecutar todas las evaluaciones
 
-              _context5.next = 8;
+              _context5.next = 9;
               return Promise.all(evaluationArray);
 
-            case 8:
+            case 9:
               userType = user.is_retailer === 1 ? "CA" : "P";
               status = "".concat(result).concat(userType); // Actualizar el statusByRetailer para todos los retailers y conceptos
 
@@ -1192,6 +1220,7 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
 
               updatedProduct = (0, _objectSpread4.default)((0, _objectSpread4.default)({}, state.product), {}, {
                 article_status: status,
+                status: (0, _statusDictionary.getMinorStatus)(Object.values(updatedStatusByRetailer).flatMap(Object.values)),
                 datasheet_status: state.product.datasheet_status === "NA" ? "NA" : status,
                 description_status: state.product.description_status === "NA" ? "NA" : status,
                 images_status: state.product.images_status === "NA" ? "NA" : status,
@@ -1218,11 +1247,11 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
                   image: _genericModalCheck.default
                 }
               });
-              _context5.next = 23;
+              _context5.next = 24;
               break;
 
-            case 19:
-              _context5.prev = 19;
+            case 20:
+              _context5.prev = 20;
               _context5.t0 = _context5["catch"](1);
               console.error("Error evaluating all:", _context5.t0);
               dispatch({
@@ -1235,21 +1264,21 @@ var ProviderProductEditionView = function ProviderProductEditionView(_ref) {
                 }
               });
 
-            case 23:
-              _context5.prev = 23;
+            case 24:
+              _context5.prev = 24;
               dispatch({
                 type: "SET_SAVING",
                 payload: false
               });
               setRejectAll(false);
-              return _context5.finish(23);
+              return _context5.finish(24);
 
-            case 27:
+            case 28:
             case "end":
               return _context5.stop();
           }
         }
-      }, _callee5, null, [[1, 19, 23, 27]]);
+      }, _callee5, null, [[1, 20, 24, 28]]);
     }));
 
     return function handleOnEvaluateAll(_x4) {

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.normalizeProduct = exports.getConceptByTab = void 0;
 
+var _statusDictionary = require("../../../global-files/statusDictionary");
+
 var normalizeProduct = function normalizeProduct(product) {
   // Handle case where product might be wrapped in a product property
   var productData = product.product || product;
@@ -43,7 +45,7 @@ var normalizeProduct = function normalizeProduct(product) {
     version: productData.version || 0,
     // from tasks
     id_order: productData.orderId || 0,
-    status: productData.status || null,
+    status: productData.statusByRetailer ? (0, _statusDictionary.getMinorStatusFromRetailerMap)(productData.statusByRetailer) : productData.status || null,
     datasheet_status: productData.datasheet_status || null,
     description_status: productData.description_status || null,
     images_status: productData.images_status || null,

package/dist/components/pages/RetailerProductEdition/context/reducers/product.js

@@ -5,7 +5,9 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.productReducer = exports.productInitialState = exports.PRODUCT_ACTIONS = void 0;
+exports.PRODUCT_ACTIONS = void 0;
+exports.getMinorStatusFromRetailer = getMinorStatusFromRetailer;
+exports.productReducer = exports.productInitialState = void 0;
 
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
 
@@ -49,7 +51,7 @@ var productReducer = function productReducer(state, action) {
 
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state), {}, {
           product: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, state.product), {}, {
-            status: getMinorStatus(action.payload.map(function (status) {
+            status: (0, _statusDictionary.getMinorStatus)(action.payload.map(function (status) {
               return status === null || status === void 0 ? void 0 : status.status;
             })),
             description_status: ((_action$payload$find = action.payload.find(function (status) {
@@ -102,24 +104,14 @@ var productReducer = function productReducer(state, action) {
         return null;
       }
   }
-};
+}; // Wrapper for array format: [{ status: "AS" }, ...]
+
 
 exports.productReducer = productReducer;
 
-function getMinorStatus() {
-  var _STATUS_DICTIONARY$NS;
-
-  var servicesStatus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  if (!servicesStatus || servicesStatus.length === 0) return _statusDictionary.STATUS_DICTIONARY.NS.name;
-  console.log({
-    servicesStatus: servicesStatus
-  });
-  var winner = servicesStatus.reduce(function (minor, current) {
-    var currentObj = typeof current === "string" ? _statusDictionary.STATUS_DICTIONARY[current] : current;
-    var minorObj = typeof minor === "string" ? _statusDictionary.STATUS_DICTIONARY[minor] : minor;
-    if (!currentObj || typeof currentObj.weight === "undefined") return minor;
-    if (!minorObj || typeof minorObj.weight === "undefined") return current;
-    return currentObj.weight < minorObj.weight ? currentObj : minorObj;
-  }, servicesStatus[0] || _statusDictionary.STATUS_DICTIONARY.NS);
-  return (winner === null || winner === void 0 ? void 0 : winner.status) || ((_STATUS_DICTIONARY$NS = _statusDictionary.STATUS_DICTIONARY.NS) === null || _STATUS_DICTIONARY$NS === void 0 ? void 0 : _STATUS_DICTIONARY$NS.status);
+function getMinorStatusFromRetailer() {
+  var statusByRetailer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  return (0, _statusDictionary.getMinorStatus)(statusByRetailer.map(function (s) {
+    return s === null || s === void 0 ? void 0 : s.status;
+  }));
 }

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

@@ -31,6 +31,8 @@ var _fileSaver = require("file-saver");
 
 var _providerProductEdition = require("./context/provider-product-edition.context");
 
+var _product = require("./context/reducers/product");
+
 var _utils = require("./utils");
 
 var _data = require("../../../global-files/data");
@@ -95,7 +97,12 @@ var _material = require("@mui/material");
 
 var _jsxRuntime = require("react/jsx-runtime");
 
-var allowedAccountsToViewChangeStatus = ["mperez@contentoh.com", "gmorales@contentoh.com", "rvega@contentoh.com", "amora@contentoh.com", "oparra@contentoh.com", "zsegura@contentoh.com", "oserna@contentoh.com", "jalvarado@contentoh.com"];
+var allowedAccountsToViewChangeStatus = ["mperez@contentoh.com", "gmorales@contentoh.com", "rvega@contentoh.com", "amora@contentoh.com", //PRODUCT DEV ACCOUNTS
+"oparra@contentoh.com", "zsegura@contentoh.com", "oserna@contentoh.com", "jalvarado@contentoh.com", //DEV ACCOUNTS
+"kikije1467@mtlcz.com", //IMÁGENES
+"karafe3218@mom2kid.com", //TEXTOS
+"ladiboh785@mi166.com" //QA
+];
 
 var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
   var _location$state, _location$state2, _state$active_retaile4, _state$active_retaile5, _state$images_values$2, _state$images_values10, _state$images_values11, _state$product8, _state$active_retaile6, _state$active_retaile7, _state$active_retaile8, _state$active_retaile9, _state$product9, _state$product10, _state$product11, _state$datasheets_inp, _state$datasheets_inp2, _state$product12, _state$images_values12, _state$comment;
@@ -994,7 +1001,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
     var _ref10 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee7(result) {
       var _state$product$id_ord, _state$active_retaile3;
 
-      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, _updatedProduct, updatedServicesData, sessionProduct, _objectSpread3, productInSession, updatedProductInSession;
+      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;
 
       return _regenerator.default.wrap(function _callee7$(_context7) {
         while (1) {
@@ -1057,10 +1064,8 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
                 }) : item;
               });
               updatedProduct = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, state.product), {}, {
-                statusByRetailer: updatedStatusByRetailer // version_status: articleStatus,
-                // status: articleStatus,
-                // article_status: articleStatus
-
+                statusByRetailer: updatedStatusByRetailer,
+                status: (0, _product.getMinorStatusFromRetailer)(updatedStatusByRetailer)
               });
               dispatch({
                 type: "SET_PRODUCT",
@@ -1131,7 +1136,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
                 // };
                 // await sendMessage(messageData);
 
-                _updatedProduct = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, state.product), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, "".concat(concept, "_status"), newStatus), (0, _defineProperty2.default)(_objectSpread2, "statusByRetailer", state.product.statusByRetailer.map(function (item) {
+                updatedStatusByRetailerForSend = state.product.statusByRetailer.map(function (item) {
                   if (item.retailer_id === retailerId && item.service === concept) {
                     return (0, _objectSpread5.default)((0, _objectSpread5.default)({}, item), {}, {
                       status: newStatus
@@ -1139,7 +1144,8 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
                   }
 
                   return item;
-                })), _objectSpread2)); //Actualizamos el services_data en el servicio específico del retailer actual
+                });
+                _updatedProduct = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, state.product), {}, (_objectSpread2 = {}, (0, _defineProperty2.default)(_objectSpread2, "".concat(concept, "_status"), newStatus), (0, _defineProperty2.default)(_objectSpread2, "statusByRetailer", updatedStatusByRetailerForSend), (0, _defineProperty2.default)(_objectSpread2, "status", (0, _product.getMinorStatusFromRetailer)(updatedStatusByRetailerForSend)), _objectSpread2)); //Actualizamos el services_data en el servicio específico del retailer actual
 
                 updatedServicesData = (_state$services_data2 = state.services_data) === null || _state$services_data2 === void 0 ? void 0 : _state$services_data2.map(function (service) {
                   return (0, _objectSpread5.default)((0, _objectSpread5.default)({}, service), {}, {
@@ -1268,7 +1274,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
                 var retailer_service = ret.service,
                     id_retailer = ret.id_retailer,
                     status_retailer_service = ret.status;
-                var lastStatusLevel = status_retailer_service.replace(/.*\//, "");
+                var lastStatusLevel = status_retailer_service === null || status_retailer_service === void 0 ? void 0 : status_retailer_service.replace(/.*\//, "");
 
                 if (conceptArray.includes(retailer_service) && statusArray !== null && statusArray !== void 0 && statusArray.includes(lastStatusLevel)) {
                   var data = {
@@ -1300,7 +1306,7 @@ var RetailerProductEditionView = function RetailerProductEditionView(_ref) {
 
               updatedProduct = (0, _objectSpread5.default)((0, _objectSpread5.default)({}, state.product), {}, {
                 article_status: status,
-                status: status,
+                status: (0, _product.getMinorStatusFromRetailer)(updatedStatusByRetailer),
                 datasheet_status: state.product.datasheet_status === "NA" ? "NA" : status,
                 description_status: state.product.description_status === "NA" ? "NA" : status,
                 images_status: state.product.images_status === "NA" ? "NA" : status,

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

@@ -161,7 +161,7 @@ var normalizeProduct = function normalizeProduct(product) {
     percentages: productData.percentages || null,
     summary: productData.summary || null,
     version: productData.version || 0,
-    id_order: productData.orderId || 0,
+    id_order: productData.orderId || productData.id_order || 0,
     status: productData.status || null,
     datasheet_status: productData.datasheet_status || null,
     description_status: productData.description_status || null,

package/dist/global-files/statusDictionary.js

@@ -98,6 +98,41 @@ var STATUS_DICTIONARY = {
     weight: 100
   }
 };
+
+var resolveStatusObj = function resolveStatusObj(statusStr) {
+  if (!statusStr || typeof statusStr !== "string") return null;
+  if (STATUS_DICTIONARY[statusStr]) return STATUS_DICTIONARY[statusStr]; // Compound statuses like 'RA/AS' — use last segment for weight lookup
+
+  var parts = statusStr.split("/");
+  var lastPart = parts[parts.length - 1];
+  var dictEntry = STATUS_DICTIONARY[lastPart];
+  if (dictEntry) return {
+    status: statusStr,
+    name: statusStr,
+    weight: dictEntry.weight
+  };
+  return null;
+}; // Returns the status string with the lowest weight from an array of status strings
+
+
+var getMinorStatus = function getMinorStatus() {
+  var servicesStatus = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  if (!servicesStatus || servicesStatus.length === 0) return STATUS_DICTIONARY.NS.status;
+  var winner = servicesStatus.reduce(function (minorObj, current) {
+    var currentObj = resolveStatusObj(typeof current === "string" ? current : current === null || current === void 0 ? void 0 : current.status);
+    if (!currentObj || typeof currentObj.weight === "undefined") return minorObj;
+    return currentObj.weight < minorObj.weight ? currentObj : minorObj;
+  }, STATUS_DICTIONARY.NS);
+  return (winner === null || winner === void 0 ? void 0 : winner.status) || STATUS_DICTIONARY.NS.status;
+};
+
+var getMinorStatusFromRetailerMap = function getMinorStatusFromRetailerMap() {
+  var statusByRetailer = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  return getMinorStatus(Object.values(statusByRetailer).flatMap(Object.values));
+};
+
 module.exports = {
-  STATUS_DICTIONARY: STATUS_DICTIONARY
+  STATUS_DICTIONARY: STATUS_DICTIONARY,
+  getMinorStatus: getMinorStatus,
+  getMinorStatusFromRetailerMap: getMinorStatusFromRetailerMap
 };

package/package.json

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

package/src/components/atoms/ProgressBar/index.js

@@ -43,12 +43,8 @@ export const ProgressBar = ({ percent, progressBarType, percentRequired }) => {
             }
             children={
               !percent && percent != 0 ? null : (
-                <Container className={`status-${progressBarType}`}>
-                  {
-                    <p>{
-                      Math.round(percent)
-                    }%</p>
-                  }
+                <Container percentageRequired={Math.round(percent)}>
+                  <p>{Math.round(percent)}%</p>
                 </Container>
               )
             }

package/src/components/atoms/ProgressBar/styles.js

@@ -2,7 +2,8 @@ import styled from "styled-components";
 import { FontFamily, GlobalColors } from "../../../global-files/variables";
 
 export const Container = styled.div`
-  background-color: ${GlobalColors.s3};
+  background-color: ${(props) =>
+    props.percentageRequired >= 100 ? GlobalColors.color_pink : GlobalColors.s3};
   width: fit-content;
   height: 27px;
   padding: 4px;
@@ -11,62 +12,7 @@ export const Container = styled.div`
   font-weight: 600;
   font-size: 14px;
   line-height: 19px;
-  color: ${(backgroundColor) =>
-    backgroundColor === "s2" || backgroundColor === "s1"
-      ? GlobalColors.s4
-      : GlobalColors.white};
-
-  &.status-CA,
-  &.status-IE {
-    background-color: ${GlobalColors.in_progress};
-  }
-
-  &.status-R,
-  &.status-AS,
-  &.status-PA {
-    background-color: ${GlobalColors.reception};
-  }
-
-  &.status-AA,
-  &.status-AP,
-  &.status-ACA,
-  &.status-AC {
-    background-color: ${GlobalColors.finished};
-  }
-
-  &.status-RA,
-  &.status-RC,
-  &.status-RP,
-  &.status-RCA {
-    background-color: ${GlobalColors.rejected_status};
-  }
-
-  &.status-Dat,
-  &.status-Dsc,
-  &.status-Imgs {
-    background-color: ${GlobalColors.s4};
-  }
-
-  &.status-Ex {
-    background-color: ${GlobalColors.exported};
-  }
-
-  &.status-DDI {
-    background-color: ${GlobalColors.original_purpura};
-  }
-
-  &.status-GLD {
-    background-color: ${GlobalColors.in_progress};
-  }
-
-  &.status-TAB {
-    background-color: ${GlobalColors.deep_gray};
-  }
-
-  &.status-Pt {
-    background-color: ${GlobalColors.s2};
-    color: ${GlobalColors.s4};
-  }
+  color: ${GlobalColors.white};
 `;
 export const ContainerIcon = styled.div`
   cursor: pointer;
@@ -89,6 +35,6 @@ export const ContainerIcon = styled.div`
         ${(props) => (props.percentageRequired < 100 ? 0 : 1)},
       "wght" 400, "GRAD" 0, "opsz" 48;
     color: ${(props) =>
-      props.percentageRequired < 100 ? "#d4d1d7" : "#e33aa9"};
+      props.percentageRequired < 100 ? "#d4d1d7" : GlobalColors.color_pink};
   }
 `;

package/src/components/atoms/Status/index.js

@@ -1,11 +1,19 @@
 import { Container } from "./styles";
+import { STATUS_DICTIONARY } from "../../../global-files/statusDictionary";
+
+const getStatusName = (statusType) => {
+  if (!statusType) return null;
+  const parts = statusType.split("/");
+  const names = parts.map((key) => STATUS_DICTIONARY[key]?.name).filter(Boolean);
+  return names.length > 0 ? names.join(" / ") : null;
+};
 
 export const Status = ({ statusType, ovalForm }) => {
+  const tooltipLabel = getStatusName(statusType);
   return (
     <Container
-      className={`status-${statusType?.replace(/\/.*/, "")} ${
-        ovalForm && "oval-form"
-      }`}
+      className={`status-${statusType?.replace(/\/.*/, "")} ${ovalForm ? "oval-form" : ""}`}
+      data-tooltip={tooltipLabel}
     >
       <p>{statusType ?? "NS"}</p>
     </Container>