tenjin-ui-kit 0.3.47 → 0.3.49

package/components/authenticationProvider/index.js

@@ -40,6 +40,10 @@ var AuthenticationProvider = function AuthenticationProvider(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     loggedInUser = _useState4[0],
     setLoggedInUser = _useState4[1];
+  var _useState5 = (0, _react.useState)(null),
+    _useState6 = _slicedToArray(_useState5, 2),
+    license = _useState6[0],
+    setLicense = _useState6[1];
   var _useSearchParams = (0, _reactRouterDom.useSearchParams)(),
     _useSearchParams2 = _slicedToArray(_useSearchParams, 2),
     searchParams = _useSearchParams2[0],
@@ -48,50 +52,86 @@ var AuthenticationProvider = function AuthenticationProvider(_ref) {
   (0, _react.useEffect)(function () {
     resolveAuthentication();
   }, []);
-  var resolveAuthentication = /*#__PURE__*/function () {
+  var resolveLicense = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var token, profileValidationResponse;
+      var token, licenseResponse;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            token = resolveToken();
+            _context.next = 4;
+            return _axios.default.get("/api/license/details", {
+              headers: {
+                Authorization: "Bearer ".concat(token)
+              }
+            });
+          case 4:
+            licenseResponse = _context.sent;
+            setLicense(licenseResponse.data);
+            _context.next = 11;
+            break;
+          case 8:
+            _context.prev = 8;
+            _context.t0 = _context["catch"](0);
+            console.log('Unable to fetch license', _context.t0);
+          case 11:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee, null, [[0, 8]]);
+    }));
+    return function resolveLicense() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var resolveAuthentication = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var token, profileValidationResponse;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
           case 0:
             token = resolveToken();
             if (!token) {
-              _context.next = 18;
+              _context2.next = 20;
               break;
             }
-            _context.prev = 2;
-            _context.next = 5;
+            _context2.prev = 2;
+            _context2.next = 5;
             return _axios.default.get("/api/me", {
               headers: {
                 Authorization: "Bearer ".concat(token)
               }
             });
           case 5:
-            profileValidationResponse = _context.sent;
+            profileValidationResponse = _context2.sent;
+            _context2.next = 8;
+            return resolveLicense();
+          case 8:
             setLoggedInUser(profileValidationResponse.data);
             setAuthLoading(false);
-            _context.next = 16;
+            _context2.next = 18;
             break;
-          case 10:
-            _context.prev = 10;
-            _context.t0 = _context["catch"](2);
+          case 12:
+            _context2.prev = 12;
+            _context2.t0 = _context2["catch"](2);
             console.error("Profile validation error");
-            console.error("Error: ", _context.t0);
+            console.error("Error: ", _context2.t0);
             setLoggedInUser(null);
             redirectToLogin();
-          case 16:
-            _context.next = 19;
-            break;
           case 18:
+            _context2.next = 21;
+            break;
+          case 20:
             redirectToLogin();
-          case 19:
+          case 21:
           case "end":
-            return _context.stop();
+            return _context2.stop();
         }
-      }, _callee, null, [[2, 10]]);
+      }, _callee2, null, [[2, 12]]);
     }));
     return function resolveAuthentication() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   var redirectToLogin = function redirectToLogin() {
@@ -112,7 +152,8 @@ var AuthenticationProvider = function AuthenticationProvider(_ref) {
   };
   return authLoading ? /*#__PURE__*/_react.default.createElement(_AuthLoader.default, null) : loggedInUser ? /*#__PURE__*/_react.default.createElement(SystemContext.Provider, {
     value: {
-      loggedInUser: loggedInUser
+      loggedInUser: loggedInUser,
+      license: license
     }
   }, children) : /*#__PURE__*/_react.default.createElement(_AuthError.default, null);
 };

package/components/layout/topBar/ProjectTopbar.js

@@ -31,6 +31,28 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+var ANNOUNCEMENT_TYPES = {
+  success: {
+    backgroundColor: '#EDF7ED',
+    borderLeft: '6px solid #4CAF50',
+    color: '#1B5E20'
+  },
+  error: {
+    backgroundColor: '#FDECEA',
+    borderLeft: '6px solid #F44336',
+    color: '#B71C1C'
+  },
+  warning: {
+    backgroundColor: '#FFF6DA',
+    borderLeft: '6px solid #FFC107',
+    color: '#7C5E10'
+  },
+  info: {
+    backgroundColor: '#E8F4FD',
+    borderLeft: '6px solid #2196F3',
+    color: '#0D47A1'
+  }
+};
 var ProjectTopbar = function ProjectTopbar(_ref) {
   var _loggedInUser$role;
   var homeIcon = _ref.homeIcon,
@@ -40,6 +62,8 @@ var ProjectTopbar = function ProjectTopbar(_ref) {
     onViewProfileClick = _ref.onViewProfileClick,
     hrefLink = _ref.hrefLink,
     avatarItems = _ref.avatarItems,
+    _ref$announcement = _ref.announcement,
+    announcement = _ref$announcement === void 0 ? null : _ref$announcement,
     _ref$isChatEnabled = _ref.isChatEnabled,
     isChatEnabled = _ref$isChatEnabled === void 0 ? false : _ref$isChatEnabled;
   var theme = (0, _system.useTheme)();
@@ -226,7 +250,27 @@ var ProjectTopbar = function ProjectTopbar(_ref) {
     },
     display: "flex",
     alignItems: "center"
-  }, (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$role = loggedInUser.role) === null || _loggedInUser$role === void 0 ? void 0 : _loggedInUser$role.id) === 1 && /*#__PURE__*/_react.default.createElement(_button.default, {
+  }, announcement && /*#__PURE__*/_react.default.createElement(_system.Box, {
+    sx: {
+      backgroundColor: ANNOUNCEMENT_TYPES[announcement.type].backgroundColor,
+      borderLeft: ANNOUNCEMENT_TYPES[announcement.type].borderLeft,
+      color: ANNOUNCEMENT_TYPES[announcement.type].color,
+      minHeight: '26px',
+      height: '100%',
+      minWidth: '200px',
+      borderRadius: '4px',
+      marginRight: '10px',
+      paddingInline: '10px',
+      paddingBlock: '6px',
+      display: 'flex',
+      alignItems: 'center',
+      fontSize: '12px'
+    }
+  }, typeof announcement.message === 'string' ? /*#__PURE__*/_react.default.createElement(_text.default, {
+    sx: {
+      fontSize: '12px'
+    }
+  }, announcement.message) : announcement.message), (loggedInUser === null || loggedInUser === void 0 ? void 0 : (_loggedInUser$role = loggedInUser.role) === null || _loggedInUser$role === void 0 ? void 0 : _loggedInUser$role.id) === 1 && /*#__PURE__*/_react.default.createElement(_button.default, {
     variant: "text",
     startIcon: /*#__PURE__*/_react.default.createElement(_reactFeather.Settings, {
       size: "1rem"

package/package.json

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