@abtnode/ux 1.16.29-beta-88bdefe8 → 1.16.29-beta-a076832b

package/lib/blocklet/publish/create-release/branding.js

@@ -211,11 +211,11 @@ function Branding({
           }
         })]
       })
-    }), /*#__PURE__*/_jsxs(Box, {
+    }), /*#__PURE__*/_jsx(Box, {
       display: "flex",
       mt: 3,
       className: "section full-width",
-      children: [/*#__PURE__*/_jsxs(Box, {
+      children: /*#__PURE__*/_jsxs(Box, {
         sx: {
           flex: 1
         },
@@ -303,61 +303,58 @@ function Branding({
             })]
           })]
         })]
-      }), /*#__PURE__*/_jsx(Suspense, {
-        fallback: /*#__PURE__*/_jsx(EmptySpinner, {}),
-        children: /*#__PURE__*/_jsx(UploaderComponent, {
-          ref: uploaderLogoRef,
-          popup: true,
-          onUploadFinish: result => {
-            setParams({
-              blockletLogo: result.data.filename
-            });
-            setInitLogoUrl('');
-            uploaderLogoRef.current.close();
-          },
-          plugins: ['ImageEditor'],
-          installerProps: {
-            disabled: true
-          },
-          apiPathProps: {
-            uploader: uploadLogoPrefix,
-            disableMediaKitPrefix: true
-          },
-          coreProps: {
-            restrictions: {
-              allowedFileExts,
-              maxFileSize,
-              maxNumberOfFiles: 1
-            }
+      })
+    }), /*#__PURE__*/_jsxs(Suspense, {
+      fallback: /*#__PURE__*/_jsx(EmptySpinner, {}),
+      children: [/*#__PURE__*/_jsx(UploaderComponent, {
+        ref: uploaderLogoRef,
+        popup: true,
+        onUploadFinish: result => {
+          setParams({
+            blockletLogo: result.data.filename
+          });
+          setInitLogoUrl('');
+          uploaderLogoRef.current.close();
+        },
+        plugins: ['ImageEditor'],
+        installerProps: {
+          disabled: true
+        },
+        apiPathProps: {
+          uploader: uploadLogoPrefix,
+          disableMediaKitPrefix: true
+        },
+        coreProps: {
+          restrictions: {
+            allowedFileExts,
+            maxFileSize,
+            maxNumberOfFiles: 1
           }
-        }, "uploader-logo")
-      }), /*#__PURE__*/_jsx(Suspense, {
-        fallback: /*#__PURE__*/_jsx(EmptySpinner, {}),
-        children: /*#__PURE__*/_jsx(UploaderComponent, {
-          ref: uploaderScreenshotRef,
-          popup: true,
-          onUploadFinish: result => {
-            const blockletScreenshots = params.blockletScreenshots || [];
-            blockletScreenshots.push(result.data?.filename);
-            setParams({
-              blockletScreenshots
-            });
-            uploaderScreenshotRef.current.close();
-          },
-          plugins: ['ImageEditor'],
-          apiPathProps: {
-            uploader: uploadScreenshotPrefix,
-            disableMediaKitPrefix: true
-          },
-          coreProps: {
-            restrictions: {
-              allowedFileExts,
-              maxFileSize,
-              maxNumberOfFiles: 5 - screenshotUrls.length
-            }
+        }
+      }, "uploader-logo"), /*#__PURE__*/_jsx(UploaderComponent, {
+        ref: uploaderScreenshotRef,
+        popup: true,
+        onUploadFinish: result => {
+          const blockletScreenshots = params.blockletScreenshots || [];
+          blockletScreenshots.push(result.data?.filename);
+          setParams({
+            blockletScreenshots
+          });
+          uploaderScreenshotRef.current.close();
+        },
+        plugins: ['ImageEditor'],
+        apiPathProps: {
+          uploader: uploadScreenshotPrefix,
+          disableMediaKitPrefix: true
+        },
+        coreProps: {
+          restrictions: {
+            allowedFileExts,
+            maxFileSize,
+            maxNumberOfFiles: 5 - screenshotUrls.length
           }
-        }, "uploader-screenshot")
-      })]
+        }
+      }, "uploader-screenshot")]
     })]
   });
 }

