@blocklet/ui-react 2.9.59 → 2.9.61

package/es/UserSessions/components/user-sessions.js

@@ -178,13 +178,26 @@ export default function UserSessions({
         }
       }
     },
+    {
+      label: t("createdAt"),
+      name: "createdAt",
+      options: {
+        customBodyRenderLite: (rawIndex) => {
+          const x = safeData[rawIndex];
+          return x.createdAt ? (
+            // @ts-ignore FIXME: @zhanghan 新版 js-sdk 会提供这个属性的提示
+            /* @__PURE__ */ jsx(RelativeTime, { value: x.createdAt, relativeRange: 3 * 86400 * 1e3, locale })
+          ) : t("unknown");
+        }
+      }
+    },
     {
       label: t("updatedAt"),
       name: "updatedAt",
       options: {
         customBodyRenderLite: (rawIndex) => {
           const x = safeData[rawIndex];
-          return /* @__PURE__ */ jsx(RelativeTime, { value: x.updatedAt, relativeRange: 3 * 86400 * 1e3, locale });
+          return x.status === "expired" ? t("expired") : /* @__PURE__ */ jsx(RelativeTime, { value: x.updatedAt, relativeRange: 3 * 86400 * 1e3, locale });
         }
       }
     },
@@ -220,7 +233,7 @@ export default function UserSessions({
               size: "small",
               color: "error",
               onClick: () => logout({ visitorId: x.visitorId }),
-              children: currentVisitorId === x.visitorId ? t("currentSession") : t("logout")
+              children: x.status === "expired" ? t("remove") : currentVisitorId === x.visitorId ? t("currentSession") : t("logout")
             }
           ) });
         }

package/es/UserSessions/libs/locales.d.ts

