@next-core/brick-kit 2.90.2 → 2.92.0

package/CHANGELOG.md

@@ -3,6 +3,50 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.92.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.91.2...@next-core/brick-kit@2.92.0) (2021-12-06)
+
+
+### Features
+
+* expose http code ([#1227](https://github.com/easyops-cn/next-core/issues/1227)) ([9e22deb](https://github.com/easyops-cn/next-core/commit/9e22deb2dc27b7d907bb782790fa4a59960ccc82))
+
+
+
+
+
+## [2.91.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.91.1...@next-core/brick-kit@2.91.2) (2021-12-05)
+
+
+### Bug Fixes
+
+* add icons field ([7415b3f](https://github.com/easyops-cn/next-core/commit/7415b3ffaafe109c3bd555878a1d5ab2cd117183))
+
+
+
+
+
+## [2.91.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.91.0...@next-core/brick-kit@2.91.1) (2021-12-03)
+
+
+### Bug Fixes
+
+* fix page tracker ([dbf1d00](https://github.com/easyops-cn/next-core/commit/dbf1d003cd2e60ad18471e403c5dc9c9690b30fa))
+
+
+
+
+
+# [2.91.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.90.2...@next-core/brick-kit@2.91.0) (2021-12-03)
+
+
+### Features
+
+* support isAdmin ([f160156](https://github.com/easyops-cn/next-core/commit/f1601567b59c9f4a27aa130dc3e2e327c84c35db))
+
+
+
+
+
 ## [2.90.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.90.1...@next-core/brick-kit@2.90.2) (2021-12-01)
 
 

package/dist/index.bundle.js

@@ -1,40 +1,21 @@
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('history'), require('@babel/runtime/helpers/objectSpread2'), require('@babel/runtime/helpers/objectWithoutProperties'), require('@babel/runtime/helpers/asyncToGenerator'), require('@babel/runtime/helpers/defineProperty'), require('react'), require('lodash'), require('@next-core/brick-utils'), require('@next-core/brick-http'), require('i18next'), require('moment'), require('@next-core/pipes'), require('@next-core/easyops-analytics'), require('js-yaml'), require('antd'), require('@ant-design/icons'), require('react-i18next'), require('@babel/runtime/helpers/esm/extends'), require('@next-core/illustrations'), require('@babel/runtime/helpers/decorate')) :
   typeof define === 'function' && define.amd ? define(['exports', 'history', '@babel/runtime/helpers/objectSpread2', '@babel/runtime/helpers/objectWithoutProperties', '@babel/runtime/helpers/asyncToGenerator', '@babel/runtime/helpers/defineProperty', 'react', 'lodash', '@next-core/brick-utils', '@next-core/brick-http', 'i18next', 'moment', '@next-core/pipes', '@next-core/easyops-analytics', 'js-yaml', 'antd', '@ant-design/icons', 'react-i18next', '@babel/runtime/helpers/esm/extends', '@next-core/illustrations', '@babel/runtime/helpers/decorate'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.BrickKit = {}, global.history$1, global._objectSpread, global._objectWithoutProperties, global._asyncToGenerator$4, global._defineProperty$1, global.React, global.lodash, global.brickUtils, global.brickHttp, global.i18next, global.moment, global.pipes, global.easyopsAnalytics, global.yaml, global.antd, global.icons, global.reactI18next, global._extends$2, global.illustrations, global._decorate));
-})(this, (function (exports, history$1, _objectSpread, _objectWithoutProperties, _asyncToGenerator$4, _defineProperty$1, React, lodash, brickUtils, brickHttp, i18next, moment, pipes, easyopsAnalytics, yaml, antd, icons, reactI18next, _extends$2, illustrations, _decorate) { 'use strict';
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.BrickKit = {}, global.history$1, global._objectSpread, global._objectWithoutProperties, global._asyncToGenerator$4, global._defineProperty$1, global.React, global.lodash, global.brickUtils, global.brickHttp, global.i18next, global.moment, global.pipes, global.easyopsAnalytics, global.yaml, global.antd, global.icons, global.reactI18next, global._extends, global.illustrations, global._decorate));
+})(this, (function (exports, history$1, _objectSpread, _objectWithoutProperties, _asyncToGenerator$4, _defineProperty$1, React, lodash, brickUtils, brickHttp, i18next, moment, pipes, easyopsAnalytics, yaml, antd, icons, reactI18next, _extends, illustrations, _decorate) { 'use strict';
 
   function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-  function _interopNamespace(e) {
-    if (e && e.__esModule) return e;
-    var n = Object.create(null);
-    if (e) {
-      Object.keys(e).forEach(function (k) {
-        if (k !== 'default') {
-          var d = Object.getOwnPropertyDescriptor(e, k);
-          Object.defineProperty(n, k, d.get ? d : {
-            enumerable: true,
-            get: function () { return e[k]; }
-          });
-        }
-      });
-    }
-    n["default"] = e;
-    return Object.freeze(n);
-  }
-
   var _objectSpread__default = /*#__PURE__*/_interopDefaultLegacy(_objectSpread);
   var _objectWithoutProperties__default = /*#__PURE__*/_interopDefaultLegacy(_objectWithoutProperties);
   var _asyncToGenerator__default = /*#__PURE__*/_interopDefaultLegacy(_asyncToGenerator$4);
   var _defineProperty__default = /*#__PURE__*/_interopDefaultLegacy(_defineProperty$1);
   var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
-  var React__namespace = /*#__PURE__*/_interopNamespace(React);
   var lodash__default = /*#__PURE__*/_interopDefaultLegacy(lodash);
   var i18next__default = /*#__PURE__*/_interopDefaultLegacy(i18next);
   var moment__default = /*#__PURE__*/_interopDefaultLegacy(moment);
   var yaml__default = /*#__PURE__*/_interopDefaultLegacy(yaml);
-  var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends$2);
+  var _extends__default = /*#__PURE__*/_interopDefaultLegacy(_extends);
   var _decorate__default = /*#__PURE__*/_interopDefaultLegacy(_decorate);
 
   class BaseBar {
@@ -1260,6 +1241,54 @@
     };
   }();
 
+  var auth = {};
+  /** @internal */
+
+  function authenticate(newAuth) {
+    Object.assign(auth, {
+      org: newAuth.org,
+      username: newAuth.username,
+      userInstanceId: newAuth.userInstanceId,
+      loginFrom: newAuth.loginFrom,
+      accessRule: newAuth.accessRule,
+      isAdmin: newAuth.isAdmin
+    }); // re-init analytics to set user_id
+
+    if (easyopsAnalytics.userAnalytics.initialized) {
+      easyopsAnalytics.userAnalytics.setUserId(newAuth.userInstanceId);
+    }
+  }
+  /**
+   * 获取当前登录认证信息。
+   *
+   * @returns 当前登录认证信息。
+   */
+
+  function getAuth() {
+    return _objectSpread__default["default"]({}, auth);
+  }
+  /** @internal */
+
+  function logout() {
+    auth.org = undefined;
+    auth.username = undefined;
+    auth.userInstanceId = undefined;
+    auth.accessRule = undefined;
+    auth.isAdmin = undefined;
+    resetPermissionPreChecks(); // re-init analytics to clear user_id
+
+    easyopsAnalytics.userAnalytics.setUserId();
+  }
+  /**
+   * 查看当前是否已登录。
+   *
+   * @returns 当前是否已登录。
+   */
+
+  function isLoggedIn() {
+    return auth.username !== undefined;
+  }
+
   var permissionMap = new Map();
   function preCheckPermissions(_x) {
     return _preCheckPermissions.apply(this, arguments);
@@ -1316,6 +1345,10 @@
   }
 
   function checkPermissions() {
+    if (getAuth().isAdmin) {
+      return true;
+    }
+
     for (var _len = arguments.length, actions = new Array(_len), _key = 0; _key < _len; _key++) {
       actions[_key] = arguments[_key];
     }
@@ -5892,52 +5925,6 @@
     };
   }();
 
-  var auth = {};
-  /** @internal */
-
-  function authenticate(newAuth) {
-    Object.assign(auth, {
-      org: newAuth.org,
-      username: newAuth.username,
-      userInstanceId: newAuth.userInstanceId,
-      loginFrom: newAuth.loginFrom,
-      accessRule: newAuth.accessRule
-    }); // re-init analytics to set user_id
-
-    if (easyopsAnalytics.userAnalytics.initialized) {
-      easyopsAnalytics.userAnalytics.setUserId(newAuth.userInstanceId);
-    }
-  }
-  /**
-   * 获取当前登录认证信息。
-   *
-   * @returns 当前登录认证信息。
-   */
-
-  function getAuth() {
-    return _objectSpread__default["default"]({}, auth);
-  }
-  /** @internal */
-
-  function logout() {
-    auth.org = undefined;
-    auth.username = undefined;
-    auth.userInstanceId = undefined;
-    auth.accessRule = undefined;
-    resetPermissionPreChecks(); // re-init analytics to clear user_id
-
-    easyopsAnalytics.userAnalytics.setUserId();
-  }
-  /**
-   * 查看当前是否已登录。
-   *
-   * @returns 当前是否已登录。
-   */
-
-  function isLoggedIn() {
-    return auth.username !== undefined;
-  }
-
   /**
    * Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
    *
@@ -6264,7 +6251,7 @@
 
       return _asyncToGenerator__default["default"](function* () {
         var data = yield window.STANDALONE_MICRO_APPS ? standaloneBootstrap() : BootstrapV2Api_bootstrapV2(_objectSpread__default["default"]({
-          appFields: "defaultConfig,userConfig,locales,name,homepage,id,currentVersion,installStatus,internal,status",
+          appFields: "defaultConfig,userConfig,locales,name,homepage,id,currentVersion,installStatus,internal,status,icons",
           ignoreTemplateFields: "templates",
           ignoreBrickFields: "bricks,processors,providers,editors"
         }, params), {
@@ -7907,7 +7894,8 @@
           username: auth.username,
           userInstanceId: auth.userInstanceId,
           loginFrom: auth.loginFrom,
-          accessRule: auth.accessRule
+          accessRule: auth.accessRule,
+          isAdmin: auth.isAdmin
         }, getRuntimeMisc()),
         flags: this.kernel.getFeatureFlags(),
         segues: this.segues,
@@ -8317,7 +8305,7 @@
 
     preCheckPermissions(container, context) {
       return _asyncToGenerator__default["default"](function* () {
-        if (isLoggedIn() && container.permissionsPreCheck && Array.isArray(container.permissionsPreCheck)) {
+        if (isLoggedIn() && !getAuth().isAdmin && container.permissionsPreCheck && Array.isArray(container.permissionsPreCheck)) {
           var usedActions = computeRealValue(container.permissionsPreCheck, context, true);
           yield validatePermissions(usedActions);
         }
@@ -9280,6 +9268,8 @@
       var _this3 = this;
 
       return _asyncToGenerator__default["default"](function* () {
+        var _apiAnalyzer$getInsta;
+
         _this3.state = "initial";
         _this3.renderId = lodash.uniqueId("render-id-");
         resetAllInjected();
@@ -9290,7 +9280,10 @@
         }
 
         var history = getHistory();
-        history.unblock();
+        history.unblock(); // Create the page tracker before page load.
+        // And the API Analyzer maybe disabled.
+
+        var pageTracker = (_apiAnalyzer$getInsta = easyopsAnalytics.apiAnalyzer.getInstance()) === null || _apiAnalyzer$getInsta === void 0 ? void 0 : _apiAnalyzer$getInsta.pageTracker();
         var locationContext = _this3.locationContext = new LocationContext(_this3.kernel, location);
         var storyboard = locationContext.matchStoryboard(_this3.kernel.bootstrapData.storyboards);
 
@@ -9301,7 +9294,7 @@
 
           brickUtils.restoreDynamicTemplates(storyboard); // 预加载权限信息
 
-          if (isLoggedIn()) {
+          if (isLoggedIn() && !getAuth().isAdmin) {
             yield preCheckPermissions(storyboard);
           } // 如果找到匹配的 storyboard，那么根据路由匹配得到的 sub-storyboard 加载它的依赖库。
 
@@ -9378,7 +9371,8 @@
               mountRoutesResult.main = [{
                 type: brickPageError,
                 properties: {
-                  error: httpErrorToString(error)
+                  error: httpErrorToString(error),
+                  code: error instanceof brickHttp.HttpResponseError ? error.response.status : null
                 },
                 events: {}
               }];
@@ -9486,8 +9480,6 @@
           });
 
           if (main.length > 0 || portal.length > 0) {
-            var _apiAnalyzer$getInsta;
-
             main.length > 0 && mountTree(main, mountPoints.main);
             portal.length > 0 && mountTree(portal, mountPoints.portal);
             afterMountTree(mountPoints.main);
@@ -9506,9 +9498,8 @@
             // See https://github.com/ReactTraining/react-router/blob/master/packages/react-router-dom/docs/guides/scroll-restoration.md
 
 
-            window.scrollTo(0, 0); // API Analyzer maybe disabled.
-
-            (_apiAnalyzer$getInsta = easyopsAnalytics.apiAnalyzer.getInstance()) === null || _apiAnalyzer$getInsta === void 0 ? void 0 : _apiAnalyzer$getInsta.pageTracker()(locationContext.getCurrentMatch().path); // analytics page_view event
+            window.scrollTo(0, 0);
+            pageTracker === null || pageTracker === void 0 ? void 0 : pageTracker(locationContext.getCurrentMatch().path); // analytics page_view event
 
             easyopsAnalytics.userAnalytics.event("page_view", _objectSpread__default["default"]({
               micro_app_id: _this3.kernel.currentApp.id,
@@ -10805,94 +10796,14 @@
   };
   var defaultLocale = localeValues;
 
-  function _extends$1() { _extends$1 = Object.assign || 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$1.apply(this, arguments); }
-
-  var _ref$1 = /*#__PURE__*/React__namespace.createElement("g", {
-    fill: "none"
-  }, /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M61.108 51.8H15.892a2.8 2.8 0 0 0-1.941.782L5.6 60.615V74.2a5.6 5.6 0 0 0 5.6 5.6h54.6a5.6 5.6 0 0 0 5.6-5.6V60.615l-8.35-8.033a2.8 2.8 0 0 0-1.942-.782z",
-    fill: "#C4C4C4"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M16.8 19.6h43.4a2.8 2.8 0 0 1 2.8 2.8v44.8a2.8 2.8 0 0 1-2.8 2.8H16.8a2.8 2.8 0 0 1-2.8-2.8V22.4a2.8 2.8 0 0 1 2.8-2.8z",
-    fill: "#F7F7F7"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M23.8 26.6h29.4a2.8 2.8 0 0 1 2.8 2.8v9.8a2.8 2.8 0 0 1-2.8 2.8H23.8a2.8 2.8 0 0 1-2.8-2.8v-9.8a2.8 2.8 0 0 1 2.8-2.8zm0 26.6h22.4a1.4 1.4 0 0 1 0 2.8H23.8a1.4 1.4 0 0 1 0-2.8zm0-7h29.4a1.4 1.4 0 0 1 0 2.8H23.8a1.4 1.4 0 0 1 0-2.8z",
-    fill: "#E5E5E5"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M82.6 42a.7.7 0 0 1 .7.7v1.399l1.4.001a.7.7 0 0 1 0 1.4l-1.4-.001V46.9a.7.7 0 0 1-1.4 0v-1.401l-1.4.001a.7.7 0 0 1 0-1.4l1.4-.001V42.7a.7.7 0 0 1 .7-.7z",
-    fill: "#CDCDCD"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M2.1 30.8c.29 0 .525.235.525.525l-.001.874.876.001a.7.7 0 0 1 0 1.4h-.876l.001.875a.525.525 0 1 1-1.05 0l-.001-.875H.7a.7.7 0 0 1 0-1.4l.874-.001.001-.874c0-.29.235-.525.525-.525zm6.3 49l-.17-.005A2.8 2.8 0 0 1 5.6 77V60.2h12.393l.175-.006c3.802-.04 7.95 5.943 19.61 6.19l.022-.002.022.002c10.856.218 15.009-5.902 19.558-6.175l.227-.009H71.4V77a2.8 2.8 0 0 1-2.63 2.795l-.17.005H8.4z",
-    fill: "#E5E5E5"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M21 3.356S24.518 2.509 25.516 0c1.438 2.057 2.18 2.947 3.884 3.338-2.321.692-3.33 1.468-4.123 3.662-.912-2.584-1.741-2.919-4.277-3.644",
-    fill: "#F5F5F5"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M63 10.125S72.382 7.923 75.044 1.4c3.834 5.35 5.81 7.663 10.356 8.68-6.19 1.797-8.878 3.816-10.995 9.52-2.43-6.72-4.643-7.59-11.405-9.475",
-    fill: "#E5E5E5"
-  }));
-
-  function SvgEmptyGreyImage(props) {
-    return /*#__PURE__*/React__namespace.createElement("svg", _extends$1({
-      width: 86,
-      height: 80,
-      viewBox: "0 0 86 80",
-      xmlns: "http://www.w3.org/2000/svg"
-    }, props), _ref$1);
-  }
-
-  function _extends() { _extends = Object.assign || 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); }
-
-  var _ref = /*#__PURE__*/React__namespace.createElement("g", {
-    fill: "none"
-  }, /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M15.892 52.3a2.3 2.3 0 0 0-1.594.642L6.1 60.828V74.2a5.08 5.08 0 0 0 1.494 3.606A5.084 5.084 0 0 0 11.2 79.3h54.6a5.08 5.08 0 0 0 3.606-1.494A5.084 5.084 0 0 0 70.9 74.2V60.828l-8.198-7.886c-.517-.498-1.331-.642-46.81-.642z",
-    stroke: "#D9D9D9",
-    fill: "#FDFDFD"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M16.8 19.6h43.4a2.8 2.8 0 0 1 2.8 2.8v44.8a2.8 2.8 0 0 1-2.8 2.8H16.8a2.8 2.8 0 0 1-2.8-2.8V22.4a2.8 2.8 0 0 1 2.8-2.8z",
-    stroke: "#EEE",
-    fill: "#F7F7F7"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M23.8 26.6h29.4a2.8 2.8 0 0 1 2.8 2.8v9.8a2.8 2.8 0 0 1-2.8 2.8H23.8a2.8 2.8 0 0 1-2.8-2.8v-9.8a2.8 2.8 0 0 1 2.8-2.8zm0 26.6h22.4a1.4 1.4 0 0 1 0 2.8H23.8a1.4 1.4 0 0 1 0-2.8zm0-7h29.4a1.4 1.4 0 0 1 0 2.8H23.8a1.4 1.4 0 0 1 0-2.8z",
-    fill: "#E5E5E5"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M82.6 42a.7.7 0 0 1 .7.7v1.399l1.4.001a.7.7 0 0 1 0 1.4l-1.4-.001V46.9a.7.7 0 0 1-1.4 0v-1.401l-1.4.001a.7.7 0 0 1 0-1.4l1.4-.001V42.7a.7.7 0 0 1 .7-.7z",
-    fill: "#CDCDCD"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M2.1 30.8c.29 0 .525.235.525.525l-.001.874.876.001a.7.7 0 0 1 0 1.4h-.876l.001.875a.525.525 0 1 1-1.05 0l-.001-.875H.7a.7.7 0 0 1 0-1.4l.874-.001.001-.874c0-.29.235-.525.525-.525z",
-    fill: "#E5E5E5"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M17.998 60.7H6.1l.005 16.455c.038.573.287 1.089.669 1.471.389.39.919.632 1.64.674H37.8l30.955-.005a2.293 2.293 0 0 0 1.52-.72c.388-.411.625-.965.625-1.575V60.7l-13.505.009c-1.637.103-3.215 1.012-5.103 2.07-3.338 1.874-7.58 4.243-14.524 4.105l-.537-.015c-7.07-.261-11.352-2.607-14.53-4.352-1.837-1.009-3.277-1.834-4.703-1.817z",
-    stroke: "#D9D9D9",
-    fill: "#F7F5F5"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M21 3.356S24.518 2.509 25.516 0c1.438 2.057 2.18 2.947 3.884 3.338-2.321.692-3.33 1.468-4.123 3.662-.912-2.584-1.741-2.919-4.277-3.644",
-    fill: "#F5F5F5"
-  }), /*#__PURE__*/React__namespace.createElement("path", {
-    d: "M63 10.125S72.382 7.923 75.044 1.4c3.834 5.35 5.81 7.663 10.356 8.68-6.19 1.797-8.878 3.816-10.995 9.52-2.43-6.72-4.643-7.59-11.405-9.475",
-    fill: "#E5E5E5"
-  }));
-
-  function SvgEmptyLightGreyImage(props) {
-    return /*#__PURE__*/React__namespace.createElement("svg", _extends({
-      width: 86,
-      height: 80,
-      viewBox: "0 0 86 80",
-      xmlns: "http://www.w3.org/2000/svg"
-    }, props), _ref);
-  }
+  var emptyImage = "../EasyopsEmpty/empty-image.397ff6359f4066d8.png";
 
   /**
    * 用于展示空数据的 React 组件。
    */
   function EasyopsEmpty(props) {
-    var _props$background;
-
-    var background = (_props$background = props.background) !== null && _props$background !== void 0 ? _props$background : "white";
-    var emptyImage = background === "white" ? SvgEmptyGreyImage : SvgEmptyLightGreyImage;
     var illustration = React.useMemo(() => props.illustration && illustrations.getIllustration(props.illustration), [props.illustration]);
-    var image = props.illustration ? illustration : /*#__PURE__*/React__default["default"].createElement(emptyImage);
+    var image = props.illustration ? illustration : emptyImage;
     return /*#__PURE__*/React__default["default"].createElement(antd.Empty, {
       image: image,
       imageStyle: props.imageStyle,