@abtnode/ux 1.16.6-beta-4562aa60 → 1.16.6-beta-eaa4d39d

package/lib/blocklet/component/environment.js

@@ -30,6 +30,20 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+const getDescription = (data, t) => {
+  let {
+    description
+  } = data;
+  if (Object.values(_constant.CHAIN_PROP_MAP).includes(data.key)) {
+    description = "".concat(data.description, " (").concat(t('blocklet.config.sharedToAllComponents'), ")");
+  }
+  return description && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    style: {
+      marginLeft: 12
+    },
+    children: description
+  });
+};
 function ComponentEnvironment(_ref) {
   let {
     blocklet,
@@ -141,7 +155,7 @@ function ComponentEnvironment(_ref) {
   const sharedConfigObj = (0, _util.getSharedConfigObj)(blocklet, ancestors);
   const missingRequiredConfigs = (0, _util.getComponentMissingConfigs)(blocklet, ancestors);
   const configs = componentConfigs.map(x => _objectSpread(_objectSpread({}, x), {}, {
-    value: sharedConfigObj[x.key] || x.value
+    value: Object.values(_constant.CHAIN_PROP_MAP).includes(x.key) && Object.keys(sharedConfigObj).includes(x.key) ? sharedConfigObj[x.key] : sharedConfigObj[x.key] || x.value
   }));
   const hasBWAConfig = configs.some(x => x.key && x.key.startsWith('BWA_'));
   const action = {
@@ -224,12 +238,7 @@ function ComponentEnvironment(_ref) {
           placeholder: t('blocklet.config.environment.value'),
           margin: "dense",
           autoFocus: true
-        }), rowData.description && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          style: {
-            marginLeft: 12
-          },
-          children: rowData.description
-        })]
+        }), getDescription(rowData, t)]
       });
     }
   }];

package/lib/blocklet/component/space-connector.js

@@ -74,7 +74,10 @@ const SpaceConnector = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
   } = (0, _react.useContext)(_context.LocaleContext);
   /** @type {{ blocklet: import('@abtnode/client').BlockletState }} */
   const {
-    blocklet
+    blocklet,
+    actions: {
+      refreshBlocklet
+    }
   } = (0, _blocklet.useBlockletContext)();
   const [gatewayUrl, setGatewayUrl] = (0, _react.useState)('');
   const spaceProps = (0, _react.useMemo)(() => {
@@ -116,6 +119,7 @@ const SpaceConnector = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
         open: false
       }));
       onConnect === null || onConnect === void 0 ? void 0 : onConnect();
