@arcblock/ux 2.7.15 → 2.7.16

package/src/SessionManager/menu-accordion.jsx

@@ -0,0 +1,87 @@
+import PropTypes from 'prop-types';
+import { Accordion, AccordionDetails, AccordionSummary, MenuItem } from '@mui/material';
+import ExpandMoreIcon from '@iconify-icons/mdi/expand-more';
+import { Icon } from '@iconify/react';
+import isEmpty from 'lodash/isEmpty';
+import isNil from 'lodash/isNil';
+import { useCreation, useMemoizedFn } from 'ahooks';
+import { translate } from '../Locale/util';
+import { translations } from './translation';
+
+function isEmptyNode(node) {
+  if (isNil(node)) {
+    return true;
+  }
+  if (isEmpty(node)) {
+    return true;
+  }
+  if (Array.isArray(node)) {
+    return node.every((item) => isEmptyNode(item));
+  }
+  return false;
+}
+
+export default function MenuAccordion({ title, children, locale }) {
+  const isEmptyChildren = useCreation(() => isEmptyNode(children), [children]);
+  const t = useMemoizedFn((key, data = {}) => {
+    return translate(translations, key, locale, 'en', data);
+  });
+
+  return (
+    <Accordion
+      defaultExpanded
+      disableGutters
+      elevation={0}
+      sx={{
+        '&.MuiAccordion-root:before': {
+          content: 'unset',
+        },
+        '.MuiAccordionSummary-root': {
+          minHeight: 'auto',
+          width: '100%',
+        },
+        '.MuiAccordionSummary-content': {
+          margin: 0,
+        },
+        '.MuiAccordionDetails-root': {
+          padding: 0,
+          paddingLeft: '30px',
+          '.session-manager-menu-item': {
+            fontSize: '15px',
+            padding: '12px 20px',
+            whiteSpace: 'normal',
+          },
+          '.session-manager-menu-icon': {
+            height: '21px',
+            widht: '21px',
+          },
+        },
+      }}>
+      <MenuItem sx={{ padding: 0, width: '100%' }}>
+        <AccordionSummary
+          className="session-manager-menu-item"
+          expandIcon={<Icon icon={ExpandMoreIcon} width={24} height={24} />}>
+          {title}
+        </AccordionSummary>
+      </MenuItem>
+      <AccordionDetails>
+        {isEmptyChildren ? (
+          <MenuItem disabled key="empty" className="session-manager-menu-item" sx={{ justifyContent: 'center' }}>
+            {t('noneMenu')}
+          </MenuItem>
+        ) : (
+          children
+        )}
+      </AccordionDetails>
+    </Accordion>
+  );
+}
+
+MenuAccordion.propTypes = {
+  title: PropTypes.any.isRequired,
+  children: PropTypes.any.isRequired,
+  locale: PropTypes.string,
+};
+MenuAccordion.defaultProps = {
+  locale: 'en',
+};

package/src/SessionManager/translation.js

@@ -0,0 +1,52 @@
+/* eslint-disable import/prefer-default-export */
+export const translations = {
+  en: {
+    edit: 'Edit',
+    account: 'account',
+    switchDid: 'Switch DID',
+    switchTo: 'Switch to',
+    switchProfile: 'Switch Profile',
+    switchPassport: 'Switch Passport',
+    disconnect: 'Disconnect',
+    connect: 'Connect',
+    openInWallet: 'Open DID Wallet',
+    alreadyBindOAuth: 'Already bind Auth0',
+    bind: 'Bind ',
+    thirdParty: 'Third Party Login',
+    connectedWith: 'Connected with',
+    manageAccounts: 'Manage Accounts',
+    manageBlocklet: 'Manage Blocklet',
+    from: 'From',
+    addAnotherAccount: 'Add another account',
+    deleteAccountTitle: 'Remove this account ?',
+    deleteAccountContent: 'After delete account, you can add it agian',
+    confirm: 'Confirm',
+    cancel: 'Cancel',
+    noneMenu: 'Empty menu, maybe you should switch to another role',
+  },
+  zh: {
+    edit: '编辑',
+    account: '账号',
+    switchDid: '切换账户',
+    switchTo: '切换至',
+    switchProfile: '切换用户信息',
+    switchPassport: '切换通行证',
+    disconnect: '退出',
+    connect: '登录',
+    openInWallet: '打开 DID 钱包',
+    // NOTE: 目前只有 Auth0，展示出具体的第三方名字会更好
+    alreadyBindOAuth: '已绑定 Auth0 账号',
+    bind: '绑定',
+    thirdParty: '第三方登录',
+    connectedWith: '连接至',
+    manageAccounts: '管理账户',
+    manageBlocklet: '管理应用',
+    from: '连接至',
+    addAnotherAccount: '添加一个账号',
+    deleteAccountTitle: '是否删除账户？',
+    deleteAccountContent: '账户删除后，可再次添加',
+    confirm: '确认',
+    cancel: '取消',
+    noneMenu: '无操作项，请尝试切换角色',
+  },
+};

