contentoh-components-library 21.4.52 → 21.4.54

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

@@ -1,16 +1,24 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TagAndInput = void 0;
 
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/slicedToArray"));
+
 var _styles = require("./styles");
 
 var _index = require("../../atoms/ScreenHeader/index");
 
 var _index2 = require("../../atoms/GeneralInput/index");
 
+var _react = require("react");
+
 var _jsxRuntime = require("react/jsx-runtime");
 
 var TagAndInput = function TagAndInput(_ref) {
@@ -39,7 +47,55 @@ var TagAndInput = function TagAndInput(_ref) {
       disabled = _ref.disabled,
       onKeyDown = _ref.onKeyDown,
       showTooltip = _ref.showTooltip,
-      auditClass = _ref.auditClass;
+      auditClass = _ref.auditClass,
+      onChange = _ref.onChange,
+      dataInputs = _ref.dataInputs,
+      inputGroup = _ref.inputGroup;
+
+  var _useState = (0, _react.useState)(true),
+      _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+      isDeleteDisabled = _useState2[0],
+      setIsDeleteDisabled = _useState2[1];
+
+  var _useState3 = (0, _react.useState)([{
+    showAdd: true,
+    value: {}
+  }]),
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      boxOnboardingList = _useState4[0],
+      setBoxOnboardingList = _useState4[1];
+
+  (0, _react.useEffect)(function () {
+    var temp = {};
+    var maxBoxId = 0;
+    inputGroup === null || inputGroup === void 0 ? void 0 : inputGroup.inputs.forEach(function (attrId) {
+      if (!dataInputs[attrId].box) return;
+      Object.entries(dataInputs[attrId].box).forEach(function (_ref2) {
+        var _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
+            boxId = _ref3[0],
+            value = _ref3[1];
+
+        if (boxId > maxBoxId) maxBoxId = boxId;
+        if (!temp[boxId]) temp[boxId] = {};
+        temp[boxId][attrId] = value;
+      });
+    });
+    var tempList = Object.values(temp);
+
+    if (tempList.length > 0) {
+      setBoxOnboardingList(tempList.map(function (value, index) {
+        return index === tempList.length - 1 ? {
+          showAdd: true,
+          value: value
+        } : {
+          value: value
+        };
+      }));
+    }
+  }, []);
+  (0, _react.useEffect)(function () {
+    onChange && onChange(boxOnboardingList);
+  }, [boxOnboardingList]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_styles.Container, {
     inputType: inputType,
     className: "input-container",
@@ -76,7 +132,20 @@ var TagAndInput = function TagAndInput(_ref) {
       description: description,
       inputOnChange: inputOnChange,
       onKeyDown: onKeyDown,
-      auditClass: auditClass
+      auditClass: auditClass,
+      onChange: function onChange(e) {
+        setBoxOnboardingList(function (prev) {
+          return prev.map(function (box, i) {
+            if (i != index) {
+              return box;
+            }
+
+            return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, box), {}, {
+              value: e
+            });
+          });
+        });
+      }
     })]
   }, "generalTagInput-".concat(inputType));
 };

package/dist/components/organisms/Box/index.js