+      refreshBlocklet();
     }, 3000);
   };
   const [authorizeConnect, setAuthorizeConnect] = (0, _react.useState)({

package/lib/blocklet/overview.js

@@ -4,29 +4,35 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = BlockletOverview;
-var _react = _interopRequireDefault(require("react"));
+var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _react = _interopRequireWildcard(require("react"));
 var _Alert = _interopRequireDefault(require("@mui/material/Alert"));
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
-var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
-var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
-var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
+var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore"));
+var _ExpandLess = _interopRequireDefault(require("@mui/icons-material/ExpandLess"));
+var _base = require("@abtnode/util/lib/base32");
+var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
 var _InfoRow = _interopRequireDefault(require("@arcblock/ux/lib/InfoRow"));
-var _util = require("@blocklet/meta/lib/util");
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
+var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
+var _util = require("@blocklet/meta/lib/util");
+var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _blocklet = require("../contexts/blocklet");
 var _node = require("../contexts/node");
-var _util2 = require("../util");
 var _didAddress = _interopRequireDefault(require("../did-address"));
-var _status = _interopRequireDefault(require("./status"));
+var _util2 = require("../util");
+var _expiration = _interopRequireDefault(require("./component/expiration"));
 var _domainStatus = _interopRequireDefault(require("./router/domain-status"));
+var _status = _interopRequireDefault(require("./status"));
 var _types = require("./types");
-var _expiration = _interopRequireDefault(require("./component/expiration"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject, _templateObject2;
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function DomainLink(_ref) {
@@ -90,6 +96,8 @@ function BlockletOverview() {
     info: nodeInfo,
     inService
   } = (0, _node.useNodeContext)();
+  const [showAllDomains, setShowAllDomains] = (0, _react.useState)(false);
+  const [showAllDIDs, setShowAllDIDs] = (0, _react.useState)(false);
   const {
     blocklet,
     loadingRuntimeInfo
@@ -111,9 +119,18 @@ function BlockletOverview() {
     })
   } : null, (migratedFrom === null || migratedFrom === void 0 ? void 0 : migratedFrom.length) > 1 ? {
     name: t('blocklet.alsoKnownAs'),
-    value: migratedFrom.slice(1).map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
-      did: x.appDid
-    }))
+    value: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      children: [(showAllDIDs ? migratedFrom.slice(1) : migratedFrom.slice(1, 2)).map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
+        did: x.appDid
+      })), migratedFrom.length > 2 && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+        style: {
+          marginLeft: '18px'
+        },
+        endIcon: showAllDIDs ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandLess.default, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {}),
+        onClick: () => setShowAllDIDs(!showAllDIDs),
+        children: showAllDIDs ? t('common.collapseAll') : t('blocklet.router.showAllDIDs')
+      })]
+    })
   } : null, {
     name: t('common.name'),
     value: (0, _util.getDisplayName)(blocklet, true)
@@ -165,6 +182,10 @@ function BlockletOverview() {
   }
   const renderRows = rows => rows.map(row => {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InfoRow.default, {
+      style: {
+        display: 'flex',
+        alignItems: 'flex-start'
+      },
       valueComponent: "div",
       nameWidth: 120,
       name: row.name,
@@ -173,6 +194,17 @@ function BlockletOverview() {
     }, row.name);
   });
   const domains = (0, _util2.sortDomains)((_blocklet$site = blocklet.site) === null || _blocklet$site === void 0 ? void 0 : _blocklet$site.domainAliases);
+  const displayDomains = [];
+  const hiddenDomains = [];
+  const pidBase32 = (0, _base.encode)(blocklet.appPid);
+  domains.forEach(domain => {
+    const value = domain.value || '';
+    if (value.endsWith(nodeInfo.didDomain || 'did.abtnet.io') && !value.startsWith(pidBase32)) {
+      hiddenDomains.push(domain);
+    } else {
+      displayDomains.push(domain);
+    }
+  });
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {
     component: "div",
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
@@ -191,7 +223,7 @@ function BlockletOverview() {
         severity: "warning",
         children: t('blocklet.router.noRunning')
       })
-    }), domains.map((domain, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+    }), (showAllDomains ? domains : displayDomains).map((domain, index) => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       display: "flex",
       alignItems: "center",
       justifyContent: "space-between",
@@ -220,7 +252,17 @@ function BlockletOverview() {
           }
         })]
       })
