contentoh-components-library 21.0.97 → 21.1.0

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

@@ -515,7 +515,9 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
             //   setPercentages(res)
             // );
 
-            setActiveRetailer(product.retailers ? product.retailers[0] : product.retailersAvailable[0]);
+            setActiveRetailer(function (current) {
+              return current.id ? current : product.retailers ? product.retailers[0] : product.retailersAvailable[0];
+            });
             getComments();
             _context4.t0 = setUserGroups;
             _context4.next = 6;
@@ -971,6 +973,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
         srvActive = _srv$filter2[0];
 
     var unvalidated = product["".concat(getConcept(tab), "_status")] === "QF" || product["".concat(getConcept(tab), "_status")] === "IN_PROGRESS";
+    var auditorUnvalidated = !["RA", "AA"].includes(product["".concat(getConcept(tab), "_status")]);
 
     switch (userId) {
       case 7:
@@ -988,7 +991,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
       case 6:
         return statusArray.includes(product.status) && servicesData.every(function (serv) {
           return ["RA", "AA"].includes(serv.status);
-        });
+        }) && auditorUnvalidated;
 
       default:
         break;
@@ -1055,7 +1058,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
               data = {};
 
               if (!result) {
-                _context9.next = 13;
+                _context9.next = 12;
                 break;
               }
 
@@ -1076,11 +1079,10 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
               });
 
             case 10:
-              getServices();
-              _context9.next = 32;
+              _context9.next = 30;
               break;
 
-            case 13:
+            case 12:
               specialistDone = evalStatus === "RF" || evalStatus === "RA" || evalStatus === "IN_PROGRESS";
 
               if (specialistDone) {
@@ -1115,51 +1117,49 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
                 retailerId: activeRetailer.id
               };
               _context9.t0 = user.id_role;
-              _context9.next = _context9.t0 === 7 ? 24 : _context9.t0 === 8 ? 24 : _context9.t0 === 4 ? 26 : _context9.t0 === 5 ? 26 : 28;
+              _context9.next = _context9.t0 === 7 ? 23 : _context9.t0 === 8 ? 23 : _context9.t0 === 4 ? 25 : _context9.t0 === 5 ? 25 : 27;
               break;
 
-            case 24:
+            case 23:
               data.especialist = true;
-              return _context9.abrupt("break", 29);
+              return _context9.abrupt("break", 28);
 
-            case 26:
+            case 25:
               data.facilitator = true;
-              return _context9.abrupt("break", 29);
+              return _context9.abrupt("break", 28);
 
-            case 28:
-              return _context9.abrupt("break", 29);
+            case 27:
+              return _context9.abrupt("break", 28);
 
-            case 29:
-              _context9.next = 31;
+            case 28:
+              _context9.next = 30;
               return _axios.default.put("".concat(process.env.REACT_APP_SEND_EVAL), data, {
                 headers: {
                   Authorization: token
                 }
               });
 
-            case 31:
-              getServices();
-
-            case 32:
+            case 30:
+              loadData();
               sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
               setProduct(productTemp);
-              _context9.next = 39;
+              _context9.next = 38;
               break;
 
-            case 36:
-              _context9.prev = 36;
+            case 35:
+              _context9.prev = 35;
               _context9.t1 = _context9["catch"](1);
               console.log(_context9.t1);
 
-            case 39:
+            case 38:
               setLoading(false);
 
-            case 40:
+            case 39:
             case "end":
               return _context9.stop();
           }
         }
