@blocklet/ui-react 2.10.74 → 2.10.75

package/lib/UserCenter/components/third-party-login/third-party-item.js

@@ -67,6 +67,7 @@ export default function ThirdPartyItem({
               }).then(resolve).catch(reject);
               close();
             },
+            // @ts-ignore
             onCancel: resolve
           });
         } else {

package/lib/UserCenter/components/user-info/user-basic-info.js

@@ -147,10 +147,7 @@ export default function UserBasicInfo({
                   {
                     title: !loading && translate(translations, "refreshProfile.title", locale),
                     sx: { display: "flex", alignItems: "center" },
-                    children: loading ? (
-                      // @ts-expect-error
-                      /* @__PURE__ */ jsx(CircularProgress, { size: "16px", sx: { color: theme?.colors?.primary, ml: 0.5 } })
-                    ) : /* @__PURE__ */ jsx(RefreshOutlinedIcon, { onClick: refreshProfile })
+                    children: loading ? /* @__PURE__ */ jsx(CircularProgress, { size: "16px", sx: { color: theme?.colors?.primary, ml: 0.5 } }) : /* @__PURE__ */ jsx(RefreshOutlinedIcon, { onClick: refreshProfile })
                   }
                 )
               ] }) : null

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

@@ -10,6 +10,8 @@ import { getVisitorId } from "@arcblock/ux/lib/Util";
 import { useConfirm } from "@arcblock/ux/lib/Dialog";
 import pAll from "p-all";
 import { Box, Button, Tooltip, Typography } from "@mui/material";
+import { useContext } from "react";
+import { SessionContext } from "@arcblock/did-connect/lib/Session";
 import UserSessionInfo from "./user-session-info.js";
 import { client } from "../../libs/client.js";
 import { translations } from "../libs/locales.js";
