@next-core/brick-kit 2.124.0 → 2.126.0

package/dist/index.esm.js

@@ -4,7 +4,7 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _asyncToGenerator$4 from '@babel/runtime/helpers/asyncToGenerator';
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
 import React, { useState, useEffect, useRef, forwardRef, useImperativeHandle, useMemo, useContext, createContext, useReducer, useCallback } from 'react';
-import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, shouldAllowRecursiveEvaluations, preevaluate, inject, deepFreeze, createProviderClass, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, matchPath, scanAppGetMenuInAny, asyncProcessBrick, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
+import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, shouldAllowRecursiveEvaluations, preevaluate, inject, deepFreeze, createProviderClass, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, matchPath, scanAppGetMenuInAny, asyncProcessBrick, scanInstalledAppsInStoryboard, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
 import _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, sortBy, merge, isEmpty, isObject as isObject$1, pick, orderBy, omit, findLastIndex, noop, isString } from 'lodash';
 import { http, HttpResponseError, HttpFetchError } from '@next-core/brick-http';
 import moment from 'moment';
@@ -2924,7 +2924,7 @@ function getNextInternalOptions(internalOptions, isArray, key) {
 }
 
 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();
@@ -3108,7 +3108,7 @@ function _processMenu() {
       items,
       app
     } = _yield$fetchMenuById,
-        restMenuData = _objectWithoutProperties(_yield$fetchMenuById, _excluded2$1);
+        restMenuData = _objectWithoutProperties(_yield$fetchMenuById, _excluded2$2);
 
     var menuData = _objectSpread(_objectSpread({}, yield computeRealValueWithOverrideApp(restMenuData, app[0].appId, context, kernel)), {}, {
       items: yield computeMenuItemsWithOverrideApp(items, context, kernel)
@@ -3496,7 +3496,8 @@ class Runtime {
   }
 
   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) {
@@ -5794,6 +5795,24 @@ function clearPollTimeout() {
   timeoutIdList.clear();
 }
 
+/**
+ * @description 独立小产品Runtime接口
+ * @endpoint GET /api/v1/runtime_standalone
+ */
+
+
+var BootstrapStandaloneApi_runtimeStandalone = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator$4(function* (options) {
+    return (
+      /**! @contract easyops.api.api_gateway.bootstrap_standalone.RuntimeStandalone@1.0.1 */
+      (yield 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
@@ -6886,6 +6905,43 @@ var UserAdminApi_searchAllUsersInfo = /*#__PURE__*/function () {
   };
 }();
 
+/**
+ * @description 独立小产品Runtime接口
+ * @endpoint GET /api/v1/micro_app_standalone/runtime/:appId
+ */
+
+
+var RuntimeApi_runtimeMicroAppStandalone = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator$4(function* (appId, options) {
+    return (
+      /**! @contract easyops.api.micro_app_standalone.runtime.RuntimeMicroAppStandalone@1.0.1 */
+      (yield 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$4(function* (data, options) {
+    return (
+      /**! @contract easyops.api.micro_app_standalone.runtime.SearchMicroAppStandalone@1.0.1 */
+      (yield 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`.
  *
@@ -7078,15 +7134,21 @@ function initAnalytics() {
   }
 }
 
-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$4(function* () {
-    var [bootstrapResult, confString] = yield Promise.all([http.get(window.BOOTSTRAP_FILE), http.get("".concat(window.APP_ROOT, "conf.yaml"), {
+    var [bootstrapResult, confString, runtimeData] = yield Promise.all([http.get(window.BOOTSTRAP_FILE), 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;
 
@@ -7134,6 +7196,24 @@ function _standaloneBootstrap() {
       }
     }
 
+    if (runtimeData) {
+      var runtimeSetings = runtimeData.settings;
+
+      if (!isEmpty(runtimeSetings)) {
+        // Merge Feature Flags
+        if (!settings) {
+          settings = runtimeSetings;
+        } else {
+          // Merge Feature Flags & Misc
+          var rest = _objectWithoutProperties(runtimeSetings, _excluded2$1);
+
+          settings.featureFlags = _objectSpread(_objectSpread({}, settings.featureFlags), runtimeSetings.featureFlags);
+          settings.misc = _objectSpread(_objectSpread({}, settings.misc), runtimeSetings.misc);
+          settings = Object.assign(settings, rest);
+        }
+      }
+    }
+
     return _objectSpread(_objectSpread({}, bootstrapResult), {}, {
       settings
     });
@@ -8855,6 +8935,27 @@ class Kernel {
         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(_objectSpread({}, storyboard.app.userConfig), appRuntimeData.userConfig); // get inject menus (Actually, appRuntimeData contains both main and inject menus)
+
+            storyboard.meta = _objectSpread(_objectSpread({}, storyboard.meta), {}, {
+              injectMenus: appRuntimeData.injectMenus
+            });
+          }
+        }
       } else {
         var {
           routes,
@@ -9369,15 +9470,20 @@ class Kernel {
   }
 
   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(_objectSpread({}, 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(_objectSpread({}, menu), (_menu$app = menu.app) !== null && _menu$app !== void 0 && _menu$app.length && menu.app[0].appId ? {} : {
+        app: [{
+          appId: currentAppId
+        }]
+      });
+    });
   }
 
   getProviderBrick(provider) {
@@ -9918,6 +10024,7 @@ function getDefaultProperties(_name, fields) {
         break;
 
       case "IP":
+        /* eslint-disable */
         defaultValue = {
           brick: "forms.general-input",
           properties: {
@@ -9927,9 +10034,14 @@ function getDefaultProperties(_name, fields) {
             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":
@@ -11329,6 +11441,69 @@ function registerFormRenderer() {
   });
 }
 
+var standaloneApps = [];
+var appIdSet = new Set();
+function preFetchStandaloneInstalledApps(_x) {
+  return _preFetchStandaloneInstalledApps.apply(this, arguments);
+}
+
+function _preFetchStandaloneInstalledApps() {
+  _preFetchStandaloneInstalledApps = _asyncToGenerator$4(function* (storyboard) {
+    var saIds = scanInstalledAppsInStoryboard(storyboard);
+    yield fetchStandaloneApps(saIds);
+  });
+  return _preFetchStandaloneInstalledApps.apply(this, arguments);
+}
+
+function fetchStandaloneApps(_x2) {
+  return _fetchStandaloneApps.apply(this, arguments);
+}
+
+function _fetchStandaloneApps() {
+  _fetchStandaloneApps = _asyncToGenerator$4(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$1(this, "defaultCollapsed", false);
@@ -11526,6 +11701,13 @@ class Router {
 
         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 加载它的依赖库。