@next-core/brick-kit 2.128.0 → 2.129.1

package/dist/index.esm.js

@@ -5,7 +5,7 @@ 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, 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 _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, isEmpty, sortBy, merge, 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';
 import { pipes } from '@next-core/pipes';
@@ -1415,7 +1415,8 @@ function authenticate(newAuth) {
     userInstanceId: newAuth.userInstanceId,
     loginFrom: newAuth.loginFrom,
     accessRule: newAuth.accessRule,
-    isAdmin: newAuth.isAdmin
+    isAdmin: newAuth.isAdmin,
+    csrfToken: newAuth.csrfToken
   }); // re-init analytics to set user_id
 
   if (userAnalytics.initialized) {
@@ -1439,6 +1440,7 @@ function logout() {
   auth.userInstanceId = undefined;
   auth.accessRule = undefined;
   auth.isAdmin = undefined;
+  auth.csrfToken = undefined;
   resetPermissionPreChecks(); // re-init analytics to clear user_id
 
   userAnalytics.setUserId();
@@ -3012,30 +3014,30 @@ function _constructMenu() {
   return _constructMenu.apply(this, arguments);
 }
 
-function constructMenuByMenusList(_x4, _x5, _x6) {
-  return _constructMenuByMenusList.apply(this, arguments);
+function preConstructMenus(_x4, _x5, _x6) {
+  return _preConstructMenus.apply(this, arguments);
 }
 
-function _constructMenuByMenusList() {
-  _constructMenuByMenusList = _asyncToGenerator$4(function* (menus, context, kernel) {
-    var data = yield Promise.all(menus.map(menuId => processMenu(menuId, context, kernel)));
+function _preConstructMenus() {
+  _preConstructMenus = _asyncToGenerator$4(function* (menus, context, kernel) {
+    var data = yield Promise.all(menus.map(menuId => processMenu(menuId, context, kernel, undefined, true)));
     data.forEach((item, index) => processMenuCache.set(menus[index], item));
   });
-  return _constructMenuByMenusList.apply(this, arguments);
+  return _preConstructMenus.apply(this, arguments);
 }
 
 var getMenu = menuId => processMenuCache.get(menuId);
-function fetchMenuById(_x7, _x8) {
+function fetchMenuById(_x7, _x8, _x9) {
   return _fetchMenuById.apply(this, arguments);
 }
 
 function _fetchMenuById() {
-  _fetchMenuById = _asyncToGenerator$4(function* (menuId, kernel) {
+  _fetchMenuById = _asyncToGenerator$4(function* (menuId, kernel, isPreFetch) {
     if (menuCache.has(menuId)) {
       return menuCache.get(menuId);
     }
 
-    var menuList = window.STANDALONE_MICRO_APPS ? kernel.getStandaloneMenus(menuId) : (yield InstanceApi_postSearch("EASYOPS_STORYBOARD_MENU", {
+    var menuList = window.STANDALONE_MICRO_APPS ? kernel.getStandaloneMenus(menuId, isPreFetch) : (yield InstanceApi_postSearch("EASYOPS_STORYBOARD_MENU", {
       page: 1,
       page_size: 200,
       fields: {
@@ -3131,7 +3133,7 @@ function processGroupInject(items, menu, injectWithMenus) {
   });
 }
 
-function loadDynamicMenuItems(_x9) {
+function loadDynamicMenuItems(_x10) {
   return _loadDynamicMenuItems.apply(this, arguments);
 }
 
@@ -3149,13 +3151,13 @@ function _loadDynamicMenuItems() {
   return _loadDynamicMenuItems.apply(this, arguments);
 }
 
-function processMenu(_x10, _x11, _x12, _x13) {
+function processMenu(_x11, _x12, _x13, _x14, _x15) {
   return _processMenu.apply(this, arguments);
 }
 
 function _processMenu() {
-  _processMenu = _asyncToGenerator$4(function* (menuId, context, kernel, hasSubMenu) {
-    var _yield$fetchMenuById = yield fetchMenuById(menuId, kernel),
+  _processMenu = _asyncToGenerator$4(function* (menuId, context, kernel, hasSubMenu, isPreFetch) {
+    var _yield$fetchMenuById = yield fetchMenuById(menuId, kernel, isPreFetch),
         {
       items,
       app
@@ -3208,19 +3210,19 @@ function computeMenuItemsWithOverrideApp(items, context, kernel) {
       });
     });
 
-    return function (_x14) {
+    return function (_x16) {
       return _ref2.apply(this, arguments);
     };
   }()));
 }
 
-function processMenuTitle(_x15) {
+function processMenuTitle(_x17) {
   return _processMenuTitle.apply(this, arguments);
 }
 
 function _processMenuTitle() {
   _processMenuTitle = _asyncToGenerator$4(function* (menuData) {
-    if (menuData.title || !menuData.titleDataSource) {
+    if (menuData.title || isEmpty(menuData.titleDataSource)) {
       return menuData.title;
     }
 
@@ -3309,7 +3311,7 @@ function requireOverrideApp(data) {
   return false;
 }
 
-function computeRealValueWithOverrideApp(_x16, _x17, _x18, _x19) {
+function computeRealValueWithOverrideApp(_x18, _x19, _x20, _x21) {
   return _computeRealValueWithOverrideApp.apply(this, arguments);
 }
 
@@ -4015,8 +4017,11 @@ function handleHttpError(error) {
     content: /*#__PURE__*/React.createElement("div", {
       style: {
         whiteSpace: "pre-wrap"
+      },
+      dangerouslySetInnerHTML: {
+        __html: httpErrorToString(error)
       }
-    }, httpErrorToString(error)),
+    }),
     okText: i18next.t("".concat(NS_BRICK_KIT, ":").concat(K.MODAL_OK))
   });
 }
@@ -9522,10 +9527,11 @@ class Kernel {
     return Object.assign({}, (_this$bootstrapData = this.bootstrapData) === null || _this$bootstrapData === void 0 ? void 0 : (_this$bootstrapData$s = _this$bootstrapData.settings) === null || _this$bootstrapData$s === void 0 ? void 0 : _this$bootstrapData$s.featureFlags);
   }
 
-  getStandaloneMenus(menuId) {
+  getStandaloneMenus(menuId, isPreFetch) {
     var _currentStoryboard$me, _currentStoryboard$me2;
 
-    var currentAppId = this.currentApp.id;
+    var app = isPreFetch ? this.nextApp : this.currentApp;
+    var currentAppId = app.id;
     var currentStoryboard = this.bootstrapData.storyboards.find(storyboard => storyboard.app.id === 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 => {
@@ -10956,7 +10962,7 @@ class LocationContext {
       var useMenus = scanAppGetMenuInAny(data);
 
       if (useMenus.length) {
-        yield constructMenuByMenusList(useMenus, _this7.getCurrentContext(), _this7.kernel);
+        yield preConstructMenus(useMenus, _this7.getCurrentContext(), _this7.kernel);
       }
     })();
   }