@abtnode/ux 1.16.29-next-680cf137 → 1.16.30-beta-00e8bdd1

package/lib/locales/zh-tw.js

@@ -738,7 +738,12 @@ export default {
       deleteStoreTip: '您確定要將{name}從連接商店列表中移除嗎？',
       disconnectStoreTip: '斷開連線後，blocklet 將從商店中移除。您確定要斷開連線嗎？',
       connectOrUpload: '連接或上傳',
-      developerInfo: '開發者資訊'
+      developerInfo: '開發者資訊',
+      possibleSameStoreTip: '依賴的 Blocklets 優先使用同源 Store',
+      autoUploadTip: '創建發布後自動將 Blocklet 上傳到商店',
+      needProjectId: '請先創建一個專案',
+      projectSettings: '專案設定',
+      noStoreSelected: '請選擇現有商店或添加新商店以繼續'
     },
     titleValidationError: '標題長度必須至少為3到40個字符',
     descriptionValidationError: '描述長度必須介於3到160個字符之間',
@@ -1269,7 +1274,8 @@ export default {
       },
       activeUserSessions: '活躍用戶會話',
       forceLogout: '強制登出',
-      forceLogoutDescription: '確認是否強制登出此使用者？'
+      forceLogoutDescription: '確認是否強制登出此使用者？',
+      openProfile: '檢視個人檔案'
     },
     transferNode: {
       name: '轉讓所有權',

package/lib/locales/zh.js

@@ -739,7 +739,12 @@ export default {
       deleteStoreTip: '您确定要将{name}从连接商店列表中移除吗？',
       disconnectStoreTip: '断开连接后，blocklet 将从商店中移除。您确定要断开连接吗？',
       connectOrUpload: '连接或上传',
-      developerInfo: '开发者信息'
+      developerInfo: '开发者信息',
+      possibleSameStoreTip: '依赖的 Blocklets 优先使用同源 Store',
+      autoUploadTip: '创建发布后自动将 Blocklet 上传到商店',
+      needProjectId: '请先创建一个项目',
+      projectSettings: '项目设置',
+      noStoreSelected: '请选择现有店铺中的一个或添加新店铺以继续'
     },
     titleValidationError: '标题长度必须至少为3到40个字符',
     descriptionValidationError: '描述长度必须在3到160个字符之间'
@@ -1269,7 +1274,8 @@ export default {
       },
       activeUserSessions: '活跃用户会话',
       forceLogout: '强制注销',
-      forceLogoutDescription: '确认是否强制退出此用户？'
+      forceLogoutDescription: '确认是否强制退出此用户？',
+      openProfile: '查看个人资料'
     },
     transferNode: {
       name: '转移所有者',

package/lib/team/members/invite-member.js

@@ -1,5 +1,5 @@
 import PropTypes from 'prop-types';
-import { Alert, Box, CircularProgress, DialogContentText, MenuItem, Select, TextField, InputLabel, FormControl } from '@mui/material';
+import { Alert, Box, CircularProgress, DialogContentText, MenuItem, Select, TextField, InputLabel, FormControl, Typography } from '@mui/material';
 import { useReactive } from 'ahooks';
 import Dialog from '@arcblock/ux/lib/Dialog';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
@@ -139,8 +139,21 @@ export default function InviteMember({
           children: roles.filter(d => d.name !== 'owner').map(r => /*#__PURE__*/_jsx(MenuItem, {
             value: r.name,
             "data-cy": `invite-member-select-option-${r.name}`,
-            children: /*#__PURE__*/_jsx("span", {
-              children: r.title || r.name
+            children: /*#__PURE__*/_jsxs(Box, {
+              sx: {
+                display: 'flex',
+                flexDirection: 'column'
+              },
+              children: [/*#__PURE__*/_jsx(Typography, {
+                variant: "subtitle1",
+                children: r.title || r.name
+              }), /*#__PURE__*/_jsx(Typography, {
+                variant: "caption",
+                sx: {
+                  opacity: 0.7
+                },
+                children: r.description
+              })]
             })
           }, r.name))
         })]

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

@@ -11,6 +11,7 @@ import FormControl from '@mui/material/FormControl';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Button from '@arcblock/ux/lib/Button';
 import Alert from '@mui/material/Alert';
+import { Box } from '@mui/material';
 import { useNodeContext } from '../../contexts/node';
 import { formatError } from '../../util';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -57,6 +58,7 @@ export default function IssuePassport({
       setLoading(false);
     }
   };
+  console.error('--debug--', roles);
   return /*#__PURE__*/_jsxs(Dialog, {
     title: t('team.passport.issue'),
     fullWidth: true,
@@ -118,8 +120,21 @@ export default function IssuePassport({
             children: roles.filter(d => showOwnerPassport || d.name !== 'owner').map(r => /*#__PURE__*/_jsx(MenuItem, {
               value: r.name,
               "data-cy": `issue-passport-select-option-${r.name}`,
-              children: /*#__PURE__*/_jsx("span", {
-                children: r.title || r.name
+              children: /*#__PURE__*/_jsxs(Box, {
+                sx: {
+                  display: 'flex',
+                  flexDirection: 'column'
+                },
+                children: [/*#__PURE__*/_jsx(Typography, {
+                  variant: "subtitle1",
+                  children: r.title || r.name
+                }), /*#__PURE__*/_jsx(Typography, {
+                  variant: "caption",
+                  sx: {
+                    opacity: 0.7
+                  },
+                  children: r.description
+                })]
               })
             }, r.name))
           })]

package/lib/team/members/member.js

@@ -1,5 +1,5 @@
 /* eslint-disable react/no-unstable-nested-components */
-import { useEffect } from 'react';
+import { useEffect, useState } from 'react';
 import PropTypes from 'prop-types';
 import styled from '@emotion/styled';
 import Toast from '@arcblock/ux/lib/Toast';
@@ -14,8 +14,10 @@ import ForbidLoginIcon from '@arcblock/icons/lib/ForbidLoginIcon';
 import AllowLoginIcon from '@arcblock/icons/lib/AllowLoginIcon';
 import { getTextColor } from '@abtnode/auth/lib/util/create-passport-svg';
 import { useReactive } from 'ahooks';
+import { Icon } from '@iconify/react';
 import { USER_TYPE } from '@abtnode/constant';
 import { LOGIN_PROVIDER, PROVIDER_NAME, TeamEvents } from '@blocklet/constant';
+import { Button } from '@mui/material';
 import Tag from '../../tag';
 import DidAddress from '../../did-address';
 import Permission from '../../permission';
@@ -26,6 +28,7 @@ import PassportIssuances from './passport-issuances';
 import Passports from './passports';
 import ToggleUserApproval from './toggle-user-approval';
 import { parseAvatar } from './util';
+import blockletSdk from '../../util/sdk';
 import UserConnections from './connections';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 function LinkUser({
@@ -75,6 +78,7 @@ export default function Member({
     issuances: null,
     tab: initTab || defaultTab
   });
+  const [profileUrl, setProfileUrl] = useState('');
   const getData = async (_teamDid, _userDid) => {
     try {
       const res = await api.doBatchQuery({
@@ -126,6 +130,12 @@ export default function Member({
     }
   }, [pageState.issuances]); // eslint-disable-line
 
+  useEffect(() => {
+    blockletSdk.user.getProfileUrl({
+      did: pageState.user?.did,
+      locale
+    }).then(setProfileUrl);
+  }, [pageState.user?.did, locale]);
   const handleChangeUser = async changedUser => {
     await getData(teamDid, changedUser.did);
     pageState.tab = defaultTab;
@@ -298,29 +308,55 @@ export default function Member({
         children: /*#__PURE__*/_jsx(Spinner, {})
       }), pageState.user && /*#__PURE__*/_jsxs("div", {
         children: [/*#__PURE__*/_jsxs(Box, {
-          display: "flex",
-          alignItems: "center",
-          className: "info",
-          children: [/*#__PURE__*/_jsx(Avatar, {
-            src: pageState.user.avatar,
-            style: {
-              width: 48,
-              height: 48,
-              backgroundColor: 'transparent',
-              marginRight: 16
-            }
-          }), /*#__PURE__*/_jsxs(Box, {
-            children: [/*#__PURE__*/_jsx(Box, {
-              className: "name",
-              children: pageState.user.fullName
-            }), /*#__PURE__*/_jsx(Box, {
-              className: "did",
-              mt: 1,
-              children: /*#__PURE__*/_jsx(DidAddress, {
-                did: pageState.user.did,
-                showQrcode: true
-              })
+          sx: {
+            display: 'flex',
+            flexDirection: 'row',
+            alignItems: 'center',
+            justifyContent: 'space-between'
+          },
+          children: [/*#__PURE__*/_jsxs(Box, {
+            display: "flex",
+            alignItems: "center",
+            className: "info",
+            children: [/*#__PURE__*/_jsx(Avatar, {
+              src: pageState.user.avatar,
+              style: {
+                width: 48,
+                height: 48,
+                backgroundColor: 'transparent',
+                marginRight: 16
+              }
+            }), /*#__PURE__*/_jsxs(Box, {
+              children: [/*#__PURE__*/_jsx(Box, {
+                className: "name",
+                children: pageState.user.fullName
+              }), /*#__PURE__*/_jsx(Box, {
+                className: "did",
+                mt: 1,
+                children: /*#__PURE__*/_jsx(DidAddress, {
+                  compact: true,
+                  responsive: false,
+                  did: pageState.user.did,
+                  showQrcode: true
+                })
+              })]
             })]
+          }), !!inService && /*#__PURE__*/_jsx("a", {
+            href: profileUrl,
+            target: "_blank",
+            rel: "noreferrer",
+            children: /*#__PURE__*/_jsxs(Button, {
+              variant: "contained",
+              color: "primary",
+              "data-cy": "issue-passport",
+              children: [/*#__PURE__*/_jsx(Icon, {
+                icon: "majesticons:open-line",
+                style: {
+                  fontSize: 16,
+                  marginRight: 4
+                }
+              }), t('team.member.openProfile')]
+            })
           })]
         }), /*#__PURE__*/_jsx(Box, {
           mx: 3,

package/lib/util/index.js

@@ -226,20 +226,6 @@ export const checkInputByType = (type, value) => {
   return false;
 };
 export const formatUrl = url => humanizeUrl(url.split('?').shift());
-export const formatPerson = person => {
-  if (!person) {
-    return '-';
-  }
-  if (typeof person === 'string') {
-    return person;
-  }
-  const name = person.name || '';
-  const u = person.url || person.web;
-  const url = u ? ` (${u})` : '';
-  const e = person.email || person.mail;
-  const email = e ? ` <${e}>` : '';
-  return name + email + url;
-};
 export const shouldCheckDomainStatus = domain => domain &&
 // eslint-disable-line
 ![DOMAIN_FOR_IP_SITE, DOMAIN_FOR_IP_SITE_REGEXP, DOMAIN_FOR_DEFAULT_SITE, DOMAIN_FOR_INTERNAL_SITE].includes(domain);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.29-next-680cf137",
+  "version": "1.16.30-beta-00e8bdd1",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -25,25 +25,25 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.29-next-680cf137",
-    "@abtnode/constant": "1.16.29-next-680cf137",
-    "@abtnode/util": "1.16.29-next-680cf137",
+    "@abtnode/auth": "1.16.30-beta-00e8bdd1",
+    "@abtnode/constant": "1.16.30-beta-00e8bdd1",
+    "@abtnode/util": "1.16.30-beta-00e8bdd1",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.126",
-    "@arcblock/did-connect": "^2.10.7",
+    "@arcblock/did": "^1.18.128",
+    "@arcblock/did-connect": "^2.10.13",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.10.7",
-    "@arcblock/nft-display": "2.10.7",
-    "@arcblock/react-hooks": "^2.10.7",
-    "@arcblock/terminal": "^2.10.7",
-    "@arcblock/ux": "^2.10.7",
-    "@blocklet/constant": "1.16.29-next-680cf137",
-    "@blocklet/js-sdk": "1.16.29-next-680cf137",
-    "@blocklet/launcher-layout": "2.3.33",
-    "@blocklet/list": "^0.13.9",
-    "@blocklet/meta": "1.16.29-next-680cf137",
-    "@blocklet/ui-react": "^2.10.7",
-    "@blocklet/uploader": "0.1.19",
+    "@arcblock/icons": "^2.10.13",
+    "@arcblock/nft-display": "2.10.13",
+    "@arcblock/react-hooks": "^2.10.13",
+    "@arcblock/terminal": "^2.10.13",
+    "@arcblock/ux": "^2.10.13",
+    "@blocklet/constant": "1.16.30-beta-00e8bdd1",
+    "@blocklet/js-sdk": "1.16.30-beta-00e8bdd1",
+    "@blocklet/launcher-layout": "2.3.39",
+    "@blocklet/list": "^0.13.14",
+    "@blocklet/meta": "1.16.30-beta-00e8bdd1",
+    "@blocklet/ui-react": "^2.10.13",
+    "@blocklet/uploader": "0.1.20",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify-icons/logos": "^1.2.36",
@@ -56,7 +56,7 @@
     "@mui/styles": "^5.15.11",
     "@mui/x-date-pickers": "^6.19.0",
     "@mui/x-tree-view": "^6.17.0",
-    "@ocap/client": "1.18.126",
+    "@ocap/client": "1.18.128",
     "@uiw/react-markdown-preview": "^5.1.1",
     "ahooks": "^3.7.8",
     "axios": "^1.7.2",
@@ -108,5 +108,5 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "17b7e7c5e43c497980d4fe6b5bb20609328041bd"
+  "gitHead": "e165c7e64a2900b4c390b7435c0bb71abbf9b625"
 }