@agilemotion/oui-react-js 1.7.0 → 1.7.2

package/dist/components/dashboard/components/blackDashboard/sidebar/ModuleMenuSidebar.js

@@ -13,6 +13,9 @@ var _CardAvatar = _interopRequireDefault(require("../../../../card/CardAvatar"))
 var _core = require("@material-ui/core");
 var _RestUtils = require("../../../../../RestUtils");
 require("./ModuleMenuSidebar.css");
+var _Event = _interopRequireDefault(require("../../../../../event/Event"));
+var _Observable = _interopRequireDefault(require("../../../../../event/Observable"));
+var _EventType = _interopRequireDefault(require("../../../../../event/EventType"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 /*eslint-disable*/
 
@@ -22,21 +25,51 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
 
 let ps;
 const TAB = 16;
-class ModuleMenuSidebar extends _react.default.Component {
-  constructor(props) {
-    super(props);
-    this.state = {
-      ...this.getCollapseStates(props.routes),
-      isLoading: false,
-      error: false,
-      activeRouteMenu: {
-        id: 'dashboard',
-        name: 'Dashboard'
-      },
-      activeModule: 'home'
+const ModuleMenuSidebar = props => {
+  const [menuState, setMenuState] = _react.default.useState();
+  const [routes, setRoutes] = _react.default.useState();
+  const [isLoading, setIsLoading] = _react.default.useState(false);
+  const [error, setError] = _react.default.useState(false);
+  const [activeModule, setActiveModule] = _react.default.useState('home');
+  const [selectedMenuRoutes, setSelectedMenuRoutes] = _react.default.useState(null);
+  const [activeRouteMenu, setActiveRouteMenu] = _react.default.useState({
+    id: 'dashboard',
+    name: 'Dashboard'
+  });
+  _react.default.useEffect(() => {
+    setMenuState(getCollapseInitialState(props.routes));
+    let service = {
+      url: '/ui/api/v1/menu/filter',
+      parameters: [{
+        value: props.routes,
+        httpParameterType: 'REQUEST_BODY'
+      }],
+      method: 'POST',
+      contentType: 'application/json'
     };
-  }
-  getViews = (menus, level) => {
+    (0, _RestUtils.invokeRest)(service, {
+      api: {
+        get id() {
+          return 'dashboard-sidebar';
+        }
+      }
+    }, 'dashboard-sidebar', result => {
+      setRoutes(result);
+      let currentModule = result.find(r => r.name === activeModule);
+      if (currentModule) {
+        getMenu(currentModule).then(result => {});
+      }
+    }, e => {
+      console.error(e);
+    }, null);
+  }, []);
+  _react.default.useEffect(() => {
+    if (routes) {
+      let currentModule = routes.find(r => r.name === activeModule);
+      getMenu(currentModule).then(result => {});
+    }
+  }, [activeModule]);
+  const getViews = (menus, level) => {
     let newViews = [];
     for (let i = 0; i < menus.length; i++) {
       let createView = {};
@@ -48,16 +81,15 @@ class ModuleMenuSidebar extends _react.default.Component {
       if (menus[i].subMenu) {
         createView.collapse = true;
         createView.state = menus[i].id + 'Collapse';
-        createView.views = this.getItems(menus[i].subMenu.items, level + 1);
+        createView.views = getItems(menus[i].subMenu.items, level + 1);
       } else {
         createView.item = menus[i];
       }
       newViews.push(createView);
     }
-    console.log('VIEWS : ', newViews, menus);
     return newViews;
   };
-  getItems = (items, level) => {
+  const getItems = (items, level) => {
     let newItems = [];
     for (let i = 0; i < items.length; i++) {
       let createItem = {};
@@ -70,7 +102,7 @@ class ModuleMenuSidebar extends _react.default.Component {
       if (!_Utils.default.isNull(items[i].subMenu)) {
         createItem.collapse = true;
         createItem.state = items[i].id + 'SubMenuCollapse';
-        createItem.views = this.getItems(items[i].subMenu.items, level + 1);
+        createItem.views = getItems(items[i].subMenu.items, level + 1);
       }
       newItems.push(createItem);
     }
@@ -78,15 +110,15 @@ class ModuleMenuSidebar extends _react.default.Component {
   };
 
   // this creates the intial state of this component based on the collapse routes
-  // that it gets through this.state.routes
-  getCollapseStates = routes => {
+  // that it gets through state.routes
+  const getCollapseStates = routes => {
     let initialState = {};
     if (routes) {
-      routes.map((prop, key) => {
+      routes.map(prop => {
         if (prop.collapse) {
           initialState = {
-            [prop.state]: this.getCollapseInitialState(prop.views),
-            ...this.getCollapseStates(prop.views),
+            [prop.state]: getCollapseInitialState(prop.views),
+            ...getCollapseStates(prop.views),
             ...initialState
           };
         }
@@ -95,10 +127,11 @@ class ModuleMenuSidebar extends _react.default.Component {
     }
     return initialState;
   };
+
   // this verifies if any of the collapses should be default opened on a rerender of this component
   // for example, on the refresh of the page,
   // while on the src/views/forms/RegularForms.js - route /admin/regular-forms
-  getCollapseInitialState(routes) {
+  const getCollapseInitialState = routes => {
     if (!routes) {
       return false;
     }
@@ -106,15 +139,15 @@ class ModuleMenuSidebar extends _react.default.Component {
       if (!routes[i].views) {
         return true;
       }
-      if (routes[i].collapse && this.getCollapseInitialState(routes[i].views)) {
+      if (routes[i].collapse && getCollapseInitialState(routes[i].views)) {
         return true;
       } else if (window.location.href.indexOf(routes[i].path) !== -1) {
         return true;
       }
     }
     return false;
-  }
-  getMenu = route => {
+  };
+  const getMenu = route => {
     return new Promise(resolve => {
       let service = {
         url: '/ui/api/v1/menu/get',
@@ -136,41 +169,51 @@ class ModuleMenuSidebar extends _react.default.Component {
           }
         }
       }, 'dashboard-sidebar', result => {
-        resolve(this.getViews(result.menus, route.level + 1));
+        let views = getViews(result.menus, route.level + 1);
+        setSelectedMenuRoutes(views);
+        let defaultMenu = views.find(m => m.item.defaultItem);
+        if (defaultMenu) {
+          if (defaultMenu.id === 'Dashboard') {
+            props.dashboardLauncher();
+          }
+          setActiveRouteMenu({
+            id: defaultMenu.id,
+            name: defaultMenu.name
+          });
+          let event = new _Event.default({
+            api: {
+              get id() {
+                return defaultMenu.id;
+              }
+            }
+          }, "menuBar");
+          _Observable.default.fireEvent(_EventType.default.CLICK, event);
+        }
+        resolve(views);
       }, e => {
         console.error(e);
         resolve(null);
       }, null);
     });
   };
-  getLiClassName = prop => {
+  const getLiClassName = prop => {
     return "li-" + prop.level;
   };
-  createModuleTabs = routes => {
+  const createModuleTabs = routes => {
     const {
       rtlActive,
       secondaryThemeColor,
       primaryThemeColor
-    } = this.props;
+    } = props;
     return routes.map((module, key) => {
       return /*#__PURE__*/_react.default.createElement("div", {
         key: key,
         style: {
-          backgroundColor: this.activeModule(module.name) ? primaryThemeColor : (0, _core.lighten)(secondaryThemeColor, .1)
+          backgroundColor: isActiveModule(module.name) ? primaryThemeColor : (0, _core.lighten)(secondaryThemeColor, .1)
         },
-        className: `${this.activeModule(module.name) ? 'module-tab-selected' : 'module-tab'}`,
+        className: `${isActiveModule(module.name) ? 'module-tab-selected' : 'module-tab'}`,
         onClick: e => {
-          this.setState({
-            ...this.state,
-            activeModule: module.name
-          });
-          let currentModule = this.state.routes.find(r => r.name === module.name);
-          this.getMenu(currentModule).then(result => {
-            this.setState({
-              ...this.state,
-              selectedMenuRoutes: result
-            });
-          });
+          setActiveModule(module.name);
         }
       }, /*#__PURE__*/_react.default.createElement("div", null, module.icon ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement("div", {
         className: 'tab-icon'
@@ -178,30 +221,29 @@ class ModuleMenuSidebar extends _react.default.Component {
         className: module.icon,
         style: {
           width: '28px',
-          color: this.activeModule(module.name) ? '#000000' : '#444746'
+          color: isActiveModule(module.name) ? '#000000' : '#444746'
         }
-      }), ' '), /*#__PURE__*/_react.default.createElement("div", null, ' ', module.label), ' ', ' ') : /*#__PURE__*/_react.default.createElement("span", null, module.name), this.activeModule(module.name) && /*#__PURE__*/_react.default.createElement("i", {
+      }), ' '), /*#__PURE__*/_react.default.createElement("div", null, ' ', module.label), ' ', ' ') : /*#__PURE__*/_react.default.createElement("span", null, module.name), isActiveModule(module.name) && /*#__PURE__*/_react.default.createElement("i", {
         className: 'fas fa-caret-left selected-module-caret'
       })));
     });
   };
 
   // this function creates the links and collapses that appear in the sidebar (left menu)
-  createLinks = routes => {
+  const createLinks = moduleRoutes => {
     const {
       rtlActive,
       secondaryThemeColor,
       primaryThemeColor
-    } = this.props;
-    return routes.map((prop, key) => {
+    } = props;
+    return moduleRoutes.map((prop, key) => {
       if (prop.redirect) {
         return null;
       }
       if ((prop.collapse || prop.isParent) && prop.name !== 'Dashboard' && prop.name !== 'My Work Items') {
-        var st = {};
-        st[prop['state']] = !this.state[prop.state];
+        menuState[prop['state']] = !menuState[prop.state];
         return /*#__PURE__*/_react.default.createElement("li", {
-          className: prop.collapse ? this.getCollapseInitialState(prop.views) + '-' + prop.level ? 'active ' + this.getLiClassName(prop) : this.getLiClassName(prop) : this.getLiClassName(prop),
+          className: prop.collapse ? getCollapseInitialState(prop.views) + '-' + prop.level ? 'active ' + getLiClassName(prop) : getLiClassName(prop) : getLiClassName(prop),
           key: key
         }, /*#__PURE__*/_react.default.createElement("a", {
           href: "#pablo",
@@ -210,18 +252,16 @@ class ModuleMenuSidebar extends _react.default.Component {
           style: {
             marginLeft: (prop.level + 1) * TAB + 'px'
           },
-          "aria-expanded": this.state[prop.state],
+          "aria-expanded": menuState[prop.state],
           onClick: e => {
             if (!prop.views) {
-              this.getMenu(prop).then(views => {
+              getMenu(prop).then(views => {
                 if (views) {
-                  prop.views = views;
-                  //this.getCollapseInitialState(views);
-                  this.setState(st);
+                  //prop.views = views;
+                  //getCollapseInitialState(views);
+                  //setState(st);
                 }
               });
-            } else {
-              this.setState(st);
             }
             e.preventDefault();
           }
@@ -243,15 +283,15 @@ class ModuleMenuSidebar extends _react.default.Component {
         }, ' ', prop.name, ' ', /*#__PURE__*/_react.default.createElement("b", {
           className: "caret"
         })), ' '), ' '), ' ', prop.collapse && prop.views ? /*#__PURE__*/_react.default.createElement(_reactstrap.Collapse, {
-          isOpen: this.state[prop.state]
+          isOpen: menuState[prop.state]
         }, /*#__PURE__*/_react.default.createElement("ul", {
           className: "nav"
-        }, " ", this.createLinks(prop.views), " "), ' ') : null);
+        }, " ", createLinks(prop.views), " "), ' ') : null);
       }
       return /*#__PURE__*/_react.default.createElement("li", {
-        className: `${'menu-link-li' + (this.activeRoute(prop.id) ? '-active' : '') + (prop.name === 'Dashboard' ? ' dashboard-link' : '')}`,
+        className: `${'menu-link-li' + (isActiveRoute(prop.id) ? '-active' : '') + (prop.name === 'Dashboard' ? ' dashboard-link' : '')}`,
         key: key,
-        style: this.activeRoute(prop.id) ? {
+        style: isActiveRoute(prop.id) ? {
           backgroundColor: (0, _core.lighten)(secondaryThemeColor, .9),
           borderRadius: '16px',
           color: secondaryThemeColor,
@@ -260,97 +300,45 @@ class ModuleMenuSidebar extends _react.default.Component {
       }, /*#__PURE__*/_react.default.createElement(_MenuLink.default, {
         config: prop.item,
         clickCallback: prop.name === 'Dashboard' ? item => {
-          this.props.dashboardLauncher();
-          this.setState({
-            ...this.state,
-            activeRouteMenu: item
-          });
-        } : item => this.setState({
-          ...this.state,
-          activeRouteMenu: item
-        }),
-        autoClick: prop.name === 'My Work Items' || prop.item && prop.item.defaultItem,
+          props.dashboardLauncher();
+          setActiveRouteMenu(item);
+        } : item => {
+          setActiveRouteMenu(item);
+        },
+        autoClick: false,
         viewId: "menuBar",
         icon: prop.icon,
-        iconColor: (prop.name === 'Dashboard' || prop.name === 'My Work Items') && this.activeRoute(prop.id) ? secondaryThemeColor : null,
-        backgroundColor: this.activeRoute(prop.id) ? (0, _core.lighten)(secondaryThemeColor, .9) : null,
+        iconColor: (prop.name === 'Dashboard' || prop.name === 'My Work Items') && isActiveRoute(prop.id) ? secondaryThemeColor : null,
+        backgroundColor: isActiveRoute(prop.id) ? (0, _core.lighten)(secondaryThemeColor, .9) : null,
         name: prop.name,
         id: prop.id,
         level: prop.level,
         tab: TAB,
-        color: this.activeRoute(prop.id) ? secondaryThemeColor : null
+        color: isActiveRoute(prop.id) ? secondaryThemeColor : null
       }), ' ');
     });
   };
 
   // verifies if routeName is the one active (in browser input)
-  activeRoute = routeName => {
-    // return this.props.location.pathname.indexOf(routeName) > -1 ? "active" : "";
-    return this.state.activeRouteMenu.id === routeName;
+  const isActiveRoute = routeName => {
+    // return props.location.pathname.indexOf(routeName) > -1 ? "active" : "";
+    return activeRouteMenu.id === routeName;
   };
-  activeModule = moduleName => {
-    return this.state.activeModule === moduleName;
+  const isActiveModule = moduleName => {
+    return activeModule === moduleName;
   };
-  componentDidMount() {
-    // if you are using a Windows Machine, the scrollbars will have a Mac look
-    if (navigator.platform.indexOf('Win') > -1) {
-      /*ps = new PerfectScrollbar(this.refs.sidebar, {
-          suppressScrollX: true,
-          suppressScrollY: false,
-      });*/
-    }
-    let service = {
-      url: '/ui/api/v1/menu/filter',
-      parameters: [{
-        value: this.props.routes,
-        httpParameterType: 'REQUEST_BODY'
-      }],
-      method: 'POST',
-      contentType: 'application/json'
-    };
-    (0, _RestUtils.invokeRest)(service, {
-      api: {
-        get id() {
-          return 'dashboard-sidebar';
-        }
-      }
-    }, 'dashboard-sidebar', result => {
-      this.setState({
-        ...this.state,
-        routes: result
-      });
-      let currentModule = result.find(r => r.name === this.state.activeModule);
-      if (currentModule) {
-        this.getMenu(currentModule).then(result => {
-          this.setState({
-            ...this.state,
-            selectedMenuRoutes: result
-          });
-        });
-      }
-    }, e => {
-      console.error(e);
-    }, null);
-  }
-  componentWillUnmount() {
-    // we need to destroy the false scrollbar when we navigate
-    // to a page that doesn't have this component rendered
-    if (navigator.platform.indexOf('Win') > -1) {
-      //ps.destroy();
-    }
-  }
-  render() {
+  const render = () => {
     const {
       activeColor,
       logo
-    } = this.props;
+    } = props;
     let logoImg = null;
     let logoText = null;
     if (!_Utils.default.isNull(logo)) {
       logoImg = /*#__PURE__*/_react.default.createElement("a", {
         href: logo.outterLink,
         className: "logo-normal",
-        onClick: this.props.closeSidebar
+        onClick: props.closeSidebar
       }, /*#__PURE__*/_react.default.createElement("div", {
         className: "logo-img",
         style: {
@@ -364,11 +352,11 @@ class ModuleMenuSidebar extends _react.default.Component {
       logoText = /*#__PURE__*/_react.default.createElement("a", {
         href: logo.outterLink,
         className: "simple-text ",
-        onClick: this.props.closeSidebar
+        onClick: props.closeSidebar
       }, logo.text, ' ');
     }
     return /*#__PURE__*/_react.default.createElement("div", {
-      className: this.props.className,
+      className: `${props.className} module-menu-sidebar`,
       data: activeColor,
       style: {
         overflow: 'auto',
@@ -379,18 +367,18 @@ class ModuleMenuSidebar extends _react.default.Component {
     }, /*#__PURE__*/_react.default.createElement("div", {
       className: 'h-100 module-menu-strip',
       style: {
-        backgroundColor: this.props.secondaryThemeColor
+        backgroundColor: props.secondaryThemeColor
       }
     }, /*#__PURE__*/_react.default.createElement("div", {
       style: {
         height: '16%'
       }
-    }), this.state.routes && /*#__PURE__*/_react.default.createElement(_reactstrap.Nav, {
+    }), routes && /*#__PURE__*/_react.default.createElement(_reactstrap.Nav, {
       style: {
         padding: '8px'
       },
       className: 'nav-wrapper'
-    }, this.createModuleTabs(this.state.routes))), /*#__PURE__*/_react.default.createElement("div", {
+    }, createModuleTabs(routes))), /*#__PURE__*/_react.default.createElement("div", {
       className: 'h-100',
       style: {
         width: 'calc(100% - 120px)'
@@ -413,7 +401,7 @@ class ModuleMenuSidebar extends _react.default.Component {
         alignItems: 'center',
         height: '100%'
       }
-    }, ' ', logoImg, ' ') : null, ' ', !_Utils.default.isNull(this.props.heading) ? /*#__PURE__*/_react.default.createElement("div", {
+    }, ' ', logoImg, ' ') : null, ' ', !_Utils.default.isNull(props.heading) ? /*#__PURE__*/_react.default.createElement("div", {
       className: "logo",
       style: {
         display: 'flex',
@@ -423,18 +411,18 @@ class ModuleMenuSidebar extends _react.default.Component {
         fontSize: '20px',
         fontWeight: 600
       }
-    }, this.props.heading) : null)), /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", {
+    }, props.heading) : null)), /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", {
       style: {
         height: '75%'
       },
       valign: 'top'
-    }, this.state.selectedMenuRoutes && /*#__PURE__*/_react.default.createElement(_reactstrap.Nav, {
+    }, selectedMenuRoutes && /*#__PURE__*/_react.default.createElement(_reactstrap.Nav, {
       style: {
         margin: '8px',
         padding: '16px'
       },
       className: 'nav-wrapper'
-    }, this.createLinks(this.state.selectedMenuRoutes)))), /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", {
+    }, createLinks(selectedMenuRoutes)))), /*#__PURE__*/_react.default.createElement("tr", null, /*#__PURE__*/_react.default.createElement("td", {
       className: 'sidebar-app-logo-wrapper',
       style: {
         height: '5%'
@@ -454,23 +442,7 @@ class ModuleMenuSidebar extends _react.default.Component {
         marginTop: '8px'
       }
     }, "Copyrights \xA9 ", 1900 + new Date().getYear(), " ", ' ')))))))));
-  }
-}
-ModuleMenuSidebar.propTypes = {
-  activeColor: _propTypes.default.oneOf(['primary', 'blue', 'green', 'orange', 'red', 'agility']),
-  secondaryThemeColor: _propTypes.default.string.isRequired,
-  rtlActive: _propTypes.default.bool,
-  routes: _propTypes.default.array.isRequired,
-  logo: _propTypes.default.oneOfType([_propTypes.default.shape({
-    innerLink: _propTypes.default.string.isRequired,
-    imgSrc: _propTypes.default.string.isRequired,
-    text: _propTypes.default.string.isRequired
-  }), _propTypes.default.shape({
-    outterLink: _propTypes.default.string.isRequired,
-    imgSrc: _propTypes.default.string.isRequired,
-    text: _propTypes.default.string.isRequired
-  })]),
-  // this is used on responsive to close the sidebar on route navigation
-  closeSidebar: _propTypes.default.func
+  };
+  return render();
 };
 var _default = exports.default = ModuleMenuSidebar;

package/dist/components/form/AutoComplete.js

@@ -54,6 +54,10 @@ const AutoCompleteWrapper = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_reac
       }
       baseValue.current = base.value;
       setOptions(value.current);
+    } else {
+      //value.current = base.value;
+      //baseValue.current = base.value;
+      //setOptions([base.value]);
     }
   }, [base.value]);
   const fetchOptions = () => {
@@ -92,23 +96,41 @@ const AutoCompleteWrapper = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_reac
   };
   return /*#__PURE__*/_react.default.createElement(_Autocomplete.default, {
     inputValue: inputValue,
-    multiple: true,
+    multiple: _Utils.default.getComponentAttribute(props.config, 'multiple', true),
     disabled: base.disabled,
     value: value.current,
+    disableClearable: !_Utils.default.getComponentAttribute(props.config, 'multiple', true),
     getOptionLabel: option => option ? option : '',
     onInputChange: (event, newValue) => handleInputChange(event, newValue),
     onChange: (e, newValue, reason) => {
-      let val = [];
-      for (const newValueElement of newValue) {
-        val.push(entityStore.find(e => e[props.config.attributes.searchAttribute] === newValueElement));
+      if (Array.isArray(newValue)) {
+        let val = [];
+        for (const newValueElement of newValue) {
+          let find = entityStore.find(e => e[props.config.attributes.searchAttribute] === newValueElement);
+          if (find) {
+            find.dataRecordDescription = find[props.config.attributes.searchAttribute];
+            val.push(find);
+          }
+        }
+        value.current = newValue;
+        base.handleValueChange(val);
+      } else {
+        let val = null;
+        let find = entityStore.find(e => e[props.config.attributes.searchAttribute] === newValue);
+        if (find) {
+          val = find;
+          val.dataRecordDescription = val[props.config.attributes.searchAttribute];
+        }
+        value.current = newValue;
+        base.handleValueChange(val);
       }
-      value.current = newValue;
-      base.handleValueChange(val);
     },
     options: options,
     id: props.config.id,
     renderInput: params => /*#__PURE__*/_react.default.createElement(_TextField.default, _extends({
       required: base.required,
+      margin: "dense",
+      size: "small",
       error: base.hasError,
       helperText: base.errorMessage,
       variant: props.borderless ? 'standard' : 'outlined'

package/dist/components/form/BaseField.js

@@ -245,11 +245,11 @@ const BaseField = props => {
   return config ? /*#__PURE__*/_react.default.createElement("div", {
     className: "col-*-*",
     key: config.id,
-    style: _Utils.default.mergeStyles({
+    style: {
       textAlign: 'left',
-      marginLeft: '15px',
+      marginLeft: props.config.attributes?.style?.marginLeft || '15px',
       display: !visible || _Utils.default.getComponentAttribute(config, 'hidden', false) === true ? 'none' : 'block'
-    }, props.config)
+    }
   }, /*#__PURE__*/_react.default.createElement("span", null, props.children({
     required: required,
     disabled: disabled,

package/dist/components/form/DatePicker.js

@@ -13,6 +13,7 @@ var _dateFns2 = _interopRequireDefault(require("@date-io/date-fns"));
 var _pickers = require("@material-ui/pickers");
 var _styles = require("@material-ui/core/styles");
 var _reactRedux = require("react-redux");
+var _DynamicJS = _interopRequireDefault(require("../../DynamicJS"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 const CustomDatePickerComponent = /*#__PURE__*/_react.default.memo( /*#__PURE__*/_react.default.forwardRef((props, ref) => {
@@ -49,6 +50,9 @@ const CustomDatePickerComponent = /*#__PURE__*/_react.default.memo( /*#__PURE__*
           limit.setDate(limit.getDate() + days);
         }
         return limit.getFullYear() + "-" + formatNumber(limit.getMonth() + 1) + "-" + formatNumber(limit.getDate());
+      } else {
+        let limit = _DynamicJS.default.executeScript(props.config.id + "-" + id, dateAttr);
+        return limit.getFullYear() + "-" + formatNumber(limit.getMonth() + 1) + "-" + formatNumber(limit.getDate());
       }
     }
     return id === "minDate" ? "1970-01-01" : "9000-12-31";
@@ -60,7 +64,7 @@ const CustomDatePickerComponent = /*#__PURE__*/_react.default.memo( /*#__PURE__*
     if (maxDate === null) {
       setMaxDate(getLimitDate("maxDate"));
     }
-  });
+  }, []);
   const secondaryColor = (0, _reactRedux.useSelector)(state => state.dashboard.secondaryThemeColor);
   const ThemedKeyboardDatePicker = (0, _styles.withStyles)({
     root: {
@@ -81,7 +85,8 @@ const CustomDatePickerComponent = /*#__PURE__*/_react.default.memo( /*#__PURE__*
     utils: _dateFns2.default
   }, /*#__PURE__*/_react.default.createElement(_Grid.default, {
     container: true,
-    ref: ref
+    ref: ref,
+    onClick: e => e.stopPropagation()
   }, /*#__PURE__*/_react.default.createElement(ThemedKeyboardDatePicker, {
     id: props.id,
     InputProps: {