@next-core/brick-kit 2.117.1 → 2.117.4

package/dist/index.esm.js

@@ -5642,6 +5642,7 @@ function getApiArgsFromApiProfile(_ref, originalArgs) {
     ext_fields,
     name,
     namespace,
+    serviceName,
     responseWrapper,
     version,
     isFileType
@@ -5655,7 +5656,7 @@ function getApiArgsFromApiProfile(_ref, originalArgs) {
   var {
     url,
     args
-  } = getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, version);
+  } = getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, serviceName, version);
   return isFileType ? [fileName, {
     url,
     method,
@@ -5671,8 +5672,8 @@ function getApiArgsFromApiProfile(_ref, originalArgs) {
   }, ...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 {
@@ -5705,6 +5706,7 @@ function getApiProfileFromApiDefinition(provider, api) {
     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
@@ -5738,7 +5740,7 @@ function _fetchFlowApiDefinition2() {
       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
@@ -5750,11 +5752,12 @@ function _fetchFlowApiDefinition2() {
       });
 
       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,
@@ -5769,6 +5772,7 @@ function _fetchFlowApiDefinition2() {
         return {
           name: contract.name,
           namespace: contract.namespaceId,
+          serviceName: contract.serviceName,
           version: contract.version,
           contract: {
             endpoint: contract.endpoint,
@@ -5789,6 +5793,7 @@ function _fetchFlowApiDefinition2() {
           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,
@@ -6675,7 +6680,6 @@ function processBootstrapResponse(bootstrapResponse) {
 
 var CUSTOM_API_PROVIDER = "brick-kit.provider-custom-api";
 function processExtFields(ext_fields) {
-
   var hasFields = type => {
     return ext_fields.some(item => item.source === type);
   };
@@ -8003,7 +8007,9 @@ class Kernel {
       path: previewPath,
       bricks: [_objectSpread({
         brick: templateId
-      }, pick(settings, "properties"))]
+      }, pick(settings, "properties"))],
+      menu: false,
+      exact: true
     };
 
     if (previewRouteIndex === -1) {
@@ -8945,8 +8951,8 @@ class LocationContext {
             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);
@@ -9227,6 +9233,8 @@ class LocationContext {
       }
 
       if (expandedBrickConf.bg) {
+        // A bg brick has no slotId.
+        brick.slotId = undefined;
         appendBrick(brick, _this6.kernel.mountPoints.bg);
       } else {
         if (expandedBrickConf.portal) {
@@ -10164,7 +10172,9 @@ class Router {
             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