-      }, _callee9, null, [[1, 36]]);
+      }, _callee9, null, [[1, 35]]);
     }));
 
     return function sendToFacilitator(_x) {

package/dist/global-files/data.js

@@ -282,6 +282,8 @@ var getNewStatus = function getNewStatus(statusArray) {
   if (lookupString.includes("AA")) return "AA";
   if (lookupString.includes("AP")) return "AP";
   if (lookupString.includes("AC")) return "AC";
+  if (lookupString.includes("RECEIVED")) return "RECEIVED";
+  if (lookupString.includes("NA")) return "NA";
   return new Error("Status not found");
 };
 

package/package.json

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

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

@@ -22,14 +22,8 @@ export const AsignationOption = ({
   const getStatus = () => {
     let servCad = "";
     services.forEach((srv) => (servCad += srv));
-    switch (servCad) {
-      case "NANANA":
-        return "NA";
-      case "RECEIVEDRECEIVEDRECEIVED":
-        return "RECEIVED";
-      default:
-        return getNewStatus(services);
-    }
+
+    return getNewStatus(services);
   };
 
   const iconsAsignation = {

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

@@ -23,6 +23,7 @@ export const GeneralInput = ({
   version,
   optionList = [],
   description,
+  inputOnChange,
 }) => {
   const [textValue, setTextValue] = useState({
     value: inputValue,
@@ -31,12 +32,13 @@ export const GeneralInput = ({
 
   const onHandleChange = (evt) => {
     if (validateInput) {
+      console.log("here");
       setTextValue({ value: validateInput(evt, position, inputsArray) });
-    } else {
+    } else if (updatedDatasheets || updatedDescriptions) {
       setTextValue({
         value: inputType === "checkbox" ? evt.target.checked : evt.target.value,
       });
-      let dataSave = updatedDatasheets.slice();
+      let dataSave = updatedDatasheets?.slice();
       if (dataSave.length === 0)
         dataSave.push({
           articleId: articleId,
@@ -62,6 +64,9 @@ export const GeneralInput = ({
         });
       }
       setUpdatedDatasheets(dataSave);
+    } else {
+      setTextValue({ value: evt.target.value });
+      inputOnChange && inputOnChange(evt);
     }
   };
 
@@ -81,14 +86,14 @@ export const GeneralInput = ({
           //disabled={!enableInputs}
           onChange={(e) => onHandleChange(e)}
         >
-          <option value="" selected disabled>
+          <option value="" disabled>
             {description}
           </option>
-          {JSON.parse(optionList || "[]").map((element) => (
+          {JSON.parse(optionList || "[]").map((element, index) => (
             <option
-              key={element}
+              key={element + "-" + index}
               value={element}
-              selected={element === textValue.value ? "selected" : ""}
+              defaultValue={element === textValue.value ? "selected" : ""}
             >
               {element}
             </option>

package/src/components/molecules/LoginPasswordStrength/index.js

@@ -13,30 +13,19 @@ export const LoginPasswordStrength = ({
   let numbers = /[0-9]/g;
   let specialChar = /[‘!’,‘@’,‘#’,‘$’,‘%’,‘^’,‘&’,‘*’]/g;
 
-  useEffect(() => {
-    const inputValue = document.getElementById("newPasswordInput");
-    inputValue.addEventListener(
-      "input",
-      (e) => {
-        updateInfo(e, e.target.value);
-      },
-      false
-    );
-  }, []);
-
-  const updateInfo = (e, newValue) => {
+  const updateInfo = (e) => {
     switch (e.target.id) {
       case "newPasswordInput":
         setPasswordStrength(0);
-        if (newValue.length >= 8) {
+        if (e.target.value.length >= 8) {
           setPasswordStrength((passwordStrength) => passwordStrength + 1);
         }
         //Verificar si la contraseña contiene mayuscula, numeros y un caracter especial
-        newValue.match(upperCaseLetters) &&
+        e.target.value.match(upperCaseLetters) &&
           setPasswordStrength((passwordStrength) => passwordStrength + 1);
-        newValue.match(numbers) &&
+        e.target.value.match(numbers) &&
           setPasswordStrength((passwordStrength) => passwordStrength + 1);
-        newValue.match(specialChar) &&
+        e.target.value.match(specialChar) &&
           setPasswordStrength((passwordStrength) => passwordStrength + 1);
         break;
       default:
@@ -52,6 +41,7 @@ export const LoginPasswordStrength = ({
           inputId={"newPasswordInput"}
           label={"Ingrese su nueva contraseña"}
           isRequired={required}
+          inputOnChange={updateInfo}
         />
         {emptyPassword && (
           <label>La contraseña debe ser minimo de 8 caracteres</label>

package/src/components/molecules/TagAndInput/index.js

@@ -23,6 +23,7 @@ export const TagAndInput = ({
   required,
   optionList,
   description,
+  inputOnChange,
 }) => {
   return (
     <Container
@@ -54,6 +55,7 @@ export const TagAndInput = ({
         required={required}
         optionList={optionList}
         description={description}
+        inputOnChange={inputOnChange}
       />
     </Container>
   );

package/src/components/organisms/FullProductNameHeader/index.js

@@ -34,7 +34,11 @@ export const FullProductNameHeader = ({
     <Container>
       <ProductNameHeader
         productName={headerData?.article?.name || headerData?.name}
-        statusType={headerData?.version_status || headerData?.status}
+        statusType={
+          headerData?.version_status ||
+          headerData?.status ||
+          headerData?.article_status
+        }
         percent={percent?.toFixed(0)}
         priority={headerData?.prio}
         date={new Date(

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

@@ -17,8 +17,7 @@ export const ChangePasswordLogin = ({
   const [emptyPassword, setEmptyPassword] = useState(false);
   const [emptyConfirmPassword, setEmptyConfirmPassword] = useState(false);
   const [matchPasswords, setMatchPasswords] = useState(true);
-  const validate = async (e) => {
-    e.preventDefault();
+  const validate = (e) => {
     const password = document.querySelector("#newPasswordInput").value;
     password.length < 8 ? setEmptyPassword(true) : setEmptyPassword(false);
     const confirmPassword = document.querySelector(

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

@@ -16,102 +16,170 @@ ProviderProductEditionDefault.args = {
     Imágenes: false,
   },
   token:
-    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiJmNTkyN2Y4ZS1jYmY3LTQ5MjItOWUwOS1lNjllYzBiMjczMWEiLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6ImY1OTI3ZjhlLWNiZjctNDkyMi05ZTA5LWU2OWVjMGIyNzMxYSIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiJhZWQzMzEyZi1kZGYyLTQ2ZTAtOTgyNS1lODU2ZDM0ODYwNzMiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY1Mzk1NzQ3MiwibmFtZSI6IklzbWFlbCBMb3BleiIsInBob25lX251bWJlciI6Iis1MjMxMTEzNjYzMzYiLCJleHAiOjE2NTM5NjEwNzIsImlhdCI6MTY1Mzk1NzQ3MiwiZW1haWwiOiJpbG9wZXpAY29udGVudG9oLmNvbSJ9.Fq4bWu0irZ3NHDU2MOXBJZaqQlzbXwrS6YY2_GBG0Nq8z5gNmKr8LFcjBvD1mYj6sO6BHPrh0yzAOtlQMVOFAeXXRZ524Um_rpECWKDUD8IjCKUIgbqQos_YB-09zetlsmIE6Pd29UxDuwrN7zWqzzTuKGUnNhfC8uS3_tG9fi4TxNY0TY8Jwuk9uo0LlOjiIb28mL06B98EWTFbuze5J0AADfa_p0zEqYMyAIn4kYouIOt8eqOVFfZ4piEJMMcbwwaPwVTpy8e6FSLHrQeCa054ZJCvdGQLKhN1Ceue77voFINI9umnEIExAp_w2miOwzJjuk6E1ALf2LWo-Rz_qg",
+    "eyJraWQiOiJkQWJkZCtlclwvTlwveVRQUWNvUlVyOCtrNUd2M1hMM2N1MWUzQ09zWExVRnc9IiwiYWxnIjoiUlMyNTYifQ.eyJzdWIiOiI1ODg0YWUzNC01OWQ2LTQ0NTQtYjk4ZS04MjE1MThiY2MzYTciLCJjb2duaXRvOmdyb3VwcyI6WyJ1c3VhcmlvX2NvbnRlbnRvaCJdLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiaXNzIjoiaHR0cHM6XC9cL2NvZ25pdG8taWRwLnVzLWVhc3QtMS5hbWF6b25hd3MuY29tXC91cy1lYXN0LTFfWE1aUWRxa0dqIiwicGhvbmVfbnVtYmVyX3ZlcmlmaWVkIjpmYWxzZSwiY29nbml0bzp1c2VybmFtZSI6IjU4ODRhZTM0LTU5ZDYtNDQ1NC1iOThlLTgyMTUxOGJjYzNhNyIsImNvZ25pdG86cm9sZXMiOlsiYXJuOmF3czppYW06Ojg5ODY3MDIzMjgwNzpyb2xlXC9jb250ZW50b2gtZGV2LXVzLWVhc3QtMS1sYW1iZGFSb2xlIl0sImF1ZCI6IjVhYzh0cGdzNmdic3ExM2ZydnJwaWVlcDQwIiwiZXZlbnRfaWQiOiJhOTZjN2YxMi0wYjI5LTRkMzctOWMxOS1mMDAzMWFiMGY2N2EiLCJ0b2tlbl91c2UiOiJpZCIsImF1dGhfdGltZSI6MTY1NTQ5MjkzNiwibmFtZSI6IkNhZGVuYSBJc21hZWwiLCJwaG9uZV9udW1iZXIiOiIrNTIzMTExMzY2MzM2IiwiZXhwIjoxNjU1NDk2NTM2LCJpYXQiOjE2NTU0OTI5MzYsImVtYWlsIjoiY2FkZW5hLmlzbWFlbEBhbGxmcmVlbWFpbC5uZXQifQ.Rg3hxEzGy4pSDcG-q5lXRZWBoBiXQQKCdpRtAChvQuGM5GaQySgBW0YUEIXcLuwMbWSzj3RWJ4ZTY8NZvUhYIRbGqnIhB82FP41YCcYF7BYDilr4pZzeqEjx6U4_jR4HtbmkFfscyg0Q1VINNHTj1b0n1xLNMiE6rM7hY3eWFFhyvXn5OIH_5fZaHjYRe2uBDnF6Ogx1Za2z8DzyKkR2-QjVo4l-f64Egc5EfYWm6_3gZ1gkRGLxa7HfQXNUs0ds7Ifkx4QYHggUQdkrNdmGeYGxqZFYgG5a4LWZ-17E6x5yL87LhH-oErepE6xe6oyy-DnHaf7rWnRPqxSuilW5lQ",
   articleId: 238,
   category: 846,
   version: 2,
   productSelected: {
-    id_article: 35319,
-    id_category: "2146",
-    name: "FOCO LED A19 (60W) LUZ AMARILLA",
-    upc: "120873",
-    timestamp: "2022-06-14T15:31:50.000Z",
-    status: "NULL",
-    categoryName: "ILUMINACIÓN|FOCOS|LEDS",
-    asignations: [],
+    orderId: 14,
+    article_status: "AP",
+    datasheet_status: "AC",
+    description_status: "AC",
+    images_status: "AP",
+    prio: "none",
     version: 2,
-    version_status: "AA",
-    retailersAvailable: [
+    brand: null,
+    article: {
+      category: "ILUMINACIÓN|FOCOS|LEDS",
+      company_name: "COMPANY DEV",
+      country: "México",
+      id_category: "2146",
+      id_article: 35705,
+      name: "FOCO LED A19 (60W) LUZ AMARILLA",
+      upc: "12087311111",
+    },
+    retailers: [
       {
         id: 58,
         name: "The Home Depot Golden",
-        country: "México",
-        id_region: 1,
-        active: 1,
+      },
+      {
+        id: 59,
+        name: "The Home Depot Platinum",
+      },
+      {
+        id: 60,
+        name: "The Home Depot Resizing",
+      },
+      {
+        id: 61,
+        name: "Home Depot TAB",
       },
     ],
-    missing: {
-      datasheet: 33,
-      description: 0,
-      image: 23,
+    services: {
+      datasheets: 1,
+      descriptions: 1,
+      images: 1,
     },
+    id_article: 35705,
+    retailersAvailable: [
+      {
+        id: 58,
+        name: "The Home Depot Golden",
+      },
+      {
+        id: 59,
+        name: "The Home Depot Platinum",
+      },
+      {
+        id: 60,
+        name: "The Home Depot Resizing",
+      },
+      {
+        id: 61,
+        name: "Home Depot TAB",
+      },
+    ],
   },
   productToEdit: {
+    ArticleId: 35705,
     idCategory: "2146",
-    ArticleId: 35319,
-    product: [
-      {
-        id_article: 35319,
+    product: {
+      orderId: 14,
+      article_status: "AP",
+      datasheet_status: "AC",
+      description_status: "AC",
+      images_status: "AP",
+      prio: "none",
+      version: 2,
+      brand: null,
+      article: {
+        category: "ILUMINACIÓN|FOCOS|LEDS",
+        company_name: "COMPANY DEV",
+        country: "México",
         id_category: "2146",
+        id_article: 35705,
         name: "FOCO LED A19 (60W) LUZ AMARILLA",
-        upc: "120873",
-        timestamp: "2022-06-14T15:31:50.000Z",
-        status: "NULL",
-        categoryName: "ILUMINACIÓN|FOCOS|LEDS",
-        asignations: [],
-        version: 2,
-        version_status: "AA",
-        retailersAvailable: [
-          {
-            id: 58,
-            name: "The Home Depot Golden",
-            country: "México",
-            id_region: 1,
-            active: 1,
-          },
-        ],
-        missing: {
-          datasheet: 33,
-          description: 0,
-          image: 23,
+        upc: "12087311111",
+      },
+      retailers: [
+        {
+          id: 58,
+          name: "The Home Depot Golden",
+        },
+        {
+          id: 59,
+          name: "The Home Depot Platinum",
         },
+        {
+          id: 60,
+          name: "The Home Depot Resizing",
+        },
+        {
+          id: 61,
+          name: "Home Depot TAB",
+        },
+      ],
+      services: {
+        datasheets: 1,
+        descriptions: 1,
+        images: 1,
       },
-    ],
+      id_article: 35705,
+      retailersAvailable: [
+        {
+          id: 58,
+          name: "The Home Depot Golden",
+        },
+        {
+          id: 59,
+          name: "The Home Depot Platinum",
+        },
+        {
+          id: 60,
+          name: "The Home Depot Resizing",
+        },
+        {
+          id: 61,
+          name: "Home Depot TAB",
+        },
+      ],
+    },
   },
   location: {
     product: { articleId: 109485, versionId: 3 },
-    state: { origin: "RequestWithContentoh" },
+    state: { origin: "Contentoh" },
   },
   user: {
-    id_user: 28,
-    name: "Proveedor",
-    last_name: "Colgate",
-    email: "ilopez@contentoh.com",
-    position: "Prueba Admin",
+    id_user: 59,
+    name: "The Home",
+    last_name: "Depot",
+    email: "cadena.ismael@allfreemail.net",
+    position: "Admin",
     telephone: "+523111366336",
     country: "México",
-    id_company: 1,
-    id_cognito: "f5927f8e-cbf7-4922-9e09-e69ec0b2731a",
+    id_company: 7,
+    id_cognito: "5884ae34-59d6-4454-b98e-821518bcc3a7",
     birth_Date: null,
     about_me: null,
     zip_code: null,
     address: null,
     job: null,
-    id_stripe: "cus_KuEt6R6vwmN09f",
+    id_stripe: "",
     id_role: 0,
     active: 1,
-    is_retailer: 0,
+    is_retailer: 1,
     membership: {
-      id: 38,
-      start_date: "2022-01-18T17:25:35.000Z",
-      end_date: "2023-01-18T17:25:35.000Z",
-      planID: 8,
-      plan: "prod_KtlhECVSFG2iro",
-      name: "Plan Pro",
-      user_limit: "20",
-      products_limit: "5000",
+      id: 24,
+      start_date: "2021-11-23T03:35:50.000Z",
+      end_date: "2022-11-23T03:35:50.000Z",
+      planID: 9,
+      plan: "prod_KtlkzZVGq6bRTO",
+      name: "Plan Enterprise Full",
+      user_limit: "30",
+      products_limit: "10000",
       type: "Enterprise",
     },
-    src: "https://content-management-profile.s3.amazonaws.com/id-28/28.png?1655246340910",
+    src: "https://content-management-profile.s3.amazonaws.com/id-59/59.png?1655492937526",
   },
 };

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

@@ -215,6 +215,7 @@ export const ProviderProductEdition = ({
 
     //Converts the data inside the datasheets object to array
     setServices(services);
+    getServices();
 
     //setActiveRetailer(product?.retailers[0]);
     setImages({
@@ -223,10 +224,6 @@ export const ProviderProductEdition = ({
     });
     if (services[2]?.values?.length > 0) setActiveImage(0);
 
-    setActiveRetailer(
-      product.retailers ? product.retailers[0] : product.retailersAvailable[0]
-    );
-
     getPercentage({ data: [product] }).then((res) => setPercentages(res));
     setLoading(false);
   };
@@ -301,11 +298,13 @@ export const ProviderProductEdition = ({
 
   useEffect(async () => {
     loadData();
+    setActiveRetailer(
+      product.retailers ? product.retailers[0] : product.retailersAvailable[0]
+    );
     // getPercentage({ data: [product] }).then((res) =>
     //   setPercentages(res)
     // );
     getCart();
-    getServices();
     setUserGroups(await fetchUsers(token));
     let arr = [];
     switch (user.id_role) {
@@ -1175,6 +1174,7 @@ export const ProviderProductEdition = ({
     sessionStorage.setItem("productEdit", JSON.stringify(prod));
     setProduct(prod);
     setShowGenericModal && setShowGenericModal(false);
+    loadData();
   };
 
   const getSectionStatus = () => {
@@ -1447,9 +1447,7 @@ export const ProviderProductEdition = ({
                 onClick={() => {
                   //setModalSent(true);
                   sendEvaluation();
-                  setMessage(
-                    `¡Evaluación de ${translateConcept()} completada!`
-                  );
+                  setMessage(`¡Evaluación de ${activeTab} completada!`);
                 }}
               />
             </div>
@@ -1464,10 +1462,10 @@ export const ProviderProductEdition = ({
               </div>
               {inCart ? (
                 <button type="button">
-                  <Link to="/checkout">
+                  {/* <Link to="/checkout">
                     <p>Articulo en carrito</p>
                     <p>Ir a checkout</p>
-                  </Link>
+                  </Link> */}
                 </button>
               ) : (
                 <Button
@@ -1486,7 +1484,7 @@ export const ProviderProductEdition = ({
       {showModal && (
         <ProductImageModal images={images} setShowModal={setShowModal} />
       )}
-      {message.length > 0 && (
+      {message.length > 0 && !showSurvey && (
         <GenericModal
           buttonType={componentsArray.length > 0 && "delete-product"}
           componentsArray={