@@ -11,6 +11,7 @@ export declare const translations: {
         email: string;
         avatar: string;
         user: string;
+        createdAt: string;
         updatedAt: string;
         lastLoginIp: string;
         actions: string;
@@ -19,6 +20,8 @@ export declare const translations: {
         logout: string;
         currentSession: string;
         unknown: string;
+        expired: string;
+        remove: string;
         logoutThisSession: string;
         logoutThisSessionConfirm: string;
         logoutAllSession: string;
@@ -36,6 +39,7 @@ export declare const translations: {
         email: string;
         avatar: string;
         user: string;
+        createdAt: string;
         updatedAt: string;
         actions: string;
         lastLoginIp: string;
@@ -44,6 +48,8 @@ export declare const translations: {
         logout: string;
         currentSession: string;
         unknown: string;
+        expired: string;
+        remove: string;
         logoutThisSession: string;
         logoutThisSessionConfirm: string;
         logoutAllSession: string;

package/es/UserSessions/libs/locales.js

@@ -11,6 +11,7 @@ export const translations = {
     email: "\u90AE\u7BB1",
     avatar: "\u5934\u50CF",
     user: "\u7528\u6237",
+    createdAt: "\u9996\u6B21\u6D3B\u52A8\u65F6\u95F4",
     updatedAt: "\u6700\u8FD1\u6D3B\u52A8\u65F6\u95F4",
     lastLoginIp: "\u6700\u8FD1\u6D3B\u52A8\u5730\u5740",
     actions: "\u64CD\u4F5C",
@@ -19,6 +20,8 @@ export const translations = {
     logout: "\u6CE8\u9500",
     currentSession: "\u5F53\u524D\u4F1A\u8BDD",
     unknown: "\u672A\u77E5",
+    expired: "\u5DF2\u8FC7\u671F",
+    remove: "\u5220\u9664",
     logoutThisSession: "\u6CE8\u9500\u6307\u5B9A\u4F1A\u8BDD",
     logoutThisSessionConfirm: "\u786E\u5B9A\u8981\u6CE8\u9500\u6B64\u4F1A\u8BDD\u5417?",
     logoutAllSession: "\u6CE8\u9500\u6240\u6709\u4F1A\u8BDD",
@@ -36,6 +39,7 @@ export const translations = {
     email: "Email",
     avatar: "Avatar",
     user: "User",
+    createdAt: "First Active Time",
     updatedAt: "Last Active Time",
     actions: "Actions",
     lastLoginIp: "Last Login IP",
@@ -44,6 +48,8 @@ export const translations = {
     logout: "Logout",
     currentSession: "Current Session",
     unknown: "Unknown",
+    expired: "Expired",
+    remove: "Remove",
     logoutThisSession: "Logout this session",
     logoutThisSessionConfirm: "Are you sure to logout this session?",
     logoutAllSession: "Logout all sessions",

package/lib/UserSessions/components/user-sessions.js

@@ -202,13 +202,29 @@ function UserSessions({
         });
       }
     }
+  }, {
+    label: t("createdAt"),
+    name: "createdAt",
+    options: {
+      customBodyRenderLite: rawIndex => {
+        const x = safeData[rawIndex];
+        return x.createdAt ?
+        // @ts-ignore FIXME: @zhanghan 新版 js-sdk 会提供这个属性的提示
+        /* @__PURE__ */
+        (0, _jsxRuntime.jsx)(_RelativeTime.default, {
+          value: x.createdAt,
+          relativeRange: 3 * 86400 * 1e3,
+          locale
+        }) : t("unknown");
+      }
+    }
   }, {
     label: t("updatedAt"),
     name: "updatedAt",
     options: {
       customBodyRenderLite: rawIndex => {
         const x = safeData[rawIndex];
-        return /* @__PURE__ */(0, _jsxRuntime.jsx)(_RelativeTime.default, {
+        return x.status === "expired" ? t("expired") : /* @__PURE__ */(0, _jsxRuntime.jsx)(_RelativeTime.default, {
           value: x.updatedAt,
           relativeRange: 3 * 86400 * 1e3,
           locale
@@ -257,7 +273,7 @@ function UserSessions({
             onClick: () => logout({
               visitorId: x.visitorId
             }),
-            children: currentVisitorId === x.visitorId ? t("currentSession") : t("logout")
+            children: x.status === "expired" ? t("remove") : currentVisitorId === x.visitorId ? t("currentSession") : t("logout")
           })
         });
       }

package/lib/UserSessions/libs/locales.d.ts

@@ -11,6 +11,7 @@ export declare const translations: {
         email: string;
         avatar: string;
         user: string;
+        createdAt: string;
         updatedAt: string;
         lastLoginIp: string;
         actions: string;
@@ -19,6 +20,8 @@ export declare const translations: {
         logout: string;
         currentSession: string;
         unknown: string;
+        expired: string;
+        remove: string;
         logoutThisSession: string;
         logoutThisSessionConfirm: string;
         logoutAllSession: string;
@@ -36,6 +39,7 @@ export declare const translations: {
         email: string;
         avatar: string;
         user: string;
+        createdAt: string;
         updatedAt: string;
         actions: string;
         lastLoginIp: string;
@@ -44,6 +48,8 @@ export declare const translations: {
         logout: string;
         currentSession: string;
         unknown: string;
+        expired: string;
+        remove: string;
         logoutThisSession: string;
         logoutThisSessionConfirm: string;
         logoutAllSession: string;

package/lib/UserSessions/libs/locales.js

@@ -17,6 +17,7 @@ const translations = exports.translations = {
     email: "\u90AE\u7BB1",
     avatar: "\u5934\u50CF",
     user: "\u7528\u6237",
+    createdAt: "\u9996\u6B21\u6D3B\u52A8\u65F6\u95F4",
     updatedAt: "\u6700\u8FD1\u6D3B\u52A8\u65F6\u95F4",
     lastLoginIp: "\u6700\u8FD1\u6D3B\u52A8\u5730\u5740",
     actions: "\u64CD\u4F5C",
@@ -25,6 +26,8 @@ const translations = exports.translations = {
     logout: "\u6CE8\u9500",
     currentSession: "\u5F53\u524D\u4F1A\u8BDD",
     unknown: "\u672A\u77E5",
+    expired: "\u5DF2\u8FC7\u671F",
+    remove: "\u5220\u9664",
     logoutThisSession: "\u6CE8\u9500\u6307\u5B9A\u4F1A\u8BDD",
     logoutThisSessionConfirm: "\u786E\u5B9A\u8981\u6CE8\u9500\u6B64\u4F1A\u8BDD\u5417?",
     logoutAllSession: "\u6CE8\u9500\u6240\u6709\u4F1A\u8BDD",
@@ -42,6 +45,7 @@ const translations = exports.translations = {
     email: "Email",
     avatar: "Avatar",
     user: "User",
+    createdAt: "First Active Time",
     updatedAt: "Last Active Time",
     actions: "Actions",
     lastLoginIp: "Last Login IP",
@@ -50,6 +54,8 @@ const translations = exports.translations = {
     logout: "Logout",
     currentSession: "Current Session",
     unknown: "Unknown",
+    expired: "Expired",
+    remove: "Remove",
     logoutThisSession: "Logout this session",
     logoutThisSessionConfirm: "Are you sure to logout this session?",
     logoutAllSession: "Logout all sessions",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.9.59",
+  "version": "2.9.61",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -62,9 +62,9 @@
     }
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.9.59",
-    "@arcblock/react-hooks": "^2.9.59",
-    "@arcblock/ux": "^2.9.59",
+    "@arcblock/did-connect": "^2.9.61",
+    "@arcblock/react-hooks": "^2.9.61",
+    "@arcblock/ux": "^2.9.61",
     "@blocklet/js-sdk": "1.16.25-beta-be3a37f4",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -108,5 +108,5 @@
     "jest": "^28.1.3",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "686579a3c6f29287149a7cb9bb15ba826bda153a"
+  "gitHead": "2349446884f18459b909c2dfe32f4411554f83da"
 }

package/src/UserSessions/components/user-sessions.tsx

@@ -1,3 +1,4 @@
+/* eslint-disable no-nested-ternary */
 /* eslint-disable react/no-unstable-nested-components */
 import Datatable from '@arcblock/ux/lib/Datatable';
 import { useCreation, useMemoizedFn, useRequest } from 'ahooks';
@@ -194,13 +195,34 @@ export default function UserSessions({
         },
       },
     },
+    {
+      label: t('createdAt'),
+      name: 'createdAt',
+      options: {
+        customBodyRenderLite: (rawIndex: number) => {
+          const x = safeData[rawIndex];
+          // @ts-ignore FIXME: @zhanghan 新版 js-sdk 会提供这个属性的提示
+          return x.createdAt ? (
+            // @ts-ignore FIXME: @zhanghan 新版 js-sdk 会提供这个属性的提示
+            <RelativeTime value={x.createdAt} relativeRange={3 * 86400 * 1000} locale={locale} />
+          ) : (
+            t('unknown')
+          );
+        },
+      },
+    },
     {
       label: t('updatedAt'),
       name: 'updatedAt',
       options: {
         customBodyRenderLite: (rawIndex: number) => {
           const x = safeData[rawIndex];
-          return <RelativeTime value={x.updatedAt} relativeRange={3 * 86400 * 1000} locale={locale} />;
+          // @ts-ignore FIXME: @zhanghan 新版 js-sdk 会提供这个属性的提示
+          return x.status === 'expired' ? (
+            t('expired')
+          ) : (
+            <RelativeTime value={x.updatedAt} relativeRange={3 * 86400 * 1000} locale={locale} />
+          );
         },
       },
     },
@@ -246,7 +268,12 @@ export default function UserSessions({
                 size="small"
                 color="error"
                 onClick={() => logout({ visitorId: x.visitorId })}>
-                {currentVisitorId === x.visitorId ? t('currentSession') : t('logout')}
+                {/* @ts-ignore FIXME: @zhanghan 新版 js-sdk 会提供这个属性的提示 */}
+                {x.status === 'expired'
+                  ? t('remove')
+                  : currentVisitorId === x.visitorId
+                  ? t('currentSession')
+                  : t('logout')}
               </Button>
             </Box>
           );

package/src/UserSessions/libs/locales.ts

@@ -11,6 +11,7 @@ export const translations = {
     email: '邮箱',
     avatar: '头像',
     user: '用户',
+    createdAt: '首次活动时间',
     updatedAt: '最近活动时间',
     lastLoginIp: '最近活动地址',
     actions: '操作',
@@ -19,6 +20,8 @@ export const translations = {
     logout: '注销',
     currentSession: '当前会话',
     unknown: '未知',
+    expired: '已过期',
+    remove: '删除',
     logoutThisSession: '注销指定会话',
     logoutThisSessionConfirm: '确定要注销此会话吗?',
     logoutAllSession: '注销所有会话',
@@ -36,6 +39,7 @@ export const translations = {
     email: 'Email',
     avatar: 'Avatar',
     user: 'User',
+    createdAt: 'First Active Time',
     updatedAt: 'Last Active Time',
     actions: 'Actions',
     lastLoginIp: 'Last Login IP',
@@ -44,6 +48,8 @@ export const translations = {
     logout: 'Logout',
     currentSession: 'Current Session',
     unknown: 'Unknown',
+    expired: 'Expired',
+    remove: 'Remove',
     logoutThisSession: 'Logout this session',
     logoutThisSessionConfirm: 'Are you sure to logout this session?',
     logoutAllSession: 'Logout all sessions',