contentoh-components-library 21.2.3 → 21.2.6

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

@@ -22,20 +22,13 @@ export const Dashboard = () => {
   const [retailers, setRetailers] = useState({});
   const [loading, setLoading] = useState(true);
 
-  const loadProductVersions = async (byStatus, queryObject) => {
-    const { retailerId, startDate, endDate, fullData } = queryObject;
-    const query = fullData
-      ? `fullData=true`
-      : `retailerId=${retailerId}&startDate=${startDate}&endDate=${endDate}`;
+  const loadProductVersions = async (queryObject, byStatus = false) => {
+    const { retailerId, startDate, endDate} = queryObject;
+    const query = `retailerId=${retailerId}&startDate=${startDate}&endDate=${endDate}`;
+    const endpoint = byStatus ? process.env.REACT_APP_READ_ORDERS_BY_STATUS : process.env.REACT_APP_READ_REQUIRED_ORDERS
     try {
-      const response = await axios.get(
-        byStatus
-          ? `${process.env.REACT_APP_READ_ORDERS_BY_STATUS}?${query}`
-          : `${process.env.REACT_APP_READ_REQUIRED_ORDERS}?retailerId=${retailerId}&startDate=${startDate}&endDate=${endDate}`
-      );
-
-      const versionList = JSON.parse(response.data.body);
-      return versionList;
+      const response = await axios.get(`${endpoint}?${query}`);
+      return JSON.parse(response.data.body);
     } catch (error) {
       console.log(error);
     }
@@ -50,22 +43,30 @@ export const Dashboard = () => {
         },
       }
     );
-    setRetailers(JSON.parse(retailersResponse.data.body).data);
+    const parsed = JSON.parse(retailersResponse.data.body).data;
+    const retailers = Object.keys(parsed).map((key) => {
+      if (key.includes('The Home Depot')) return parsed[key];
+    }).filter((f) => f);
+    setRetailers(retailers);
   };
 
   const loadProductsByStatus = async (orderByStatus) => {
-    const { orders, fullData } = await loadProductVersions(true, orderByStatus);
+    const { orders, fullData } = await loadProductVersions(orderByStatus, true);
+    const { total, R, ACA, PA } = fullData;
+    const inProcess = Object.keys(fullData).reduce((prev, curr) =>
+      !['total', 'ACA', 'PA', 'R'].includes(curr) ? prev + fullData[curr] : prev
+    , 0);
     setMetricsData([
-      { label: "Productos totales", value: fullData?.total },
-      { label: "Productos sin asignar", value: fullData?.PA },
-      { label: "Productos en proceso", value: fullData?.CA },
-      { label: "Productos terminados", value: fullData?.AP },
+      { label: "Productos totales", value: total },
+      { label: "Productos sin asignar", value: PA + R },
+      { label: "Productos en proceso", value: inProcess },
+      { label: "Productos terminados", value: ACA },
     ]);
     setProductsByStatus(orders);
   };
 
   const loadRequiredProducts = async (orderByRequired) => {
-    const { dates } = await loadProductVersions(false, orderByRequired);
+    const { dates } = await loadProductVersions(orderByRequired);
     setRequiredProducts(dates);
   };
 
@@ -82,16 +83,10 @@ export const Dashboard = () => {
     setOrderByStatus(queryObject);
     setOrderByRequired(queryObject);
     getRetailers();
+    loadProductsByStatus(queryObject);
+    loadRequiredProducts(queryObject);
   }, []);
 
