@next-core/brick-kit 2.124.0 → 2.126.0

package/CHANGELOG.md

@@ -3,6 +3,42 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.126.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.125.0...@next-core/brick-kit@2.126.0) (2022-08-08)
+
+
+### Bug Fixes
+
+* make loose dependency on backend runtime api ([6474f53](https://github.com/easyops-cn/next-core/commit/6474f53687ae514e79c88780810d98e887045c32))
+
+
+### Features
+
+* **runtime:** support runtime FLAGS and MISC on standalone mode ([131cdbc](https://github.com/easyops-cn/next-core/commit/131cdbc46eb609722719091a202c3364053bfc84))
+* support userConfig & injectMenus in standalone mode ([cd890ed](https://github.com/easyops-cn/next-core/commit/cd890edf01b12c18a771d677106de74ca4e837be))
+
+
+
+
+
+# [2.125.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.124.1...@next-core/brick-kit@2.125.0) (2022-08-08)
+
+
+### Features
+
+* support INSTALLED_APPS in standalone mode ([c152053](https://github.com/easyops-cn/next-core/commit/c1520532597c88d1def251aafd44831c7a7fad56))
+
+
+
+
+
+## [2.124.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.124.0...@next-core/brick-kit@2.124.1) (2022-08-03)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
 # [2.124.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.123.8...@next-core/brick-kit@2.124.0) (2022-08-01)
 
 

package/dist/index.bundle.js

@@ -2923,7 +2923,7 @@
   }
 
   var _excluded$6 = ["children"],
-      _excluded2$1 = ["items", "app"];
+      _excluded2$2 = ["items", "app"];
   var symbolAppId = Symbol("appId");
   // Caching menu requests to avoid flicker.
   var menuCache = new Map();
@@ -3107,7 +3107,7 @@
         items,
         app
       } = _yield$fetchMenuById,
-          restMenuData = _objectWithoutProperties__default["default"](_yield$fetchMenuById, _excluded2$1);
+          restMenuData = _objectWithoutProperties__default["default"](_yield$fetchMenuById, _excluded2$2);
 
       var menuData = _objectSpread__default["default"](_objectSpread__default["default"]({}, yield computeRealValueWithOverrideApp(restMenuData, app[0].appId, context, kernel)), {}, {
         items: yield computeMenuItemsWithOverrideApp(items, context, kernel)
@@ -3495,7 +3495,8 @@
     }
 
     hasInstalledApp(appId, matchVersion) {
-      return kernel.bootstrapData.microApps.some(app => {
+      var allMicroApps = window.STANDALONE_MICRO_APPS ? kernel.bootstrapData.offSiteStandaloneApps : kernel.bootstrapData.microApps;
+      return allMicroApps.some(app => {
         var foundApp = app.id === appId && app.installStatus !== "running";
 
         if (!matchVersion || !foundApp) {
@@ -5793,6 +5794,24 @@
     timeoutIdList.clear();
   }
 
+  /**
+   * @description 独立小产品Runtime接口
+   * @endpoint GET /api/v1/runtime_standalone
+   */
+
+
+  var BootstrapStandaloneApi_runtimeStandalone = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator__default["default"](function* (options) {
+      return (
+        /**! @contract easyops.api.api_gateway.bootstrap_standalone.RuntimeStandalone@1.0.1 */
+        (yield brickHttp.http.get("api/v1/runtime_standalone", options)).data
+      );
+    });
+
+    return function BootstrapStandaloneApi_runtimeStandalone(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
   /**
    * @description 获取系统初始化信息
    * @endpoint GET /api/auth/v2/bootstrap
@@ -6885,6 +6904,43 @@
     };
   }();
 
+  /**
+   * @description 独立小产品Runtime接口
+   * @endpoint GET /api/v1/micro_app_standalone/runtime/:appId
+   */
+
+
+  var RuntimeApi_runtimeMicroAppStandalone = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator__default["default"](function* (appId, options) {
+      return (
+        /**! @contract easyops.api.micro_app_standalone.runtime.RuntimeMicroAppStandalone@1.0.1 */
+        (yield brickHttp.http.get("api/gateway/micro_app_standalone.runtime.RuntimeMicroAppStandalone/api/v1/micro_app_standalone/runtime/".concat(appId), options)).data
+      );
+    });
+
+    return function RuntimeApi_runtimeMicroAppStandalone(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  /**
+   * @description 查询独立部署小产品
+   * @endpoint POST /api/v1/micro_app_standalone/search
+   */
+
+
+  var RuntimeApi_searchMicroAppStandalone = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator__default["default"](function* (data, options) {
+      return (
+        /**! @contract easyops.api.micro_app_standalone.runtime.SearchMicroAppStandalone@1.0.1 */
+        (yield brickHttp.http.post("api/gateway/micro_app_standalone.runtime.SearchMicroAppStandalone/api/v1/micro_app_standalone/search", data, options)).data
+      );
+    });
+
+    return function RuntimeApi_searchMicroAppStandalone(_x, _x2) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+
   /**
    * Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
    *
@@ -7077,15 +7133,21 @@
     }
   }
 
-  var _excluded$4 = ["feature_flags"];
+  var _excluded$4 = ["feature_flags"],
+      _excluded2$1 = ["featureFlags", "misc"];
   function standaloneBootstrap() {
     return _standaloneBootstrap.apply(this, arguments);
   }
 
   function _standaloneBootstrap() {
     _standaloneBootstrap = _asyncToGenerator__default["default"](function* () {
-      var [bootstrapResult, confString] = yield Promise.all([brickHttp.http.get(window.BOOTSTRAP_FILE), brickHttp.http.get("".concat(window.APP_ROOT, "conf.yaml"), {
+      var [bootstrapResult, confString, runtimeData] = yield Promise.all([brickHttp.http.get(window.BOOTSTRAP_FILE), brickHttp.http.get("".concat(window.APP_ROOT, "conf.yaml"), {
         responseType: "text"
+      }), yield BootstrapStandaloneApi_runtimeStandalone().catch(function (error) {
+        // make it not crash when the backend service is not updated.
+        // eslint-disable-next-line no-console
+        console.warn("request runtime api from api-gateway failed: ", error, ", something might went wrong running standalone micro app");
+        return undefined;
       })]);
       var conf;
 
@@ -7133,6 +7195,24 @@
         }
       }
 
+      if (runtimeData) {
+        var runtimeSetings = runtimeData.settings;
+
+        if (!_.isEmpty(runtimeSetings)) {
+          // Merge Feature Flags
+          if (!settings) {
+            settings = runtimeSetings;
+          } else {
+            // Merge Feature Flags & Misc
+            var rest = _objectWithoutProperties__default["default"](runtimeSetings, _excluded2$1);
+
+            settings.featureFlags = _objectSpread__default["default"](_objectSpread__default["default"]({}, settings.featureFlags), runtimeSetings.featureFlags);
+            settings.misc = _objectSpread__default["default"](_objectSpread__default["default"]({}, settings.misc), runtimeSetings.misc);
+            settings = Object.assign(settings, rest);
+          }
+        }
+      }
+
       return _objectSpread__default["default"](_objectSpread__default["default"]({}, bootstrapResult), {}, {
         settings
       });
@@ -8854,6 +8934,27 @@
           Object.assign(storyboard, {
             $$fulfilled: true
           });
+
+          if (!window.NO_AUTH_GUARD) {
+            var appRuntimeData;
+
+            try {
+              appRuntimeData = yield RuntimeApi_runtimeMicroAppStandalone(storyboard.app.id);
+            } catch (error) {
+              // make it not crash when the backend service is not updated.
+              // eslint-disable-next-line no-console
+              console.warn("request standalone runtime api from micro-app-standalone failed: ", error, ", something might went wrong running standalone micro app");
+            }
+
+            if (appRuntimeData) {
+              // merge user config
+              storyboard.app.userConfig = _objectSpread__default["default"](_objectSpread__default["default"]({}, storyboard.app.userConfig), appRuntimeData.userConfig); // get inject menus (Actually, appRuntimeData contains both main and inject menus)
+
+              storyboard.meta = _objectSpread__default["default"](_objectSpread__default["default"]({}, storyboard.meta), {}, {
+                injectMenus: appRuntimeData.injectMenus
+              });
+            }
+          }
         } else {
           var {
             routes,
@@ -9368,15 +9469,20 @@
     }
 
     getStandaloneMenus(menuId) {
-      var _cloneDeep, _currentStoryboard$me;
+      var _currentStoryboard$me, _currentStoryboard$me2;
 
       var currentAppId = this.currentApp.id;
       var currentStoryboard = this.bootstrapData.storyboards.find(storyboard => storyboard.app.id === currentAppId);
-      return ((_cloneDeep = _.cloneDeep((_currentStoryboard$me = currentStoryboard.meta) === null || _currentStoryboard$me === void 0 ? void 0 : _currentStoryboard$me.menus)) !== null && _cloneDeep !== void 0 ? _cloneDeep : []).filter(menu => menu.menuId === menuId).map(menu => _objectSpread__default["default"](_objectSpread__default["default"]({}, menu), {}, {
-        app: [{
-          appId: currentAppId
-        }]
-      }));
+      var menus = (_currentStoryboard$me = currentStoryboard.meta) !== null && _currentStoryboard$me !== void 0 && _currentStoryboard$me.injectMenus ? _.cloneDeep(currentStoryboard.meta.injectMenus) : (_currentStoryboard$me2 = currentStoryboard.meta) !== null && _currentStoryboard$me2 !== void 0 && _currentStoryboard$me2.menus ? _.cloneDeep(currentStoryboard.meta.menus) : [];
+      return menus.filter(menu => menu.menuId === menuId).map(menu => {
+        var _menu$app;
+
+        return _objectSpread__default["default"](_objectSpread__default["default"]({}, menu), (_menu$app = menu.app) !== null && _menu$app !== void 0 && _menu$app.length && menu.app[0].appId ? {} : {
+          app: [{
+            appId: currentAppId
+          }]
+        });
+      });
     }
 
     getProviderBrick(provider) {
@@ -9917,6 +10023,7 @@
           break;
 
         case "IP":
+          /* eslint-disable */
           defaultValue = {
             brick: "forms.general-input",
             properties: {
@@ -9926,9 +10033,14 @@
               readOnly: field.limit.includes("READONLY"),
               required: field.limit.includes("REQUIRED"),
               placeholder: field.description,
-              pattern: /((^\s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))\s*$)|(^\s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(\.(25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(%.+)?\s*$))/
+              pattern: "((^s*((([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]).){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5]))s*$)|(^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*$))",
+              message: {
+                pattern: "输入字符不匹配IP格式"
+              }
             }
           };
+          /* eslint-disable */
+
           break;
 
         case "JSON":
@@ -11328,6 +11440,69 @@
     });
   }
 
+  var standaloneApps = [];
+  var appIdSet = new Set();
+  function preFetchStandaloneInstalledApps(_x) {
+    return _preFetchStandaloneInstalledApps.apply(this, arguments);
+  }
+
+  function _preFetchStandaloneInstalledApps() {
+    _preFetchStandaloneInstalledApps = _asyncToGenerator__default["default"](function* (storyboard) {
+      var saIds = brickUtils.scanInstalledAppsInStoryboard(storyboard);
+      yield fetchStandaloneApps(saIds);
+    });
+    return _preFetchStandaloneInstalledApps.apply(this, arguments);
+  }
+
+  function fetchStandaloneApps(_x2) {
+    return _fetchStandaloneApps.apply(this, arguments);
+  }
+
+  function _fetchStandaloneApps() {
+    _fetchStandaloneApps = _asyncToGenerator__default["default"](function* (saIds) {
+      // ignore apps which are already searched
+      var searchIds = _.difference(saIds, Array.from(appIdSet));
+
+      if (searchIds.length === 0) {
+        return;
+      }
+
+      try {
+        var result = yield RuntimeApi_searchMicroAppStandalone({
+          query: {
+            isActiveVersion: true,
+            appId: {
+              $in: searchIds
+            }
+          },
+          fields: ["appId", "version"]
+        });
+
+        for (var item of result.list) {
+          standaloneApps.push({
+            id: item.appId,
+            currentVersion: item.version,
+            installStatus: "ok"
+          });
+        }
+
+        for (var id of searchIds) {
+          appIdSet.add(id);
+        }
+      } catch (error) {
+        // Allow search micro app to fail, and
+        // make it not crash when the backend service is not updated.
+        // eslint-disable-next-line no-console
+        console.error("get off site standalone micro app failed", error);
+      }
+    });
+    return _fetchStandaloneApps.apply(this, arguments);
+  }
+
+  function getStandaloneInstalledApps() {
+    return standaloneApps;
+  }
+
   class Router {
     constructor(kernel) {
       _defineProperty__default["default"](this, "defaultCollapsed", false);
@@ -11525,6 +11700,13 @@
 
           if (isLoggedIn() && !getAuth().isAdmin) {
             yield preCheckPermissions(storyboard);
+          } // Standalone App 需要额外读取 Installed App 信息
+
+
+          if (window.STANDALONE_MICRO_APPS && !window.NO_AUTH_GUARD) {
+            // TODO: get standalone apps when NO_AUTH_GUARD, maybe from conf.yaml
+            yield preFetchStandaloneInstalledApps(storyboard);
+            _this3.kernel.bootstrapData.offSiteStandaloneApps = getStandaloneInstalledApps();
           } // 如果找到匹配的 storyboard，那么根据路由匹配得到的 sub-storyboard 加载它的依赖库。