package/src/SessionManager/use-accounts.js

@@ -0,0 +1,18 @@
+import { useLocalStorageState, useMemoizedFn } from 'ahooks';
+
+export default function useAccounts() {
+  const [accounts, setAccounts] = useLocalStorageState('blocklet:sessionManager:accounts', {
+    defaultValue: [],
+  });
+
+  const connectAccount = useMemoizedFn((account) => {
+    const accountIndex = accounts.findIndex((x) => x.did === account.did);
+    if (accountIndex >= 0) {
+      accounts.splice(accountIndex, 1);
+    }
+    accounts.unshift(account);
+    setAccounts(accounts);
+  });
+
+  return { accounts, setAccounts, connectAccount };
+}

package/src/SessionManager/user-info.jsx

@@ -0,0 +1,116 @@
+/* eslint-disable react/jsx-no-bind */
+/* eslint-disable react/prop-types */
+import { Box, Chip, Typography } from '@mui/material';
+import ShieldCheckIcon from '@iconify-icons/mdi/shield-check';
+import ExpandMoreIcon from '@iconify-icons/mdi/expand-more';
+import { Icon } from '@iconify/react';
+import { useCreation, useMemoizedFn } from 'ahooks';
+
+import DidAvatar from '../Avatar';
+import DidAddress from '../Address';
+import DID from '../DID';
+import { getUserAvatar } from '../Util';
+import { t as translate } from '../Locale/util';
+import { translations } from './translation';
+
+export default function UserInfo({ session, locale, onEditUser, onSwitchPassport, switchProfile, hasBindWallet }) {
+  const t = (key, data = {}) => {
+    return translate(translations, key, locale, 'en', data);
+  };
+  const avatar = getUserAvatar(session.user?.avatar?.replace(/\s/g, encodeURIComponent(' ')));
+  const { walletDid } = session.useDid({ session });
+  const currentRole = useCreation(
+    () => session.user?.passports?.find((item) => item.name === session.user.role),
+    [session?.user?.passports, session?.user?.role]
+  );
+  const userEmail = useCreation(() => session.user?.email || 'lancelot_lewis@163.com', [session?.user]);
+
+  const canEdit = useCreation(() => {
+    if (onEditUser instanceof Function) {
+      if (switchProfile && hasBindWallet && session.provider !== 'federated') {
+        return true;
+      }
+    }
+    return false;
+  }, [onEditUser, switchProfile, hasBindWallet, session.provider]);
+
+  const _onEditUser = useMemoizedFn(() => {
+    if (canEdit) {
+      onEditUser();
+    }
+  });
+
+  return (
+    <Box
+      sx={{
+        display: 'flex',
+        alignItems: 'center',
+        gap: '16px',
+        padding: '15px 20px',
+      }}>
+      <Box
+        onClick={_onEditUser}
+        data-cy="sessionManager-switch-profile-trigger"
+        sx={{
+          cursor: canEdit ? 'pointer' : 'default',
+          position: 'relative',
+          borderRadius: '100%',
+          overflow: 'hidden',
+          fontSize: 0,
+          '&:hover': canEdit
+            ? {
+                '&::after': {
+                  content: `"${t('edit')}"`,
+                  position: 'absolute',
+                  bottom: 0,
+                  background: 'rgba(0, 0, 0, 0.2)',
+                  left: 0,
+                  right: 0,
+                  height: '2.2em',
+                  color: 'white',
+                  textAlign: 'center',
+                  fontSize: '12px',
+                  lineHeight: '2em',
+                },
+              }
+            : {},
+        }}>
+        <DidAvatar variant="circle" did={session.user.did} src={avatar} size={64} shape="circle" />
+      </Box>
+      <Box sx={{ flex: 1, position: 'static', overflow: 'hidden', fontSize: '14px' }}>
+        <Typography variant="h5" fontWeight="bold" mb={1}>
+          {session.user.fullName}
+        </Typography>
+        {/* eslint-disable-next-line no-nested-ternary */}
+        {session.provider === 'auth0' ? (
+          walletDid ? (
+            <DID responsive={false} compact did={walletDid} />
+          ) : null
+        ) : (
+          <DID responsive={false} compact did={session.user.did} />
+        )}
+        {userEmail ? <DidAddress responsive={false}>{userEmail}</DidAddress> : null}
+        <Chip
+          label={currentRole?.title || session.user?.role.toUpperCase()}
+          size="small"
+          variant="outlined"
+          sx={{
+            height: 'auto',
+            marginRight: 0,
+            position: 'absolute',
+            top: 20,
+            right: 15,
+            fontWeight: 'bold',
+            fontSize: '12px',
+          }}
+          icon={<Icon icon={ShieldCheckIcon} height="0.8em" />}
+          deleteIcon={<Icon icon={ExpandMoreIcon} height="1em" />}
+          // HACK: 必须设置 onDelete 函数，deleteIcon 才能显示出来
+          onDelete={onSwitchPassport}
+          onClick={onSwitchPassport}
+          data-cy="sessionManager-switch-passport-trigger"
+        />
+      </Box>
+    </Box>
+  );
+}