@@ -27,6 +29,7 @@ export default function UserSessions({
   showAction = true,
   showUser = true
 }) {
+  const { session } = useContext(SessionContext);
   const currentVisitorId = getVisitorId();
   const { locale } = useLocaleContext();
   const { confirmApi, confirmHolder } = useConfirm();
@@ -34,11 +37,11 @@ export default function UserSessions({
     return translate(translations, key, locale, "en", data);
   });
   const getData = useMemoizedFn(async () => {
-    let data = user?.userSessions;
-    if (!data) {
-      data = await client.userSession.getUserSessions({ did: user.did });
-    }
+    let data = user?.userSessions || [];
     try {
+      if (!data && session.user) {
+        data = await client.userSession.getUserSessionsByMyself();
+      }
       const ipIndexList = data?.map((x, index) => [index, x.lastLoginIp]).filter((x) => !!x[1]);
       const ipList = ipIndexList?.map((x) => x[1]);
       const result = await batchIp2Region(ipList);
@@ -187,10 +190,7 @@ export default function UserSessions({
       options: {
         customBodyRenderLite: (rawIndex) => {
           const x = safeData[rawIndex];
-          return x.createdAt ? (
-            // @ts-expect-error
-            /* @__PURE__ */ jsx(RelativeTime, { value: x.createdAt, relativeRange: 3 * 86400 * 1e3, locale })
-          ) : t("unknown");
+          return x.createdAt ? /* @__PURE__ */ jsx(RelativeTime, { value: x.createdAt, relativeRange: 3 * 86400 * 1e3, locale }) : t("unknown");
         }
       }
     },
@@ -200,10 +200,7 @@ export default function UserSessions({
       options: {
         customBodyRenderLite: (rawIndex) => {
           const x = safeData[rawIndex];
-          return x.status === "expired" ? t("expired") : (
-            // @ts-expect-error
-            /* @__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 });
         }
       }
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.10.74",
+  "version": "2.10.75",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -32,9 +32,9 @@
     "url": "https://github.com/ArcBlock/ux/issues"
   },
   "dependencies": {
-    "@arcblock/bridge": "^2.10.74",
-    "@arcblock/react-hooks": "^2.10.74",
-    "@blocklet/did-space-react": "^0.5.72",
+    "@arcblock/bridge": "^2.10.75",
+    "@arcblock/react-hooks": "^2.10.75",
+    "@blocklet/did-space-react": "^0.5.75",
     "@iconify-icons/logos": "^1.2.36",
     "@iconify-icons/material-symbols": "^1.2.58",
     "@iconify/react": "^4.1.1",
@@ -80,5 +80,5 @@
     "jest": "^29.7.0",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "e9ebc573e8c38bc82a6c2a1ff58bae932dd59ec6"
+  "gitHead": "9e8d12bef56d3cd933ef1cb3a7209068de448dbb"
 }

package/src/UserCenter/components/third-party-login/third-party-item.tsx

@@ -85,6 +85,7 @@ export default function ThirdPartyItem({
                 .catch(reject);
               close();
             },
+            // @ts-ignore
             onCancel: resolve,
           });
         } else {

package/src/UserCenter/components/user-info/user-basic-info.tsx

@@ -157,7 +157,6 @@ export default function UserBasicInfo({
                 title={!loading && translate(translations, 'refreshProfile.title', locale)}
                 sx={{ display: 'flex', alignItems: 'center' }}>
                 {loading ? (
-                  // @ts-expect-error
                   <CircularProgress size="16px" sx={{ color: theme?.colors?.primary, ml: 0.5 }} />
                 ) : (
                   <RefreshOutlinedIcon onClick={refreshProfile} />

package/src/UserSessions/components/user-session-info.tsx

@@ -21,7 +21,6 @@ export default function UserSessionInfo({ user, sessionUser }: { readonly user:
         size={40}
         variant="circle"
         shape="circle"
-        // @ts-expect-error
         src={sessionUser.avatar}
         did={sessionUser.did}
         sx={{ flexShrink: 0 }}

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

@@ -11,11 +11,12 @@ import { getVisitorId } from '@arcblock/ux/lib/Util';
 import { useConfirm } from '@arcblock/ux/lib/Dialog';
 import pAll from 'p-all';
 import { Box, Button, Tooltip, Typography } from '@mui/material';
-import { ReactElement } from 'react';
+import { ReactElement, useContext } from 'react';
 import { UserSession } from '@blocklet/js-sdk';
+import { SessionContext } from '@arcblock/did-connect/lib/Session';
 
 import UserSessionInfo from './user-session-info';
-import { User } from '../../@types';
+import { User, SessionContext as TSessionContext } from '../../@types';
 import { client } from '../../libs/client';
 import { translations } from '../libs/locales';
 import { batchIp2Region } from '../libs/utils';
@@ -40,6 +41,7 @@ export default function UserSessions({
   readonly showAction?: boolean;
   readonly showUser?: boolean;
 }) {
+  const { session } = useContext<TSessionContext>(SessionContext);
   const currentVisitorId = getVisitorId();
   const { locale } = useLocaleContext();
   const { confirmApi, confirmHolder } = useConfirm();
@@ -47,11 +49,12 @@ export default function UserSessions({
     return translate(translations, key, locale, 'en', data);
   });
   const getData: () => Promise<(UserSession & { ipRegion?: string })[]> = useMemoizedFn(async () => {
-    let data = user?.userSessions as (UserSession & { ipRegion?: string })[];
-    if (!data) {
-      data = await client.userSession.getUserSessions({ did: user.did });
-    }
+    let data = (user?.userSessions || []) as (UserSession & { ipRegion?: string })[];
     try {
+      if (!data && session.user) {
+        data = await client.userSession.getUserSessionsByMyself();
+      }
+      // FIXME: @zhanghan 优化获取 IP 信息的处理逻辑
       const ipIndexList = data?.map((x, index) => [index, x.lastLoginIp] as [number, string]).filter((x) => !!x[1]);
       const ipList = ipIndexList?.map((x) => x[1]);
       const result = await batchIp2Region(ipList);
@@ -209,7 +212,6 @@ export default function UserSessions({
         customBodyRenderLite: (rawIndex: number) => {
           const x = safeData[rawIndex];
           return x.createdAt ? (
-            // @ts-expect-error
             <RelativeTime value={x.createdAt} relativeRange={3 * 86400 * 1000} locale={locale} />
           ) : (
             t('unknown')
@@ -226,7 +228,6 @@ export default function UserSessions({
           return x.status === 'expired' ? (
             t('expired')
           ) : (
-            // @ts-expect-error
             <RelativeTime value={x.updatedAt} relativeRange={3 * 86400 * 1000} locale={locale} />
           );
         },
@@ -299,7 +300,9 @@ export default function UserSessions({
       <Datatable
         locale={locale}
         data={safeData}
+        // @ts-expect-error
         columns={columns}
+        // @ts-expect-error
         customButtons={customButtons}
         options={tableOptions}
         loading={pageState.loading}

package/lib/UserCenter/libs/api.d.ts

@@ -1,3 +0,0 @@
-import axios from 'axios';
-declare const api: import("axios").AxiosInstance;
-export { axios, api };

package/lib/UserCenter/libs/api.js

@@ -1,4 +0,0 @@
-import axios from "axios";
-axios.defaults.timeout = 10 * 1e3;
-const api = axios.create();
-export { axios, api };

package/src/UserCenter/libs/api.ts

@@ -1,7 +0,0 @@
-import axios from 'axios';
-
-axios.defaults.timeout = 10 * 1000; // 超时时间设为10s
-
-const api = axios.create();
-
-export { axios, api };