@abtnode/ux 1.16.29-beta-2eaf40bc → 1.16.29-beta-cbfd116d

package/lib/blocklet/component/add-component/step-connect.js

@@ -59,7 +59,7 @@ const StepContent = /*#__PURE__*/forwardRef(({
       }) : null,
       stepTip: t('blocklet.component.add'),
       children: /*#__PURE__*/_jsx(RightContent, {
-        children: step?.body && typeof step.body === 'function' ? step.body() : step.body
+        children: typeof step?.body === 'function' ? step.body() : step?.body
       })
     })
   });
@@ -113,8 +113,6 @@ const ContentWrapper = styled(Box)`
         }
       }
 
-
-
       // content-panel
       .root-header + div{
         padding-top: 0;

package/lib/blocklet/storage/delete.js

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
-import { ListItemIcon, ListItemText, MenuItem } from '@mui/material';
+import { ListItemIcon, ListItemText, MenuItem, Typography } from '@mui/material';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import Confirm from '@arcblock/ux/lib/Dialog/confirm';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
@@ -73,8 +73,11 @@ function DeleteDIDSpacesGateWay({
         children: t('common.delete')
       })]
     }), /*#__PURE__*/_jsx(Confirm, {
-      title: t('common.delConfirmDescription', {
-        data: `${spaceGateway?.name}`
+      title: /*#__PURE__*/_jsx(Typography, {
+        variant: "h6",
+        children: t('common.delConfirmDescription', {
+          data: `${spaceGateway?.name}`
+        })
       }),
       open: open,
       confirmButton: {

package/lib/blocklet/storage/disconnect.js

@@ -219,7 +219,7 @@ function Disconnect() {
       alignContent: "center",
       children: [/*#__PURE__*/_jsx(EmptySpacesNFT, {
         style: {
-          width: 200,
+          width: 250,
           height: 250
         }
       }), /*#__PURE__*/_jsx(Typography, {

package/lib/blocklet/storage/index.js

@@ -1,16 +1,29 @@
 import React from 'react';
+import isEmpty from 'lodash/isEmpty';
+import Center from '@arcblock/ux/lib/Center';
+import { CircularProgress } from '@mui/material';
 import Disconnect from './disconnect';
 import Connected from './connected';
-import { useBlockletStorageContext } from '../../contexts/blocklet-storage';
+import { BlockletStorageProvider, useBlockletStorageContext } from '../../contexts/blocklet-storage';
 import { jsx as _jsx } from "react/jsx-runtime";
-function NewStorage() {
+function StoragePage() {
   const {
-    backupEndpoint
+    spaceGatewaysLoading,
+    spaceGateways
   } = useBlockletStorageContext();
-  if (backupEndpoint) {
-    return /*#__PURE__*/_jsx(Connected, {});
+  if (spaceGatewaysLoading) {
+    return /*#__PURE__*/_jsx(Center, {
+      relative: "parent",
+      children: /*#__PURE__*/_jsx(CircularProgress, {})
+    });
   }
-  return /*#__PURE__*/_jsx(Disconnect, {});
+  if (isEmpty(spaceGateways)) {
+    return /*#__PURE__*/_jsx(Disconnect, {});
+  }
+  return /*#__PURE__*/_jsx(Connected, {});
 }
-NewStorage.propTypes = {};
-export default NewStorage;
+export default function Storage() {
+  return /*#__PURE__*/_jsx(BlockletStorageProvider, {
+    children: /*#__PURE__*/_jsx(StoragePage, {})
+  });
+}

package/lib/contexts/blocklet-storage.js

@@ -104,6 +104,20 @@ function BlockletStorageProvider({
     setAutoCheckUpdateRefresh(x => !x);
   };
 
+  /**
+   * @description
+   * @param {AutoBackup} value
+   */
+  const updateAutoBackup = async value => {
+    await api.updateAutoBackup({
+      input: {
+        did: blocklet.meta.did,
+        autoBackup: value
+      }
+    });
+    refreshAutoBackup();
+  };
+
   /**
    * @description
    * @param {SpaceGateway} spaceGateway
@@ -144,6 +158,22 @@ function BlockletStorageProvider({
     if (!spaceGateway) {
       return;
     }
+    if (spaceGateway.endpoint === backupEndpoint) {
+      await api.configBlocklet({
+        input: {
+          did: [blocklet.meta.did],
+          configs: [{
+            key: BLOCKLET_CONFIGURABLE_KEY.BLOCKLET_APP_BACKUP_ENDPOINT,
+            value: ''
+          }]
+        }
+      });
+      if (autoBackup?.enabled) {
+        await updateAutoBackup({
+          enabled: false
+        });
+      }
+    }
     await api.deleteBlockletSpaceGateway({
       input: {
         did: blocklet.meta.did,
@@ -190,20 +220,6 @@ function BlockletStorageProvider({
    * @param {SpaceGateway} spaceGateway
    */
   const spaceGatewayIsSelected = spaceGateway => spaceGateway?.endpoint === backupEndpoint;
-
-  /**
-   * @description
-   * @param {AutoBackup} value
-   */
-  const updateAutoBackup = async value => {
-    await api.updateAutoBackup({
-      input: {
-        did: blocklet.meta.did,
-        autoBackup: value
-      }
-    });
-    refreshAutoBackup();
-  };
   const updateAutoCheckUpdate = async value => {
     await api.updateAutoCheckUpdate({
       input: {

package/lib/hooks/use-auto-backup.js

@@ -3,6 +3,13 @@ import { useAsyncEffect } from 'ahooks';
 import { useState } from 'react';
 import { useBlockletContext } from '../contexts/blocklet';
 import { useNodeContext } from '../contexts/node';
+
+/**
+ * @description
+ * @export
+ * @param {*} [{ deps }={ deps: [] }]
+ * @return {import('@abtnode/client').AutoBackup | null}
+ */
 export function useAutoBackup({
   deps
 } = {

package/lib/hooks/use-space-gateways.js

@@ -23,10 +23,7 @@ export default function useSpaceGateways({
 } = {}) {
   /** @type {{ blocklet: import('@abtnode/client').BlockletState }} */
   const {
-    blocklet,
-    actions: {
-      refreshBlocklet
-    }
+    blocklet
   } = useBlockletContext();
   const blockletDid = blocklet?.meta?.did;
   const [spaceGateways, setSpaceGateways] = useState([]);
@@ -59,7 +56,7 @@ export default function useSpaceGateways({
     } finally {
       setLoading?.(false);
     }
-  }, [blockletDid, refreshBlocklet, refresh]);
+  }, [blockletDid, refresh]);
   return {
     spaceGateways
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.29-beta-2eaf40bc",
+  "version": "1.16.29-beta-cbfd116d",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -25,24 +25,24 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.29-beta-2eaf40bc",
-    "@abtnode/constant": "1.16.29-beta-2eaf40bc",
-    "@abtnode/util": "1.16.29-beta-2eaf40bc",
+    "@abtnode/auth": "1.16.29-beta-cbfd116d",
+    "@abtnode/constant": "1.16.29-beta-cbfd116d",
+    "@abtnode/util": "1.16.29-beta-cbfd116d",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.126",
-    "@arcblock/did-connect": "^2.10.5",
+    "@arcblock/did-connect": "^2.10.7",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.10.5",
-    "@arcblock/nft-display": "2.10.5",
-    "@arcblock/react-hooks": "^2.10.5",
-    "@arcblock/terminal": "^2.10.5",
-    "@arcblock/ux": "^2.10.5",
-    "@blocklet/constant": "1.16.29-beta-2eaf40bc",
-    "@blocklet/js-sdk": "1.16.29-beta-2eaf40bc",
-    "@blocklet/launcher-layout": "2.3.30",
+    "@arcblock/icons": "^2.10.7",
+    "@arcblock/nft-display": "2.10.7",
+    "@arcblock/react-hooks": "^2.10.7",
+    "@arcblock/terminal": "^2.10.7",
+    "@arcblock/ux": "^2.10.7",
+    "@blocklet/constant": "1.16.29-beta-cbfd116d",
+    "@blocklet/js-sdk": "1.16.29-beta-cbfd116d",
+    "@blocklet/launcher-layout": "2.3.33",
     "@blocklet/list": "^0.13.9",
-    "@blocklet/meta": "1.16.29-beta-2eaf40bc",
-    "@blocklet/ui-react": "^2.10.5",
+    "@blocklet/meta": "1.16.29-beta-cbfd116d",
+    "@blocklet/ui-react": "^2.10.7",
     "@blocklet/uploader": "0.1.19",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -108,5 +108,5 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "d723d07ca8914468fc1b53af23aa53dc343e0a8c"
+  "gitHead": "e9bdb7af77f2d126e40195c67972b07fe683adf9"
 }