tenjin-ui-kit 0.2.50 → 0.2.52

package/common/hooks/newApiHook.js

@@ -98,12 +98,14 @@ var useAPI = function useAPI() {
     setLoading = _useState30[1];
   var useGet = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, action) {
-      var response;
+      var response, parsedError;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             _context.prev = 0;
-            setLoading(true);
+            setLoading({
+              getLoading: true
+            });
             _context.next = 4;
             return (0, _http.getSecureClient)().get(url);
           case 4:
@@ -114,18 +116,19 @@ var useAPI = function useAPI() {
             setLoading({
               getLoading: false
             });
-            _context.next = 13;
+            _context.next = 14;
             break;
           case 9:
             _context.prev = 9;
             _context.t0 = _context["catch"](0);
+            parsedError = (0, _http.parseAxiosError)(_context.t0);
             setErrorMessage({
-              getError: _context.t0.message
+              getError: parsedError.message
             });
             setLoading({
               getLoading: false
             });
-          case 13:
+          case 14:
           case "end":
             return _context.stop();
         }
@@ -137,12 +140,14 @@ var useAPI = function useAPI() {
   }();
   var usePost = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(url, body, action) {
-      var response;
+      var response, parsedError;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            setLoading(true);
+            setLoading({
+              postLoading: true
+            });
             _context2.next = 4;
             return (0, _http.getSecureClient)().post(url, body);
           case 4:
@@ -153,18 +158,19 @@ var useAPI = function useAPI() {
             setLoading({
               postLoading: false
             });
-            _context2.next = 13;
+            _context2.next = 14;
             break;
           case 9:
             _context2.prev = 9;
             _context2.t0 = _context2["catch"](0);
+            parsedError = (0, _http.parseAxiosError)(_context2.t0);
             setErrorMessage({
-              postError: _context2.t0.message
+              postError: parsedError.message
             });
             setLoading({
               postLoading: false
             });
-          case 13:
+          case 14:
           case "end":
             return _context2.stop();
         }
@@ -176,34 +182,37 @@ var useAPI = function useAPI() {
   }();
   var usePut = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(url, body, action) {
-      var response;
+      var response, _response, parsedError;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             _context3.prev = 0;
-            setLoading(true);
+            setLoading({
+              putLoading: true
+            });
             _context3.next = 4;
             return (0, _http.getSecureClient)().put(url, body);
           case 4:
-            response = _context3.sent;
+            _response = _context3.sent;
             setResult({
-              putResult: response
+              putResult: _response
             });
             setLoading({
               putLoading: false
             });
-            _context3.next = 13;
+            _context3.next = 14;
             break;
           case 9:
             _context3.prev = 9;
             _context3.t0 = _context3["catch"](0);
+            parsedError = (0, _http.parseAxiosError)(_context3.t0);
             setErrorMessage({
-              putError: _context3.t0.message
+              putError: parsedError.message
             });
             setLoading({
               putLoading: false
             });
-          case 13:
+          case 14:
           case "end":
             return _context3.stop();
         }
@@ -215,12 +224,14 @@ var useAPI = function useAPI() {
   }();
   var useDelete = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4(url, action) {
-      var response;
+      var response, parsedError;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _context4.prev = 0;
-            setLoading(true);
+            setLoading({
+              deleteLoading: true
+            });
             _context4.next = 4;
             return (0, _http.getSecureClient)().delete(url);
           case 4:
@@ -231,18 +242,19 @@ var useAPI = function useAPI() {
             setLoading({
               deleteLoading: false
             });
-            _context4.next = 13;
+            _context4.next = 14;
             break;
           case 9:
             _context4.prev = 9;
             _context4.t0 = _context4["catch"](0);
+            parsedError = (0, _http.parseAxiosError)(_context4.t0);
             setErrorMessage({
-              deleteError: _context4.t0.message
+              deleteError: parsedError.message
             });
             setLoading({
               deleteLoading: false
             });
-          case 13:
+          case 14:
           case "end":
             return _context4.stop();
         }

package/components/button/index.js

@@ -26,7 +26,12 @@ var Button = function Button(props) {
   };
   return /*#__PURE__*/_react.default.createElement(_material.Button, _extends({
     onClick: handleClick
-  }, props), loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(ButtonLoader, {
+  }, props, {
+    size: "small",
+    sx: {
+      minWidth: 148
+    }
+  }), loading ? /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(ButtonLoader, {
     buttonColor: color,
     size: size,
     loadingText: loadingText
@@ -40,16 +45,16 @@ var ButtonLoader = function ButtonLoader(_ref) {
   var resolvedButtonColor = theme.palette[buttonColor] ? theme.palette[buttonColor].main : theme.palette.primary.main;
   var textColor = theme.palette.getContrastText(resolvedButtonColor);
   return /*#__PURE__*/_react.default.createElement(_material.CircularProgress, {
-    size: size === "small" ? 20 : size === "large" ? 24 : 22,
+    size: size === 'small' ? 20 : size === 'large' ? 24 : 22,
     sx: {
-      marginRight: loadingText ? "0.5rem" : "initial",
+      marginRight: loadingText ? '0.5rem' : 'initial',
       color: textColor
     }
   });
 };
 exports.ButtonLoader = ButtonLoader;
 Button.defaultProps = {
-  color: "primary"
+  color: 'primary'
 };
 Button.propTypes = {
   loading: _propTypes.default.bool,

package/components/input/index.js

@@ -10,7 +10,7 @@ var _InputLabel = _interopRequireDefault(require("@mui/material/InputLabel"));
 var _styles = require("@mui/material/styles");
 var _react = _interopRequireDefault(require("react"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _excluded = ["label", "id", "fullWidth", "disableAutocomplete", "startIcon", "endIcon", "size", "error", "errorMessage", "isRequired", "isDisabled"];
+var _excluded = ["label", "id", "fullWidth", "disableAutocomplete", "startIcon", "endIcon", "size", "error", "errorMessage", "isRequired", "isDisabled", "isPastDateDisabled"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
@@ -27,8 +27,10 @@ var Input = function Input(_ref) {
     errorMessage = _ref.errorMessage,
     isRequired = _ref.isRequired,
     isDisabled = _ref.isDisabled,
+    isPastDateDisabled = _ref.isPastDateDisabled,
     rest = _objectWithoutProperties(_ref, _excluded);
   var theme = (0, _styles.useTheme)();
+  var minDate = new Date().toISOString().split('T')[0];
   return /*#__PURE__*/_react.default.createElement(_FormControl.default, {
     variant: "standard",
     fullWidth: fullWidth
@@ -60,7 +62,10 @@ var Input = function Input(_ref) {
     startAdornment: startIcon,
     endAdornment: endIcon,
     helperText: errorMessage,
-    disabled: isDisabled
+    disabled: isDisabled,
+    inputProps: isPastDateDisabled && {
+      min: minDate
+    }
   })), error && /*#__PURE__*/_react.default.createElement(_material.TextField, _extends({
     required: isRequired,
     id: id,
@@ -78,7 +83,10 @@ var Input = function Input(_ref) {
     startAdornment: startIcon,
     endAdornment: endIcon,
     helperText: errorMessage,
-    error: true
+    error: true,
+    inputProps: isPastDateDisabled && {
+      min: minDate
+    }
   }, rest)));
 };
 Input.propTypes = {

package/components/layout/sidebar/GroupedMenu.js

@@ -1,6 +1,5 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -11,15 +10,21 @@ var _material = require("@mui/material");
 var _reactRouterDom = require("react-router-dom");
 var _style = _interopRequireDefault(require("./style"));
 var _ = require("..");
+var _clsx2 = _interopRequireDefault(require("clsx"));
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 var GroupedMenu = function GroupedMenu(_ref) {
   var groups = _ref.groups;
   var classes = (0, _style.default)();
   var _useContext = (0, _react.useContext)(_.LayoutContext),
     selectedSidebarKey = _useContext.layoutState.selectedSidebarKey,
     setSelectedSidebarKey = _useContext.setSelectedSidebarKey;
+  console.log(selectedSidebarKey, '0-00000000000000000');
   return groups ? groups.map(function (group, index) {
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, {
       key: group.groupName
@@ -28,10 +33,11 @@ var GroupedMenu = function GroupedMenu(_ref) {
         className: classes.subHeader
       }, group.groupName)
     }, group.items.map(function (i) {
+      var _clsx;
       return /*#__PURE__*/_react.default.createElement(_material.ListItemButton, {
         disableRipple: true,
         disableTouchRipple: true,
-        component: i.serverSide ? "a" : _reactRouterDom.Link,
+        component: i.serverSide ? 'a' : _reactRouterDom.Link,
         href: i.href,
         to: i.href,
         selected: i.key === selectedSidebarKey,
@@ -39,14 +45,17 @@ var GroupedMenu = function GroupedMenu(_ref) {
         key: i.key,
         onClick: function onClick() {
           return setSelectedSidebarKey(i.key);
+        },
+        classes: {
+          selected: classes.selectedGroupMenuItem
         }
       }, /*#__PURE__*/_react.default.createElement(_material.ListItemText, {
         disableTypography: true,
-        className: classes.listItemText
+        className: (0, _clsx2.default)((_clsx = {}, _defineProperty(_clsx, classes.listItemText, true), _defineProperty(_clsx, classes.selectedFlatMenuItemText, selectedSidebarKey === i.key), _clsx))
       }, i.display));
     })), index < groups.length - 1 && /*#__PURE__*/_react.default.createElement(_material.Divider, {
       sx: {
-        height: "initial !important"
+        height: 'initial !important'
       }
     }));
   }) : /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null);

package/components/layout/sidebar/index.js

@@ -34,14 +34,14 @@ var Sidebar = function Sidebar(_ref) {
     toggleSidebar = _useContext.toggleSidebar,
     setSelectedSidebarKey = _useContext.setSelectedSidebarKey;
   return /*#__PURE__*/_react.default.createElement(_paper.default, {
-    className: (0, _clsx2.default)((_clsx = {}, _defineProperty(_clsx, classes.expanded, !collapsed), _defineProperty(_clsx, classes.collapsed, collapsed && allowCollapse), _defineProperty(_clsx, "tenjin-sidebar", true), _clsx)),
+    className: (0, _clsx2.default)((_clsx = {}, _defineProperty(_clsx, classes.expanded, !collapsed), _defineProperty(_clsx, classes.collapsed, collapsed && allowCollapse), _defineProperty(_clsx, 'tenjin-sidebar', true), _clsx)),
     fullHeight: true
   }, /*#__PURE__*/_react.default.createElement(_material.Box, {
     sx: {
       padding: theme.spacing(1),
-      maxHeight: allowCollapse ? "calc(100% - 48px)" : "100%",
-      height: allowCollapse ? "calc(100% - 48px)" : "100%",
-      overflowY: "auto"
+      maxHeight: allowCollapse ? 'calc(100% - 48px)' : '100%',
+      height: allowCollapse ? 'calc(100% - 48px)' : '100%',
+      overflowY: 'auto'
     }
   }, children), allowCollapse && /*#__PURE__*/_react.default.createElement(_material.Box, {
     display: "flex",
@@ -49,22 +49,22 @@ var Sidebar = function Sidebar(_ref) {
     justifyContent: "center",
     alignContent: "center",
     sx: {
-      height: "48px"
+      height: '48px'
     }
   }, /*#__PURE__*/_react.default.createElement(_material.Tooltip, {
-    title: collapsed ? "Expand" : "Collapse",
+    title: collapsed ? 'Expand' : 'Collapse',
     placement: "top"
   }, /*#__PURE__*/_react.default.createElement(_material.IconButton, {
     size: "large",
     disableRipple: true,
     sx: {
-      height: "100%",
-      width: "100%"
+      height: '100%',
+      width: '100%'
     },
     variant: "text",
     fullWidth: true,
     onClick: toggleSidebar,
-    "aria-label": collapsed ? "Expand Menu" : "Collapse Menu"
+    "aria-label": collapsed ? 'Expand Menu' : 'Collapse Menu'
   }, collapsed ? /*#__PURE__*/_react.default.createElement(_fi.FiChevronRight, null) : /*#__PURE__*/_react.default.createElement(_fi.FiChevronLeft, null)))));
 };
 Sidebar.propTypes = {

package/components/layout/sidebar/style.js

@@ -8,50 +8,55 @@ var _styles = require("@mui/styles");
 var _default = (0, _styles.makeStyles)(function (theme) {
   return {
     subHeader: {
-      textTransform: "uppercase",
+      textTransform: 'uppercase',
       fontSize: theme.typography.fontSize - 2,
-      color: "rgba(0,0,0,0.5)",
+      color: 'rgba(0,0,0,0.5)',
       fontWeight: 500
     },
     link: {
-      textDecoration: "none"
+      textDecoration: 'none'
     },
     listItemText: {
       color: "".concat(theme.palette.primary.main, " !important"),
-      fontWeight: "500 !important"
+      fontWeight: '500 !important'
     },
     expanded: {
-      width: "240px"
+      width: '240px'
     },
     collapsed: {
-      width: "72px"
+      width: '72px'
     },
     collapsedFlatMenuItem: {
-      paddingLeft: "0",
-      paddingRight: "0",
-      display: "flex !important",
-      alignItems: "center !important",
-      justifyContent: "center !important",
-      "& .MuiListItemIcon-root": {
-        minWidth: "10px"
+      paddingLeft: '0',
+      paddingRight: '0',
+      display: 'flex !important',
+      alignItems: 'center !important',
+      justifyContent: 'center !important',
+      '& .MuiListItemIcon-root': {
+        minWidth: '10px'
       }
     },
     collapsedFlatMenuItemText: {
-      display: "none !important"
+      display: 'none !important'
     },
     flatMenuItem: {
-      height: "48px",
-      borderRadius: "7px !important"
+      height: '48px',
+      borderRadius: '7px !important'
     },
     selectedFlatMenuItem: {
       backgroundColor: "".concat(theme.palette.primary.main, " !important"),
-      color: "#fff !important"
+      color: '#fff !important'
+    },
+    selectedGroupMenuItem: {
+      backgroundColor: "".concat(theme.palette.primary.main, " !important"),
+      color: '#fff !important',
+      borderRadius: '5px !important'
     },
     selectedFlatMenuIcon: {
-      color: "#fff !important"
+      color: '#fff !important'
     },
     selectedFlatMenuItemText: {
-      color: "#fff !important"
+      color: '#fff !important'
     }
   };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tenjin-ui-kit",
-  "version": "0.2.50",
+  "version": "0.2.52",
   "repository": {
     "url": "https://gitlab.com/yethi/react/tenjin-ui-kit.git"
   },