@abtnode/ux 1.16.30 → 1.16.31-beta-4246ab25

package/lib/blocklet/component/did-space/item.js

@@ -77,7 +77,6 @@ function SpaceItem({
       children: [/*#__PURE__*/_jsx(Box, {
         display: "flex",
         children: /*#__PURE__*/_jsx(PreviewSpaceNft, {
-          alt: spaceGateway.did,
           src: getSpaceNftDisplayUrlFromEndpoint(spaceGateway.endpoint)
         })
       }), /*#__PURE__*/_jsxs(Box, {

package/lib/blocklet/configuration.js

@@ -44,10 +44,11 @@ function BlockletEnvironment({
   const {
     t
   } = useContext(LocaleContext);
-  const [loading, setLoading] = useState('');
+  const [loading, setLoading] = useState(false);
   const [showTransferOwner, setShowTransferOwner] = useState(false);
   const whoCanAccess = getWhoCanAccess(blocklet);
   const publicToStore = blocklet?.settings?.publicToStore;
+  const inviteEnabled = !!blocklet?.settings?.invite?.enabled;
   const disabled = loading || !hasPermission;
   const {
     logoUrl,
@@ -171,6 +172,26 @@ function BlockletEnvironment({
   };
   const onDeletableChange = createBooleanConfigHandler('BLOCKLET_DELETABLE', checked => checked ? 'no' : 'yes');
   const onTenantModeChange = createBooleanConfigHandler('BLOCKLET_APP_TENANT_MODE', checked => checked ? BLOCKLET_TENANT_MODES.MULTIPLE : BLOCKLET_TENANT_MODES.SINGLE);
+  const onChangeInviteSettings = async e => {
+    if (loading) {
+      return;
+    }
+    setLoading(true);
+    try {
+      await api.updateInviteSettings({
+        input: {
+          did: blocklet.meta.did,
+          invite: {
+            enabled: e.target.checked
+          }
+        }
+      });
+    } catch (err) {
+      Toast.error(err.message);
+    } finally {
+      setLoading(false);
+    }
+  };
   const onUpdateCors = async value => {
     const oldValue = site.corsAllowedOrigins || [];
     const newValue = value.split(',').map(x => x.trim()).filter(Boolean);
@@ -493,6 +514,22 @@ function BlockletEnvironment({
             onChange: onTenantModeChange
           })]
         })
+      }), /*#__PURE__*/_jsx(Box, {
+        className: "config-form",
+        children: /*#__PURE__*/_jsxs(Box, {
+          className: "config-item",
+          children: [/*#__PURE__*/_jsxs(Box, {
+            className: "config-label",
+            children: [t('team.invite.setting'), /*#__PURE__*/_jsx(Box, {
+              className: "config-desc",
+              children: t(`team.invite.${inviteEnabled ? 'enabled' : 'disabled'}`)
+            })]
+          }), /*#__PURE__*/_jsx(Switch, {
+            disabled: disabled,
+            checked: inviteEnabled,
+            onChange: onChangeInviteSettings
+          })]
+        })
       })]
     })]
   });

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

@@ -201,6 +201,7 @@ function Header({
           blockletResource: msg
         });
       }
