@abtnode/ux 1.16.25-beta-e3dbef52 → 1.16.25-beta-be3a37f4

package/es/team/members/index.js

@@ -1,17 +1,15 @@
 /* eslint-disable react/no-unstable-nested-components */
 /* eslint-disable jsx-a11y/aria-role */
-import { useContext, useState, useEffect } from 'react';
+import { useContext, useState, useEffect, useRef } from 'react';
 import styled from '@emotion/styled';
 import isEmpty from 'lodash/isEmpty';
 import PropTypes from 'prop-types';
 import classnames from 'classnames';
-import Dialog from '@arcblock/ux/lib/Dialog';
-import Tooltip from '@mui/material/Tooltip';
-import Box from '@mui/material/Box';
-import FormControlLabel from '@mui/material/FormControlLabel';
-import Checkbox from '@mui/material/Checkbox';
+import { Badge, IconButton, Tooltip, Checkbox, Box, FormControlLabel } from '@mui/material';
+import Dialog, { useConfirm } from '@arcblock/ux/lib/Dialog';
 import AddIcon from '@mui/icons-material/Add';
 import LoopIcon from '@mui/icons-material/Loop';
+import ViewListIcon from '@mui/icons-material/ViewList';
 import Avatar from '@arcblock/did-connect/lib/Avatar';
 import { LocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Button from '@arcblock/ux/lib/Button';
@@ -20,11 +18,12 @@ import ExternalIssuerIcon from '@arcblock/icons/lib/ExternalIssuerIcon';
 import { getTextColor } from '@abtnode/auth/lib/util/create-passport-svg';
 import Datatable, { getDurableData } from '@arcblock/ux/lib/Datatable';
 import RelativeTime from '@arcblock/ux/lib/RelativeTime';
+import Toast from '@arcblock/ux/lib/Toast';
 import { USER_TYPE } from '@abtnode/constant';
 import { TeamEvents } from '@blocklet/constant';
 import useUrlState from '@ahooksjs/use-url-state';
-import { useMount } from 'ahooks';
-import Toast from '@arcblock/ux/lib/Toast';
+import { useMemoizedFn, useMount } from 'ahooks';
+import { UserSessions } from '@blocklet/ui-react';
 import Tag from '../../tag';
 import DidAddress from '../../did-address';
 import { useNodeContext } from '../../contexts/node';
@@ -116,6 +115,29 @@ export default function MemberList({
   type,
   createPassportSvg
 }) {
+  const {
+    confirmApi,
+    confirmHolder
+  } = useConfirm({
+    sx: {
+      '.MuiDialog-paper': {
+        borderRadius: 2,
+        maxWidth: 1000
+      },
+      '.ux-dialog_title': {
+        fontWeight: 600
+      },
+      '.ux-dialog_closeButton': {
+        p: 1
+      },
+      '.MuiDialogActions-root': {
+        display: {
+          xs: 'none',
+          md: 'flex'
+        }
+      }
+    }
+  });
   const {
     appIdList = []
   } = useBlockletContext();
@@ -188,7 +210,8 @@ export default function MemberList({
   });
   const getUsers = () => {
     const query = {
-      includeTags: true
+      includeTags: true,
+      includeUserSessions: type === 'blocklet'
     };
     if (search.hideBlocked) {
       query.approved = true;
@@ -245,6 +268,21 @@ export default function MemberList({
   useSubscription(TeamEvents.userUpdated, handleUserChange, [search]);
   useSubscription(TeamEvents.userAdded, handleUserChange, [search]);
   const isInvitationEnabled = enablePassportIssuance;
+  const openUserSessions = useMemoizedFn(user => {
+    confirmApi.open({
+      title: 'User Sessions',
+      content: /*#__PURE__*/_jsx(UserSessions, {
+        user: user,
+        showAction: false,
+        showUser: false
+      }),
+      onConfirm() {
+        confirmApi.close();
+      },
+      confirmButtonText: t('common.close'),
+      showCancelButton: false
+    });
+  });
   const columns = [{
     label: t('common.name'),
     name: 'fullName',
@@ -310,6 +348,32 @@ export default function MemberList({
         return providerName;
       }
     }
+  }, type === 'blocklet' && {
+    label: t('team.member.activeUserSessions'),
+    name: 'userSessions',
+    options: {
+      customBodyRenderLite: rowIndex => {
+        const user = users[rowIndex];
+        return /*#__PURE__*/_jsx(IconButton, {
+          onClick: e => {
+            e.stopPropagation();
+            openUserSessions(user);
+          },
+          children: /*#__PURE__*/_jsx(Badge, {
+            badgeContent: user?.userSessions?.length,
+            color: user?.userSessions?.length > 0 ? 'primary' : 'default',
+            sx: user?.userSessions?.length > 0 ? {} : {
+              '.MuiBadge-badge': {
+                backgroundColor: 'grey',
+                color: 'white'
+              }
+            },
+            showZero: true,
+            children: /*#__PURE__*/_jsx(ViewListIcon, {})
+          })
+        });
+      }
+    }
   }, {
     label: t('common.actions'),
     name: '',
@@ -323,16 +387,20 @@ export default function MemberList({
           permission: inService ? '' : 'mutate_team',
           role: inService ? BlockletAdminRoles : [],
           children: /*#__PURE__*/_jsx(Actions, {
+            type: type,
             user: x,
             onIssuePassport: () => setMemberDialog({
               ...x,
               initTab: 'issuances'
+            }),
+            onRefresh: () => handleUserChange({
+              teamDid
             })
           })
         });
       }
     }
-  }];
+  }].filter(Boolean);
   const customButtons = [];
   if (isInvitationEnabled) {
     customButtons.push( /*#__PURE__*/_jsxs(Button, {
@@ -440,17 +508,20 @@ export default function MemberList({
       }));
     }
   };
+  const datatableRef = useRef(null);
   const tableOptions = {
     sort: false,
     download: false,
     filter: false,
     print: false,
     expandableRowsOnClick: true,
-    onRowClick(e, {
+    onRowClick(row, {
       dataIndex
-    }) {
-      const x = users[dataIndex];
-      setMemberDialog(x);
+    }, e) {
+      if (datatableRef.current?.contains(e.target)) {
+        const x = users[dataIndex];
+        setMemberDialog(x);
+      }
     },
     page: search.page - 1,
     rowsPerPage: search.pageSize,
@@ -458,7 +529,7 @@ export default function MemberList({
     searchDebounceTime: 600
   };
   return /*#__PURE__*/_jsxs(Div, {
-    children: [/*#__PURE__*/_jsxs(Box, {
+    children: [confirmHolder, /*#__PURE__*/_jsxs(Box, {
       className: "main",
       display: "flex",
       sx: {
@@ -483,6 +554,7 @@ export default function MemberList({
           }, x.name))
         })
       }), /*#__PURE__*/_jsx("div", {
+        ref: datatableRef,
         className: "right",
         children: /*#__PURE__*/_jsx(Datatable, {
           className: "main-table",

package/lib/actions.js

@@ -66,7 +66,9 @@ function Actions(_ref) {
       keepMounted: true,
       open: open,
       onClose: onClose,
-      PaperProps: {},
+      slotProps: {
+        paper: {}
+      },
       children: actions.map((action, index) => {
         if (typeof action === 'function') {
           return action({

package/lib/blocklet/actions.js

@@ -342,13 +342,17 @@ function BlockletActions(_ref) {
     name: t('common.restart'),
     handler: createHandler('restart', node.api.restartBlocklet, true),
     disabled: disableStart || blocklet.status !== 'running'
-  }, {
-    action: 'reload',
-    icon: _icons.default.Reload,
-    name: t('common.reload'),
-    handler: createHandler('reload', node.api.reloadBlocklet),
-    disabled: disableStart || blocklet.status !== 'running'
-  }, (0, _util2.isDownloading)(blocklet.status) ? cancelDownloadAction : removeAction, {
+  },
+  // hidden reload: https://github.com/ArcBlock/blocklet-server/issues/8655
+  // {
+  //   action: 'reload',
+  //   icon: Icons.Reload,
+  //   name: t('common.reload'),
+  //   handler: createHandler('reload', node.api.reloadBlocklet),
+  //   disabled: disableStart || blocklet.status !== 'running',
+  // },
+
+  (0, _util2.isDownloading)(blocklet.status) ? cancelDownloadAction : removeAction, {
     separator: true
   }, {
     onlyInMenu: true,

package/lib/locales/ar.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: 'وثيقة المساعدة',
       componentIncluded: 'مدرج',
       componentForceRequired: 'مجبر مطلوب'
-    }
+    },
+    titleValidationError: 'يجب أن يكون طول العنوان على الأقل 3 أحرف',
+    descriptionValidationError: 'يجب أن تكون طول الوصف بين 3 و 160 حرفًا'
   },
   dashboard: {
     nodeDid: 'عقدة',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'عنوان URL مخصص',
         slack: 'خطاف سلاك',
         tested: 'تم إرسال رسالة تجريبية'
-      }
+      },
+      activeUserSessions: 'جلسات المستخدم النشطة',
+      forceLogout: 'تسجيل الخروج القسري',
+      forceLogoutDescription: 'هل تؤكد تسجيل خروج هذا المستخدم؟'
     },
     transferNode: {
       name: 'تحويل الملكية',

package/lib/locales/de.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: 'Hilfe-Dokument',
       componentIncluded: 'Eingeschlossen',
       componentForceRequired: 'Erzwungen Erforderlich'
-    }
+    },
+    titleValidationError: 'Die Länge des Titels muss mindestens 3 Zeichen betragen',
+    descriptionValidationError: 'Die Beschreibungslänge muss zwischen 3 und 160 Zeichen liegen'
   },
   dashboard: {
     nodeDid: 'Knoten',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'Benutzerdefinierte URL',
         slack: 'Slack-Webhook',
         tested: 'Testnachricht gesendet'
-      }
+      },
+      activeUserSessions: 'Aktive Benutzersitzungen',
+      forceLogout: 'Erzwungenes Abmelden',
+      forceLogoutDescription: 'Bestätigen Sie die erzwungene Abmeldung dieses Benutzers?'
     },
     transferNode: {
       name: 'Änderung des Eigentums',

package/lib/locales/en.js

@@ -356,6 +356,8 @@ var _default = exports.default = {
     installFromMarket: 'Install New Blocklets',
     installFromUrl: 'Install From Url',
     installFromCreate: 'Create Blocklet',
+    titleValidationError: 'Title length must be between 3 and 40 characters',
+    descriptionValidationError: 'Description length must be between 3 and 160 characters',
     installFromDiskBackup: 'Restore from this server',
     installedAt: 'Installed At',
     internal: 'Internal',
@@ -1188,7 +1190,10 @@ var _default = exports.default = {
         url: 'Custom URL',
         slack: 'Slack Webhook',
         tested: 'Test message sent'
-      }
+      },
+      activeUserSessions: 'Active User Sessions',
+      forceLogout: 'Force logout',
+      forceLogoutDescription: 'Confirm to force logout this user?'
     },
     transferNode: {
       name: 'Transfer Ownership',

package/lib/locales/es.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: 'Ayuda Documento',
       componentIncluded: 'Incluido',
       componentForceRequired: 'Obligatorio Requerido'
-    }
+    },
+    titleValidationError: 'La longitud del título debe ser de al menos 3 caracteres',
+    descriptionValidationError: 'La longitud de la descripción debe estar entre 3 y 160 caracteres'
   },
   dashboard: {
     nodeDid: 'Nodo',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'URL personalizada',
         slack: 'Slack Webhook',
         tested: 'Mensaje de prueba enviado'
-      }
+      },
+      activeUserSessions: 'Sesiones de usuario activas',
+      forceLogout: 'Cerrar sesión forzada',
+      forceLogoutDescription: '¿Confirmar para forzar el cierre de sesión de este usuario?'
     },
     transferNode: {
       name: 'Transferir propiedad',

package/lib/locales/fr.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: "Document d'aide",
       componentIncluded: 'Inclus',
       componentForceRequired: 'Forcé Requis'
-    }
+    },
+    titleValidationError: "La longueur du titre doit être d'au moins 3 caractères",
+    descriptionValidationError: 'La longueur de la description doit être comprise entre 3 et 160 caractères'
   },
   dashboard: {
     nodeDid: 'Noeud',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'URL personnalisée',
         slack: 'Webhook Slack',
         tested: 'Message de test envoyé'
-      }
+      },
+      activeUserSessions: "Sessions d'utilisateurs actives",
+      forceLogout: 'Déconnexion forcée',
+      forceLogoutDescription: 'Confirmez-vous la déconnexion forcée de cet utilisateur?'
     },
     transferNode: {
       name: 'Transfert de propriété',

package/lib/locales/hi.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: 'सहायता दस्तावेज़',
       componentIncluded: 'शामिल',
       componentForceRequired: 'मजबूरी आवश्यक'
-    }
+    },
+    titleValidationError: 'शीर्षक की लंबाई कम से कम 3 अक्षर होनी चाहिए',
+    descriptionValidationError: 'विवरण की लंबाई 3 और 160 वर्णों के बीच होनी चाहिए'
   },
   dashboard: {
     nodeDid: 'नोड',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'कस्टम URL',
         slack: 'स्लैक वेबहुक',
         tested: 'परीक्षण संदेश भेजा गया'
-      }
+      },
+      activeUserSessions: 'सक्रिय उपयोगकर्ता सत्र',
+      forceLogout: 'बाहर करें बल',
+      forceLogoutDescription: 'क्या आप इस उपयोगकर्ता को बाहर करने के लिए पुष्टि करें?'
     },
     transferNode: {
       name: 'स्वामित्व स्थानांतरण',

package/lib/locales/id.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: 'Dokumen Bantuan',
       componentIncluded: 'Termasuk',
       componentForceRequired: 'Dipaksa Diperlukan'
-    }
+    },
+    titleValidationError: 'Panjang judul harus setidaknya 3 karakter',
+    descriptionValidationError: 'Panjang deskripsi harus antara 3 dan 160 karakter.'
   },
   dashboard: {
     nodeDid: 'Node',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'URL kustom',
         slack: 'Slack Webhook',
         tested: 'Pesan uji terkirim'
-      }
+      },
+      activeUserSessions: 'Sesi Pengguna Aktif',
+      forceLogout: 'Keluar paksa',
+      forceLogoutDescription: 'Konfirmasi untuk logout paksa pengguna ini?'
     },
     transferNode: {
       name: 'Pindahkan Kepemilikan',

package/lib/locales/ja.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: 'ヘルプドキュメント',
       componentIncluded: '含まれています',
       componentForceRequired: '強制必要'
-    }
+    },
+    titleValidationError: 'タイトルの長さは最低3文字以上である必要があります',
+    descriptionValidationError: '説明の長さは3から160文字の間でなければなりません'
   },
   dashboard: {
     nodeDid: 'ノード',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'カスタムURL',
         slack: 'Slack Webhook',
         tested: 'テストメッセージを送信しました'
-      }
+      },
+      activeUserSessions: 'アクティブユーザーセッション',
+      forceLogout: '強制ログアウト',
+      forceLogoutDescription: 'このユーザーを強制的にログアウトしますか？'
     },
     transferNode: {
       name: '権限の移譲',

package/lib/locales/ko.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: '도움말 문서',
       componentIncluded: '포함됨',
       componentForceRequired: '강제 필수'
-    }
+    },
+    titleValidationError: '제목 길이는 최소 3자 이상이어야 합니다',
+    descriptionValidationError: '설명 길이는 3에서 160자 사이여야 합니다'
   },
   dashboard: {
     nodeDid: '노드',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: '사용자 정의 URL',
         slack: 'Slack Webhook',
         tested: '테스트 메시지가 전송되었습니다'
-      }
+      },
+      activeUserSessions: '활성 사용자 세션',
+      forceLogout: '강제 로그아웃',
+      forceLogoutDescription: '이 사용자를 강제로 로그아웃하시겠습니까?'
     },
     transferNode: {
       name: '소유권 이전',

package/lib/locales/pt.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: 'Documento de ajuda',
       componentIncluded: 'Incluído',
       componentForceRequired: 'Forçado Obrigatório'
-    }
+    },
+    titleValidationError: 'O comprimento do título deve ter pelo menos 3 caracteres',
+    descriptionValidationError: 'O comprimento da descrição deve estar entre 3 e 160 caracteres.'
   },
   dashboard: {
     nodeDid: 'Nó',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'URL personalizado',
         slack: 'Slack Webhook',
         tested: 'Mensagem de teste enviada'
-      }
+      },
+      activeUserSessions: 'Sessões de Usuários Ativos',
+      forceLogout: 'Logout forçado',
+      forceLogoutDescription: 'Confirmar o logout forçado deste usuário?'
     },
     transferNode: {
       name: 'Transferir Propriedade',

package/lib/locales/ru.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: 'Документация помощи',
       componentIncluded: 'Включено',
       componentForceRequired: 'Принудительно Требуется'
-    }
+    },
+    titleValidationError: 'Длина заголовка должна быть не менее 3 символов',
+    descriptionValidationError: 'Длина описания должна быть от 3 до 160 символов'
   },
   dashboard: {
     nodeDid: 'Узел',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'Пользовательский URL',
         slack: 'Слэк вебхук',
         tested: 'Тестовое сообщение отправлено'
-      }
+      },
+      activeUserSessions: 'Активные пользовательские сессии',
+      forceLogout: 'Принудительный выход',
+      forceLogoutDescription: 'Подтвердить выход из системы этого пользователя?'
     },
     transferNode: {
       name: 'Передача собственности',

package/lib/locales/th.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: 'เอกสารช่วยเหลือ',
       componentIncluded: 'รวมอยู่ใน',
       componentForceRequired: 'บังคับต้องการ'
-    }
+    },
+    titleValidationError: 'ความยาวของชื่อต้องมีอย่างน้อย 3 ตัวอักษร',
+    descriptionValidationError: 'ความยาวคำอธิบายต้องอยู่ระหว่าง 3 ถึง 160 ตัวอักษร.'
   },
   dashboard: {
     nodeDid: 'โหนด',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'URL ที่กำหนดเอง',
         slack: 'Slack Webhook',
         tested: 'ส่งข้อความทดสอบแล้ว'
-      }
+      },
+      activeUserSessions: 'เซสชันผู้ใช้ที่ใช้งานอยู่',
+      forceLogout: 'ออกจากระบบบังคับ',
+      forceLogoutDescription: 'ยืนยันให้ออกจากระบบผู้ใช้นี้หรือไม่?'
     },
     transferNode: {
       name: 'โอนสิทธิ์การเป็นเจ้าของ',

package/lib/locales/vi.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: 'Tài liệu giúp đỡ',
       componentIncluded: 'Bao gồm',
       componentForceRequired: 'Bắt Buộc Yêu Cầu'
-    }
+    },
+    titleValidationError: 'Độ dài tiêu đề phải ít nhất 3 ký tự',
+    descriptionValidationError: 'Chiều dài mô tả phải từ 3 đến 160 ký tự.'
   },
   dashboard: {
     nodeDid: 'Nút',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: 'URL tùy chỉnh',
         slack: 'Slack Webhook',
         tested: 'Tin nhắn kiểm tra đã được gửi'
-      }
+      },
+      activeUserSessions: 'Phiên người dùng hoạt động',
+      forceLogout: 'Đăng xuất bắt buộc',
+      forceLogoutDescription: 'Xác nhận đăng xuất buộc người dùng này?'
     },
     transferNode: {
       name: 'Chuyển quyền sở hữu',

package/lib/locales/zh-tw.js

@@ -693,7 +693,9 @@ var _default = exports.default = {
       installResourceHelp: '幫助文件',
       componentIncluded: '已包含',
       componentForceRequired: '強制要求'
-    }
+    },
+    titleValidationError: '標題長度必須至少為3到40個字符',
+    descriptionValidationError: '描述長度必須介於3到160個字符之間'
   },
   dashboard: {
     nodeDid: '節點',
@@ -1195,7 +1197,10 @@ var _default = exports.default = {
         url: '客製網址',
         slack: 'Slack Webhook',
         tested: '測試訊息已發送'
-      }
+      },
+      activeUserSessions: '活躍用戶會話',
+      forceLogout: '強制登出',
+      forceLogoutDescription: '確認是否強制登出此使用者？'
     },
     transferNode: {
       name: '轉讓所有權',

package/lib/locales/zh.js

@@ -696,7 +696,9 @@ var _default = exports.default = {
         noDescription: '请填写 Blocklet 描述',
         noNote: '请填写 发布说明'
       }
-    }
+    },
+    titleValidationError: '标题长度必须至少为3到40个字符',
+    descriptionValidationError: '描述长度必须在3到160个字符之间'
   },
   dashboard: {
     nodeDid: '节点地址',
@@ -1199,7 +1201,10 @@ var _default = exports.default = {
         url: '自定义 URL',
         slack: 'Slack 通知',
         tested: '测试消息已经发送'
-      }
+      },
+      activeUserSessions: '活跃用户会话',
+      forceLogout: '强制注销',
+      forceLogoutDescription: '确认是否强制退出此用户？'
     },
     transferNode: {
       name: '转移所有者',