asab_webui_shell 25.1.6 → 25.1.8-alpha.0

package/README.md

@@ -1,3 +1,28 @@
 # TeskaLabs ASAB WebUI Shell Library
 
 Shell library of ASAB used in WebUI projects.
+
+## Getting started
+
+```
+pnpm add asab_webui_shell
+```
+
+## Usage
+
+```
+import { Application } from 'asab_webui_shell';
+```
+
+Possible imports:
+
+- Application
+- AboutModule
+- AuthModule
+- TenantModule
+- I18nModule
+- getBrandImage
+
+## Documentation
+
+**TODO**

package/dist/containers/Application.js

@@ -124,6 +124,10 @@ var Application = /*#__PURE__*/function (_Component) {
     _this.ReduxService.addReducer("sidebar", _reducer2["default"]);
     _this.ReduxService.addReducer("navigation", _reducer4["default"]);
     _this.ReduxService.addReducer("router", _reducer5["default"]);
+
+    // The application can provide a list of keys that should be automatically parsed as BigInt, when received from the server in Axios call
+    // This is important to preserve 64bit numbers from the server such as IP addresses, timestamps etc.
+    _this.JSONParseBigInt = new Set(props === null || props === void 0 ? void 0 : props.bigint);
     _this._handleKeyUp = _this._handleKeyUp.bind(_this);
     _this.state = {
       networking: 0,
@@ -337,6 +341,10 @@ var Application = /*#__PURE__*/function (_Component) {
         return undefined;
       }
       var axios = _axios["default"].create(_objectSpread(_objectSpread({}, props), {}, {
+        transformResponse: function transformResponse(res) {
+          return res;
+        },
+        // Disable implicit JSON parsing, we explicitly parse JSON in the interceptor ( https://stackoverflow.com/questions/41013082/disable-json-parsing-in-axios )
         baseURL: service_url
       }));
 
@@ -370,9 +378,39 @@ var Application = /*#__PURE__*/function (_Component) {
         return Promise.reject(error);
       });
 
-      // We want to remove networking indicator when we recieve the response
+      // We want to remove the networking indicator when we receive the response
       axios.interceptors.response.use(function (response) {
+        var _response$headers$con;
+        // Call the `popNetworkingIndicator` method to remove the networking indicator (e.g., loading spinner)
         that.popNetworkingIndicator();
+
+        // Check if the response content type is 'application/json' or starts with 'application/json'
+        if (response !== null && response !== void 0 && (_response$headers$con = response.headers['content-type']) !== null && _response$headers$con !== void 0 && _response$headers$con.startsWith('application/json')) {
+          // If the response is JSON, then parse it with respect to BigInt
+          // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/JSON/parse
+          try {
+            // Parse the response data using a custom reviver function
+            response.data = JSON.parse(response.data,
+            // Custom reviver function to handle BigInt values
+            function (key, value, context) {
+              // If there is no data in the JSONParseBigInt, return the value immediately
+              if (that.JSONParseBigInt.size === 0) {
+                return value;
+              }
+              // Check if the key is in the `JSONParseBigInt` set and the value is a number
+              if (that.JSONParseBigInt.has(key) && typeof value === 'number') {
+                // Convert the number to a BigInt
+                return BigInt(context.source);
+              }
+              // Return the original value if no conversion is needed
+              return value;
+            });
+          } catch (e) {
+            // Log any errors that occur during JSON parsing
+            console.error("Error in axios.interceptors.response", e);
+          }
+        }
+        // If the request was satisfied (application/json and presence of BigInt) return the modified object. If not, we return unchanged object
         return response;
       }, function (error) {
         that.popNetworkingIndicator();

package/dist/containers/Header/reducer.js

@@ -10,7 +10,7 @@ var _actions = require("../../actions");
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { (0, _defineProperty2["default"])(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var initialState = {
-  helpPath: "https://docs.teskalabs.com/logman.io/user/",
+  helpPath: undefined,
   subtitle: undefined,
   flag: undefined,
   headerNavItems: []

package/dist/containers/Router/ApplicationRouter.js

@@ -49,14 +49,16 @@ function RouteRenderer(props) {
     return (_state$auth = state.auth) !== null && _state$auth !== void 0 && _state$auth.resources ? state.auth.resources : [];
   });
   var dispatch = (0, _reactRedux.useDispatch)();
+  var defaultHelp = props.app.Config.get("help");
+
   // Set up and dispatch help content
   (0, _react.useEffect)(function () {
-    var defaultHelp = "https://docs.teskalabs.com/logman.io/user/";
     dispatch({
       type: _actions.SET_HELP_PATH,
       helpPath: props.route.help ? props.route.help : defaultHelp
     });
   }, [props.route.help]);
+
   // Route component renders the approriate screen based on the route
   if (props.route.resource) {
     // If resource present, let UnauthorizedAccessScreen to decide if the Screen will be rendered

package/dist/modules/about/AboutScreen.js

@@ -1,22 +1,42 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+var _typeof = require("@babel/runtime/helpers/typeof");
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
-var _react = _interopRequireDefault(require("react"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = _interopRequireWildcard(require("react"));
 var _reactI18next = require("react-i18next");
 var _reactRedux = require("react-redux");
+var _BrandImage = require("../../components/branding/BrandImage");
 var _reactstrap = require("reactstrap");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
 function AboutScreen(props) {
+  var _useState = (0, _react.useState)(undefined),
+    _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+    brandImage = _useState2[0],
+    setBrandImage = _useState2[1];
+  var theme = (0, _reactRedux.useSelector)(function (state) {
+    return state.theme;
+  });
+  (0, _react.useEffect)(function () {
+    setBrandImage((0, _BrandImage.getBrandImage)(props, theme));
+  }, [theme]);
   return /*#__PURE__*/_react["default"].createElement(_reactstrap.Container, {
     className: "pt-5"
   }, /*#__PURE__*/_react["default"].createElement(_reactstrap.Row, {
     className: "justify-content-center"
   }, /*#__PURE__*/_react["default"].createElement(_reactstrap.Col, {
     md: "6"
-  }, /*#__PURE__*/_react["default"].createElement(AboutCard, {
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    className: "my-4"
+  }, brandImage ? /*#__PURE__*/_react["default"].createElement("img", {
+    src: brandImage === null || brandImage === void 0 ? void 0 : brandImage.full,
+    alt: "TeskaLabs logo"
+  }) : null), /*#__PURE__*/_react["default"].createElement(AboutCard, {
     app: props.app
   }))));
 }

package/dist/modules/auth/header.js

@@ -86,7 +86,7 @@ function AuthHeaderDropdown(props) {
   }) : /*#__PURE__*/_react["default"].createElement("i", {
     alt: userinfo === null || userinfo === void 0 ? void 0 : userinfo.username,
     className: "pe-2 bi ".concat(isSuperuser ? 'bi-universal-access' : 'bi-person-gear')
-  }), /*#__PURE__*/_react["default"].createElement("span", null, userinfo === null || userinfo === void 0 ? void 0 : userinfo.username)), /*#__PURE__*/_react["default"].createElement(_reactstrap.DropdownMenu, {
+  }), /*#__PURE__*/_react["default"].createElement("span", null, (userinfo === null || userinfo === void 0 ? void 0 : userinfo.username) || (userinfo === null || userinfo === void 0 ? void 0 : userinfo.sub))), /*#__PURE__*/_react["default"].createElement(_reactstrap.DropdownMenu, {
     className: "shadow"
   }, /*#__PURE__*/_react["default"].createElement(_reactstrap.DropdownItem, {
     header: true

package/package.json

@@ -1,8 +1,23 @@
 {
   "name": "asab_webui_shell",
-  "version": "25.1.6",
+  "version": "25.1.8-alpha.0",
   "license": "BSD-3-Clause",
   "description": "TeskaLabs ASAB WebUI Shell Application",
+  "contributors": [
+    {
+      "name": "TeskaLabs",
+      "email": "info@teskalabs.com",
+      "url": "https://teskalabs.com"
+    }
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+ssh://git@github.com:TeskaLabs/asab-webui-shell-lib.git"
+  },
+  "bugs": {
+    "url": "https://github.com/TeskaLabs/asab-webui-shell-lib/issues"
+  },
+  "homepage": "https://github.com/TeskaLabs/asab-webui-shell-lib",
   "main": "dist/index.js",
   "files": [
     "dist"