+      return;
     }
     const lastProject = await api.getProject({
       input: {

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

@@ -26,6 +26,7 @@ import ReleaseStepper from './release-stepper';
 import ResourceUpload from './resource-upload';
 import StopBox from './stop-box';
 import Version from './version';
+import preserveOriginalStrings from '../utils/preserve-original-strings';
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const addComponentTabs = ({
   tabs,
@@ -212,6 +213,7 @@ export default function CreateRelease({
         Toast.error('Release not found');
         return;
       }
+      res.release = preserveOriginalStrings(res.release);
       if (mode !== 'view') {
         res.release.note = '';
       }
@@ -245,7 +247,6 @@ export default function CreateRelease({
           projectId
         }
       });
-      setLoading(false);
       const data = res.project || {};
       if (!data.blockletVersion) {
         data.blockletVersion = '1.0.0';
@@ -258,24 +259,28 @@ export default function CreateRelease({
         updateParamsByUrl();
       }
     } catch (err) {
-      setLoading(false);
       Toast.error(formatError(err));
     }
   };
   const getData = useCallback(async () => {
-    if (mode === 'view') {
-      if (!releaseId) {
-        Toast.error('Empty release id');
+    setLoading(true);
+    try {
+      if (mode === 'view') {
+        if (!releaseId) {
+          Toast.error('Empty release id');
+          return;
+        }
+        await getProject();
+        await getRelease();
         return;
       }
       await getProject();
-      await getRelease();
-      return;
-    }
-    await getProject();
-    if (releaseId) {
-      setReleaseUsedLast(true);
-      await getRelease();
+      if (releaseId) {
+        setReleaseUsedLast(true);
+        await getRelease();
+      }
+    } finally {
+      setLoading(false);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [mode, releaseId]);
@@ -380,6 +385,7 @@ export default function CreateRelease({
         flexDirection: isMobile ? 'column' : 'row',
         children: [!isMobile && /*#__PURE__*/_jsx(ReleaseStepper, {
           steps: steps,
+          loading: loading,
           viewMode: mode === 'view',
           params: params,
           hasSelectedResources: hasSelectedResources || params.uploadedResource,

package/lib/blocklet/publish/utils/preserve-original-strings.js

@@ -0,0 +1,11 @@
+export default function preserveOriginalStrings(obj) {
+  // eslint-disable-next-line no-restricted-syntax
+  for (const key in obj) {
+    if (typeof obj[key] === 'string') {
+      obj[key] = obj[key].replace(/\\\\/g, '\\');
+    } else if (typeof obj[key] === 'object' && obj[key] !== null) {
+      preserveOriginalStrings(obj[key]);
+    }
+  }
+  return obj;
+}

package/lib/blocklet/storage/item.js

@@ -418,7 +418,6 @@ function SpaceItem({
           })]
         })]
       }), /*#__PURE__*/_jsx(PreviewSpaceNft, {
-        alt: spaceGateway.did,
         src: getSpaceNftDisplayUrlFromEndpoint(spaceGateway.endpoint),
         width: "72px",
         height: "72px"

package/lib/blocklet/storage/preview-nft.js

@@ -1,6 +1,5 @@
 import React from "react";
 import { useState } from 'react';
-import ReactPlaceholder from 'react-placeholder';
 import { string } from 'prop-types';
 import { Dialog, DialogContent, IconButton } from '@mui/material';
 import CloseOutlinedIcon from '@mui/icons-material/CloseOutlined';
@@ -204,39 +203,42 @@ EmptySpacesNFT.defaultProps = {
 };
 function PreviewSpaceNft({
   src,
-  alt,
   width,
   height
 }) {
-  const [showEmptySpaceNFT, setShowEmptySpaceNFT] = useState(false);
   const [open, setOpen] = useState(false);
   const handleOpen = () => setOpen(true);
   const handleClose = () => setOpen(false);
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(ReactPlaceholder, {
-      ready: showEmptySpaceNFT,
-      customPlaceholder:
-      /*#__PURE__*/
-      // eslint-disable-next-line jsx-a11y/no-noninteractive-element-interactions
-      _jsx("img", {
-        style: {
-          cursor: 'pointer'
-        },
-        alt: alt,
-        src: src,
+    children: [/*#__PURE__*/_jsxs("div", {
+      style: {
+        position: 'relative'
+      },
+      onClick: handleOpen,
+      children: [/*#__PURE__*/_jsx("object", {
+        data: src,
         width: width,
         height: height,
-        onError: () => setShowEmptySpaceNFT(true),
-        onClick: handleOpen
-      }),
-      children: /*#__PURE__*/_jsx(EmptySpacesNFT, {
+        children: /*#__PURE__*/_jsx(EmptySpacesNFT, {
+          viewBox: "0 0 228 258",
+          style: {
+            cursor: 'pointer',
+            width: '64px',
+            height: '64px'
+          }
+        })
+      }), /*#__PURE__*/_jsx("div", {
         style: {
-          cursor: 'pointer',
-          width: '58px',
-          height: '58px'
+          position: 'absolute',
+          top: 0,
+          left: 0,
+          width: '100%',
+          height: '100%',
+          zIndex: '1',
+          cursor: 'pointer'
         },
         onClick: handleOpen
-      })
+      })]
     }), /*#__PURE__*/_jsx(Dialog, {
       open: open,
       onClose: handleClose,
@@ -260,27 +262,27 @@ function PreviewSpaceNft({
             color: 'white'
           },
           children: /*#__PURE__*/_jsx(CloseOutlinedIcon, {})
-        }), showEmptySpaceNFT ? /*#__PURE__*/_jsx(EmptySpacesNFT, {
-          style: {
-            width: '100%',
-            height: '75vh'
-          }
-        }) : /*#__PURE__*/_jsx("img", {
-          src: src,
-          alt: "",
+        }), "(", /*#__PURE__*/_jsx("object", {
+          data: src,
           style: {
             width: '100%',
             height: '75vh',
             objectFit: 'contain'
-          }
-        })]
+          },
+          children: /*#__PURE__*/_jsx(EmptySpacesNFT, {
+            viewBox: "0 0 228 258",
+            style: {
+              width: '100%',
+              height: '75vh'
+            }
+          })
+        }), ")"]
       })
     })]
   });
 }
 PreviewSpaceNft.propTypes = {
   src: string.isRequired,
-  alt: string.isRequired,
   width: string,
   height: string
 };

package/lib/locales/en.js

@@ -1221,8 +1221,14 @@ export default {
     title: 'Your Blocklet Server is up and running!'
   },
   team: {
-    invite: 'Invite New',
     add: 'Add New',
+    invite: {
+      action: 'Invite New',
+      setting: 'Invite Settings',
+      enabled: 'Allow any user to invite new user to this blocklet',
+      disabled: 'Only owner/admin can invite new user to this blocklet',
+      inviter: 'Invited By'
+    },
     member: {
       name: 'Name',
       passport: 'Passport',

package/lib/team/members/index.js

@@ -493,7 +493,7 @@ export default function MemberList({
             fontSize: '1.3em',
             marginRight: 4
           }
-        }), t('team.invite')]
+        }), t('team.invite.action')]
       })
     }));
     if (type === 'server') {

package/lib/team/members/member.js

@@ -148,10 +148,10 @@ export default function Member({
       value: pageState.user.fullName
     }, {
       name: t('common.email'),
-      value: pageState.user.email
+      value: pageState.user.email || '-'
     }, {
       name: t('common.phone'),
-      value: pageState.user.phone
+      value: pageState.user.phone || '-'
     }, {
       name: t('team.member.source'),
       value: /*#__PURE__*/_jsx(Box, {
@@ -173,7 +173,15 @@ export default function Member({
       value: formatToDatetime(pageState.user.createdAt, locale)
     }, {
       name: t('common.remark'),
-      value: pageState.user.remark || '--'
+      value: pageState.user.remark || '-'
+    }, {
+      name: t('team.invite.inviter'),
+      value: pageState.user.inviter ? /*#__PURE__*/_jsx(DidAddress, {
+        compact: true,
+        responsive: true,
+        did: pageState.user.inviter,
+        showQrcode: true
+      }) : '-'
     }, Array.isArray(pageState.user.tags) && pageState.user.tags.length > 0 ? {
       name: t('common.tags'),
       value: pageState.user.tags.map(x => /*#__PURE__*/_jsx(Tag, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.30",
+  "version": "1.16.31-beta-4246ab25",
   "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.30",
-    "@abtnode/constant": "1.16.30",
-    "@abtnode/util": "1.16.30",
+    "@abtnode/auth": "1.16.31-beta-4246ab25",
+    "@abtnode/constant": "1.16.31-beta-4246ab25",
+    "@abtnode/util": "1.16.31-beta-4246ab25",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.132",
-    "@arcblock/did-connect": "^2.10.22",
+    "@arcblock/did": "^1.18.135",
+    "@arcblock/did-connect": "^2.10.27",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.10.22",
-    "@arcblock/nft-display": "2.10.22",
-    "@arcblock/react-hooks": "^2.10.22",
-    "@arcblock/terminal": "^2.10.22",
-    "@arcblock/ux": "^2.10.22",
-    "@blocklet/constant": "1.16.30",
-    "@blocklet/js-sdk": "1.16.30",
-    "@blocklet/launcher-layout": "2.10.22",
+    "@arcblock/icons": "^2.10.27",
+    "@arcblock/nft-display": "2.10.27",
+    "@arcblock/react-hooks": "^2.10.27",
+    "@arcblock/terminal": "^2.10.27",
+    "@arcblock/ux": "^2.10.27",
+    "@blocklet/constant": "1.16.31-beta-4246ab25",
+    "@blocklet/js-sdk": "1.16.31-beta-4246ab25",
+    "@blocklet/launcher-layout": "2.10.27",
     "@blocklet/list": "^0.13.18",
-    "@blocklet/meta": "1.16.30",
-    "@blocklet/ui-react": "^2.10.22",
-    "@blocklet/uploader": "0.1.23",
+    "@blocklet/meta": "1.16.31-beta-4246ab25",
+    "@blocklet/ui-react": "^2.10.27",
+    "@blocklet/uploader": "0.1.28",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify-icons/logos": "^1.2.36",
@@ -56,10 +56,10 @@
     "@mui/styles": "^5.15.11",
     "@mui/x-date-pickers": "^6.19.0",
     "@mui/x-tree-view": "^6.17.0",
-    "@ocap/client": "1.18.132",
+    "@ocap/client": "1.18.135",
     "@uiw/react-markdown-preview": "^5.1.1",
     "ahooks": "^3.7.8",
-    "axios": "^1.7.2",
+    "axios": "^1.7.5",
     "classnames": "^2.3.2",
     "copy-to-clipboard": "^3.3.3",
     "date-fns": "^2.30.0",
@@ -92,7 +92,7 @@
     "react-sortable-tree-theme-material-ui": "^1.0.16",
     "react-use": "^17.4.0",
     "rehype-external-links": "^3.0.0",
-    "semver": "^7.3.8",
+    "semver": "^7.6.3",
     "timeago.js": "^4.0.2",
     "ufo": "^1.5.3",
     "validator": "^13.9.0"
@@ -108,5 +108,5 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "18420639259c736016b19152229183d9fc1c1656"
+  "gitHead": "ef93705b89033e4cd5fed458b64521d0a994a1d0"
 }