@alicloud/alfa-react 1.3.4 → 1.4.0-alpha.2

package/lib/utils/getConsoleConfig.js

@@ -13,8 +13,6 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-var _alfaCore = require("@alicloud/alfa-core");
-
 var _md = _interopRequireDefault(require("crypto-js/md5"));
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
@@ -26,12 +24,13 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  * @param features
  */
 var processFeatures = function processFeatures(features) {
+  if (!features) return {};
   return Object.keys(features).reduce(function (newFeatures, key) {
     var _ALIYUN_CONSOLE_CONFI;
 
-    var feature = features[key];
+    var feature = features === null || features === void 0 ? void 0 : features[key];
     if (!feature) return newFeatures;
-    var uid = ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.CURRENT_PK) || '';
+    var uid = ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.MAIN_ACCOUNT_PK) || '';
     var md5Uid = (0, _md.default)(uid).toString();
     var enableBlockList = feature.enableBlockList,
         enableSampling = feature.enableSampling,
@@ -56,35 +55,59 @@ var processFeatures = function processFeatures(features) {
   }, {});
 };
 
+var getRegions = function getRegions(regions) {
+  if (!Array.isArray(regions) && regions.region) {
+    return regions.region || [];
+  }
+
+  return [];
+};
+
+var processChannelFeatures = function processChannelFeatures(allChannelFeatures, channel) {
+  var channelFeatures = allChannelFeatures === null || allChannelFeatures === void 0 ? void 0 : allChannelFeatures[channel];
+  if (!channelFeatures) return {};
+  return Object.keys(channelFeatures).reduce(function (newChannelFeatures, key) {
+    var channelFeature = channelFeatures[key];
+    if (!channelFeature) return newChannelFeatures;
+
+    if (newChannelFeatures) {
+      var status = channelFeature.status,
+          attribute = channelFeature.attribute;
+      newChannelFeatures[key] = {
+        status: status,
+        attribute: _objectSpread(_objectSpread({}, attribute), {}, {
+          regions: getRegions(channelFeature.attribute.regions)
+        })
+      };
+    }
+
+    return newChannelFeatures;
+  }, {});
+};
+
 var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig(configData, consoleConfig) {
-  var _window, _window$ALIYUN_CONSOL, _configData$ALL_CHANN, _configData$ALL_CHANN2;
+  var _window, _window$ALIYUN_CONSOL, _configData$ALL_CHANN;
 
   var channel = ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.CHANNEL) || 'OFFICIAL';
   var channelLinks = ((_configData$ALL_CHANN = configData.ALL_CHANNEL_LINKS) === null || _configData$ALL_CHANN === void 0 ? void 0 : _configData$ALL_CHANN[channel]) || {};
-  var channelFeatures = ((_configData$ALL_CHANN2 = configData.ALL_CHANNEL_FEATURE_STATUS) === null || _configData$ALL_CHANN2 === void 0 ? void 0 : _configData$ALL_CHANN2[channel]) || {};
+  var channelFeatures = configData.ALL_CHANNEL_FEATURE_STATUS || {};
   var features = configData.ALL_FEATURE_STATUS || {};
   return _objectSpread(_objectSpread({}, consoleConfig), {}, {
     CHANNEL_LINKS: channelLinks,
-    CHANNEL_FEATURE_STATUS: channelFeatures,
+    CHANNEL_FEATURE_STATUS: processChannelFeatures(channelFeatures, channel),
     FEATURE_STATUS: processFeatures(features)
   });
 };
 
 var getConsoleConfig = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(config, consoleConfig) {
-    var configData;
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(configData, consoleConfig) {
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            _context.next = 2;
-            return (0, _alfaCore.getConfig)(config);
-
-          case 2:
-            configData = _context.sent;
             return _context.abrupt("return", mergeConfigDataWithConsoleConfig(configData, consoleConfig));
 
-          case 4:
+          case 1:
           case "end":
             return _context.stop();
         }

package/lib/utils/getConsoleGlobal.d.ts

@@ -0,0 +1,2 @@
+import { AlfaConfig, IWin } from '@alicloud/alfa-core';
+export declare const getConsoleGlobal: (configData: AlfaConfig, global: IWin['ALIYUN_CONSOLE_GLOBAL']) => Promise<{}>;

package/lib/utils/getConsoleGlobal.js

@@ -0,0 +1,41 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getConsoleGlobal = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2.default)(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+var getConsoleGlobal = /*#__PURE__*/function () {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(configData, global) {
+    return _regenerator.default.wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            return _context.abrupt("return", _objectSpread(_objectSpread({}, global), configData === null || configData === void 0 ? void 0 : configData.GLOBAL_DATA));
+
+          case 1:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  }));
+
+  return function getConsoleGlobal(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
+exports.getConsoleGlobal = getConsoleGlobal;

package/lib/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.3.4";
+export declare const version = "1.4.0-alpha.2";

package/lib/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-var version = '1.3.4';
+var version = '1.4.0-alpha.2';
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.3.4",
+  "version": "1.4.0-alpha.2",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -39,7 +39,7 @@
     "typescript": "^3.0.3"
   },
   "dependencies": {
-    "@alicloud/alfa-core": "^1.3.3",
+    "@alicloud/alfa-core": "^1.4.0-alpha.2",
     "@alicloud/console-os-loader": "^1.2.3",
     "@alicloud/widget-utils-console": "^0.1.6",
     "classnames": "^2.2.6",
@@ -48,5 +48,5 @@
   "peerDependencies": {
     "react": "^16 | ^17"
   },
-  "gitHead": "226b5899f3fc8b7929a7606f4ac6e7c7ec7cfdb7"
+  "gitHead": "5c0d708d90ac6720e85148496c2eca87fb5c6078"
 }