contentoh-components-library 21.3.79 → 21.3.80

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

@@ -485,28 +485,7 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
   var _useState83 = (0, _react.useState)(false),
       _useState84 = (0, _slicedToArray2.default)(_useState83, 2),
       valRejAll = _useState84[0],
-      setValRejAll = _useState84[1]; //! ==========================================Daniel===========================================
-
-  /*  ====================================== Cambios =================================*/
-
-
-  var _useState85 = (0, _react.useState)([]),
-      _useState86 = (0, _slicedToArray2.default)(_useState85, 2),
-      desc = _useState86[0],
-      setDesc = _useState86[1];
-
-  var _useState87 = (0, _react.useState)([]),
-      _useState88 = (0, _slicedToArray2.default)(_useState87, 2),
-      fich = _useState88[0],
-      setFich = _useState88[1];
-
-  var _useState89 = (0, _react.useState)([]),
-      _useState90 = (0, _slicedToArray2.default)(_useState89, 2),
-      imag = _useState90[0],
-      setImag = _useState90[1];
-  /*  ------------------------------------- Cambios ----------------------------------*/
-  //! ==========================================Daniel===========================================
-
+      setValRejAll = _useState84[1];
 
   (0, _react.useEffect)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
     var _ref3, id_article;
@@ -1993,14 +1972,9 @@ var RetailerProductEdition = function RetailerProductEdition(_ref) {
           isRetailer: isRetailer,
           showSaveButton: auditorAssigned() || userAssigned(),
           version: version,
-          desc: desc,
-          setDesc: setDesc,
-          fich: fich,
-          setFich: setFich,
-          imag: imag,
-          setImag: setImag,
           updatedDescriptions: updatedDescriptions,
           updatedDatasheets: updatedDatasheets,
+          images: images,
           selectedImages: selectedImages,
           setUpdatedDescriptions: setUpdatedDescriptions,
           setUpdatedDatasheets: setUpdatedDatasheets,

package/package.json

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

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

@@ -7,7 +7,7 @@ export const GeneralInput = ({
   inputType,
   inputId,
   inputName,
-  inputValue,
+  inputValue = "",
   inputPlaceholder,
   validateInput,
   position,
@@ -43,7 +43,6 @@ export const GeneralInput = ({
     ) {
       let generalValue;
       if (optionList?.length > 0) {
-        let index = evt.target.selectedIndex;
         let valueSelected = evt.target.value;
         generalValue = valueSelected;
         setTextValue({ value: generalValue });
@@ -56,26 +55,26 @@ export const GeneralInput = ({
       }
       let dataSave = updatedDatasheets?.slice();
 
-      if (dataSave.length === 0)
-        dataSave.push({
-          articleId: articleId,
-          versionId: version,
-          attributeId: inputId,
-          value: generalValue,
-        });
-      else if (dataSave.some((e) => e.attributeId === inputId)) {
-        dataSave.forEach((e) => {
-          if (e.attributeId === inputId) {
-            e.value = generalValue;
-          }
-        });
+      if (dataSave?.length > 0) {
+        const index = dataSave.findIndex((e) => e.attributeId === inputId);
+        if (index !== -1) {
+          if (generalValue !== inputValue) dataSave[index].value = generalValue;
+          else dataSave.splice(index, 1);
+        } else {
+          dataSave.push({
+            articleId: articleId,
+            attributeId: inputId,
+            value: generalValue,
+          });
+        }
       } else {
-        dataSave.push({
-          articleId: articleId,
-          versionId: version,
-          attributeId: inputId,
-          value: generalValue,
-        });
+        if (generalValue !== inputValue) {
+          dataSave.push({
+            articleId: articleId,
+            attributeId: inputId,
+            value: generalValue,
+          });
+        }
       }
       setUpdatedDatasheets(dataSave);
     } else {

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

@@ -1,6 +1,6 @@
 import ReactQuill from "react-quill";
 import "react-quill/dist/quill.snow.css";
-import { useEffect, useState } from "react";
+import { useState } from "react";
 import { Container } from "./styles";
 
 export const InputFormatter = ({
@@ -9,8 +9,6 @@ export const InputFormatter = ({
   articleId,
   updatedDescriptions,
   setUpdatedDescriptions,
-  addTextAreaToArray,
-  name,
   isRequired,
   maxChar,
 }) => {
@@ -44,7 +42,7 @@ export const InputFormatter = ({
       .replace(/\&/gm, "&");
   };
 
-  const onChange = (valueInput, delta, user, h) => {
+  const onChange = (valueInput, h) => {
     let value = "";
     try {
       if (h.getLength() - 1 <= maxLength) {
@@ -72,12 +70,10 @@ export const InputFormatter = ({
       let idInput = inputId;
       let dataSave = updatedDescriptions?.slice();
       if (dataSave?.length > 0) {
-        if (dataSave.filter((e) => e.attributeId === idInput).length > 0) {
-          dataSave.forEach((e) => {
-            if (e.attributeId === idInput) {
-              e.value = value;
-            }
-          });
+        const index = dataSave.findIndex((e) => e.attributeId === idInput);
+        if (index !== -1) {
+          if (value !== mainValue) dataSave[index].value = value;
+          else dataSave.splice(index, 1);
         } else {
           dataSave.push({
             articleId: articleId,
@@ -86,11 +82,13 @@ export const InputFormatter = ({
           });
         }
       } else {
-        dataSave.push({
-          articleId: articleId,
-          attributeId: idInput,
-          value: value,
-        });
+        if (value !== mainValue) {
+          dataSave.push({
+            articleId: articleId,
+            attributeId: idInput,
+            value: value,
+          });
+        }
       }
       setUpdatedDescriptions(dataSave);
     }
@@ -142,9 +140,7 @@ export const InputFormatter = ({
             e.preventDefault();
           }
         }}
-        onChange={(valueInput, user, range, h) => {
-          onChange(valueInput, user, range, h);
-        }}
+        onChange={(valueInput, user, range, h) => onChange(valueInput, h)}
         onChangeSelection={getSelection}
       />
       <p className="description-limit">

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

@@ -72,4 +72,4 @@ export const AvatarAndValidation = ({
       )}
     </Container>
   );
-};
+};

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

@@ -2,156 +2,103 @@ import { Container } from "./styles";
 import { TabSection } from "../../atoms/TabSection";
 import { useEffect, useState } from "react";
 
-
 import { Modal } from "../../organisms/Modal";
 import { ButtonV2 } from "../../atoms/ButtonV2";
 
-
 export const TabsMenu = ({
   tabsSections = {},
   setImagesSection,
   setActiveTab,
   activeTab,
-
-  desc,
-  setDesc,
-  fich,
-  setFich,
-  imag,
-  setImag,
   updatedDescriptions,
   updatedDatasheets,
-  selectedImages,
-  setUpdatedDescriptions,
-  setUpdatedDatasheets,
-  setSelectedImages
+  images,
 }) => {
   const [sections, setSections] = useState(tabsSections);
 
-
-  const [modal, setModal] = useState(false)
-  const [isFirstExecution, setIsFirstExecution] = useState(true)
-  const [detectaTab, setDetectaTab] = useState('')
-  const [cancelAccept, setCancelAccept] = useState('')
-  const [llave, setLlave] = useState('')
-  const [objeto, setObjeto] = useState()
-
-
-
+  const [modal, setModal] = useState(false);
+  const [cancelAccept, setCancelAccept] = useState("");
+  const [llave, setLlave] = useState("");
+  const [objeto, setObjeto] = useState();
 
   const activeSection = (key, array = {}) => {
     let tempArray = {};
     setImagesSection(key === "Imágenes");
     Object.keys(array).forEach((section) => {
       tempArray[section] = section === key;
-      if (section === key) {
-        
-        setUpdatedDatasheets([])
-        setUpdatedDescriptions([])
-        setSelectedImages([])
-        setDesc([])
-        setFich([])
-        setImag([])
-        return setActiveTab(key)
-      };
+      if (section === key) return setActiveTab(key);
     });
     setSections(tempArray);
   };
 
+  useEffect(() => {
+    if ((cancelAccept === "Aceptar") & (llave !== "")) {
+      setCancelAccept("");
+      setModal(false);
+      activeSection(llave, objeto);
+    } else if ((cancelAccept === "Cancelar") & (llave !== "")) {
+      setModal(false);
+      setCancelAccept("");
+    }
+  }, [cancelAccept]);
 
-
-
-    //! ==========================================Daniel===========================================
-  {/*=============================================================================
-    UseEffect para poder recolectar la info
-  ==============================================================================*/}
-
-useEffect(() => {
-    if (cancelAccept==='Aceptar' & llave!==''){
-      setCancelAccept('')
-      setModal(false)
-      activeSection(llave, objeto)
-    } else if (cancelAccept==='Cancelar' & llave!=='') {
-       setModal(false)
-       setCancelAccept('')
-    }  
-  },[cancelAccept])
-
- 
-
-  function detectClickFunction  (e,key,sections) {
-
-
+  const detectClickFunction = (e, key, sections) => {
     const targetIsTheCurrentTab = e.target.innerHTML === activeTab;
     const descriptionsWereUpdated = updatedDescriptions.length > 0;
     const datasheetWereUpdated = updatedDatasheets.length > 0;
-    const imagesWereUpdated = selectedImages.length > 0;
-    const dataWereUpdated = descriptionsWereUpdated || datasheetWereUpdated || imagesWereUpdated;
-
-    if (!targetIsTheCurrentTab && !dataWereUpdated ){ 
-      setLlave(key)
-      setObjeto(sections)
-      activeSection(key, sections)
-      }
-    else if(!targetIsTheCurrentTab &&  dataWereUpdated ){
-      setModal(true)
-      setLlave(key)
-      setObjeto(sections)
-
-
+    const imagesWereUpdated = images?.values?.filter((f) => !f.id)?.length > 0;
+    const dataWereUpdated =
+      descriptionsWereUpdated || datasheetWereUpdated || imagesWereUpdated;
+
+    if (!targetIsTheCurrentTab && !dataWereUpdated) {
+      setLlave(key);
+      setObjeto(sections);
+      activeSection(key, sections);
+    } else if (!targetIsTheCurrentTab && dataWereUpdated) {
+      setModal(true);
+      setLlave(key);
+      setObjeto(sections);
     }
-  } 
-
-
-
-
-  //! ==========================================Daniel===========================================
-
+  };
 
   return (
     <>
-    {/* //! ==========================================Daniel=========================================== */ }
-                  {/*=============================================================================
-                          Llamado al componente para poder renderizar la alerta
-                  ==============================================================================*/}
-                {activeTab && <Modal
-                  show={modal}
-                  title='Cambios sin Guardar'
-                  message= 'Estás cambiando de vista y aun no guardas cambios ¿Estás seguro?'
-                  buttons={ [
-                    <ButtonV2
-                      key={"btn-Cancelar"}
-                      type={"white"}
-                      label={"Cancelar"}
-                      size={12}
-                      onClick={(event) => setCancelAccept(event.target.textContent)}
-                    />,
-                    <ButtonV2
-                      key={"btn-Aceptar"}
-                      type={"pink"}
-                      label={"Aceptar"}
-                      size={12}
-                      onClick={(event) =>  setCancelAccept(event.target.textContent)}
-                    />,
-                  ]}
-                /> 
-                }
-                {/*=============================================================================
-                          Llamado al componente para poder renderizar la alerta
-                  ==============================================================================*/}
-{/*  //! ==========================================Daniel=========================================== */ }
-    <Container>
-      {Object.keys(sections).map((key, index) => (
-        <TabSection
-          key={index}
-          label={key}
-          active={sections[key]}
-          onClick={(e)=>{
-           detectClickFunction (e, key, sections)
-          }}
+      {activeTab && (
+        <Modal
+          show={modal}
+          title="Cambios sin Guardar"
+          message="Estás cambiando de vista y aun no guardas cambios ¿Estás seguro?"
+          buttons={[
+            <ButtonV2
+              key={"btn-Cancelar"}
+              type={"white"}
+              label={"Cancelar"}
+              size={12}
+              onClick={(event) => setCancelAccept(event.target.textContent)}
+            />,
+            <ButtonV2
+              key={"btn-Aceptar"}
+              type={"pink"}
+              label={"Aceptar"}
+              size={12}
+              onClick={(event) => setCancelAccept(event.target.textContent)}
+            />,
+          ]}
         />
-      ))}
-    </Container>
+      )}
+
+      <Container>
+        {Object.keys(sections).map((key, index) => (
+          <TabSection
+            key={index}
+            label={key}
+            active={sections[key]}
+            onClick={(e) => {
+              detectClickFunction(e, key, sections);
+            }}
+          />
+        ))}
+      </Container>
     </>
   );
-};
+};

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

@@ -1,8 +1,6 @@
 import { Container } from "./styles";
 import { ScreenHeader } from "../../atoms/ScreenHeader/index";
 import { GeneralInput } from "../../atoms/GeneralInput/index";
-import { useEffect } from "react";
-import { useState } from "react";
 
 export const TagAndInput = ({
   inputType,
@@ -32,7 +30,6 @@ export const TagAndInput = ({
   showTooltip,
   auditClass,
 }) => {
-  
   return (
     <Container
       inputType={inputType}
@@ -76,5 +73,4 @@ export const TagAndInput = ({
       />
     </Container>
   );
-  
 };

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

@@ -19,19 +19,13 @@ export const FullTabsMenu = ({
   canAssign,
   version,
   setShowVersionSelector,
-
-  desc,
-  setDesc,
-  fich,
-  setFich,
-  imag,
-  setImag,
+  images,
   updatedDescriptions,
   updatedDatasheets,
   selectedImages,
   setUpdatedDescriptions,
   setUpdatedDatasheets,
-  setSelectedImages
+  setSelectedImages,
 }) => {
   const [imagesSection, setImagesSection] = useState(false);
 
@@ -42,13 +36,7 @@ export const FullTabsMenu = ({
         setImagesSection={setImagesSection}
         setActiveTab={setActiveTab}
         activeTab={activeTab}
-
-        desc={ desc }
-        setDesc={ setDesc }
-        fich={fich}
-        setFich={setFich}
-        imag={imag}
-        setImag={setImag}
+        images={images}
         updatedDescriptions={updatedDescriptions}
         updatedDatasheets={updatedDatasheets}
         selectedImages={selectedImages}
@@ -74,4 +62,4 @@ export const FullTabsMenu = ({
       />
     </Container>
   );
-};
+};

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

@@ -3,7 +3,6 @@ import { TableHeader } from "../../molecules/TableHeader";
 import { Container as Row } from "../../molecules/TableRow/styles";
 import { ScreenHeader } from "../../atoms/ScreenHeader";
 import LabelToInput from "../../atoms/LabelToInput";
-import { useState, useEffect } from "react";
 
 export const ImageDataTable = ({
   activeImage,
@@ -21,7 +20,6 @@ export const ImageDataTable = ({
   setShowVersionSelector,
   shotThd,
 }) => {
-
   return (
     <Container darkMode={darkMode}>
       <TableHeader
@@ -45,7 +43,6 @@ export const ImageDataTable = ({
           }
         />
       </Row>
-      
       <Row>
         <ScreenHeader headerType={"table-row-text"} text="Tipo de empaque" />
         <ScreenHeader

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

@@ -47,7 +47,6 @@ export const InputGroup = ({
           text={inputGroup?.dataGroup}
         />
       )}
-      
       <div className="inputs-container">
         {inputGroup?.inputs?.map((input, index) =>
           activeSection === "Ficha técnica" ? (
@@ -119,11 +118,9 @@ export const InputGroup = ({
                   ? "audit-class"
                   : ""
               }
-            />
-            
+            />            
           )
-        )
-        }
+        )}
       </div>
     </Container>
   );

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

@@ -225,19 +225,6 @@ export const ProviderProductEdition = ({
     Imágenes: null,
   });
 
-
-      //! ==========================================Daniel===========================================
-  /*  ====================================== Cambios =================================*/
-  const [desc, setDesc] = useState([])
-  const [fich, setFich] = useState([])
-  const [imag, setImag] = useState([])
-
-    /*  ------------------------------------- Cambios ----------------------------------*/
-  //! ==========================================Daniel===========================================
-
-
-
-
   const [inCart, setInCart] = useState(false);
   const [dataGenericModal, setDataGenericModal] = useState({
     message: "¿Estás seguro de continuar?",
@@ -1259,6 +1246,7 @@ export const ProviderProductEdition = ({
     },
   ];
   const sendToEvaluation = (result) => {
+    console.log({ result });
     if (result === "A") {
       if (
         origin[activeTab] === "RequestWithoutContentoh" &&
@@ -1291,7 +1279,7 @@ export const ProviderProductEdition = ({
       }
     } else {
       if (
-        originProp === "RequestWithoutContentoh" &&
+        origin === "RequestWithoutContentoh" &&
         !user.is_retailer &&
         (!product.id_order || !product.orderId)
       ) {
@@ -1314,6 +1302,7 @@ export const ProviderProductEdition = ({
       }
     }
   };
+
   return (
     <Container headerTop={headerTop}>
       <HeaderTop
@@ -1359,7 +1348,7 @@ export const ProviderProductEdition = ({
             showApproveRejectAll={isRevision() && getSectionStatus()}
             approveAll={() => {
               if (
-                originProp === "RequestWithoutContentoh" &&
+                origin === "RequestWithoutContentoh" &&
                 !user.is_retailer &&
                 (!product.id_order || !product.orderId)
               ) {
@@ -1390,7 +1379,7 @@ export const ProviderProductEdition = ({
             }}
             rejectAll={() => {
               if (
-                originProp === "RequestWithoutContentoh" &&
+                origin === "RequestWithoutContentoh" &&
                 !user.is_retailer &&
                 (!product.id_order || !product.orderId)
               ) {
@@ -1439,20 +1428,13 @@ export const ProviderProductEdition = ({
             isRetailer={isRetailer}
             showSaveButton={enableActions(product.version_status)}
             version={version}
-
-            desc={ desc }
-            setDesc={ setDesc }
-            fich={fich}
-            setFich={setFich}
-            imag={imag}
-            setImag={setImag}
             updatedDescriptions={updatedDescriptions}
             updatedDatasheets={updatedDatasheets}
+            images={images}
             selectedImages={selectedImages}
             setUpdatedDescriptions={setUpdatedDescriptions}
             setUpdatedDatasheets={setUpdatedDatasheets}
             setSelectedImages={setSelectedImages}
-
             setShowVersionSelector={setShowVersionSelector}
             onClickSave={() => {
               switch (activeTab) {