@abtnode/ux 1.16.6-beta-08670107 → 1.16.6-beta-593a7a98

package/lib/blocklet/audit-logs.js

@@ -11,6 +11,7 @@ var _Avatar = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar")
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Empty = _interopRequireDefault(require("@arcblock/ux/lib/Empty"));
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _constant = require("@abtnode/constant");
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _Pagination = _interopRequireDefault(require("@mui/lab/Pagination"));
@@ -34,7 +35,7 @@ const getUserLink = _ref => {
   } = _ref;
   if (inService) {
     // TODO
-    return "/members?did=".concat(log.actor.did);
+    return "".concat(_constant.WELLKNOWN_BLOCKLET_ADMIN_PATH, "/members?did=").concat(log.actor.did);
   }
   if (log.scope === info.did) {
     return "/team/members?did=".concat(log.actor.did);
@@ -183,10 +184,12 @@ function AuditLogs() {
 }
 function WrappedAuditLogs(_ref3) {
   let {
-    scope
+    scope,
+    categories
   } = _ref3;
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_auditLog.AuditLogProvider, {
     scope: scope,
+    categories: categories,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)(AuditLogs, {})
   });
 }

package/lib/blocklet/component/expiration.js

@@ -30,6 +30,10 @@ function Expiration(_ref) {
   if (state.loading) {
     return '';
   }
+  if (state.error) {
+    console.error('load nft expiration failed, nfId:', controller === null || controller === void 0 ? void 0 : controller.nftId, 'chainHost:', controller === null || controller === void 0 ? void 0 : controller.chainHost, state.error);
+    return '-';
+  }
   const expirationDate = (0, _last.default)((0, _get.default)(state.value, 'data.value.expirationDate', []));
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_RelativeTime.default, {

package/lib/blocklet/configuration.js

@@ -32,7 +32,6 @@ var _permission = require("../permission");
 var _addDomainAlias = _interopRequireDefault(require("./router/action/add-domain-alias"));
 var _domainStatus = _interopRequireDefault(require("./router/domain-status"));
 var _domainActions = _interopRequireDefault(require("./router/domain-actions"));
-var _walletType = _interopRequireDefault(require("./preferences/wallet-type"));
 var _appSk = _interopRequireDefault(require("./preferences/app-sk"));
 var _addCert = _interopRequireDefault(require("./add-cert"));
 var _transferOwner = _interopRequireDefault(require("./transfer-owner"));
@@ -93,7 +92,6 @@ function BlockletEnvironment(_ref) {
   }
 
   // configurable blocklet environment
-  const customType = blocklet.environments.find(x => x.key === 'BLOCKLET_WALLET_TYPE');
   const customDelete = blocklet.environments.find(x => x.key === 'BLOCKLET_DELETABLE');
   const deletable = !customDelete || customDelete.value === 'yes';
   const customUrl = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_URL');
@@ -223,30 +221,6 @@ function BlockletEnvironment(_ref) {
       setLoading(false);
     }
   };
-  const onWalletTypeChange = async value => {
-    if (loading) {
-      return;
-    }
-    setLoading(true);
-    try {
-      const {
-        blocklet: data
-      } = await node.api.configBlocklet({
-        input: {
-          did: blocklet.meta.did,
-          configs: [{
-            key: _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_WALLET_TYPE,
-            value
-          }]
-        }
-      });
-      onUpdate(data);
-    } catch (err) {
-      _toast.default.error(err.message);
-    } finally {
-      setLoading(false);
-    }
-  };
   const onUpdateCors = async value => {
     const oldValue = site.corsAllowedOrigins || [];
     const newValue = value.split(',').map(x => x.trim()).filter(Boolean);
@@ -506,23 +480,7 @@ function BlockletEnvironment(_ref) {
         border: '1px solid red',
         borderRadius: 2
       },
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-        className: "config-form",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-          className: "config-item",
-          children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-            className: "config-label",
-            children: [t('blocklet.config.walletType.name'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-              className: "config-desc",
-              children: t('blocklet.config.walletType.description')
-            })]
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_walletType.default, {
-            value: (customType === null || customType === void 0 ? void 0 : customType.value) || 'default',
-            disabled: disabled,
-            onChange: onWalletTypeChange
-          })]
-        })
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         className: "config-form",
         mt: 2,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {

package/lib/blocklet/overview.js

@@ -36,6 +36,10 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 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) } })); }
+const WalletType = {
+  arcblock: 'ArcBlock',
+  ethereum: 'Ethereum'
+};
 function DomainLink(_ref) {
   let {
     domain,
@@ -88,7 +92,7 @@ DomainLink.propTypes = {
 };
 const LinkDiv = _styled.default.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &,\n  & > * {\n    color: #222;\n    font-size: 18px;\n  }\n\n  .status {\n    margin-left: 8px;\n  }\n"])));
 function BlockletOverview() {
-  var _blocklet$settings, _blocklet$site;
+  var _blocklet$environment, _blocklet$settings, _blocklet$site;
   const {
     t,
     locale
@@ -108,6 +112,7 @@ function BlockletOverview() {
     appPid,
     migratedFrom = []
   } = blocklet;
+  const chainType = (_blocklet$environment = blocklet.environments.find(x => x.key === 'BLOCKLET_APP_CHAIN_TYPE')) === null || _blocklet$environment === void 0 ? void 0 : _blocklet$environment.value;
   const infoRows = [appDid ? {
     name: t('blocklet.appId'),
     value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
@@ -164,6 +169,9 @@ function BlockletOverview() {
     value: (_blocklet$settings = blocklet.settings) !== null && _blocklet$settings !== void 0 && _blocklet$settings.owner ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
       did: blocklet.settings.owner.did
     }) : '--'
+  }, {
+    name: t('blocklet.config.walletType.name'),
+    value: WalletType[chainType || 'arcblock'] || chainType
   }, blocklet.externalSkSource ? {
     name: t('blocklet.skSource'),
     value: blocklet.externalSkSource

package/lib/blocklet/router/action/add-domain-alias.js

@@ -44,6 +44,9 @@ function AddDomainAlias(_ref) {
     setConfirmSetting(null);
   };
   const onConfirm = async params => {
+    if (loading) {
+      return;
+    }
     setLoading(true);
     try {
       await api.addDomainAlias({

package/lib/blocklet/util.js

@@ -231,18 +231,18 @@ const fixBlocklet = async function fixBlocklet(blocklet) {
   blocklet.capabilities = getAppCapabilities(blocklet);
 };
 exports.fixBlocklet = fixBlocklet;
-const DEFAULT_WALLET_TYPE = 'default';
+const DEFAULT_WALLET_TYPE = 'arcblock';
 const getWalletType = function getWalletType(raw) {
   let fromState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
   let item;
 
   // from state: migrating
   if (fromState) {
-    item = (raw.configs || []).find(x => x.key === 'BLOCKLET_WALLET_TYPE');
+    item = (raw.configs || []).find(x => x.key === 'BLOCKLET_APP_CHAIN_TYPE');
     if (item && item.value) {
       return item.value;
     }
-    item = (raw.environments || []).find(x => x.key === 'BLOCKLET_WALLET_TYPE');
+    item = (raw.environments || []).find(x => x.key === 'BLOCKLET_APP_CHAIN_TYPE');
     if (item && item.value) {
       return item.value;
     }
@@ -250,7 +250,7 @@ const getWalletType = function getWalletType(raw) {
   }
 
   // from meta: installing
-  item = (raw.environments || []).find(x => x.name === 'BLOCKLET_WALLET_TYPE');
+  item = (raw.environments || []).find(x => x.name === 'BLOCKLET_APP_CHAIN_TYPE');
   if (item && item.default) {
     return item.default;
   }

package/lib/contexts/audit-log.js

@@ -24,7 +24,8 @@ exports.AuditLogConsumer = Consumer;
 function AuditLogProvider(_ref) {
   let {
     children,
-    scope = ''
+    scope = '',
+    categories = []
   } = _ref;
   const {
     api: client
@@ -38,6 +39,45 @@ function AuditLogProvider(_ref) {
   });
   const [loading, setLoading] = (0, _react.useState)(false);
   const [category, setCategory] = (0, _useLocalStorage.default)("audit-log-category-".concat(scope), 'all');
+  const categoryList = [{
+    value: 'all',
+    label: 'All',
+    description: ''
+  }, {
+    value: 'blocklet',
+    label: 'Blocklet Management',
+    description: ''
+  }, {
+    value: 'server',
+    label: 'Server Management',
+    description: ''
+  }, {
+    value: 'team',
+    label: 'Team Management',
+    description: ''
+  }, {
+    value: 'security',
+    label: 'Security',
+    description: ''
+  }, {
+    value: 'certificates',
+    label: 'Certificate Management',
+    description: ''
+  }, {
+    value: 'integrations',
+    label: 'Integration Management',
+    description: ''
+  }, {
+    value: 'gateway',
+    label: 'Gateway',
+    description: ''
+  }];
+  const filterCategories = categoryList.filter(item => {
+    if (categories.length) {
+      return item.value === 'all' || categories.includes(item.value);
+    }
+    return true;
+  });
   const fetchLogs = async function fetchLogs() {
     let {
       page = 1,
@@ -52,6 +92,7 @@ function AuditLogProvider(_ref) {
     try {
       // eslint-disable-next-line no-shadow
       const res = await client.getAuditLogs({
+        // 由于 blocklet 中的 audit-log 本身就不包含 server 类型的，所以这里的 category 查询不需要对 server 类型的做额外的处理
         input: {
           paging: {
             page
@@ -89,39 +130,7 @@ function AuditLogProvider(_ref) {
       category,
       scope
     },
-    categories: [{
-      value: 'all',
-      label: 'All',
-      description: ''
-    }, {
-      value: 'blocklet',
-      label: 'Blocklet Management',
-      description: ''
-    }, {
-      value: 'server',
-      label: 'Server Management',
-      description: ''
-    }, {
-      value: 'team',
-      label: 'Team Management',
-      description: ''
-    }, {
-      value: 'security',
-      label: 'Security',
-      description: ''
-    }, {
-      value: 'certificates',
-      label: 'Certificate Management',
-      description: ''
-    }, {
-      value: 'integrations',
-      label: 'Integration Management',
-      description: ''
-    }, {
-      value: 'gateway',
-      label: 'Gateway',
-      description: ''
-    }],
+    categories: filterCategories,
     setCategory,
     data: auditLogs,
     paging

package/lib/locales/en.js

@@ -313,8 +313,8 @@ module.exports = {
     services: 'Exposed Services',
     upstreamPort: 'Upstream Port',
     noService: 'No Services',
-    appId: 'App ID',
-    appPid: 'Permanent ID',
+    appId: 'App DID',
+    appPid: 'Permanent DID',
     alsoKnownAs: 'Also Known As',
     skSource: 'Owner Wallet',
     reloadSuccess: 'Blocklet was reloaded successfully',

package/lib/locales/zh.js

@@ -318,9 +318,9 @@ module.exports = {
     services: '暴露的服务',
     upstreamPort: '上游端口',
     noService: '暂无服务',
-    appId: '应用 ID',
-    appPid: '永久性 ID',
-    alsoKnownAs: '曾用 ID',
+    appId: '应用 DID',
+    appPid: '永久性 DID',
+    alsoKnownAs: '曾用 DID',
     skSource: '安装钱包',
     reloadSuccess: 'Blocklet 重启成功',
     statusTip: 'Blocklet {status}',

package/lib/team/members/index.js

@@ -25,6 +25,8 @@ var _ExternalIssuerIcon = _interopRequireDefault(require("@arcblock/icons/lib/Ex
 var _Datatable = _interopRequireWildcard(require("@arcblock/ux/lib/Datatable"));
 var _RelativeTime = _interopRequireDefault(require("@arcblock/ux/lib/RelativeTime"));
 var _constant = require("@abtnode/constant");
+var _useUrlState = _interopRequireDefault(require("@ahooksjs/use-url-state"));
+var _ahooks = require("ahooks");
 var _toast = _interopRequireDefault(require("../../toast"));
 var _node = require("../../contexts/node");
 var _team = require("../../contexts/team");
@@ -146,6 +148,9 @@ function MemberList(_ref2) {
   const [users, setUsers] = (0, _react.useState)([]);
   const [rowCount, setRowCount] = (0, _react.useState)();
   const [userCounts, setUserCounts] = (0, _react.useState)([]);
+  const [urlState] = (0, _useUrlState.default)({
+    did: undefined
+  });
   const durableKey = "members-".concat(teamDid);
   const tableDurableData = (0, _Datatable.getDurableData)(durableKey);
   const [search, setSearch] = (0, _react.useState)({
@@ -155,6 +160,18 @@ function MemberList(_ref2) {
     pageSize: tableDurableData.rowsPerPage || 10,
     page: tableDurableData.page ? tableDurableData.page + 1 : 1
   });
+  (0, _ahooks.useMount)(async () => {
+    if (urlState.did) {
+      const {
+        user
+      } = await api.getUser({
+        did: urlState.did
+      });
+      if (user) {
+        setMemberDialog(user);
+      }
+    }
+  });
   const sideList = (roles || []).map(x => ({
     name: x.name,
     title: x.title,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.6-beta-08670107",
+  "version": "1.16.6-beta-593a7a98",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -22,21 +22,22 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.6-beta-08670107",
-    "@abtnode/constant": "1.16.6-beta-08670107",
-    "@abtnode/util": "1.16.6-beta-08670107",
-    "@arcblock/did": "^1.18.76",
-    "@arcblock/did-connect": "^2.5.34",
+    "@abtnode/auth": "1.16.6-beta-593a7a98",
+    "@abtnode/constant": "1.16.6-beta-593a7a98",
+    "@abtnode/util": "1.16.6-beta-593a7a98",
+    "@ahooksjs/use-url-state": "^3.5.1",
+    "@arcblock/did": "^1.18.77",
+    "@arcblock/did-connect": "^2.5.36",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.34",
-    "@arcblock/react-hooks": "^2.5.34",
-    "@arcblock/terminal": "^2.5.34",
-    "@arcblock/ux": "^2.5.34",
-    "@blocklet/constant": "1.16.6-beta-08670107",
-    "@blocklet/launcher-layout": "2.0.34",
+    "@arcblock/icons": "^2.5.36",
+    "@arcblock/react-hooks": "^2.5.36",
+    "@arcblock/terminal": "^2.5.36",
+    "@arcblock/ux": "^2.5.36",
+    "@blocklet/constant": "1.16.6-beta-593a7a98",
+    "@blocklet/launcher-layout": "2.0.36",
     "@blocklet/list": "^0.11.22",
-    "@blocklet/meta": "1.16.6-beta-08670107",
-    "@blocklet/ui-react": "^2.5.34",
+    "@blocklet/meta": "1.16.6-beta-593a7a98",
+    "@blocklet/ui-react": "^2.5.36",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -45,7 +46,7 @@
     "@mui/lab": "^5.0.0-alpha.102",
     "@mui/material": "^5.10.8",
     "@mui/styles": "^5.10.8",
-    "@ocap/client": "1.18.76",
+    "@ocap/client": "1.18.77",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.1",
     "axios": "^0.27.2",
@@ -91,5 +92,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "11bbd8ea245fdb5920338f104cbe059e90a0e1b5"
+  "gitHead": "5ea65d1ddc91e997f029741f01ce453464d86666"
 }

package/lib/blocklet/preferences/wallet-type.js

@@ -1,107 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = WalletType;
-var _react = require("react");
-var _styled = _interopRequireDefault(require("@emotion/styled"));
-var _propTypes = _interopRequireDefault(require("prop-types"));
-var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
-var _Box = _interopRequireDefault(require("@mui/material/Box"));
-var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
-var _context = require("@arcblock/ux/lib/Locale/context");
-var _confirm = _interopRequireDefault(require("../../confirm"));
-var _jsxRuntime = require("react/jsx-runtime");
-var _templateObject, _templateObject2;
-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 WalletType(_ref) {
-  let {
-    value,
-    onChange,
-    disabled
-  } = _ref;
-  const {
-    t
-  } = (0, _context.useLocaleContext)();
-  const [confirmCustomType, setConfirmCustomType] = (0, _react.useState)(null);
-  const WalletTypes = [{
-    label: 'DID',
-    value: 'default'
-  }, {
-    label: 'ETH',
-    value: 'eth'
-  }];
-  const onWalletTypeChange = async e => {
-    setConfirmCustomType({
-      value: e.target.value
-    });
-  };
-  const _onConfirm = async v => {
-    try {
-      await onChange(v);
-    } finally {
-      setConfirmCustomType(null);
-    }
-  };
-  return [/*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
-    disabled: disabled,
-    select: true,
-    size: "small",
-    value: value || 'default',
-    onChange: onWalletTypeChange,
-    children: WalletTypes.map(type => {
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledMenuItem, {
-        value: type.value,
-        sx: {
-          display: 'block'
-        },
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-          display: "flex",
-          alignItems: "center",
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-            children: type.label
-          })
-        })
-      });
-    })
-  }), confirmCustomType && /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
-    title: t('blocklet.config.walletTypeTitle'),
-    description: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-        dangerouslySetInnerHTML: {
-          __html: t('blocklet.config.blockletTypeChangeTip', {
-            value: WalletTypes.find(x => x.value === confirmCustomType.value).label
-          })
-        }
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-        fontWeight: "bold",
-        mt: 2,
-        children: t('blocklet.config.appDidChangeTip')
-      }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(UL, {
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
-          children: t('blocklet.config.appDidChangeTipL1')
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("li", {
-          children: t('blocklet.config.appDidChangeTipL2')
-        })]
-      })]
-    }),
-    confirm: t('confirm'),
-    cancel: t('cancel'),
-    onConfirm: () => _onConfirm(confirmCustomType.value),
-    onCancel: () => setConfirmCustomType(null)
-  })];
-}
-WalletType.propTypes = {
-  value: _propTypes.default.string,
-  onChange: _propTypes.default.func,
-  disabled: _propTypes.default.bool
-};
-WalletType.defaultProps = {
-  value: 'default',
-  onChange: () => {},
-  disabled: false
-};
-const StyledMenuItem = (0, _styled.default)(_MenuItem.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .tip {\n    font-size: 12px;\n    color: ", ";\n  }\n"])), props => props.theme.palette.text.secondary);
-const UL = (0, _styled.default)('ul')(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  padding-left: 16px;\n  li {\n    margin-top: 8px;\n    list-style: disk;\n    font-weight: bold;\n  }\n"])));