@abtnode/ux 1.16.3 → 1.16.4-beta-8682e092

package/lib/blocklet/actions.js

@@ -70,7 +70,7 @@ function BlockletActions(_ref) {
     loading: recommendedUrlLoading,
     recommendedUrl
   } = useBlockletUrlEvaluation(blocklet);
-  const inProgress = (0, _util2.isInProgress)(blocklet.status);
+  const inProgress = (0, _util.isInProgress)(blocklet.status);
   const {
     inService
   } = node;

package/lib/blocklet/component/add.js

@@ -32,7 +32,7 @@ var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
 var _AnimationWaiter = _interopRequireDefault(require("@arcblock/ux/lib/AnimationWaiter"));
 var _launchResultMessage = _interopRequireDefault(require("@blocklet/launcher-layout/lib/launch-result-message"));
 var _util = require("@blocklet/meta/lib/util");
-var _urlFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-friendly"));
+var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
 var _node = require("../../contexts/node");
 var _util2 = require("../../util");
 var _toast = _interopRequireDefault(require("../../toast"));
@@ -293,7 +293,7 @@ function AddComponent(_ref2) {
     const installInput = _objectSpread(_objectSpread(_objectSpread({
       rootDid: blocklet.meta.did,
       url,
-      mountPoint: (0, _urlFriendly.default)(mountPoint),
+      mountPoint: (0, _urlPathFriendly.default)(mountPoint),
       title,
       name: componentName,
       did: componentDid
@@ -558,7 +558,7 @@ function AddComponent(_ref2) {
     } else {
       var _component$current$me, _component$current$me2;
       doc = _objectSpread(_objectSpread({}, doc), {}, {
-        pathPrefix: hasRootPath ? "/".concat((0, _urlFriendly.default)(name)) : '/',
+        pathPrefix: hasRootPath ? "/".concat((0, _urlPathFriendly.default)(name)) : '/',
         title: title || '',
         componentName: '',
         hasEnvironmentsStep: ((_component$current$me = component.current.meta) === null || _component$current$me === void 0 ? void 0 : (_component$current$me2 = _component$current$me.environments) === null || _component$current$me2 === void 0 ? void 0 : _component$current$me2.length) > 0

package/lib/blocklet/component/index.js

@@ -256,7 +256,7 @@ function ComponentItem(_ref) {
   let deleteDisabledTip = '';
   if (depth !== 1) {
     deleteDisabledTip = t('blocklet.component.tip.notDynamic');
-  } else if ((0, _util2.isInProgress)(root.status) || depth === 1 && deletingComponents.includes(blocklet.meta.did)) {
+  } else if ((0, _util.isInProgress)(root.status) || depth === 1 && deletingComponents.includes(blocklet.meta.did)) {
     deleteDisabledTip = t('blocklet.component.tip.stopBlocklet');
   } else if ((_blocklet$dependents2 = blocklet.dependents) !== null && _blocklet$dependents2 !== void 0 && _blocklet$dependents2.length) {
     const requires = blocklet.dependents.filter(x => x.required);
@@ -618,7 +618,7 @@ function BlockletComponent(_ref4) {
             variant: "dot",
             invisible: !showUpdateDot,
             children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
-              disabled: loading || (0, _util2.isInProgress)(blocklet.status),
+              disabled: loading || (0, _util.isInProgress)(blocklet.status),
               color: "secondary",
               onClick: () => {
                 checkForUpdates();
@@ -650,7 +650,7 @@ function BlockletComponent(_ref4) {
                 open
               } = _ref7;
               return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
-                disabled: loading || (0, _util2.isInProgress)(blocklet.status),
+                disabled: loading || (0, _util.isInProgress)(blocklet.status),
                 variant: "text",
                 color: "primary",
                 "data-cy": "add-rule",
@@ -671,7 +671,7 @@ function BlockletComponent(_ref4) {
                 open
               } = _ref8;
               return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
-                disabled: loading || (0, _util2.isInProgress)(blocklet.status),
+                disabled: loading || (0, _util.isInProgress)(blocklet.status),
                 variant: "text",
                 color: "primary",
                 "data-cy": "add-component",

package/lib/blocklet/component/setting.js

@@ -9,7 +9,7 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _urlFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-friendly"));
+var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
 var _toast = _interopRequireDefault(require("../../toast"));
 var _formTextInput = _interopRequireDefault(require("../../form/form-text-input"));
 var _node = require("../../contexts/node");
@@ -74,7 +74,7 @@ function ComponentSetting(_ref) {
     try {
       const input = {
         rootDid,
-        mountPoint: (0, _urlFriendly.default)(value)
+        mountPoint: (0, _urlPathFriendly.default)(value)
       };
       if (!isRoot) {
         input.did = blocklet.meta.did;
@@ -123,7 +123,7 @@ function ComponentSetting(_ref) {
         onSubmit: onSubmitMountPoint,
         onChange: handleMountPointChange,
         helperText: mountPointHelperText,
-        formatterBeforeSubmit: value => (0, _urlFriendly.default)(value)
+        formatterBeforeSubmit: value => (0, _urlPathFriendly.default)(value)
       })]
     })
   }));

package/lib/blocklet/configuration.js

@@ -8,7 +8,6 @@ var _react = _interopRequireWildcard(require("react"));
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _get = _interopRequireDefault(require("lodash/get"));
-var _omit = _interopRequireDefault(require("lodash/omit"));
 var _isEqual = _interopRequireDefault(require("lodash/isEqual"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _useTheme = _interopRequireDefault(require("@mui/material/styles/useTheme"));
@@ -25,7 +24,6 @@ var _constant = require("@abtnode/constant");
 var _constant2 = require("@blocklet/constant");
 var _util = require("@blocklet/meta/lib/util");
 var _toast = _interopRequireDefault(require("../toast"));
-var _schemaForm = _interopRequireDefault(require("../schema-form"));
 var _formTextInput = _interopRequireDefault(require("../form/form-text-input"));
 var _node = require("../contexts/node");
 var _util2 = require("../util");
@@ -38,8 +36,7 @@ var _appSk = _interopRequireDefault(require("./preferences/app-sk"));
 var _addCert = _interopRequireDefault(require("./add-cert"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
-const _excluded = ["blocklet", "onUpdate", "hasPermission"],
-  _excluded2 = ["value"];
+const _excluded = ["blocklet", "onUpdate", "hasPermission"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 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; }
@@ -68,7 +65,6 @@ function BlockletEnvironment(_ref) {
   const whoCanAccess = (0, _util.getWhoCanAccess)(blocklet);
   const publicToStore = blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.publicToStore;
   const theme = (0, _useTheme.default)();
-  const [editingItem, setEditingItem] = (0, _react.useState)(null);
   const disabled = loading || !hasPermission;
   const {
     inService,
@@ -141,15 +137,6 @@ function BlockletEnvironment(_ref) {
       cpuCores
     });
   }
-  const defaultValue = {};
-  const schemaList = configurableEnvs.map(item => {
-    const {
-        value
-      } = item,
-      props = _objectWithoutProperties(item, _excluded2);
-    defaultValue[item.key] = value;
-    return _objectSpread({}, props);
-  });
   const onPublicToStoreChange = async e => {
     if (loading) {
       return;
@@ -174,17 +161,21 @@ function BlockletEnvironment(_ref) {
       setLoading(false);
     }
   };
-  const onSubmitConfig = async value => {
-    if (value.key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_CLUSTER_SIZE) {
-      const errMessage = (0, _util2.isValidClusterSize)(value);
+  const onSubmitConfig = async (key, value) => {
+    if (key === _constant2.BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_CLUSTER_SIZE) {
+      const errMessage = (0, _util2.isValidClusterSize)({
+        value,
+        cpuCores
+      });
       if (errMessage) {
         _toast.default.error(errMessage);
         return;
       }
     }
-    const params = [_objectSpread(_objectSpread({}, (0, _omit.default)(editingItem, ['childDid', 'componentType', 'componentProps'])), {}, {
+    const params = [{
+      key,
       value
-    })];
+    }];
     try {
       setLoading(true);
       const {
@@ -302,29 +293,24 @@ function BlockletEnvironment(_ref) {
     }
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, _objectSpread(_objectSpread({}, rest), {}, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_schemaForm.default, {
-      disabled: disabled,
-      style: {
-        marginTop: -24
-      },
-      loading: loading,
-      schema: schemaList,
-      defaultValue: defaultValue,
-      onChange: (changeValue, _ref2) => {
-        let {
-          action,
-          currentItem
-        } = _ref2;
-        if (action === 'edit') {
-          setEditingItem(currentItem);
-        } else if (['cancel', 'confirm'].includes(action)) {
-          setEditingItem(null);
-        }
-        if (action === 'confirm') {
-          onSubmitConfig(changeValue[currentItem.key]);
-        }
-      }
-    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+    children: [configurableEnvs.map(item => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      className: "config-form",
+      mt: 2,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+        className: "config-label",
+        fontSize: 14,
+        mb: 0,
+        children: item.description
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_formTextInput.default, {
+        style: {
+          marginTop: 0
+        },
+        disabled: loading || disabled,
+        loading: loading,
+        initialValue: item.value,
+        onSubmit: value => onSubmitConfig(item.key, value)
+      })]
+    })), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
       className: "config-form",
       children: [whoCanAccess === 'all' && blocklet.source === 'registry' && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         className: "config-item",
@@ -375,10 +361,10 @@ function BlockletEnvironment(_ref) {
             id: site.id,
             title: t('router.domain.add.title'),
             teamDid: did,
-            children: _ref3 => {
+            children: _ref2 => {
               let {
                 open
-              } = _ref3;
+              } = _ref2;
               return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Button.default, {
                 style: {
                   marginLeft: 16
@@ -387,7 +373,7 @@ function BlockletEnvironment(_ref) {
                 color: "primary",
                 "data-cy": "add-domain-alias",
                 onClick: open,
-                disabled: (0, _util2.isInProgress)(blocklet.status),
+                disabled: (0, _util.isInProgress)(blocklet.status),
                 children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Add.default, {
                   style: {
                     fontSize: '1.3em',
@@ -425,10 +411,10 @@ function BlockletEnvironment(_ref) {
             domain: domain.value,
             domainStatus: domain.domainStatus,
             did: blocklet.meta.did,
-            children: _ref4 => {
+            children: _ref3 => {
               let {
                 open
-              } = _ref4;
+              } = _ref3;
               return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
                 size: "small",
                 onClick: e => open(e),

package/lib/blocklet/oauth/auth0.js

@@ -69,7 +69,7 @@ function OAuthAuth0() {
       reset(defaultValues);
       _toast.default.success(t('oauth.saveSuccess'));
     } catch (err) {
-      _toast.default.success(err.message || t('oauth.saveFailed'));
+      _toast.default.error(err.message || t('oauth.saveFailed'));
     }
   });
   const validateDomain = (0, _ahooks.useMemoizedFn)(val => {

package/lib/blocklet/overview.js

@@ -146,7 +146,10 @@ 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
     }) : '--'
-  }].filter(Boolean);
+  }, blocklet.externalSkSource ? {
+    name: t('blocklet.skSource'),
+    value: blocklet.externalSkSource
+  } : null].filter(Boolean);
   if (inService) {
     infoRows.push({
       name: t('common.serverDid'),

package/lib/blocklet/preferences/app-sk.js

@@ -12,10 +12,13 @@ var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _constant = require("@abtnode/constant");
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _util = require("@blocklet/meta/lib/util");
 var _formTextInput = _interopRequireDefault(require("../../form/form-text-input"));
 var _confirm = _interopRequireDefault(require("../../confirm"));
 var _session = require("../../contexts/session");
 var _blocklet = require("../../contexts/blocklet");
+var _util2 = require("../../util");
+var _toast = _interopRequireDefault(require("../../toast"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -61,9 +64,19 @@ function AppSk(_ref) {
   const triggers = blocklet.structVersion === _constant.APP_STRUCT_VERSION ? [{
     key: 'rotate-with-did-wallet',
     title: 'Migrate with DID Wallet',
-    handler: () => setState({
-      isConnectOpen: true
-    })
+    handler: () => {
+      if ((0, _util2.isRunning)(blocklet.status)) {
+        _toast.default.error(t('blocklet.error.isRunning'));
+        return;
+      }
+      if ((0, _util.isInProgress)(blocklet.status)) {
+        _toast.default.error(t('blocklet.error.isInProgress'));
+        return;
+      }
+      setState({
+        isConnectOpen: true
+      });
+    }
   }] : [];
   return [/*#__PURE__*/(0, _jsxRuntime.jsx)(_formTextInput.default, {
     disabled: disabled,

package/lib/blocklet/router/action/add-rule.js

@@ -13,7 +13,7 @@ var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@abtnode/constant");
-var _urlFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-friendly"));
+var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
 var _node = require("../../../contexts/node");
 var _blocklet = require("../../../contexts/blocklet");
 var _confirm = _interopRequireDefault(require("../../../confirm"));
@@ -58,7 +58,7 @@ function AddRule(_ref) {
       setLoading(true);
       const rule = {
         from: {
-          pathPrefix: (0, _urlFriendly.default)(params.pathPrefix)
+          pathPrefix: (0, _urlPathFriendly.default)(params.pathPrefix)
         },
         to: {
           type: params.type

package/lib/blocklet/router/action/update-rule.js

@@ -13,7 +13,7 @@ var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _constant = require("@abtnode/constant");
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _urlFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-friendly"));
+var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
 var _node = require("../../../contexts/node");
 var _blocklet = require("../../../contexts/blocklet");
 var _confirm = _interopRequireDefault(require("../../../confirm"));
@@ -63,7 +63,7 @@ function UpdateRule(_ref) {
       const rule = {
         id: ruleId,
         from: {
-          pathPrefix: (0, _urlFriendly.default)(params.pathPrefix)
+          pathPrefix: (0, _urlPathFriendly.default)(params.pathPrefix)
         },
         to: {
           type: params.type

package/lib/blocklet/status.js

@@ -9,9 +9,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _util = require("@blocklet/meta/lib/util");
 var _dot = _interopRequireDefault(require("../dot"));
 var _tag = _interopRequireDefault(require("../tag"));
-var _util = require("../util");
 var _jsxRuntime = require("react/jsx-runtime");
 const _excluded = ["status", "variant", "source"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }

package/lib/blocklet/version.js

@@ -91,7 +91,7 @@ function Version(_ref) {
     onConfirm,
     onCancel
   };
-  if (hasPermission && newVersionBlocklet && !(0, _util2.isInProgress)(blocklet.status)) {
+  if (hasPermission && newVersionBlocklet && !(0, _util.isInProgress)(blocklet.status)) {
     return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_tag.default, _objectSpread(_objectSpread({}, rest), {}, {
         children: blocklet.meta.version

package/lib/locales/en.js

@@ -304,6 +304,7 @@ module.exports = {
     appId: 'App ID',
     appPid: 'Permanent ID',
     alsoKnownAs: 'Also Known As',
+    skSource: 'Owner Wallet',
     reloadSuccess: 'Blocklet was reloaded successfully',
     statusTip: 'Blocklet is {status}',
     initialUptime: 'Less than 1m',
@@ -544,6 +545,10 @@ module.exports = {
         duplicate: 'Find duplicate component {name}, please delete useless components and migrate again',
         running: 'Please stop blocklet before migration'
       }
+    },
+    error: {
+      isRunning: 'Blocklet is running, please stop it first',
+      isInProgress: 'Blocklet is in progress, please wait for it to finish'
     }
   },
   dashboard: {
@@ -947,7 +952,8 @@ module.exports = {
       },
       error: {
         passportEmpty: 'Passport should not be empty'
-      }
+      },
+      connectedAccounts: 'Connected Accounts'
     },
     transferNode: {
       name: 'Transfer Ownership',

package/lib/locales/zh.js

@@ -310,6 +310,7 @@ module.exports = {
     appId: '应用 ID',
     appPid: '永久性 ID',
     alsoKnownAs: '曾用 ID',
+    skSource: '安装钱包',
     reloadSuccess: 'Blocklet 重启成功',
     statusTip: 'Blocklet {status}',
     initialUptime: '少于1分钟',
@@ -552,6 +553,10 @@ module.exports = {
         duplicate: '发现重复的组件 {name}，请删除无用组件并重新迁移',
         running: '迁移前请先停止应用'
       }
+    },
+    error: {
+      isRunning: 'Blocklet 正在运行，请先停止运行',
+      isInProgress: 'Blocklet 正在进行中，请等待完成'
     }
   },
   dashboard: {
@@ -950,7 +955,8 @@ module.exports = {
       },
       error: {
         passportEmpty: '通行证不能为空'
-      }
+      },
+      connectedAccounts: '已连接账号'
     },
     transferNode: {
       name: '转移所有者',

package/lib/team/members/index.js

@@ -274,11 +274,15 @@ function MemberList(_ref2) {
     }
   }, {
     label: t('team.member.source'),
-    name: 'source',
+    name: 'extraConfigs.sourceProvider',
     options: {
       customBodyRender: e => {
         const source = e || _constant.USER_TYPE.WALLET;
-        return t("team.member.source_".concat(source)) || '-';
+        const providerNameMap = {
+          auth0: 'Auth0',
+          wallet: 'DID wallet'
+        };
+        return providerNameMap[source] || source;
       }
     }
   }, {

package/lib/team/members/issue-passport.js

@@ -14,7 +14,6 @@ var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _Select = _interopRequireDefault(require("@mui/material/Select"));
 var _InputLabel = _interopRequireDefault(require("@mui/material/InputLabel"));
 var _FormControl = _interopRequireDefault(require("@mui/material/FormControl"));
-var _constant = require("@abtnode/constant");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
@@ -26,7 +25,7 @@ function IssuePassport(_ref) {
   let {
     teamDid,
     ownerDid,
-    ownerSource,
+    needReceive,
     roles,
     onCancel,
     onSuccess,
@@ -94,7 +93,7 @@ function IssuePassport(_ref) {
         "data-cy": "issue-passport-create-btn",
         children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {
           size: 16
-        }), ownerSource === _constant.USER_TYPE.DERIVED ? t('oauth.issued') : t('team.passport.issuance.create.title')]
+        }), needReceive ? t('team.passport.issuance.create.title') : t('oauth.issued')]
       })]
     }),
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_DialogContentText.default, {
@@ -144,7 +143,7 @@ function IssuePassport(_ref) {
 IssuePassport.propTypes = {
   teamDid: _propTypes.default.string.isRequired,
   ownerDid: _propTypes.default.string.isRequired,
-  ownerSource: _propTypes.default.oneOf([_constant.USER_TYPE.WALLET, _constant.USER_TYPE.DERIVED, undefined]),
+  needReceive: _propTypes.default.bool,
   onCancel: _propTypes.default.func.isRequired,
   onSuccess: _propTypes.default.func.isRequired,
   onError: _propTypes.default.func,
@@ -155,5 +154,5 @@ IssuePassport.defaultProps = {
   onError: () => {},
   roles: [],
   showOwnerPassport: false,
-  ownerSource: _constant.USER_TYPE.WALLET
+  needReceive: true
 };

package/lib/team/members/member.js

@@ -12,14 +12,12 @@ var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Avatar = _interopRequireDefault(require("@mui/material/Avatar"));
-var _Avatar2 = _interopRequireDefault(require("@arcblock/did-connect/lib/Avatar"));
 var _Tabs = _interopRequireDefault(require("@arcblock/ux/lib/Tabs"));
 var _InfoRow = _interopRequireDefault(require("@arcblock/ux/lib/InfoRow"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Address = _interopRequireDefault(require("@arcblock/did-connect/lib/Address"));
 var _ForbidLoginIcon = _interopRequireDefault(require("@arcblock/icons/lib/ForbidLoginIcon"));
 var _AllowLoginIcon = _interopRequireDefault(require("@arcblock/icons/lib/AllowLoginIcon"));
-var _reactUse = require("react-use");
 var _ahooks = require("ahooks");
 var _constant = require("@abtnode/constant");
 var _permission = _interopRequireDefault(require("../../permission"));
@@ -64,66 +62,21 @@ LinkUser.propTypes = {
 function TabOAuth(_ref2) {
   var _user$extraConfigs;
   let {
-    user,
-    onChangeUser
+    user
   } = _ref2;
-  const {
-    api,
-    inService
-  } = (0, _node.useNodeContext)();
-  const {
-    teamDid
-  } = (0, _team.useTeamContext)();
   const connectedAccounts = ((_user$extraConfigs = user.extraConfigs) === null || _user$extraConfigs === void 0 ? void 0 : _user$extraConfigs.connectedAccounts) || [];
-  const sourceIds = connectedAccounts.map(x => x.id);
-  const users = (0, _reactUse.useAsync)(async () => {
-    if (sourceIds !== null && sourceIds !== void 0 && sourceIds.length) {
-      const {
-        users: data
-      } = await api.getUsers({
-        input: {
-          teamDid,
-          sourceIds
-        }
-      });
-      return data;
-    }
-    return [];
-  }, []);
-  if (users.loading || !users.value) {
-    return null;
-  }
-  return users.value.map(userItem => {
-    var _userItem$extraConfig;
+  return connectedAccounts.map(account => {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InfoRow.default, {
       style: {
         alignItems: 'flex-start'
       },
       valueComponent: "div",
       nameWidth: 120,
-      name: (_userItem$extraConfig = userItem.extraConfigs) === null || _userItem$extraConfig === void 0 ? void 0 : _userItem$extraConfig.sourceProvider,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
-        display: "flex",
-        alignItems: "center",
-        title: userItem.email,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Avatar2.default, {
-          src: (0, _util2.parseAvatar)(userItem.avatar, teamDid, inService),
-          size: 20,
-          did: userItem.did,
-          shape: "circle",
-          style: {
-            borderRadius: '100%',
-            overflow: 'hidden'
-          }
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(LinkUser, {
-          name: userItem.fullName,
-          mx: 1,
-          onClick: () => {
-            onChangeUser(userItem);
-          }
-        })]
+      name: account.provider,
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Address.default, {
+        children: account.did
       })
-    }, userItem.did);
+    }, account.did);
   });
 }
 TabOAuth.propTypes = {
@@ -218,10 +171,14 @@ function Member(_ref3) {
     await getData(teamDid, changedUser.did);
     pageState.tab = defaultTab;
   };
+  const providerNameMap = {
+    auth0: 'Auth0',
+    wallet: 'DID wallet'
+  };
 
   // tab
   const Info = () => {
-    var _pageState$user$extra, _pageState$user$extra3;
+    var _pageState$user, _pageState$user$extra, _pageState$user2, _pageState$user2$extr;
     const rows = pageState.user ? [{
       name: t('team.member.name'),
       value: pageState.user.fullName
@@ -230,25 +187,10 @@ function Member(_ref3) {
       value: pageState.user.email
     }, {
       name: t('team.member.source'),
-      value: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
         display: "flex",
         alignItems: "center",
-        children: [t("team.member.source_".concat(pageState.user.source || _constant.USER_TYPE.WALLET)) || '-', ((_pageState$user$extra = pageState.user.extraConfigs) === null || _pageState$user$extra === void 0 ? void 0 : _pageState$user$extra.bindDid) && /*#__PURE__*/(0, _jsxRuntime.jsx)(LinkUser, {
-          ml: 1,
-          name: t('oauth.alreadyBindWallet'),
-          onClick: () => {
-            var _pageState$user$extra2;
-            return handleChangeUser({
-              did: (_pageState$user$extra2 = pageState.user.extraConfigs) === null || _pageState$user$extra2 === void 0 ? void 0 : _pageState$user$extra2.bindDid
-            });
-          }
-        }), ((_pageState$user$extra3 = pageState.user.extraConfigs) === null || _pageState$user$extra3 === void 0 ? void 0 : _pageState$user$extra3.derivedAccount) && /*#__PURE__*/(0, _jsxRuntime.jsx)(LinkUser, {
-          ml: 1,
-          name: t('oauth.alreadyBindOAuth'),
-          onClick: () => {
-            pageState.tab = 'oauth';
-          }
-        })]
+        children: providerNameMap[((_pageState$user = pageState.user) === null || _pageState$user === void 0 ? void 0 : (_pageState$user$extra = _pageState$user.extraConfigs) === null || _pageState$user$extra === void 0 ? void 0 : _pageState$user$extra.sourceProvider) || _constant.USER_TYPE.WALLET] || ((_pageState$user2 = pageState.user) === null || _pageState$user2 === void 0 ? void 0 : (_pageState$user2$extr = _pageState$user2.extraConfigs) === null || _pageState$user2$extr === void 0 ? void 0 : _pageState$user2$extr.sourceProvider)
       })
     }, {
       name: t('team.member.allowLogin'),
@@ -294,7 +236,7 @@ function Member(_ref3) {
       component: Info
     },
     oauth: {
-      label: t('oauth.thirdPartyLogin'),
+      label: t('team.member.connectedAccounts'),
       value: 'oauth',
       component: () => /*#__PURE__*/(0, _jsxRuntime.jsx)(TabOAuth, {
         user: pageState.user,
@@ -346,8 +288,12 @@ function Member(_ref3) {
       return enablePassportIssuance && pageState.issuances && !!pageState.issuances.length;
     }
     if (x.value === 'oauth') {
-      var _pageState$user;
-      return ((_pageState$user = pageState.user) === null || _pageState$user === void 0 ? void 0 : _pageState$user.source) !== _constant.USER_TYPE.DERIVED;
+      var _pageState$user3, _pageState$user3$extr;
+      const connectedAccounts = ((_pageState$user3 = pageState.user) === null || _pageState$user3 === void 0 ? void 0 : (_pageState$user3$extr = _pageState$user3.extraConfigs) === null || _pageState$user3$extr === void 0 ? void 0 : _pageState$user3$extr.connectedAccounts) || [];
+      return connectedAccounts.find(item => {
+        var _pageState$user4;
+        return item.provider !== (((_pageState$user4 = pageState.user) === null || _pageState$user4 === void 0 ? void 0 : _pageState$user4.extraConfigs.sourceProvider) || 'wallet');
+      });
     }
     return true;
   });

package/lib/team/members/passports.js

@@ -71,7 +71,7 @@ ConfirmDescription.propTypes = {
 };
 ConfirmDescription.defaultProps = {};
 function Passports(_ref2) {
-  var _blocklet$settings;
+  var _user$extraConfigs2, _blocklet$settings;
   let {
     user,
     onCreate
@@ -191,6 +191,17 @@ function Passports(_ref2) {
     };
   };
   const filteredPassports = passports.filter(x => !search || x.title.includes(search) || x.name.includes(search));
+  const needReceive = (0, _react.useMemo)(() => {
+    var _user$extraConfigs;
+    const connectedAccounts = (user === null || user === void 0 ? void 0 : (_user$extraConfigs = user.extraConfigs) === null || _user$extraConfigs === void 0 ? void 0 : _user$extraConfigs.connectedAccounts) || [];
+    if (connectedAccounts.find(item => item.provider === 'wallet')) {
+      return true;
+    }
+    if (connectedAccounts.length === 0) {
+      return true;
+    }
+    return false;
+  }, [user === null || user === void 0 ? void 0 : (_user$extraConfigs2 = user.extraConfigs) === null || _user$extraConfigs2 === void 0 ? void 0 : _user$extraConfigs2.connectedAccounts]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Div, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_listHeader.default, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -307,7 +318,7 @@ function Passports(_ref2) {
     }), showIssueDialog && /*#__PURE__*/(0, _jsxRuntime.jsx)(_issuePassport.default, {
       teamDid: teamDid,
       ownerDid: user.did,
-      ownerSource: user.source,
+      needReceive: needReceive,
       roles: roles,
       onCancel: () => setShowIssueDialog(false),
       onSuccess: () => {

package/lib/util/index.js

@@ -22,7 +22,6 @@ exports.getAsset = getAsset;
 exports.getAssetExpiration = getAssetExpiration;
 exports.getBlockletLogoUrl = void 0;
 exports.getBlockletMetaUrl = getBlockletMetaUrl;
-exports.getBlockletServices = void 0;
 exports.getBlockletUrl = getBlockletUrl;
 exports.getBlockletUrlParams = void 0;
 exports.getBlockletUrls = getBlockletUrls;
@@ -31,9 +30,9 @@ exports.getPathPrefix = exports.getIssuePassportLink = exports.getInviteLink = v
 exports.getRelativeTime = getRelativeTime;
 exports.getStoreList = void 0;
 exports.getWebWalletUrl = getWebWalletUrl;
-exports.isNewStoreUrl = exports.isInstalling = exports.isInProgress = exports.isDownloading = exports.isChrome = exports.isCertificateMatch = exports.isBlockletDev = void 0;
+exports.isNewStoreUrl = exports.isInstalling = exports.isDownloading = exports.isChrome = exports.isCertificateMatch = exports.isBlockletDev = void 0;
 exports.isProtectedRole = isProtectedRole;
-exports.isUrlAccessible = exports.isSafari = void 0;
+exports.isUrlAccessible = exports.isSafari = exports.isRunning = void 0;
 exports.isValidClusterSize = isValidClusterSize;
 exports.parseQuery = void 0;
 exports.patchJsxToLocale = patchJsxToLocale;
@@ -57,7 +56,7 @@ var _urlEvaluation = require("@abtnode/util/lib/url-evaluation");
 var _checkAccessibleBrowser = _interopRequireDefault(require("@abtnode/util/lib/url-evaluation/check-accessible-browser"));
 var _axios = _interopRequireDefault(require("@abtnode/util/lib/axios"));
 var _normalizePathPrefix = _interopRequireDefault(require("@abtnode/util/lib/normalize-path-prefix"));
-var _urlFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-friendly"));
+var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
 var _window$env;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function sleep(t) {
@@ -161,9 +160,19 @@ function getBlockletUrls() {
   }
   let mountPoint = inputMountPoint;
   if (!mountPoint) {
-    var _rule$from;
-    const rule = site.rules.filter(x => !x.from.pathPrefix.startsWith(_constant.WELLKNOWN_PATH_PREFIX))[0];
-    mountPoint = (0, _normalizePathPrefix.default)((rule === null || rule === void 0 ? void 0 : (_rule$from = rule.from) === null || _rule$from === void 0 ? void 0 : _rule$from.pathPrefix) || '/');
+    var _rule, _rule$from, _rule2, _rule2$from;
+    const rules = site.rules.filter(x => !x.from.pathPrefix.startsWith(_constant.WELLKNOWN_PATH_PREFIX));
+    let rule = rules[0];
+    if (((_rule = rule) === null || _rule === void 0 ? void 0 : (_rule$from = _rule.from) === null || _rule$from === void 0 ? void 0 : _rule$from.pathPrefix) !== '/') {
+      const rootRule = rules.find(x => {
+        var _x$from;
+        return ((_x$from = x.from) === null || _x$from === void 0 ? void 0 : _x$from.pathPrefix) === '/';
+      });
+      if (rootRule) {
+        rule = rootRule;
+      }
+    }
+    mountPoint = (0, _normalizePathPrefix.default)(((_rule2 = rule) === null || _rule2 === void 0 ? void 0 : (_rule2$from = _rule2.from) === null || _rule2$from === void 0 ? void 0 : _rule2$from.pathPrefix) || '/');
   }
   return domains.map(domain => getAccessUrl(domain.value, mountPoint, params));
 }
@@ -286,12 +295,12 @@ const appendParams = function appendParams(url) {
   return "".concat(pathname, "?").concat(_querystring.default.stringify(params));
 };
 exports.appendParams = appendParams;
-const isInProgress = status => ['waiting', 'downloading', 'starting', 'installing', 'stopping', 'upgrading', 'restarting', 'deleting'].includes(status);
-exports.isInProgress = isInProgress;
 const isInstalling = status => ['waiting', 'downloading', 'installing', 'upgrading'].includes(status);
 exports.isInstalling = isInstalling;
 const isDownloading = status => ['waiting', 'downloading'].includes(status);
 exports.isDownloading = isDownloading;
+const isRunning = status => status === 'running';
+exports.isRunning = isRunning;
 const formatDiskSize = function formatDiskSize(size) {
   let serverPlatform = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
   const base = serverPlatform === 'linux' ? 2 : 10;
@@ -331,23 +340,6 @@ const formatPerson = person => {
   return name + email + url;
 };
 exports.formatPerson = formatPerson;
-const getBlockletServices = blocklet => {
-  const services = [];
-  if (!blocklet) {
-    return services;
-  }
-  const interfaces = (blocklet.meta.interfaces || []).filter(x => x.type === _constant2.BLOCKLET_INTERFACE_TYPE_SERVICE);
-  interfaces.forEach(x => {
-    services.push({
-      name: x.name,
-      protocol: x.protocol,
-      port: Number(x.port.external),
-      upstreamPort: Number(blocklet.ports[x.port.internal])
-    });
-  });
-  return services;
-};
-exports.getBlockletServices = getBlockletServices;
 const shouldCheckDomainStatus = domain => domain &&
 // eslint-disable-line
 ![_constant.DOMAIN_FOR_IP_SITE, _constant.DOMAIN_FOR_IP_SITE_REGEXP, _constant.DOMAIN_FOR_DEFAULT_SITE, _constant.DOMAIN_FOR_INTERNAL_SITE].includes(domain);
@@ -702,5 +694,5 @@ const sortDomains = domains => {
   });
 };
 exports.sortDomains = sortDomains;
-const formatMountPoint = value => (0, _normalizePathPrefix.default)((0, _urlFriendly.default)(value));
+const formatMountPoint = value => (0, _normalizePathPrefix.default)((0, _urlPathFriendly.default)(value));
 exports.formatMountPoint = formatMountPoint;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.3",
+  "version": "1.16.4-beta-8682e092",
   "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.3",
-    "@abtnode/constant": "1.16.3",
-    "@abtnode/util": "1.16.3",
-    "@arcblock/did-connect": "^2.5.18",
+    "@abtnode/auth": "1.16.4-beta-8682e092",
+    "@abtnode/constant": "1.16.4-beta-8682e092",
+    "@abtnode/util": "1.16.4-beta-8682e092",
+    "@arcblock/did-connect": "^2.5.21",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.18",
-    "@arcblock/react-hooks": "^2.5.18",
-    "@arcblock/terminal": "^2.5.18",
-    "@arcblock/ux": "^2.5.18",
-    "@blocklet/constant": "1.16.3",
+    "@arcblock/icons": "^2.5.21",
+    "@arcblock/react-hooks": "^2.5.21",
+    "@arcblock/terminal": "^2.5.21",
+    "@arcblock/ux": "^2.5.21",
+    "@blocklet/constant": "1.16.4-beta-8682e092",
     "@blocklet/launcher-layout": "1.9.65",
-    "@blocklet/list": "^0.11.15",
-    "@blocklet/meta": "1.16.3",
-    "@blocklet/ui-react": "^2.5.18",
+    "@blocklet/list": "^0.11.16",
+    "@blocklet/meta": "1.16.4-beta-8682e092",
+    "@blocklet/ui-react": "^2.5.21",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -89,5 +89,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "a21d48225c6f89963796871f404a2318a335701d"
+  "gitHead": "ab6fc7aeaec32f14ec2153976f2121aa893486b5"
 }