package/lib/blocklet/publish/create-release/connect-store-button.js

@@ -1,16 +1,20 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import { BLOCKLET_TENANT_MODES } from '@blocklet/constant';
 import AddIcon from '@mui/icons-material/Add';
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown';
-import { Button, ButtonGroup, CircularProgress, ClickAwayListener, Divider, Grow, IconButton, MenuItem, MenuList, Paper, Popper, Typography } from '@mui/material';
+import { Box, Button, ButtonGroup, CircularProgress, ClickAwayListener, Divider, Grow, IconButton, MenuItem, MenuList, Paper, Popper, Typography } from '@mui/material';
 import PropTypes from 'prop-types';
 import { Icon } from '@iconify/react';
 import { useRef, useState } from 'react';
 import Toast from '@arcblock/ux/lib/Toast';
 import formatError from '@abtnode/util/lib/format-error';
+import { useSessionContext } from '../../../contexts/session';
 import AddStore from '../../../store/add';
 import { useNodeContext } from '../../../contexts/node';
 import ConfirmDialog from '../../../confirm';
+import { useBlockletContext } from '../../../contexts/blocklet';
+import ShortenLabel from '../../component/shorten-label';
+import canDeleteStore from '../utils/can-delete-store';
+import getStudioStoreList from '../utils/get-studio-store-list';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 export default function ConnectStoreButton({
   blocklet,
@@ -24,12 +28,18 @@ export default function ConnectStoreButton({
   const {
     t
   } = useLocaleContext();
+  const {
+    session
+  } = useSessionContext();
+  const {
+    api,
+    info: nodeInfo,
+    inService
+  } = useNodeContext();
+  const blockletContext = useBlockletContext();
   const [open, setOpen] = useState(false);
   const anchorRef = useRef(null);
   const [openAddStore, setOpenAddStore] = useState(false);
-  const {
-    api
-  } = useNodeContext();
   const [deleteStore, setDeleteStore] = useState(null);
   const handleSelectStore = nextStore => {
     onChangeStore(nextStore);
@@ -59,17 +69,27 @@ export default function ConnectStoreButton({
         input: {
           teamDid: blocklet.meta.did,
           url: deleteStore.url,
-          projectId: ''
+          projectId: '',
+          scope: deleteStore.scope || 'studio'
         }
       });
-      setDeleteStore(null);
+      await blockletContext?.actions?.refreshBlocklet();
     } catch (err) {
       Toast.error(`Remove Blocklet Store Error: ${formatError(err)}`);
+    } finally {
+      setDeleteStore(null);
     }
   };
-  const storeList = blocklet?.settings?.storeList || [];
+  const {
+    storeList
+  } = getStudioStoreList({
+    fromBlocklet: inService,
+    blocklet,
+    nodeInfo,
+    componentDid,
+    userDid: session?.user?.did
+  });
   const did = blocklet?.meta?.did;
-  const manageable = !(componentDid && window.blocklet?.tenantMode === BLOCKLET_TENANT_MODES.MULTIPLE);
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs(ButtonGroup, {
       disabled: disabled,
@@ -100,16 +120,16 @@ export default function ConnectStoreButton({
       },
       open: open,
       anchorEl: anchorRef.current,
+      placement: "bottom-end",
       role: undefined,
       transition: true,
       disablePortal: true,
       children: ({
-        TransitionProps,
-        placement
+        TransitionProps
       }) => /*#__PURE__*/_jsx(Grow, {
         ...TransitionProps,
         style: {
-          transformOrigin: placement === 'bottom' ? 'center top' : 'center bottom'
+          transformOrigin: 'center top'
         },
         children: /*#__PURE__*/_jsx(Paper, {
           children: /*#__PURE__*/_jsx(ClickAwayListener, {
@@ -117,16 +137,35 @@ export default function ConnectStoreButton({
             children: /*#__PURE__*/_jsxs(MenuList, {
               id: "split-button-menu",
               autoFocusItem: true,
+              sx: {
+                maxHeight: 300,
+                overflowY: 'auto'
+              },
               children: [storeList.map(option => /*#__PURE__*/_jsxs(MenuItem, {
                 selected: option.id === store.id,
                 sx: {
-                  height: 40
+                  height: 56
                 },
                 onClick: () => handleSelectStore(option),
-                children: [/*#__PURE__*/_jsx(Typography, {
-                  variant: "inherit",
-                  children: option.name
-                }), manageable && !option.protected && /*#__PURE__*/_jsx(IconButton, {
+                children: [/*#__PURE__*/_jsxs(Box, {
+                  children: [/*#__PURE__*/_jsx(ShortenLabel, {
+                    sx: {
+                      fontSize: '16px'
+                    },
+                    maxLength: 24,
+                    children: option.name
+                  }), /*#__PURE__*/_jsx(ShortenLabel, {
+                    sx: {
+                      fontSize: '13px',
+                      opacity: 0.6
+                    },
+                    maxLength: 30,
+                    children: option.url
+                  })]
+                }), canDeleteStore({
+                  store: option,
+                  userDid: session?.user?.did
+                }) && /*#__PURE__*/_jsx(IconButton, {
                   sx: {
                     ml: 1
                   },
@@ -139,7 +178,7 @@ export default function ConnectStoreButton({
                     icon: "ic:outline-delete"
                   })
                 })]
-              }, option.url)), manageable && /*#__PURE__*/_jsx(Divider, {}), manageable && /*#__PURE__*/_jsxs(MenuItem, {
+              }, option.url)), /*#__PURE__*/_jsx(Divider, {}), /*#__PURE__*/_jsxs(MenuItem, {
                 onClick: handleOpenAddStore,
                 children: [/*#__PURE__*/_jsx(AddIcon, {
                   font: true
@@ -158,7 +197,8 @@ export default function ConnectStoreButton({
       onClose: handleCloseAddStore,
       teamDid: did,
       storeList: storeList,
-      scope: "studio"
+      scope: "studio",
+      onAdd: blockletContext?.actions?.refreshBlocklet
     }), deleteStore && /*#__PURE__*/_jsx(ConfirmDialog, {
       displayError: true,
       title: `${t('common.delete')} ${deleteStore.name}`,

package/lib/blocklet/publish/create-release/connect-store-list.js

@@ -4,9 +4,11 @@ import { Box, List, Alert, ListItem, ListItemText } from '@mui/material';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import LaunchIcon from '@mui/icons-material/Launch';
 import { blueGrey } from '@mui/material/colors';
-import { BLOCKLET_TENANT_MODES } from '@blocklet/constant';
 import AddStore from '../../../store/add';
 import StoreItem from '../../../store/item';
+import { useSessionContext } from '../../../contexts/session';
+import { useBlockletContext } from '../../../contexts/blocklet';
+import getStudioStoreList from '../utils/get-studio-store-list';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 function ConnectStoreList({
   blocklet,
@@ -26,7 +28,22 @@ function ConnectStoreList({
   const {
     t
   } = useLocaleContext();
-  const storeList = blocklet?.settings?.storeList || [];
+  const {
+    actions: {
+      refreshBlocklet
+    }
+  } = useBlockletContext();
+  const {
+    session
+  } = useSessionContext();
+  const {
+    storeList
+  } = getStudioStoreList({
+    fromBlocklet: true,
+    blocklet,
+    componentDid,
+    userDid: session?.user?.did
+  });
   const connectedMap = useMemo(() => {
     if (!connectedStores?.length) {
       return {};
@@ -74,14 +91,16 @@ function ConnectStoreList({
             connectedStore: connectedMap[x.id],
             onPublish: onPublish,
             onDelete: onDelete,
+            scope: x.scope || 'studio',
             onOpenConnectStore: onOpenConnectStore
           })
         })
       }, x.url))
-    }), componentDid && window.blocklet?.tenantMode === BLOCKLET_TENANT_MODES.MULTIPLE ? null : /*#__PURE__*/_jsx(AddStore, {
+    }), /*#__PURE__*/_jsx(AddStore, {
       teamDid: did,
       storeList: storeList,
-      scope: "studio"
+      scope: "studio",
+      onAdd: refreshBlocklet
     })]
   });
 }

package/lib/blocklet/publish/create-release/header.js

@@ -165,7 +165,7 @@ function Header({
         Toast.error(err?.response?.data?.error?.message || err.message);
         setLoading(false);
         setParamsErrTip({
-          resources: 'Invalid save the resource'
+          blockletResource: 'Invalid save the resource'
         });
         return;
       }
@@ -218,7 +218,7 @@ function Header({
     }).catch(err => {
       const msg = formatError(err);
       Toast.error(msg);
-      if (/resource.*empty/.test(msg)) {
+      if (/resource/.test(msg) || /zip/.test(msg)) {
         setParamsErrTip({
           blockletResource: msg
         });

package/lib/blocklet/publish/create-release/index.js

@@ -132,7 +132,7 @@ export default function CreateRelease({
   const setSelectedResourceIds = useCallback((...args) => {
     _setSelectedResourceIds(...args);
     setParamsErrTip({
-      blockletResources: ''
+      blockletResource: ''
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
@@ -521,7 +521,9 @@ export default function CreateRelease({
                   readOnly: readOnly,
                   projectId: projectId === UNOWNED_DID ? '' : projectId,
                   params: params,
-                  setParams: setParams
+                  error: paramsErrTip.blockletResource,
+                  setParams: setParams,
+                  setParamsErrTip: setParamsErrTip
                 })]
               })
             })

package/lib/blocklet/publish/create-release/release-stepper.js

@@ -29,7 +29,7 @@ export default function ReleaseStepper({
       return paramsErrTip?.blockletTitle || paramsErrTip?.projectId || paramsErrTip?.blockletDescription;
     }
     if (step === 2) {
-      return paramsErrTip?.blockletResources;
+      return paramsErrTip?.blockletResource;
     }
     if (step >= 4) {
       return paramsErrTip?.blockletVersion || paramsErrTip?.note;
@@ -156,6 +156,6 @@ ReleaseStepper.propTypes = {
     blockletTitle: PropTypes.string,
     blockletDescription: PropTypes.string,
     note: PropTypes.string,
-    blockletResources: PropTypes.string
+    blockletResource: PropTypes.string
   }).isRequired
 };

package/lib/blocklet/publish/create-release/resource-upload.js

@@ -18,7 +18,9 @@ export default function ResourceUpload({
   projectId,
   readOnly,
   params,
-  setParams
+  setParams,
+  setParamsErrTip,
+  error
 }) {
   const {
     t
@@ -74,6 +76,9 @@ export default function ResourceUpload({
           setParams({
             uploadedResource: result.data.filename
           });
+          setParamsErrTip({
+            blockletResource: ''
+          });
           uploaderRef.current?.close();
         },
         plugins: ['ImageEditor'],
@@ -92,6 +97,11 @@ export default function ResourceUpload({
           }
         }
       }, "uploader-resource")
+    }), !!error && /*#__PURE__*/_jsx(Box, {
+      color: "error.main",
+      mt: 1,
+      fontSize: 14,
+      children: error
     })]
   });
 }
@@ -100,6 +110,8 @@ ResourceUpload.propTypes = {
   projectId: PropTypes.string.isRequired,
   readOnly: PropTypes.bool.isRequired,
   params: PropTypes.object.isRequired,
-  setParams: PropTypes.func.isRequired
+  setParams: PropTypes.func.isRequired,
+  error: PropTypes.string.isRequired,
+  setParamsErrTip: PropTypes.func.isRequired
 };
 ResourceUpload.defaultProps = {};

package/lib/blocklet/publish/create-release/tree.js

@@ -140,7 +140,10 @@ export default function Tree({
             }), /*#__PURE__*/_jsx(Box, {
               className: "name",
               children: node.name
-            }), node.url && /*#__PURE__*/_jsx("a", {
+            }), node.url &&
+            /*#__PURE__*/
+            // eslint-disable-next-line jsx-a11y/control-has-associated-label
+            _jsx("a", {
               href: node.url,
               target: "_blank",
               rel: "noreferrer",

package/lib/blocklet/publish/hooks/use-want-to-connect-store.js

@@ -1,8 +1,12 @@
 import { BLOCKLET_STORE } from '@abtnode/constant';
 import { useCallback, useMemo, useState } from 'react';
+import { useSessionContext } from '../../../contexts/session';
 const LOCAL_STORAGE_KEY = 'lastWantToConnectStoreId';
 function useWantToConnectStore(blocklet) {
   const [_wantToConnectStore, _setWantToConnectStore] = useState(null);
+  const {
+    session
+  } = useSessionContext();
   const setWantToConnectStore = useCallback(x => {
     _setWantToConnectStore(x);
     localStorage.setItem(LOCAL_STORAGE_KEY, x?.id);
@@ -13,8 +17,16 @@ function useWantToConnectStore(blocklet) {
     if (lastStore) {
       return lastStore;
     }
-    return (blocklet?.settings?.storeList || []).find(x => x.id === BLOCKLET_STORE.id);
-  }, [blocklet?.settings?.storeList]);
+    return (blocklet?.settings?.storeList || []).find(x => {
+      if (x.id !== BLOCKLET_STORE.id) {
+        return false;
+      }
+      if (x.scope && x.scope !== 'studio' && x.scope !== session?.user?.did) {
+        return false;
+      }
+      return true;
+    });
+  }, [blocklet?.settings?.storeList, session?.user?.did]);
   const wantToConnectStore = _wantToConnectStore || baseStore;
   return [wantToConnectStore, setWantToConnectStore];
 }

package/lib/blocklet/publish/utils/can-delete-store.js

@@ -0,0 +1,18 @@
+import { BLOCKLET_TENANT_MODES } from '@blocklet/constant';
+const canDeleteStore = ({
+  store,
+  userDid
+}) => {
+  const singleTenant = !(window.blocklet?.tenantMode === BLOCKLET_TENANT_MODES.MULTIPLE);
+  if (store.protected) {
+    return false;
+  }
+  if (store.scope && store.scope === userDid) {
+    return true;
+  }
+  if (singleTenant) {
+    return store.scope === 'studio';
+  }
+  return false;
+};
+export default canDeleteStore;

package/lib/blocklet/publish/utils/get-studio-store-list.js

@@ -0,0 +1,15 @@
+const getStudioStoreList = ({
+  fromBlocklet,
+  nodeInfo,
+  blocklet,
+  userDid
+}) => {
+  const teamDid = fromBlocklet ? blocklet?.meta?.did : nodeInfo?.did;
+  let storeList = fromBlocklet ? blocklet?.settings?.storeList || [] : nodeInfo?.blockletRegistryList || [];
+  storeList = storeList.filter(x => x.protected || !x.scope || x.scope === 'studio' || x.scope === userDid);
+  return {
+    teamDid,
+    storeList
+  };
+};
+export default getStudioStoreList;

package/lib/blocklet/publish/utils/validate-params.js

@@ -23,7 +23,7 @@ export const validateParams = ({
   }
   if (!params.uploadedResource && !hasSelectedResources) {
     errors.push({
-      param: 'blockletResources',
+      param: 'blockletResource',
       message: t('blocklet.publish.errorTip.noResource')
     });
   }

package/lib/delete-confirm.js

@@ -7,8 +7,9 @@ import TextField from '@mui/material/TextField';
 import Alert from '@mui/material/Alert';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import ClickToCopy from './click-to-copy';
+import ShortenLabel from './blocklet/component/shorten-label';
 import Confirm from './confirm';
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function CancelConfirm({
   title,
   description,
@@ -25,7 +26,13 @@ export default function CancelConfirm({
   } = useLocaleContext();
   const confirmSetting = {
     title: () => /*#__PURE__*/_jsxs("div", {
-      children: [title, ` (${keyName})`]
+      children: [title, /*#__PURE__*/_jsx(ShortenLabel, {
+        sx: {
+          fontSize: '14px'
+        },
+        maxLength: 64,
+        children: ` (${keyName})`
+      })]
     }),
     description: (params, setParams) => {
       const setValue = value => {

package/lib/locales/en.js

@@ -1503,7 +1503,7 @@ export default {
       installedButStopped: 'The app is installed successfully, but cannot be started. You can start it manually after resolving blocking issues',
       installedButError: 'The app is successfully installed, but failed to start',
       restoreFailed: 'Failed to restore app, please try again',
-      resourceBlocklet: ''
+      resourceBlocklet: 'This blocklet cannot be launched directly, but you can add it into existing application.'
     },
     steps: {
       introduction: 'Introduction',

package/lib/store/add.js

@@ -48,12 +48,8 @@ export default function AddStore({
     setLoading(true);
     try {
       const {
-        isNew,
         decoded
       } = isNewStoreUrl(url, storeList);
-      if (!isNew) {
-        throw new Error(t('store.blockletRegistry.haveSameRegistry'));
-      }
       await api.addBlockletStore({
         input: {
           teamDid,

package/lib/store/connect-actions.js

@@ -9,6 +9,8 @@ import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import ConfirmDialog from '../confirm';
 import DeleteStore from './delete';
+import canDeleteStore from '../blocklet/publish/utils/can-delete-store';
+import { useSessionContext } from '../contexts/session';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 function ConnectActions({
   connected,
@@ -23,6 +25,9 @@ function ConnectActions({
   const {
     t
   } = useLocaleContext();
+  const {
+    session
+  } = useSessionContext();
   const [showDisconnectConfirm, setShowDisconnectConfirm] = useState(false);
   const handleOpenUrl = e => {
     e.stopPropagation();
@@ -93,11 +98,15 @@ function ConnectActions({
             children: x.label
           })]
         }, x.label);
-      }), !store.protected && /*#__PURE__*/_jsx(DeleteStore, {
+      }), canDeleteStore({
+        store,
+        userDid: session?.user?.did
+      }) && /*#__PURE__*/_jsx(DeleteStore, {
         store: store,
         onDelete: onDelete,
         teamDid: teamDid,
         projectId: projectId,
+        scope: store.scope || 'studio',
         children: /*#__PURE__*/_jsxs(MenuItem, {
           dense: true,
           disabled: store.protected,

package/lib/store/delete.js

@@ -8,13 +8,15 @@ import { Button } from '@mui/material';
 import { useNodeContext } from '../contexts/node';
 import DelConfirm from '../delete-confirm';
 import { formatError } from '../util';
+import { useBlockletContext } from '../contexts/blocklet';
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 export default function DeleteStore({
   store,
   teamDid,
   onDelete,
   children,
-  projectId = ''
+  projectId = '',
+  scope = ''
 }) {
   const {
     api
@@ -22,6 +24,7 @@ export default function DeleteStore({
   const {
     t
   } = useLocaleContext();
+  const blockletContext = useBlockletContext();
   const [loading, setLoading] = useState(false);
   const [confirmSetting, setConfirmSetting] = useState(null);
   const theme = useTheme();
@@ -36,9 +39,11 @@ export default function DeleteStore({
         input: {
           teamDid,
           url: store.url,
-          projectId
+          projectId,
+          scope
         }
       });
+      await blockletContext?.actions.refreshBlocklet();
       if (onDelete && typeof onDelete === 'function') {
         onDelete();
       }
@@ -103,10 +108,12 @@ DeleteStore.propTypes = {
   teamDid: PropTypes.string.isRequired,
   store: PropTypes.object.isRequired,
   onDelete: PropTypes.func,
-  projectId: PropTypes.string
+  projectId: PropTypes.string,
+  scope: PropTypes.string
 };
 DeleteStore.defaultProps = {
   children: null,
   projectId: '',
+  scope: '',
   onDelete: () => {}
 };

package/lib/store/item.js

@@ -104,7 +104,8 @@ export default function StoreItem({
   onPublish,
   onOpenConnectStore,
   onSelectConnectStore,
-  behavior
+  behavior,
+  scope = ''
 }) {
   const classes = useStyles();
   const {
@@ -164,14 +165,19 @@ export default function StoreItem({
     });
   };
   const handleDisconnectStore = async () => {
-    await api.disconnectFromStore({
-      input: {
-        did: teamDid,
-        storeId: store.id,
-        projectId
-      }
-    });
-    onDelete();
+    try {
+      await api.disconnectFromStore({
+        input: {
+          did: teamDid,
+          storeId: store.id,
+          projectId,
+          storeScope: scope
+        }
+      });
+      onDelete();
+    } catch (err) {
+      Toast.error(formatError(err));
+    }
   };
   const handleUploadToStore = () => {
     setLoading(true);
@@ -341,7 +347,8 @@ export default function StoreItem({
         }), !store.protected && /*#__PURE__*/_jsx(DeleteStore, {
           store: store,
           onDelete: onDelete,
-          teamDid: teamDid
+          teamDid: teamDid,
+          scope: ""
         })]
       })]
     })]
@@ -367,6 +374,7 @@ StoreItem.propTypes = {
     protected: PropTypes.bool,
     connected: PropTypes.bool
   }).isRequired,
+  scope: PropTypes.string,
   onDelete: PropTypes.func,
   onPublish: PropTypes.func,
   onOpenConnectStore: PropTypes.func,
@@ -380,6 +388,7 @@ StoreItem.defaultProps = {
   releaseId: '',
   projectId: '',
   releaseType: '',
+  scope: '',
   behavior: BEHAVIOR.CONNECT,
   onPublish: () => {},
   onDelete: () => {},

package/lib/team/members/index.js

@@ -141,7 +141,8 @@ export default function MemberList({
     }
   });
   const {
-    appIdList = []
+    appIdList = [],
+    blocklet
   } = useBlockletContext();
   const {
     teamDid,
@@ -151,8 +152,7 @@ export default function MemberList({
     refresh,
     enablePassportIssuance,
     endpoint,
-    api,
-    blocklet
+    api
   } = useTeamContext();
   const {
     inService,
@@ -161,30 +161,30 @@ export default function MemberList({
     }
   } = useNodeContext();
   const appInfoList = [];
-  if (inService && blocklet) {
+  if (blocklet) {
     const federatedMaster = (blocklet.settings?.federated?.sites || []).find(item => item.isMaster !== false);
     const federatedCurrent = (blocklet.settings?.federated?.sites || []).find(item => item.appId === blocklet.appDid);
     if (federatedCurrent?.status === 'approved') {
       appInfoList.push({
-        appId: federatedMaster.appId,
-        appName: federatedMaster.appName,
-        appDescription: federatedMaster.appDescription,
-        appLogo: federatedMaster.appLogo,
-        appPid: federatedMaster.appPid,
-        appUrl: federatedMaster.appUrl,
-        version: federatedMaster.version,
-        sourceAppPid: federatedMaster.appPid,
+        appId: federatedMaster?.appId,
+        appName: federatedMaster?.appName,
+        appDescription: federatedMaster?.appDescription,
+        appLogo: federatedMaster?.appLogo,
+        appPid: federatedMaster?.appPid,
+        appUrl: federatedMaster?.appUrl,
+        version: federatedMaster?.version,
+        sourceAppPid: federatedMaster?.appPid,
         provider: 'wallet'
       });
     }
     appInfoList.push({
-      appId: federatedCurrent.appId,
-      appName: federatedCurrent.appName,
-      appDescription: federatedCurrent.appDescription,
-      appLogo: federatedCurrent.appLogo,
-      appPid: federatedCurrent.appPid,
-      appUrl: federatedCurrent.appUrl,
-      version: federatedCurrent.version,
+      appId: federatedCurrent?.appId,
+      appName: federatedCurrent?.appName,
+      appDescription: federatedCurrent?.appDescription,
+      appLogo: federatedCurrent?.appLogo,
+      appPid: federatedCurrent?.appPid,
+      appUrl: federatedCurrent?.appUrl,
+      version: federatedCurrent?.version,
       // NOTICE: null 代表该值置空
       sourceAppPid: null,
       provider: 'wallet'

package/lib/util/index.js

@@ -18,6 +18,7 @@ import { evaluateURLs } from '@abtnode/util/lib/url-evaluation';
 import checkAccessible from '@abtnode/util/lib/url-evaluation/check-accessible-browser';
 import { BLOCKLET_MODES } from '@blocklet/constant';
 import urlPathFriendly from '@blocklet/meta/lib/url-path-friendly';
+const STORE_LOGO_FILTER = 'imageFilter=convert&f=png&h=80';
 export { formatError };
 export function filesize(size, options = {}) {
   return _filesize(size, {
@@ -300,17 +301,11 @@ export const getIssuePassportLink = ({
   u.searchParams.set('id', id);
   return u.href;
 };
-export const formatRegistryScreenshotPath = (did, asset) => {
-  if (asset.startsWith('/assets')) {
-    return asset;
-  }
-  return `/assets/${did}/screenshots/${asset}`;
-};
 export const formatRegistryLogoPath = (did, asset, version = '') => {
   if (asset.startsWith('/assets')) {
     return asset;
   }
-  return version ? `/assets/${did}/${asset}?v=${version}` : `/assets/${did}/${asset}`;
+  return version ? `/assets/${did}/${asset}?v=${version}&${STORE_LOGO_FILTER}` : `/assets/${did}/${asset}?${STORE_LOGO_FILTER}`;
 };
 export function getWebWalletUrl(info) {
   try {
@@ -373,7 +368,7 @@ export const getBlockletLogoUrl = ({
   if (apiPrefix) {
     apiPrefix = `/${apiPrefix}`;
   }
-  return joinURL(apiPrefix, version ? `/blocklet/logo/${did}?v=${version}` : `/blocklet/logo/${did}`);
+  return joinURL(apiPrefix, version ? `/blocklet/logo/${did}?v=${version}&${STORE_LOGO_FILTER}` : `/blocklet/logo/${did}?${STORE_LOGO_FILTER}`);
 };
 export const getPathPrefix = () => window.env && window.env.apiPrefix ? window.env.apiPrefix : '/';
 export const isUrlAccessible = url => checkAccessible(joinURL(new URL(url).origin, WELLKNOWN_PING_PREFIX));
@@ -595,7 +590,7 @@ export const getStoreList = ({
   const storeList = fromBlocklet ? blocklet?.settings?.storeList || [] : nodeInfo?.blockletRegistryList || [];
   return {
     teamDid,
-    storeList: storeList.filter(x => !x.scope || x.scope !== 'studio')
+    storeList: storeList.filter(x => x.protected || !x.scope)
   };
 };
 const isDidDomainOrIpEchoDomain = domain => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.29-beta-88bdefe8",
+  "version": "1.16.29-beta-a076832b",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -25,25 +25,25 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.29-beta-88bdefe8",
-    "@abtnode/constant": "1.16.29-beta-88bdefe8",
-    "@abtnode/util": "1.16.29-beta-88bdefe8",
+    "@abtnode/auth": "1.16.29-beta-a076832b",
+    "@abtnode/constant": "1.16.29-beta-a076832b",
+    "@abtnode/util": "1.16.29-beta-a076832b",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.123",
-    "@arcblock/did-connect": "^2.10.0",
+    "@arcblock/did": "^1.18.124",
+    "@arcblock/did-connect": "^2.10.2",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.10.0",
-    "@arcblock/nft-display": "2.10.0",
-    "@arcblock/react-hooks": "^2.10.0",
-    "@arcblock/terminal": "^2.10.0",
-    "@arcblock/ux": "^2.10.0",
-    "@blocklet/constant": "1.16.29-beta-88bdefe8",
-    "@blocklet/js-sdk": "1.16.29-beta-88bdefe8",
-    "@blocklet/launcher-layout": "2.3.22",
-    "@blocklet/list": "^0.12.114",
-    "@blocklet/meta": "1.16.29-beta-88bdefe8",
-    "@blocklet/ui-react": "^2.10.0",
-    "@blocklet/uploader": "^0.1.13",
+    "@arcblock/icons": "^2.10.2",
+    "@arcblock/nft-display": "2.10.2",
+    "@arcblock/react-hooks": "^2.10.2",
+    "@arcblock/terminal": "^2.10.2",
+    "@arcblock/ux": "^2.10.2",
+    "@blocklet/constant": "1.16.29-beta-a076832b",
+    "@blocklet/js-sdk": "1.16.29-beta-a076832b",
+    "@blocklet/launcher-layout": "2.3.24",
+    "@blocklet/list": "^0.13.4",
+    "@blocklet/meta": "1.16.29-beta-a076832b",
+    "@blocklet/ui-react": "^2.10.2",
+    "@blocklet/uploader": "^0.1.16",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify-icons/logos": "^1.2.36",
@@ -56,7 +56,7 @@
     "@mui/styles": "^5.15.11",
     "@mui/x-date-pickers": "^6.19.0",
     "@mui/x-tree-view": "^6.17.0",
-    "@ocap/client": "1.18.123",
+    "@ocap/client": "1.18.124",
     "@uiw/react-markdown-preview": "^5.1.1",
     "ahooks": "^3.7.8",
     "axios": "^1.7.2",
@@ -108,5 +108,5 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "2a91288d21c8defe019e1debfc242b6ef708573e"
+  "gitHead": "aa0791bd43f8c7068b24bc426ce0f0e4d8a3f583"
 }