@@ -37,18 +37,13 @@ var Box = function Box(_ref) {
       isDeleteDisabled = _useState2[0],
       setIsDeleteDisabled = _useState2[1];
 
-  var _useState3 = (0, _react.useState)(false),
-      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-      isEditEnabled = _useState4[0],
-      setIsEditEnabled = _useState4[1];
-
-  var _useState5 = (0, _react.useState)([{
+  var _useState3 = (0, _react.useState)([{
     showAdd: true,
     value: {}
   }]),
-      _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
-      boxOnboardingList = _useState6[0],
-      setBoxOnboardingList = _useState6[1];
+      _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
+      boxOnboardingList = _useState4[0],
+      setBoxOnboardingList = _useState4[1];
 
   (0, _react.useEffect)(function () {
     var temp = {};
@@ -97,10 +92,6 @@ var Box = function Box(_ref) {
     }
   };
 
-  var handleToggleEdit = function handleToggleEdit() {
-    setIsEditEnabled(!isEditEnabled);
-  };
-
   (0, _react.useEffect)(function () {
     onChange && onChange(boxOnboardingList);
   }, [boxOnboardingList]);
@@ -122,7 +113,6 @@ var Box = function Box(_ref) {
               data: boxOnboarding.value,
               dataInputs: dataInputs,
               inputs: inputGroup.inputs,
-              isEditEnabled: isEditEnabled,
               onChange: function onChange(e) {
                 setBoxOnboardingList(function (prev) {
                   return prev.map(function (box, i) {
@@ -143,9 +133,7 @@ var Box = function Box(_ref) {
               onDelete: function onDelete() {
                 return handleDeleteBoxOnboarding(index);
               },
-              isDeleteDisabled: isDeleteDisabled,
-              onToggleEdit: handleToggleEdit,
-              isEditEnabled: isEditEnabled
+              isDeleteDisabled: isDeleteDisabled
             }, index)]
           })
         });

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

@@ -178,6 +178,9 @@ var InputGroup = function InputGroup(_ref) {
               optionList: (_dataInputs$input23 = dataInputs[input]) === null || _dataInputs$input23 === void 0 ? void 0 : _dataInputs$input23.option_list,
               description: (_dataInputs$input24 = dataInputs[input]) === null || _dataInputs$input24 === void 0 ? void 0 : _dataInputs$input24.description,
               showTooltip: true,
+              inputGroup: inputGroup,
+              dataInputs: dataInputs,
+              onChange: setUpdatedBoxData,
               auditClass: compare && !isEquals(dataInputs[input].value, auditInputs[input].value) ? "audit-class" : ""
             }, index + "-" + ((_dataInputs$input13 = dataInputs[input]) === null || _dataInputs$input13 === void 0 ? void 0 : _dataInputs$input13.value) + "-" + ((_dataInputs$input14 = dataInputs[input]) === null || _dataInputs$input14 === void 0 ? void 0 : _dataInputs$input14.id) + "-" + compare)
           }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_TagAndInput.TagAndInput, {

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

@@ -231,7 +231,7 @@ var Dashboard = function Dashboard(_ref) {
 
   var loadProductsByStatus = /*#__PURE__*/function () {
     var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(orderByStatus) {
-      var isRetailer, isProvider, isCollaborator, _ref5, ordersBydate, ordersByStatus, _ordersByStatus$total, total, _ordersByStatus$R, R, _ordersByStatus$PA, PA, _ordersByStatus$Ex, Ex, _ordersByStatus$ACA, ACA, productsFinished, inProcess, metricsArray;
+      var isRetailer, isProvider, isCollaborator, _ref5, ordersBydate, ordersByStatus, ordersByActive, _ordersByStatus$total, total, _ordersByStatus$R, R, _ordersByStatus$PA, PA, _ordersByStatus$Ex, Ex, _ordersByStatus$ACA, ACA, productsFinished, inProcess, registeredProducts, metricsArray;
 
       return _regenerator.default.wrap(function _callee3$(_context3) {
         while (1) {
@@ -257,6 +257,7 @@ var Dashboard = function Dashboard(_ref) {
               _ref5 = _context3.t0;
               ordersBydate = _ref5.ordersBydate;
               ordersByStatus = _ref5.ordersByStatus;
+              ordersByActive = _ref5.ordersByActive;
               _ordersByStatus$total = ordersByStatus.total, total = _ordersByStatus$total === void 0 ? 0 : _ordersByStatus$total, _ordersByStatus$R = ordersByStatus.R, R = _ordersByStatus$R === void 0 ? 0 : _ordersByStatus$R, _ordersByStatus$PA = ordersByStatus.PA, PA = _ordersByStatus$PA === void 0 ? 0 : _ordersByStatus$PA, _ordersByStatus$Ex = ordersByStatus.Ex, Ex = _ordersByStatus$Ex === void 0 ? 0 : _ordersByStatus$Ex, _ordersByStatus$ACA = ordersByStatus.ACA, ACA = _ordersByStatus$ACA === void 0 ? 0 : _ordersByStatus$ACA;
               productsFinished = 0;
               if (isRetailer) productsFinished = Ex;
@@ -265,11 +266,16 @@ var Dashboard = function Dashboard(_ref) {
               inProcess = Object.keys(ordersByStatus).reduce(function (prev, curr) {
                 return !["total", "PA", "R", "Ex", "ACA"].includes(curr) ? prev + ordersByStatus[curr] : prev;
               }, 0);
+              registeredProducts = ordersByActive.registered;
               metricsArray = [metricsData[0] ? metricsData[0] : {
                 label: "Productos totales",
                 value: total
               }];
+              console.log(registeredProducts);
               metricsArray.push({
+                label: "Productos activos",
+                value: registeredProducts
+              }, {
                 label: "Productos filtrados",
                 value: total
               }, {
@@ -288,7 +294,7 @@ var Dashboard = function Dashboard(_ref) {
               setRequiredProducts(ordersBydate);
               setProductsByStatus(ordersByStatus);
 
-            case 24:
+            case 27:
             case "end":
               return _context3.stop();
           }

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

@@ -1240,11 +1240,12 @@ var ProviderProductEdition = function ProviderProductEdition(_ref) {
                   });
                 });
               });
-              dataObject = {
+              dataObject = (0, _objectSpread3.default)({
                 articleId: product === null || product === void 0 ? void 0 : product.id_article,
-                articleData: updatedDatasheets,
+                articleData: updatedDatasheets
+              }, parseBoxData.length > 0 && {
                 boxData: parseBoxData
-              };
+              });
               if (product !== null && product !== void 0 && product.orderId) dataObject["orderId"] = product === null || product === void 0 ? void 0 : product.orderId;
               _context12.prev = 4;
               _context12.next = 7;

package/package.json

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

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

@@ -1,6 +1,7 @@
 import { Container } from "./styles";
 import { ScreenHeader } from "../../atoms/ScreenHeader/index";
 import { GeneralInput } from "../../atoms/GeneralInput/index";
+import { useState, useEffect } from "react";
 
 export const TagAndInput = ({
   inputType,
@@ -29,7 +30,42 @@ export const TagAndInput = ({
   onKeyDown,
   showTooltip,
   auditClass,
+  onChange, 
+  dataInputs,
+  inputGroup
 }) => {
+  const [isDeleteDisabled, setIsDeleteDisabled] = useState(true);
+  const [boxOnboardingList, setBoxOnboardingList] = useState([
+    {
+      showAdd: true,
+      value: {},
+    },
+  ]);
+
+  useEffect(() => {
+    const temp = {};
+    let maxBoxId = 0;
+    inputGroup?.inputs.forEach((attrId) => {
+      if (!dataInputs[attrId].box) return;
+      Object.entries(dataInputs[attrId].box).forEach(([boxId, value]) => {
+        if (boxId > maxBoxId) maxBoxId = boxId;
+        if (!temp[boxId]) temp[boxId] = {};
+        temp[boxId][attrId] = value;
+      });
+    });
+    const tempList = Object.values(temp);
+    if (tempList.length > 0) {
+      setBoxOnboardingList(
+        tempList.map((value, index) =>
+          index === tempList.length - 1 ? { showAdd: true, value } : { value }
+        )
+      );
+    }
+  }, []);
+  
+  useEffect(() => {
+    onChange && onChange(boxOnboardingList);
+  }, [boxOnboardingList]);
   return (
     <Container
       inputType={inputType}
@@ -70,6 +106,16 @@ export const TagAndInput = ({
         inputOnChange={inputOnChange}
         onKeyDown={onKeyDown}
         auditClass={auditClass}
+        onChange={(e) => {
+          setBoxOnboardingList((prev) => {
+            return prev.map((box, i) => {
+              if (i != index) {
+                return box;
+              }
+              return { ...box, value: e };
+            });
+          });
+        }}
       />
     </Container>
   );

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

@@ -6,7 +6,6 @@ import { BoxButtons } from "../../molecules/BoxButtons";
 
 export const Box = ({ onChange, dataInputs, inputGroup }) => {
   const [isDeleteDisabled, setIsDeleteDisabled] = useState(true);
-  const [isEditEnabled, setIsEditEnabled] = useState(false);
   const [boxOnboardingList, setBoxOnboardingList] = useState([
     {
       showAdd: true,
@@ -53,9 +52,6 @@ export const Box = ({ onChange, dataInputs, inputGroup }) => {
       setIsDeleteDisabled(true);
     }
   };
-  const handleToggleEdit = () => {
-    setIsEditEnabled(!isEditEnabled);
-  };
   
   useEffect(() => {
     onChange && onChange(boxOnboardingList);
@@ -79,7 +75,6 @@ export const Box = ({ onChange, dataInputs, inputGroup }) => {
                 data={boxOnboarding.value}
                 dataInputs={dataInputs}
                 inputs={inputGroup.inputs}
-                isEditEnabled={isEditEnabled}
                 onChange={(e) => {
                   setBoxOnboardingList((prev) => {
                     return prev.map((box, i) => {
@@ -98,8 +93,6 @@ export const Box = ({ onChange, dataInputs, inputGroup }) => {
                 onAdd={handleAddBoxOnboarding}
                 onDelete={() => handleDeleteBoxOnboarding(index)}
                 isDeleteDisabled={isDeleteDisabled}
-                onToggleEdit={handleToggleEdit}
-                isEditEnabled={isEditEnabled}
               />
             </div>
           </>

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

@@ -228,6 +228,9 @@ export const InputGroup = ({
                     optionList={dataInputs[input]?.option_list}
                     description={dataInputs[input]?.description}
                     showTooltip={true}
+                    inputGroup={inputGroup}
+                    dataInputs={dataInputs}
+                    onChange={setUpdatedBoxData}
                     auditClass={
                       compare &&
                       !isEquals(dataInputs[input].value, auditInputs[input].value)
@@ -270,4 +273,4 @@ export const InputGroup = ({
       )}
     </>
   );
-                }  
+}  

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

@@ -84,7 +84,7 @@ export const Dashboard = ({ jwt, user, company }) => {
     const isRetailer = user.is_retailer && company.retailers;
     const isProvider = !user.is_retailer && user.id_role === 0;
     const isCollaborator = user.id_role > 0;
-    const { ordersBydate, ordersByStatus } =
+    const { ordersBydate, ordersByStatus, ordersByActive } =
       (await loadProductVersions(orderByStatus)) || {};
 
     const { total = 0, R = 0, PA = 0, Ex = 0, ACA = 0 } = ordersByStatus;
@@ -100,13 +100,18 @@ export const Dashboard = ({ jwt, user, company }) => {
           : prev,
       0
     );
+
+    const registeredProducts = ordersByActive.registered;
     let metricsArray = [
       metricsData[0]
         ? metricsData[0]
         : { label: "Productos totales", value: total },
     ];
 
+    console.log(registeredProducts);
+
     metricsArray.push(
+      { label: "Productos activos", value: registeredProducts },
       { label: "Productos filtrados", value: total },
       { label: "Productos sin asignar", value: PA + R },
       { label: "Productos en proceso", value: inProcess },

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

@@ -699,7 +699,7 @@ export const ProviderProductEdition = ({
     const dataObject = {
       articleId: product?.id_article,
       articleData: updatedDatasheets,
-      boxData: parseBoxData,
+      ...(parseBoxData.length > 0 && { boxData: parseBoxData }),
     };   
     
     if (product?.orderId) dataObject["orderId"] = product?.orderId;