@next-core/brick-kit 2.122.3 → 2.122.4

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.122.4](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.122.3...@next-core/brick-kit@2.122.4) (2022-06-27)
+
+
+### Bug Fixes
+
+* remove the request to fetch contarcts ([18f80d9](https://github.com/easyops-cn/next-core/commit/18f80d917f588956251621f27cc2d523cb5916fd))
+
+
+
+
+
 ## [2.122.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.122.2...@next-core/brick-kit@2.122.3) (2022-06-24)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -563,24 +563,6 @@
       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, mock) {
     var globalVariables = _objectSpread__default["default"]({}, providedGlobalVariables); // Allow limited browser builtin values.
@@ -5841,51 +5823,6 @@
     };
   }();
 
-  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 => {
-        var isFlowAPi = isCustomApiProvider(item.provider);
-        return _objectSpread__default["default"](_objectSpread__default["default"]({}, item), {}, {
-          uri: "".concat(isFlowAPi ? item.uri.replace(/(.+?)\/(.+)/, (_match, p1, p2) => {
-            return "/".concat(p1, "(@\\d+\\.\\d+\\.\\d+)?/").concat(p2, "$");
-          }) : "/".concat(item.uri.split(".").slice(2).join("."), "$")).replace(/:\w+/g, "([^/]+)")
-        });
-      })
-    });
-  }
-  function getMockList() {
-    return mocks.mockList;
-  }
-  var getMockInfo = (requestUrl, method) => {
-    var transformGetMethod = method => {
-      if (method.toUpperCase() === "LIST") {
-        return "GET";
-      }
-
-      return method === null || method === void 0 ? void 0 : method.toUpperCase();
-    };
-
-    var item = mocks.mockList.find(item => new RegExp(item.uri).test(requestUrl) && transformGetMethod(item.method) === (method === null || method === void 0 ? void 0 : method.toUpperCase()));
-
-    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 contractsMap = new Map();
   function collectContract(contracts) {
     contracts === null || contracts === void 0 ? void 0 : contracts.forEach(contract => {
@@ -6022,75 +5959,40 @@
     _fetchFlowApiDefinition2 = _asyncToGenerator__default["default"](function* (provider) {
       var [namespaceName, nameWithVersion] = provider.split("@");
       var [name, version] = nameWithVersion.split(":");
-      var isUseMock = getMockList().find(item => item.provider === "".concat(namespaceName, "@").concat(name));
-
-      if (isUseMock) {
-        var _list$;
+      var contract;
 
-        var {
-          list
-        } = yield InstanceApi_postSearchV3("FLOW_BUILDER_API_CONTRACT@EASYOPS", {
-          fields: ["name", "namespaceId", "endpoint", "response", "version", "serviceName"],
-          query: {
-            namespaceId: {
-              $eq: namespaceName
-            },
-            name: {
-              $eq: name
-            }
+      if (contract = getContract("".concat(namespaceName, ".").concat(name))) {
+        return {
+          name: contract.name,
+          namespace: contract.namespaceId,
+          serviceName: contract.serviceName,
+          version: contract.version,
+          contract: {
+            endpoint: contract.endpoint,
+            response: contract.response
           }
-        });
-
-        if ((_list$ = list[0]) !== null && _list$ !== void 0 && _list$.instanceId) {
-          var _list$2, _list$3;
-
-          return {
-            name: list[0].name,
-            namespace: (_list$2 = list[0]) === null || _list$2 === void 0 ? void 0 : _list$2.namespaceId,
-            serviceName: (_list$3 = list[0]) === null || _list$3 === void 0 ? void 0 : _list$3.serviceName,
-            version: list[0].version,
-            contract: {
-              endpoint: list[0].endpoint,
-              response: list[0].response
-            }
-          };
-        }
+        };
       } else {
-        var contract;
+        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;
 
-        if (contract = getContract("".concat(namespaceName, ".").concat(name))) {
           return {
-            name: contract.name,
-            namespace: contract.namespaceId,
-            serviceName: contract.serviceName,
-            version: contract.version,
+            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,
+            serviceName: contractData.serviceName,
+            version: contractData.version,
             contract: {
-              endpoint: contract.endpoint,
-              response: contract.response
+              endpoint: contractData.endpoint,
+              response: contractData.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,
-              serviceName: contractData.serviceName,
-              version: contractData.version,
-              contract: {
-                endpoint: contractData.endpoint,
-                response: contractData.response
-              }
-            };
-          }
         }
       }
     });
@@ -10338,6 +10240,48 @@
     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 => {
+        var isFlowAPi = isCustomApiProvider(item.provider);
+        return _objectSpread__default["default"](_objectSpread__default["default"]({}, item), {}, {
+          uri: "".concat(isFlowAPi ? item.uri.replace(/(.+?)\/(.+)/, (_match, p1, p2) => {
+            return "/".concat(p1, "(@\\d+\\.\\d+\\.\\d+)?/").concat(p2, "$");
+          }) : "/".concat(item.uri.split(".").slice(2).join("."), "$")).replace(/:\w+/g, "([^/]+)")
+        });
+      })
+    });
+  }
+  var getMockInfo = (requestUrl, method) => {
+    var transformGetMethod = method => {
+      if (method.toUpperCase() === "LIST") {
+        return "GET";
+      }
+
+      return method === null || method === void 0 ? void 0 : method.toUpperCase();
+    };
+
+    var item = mocks.mockList.find(item => new RegExp(item.uri).test(requestUrl) && transformGetMethod(item.method) === (method === null || method === void 0 ? void 0 : method.toUpperCase()));
+
+    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);