@blocklet/did-space-react 1.0.13 → 1.0.15

package/dist/cjs/components/space-card/audit-log-bar.d.ts

@@ -1,4 +1,8 @@
-export declare function AuditLogBar({ endpoint, deps }: {
+import { DIDSpaceStatus } from '../../types';
+export interface AuditLogBarProps {
     endpoint: string;
+    spaceStatus: DIDSpaceStatus;
+    errorCode: number;
     deps?: any[];
-}): import("react/jsx-runtime").JSX.Element | null;
+}
+export declare function AuditLogBar({ endpoint, spaceStatus, errorCode, deps }: AuditLogBarProps): import("react/jsx-runtime").JSX.Element | null;

package/dist/cjs/components/space-card/audit-log-bar.js

@@ -4,19 +4,22 @@ const jsxRuntime = require('react/jsx-runtime');
 const material = require('@mui/material');
 const OpenInNewIcon = require('@mui/icons-material/OpenInNew');
 const ufo = require('ufo');
+const index = require('../../types/index.js');
 const util = require('../../libs/util.js');
 const useLocale = require('../../hooks/use-locale.js');
 const useAuditLog = require('../../hooks/use-audit-log.js');
 
-function AuditLogBar({ endpoint, deps = [] }) {
+function AuditLogBar({ endpoint, spaceStatus, errorCode, deps = [] }) {
   const { t } = useLocale();
   const { loading, data: auditLogs } = useAuditLog({
     endpoint,
+    spaceStatus,
+    errorCode,
     deps
   });
   const { baseUrl, spaceDid, appDid } = util.getSpaceEndpointContext(endpoint);
   const latestLog = auditLogs?.[0];
-  if (loading) {
+  if (loading || spaceStatus === index.DIDSpaceStatus.LOADING) {
     return /* @__PURE__ */ jsxRuntime.jsx(material.Skeleton, { variant: "text", sx: { width: "100%", fontSize: "1rem" } });
   }
   if (!latestLog) {

package/dist/cjs/components/space-card/index.js

@@ -99,7 +99,8 @@ function Status({
           ErrorLink,
           {
             title: t("storage.spaces.error.incompatible", {
-              spaceVersion,
+              spaceVersion: spaceVersion || " < 0.5.77",
+              // version 字段是在 0.5.77 版本添加的
               expectVersion
             }),
             url: ufo.joinURL(new URL(spaceUrl).origin, ".well-known/service/admin/components")
@@ -238,7 +239,7 @@ function DIDSpaceConnection({
     }
     return action;
   };
-  const originalFooter = /* @__PURE__ */ jsxRuntime.jsx(auditLogBar.AuditLogBar, { endpoint, deps: refreshDeps });
+  const originalFooter = /* @__PURE__ */ jsxRuntime.jsx(auditLogBar.AuditLogBar, { endpoint, spaceStatus: spaceStatus.current, errorCode, deps: refreshDeps });
   const renderFooter = () => {
     if (typeof footer === "function") {
       return footer({

package/dist/cjs/hooks/use-audit-log.d.ts

@@ -1,10 +1,13 @@
 import type { AuditLogModel } from '@did-space/core';
 import { AuditLogAction, AuditLogStatus } from '@did-space/core/model';
+import { DIDSpaceStatus } from '../types';
 export interface AuditLogModelExtra extends AuditLogModel {
     description: React.ReactNode;
 }
-export default function useAuditLog({ endpoint, size, status, actionType, deps, }: {
+export default function useAuditLog({ endpoint, spaceStatus, errorCode, size, status, actionType, deps, }: {
     endpoint: string;
+    spaceStatus: DIDSpaceStatus;
+    errorCode: number;
     size?: number;
     status?: AuditLogStatus | AuditLogStatus[];
     actionType?: AuditLogAction | AuditLogAction[];

package/dist/cjs/hooks/use-audit-log.js

@@ -5,11 +5,13 @@ const ahooks = require('ahooks');
 const model = require('@did-space/core/model');
 const ufo = require('ufo');
 const xbytes = require('xbytes');
+const constants = require('@did-space/core/constants');
 const api = require('../libs/api.js');
 const useLocale = require('./use-locale.js');
 const util = require('../libs/util.js');
+const index = require('../types/index.js');
 
-const TranslateKeyMap = {
+const translateKeyMap = {
   [model.AuditLogAction.APP_BACKUP]: {
     description: "auditLog.backup.description"
   },
@@ -26,11 +28,19 @@ const TranslateKeyMap = {
     description: "auditLog.objectsSync.description"
   }
 };
+const unreachableErrorCodes = [
+  constants.SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED,
+  constants.SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR,
+  constants.SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE
+];
+const defaultActionTypes = [model.AuditLogAction.APP_BACKUP, model.AuditLogAction.APP_RESTORE, model.AuditLogAction.APP_OBJECTS_SYNC];
 function useAuditLog({
   endpoint,
+  spaceStatus,
+  errorCode,
   size = 1,
   status = model.AuditLogStatus.SUCCEEDED,
-  actionType = [model.AuditLogAction.APP_BACKUP, model.AuditLogAction.APP_RESTORE, model.AuditLogAction.APP_OBJECTS_SYNC],
+  actionType = defaultActionTypes,
   deps = []
 }) {
   const { t, locale } = useLocale();
@@ -39,8 +49,14 @@ function useAuditLog({
       if (!isUrl(endpoint)) {
         return void 0;
       }
+      if (spaceStatus === index.DIDSpaceStatus.LOADING) {
+        return void 0;
+      }
+      if (unreachableErrorCodes.includes(errorCode)) {
+        return void 0;
+      }
       const { data: res } = await api.get(
-        ufo.joinURL(window.location.origin, "/.well-known/service/api/did-space/audit-log/list"),
+        ufo.joinURL(window.location.origin, "/.well-known/service/api/did-space/audit-logs"),
         {
           timeout: 1e3 * 30,
           params: {
@@ -54,7 +70,7 @@ function useAuditLog({
       return res.data.rows;
     },
     {
-      refreshDeps: [endpoint, size].concat(deps),
+      refreshDeps: [endpoint, spaceStatus, errorCode, size, status, actionType, ...deps],
       onError(err) {
         console.error(err);
       }
@@ -68,7 +84,7 @@ function useAuditLog({
       }
       const result = {
         ...v,
-        description: t(TranslateKeyMap[v.actionType].description, {
+        description: t(translateKeyMap[v.actionType].description, {
           ...extraData,
           relativeTime: util.formatRelativeTime(v.createdAt, locale)
         })

package/dist/cjs/hooks/use-space-info.js

@@ -23,7 +23,7 @@ function useSpaceInfo({ endpoint, deps = [] }) {
         isListable,
         isReadable,
         isWriteable,
-        rawVersion = "legacy",
+        rawVersion,
         rawOwnerDid,
         rawAvailable,
         rawErrorCode

package/dist/cjs/package.json.js

@@ -1,5 +1,5 @@
 'use strict';
 
-const version = "1.0.13";
+const version = "1.0.15";
 
 exports.version = version;

package/dist/es/components/space-card/audit-log-bar.d.ts

@@ -1,4 +1,8 @@
-export declare function AuditLogBar({ endpoint, deps }: {
+import { DIDSpaceStatus } from '../../types';
+export interface AuditLogBarProps {
     endpoint: string;
+    spaceStatus: DIDSpaceStatus;
+    errorCode: number;
     deps?: any[];
-}): import("react/jsx-runtime").JSX.Element | null;
+}
+export declare function AuditLogBar({ endpoint, spaceStatus, errorCode, deps }: AuditLogBarProps): import("react/jsx-runtime").JSX.Element | null;

package/dist/es/components/space-card/audit-log-bar.js

@@ -2,19 +2,22 @@ import { jsx, jsxs } from 'react/jsx-runtime';
 import { Skeleton, Box, Link } from '@mui/material';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import { joinURL } from 'ufo';
+import { DIDSpaceStatus } from '../../types/index.js';
 import { getSpaceEndpointContext } from '../../libs/util.js';
 import useLocale from '../../hooks/use-locale.js';
 import useAuditLog from '../../hooks/use-audit-log.js';
 
-function AuditLogBar({ endpoint, deps = [] }) {
+function AuditLogBar({ endpoint, spaceStatus, errorCode, deps = [] }) {
   const { t } = useLocale();
   const { loading, data: auditLogs } = useAuditLog({
     endpoint,
+    spaceStatus,
+    errorCode,
     deps
   });
   const { baseUrl, spaceDid, appDid } = getSpaceEndpointContext(endpoint);
   const latestLog = auditLogs?.[0];
-  if (loading) {
+  if (loading || spaceStatus === DIDSpaceStatus.LOADING) {
     return /* @__PURE__ */ jsx(Skeleton, { variant: "text", sx: { width: "100%", fontSize: "1rem" } });
   }
   if (!latestLog) {

package/dist/es/components/space-card/index.js

@@ -1,4 +1,4 @@
-import { jsxs, jsx } from 'react/jsx-runtime';
+import { jsx, jsxs } from 'react/jsx-runtime';
 import isUndefined from 'lodash/isUndefined';
 import { withQuery, joinURL } from 'ufo';
 import { Box, Stack, Tooltip, Link, Skeleton } from '@mui/material';
@@ -97,7 +97,8 @@ function Status({
           ErrorLink,
           {
             title: t("storage.spaces.error.incompatible", {
-              spaceVersion,
+              spaceVersion: spaceVersion || " < 0.5.77",
+              // version 字段是在 0.5.77 版本添加的
               expectVersion
             }),
             url: joinURL(new URL(spaceUrl).origin, ".well-known/service/admin/components")
@@ -236,7 +237,7 @@ function DIDSpaceConnection({
     }
     return action;
   };
-  const originalFooter = /* @__PURE__ */ jsx(AuditLogBar, { endpoint, deps: refreshDeps });
+  const originalFooter = /* @__PURE__ */ jsx(AuditLogBar, { endpoint, spaceStatus: spaceStatus.current, errorCode, deps: refreshDeps });
   const renderFooter = () => {
     if (typeof footer === "function") {
       return footer({

package/dist/es/hooks/use-audit-log.d.ts

@@ -1,10 +1,13 @@
 import type { AuditLogModel } from '@did-space/core';
 import { AuditLogAction, AuditLogStatus } from '@did-space/core/model';
+import { DIDSpaceStatus } from '../types';
 export interface AuditLogModelExtra extends AuditLogModel {
     description: React.ReactNode;
 }
-export default function useAuditLog({ endpoint, size, status, actionType, deps, }: {
+export default function useAuditLog({ endpoint, spaceStatus, errorCode, size, status, actionType, deps, }: {
     endpoint: string;
+    spaceStatus: DIDSpaceStatus;
+    errorCode: number;
     size?: number;
     status?: AuditLogStatus | AuditLogStatus[];
     actionType?: AuditLogAction | AuditLogAction[];

package/dist/es/hooks/use-audit-log.js

@@ -3,11 +3,13 @@ import { useRequest, useCreation } from 'ahooks';
 import { AuditLogAction, AuditLogStatus } from '@did-space/core/model';
 import { joinURL } from 'ufo';
 import xbytes from 'xbytes';
+import { SPACE_CONNECT_ERROR_CODE } from '@did-space/core/constants';
 import api from '../libs/api.js';
 import useLocale from './use-locale.js';
 import { formatRelativeTime } from '../libs/util.js';
+import { DIDSpaceStatus } from '../types/index.js';
 
-const TranslateKeyMap = {
+const translateKeyMap = {
   [AuditLogAction.APP_BACKUP]: {
     description: "auditLog.backup.description"
   },
@@ -24,11 +26,19 @@ const TranslateKeyMap = {
     description: "auditLog.objectsSync.description"
   }
 };
+const unreachableErrorCodes = [
+  SPACE_CONNECT_ERROR_CODE.CORS_BLOCKED,
+  SPACE_CONNECT_ERROR_CODE.NETWORK_ERROR,
+  SPACE_CONNECT_ERROR_CODE.INCOMPATIBLE
+];
+const defaultActionTypes = [AuditLogAction.APP_BACKUP, AuditLogAction.APP_RESTORE, AuditLogAction.APP_OBJECTS_SYNC];
 function useAuditLog({
   endpoint,
+  spaceStatus,
+  errorCode,
   size = 1,
   status = AuditLogStatus.SUCCEEDED,
-  actionType = [AuditLogAction.APP_BACKUP, AuditLogAction.APP_RESTORE, AuditLogAction.APP_OBJECTS_SYNC],
+  actionType = defaultActionTypes,
   deps = []
 }) {
   const { t, locale } = useLocale();
@@ -37,8 +47,14 @@ function useAuditLog({
       if (!isUrl(endpoint)) {
         return void 0;
       }
+      if (spaceStatus === DIDSpaceStatus.LOADING) {
+        return void 0;
+      }
+      if (unreachableErrorCodes.includes(errorCode)) {
+        return void 0;
+      }
       const { data: res } = await api.get(
-        joinURL(window.location.origin, "/.well-known/service/api/did-space/audit-log/list"),
+        joinURL(window.location.origin, "/.well-known/service/api/did-space/audit-logs"),
         {
           timeout: 1e3 * 30,
           params: {
@@ -52,7 +68,7 @@ function useAuditLog({
       return res.data.rows;
     },
     {
-      refreshDeps: [endpoint, size].concat(deps),
+      refreshDeps: [endpoint, spaceStatus, errorCode, size, status, actionType, ...deps],
       onError(err) {
         console.error(err);
       }
@@ -66,7 +82,7 @@ function useAuditLog({
       }
       const result = {
         ...v,
-        description: t(TranslateKeyMap[v.actionType].description, {
+        description: t(translateKeyMap[v.actionType].description, {
           ...extraData,
           relativeTime: formatRelativeTime(v.createdAt, locale)
         })

package/dist/es/hooks/use-space-info.js

@@ -21,7 +21,7 @@ function useSpaceInfo({ endpoint, deps = [] }) {
         isListable,
         isReadable,
         isWriteable,
-        rawVersion = "legacy",
+        rawVersion,
         rawOwnerDid,
         rawAvailable,
         rawErrorCode

package/dist/es/package.json.js

@@ -1,3 +1,3 @@
-const version = "1.0.13";
+const version = "1.0.15";
 
 export { version };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/did-space-react",
-  "version": "1.0.13",
+  "version": "1.0.15",
   "description": "Reusable react components for did space",
   "keywords": [
     "react",
@@ -81,7 +81,7 @@
   },
   "dependencies": {
     "@arcblock/did": "^1.19.9",
-    "@did-space/core": "^1.0.13",
+    "@did-space/core": "^1.0.15",
     "@mui/icons-material": "^5.16.14",
     "@mui/lab": "^5.0.0-alpha.175",
     "@mui/material": "^5.16.14",
@@ -150,5 +150,5 @@
     "vite-plugin-node-polyfills": "^0.22.0",
     "vitest": "^3.0.5"
   },
-  "gitHead": "1cb6e52c2db732d49ab154a11182d46b01fb9509"
+  "gitHead": "5b7c651163212bec81066afdd2f43cda21dbc9e7"
 }