@next-core/brick-kit 2.101.0 → 2.102.1

package/CHANGELOG.md

@@ -3,6 +3,53 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.102.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.102.0...@next-core/brick-kit@2.102.1) (2022-01-12)
+
+
+### Bug Fixes
+
+* do not redirect to login page while NO_AUTH_GUARD is enabled ([02b69b1](https://github.com/easyops-cn/next-core/commit/02b69b19b98b1ba4aa4e0d2405d28444f3c05def))
+
+
+
+
+
+# [2.102.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.101.2...@next-core/brick-kit@2.102.0) (2022-01-07)
+
+
+### Features
+
+* **FlowApi:**  update size-limit.js ([7b61a08](https://github.com/easyops-cn/next-core/commit/7b61a088ed6e0f2bd7ecd3bcb80fd2fa8b918bc7))
+* **FlowApi:**  update unit test ([059f6b6](https://github.com/easyops-cn/next-core/commit/059f6b612d5e90cb5facaa6285c8340f046ce4b0))
+* **FlowApi:**  update unit test ([a4bcc9d](https://github.com/easyops-cn/next-core/commit/a4bcc9d654039616a3889c142e5bd37c8ee987bc))
+* **FlowApi:**  useMock in flow api ([05a5751](https://github.com/easyops-cn/next-core/commit/05a5751e33aedfaae73c80a040081c2b4d2f2a73))
+
+
+
+
+
+## [2.101.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.101.1...@next-core/brick-kit@2.101.2) (2022-01-06)
+
+
+### Bug Fixes
+
+* dark theme refine ([db6d4e5](https://github.com/easyops-cn/next-core/commit/db6d4e58c98779329e9dad99ee0fcde22631e44b))
+
+
+
+
+
+## [2.101.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.101.0...@next-core/brick-kit@2.101.1) (2022-01-05)
+
+
+### Bug Fixes
+
+* fix `_.isEmpty(QUERY)` ([3202979](https://github.com/easyops-cn/next-core/commit/3202979a524a512423b9ce1f698c265ce650755c))
+
+
+
+
+
 # [2.101.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.100.0...@next-core/brick-kit@2.101.0) (2022-01-05)
 
 

package/dist/index.bundle.js

@@ -512,6 +512,24 @@
       return _ref.apply(this, arguments);
     };
   }();
+  /**
+   * @description 搜索实例V3 (支持多属性排序)
+   * @endpoint POST /v3/object/:objectId/instance/_search
+   */
+
+
+  var InstanceApi_postSearchV3 = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator$3(function* (objectId, data, options) {
+      return (
+        /**! @contract easyops.api.cmdb.instance.PostSearchV3 */
+        (yield brickHttp.http.post("api/gateway/cmdb.instance.PostSearchV3/v3/object/".concat(objectId, "/instance/_search"), data, options)).data
+      );
+    });
+
+    return function InstanceApi_postSearchV3(_x, _x2, _x3) {
+      return _ref.apply(this, arguments);
+    };
+  }();
 
   function supply(attemptToVisitGlobals, providedGlobalVariables) {
     var globalVariables = _objectSpread__default["default"]({}, providedGlobalVariables); // Allow limited browser builtin values.
@@ -1527,6 +1545,11 @@
         return {
           check: collectCoverage ? fakeCheckPermissions : checkPermissions
         };
+
+      case "THEME":
+        return {
+          getTheme: collectCoverage ? () => "light" : getTheme
+        };
     }
   }
 
@@ -1893,39 +1916,16 @@
           });
 
         case "QUERY":
-          return getDynamicReadOnlyProxy({
-            get(target, key) {
-              return query.has(key) ? query.get(key) : undefined;
-            },
-
-            ownKeys() {
-              return Array.from(query.keys());
-            }
-
-          });
+          return Object.fromEntries(Array.from(query.keys()).map(key => [key, query.get(key)]));
 
         case "QUERY_ARRAY":
-          return getDynamicReadOnlyProxy({
-            get(target, key) {
-              return query.has(key) ? query.getAll(key) : undefined;
-            },
-
-            ownKeys() {
-              return Array.from(query.keys());
-            }
-
-          });
+          return Object.fromEntries(Array.from(query.keys()).map(key => [key, query.getAll(key)]));
 
         case "SEGUE":
           return {
             getUrl: getUrlBySegueFactory(app, segues)
           };
 
-        case "THEME":
-          return {
-            getTheme
-          };
-
         case "SESSION_STORAGE":
           return {
             getItem: getItemFactory("session")
@@ -3210,7 +3210,7 @@
 
   function handleHttpError(error) {
     // Redirect to login page if not logged in.
-    if (isUnauthenticatedError(error)) {
+    if (isUnauthenticatedError(error) && !window.NO_AUTH_GUARD) {
       // Do not show multiple confirm modals.
       if (unauthenticatedConfirmModal) {
         return;
@@ -5036,6 +5036,39 @@
     };
   }();
 
+  var mocks = {
+    mockId: null,
+    mockList: []
+  };
+  function registerMock(useMocks) {
+    var _useMocks$mockList;
+
+    if (useMocks) mocks = _objectSpread__default["default"](_objectSpread__default["default"]({}, useMocks), {}, {
+      mockList: (_useMocks$mockList = useMocks.mockList) === null || _useMocks$mockList === void 0 ? void 0 : _useMocks$mockList.map(item => _objectSpread__default["default"](_objectSpread__default["default"]({}, item), {}, {
+        uri: item.uri.replace(/(easyops\.api\.)(.+?)\/(.+)/, (_match, p1, p2, p3) => {
+          return "(".concat(p1, ")?").concat(p2, "(@\\d+\\.\\d+\\.\\d+)?/").concat(p3, "$");
+        }).replace(/:\w+/g, "([^/]+)")
+      }))
+    });
+  }
+  function getMockList() {
+    return mocks.mockList;
+  }
+  var getMockInfo = requestUrl => {
+    var item = mocks.mockList.find(item => new RegExp(item.uri).test(requestUrl));
+
+    if (item) {
+      return {
+        url: requestUrl.replace(/(api\/gateway\/.+?)(@\d+\.\d+\.\d+)?\/(.+)/, (_match, p1, _p2, p3) => {
+          return "".concat(p1, "/").concat(p3);
+        }).replace(/(api\/gateway)/, "api/gateway/mock_server.proxy.".concat(mocks.mockId)),
+        mockId: mocks.mockId
+      };
+    }
+
+    return;
+  };
+
   var flowApiDefinitionPromiseMap = new Map(); // Legacy Custom API: `${namespace}@${name}`
   // Flow API: `${namespace}@${name}:${version}`
 
@@ -5155,25 +5188,59 @@
     _fetchFlowApiDefinition2 = _asyncToGenerator__default["default"](function* (provider) {
       var [namespaceName, nameWithVersion] = provider.split("@");
       var [name, version] = nameWithVersion.split(":");
-      var {
-        contractData
-      } = yield ContractApi_searchSingleContract({
-        contractName: "".concat(namespaceName, ".").concat(name),
-        version
-      }); // return undefined if don't found contract
+      var isUseMock = getMockList().find(item => item.provider === "".concat(namespaceName, "@").concat(name));
 
-      if (contractData) {
-        var _contractData$namespa, _contractData$namespa2;
+      if (isUseMock) {
+        var _list$;
 
-        return {
-          name: contractData.name,
-          namespace: (_contractData$namespa = contractData.namespace) === null || _contractData$namespa === void 0 ? void 0 : (_contractData$namespa2 = _contractData$namespa[0]) === null || _contractData$namespa2 === void 0 ? void 0 : _contractData$namespa2.name,
-          version: contractData.version,
-          contract: {
-            endpoint: contractData.endpoint,
-            response: contractData.response
+        var {
+          list
+        } = yield InstanceApi_postSearchV3("FLOW_BUILDER_API_CONTRACT@EASYOPS", {
+          fields: ["name", "namespaceId", "endpoint", "response", "version"],
+          query: {
+            namespaceId: {
+              $eq: namespaceName
+            },
+            name: {
+              $eq: name
+            }
           }
-        };
+        });
+
+        if ((_list$ = list[0]) !== null && _list$ !== void 0 && _list$.instanceId) {
+          var _list$2;
+
+          return {
+            name: list[0].name,
+            namespace: (_list$2 = list[0]) === null || _list$2 === void 0 ? void 0 : _list$2.namespaceId,
+            version: list[0].version,
+            contract: {
+              endpoint: list[0].endpoint,
+              response: list[0].response
+            }
+          };
+        }
+      } else {
+        var {
+          contractData
+        } = yield ContractApi_searchSingleContract({
+          contractName: "".concat(namespaceName, ".").concat(name),
+          version
+        }); // return undefined if don't found contract
+
+        if (contractData) {
+          var _contractData$namespa, _contractData$namespa2;
+
+          return {
+            name: contractData.name,
+            namespace: (_contractData$namespa = contractData.namespace) === null || _contractData$namespa === void 0 ? void 0 : (_contractData$namespa2 = _contractData$namespa[0]) === null || _contractData$namespa2 === void 0 ? void 0 : _contractData$namespa2.name,
+            version: contractData.version,
+            contract: {
+              endpoint: contractData.endpoint,
+              response: contractData.response
+            }
+          };
+        }
       }
     });
     return _fetchFlowApiDefinition2.apply(this, arguments);
@@ -10102,36 +10169,6 @@
     return defaultCollapsed || defaultCollapsedBreakpoint && document.documentElement.clientWidth < defaultCollapsedBreakpoint;
   }
 
-  var mocks = {
-    mockId: null,
-    mockList: []
-  };
-  function registerMock(useMocks) {
-    var _useMocks$mockList;
-
-    if (useMocks) mocks = _objectSpread__default["default"](_objectSpread__default["default"]({}, useMocks), {}, {
-      mockList: (_useMocks$mockList = useMocks.mockList) === null || _useMocks$mockList === void 0 ? void 0 : _useMocks$mockList.map(item => _objectSpread__default["default"](_objectSpread__default["default"]({}, item), {}, {
-        uri: item.uri.replace(/(easyops\.api\.)(.+?)\/(.+)/, (_match, p1, p2, p3) => {
-          return "(".concat(p1, ")?").concat(p2, "(@\\d+\\.\\d+\\.\\d+)?/").concat(p3, "$");
-        }).replace(/:\w+/g, "([^/]+)")
-      }))
-    });
-  }
-  var getMockInfo = requestUrl => {
-    var item = mocks.mockList.find(item => new RegExp(item.uri).test(requestUrl));
-
-    if (item) {
-      return {
-        url: requestUrl.replace(/(api\/gateway\/.+?)(@\d+\.\d+\.\d+)?\/(.+)/, (_match, p1, _p2, p3) => {
-          return "".concat(p1, "/").concat(p3);
-        }).replace(/(api\/gateway)/, "api/gateway/mock_server.proxy.".concat(mocks.mockId)),
-        mockId: mocks.mockId
-      };
-    }
-
-    return;
-  };
-
   class Router {
     constructor(kernel) {
       _defineProperty__default["default"](this, "defaultCollapsed", false);
@@ -10297,7 +10334,7 @@
       var _this3 = this;
 
       return _asyncToGenerator__default["default"](function* () {
-        var _apiAnalyzer$getInsta;
+        var _apiAnalyzer$getInsta, _currentApp$theme;
 
         _this3.state = "initial";
         _this3.renderId = lodash.uniqueId("render-id-");
@@ -10348,6 +10385,8 @@
         var legacy = currentApp ? currentApp.legacy : undefined;
         _this3.kernel.nextApp = currentApp;
         var layoutType = (currentApp === null || currentApp === void 0 ? void 0 : currentApp.layoutType) || "console";
+        setTheme((_currentApp$theme = currentApp === null || currentApp === void 0 ? void 0 : currentApp.theme) !== null && _currentApp$theme !== void 0 ? _currentApp$theme : "light");
+        setMode("default");
         devtoolsHookEmit("rendering");
         unmountTree(mountPoints.bg);
 
@@ -10358,7 +10397,7 @@
         };
 
         if (storyboard) {
-          var _currentApp$breadcrum, _currentApp$breadcrum2, _currentApp$theme;
+          var _currentApp$breadcrum, _currentApp$breadcrum2;
 
           if (appChanged && currentApp.id && isLoggedIn()) {
             var usedCustomApis = brickUtils.mapCustomApisToNameAndNamespace(brickUtils.scanCustomApisInStoryboard(storyboard));
@@ -10391,7 +10430,7 @@
             // eslint-disable-next-line no-console
             console.error(error); // Redirect to login page if not logged in.
 
-            if (isUnauthenticatedError(error)) {
+            if (isUnauthenticatedError(error) && !window.NO_AUTH_GUARD) {
               mountRoutesResult.flags.unauthenticated = true;
             } else {
               yield _this3.kernel.layoutBootstrap(layoutType);
@@ -10455,10 +10494,8 @@
           _this3.kernel.unsetBars({
             appChanged,
             legacy: actualLegacy
-          });
+          }); // There is a window to set theme and mode by `lifeCycle.onBeforePageLoad`.
 
-          setTheme((_currentApp$theme = currentApp.theme) !== null && _currentApp$theme !== void 0 ? _currentApp$theme : "light");
-          setMode("default"); // There is a window to set theme and mode by `lifeCycle.onBeforePageLoad`.
 
           _this3.locationContext.handleBeforePageLoad();