@next-core/brick-kit 2.117.1 → 2.117.4

package/CHANGELOG.md

@@ -3,6 +3,41 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.117.4](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.3...@next-core/brick-kit@2.117.4) (2022-04-11)
+
+
+### Bug Fixes
+
+* bg bricks should have no slot ([0c93d41](https://github.com/easyops-cn/next-core/commit/0c93d417da911b5b7d012d81f73bdeeadbf4f9d2))
+* no menu for template preview ([6f5ed88](https://github.com/easyops-cn/next-core/commit/6f5ed88002f61f105a6e2ab87481ffab2bbb0616))
+
+
+
+
+
+## [2.117.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.2...@next-core/brick-kit@2.117.3) (2022-04-08)
+
+
+### Bug Fixes
+
+* fix getMenu later ([ebe69b9](https://github.com/easyops-cn/next-core/commit/ebe69b99e565e53d2e649bf6facc601b5cd0d544))
+* update unit test ([104f0d1](https://github.com/easyops-cn/next-core/commit/104f0d1f0b9b741759743095b1e7d34294999803))
+
+
+
+
+
+## [2.117.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.1...@next-core/brick-kit@2.117.2) (2022-04-07)
+
+
+### Bug Fixes
+
+* support service name ([63b8f0b](https://github.com/easyops-cn/next-core/commit/63b8f0be85d4d213e8fd308beec84d0bbdee210d))
+
+
+
+
+
 ## [2.117.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.0...@next-core/brick-kit@2.117.1) (2022-04-07)
 
 

package/dist/index.bundle.js

@@ -5641,6 +5641,7 @@
       ext_fields,
       name,
       namespace,
+      serviceName,
       responseWrapper,
       version,
       isFileType
@@ -5654,7 +5655,7 @@
     var {
       url,
       args
-    } = getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, version);
+    } = getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, serviceName, version);
     return isFileType ? [fileName, {
       url,
       method,
@@ -5670,8 +5671,8 @@
     }, ...args];
   }
 
-  function getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, version) {
-    var prefix = version ? "api/gateway/".concat(namespace, ".").concat(name, "@").concat(version) : "api/gateway/api_service.".concat(namespace, ".").concat(name);
+  function getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, serviceName, version) {
+    var prefix = version ? serviceName ? "api/gateway/".concat(serviceName) : "api/gateway/".concat(namespace, ".").concat(name, "@").concat(version) : "api/gateway/api_service.".concat(namespace, ".").concat(name);
     var restArgs = originalArgs.slice();
     var transformedUri = uri.replace(/:([^/]+)/g, () => restArgs.shift());
     return {
@@ -5704,6 +5705,7 @@
       ext_fields,
       name: api.name,
       namespace: api.namespace,
+      serviceName: api.serviceName,
       version: api.version,
       isFileType: (contract === null || contract === void 0 ? void 0 : (_contract$response = contract.response) === null || _contract$response === void 0 ? void 0 : _contract$response.type) === "file",
       responseWrapper
@@ -5737,7 +5739,7 @@
         var {
           list
         } = yield InstanceApi_postSearchV3("FLOW_BUILDER_API_CONTRACT@EASYOPS", {
-          fields: ["name", "namespaceId", "endpoint", "response", "version"],
+          fields: ["name", "namespaceId", "endpoint", "response", "version", "serviceName"],
           query: {
             namespaceId: {
               $eq: namespaceName
@@ -5749,11 +5751,12 @@
         });
 
         if ((_list$ = list[0]) !== null && _list$ !== void 0 && _list$.instanceId) {
-          var _list$2;
+          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,
@@ -5768,6 +5771,7 @@
           return {
             name: contract.name,
             namespace: contract.namespaceId,
+            serviceName: contract.serviceName,
             version: contract.version,
             contract: {
               endpoint: contract.endpoint,
@@ -5788,6 +5792,7 @@
             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,
@@ -6674,7 +6679,6 @@
 
   var CUSTOM_API_PROVIDER = "brick-kit.provider-custom-api";
   function processExtFields(ext_fields) {
-
     var hasFields = type => {
       return ext_fields.some(item => item.source === type);
     };
@@ -8002,7 +8006,9 @@
         path: previewPath,
         bricks: [_objectSpread__default["default"]({
           brick: templateId
-        }, lodash.pick(settings, "properties"))]
+        }, lodash.pick(settings, "properties"))],
+        menu: false,
+        exact: true
       };
 
       if (previewRouteIndex === -1) {
@@ -8944,8 +8950,8 @@
               yield _this.preFetchMenu(route.context);
               yield _this.mountRoutes(route.routes, slotId, mountRoutesResult);
             } else if (isRouteConfOfBricks(route) && Array.isArray(route.bricks)) {
-              yield _this.mountBricks(route.bricks, matched.match, slotId, mountRoutesResult);
-              yield _this.preFetchMenu(route); // analytics data (page_view event)
+              yield _this.preFetchMenu(route);
+              yield _this.mountBricks(route.bricks, matched.match, slotId, mountRoutesResult); // analytics data (page_view event)
 
               if (route.analyticsData) {
                 mountRoutesResult.analyticsData = computeRealValue(route.analyticsData, context, true);
@@ -9226,6 +9232,8 @@
         }
 
         if (expandedBrickConf.bg) {
+          // A bg brick has no slotId.
+          brick.slotId = undefined;
           appendBrick(brick, _this6.kernel.mountPoints.bg);
         } else {
           if (expandedBrickConf.portal) {
@@ -10163,7 +10171,9 @@
               path: "${APP.homepage}/_dev_only_/template-preview/:templateId",
               bricks: [{
                 brick: "span"
-              }]
+              }],
+              menu: false,
+              exact: true
             }), undefined, mountRoutesResult);
           } catch (error) {
             // eslint-disable-next-line no-console