-  useEffect(() => {
-    loadProductsByStatus(orderByStatus);
-  }, [orderByStatus]);
-
-  useEffect(() => {
-    loadRequiredProducts(orderByRequired);
-  }, [orderByRequired]);
-
   useEffect(() => {
     orderByRequired?.retailerId &&
       orderByStatus?.retailerId &&
@@ -122,7 +117,10 @@ export const Dashboard = () => {
           retailerSelected={orderByStatus.retailerId}
           retailers={retailers}
           queryObject={orderByStatus}
-          setQueryObject={setOrderByStatus}
+          setQueryObject={(evt) => {
+            loadProductsByStatus(evt);
+            setOrderByStatus(evt);
+          }}
         />
         <DashboardMetric
           label={"Productos solicitados"}
@@ -137,7 +135,10 @@ export const Dashboard = () => {
           retailers={retailers}
           retailerSelected={orderByRequired.retailerId}
           queryObject={orderByRequired}
-          setQueryObject={setOrderByRequired}
+          setQueryObject={(evt) => {
+            loadRequiredProducts(evt);
+            setOrderByRequired(evt);
+          }}
         />
       </div>
     </Container>

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

@@ -18,278 +18,65 @@ RetailerProductEditionDefault.args = {
   token:
     "eyJraWQiOiJEV3owZnNieXg2MXNFcVduN3RCXC81bVhod3ZNbFZIOTgwUnZcL3RjT0lKdEk9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIwYjY2YTRhOS03NzkwLTQwMzQtYTMwYS1jMDA4MDg5NjI4NjciLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfbFN6UVo0WjdSIiwiY29nbml0bzp1c2VybmFtZSI6IjBiNjZhNGE5LTc3OTAtNDAzNC1hMzBhLWMwMDgwODk2Mjg2NyIsImF1ZCI6IjUyZDlza2tkY2c4cWpwODhvb2sxdXNlNm1rIiwiZXZlbnRfaWQiOiIzNmIxMmUwMy0xOWJhLTRiMDktYWJiYS1kZjk3ZTFkNThjZTQiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY2MDE4MjgzNywibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY2MDE4NjQzNywiaWF0IjoxNjYwMTgyODM3LCJlbWFpbCI6ImJheWFkaTE1MzhAbW5xbG0uY29tIn0.MM9nIHkrRIS2o8_s4BR6VTLgyw3ryvPrr-mf6RtnQ4smng2Q3fmtK07zInNcvcrv8EXO5J9z47_NZ5MOJDo1Pz1CV2cOYM7PT5tEn3F-W4SitqDbBw3KxfkqSMxdZUIHLWECGL-u2ATCYU2J4KRVQi8XSP1qbfv1hu9dh-vID8Fq641ccQwEqUDC13pshDPlR08legg7AAPJqoilV7wuvxqTYAK6fGqMS5jcdW2iDmU0ti9gkydXkYRIC-jg446VOmRCpwzKsk4UAPwlrGeodQ0LV1bfWn_-KVspWCRQd6U5WbFxHn0umYe3CvvPpyVmHzD3F_EMxaVyqV5aW5IoIQ",
   productSelected: {
-    services: {
-      datasheets: 1,
-      descriptions: 1,
-      images: 1,
+    "services": {
+        "datasheets": 1,
+        "descriptions": 1,
+        "images": 1
     },
-    orderId: 2296,
-    status: "AP",
-    datasheet_status: "AP",
-    prio: "none",
-    version: 8,
-    description_status: "ACA",
-    images_status: "AP",
-    article: {
-      id_article: 14701,
-      id_category: "684",
-      name: "Pasta Dental Colgate Total 12 Clean Mint de 100 ml",
-      upc: "7501035911369",
-      timestamp: "2021-10-09T16:33:17.000Z",
-      id_user: 203,
-      status: "Ex",
-      active: 1,
-      company_id: 226,
-      SKU: null,
-      Descripcion: null,
-      Proveedor: null,
-      id_proveedor: 0,
-      company_name: "Prueba Test S.A de C.V.",
-      country: "null",
-      id_order: 2296,
-      id_datasheet_especialist: 405,
-      id_datasheet_facilitator: 158,
-      id_description_especialist: 405,
-      id_description_facilitator: 158,
-      id_images_especialist: 366,
-      id_images_facilitator: 160,
-      id_auditor: 9,
-      id_recepcionist: null,
-      category: "Salud y Belleza|Cuidado Bucal|Pastas Dentales y Aseo Bucal",
-      missingAttributes: -1,
-      missingDescriptions: 3,
-      missingImages: -9,
+    "orderId": 1810,
+    "status": "RP",
+    "datasheet_status": "RP",
+    "prio": "none",
+    "version": 2,
+    "description_status": "RP",
+    "images_status": "RP",
+    "article": {
+        "id_article": 68934,
+        "id_category": "2290",
+        "name": "SCOTCHBLUE  3PACK MASKING TAPE 24MMX55M",
+        "upc": "167907",
+        "timestamp": "2022-06-22T15:44:57.000Z",
+        "id_user": 704,
+        "status": "NULL",
+        "active": 1,
+        "company_id": 437,
+        "SKU": null,
+        "Descripcion": null,
+        "Proveedor": null,
+        "id_proveedor": 0,
+        "company_name": "",
+        "country": null,
+        "id_order": 1810,
+        "id_datasheet_especialist": 1248,
+        "id_datasheet_facilitator": 1252,
+        "id_description_especialist": 1248,
+        "id_description_facilitator": 1252,
+        "id_images_especialist": 1251,
+        "id_images_facilitator": 1286,
+        "id_auditor": 514,
+        "id_recepcionist": null,
+        "category": "Pinturas|Herramientas y accesorios para pintar|Cintas",
+        "missingAttributes": null,
+        "missingDescriptions": null,
+        "missingImages": null
     },
-    retailers: [
-      {
-        id: 4,
-        name: "Walmart Super y Superama",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 97.61904761904763,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/4.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 5,
-        name: "Chedraui",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 100,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/5.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 6,
-        name: "HEB",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 100,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/6.png",
-        services: ["AP", "ACA", "AP"],
-      },
-      {
-        id: 7,
-        name: "Mega",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 100,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/7.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 8,
-        name: "Fragua",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: null,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/8.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 9,
-        name: "Amazon",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 85.18518518518518,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/9.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 12,
-        name: "La Comer",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 100,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/12.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 13,
-        name: "Soriana",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 100,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/13.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 16,
-        name: "Rappi",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 93.33333333333333,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/16.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 17,
-        name: "Genérico",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 100,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/17.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 18,
-        name: "Google",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 96.66666666666667,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/18.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 20,
-        name: "Cornershop",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 91.66666666666667,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/20.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 24,
-        name: "Alsuper",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 95.83333333333333,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/24.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 27,
-        name: "IMPIRA México",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 100,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/27.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 29,
-        name: "Farmacias del Ahorro",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 81.48148148148148,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/29.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 33,
-        name: "Merza",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 66.66666666666667,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/33.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 34,
-        name: "San Pablo",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 95.16666666666667,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/34.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 38,
-        name: "Del Sol",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 100,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/38.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 39,
-        name: "Justo",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 94.73684210526316,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/39.png",
-        services: ["NA", "NA", "NA"],
-      },
-      {
-        id: 62,
-        name: "Sanborns Café",
-        country: "México",
-        id_region: 1,
-        active: 1,
-        percentage: 100,
-        image:
-          "https://content-management-images.s3.amazonaws.com/retailers/62.png",
-        services: ["NA", "NA", "NA"],
-      },
+    "retailers": [
+        {
+            "id": 58,
+            "name": "The Home Depot Golden",
+            "country": "México",
+            "id_region": 1,
+            "active": 1
+        }
     ],
-    country: "null",
-    upc: "7501035911369",
-  },
+    "country": null,
+    "upc": "167907"
+},
   location: {
     product: { articleId: 109485, versionId: 3 },
   },
   user: {
-    id_user: 423,
+    id_user: 1248,
     name: "Facilitador Textos",
     last_name: " ",
     email: "bayadi1538@mnqlm.com",
@@ -304,7 +91,7 @@ RetailerProductEditionDefault.args = {
     address: null,
     job: null,
     id_stripe: null,
-    id_role: 1,
+    id_role: 7,
     active: 1,
     is_retailer: 0,
     email_notify: null,

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

@@ -648,7 +648,7 @@ export const RetailerProductEdition = ({
           statusArray.includes(srvActive) &&
           (["RA", "RC"].includes(product?.status) ||
             srv.filter((serv) =>
-              statusArray.includes(serv.status?.replace(/.*\//, ""))
+              ["CA"].includes(serv.status?.replace(/.*\//, ""))
             ).length === srv.length)
         );
       case 4:
@@ -1387,6 +1387,7 @@ export const RetailerProductEdition = ({
               </>
             )}
           </div>
+          {console.log(userAssigned(activeTab), auditorAssigned())}
           {(userAssigned(activeTab) || auditorAssigned()) &&
             product[`${getConcept(activeTab)}_status`] !== "NS" && (
               <div className="commentary-box">

package/dist/components/atoms/StatusTag/StatusTag.stories.js

@@ -1,48 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.StatusTagDefault = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
-
-var _index = require("./index");
-
-var _variables = require("../../../global-files/variables");
-
-var _jsxRuntime = require("react/jsx-runtime");
-
-var status = _variables.GlobalStatus;
-var _default = {
-  title: "Components/atoms/StatusTag",
-  component: _index.StatusTag,
-  argTypes: {
-    statusType: {
-      options: status,
-      control: {
-        type: "select"
-      }
-    },
-    ovalForm: {
-      options: [true, false],
-      control: {
-        type: "boolean"
-      }
-    }
-  }
-};
-exports.default = _default;
-
-var Template = function Template(args) {
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.StatusTag, (0, _objectSpread2.default)({}, args));
-};
-
-var StatusTagDefault = Template.bind({});
-exports.StatusTagDefault = StatusTagDefault;
-StatusTagDefault.args = {
-  statusType: "-",
-  ovalForm: false
-};

package/dist/components/atoms/StatusTag/index.js

@@ -1,58 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.StatusTag = void 0;
-
-var _styles = require("./styles");
-
-var _jsxRuntime = require("react/jsx-runtime");
-
-var StatusTag = function StatusTag(_ref) {
-  var statusType = _ref.statusType,
-      ovalForm = _ref.ovalForm;
-
-  var getShortStatus = function getShortStatus(status) {
-    switch (status) {
-      case "COMPLETED":
-        return "C";
-
-      case "RECEPTION":
-        return "Pr";
-
-      case "NULL":
-        return "-";
-
-      case "RECEIVED":
-        return "Rc";
-
-      case "IN_PROGRESS":
-        return "P";
-
-      case "ASSIGNED":
-        return "As";
-
-      case "APPROVED":
-        return "Ap";
-
-      case "VALIDATING":
-        return "V";
-
-      case "PAID_OUT":
-        return "Po";
-
-      default:
-        return status;
-    }
-  };
-
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_styles.Container, {
-    className: "status-".concat(getShortStatus(statusType), " ").concat(ovalForm && "oval-form"),
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)("p", {
-      children: getShortStatus(statusType)
-    })
-  });
-};
-
-exports.StatusTag = StatusTag;

package/dist/components/atoms/StatusTag/styles.js

@@ -1,20 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.Container = void 0;
-
-var _taggedTemplateLiteral2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/taggedTemplateLiteral"));
-
-var _styledComponents = _interopRequireDefault(require("styled-components"));
-
-var _variables = require("../../../global-files/variables");
-
-var _templateObject;
-
-var Container = _styledComponents.default.div(_templateObject || (_templateObject = (0, _taggedTemplateLiteral2.default)(["\n  width: fit-content;\n  padding: 0 10px;\n  height: 20px;\n  background-color: ", ";\n  border-radius: 3px;\n\n  p {\n    text-align: center;\n    color: ", ";\n    font-family: ", ";\n    font-size: 12px;\n    line-height: 20px;\n  }\n\n  &.status-As,\n  &.status-P,\n  &.status-IN_PROGRESS,\n  &.status-QF {\n    background-color: ", ";\n  }\n\n  &.status-Pr,\n  &.status-Rr,\n  &.status-Rc {\n    background-color: ", ";\n  }\n\n  &.status-AA,\n  &.status-AP,\n  &.status-AC,\n  &.status-AF {\n    background-color: ", ";\n  }\n\n  &.status-RA,\n  &.status-RF,\n  &.status-RP,\n  &.status-RC {\n    background-color: ", ";\n  }\n\n  &.status-Dat,\n  &.status-Dsc,\n  &.status-Imgs {\n    background-color: ", ";\n  }\n\n  &.status-Ex {\n    background-color: ", ";\n  }\n\n  &.status-DDI {\n    background-color: ", ";\n  }\n\n  &.status-GLD {\n    background-color: ", ";\n  }\n\n  &.status-TAB {\n    background-color: ", ";\n  }\n\n  &.status-Pt {\n    background-color: ", ";\n    color: ", ";\n  }\n\n  &.oval-form {\n    border-radius: 10px;\n  }\n"])), _variables.GlobalColors.s3, _variables.GlobalColors.white, _variables.FontFamily.Lato, _variables.GlobalColors.in_progress, _variables.GlobalColors.reception, _variables.GlobalColors.finished, _variables.GlobalColors.rejected_status, _variables.GlobalColors.s4, _variables.GlobalColors.exported, _variables.GlobalColors.original_purpura, _variables.GlobalColors.in_progress, _variables.GlobalColors.deep_gray, _variables.GlobalColors.s2, _variables.GlobalColors.s4);
-
-exports.Container = Container;

package/dist/components/pages/RegistrationLoginFirstStep/RegistrationLoginFirstStep.stories.js

@@ -1,37 +0,0 @@
-"use strict";
-
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = exports.RegistrationLoginFirstStepDefault = void 0;
-
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
-
-var _index = require("./index");
-
-var _loginImage = _interopRequireDefault(require("../../../assets/images/carouselImagesLogin/loginImage.svg"));
-
-var _login = _interopRequireDefault(require("../../../assets/images/carouselImagesLogin/login2.svg"));
-
-var _login2 = _interopRequireDefault(require("../../../assets/images/carouselImagesLogin/login3.svg"));
-
-var _jsxRuntime = require("react/jsx-runtime");
-
-var _default = {
-  title: "Components/pages/RegistrationLoginFirstStep",
-  component: _index.RegistrationLoginFirstStep
-};
-exports.default = _default;
-
-var Template = function Template(args) {
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_index.RegistrationLoginFirstStep, (0, _objectSpread2.default)({}, args));
-};
-
-var RegistrationLoginFirstStepDefault = Template.bind({});
-exports.RegistrationLoginFirstStepDefault = RegistrationLoginFirstStepDefault;
-RegistrationLoginFirstStepDefault.args = {
-  imageArrayCarousel: [_loginImage.default, _login.default, _login2.default],
-  textCarousel: "Elige la plataforma que conecta proovedores y retailers"
-};