contentoh-components-library 21.2.7 → 21.2.10

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

@@ -913,16 +913,17 @@ export const ProviderProductEdition = ({
     try {
       setLoading(true);
       const evaluationArray = [];
-      const sendAll = [];
       const conceptArray = ["description", "datasheet", "images"];
       const dataGeneral = {
         articleId: product.id_article,
         orderId: product.id_order ?? product.orderId,
         result,
+        isAproved: result === "A",
       };
       servicesData?.forEach((ret) => {
         const { service, id_retailer } = ret;
-        const data = {
+        let data = {};
+        data = {
           ...dataGeneral,
           concept: service,
           retailerId: id_retailer,
@@ -935,31 +936,25 @@ export const ProviderProductEdition = ({
             },
           })
         );
-        sendAll.push(
-          axios.put(`${process.env.REACT_APP_SEND_EVAL}`, data, {
-            headers: {
-              Authorization: token,
-            },
-          })
-        );
       });
-
-      await Promise.all([...evaluationArray, ...sendAll]);
+      const evalResponse = await Promise.all(evaluationArray);
+      console.log(evalResponse.map(({ data }) => JSON.parse(data.body)));
+      const userType = user.is_retailer === 1 ? "CA" : "P";
 
       const productTemp = product;
-      productTemp.article_status = `${result}CA`;
+      productTemp.article_status = `${result}${userType}`;
       productTemp.datasheet_status =
-        productTemp.datasheet_status === "NA" ? "NA" : `${result}CA`;
+        productTemp.datasheet_status === "NA" ? "NA" : `${result}${userType}`;
       productTemp.description_status =
-        productTemp.description_status === "NA" ? "NA" : `${result}CA`;
+        productTemp.description_status === "NA" ? "NA" : `${result}${userType}`;
       productTemp.images_status =
-        productTemp.images_status === "NA" ? "NA" : `${result}CA`;
+        productTemp.images_status === "NA" ? "NA" : `${result}${userType}`;
 
       const retailerStatusCopy = { ...retailerStatus };
       Object.keys(retailerStatusCopy).forEach((key) => {
         conceptArray.forEach((concept) => {
           if (retailerStatusCopy[key][concept]) {
-            retailerStatusCopy[key][concept] = `${result}CA`;
+            retailerStatusCopy[key][concept] = `${result}${userType}`;
           }
         });
       });
@@ -1494,6 +1489,7 @@ export const ProviderProductEdition = ({
           companyName={company.company_name}
           currentVersion={version}
           setShowCreateVersion={setShowCreateVersion}
+          setShowVersionSelector={setShowVersionSelector}
         />
       )}
       {showCreateVersion && (

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

@@ -16,82 +16,82 @@ RetailerProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJEV3owZnNieXg2MXNFcVduN3RCXC81bVhod3ZNbFZIOTgwUnZcL3RjT0lKdEk9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIwYjY2YTRhOS03NzkwLTQwMzQtYTMwYS1jMDA4MDg5NjI4NjciLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfbFN6UVo0WjdSIiwiY29nbml0bzp1c2VybmFtZSI6IjBiNjZhNGE5LTc3OTAtNDAzNC1hMzBhLWMwMDgwODk2Mjg2NyIsImF1ZCI6IjUyZDlza2tkY2c4cWpwODhvb2sxdXNlNm1rIiwiZXZlbnRfaWQiOiI4ZjA2YmU0NC04ZWEzLTQ5OWMtOGFjZC0xMDlmMDZiZWI1MjAiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY2MDA3NjQ5MywibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY2MDA4MDA5MywiaWF0IjoxNjYwMDc2NDkzLCJlbWFpbCI6ImJheWFkaTE1MzhAbW5xbG0uY29tIn0.aw_x1A8WR2MCp_Kz-T2Jcg0ZtuKwyzQ23yT_OoKr-aGJmEjSPihmksWgLZr9hJXyfvU0JndaVMM_3DRly1TdtJ264zwH4dZ7Cp9gF4TSXG16HQxIIPUA4NnwdpOnlBdE9E27mCXs4XYnCZ7dRMXnkjpRL4PVbrGji9qbEEJR6TxCJafR-zes1o4HC1KfQ5QF4s5I_LYQYbD-Ot0A1zDiJg34HR9tTILu5f4uc_2Nj8bqqYJsEdKg982WWO9ac2uKRPXQqNL6CsdltnSeQQcnS6Wj5DJTRRoc-lRdE6ekpAvDGPo0Dyj1Q8GYH3uxvM-pVu8J1Z_JOtO5j5mPN9krpA",
+    "eyJraWQiOiJEV3owZnNieXg2MXNFcVduN3RCXC81bVhod3ZNbFZIOTgwUnZcL3RjT0lKdEk9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiIwYjY2YTRhOS03NzkwLTQwMzQtYTMwYS1jMDA4MDg5NjI4NjciLCJjb2duaXRvOmdyb3VwcyI6WyJjb2xhYm9yYWRvcmVzX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfbFN6UVo0WjdSIiwiY29nbml0bzp1c2VybmFtZSI6IjBiNjZhNGE5LTc3OTAtNDAzNC1hMzBhLWMwMDgwODk2Mjg2NyIsImF1ZCI6IjUyZDlza2tkY2c4cWpwODhvb2sxdXNlNm1rIiwiZXZlbnRfaWQiOiIzNmIxMmUwMy0xOWJhLTRiMDktYWJiYS1kZjk3ZTFkNThjZTQiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY2MDE4MjgzNywibmFtZSI6IkNvbGFib3JhZG9yIiwicGhvbmVfbnVtYmVyIjoiKzUyMTExMSIsImV4cCI6MTY2MDE4NjQzNywiaWF0IjoxNjYwMTgyODM3LCJlbWFpbCI6ImJheWFkaTE1MzhAbW5xbG0uY29tIn0.MM9nIHkrRIS2o8_s4BR6VTLgyw3ryvPrr-mf6RtnQ4smng2Q3fmtK07zInNcvcrv8EXO5J9z47_NZ5MOJDo1Pz1CV2cOYM7PT5tEn3F-W4SitqDbBw3KxfkqSMxdZUIHLWECGL-u2ATCYU2J4KRVQi8XSP1qbfv1hu9dh-vID8Fq641ccQwEqUDC13pshDPlR08legg7AAPJqoilV7wuvxqTYAK6fGqMS5jcdW2iDmU0ti9gkydXkYRIC-jg446VOmRCpwzKsk4UAPwlrGeodQ0LV1bfWn_-KVspWCRQd6U5WbFxHn0umYe3CvvPpyVmHzD3F_EMxaVyqV5aW5IoIQ",
   productSelected: {
-    services: {
-      datasheets: 0,
-      descriptions: 0,
-      images: 1,
+    "services": {
+        "datasheets": 1,
+        "descriptions": 1,
+        "images": 1
     },
-    orderId: 1789,
-    status: "ACA",
-    datasheet_status: "NS",
-    prio: "none",
-    version: 2,
-    description_status: "NS",
-    images_status: "ACA",
-    article: {
-      id_article: 68865,
-      id_category: "2999",
-      name: "RESIZE",
-      upc: "169955",
-      timestamp: "2022-06-21T16:03:10.000Z",
-      id_user: 1238,
-      status: "NULL",
-      active: 0,
-      company_id: 819,
-      SKU: null,
-      Descripcion: null,
-      Proveedor: null,
-      id_proveedor: 0,
-      company_name: "The Home Depot Resize",
-      country: "México",
-      id_order: 1789,
-      id_datasheet_especialist: null,
-      id_datasheet_facilitator: null,
-      id_description_especialist: null,
-      id_description_facilitator: null,
-      id_images_especialist: 1250,
-      id_images_facilitator: 424,
-      id_auditor: null,
-      id_recepcionist: null,
-      category: "Resizing|Resizing|Resizing",
-      missingAttributes: null,
-      missingDescriptions: null,
-      missingImages: null,
+    "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: 60,
-        name: "The Home Depot Resizing",
-        country: "México",
-        id_region: 1,
-        active: 1,
-      },
+    "retailers": [
+        {
+            "id": 58,
+            "name": "The Home Depot Golden",
+            "country": "México",
+            "id_region": 1,
+            "active": 1
+        }
     ],
-    country: "México",
-    upc: "169955",
-  },
+    "country": null,
+    "upc": "167907"
+},
   location: {
     product: { articleId: 109485, versionId: 3 },
   },
   user: {
-    id_user: 425,
-    name: "Auditor QA",
+    id_user: 1248,
+    name: "Facilitador Textos",
     last_name: " ",
-    email: "ladiboh785@mi166.com",
+    email: "bayadi1538@mnqlm.com",
     position: "Tester",
     telephone: null,
     country: null,
     id_company: 254,
-    id_cognito: "23a3f496-4e38-4e12-9bf5-7f90b77a2f35",
+    id_cognito: "0b66a4a9-7790-4034-a30a-c00808962867",
     birth_Date: null,
     about_me: null,
     zip_code: null,
     address: null,
     job: null,
     id_stripe: null,
-    id_role: 1,
+    id_role: 7,
     active: 1,
     is_retailer: 0,
     email_notify: null,
@@ -106,6 +106,6 @@ RetailerProductEditionDefault.args = {
       products_limit: "1000",
       type: "Enterprise",
     },
-    src: "https://content-management-profile-prod.s3.amazonaws.com/id-425/425.png?1659649029658",
+    src: "https://content-management-profile-prod.s3.amazonaws.com/id-423/423.png?1660182839373",
   },
 };

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

@@ -60,7 +60,7 @@ const reducerImages = (state, action) => {
       values[action.index][action.attribute] = action.value;
       return { ...state, values };
     case "changeAttrValue":
-      const index = attrForImgs.general.findIndex((f) => (f.id = action.id));
+      const index = attrForImgs.general.findIndex((f) => f.id === action.id);
       if (index !== -1) {
         attrForImgs.general[index].value = action.value;
       }
@@ -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/src/index.js

@@ -63,6 +63,7 @@ export * from "./components/organisms/ProductImageModal/index";
 export * from "./components/pages/ChangePasswordLogin";
 export * from "./components/pages/CustomerLogin";
 export * from "./components/pages/CustomerType";
+export * from "./components/pages/Dashboard";
 export * from "./components/pages/EmailResetPassword";
 export * from "./components/pages/OnboardPlan";
 export * from "./components/pages/RegistrationLoginSecondStep";