contentoh-components-library 21.0.96 → 21.0.99

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

@@ -45,6 +45,11 @@ const reducerImages = (state, action) => {
     case "changeAttrValue":
       attrForImgs[action.retailer][action.index].value = action.value;
       return { ...state, attrForImgs, values };
+    case "deleteImage":
+      values = values.filter(
+        (value) => action.selectedImages.indexOf(value) === -1
+      );
+      return { ...state, values };
     default:
       return state;
   }
@@ -153,6 +158,8 @@ export const RetailerProductEdition = ({
   const [retailerStatus, setRetailerStatus] = useState("-");
   const [statusArray, setStatusArray] = useState([]);
   const [socketType, setSocketType] = useState(null);
+  const [servicesStatus, setServicesStatus] = useState([]);
+  const [saving, setSaving] = useState(loading);
 
   useEffect(() => {
     checkAll && setSelectedImages(images.values);
@@ -166,18 +173,15 @@ export const RetailerProductEdition = ({
     );
     //Converts the data inside the datasheets object to array
     setServices(services);
+    getServices();
 
     //setActiveRetailer(product?.retailers[0]);
     setImages({
       action: "init",
-      init: JSON.parse(sessionStorage.getItem("imagesList")) || services[2],
+      init: services[2],
     });
     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);
   };
@@ -234,7 +238,13 @@ export const RetailerProductEdition = ({
     // getPercentage({ data: [product] }).then((res) =>
     //   setPercentages(res)
     // );
-    getServices();
+    setActiveRetailer((current) =>
+      current.id
+        ? current
+        : product.retailers
+        ? product.retailers[0]
+        : product.retailersAvailable[0]
+    );
     getComments();
     setUserGroups(await fetchUsers(token));
     let arr = [];
@@ -483,6 +493,7 @@ export const RetailerProductEdition = ({
       });
     }
     if (valid && duplicated?.length === 0) {
+      setLoading(true);
       try {
         data?.articleData?.forEach((e) => {
           e.uuid = uuidv4();
@@ -524,7 +535,6 @@ export const RetailerProductEdition = ({
 
   useEffect(async () => {
     if (imagesUploaded) {
-      setLoading(true);
       dataImages.articleData = dataImages?.articleData.map((e) => {
         delete e.src;
         e.imageID = e.image_id;
@@ -561,6 +571,10 @@ export const RetailerProductEdition = ({
       product[`${getConcept(tab)}_status`] === "QF" ||
       product[`${getConcept(tab)}_status`] === "IN_PROGRESS";
 
+    const auditorUnvalidated = !["RA", "AA"].includes(
+      product[`${getConcept(tab)}_status`]
+    );
+
     switch (userId) {
       case 7:
       case 8:
@@ -582,7 +596,8 @@ export const RetailerProductEdition = ({
       case 6:
         return (
           statusArray.includes(product.status) &&
-          servicesData.every((serv) => ["RA", "AA"].includes(serv.status))
+          servicesData.every((serv) => ["RA", "AA"].includes(serv.status)) &&
+          auditorUnvalidated
         );
       default:
         break;
@@ -660,7 +675,7 @@ export const RetailerProductEdition = ({
             Authorization: token,
           },
         });
-        getServices();
+        //getServices();
       } else {
         const specialistDone =
           evalStatus === "RF" ||
@@ -723,8 +738,8 @@ export const RetailerProductEdition = ({
             Authorization: token,
           },
         });
-        getServices();
       }
+      loadData();
       sessionStorage.setItem("productSelected", JSON.stringify(productTemp));
       setProduct(productTemp);
     } catch (error) {
@@ -836,7 +851,22 @@ export const RetailerProductEdition = ({
     });
 
     objetcTemp["Descripción"] = desInputsRequired;
-    const requiredImages = services[2]?.inputs?.filter((e) => e.required);
+
+    const retailersRequested = [];
+    services[2]?.retailerMandatories?.forEach((retMan) =>
+      retMan.forEach((rm) => retailersRequested.push(rm))
+    );
+    const requiredImages = services[2]?.inputs?.filter(
+      (e) =>
+        e.required === 1 &&
+        retailersRequested.filter(
+          (ret) =>
+            ret.id_image === e.id &&
+            servicesData.filter((srv) => srv.id_retailer === ret.id_retailer)
+              .length > 0
+        ).length > 0
+    );
+
     let requiredCounter = 0;
     requiredImages?.forEach(
       (req) =>
@@ -985,7 +1015,6 @@ export const RetailerProductEdition = ({
 
   const deleteImages = () => {
     setLoading(true);
-    const imagesTemp = images;
     const { values } = images;
     const imgsInBack = [];
 
@@ -997,12 +1026,10 @@ export const RetailerProductEdition = ({
       (value) => selectedImages.indexOf(value) === -1
     );
 
-    imagesTemp.values = imgsLeft;
-
     if (imgsInBack.length > 0) {
       const data = {
         articleId: product.article.id_article,
-        deleteImages: selectedImages,
+        deleteImages: imgsInBack,
       };
       try {
         axios.put(
@@ -1016,8 +1043,22 @@ export const RetailerProductEdition = ({
         console.log(err);
       }
     }
-    sessionStorage.setItem("imagesList", JSON.stringify(imagesTemp));
-    loadData();
+
+    setImages({
+      action: "deleteImage",
+      selectedImages,
+    });
+
+    getRequired([
+      services[0],
+      services[1],
+      { ...services[2], values: imgsLeft },
+    ]);
+
+    setTimeout(() => {
+      setLoading(false);
+    }, 500);
+
     setMessage("");
     setComponentsArray([]);
   };
@@ -1093,6 +1134,10 @@ export const RetailerProductEdition = ({
     services.length > 0 && getRequired(services);
   }, [services, servicesData, activeTab]);
 
+  useEffect(() => {
+    setSaving(loading);
+  }, [loading]);
+
   return (
     <Container headerTop={headerTop}>
       <HeaderTop setHeaderTop={setHeaderTop} />
@@ -1123,6 +1168,7 @@ export const RetailerProductEdition = ({
             headerData={product}
             percent={activePercentage}
             activeRetailer={activeRetailer}
+            servicesData={servicesData}
             setActiveRetailer={setActiveRetailer}
             sendToFacilitator={sendToFacilitator}
             approve={() => {
@@ -1146,17 +1192,21 @@ export const RetailerProductEdition = ({
             assig={assig[activeTab]}
             setAssignation={setAssignation}
             isRetailer={isRetailer}
-            showSaveButton={true}
+            showSaveButton={userAssigned()}
             onClickSave={() => {
               switch (activeTab) {
                 case "Descripción":
-                  product?.description_status !== "NS" && saveDescriptions();
+                  !saving &&
+                    product?.description_status !== "NS" &&
+                    saveDescriptions();
                   break;
                 case "Ficha técnica":
-                  product?.datasheet_status !== "NS" && saveDatasheets();
+                  !saving &&
+                    product?.datasheet_status !== "NS" &&
+                    saveDatasheets();
                   break;
                 case "Imágenes":
-                  product?.images_status !== "NS" && updateImages();
+                  !saving && product?.images_status !== "NS" && updateImages();
                   break;
 
                 default:

package/src/global-files/data.js

@@ -194,5 +194,7 @@ export const 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");
 };