package/src/SessionManager/user-popper.jsx

@@ -1,6 +1,7 @@
 import PropTypes from 'prop-types';
 import { IconButton, Paper, Popper, ClickAwayListener } from '@mui/material';
-import { Close as CloseIcon } from '@mui/icons-material';
+import CloseIcon from '@iconify-icons/mdi/close';
+import { Icon } from '@iconify/react';
 import { styled } from '../Theme';
 
 export default function UserPopper({ anchorEl, dark, children, open, onClose, autoClose }) {
@@ -43,7 +44,7 @@ export default function UserPopper({ anchorEl, dark, children, open, onClose, au
                 size="small"
                 sx={{ cursor: 'pointer', position: 'absolute', right: 0, top: 0, zIndex: 1 }}
                 onClick={onClose}>
-                <CloseIcon />
+                <Icon icon={CloseIcon} width={20} height={20} />
               </IconButton>
               {children}
             </>
@@ -75,8 +76,7 @@ const StyledPopper = styled(Popper)`
     return theme.zIndex.tooltip;
   }};
   .MuiList-root {
-    /* HACK: 需要288px 才能将 did 展示完整 */
-    width: 290px;
+    width: 320px;
   }
   .session-manager-user {
     font-size: 12px;
@@ -93,38 +93,8 @@ const StyledPopper = styled(Popper)`
     align-items: center;
     justify-content: space-between;
   }
-  .session-manager-id-item {
-    position: relative;
-    padding-left: 8px;
-    /* HACK: 当前元素既是第一个，也是最后一个，即只有一个同级元素 */
-    &:first-of-type:last-of-type {
-      padding-left: 0;
-      &:before,
-      &:after {
-        content: unset;
-      }
-    }
-    &:before {
-      position: absolute;
-      content: '';
-      left: 0px;
-      top: 50%;
-      width: 6px;
-      height: 1px;
-      background-color: #aeaeae;
-    }
-    &:not(:last-of-type):after {
-      position: absolute;
-      content: '';
-      left: 0px;
-      top: 50%;
-      height: 100%;
-      width: 1px;
-      background-color: #aeaeae;
-    }
-  }
   .session-manager-menu-item {
-    padding: 18.5px 24px;
+    padding: 18px 20px;
     color: #777;
     font-size: 16px;
     &:hover {
@@ -133,6 +103,6 @@ const StyledPopper = styled(Popper)`
   }
   .session-manager-menu-icon {
     color: #999;
-    margin-right: 16px;
+    margin-right: 8px;
   }
 `;

package/src/SessionManager/utils.js

@@ -0,0 +1,3 @@
+export const getSourceProvider = (user) => user?.sourceProvider || user?.extraConfigs?.sourceProvider || 'wallet';
+
+export const getConnectedAccounts = (user) => user?.connectedAccounts || user?.extraConfigs?.connectedAccounts || [];

package/src/Util/index.js

@@ -324,3 +324,11 @@ export const getUserAvatar = (avatar, size = 48) => {
 
   return avatar;
 };
+
+export const sleep = (time = 0) => {
+  return new Promise((resolve) => {
+    setTimeout(() => {
+      resolve();
+    }, time);
+  });
+};