-    }, domain.value)), !domains.length && (loadingRuntimeInfo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
+    }, domain.value)), hiddenDomains.length > 0 && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      style: {
+        marginLeft: '20px',
+        marginTop: '12px'
+      },
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+        endIcon: showAllDomains ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandLess.default, {}) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExpandMore.default, {}),
+        onClick: () => setShowAllDomains(!showAllDomains),
+        children: showAllDomains ? t('common.collapseAll') : t('blocklet.router.showAllDomains')
+      })
+    }), !domains.length && (loadingRuntimeInfo ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
       size: 16
     }) : /*#__PURE__*/(0, _jsxRuntime.jsx)(_Empty.default, {
       children: t('common.empty')

package/lib/blocklet/storage.js

@@ -44,17 +44,14 @@ function useBackupProgress(_ref) {
     completed: false
   });
   const node = (0, _node.useNodeContext)();
-  const webSocketClient = node.ws.getWsClient();
-  (0, _react.useEffect)(() => {
-    webSocketClient.on(_constant.BlockletEvents.backupProgress, data => {
-      if (appDid === (data === null || data === void 0 ? void 0 : data.appDid)) {
-        setProgress(preValue => _objectSpread(_objectSpread({}, preValue), data));
-      }
-    });
-    return () => {
-      webSocketClient.off(_constant.BlockletEvents.backupProgress);
-    };
-  }, [appDid, webSocketClient]);
+  const {
+    ws: {
+      useSubscription
+    }
+  } = node;
+  useSubscription(_constant.BlockletEvents.backupProgress, data => {
+    setProgress(preValue => _objectSpread(_objectSpread({}, preValue), data));
+  }, [appDid]);
   return progress;
 }
 function Storage() {
@@ -162,7 +159,7 @@ function Storage() {
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.LinearProgress, {
             color: "primary",
-            variant: "indeterminate",
+            variant: "determinate",
             value: progress === null || progress === void 0 ? void 0 : progress.progress
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {

package/lib/locales/en.js

@@ -424,7 +424,8 @@ module.exports = {
       appDidChangeTipL2: 'The DID domain name of the application will change, and the original domain name will become invalid',
       appSkChangeTip: 'You are changing application secret key',
       walletTypeTitle: 'Update Wallet Type',
-      appSkTitle: 'Update Application Secret Key'
+      appSkTitle: 'Update Application Secret Key',
+      sharedToAllComponents: 'Will be shared to all components'
     },
     overview: {
       source: 'Source',
@@ -528,7 +529,9 @@ module.exports = {
       urlInaccessible: 'It may be due to network reasons, the address is temporarily inaccessible',
       noAccessibleUrl: 'No accessible URL',
       domainLockTooltip: 'The system generated Domain cannot be edited.',
-      urlLockTooltip: 'The system generated URL Path cannot be edited.'
+      urlLockTooltip: 'The system generated URL Path cannot be edited.',
+      showAllDomains: 'Show all domains',
+      showAllDIDs: 'Show all DIDs'
     },
     export: {
       title: 'Export Blocklet',
@@ -661,6 +664,7 @@ module.exports = {
         dialog: 'Click on "confirm" to install the update. Blocklet Server will enter maintenance mode until the update is completed and return to production mode automatically.',
         confirm: 'Upgrade',
         switchLabel: 'Auto Update Check',
+        enableBetaRelease: 'Enable Beta Release',
         setup: 'Preparing the upgrade',
         installing: 'Installing Blocklet Server v{version}',
         restarting: 'Restarting Blocklet Server',

package/lib/locales/zh.js

@@ -429,7 +429,8 @@ module.exports = {
       appDidChangeTipL2: '应用的 DID 域名会发生变化，原域名将会失效',
       appSkChangeTip: '你正在修改应用私钥',
       walletTypeTitle: '修改钱包类型',
-      appSkTitle: '修改应用私钥'
+      appSkTitle: '修改应用私钥',
+      sharedToAllComponents: '将共享给所有组件'
     },
     overview: {
       source: '来源',
@@ -535,7 +536,9 @@ module.exports = {
       urlInaccessible: '可能因为网络的原因，该地址暂时无法访问',
       noAccessibleUrl: '没有可访问的地址',
       domainLockTooltip: '无法编辑由系统生成的 域名',
-      urlLockTooltip: '无法编辑由系统生成的 URL 路径'
+      urlLockTooltip: '无法编辑由系统生成的 URL 路径',
+      showAllDomains: '显示所有域名',
+      showAllDIDs: '显示所有 DID'
     },
     export: {
       title: '导出 Blocklet',
@@ -661,6 +664,7 @@ module.exports = {
         dialog: '点击 “确认” 安装更新。节点将进入维护模式，直到更新完成并自动返回生产模式。',
         confirm: '升级',
         switchLabel: '自动更新检查',
+        enableBetaRelease: '允许安装测试版',
         setup: '准备升级中',
         installing: '安装节点新版本（v{version}）',
         restarting: '重新启动节点',

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-4562aa60",
+  "version": "1.16.6-beta-eaa4d39d",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -22,20 +22,20 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.6-beta-4562aa60",
-    "@abtnode/constant": "1.16.6-beta-4562aa60",
-    "@abtnode/util": "1.16.6-beta-4562aa60",
-    "@arcblock/did-connect": "^2.5.27",
+    "@abtnode/auth": "1.16.6-beta-eaa4d39d",
+    "@abtnode/constant": "1.16.6-beta-eaa4d39d",
+    "@abtnode/util": "1.16.6-beta-eaa4d39d",
+    "@arcblock/did-connect": "^2.5.30",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.27",
-    "@arcblock/react-hooks": "^2.5.27",
-    "@arcblock/terminal": "^2.5.27",
-    "@arcblock/ux": "^2.5.27",
-    "@blocklet/constant": "1.16.6-beta-4562aa60",
-    "@blocklet/launcher-layout": "2.0.30",
+    "@arcblock/icons": "^2.5.30",
+    "@arcblock/react-hooks": "^2.5.30",
+    "@arcblock/terminal": "^2.5.30",
+    "@arcblock/ux": "^2.5.30",
+    "@blocklet/constant": "1.16.6-beta-eaa4d39d",
+    "@blocklet/launcher-layout": "2.0.32",
     "@blocklet/list": "^0.11.18",
-    "@blocklet/meta": "1.16.6-beta-4562aa60",
-    "@blocklet/ui-react": "^2.5.27",
+    "@blocklet/meta": "1.16.6-beta-eaa4d39d",
+    "@blocklet/ui-react": "^2.5.30",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -90,5 +90,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "e49856099ffc3c16eda77480a7ad93b2e9760764"
+  "gitHead": "0d2ab99f67109e989f8182fc70bc3ee9fa430585"
 }