@abtnode/ux 1.16.23-beta-abdda301 → 1.16.23-beta-035db744

package/es/blocklet/logo-uploader.js

@@ -49,6 +49,9 @@ export default function LogoUploader({
       popup: true,
       onUploadFinish: onFinish,
       plugins: ['ImageEditor'],
+      installerProps: {
+        disabled: true
+      },
       apiPathProps: {
         uploader: joinUrl(prefix, uploadPrefix, type, did),
         disableMediaKitPrefix: true

package/es/blocklet/publish/create-release.js

@@ -14,6 +14,7 @@ import IconButton from '@mui/material/IconButton';
 import DeleteOutlineIcon from '@mui/icons-material/DeleteOutline';
 import InputAdornment from '@mui/material/InputAdornment';
 import Spinner from '@mui/material/CircularProgress';
+import Dialog from '@mui/material/Dialog';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Button from '@arcblock/ux/lib/Button';
 import Toast from '@arcblock/ux/lib/Toast';
@@ -26,6 +27,7 @@ import BlockletBundleAvatar from '../bundle-avatar';
 import { useNodeContext } from '../../contexts/node';
 import { useBlockletContext } from '../../contexts/blocklet';
 import EmptySpinner from '../../empty-spinner';
+import ClickToCopy from '../../click-to-copy';
 import { formatError } from '../../util';
 import Resource from './resource';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -34,6 +36,8 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
 const allowedFileTypes = ['image/*', '.jpg', '.jpeg', '.png', '.gif', '.svg'];
 const maxFileSize = 1024 * 1024 * 10; // 10 MB
 
+const serverEndpoint = window.env?.serverEndpoint;
+
 // eslint-disable-next-line import/no-unresolved
 const UploaderComponent = /*#__PURE__*/lazy(() => import('@blocklet/uploader/react').then(res => ({
   default: res.Uploader
@@ -130,6 +134,7 @@ export default function CreateRelease({
   const uploaderLogoRef = useRef(null);
   const uploaderScreenshotRef = useRef(null);
   const [projectType, setProjectType] = useState();
+  const [installResourceTip, setInstallResourceTip] = useState();
   const releaseId = inputReleaseId === 'create' ? '' : inputReleaseId;
   const mode = inputReleaseId === 'create' ? 'create' : 'edit';
   const tabs = [];
@@ -309,6 +314,72 @@ export default function CreateRelease({
   const onTabChange = x => {
     setTab(x);
   };
+  let installButton = null;
+  if (isPublished && serverEndpoint) {
+    const blockletMetaUrl = joinUrl(serverEndpoint, `/api/project/${blocklet.meta.did}/${projectId}/${releaseId}/release/blocklet.json`);
+    if (projectType === 'pack') {
+      const url = new URL(serverEndpoint);
+      url.pathname = joinUrl(url.pathname, '/launch-blocklet/agreement');
+      url.searchParams.set('blocklet_meta_url', blockletMetaUrl);
+      installButton = /*#__PURE__*/_jsx(Button, {
+        variant: "outlined",
+        style: {
+          marginRight: 8
+        },
+        children: /*#__PURE__*/_jsx("a", {
+          href: url.href,
+          target: "_blank",
+          rel: "noreferrer",
+          children: t('common.install')
+        })
+      });
+    } else {
+      installButton = /*#__PURE__*/_jsxs(_Fragment, {
+        children: [/*#__PURE__*/_jsx(Button, {
+          variant: "outlined",
+          style: {
+            marginRight: 8
+          },
+          onClick: () => setInstallResourceTip(blockletMetaUrl),
+          children: t('common.install')
+        }), /*#__PURE__*/_jsx(Dialog, {
+          fullWidth: true,
+          maxWidth: "sm",
+          open: installResourceTip,
+          onClose: () => setInstallResourceTip(''),
+          children: /*#__PURE__*/_jsxs(Box, {
+            sx: {
+              py: 5,
+              px: 4,
+              wordBreak: 'break-all'
+            },
+            children: [/*#__PURE__*/_jsx(Typography, {
+              variant: "h6",
+              sx: {
+                mb: 2
+              },
+              children: t('blocklet.publish.installResourceTip')
+            }), /*#__PURE__*/_jsx(ClickToCopy, {
+              children: installResourceTip
+            }), /*#__PURE__*/_jsxs(Typography, {
+              sx: {
+                mt: 2
+              },
+              children: [t('blocklet.publish.installResourceTip2'), /*#__PURE__*/_jsx("a", {
+                style: {
+                  marginLeft: 4
+                },
+                href: "https://www.arcblock.io/docs/blocklet-developer/R3weqCy7WPI8ggudt0C2alWv",
+                target: "_blank",
+                rel: "noreferrer",
+                children: t('blocklet.publish.installResourceHelp')
+              })]
+            })]
+          })
+        })]
+      });
+    }
+  }
   return /*#__PURE__*/_jsxs(Main, {
     ...rest,
     children: [/*#__PURE__*/_jsxs(Box, {
@@ -354,12 +425,14 @@ export default function CreateRelease({
               color: "inherit"
             }), t('common.release')]
           })]
-        }), isPublished && /*#__PURE__*/_jsx(Button, {
-          variant: "contained",
-          children: /*#__PURE__*/_jsx("a", {
-            href: joinUrl(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/project/${blocklet.meta.did}/${projectId}/${releaseId}/download/${(release.files || [])[0]}`),
-            children: t('common.download')
-          })
+        }), isPublished && /*#__PURE__*/_jsxs(_Fragment, {
+          children: [installButton, /*#__PURE__*/_jsx(Button, {
+            variant: "contained",
+            children: /*#__PURE__*/_jsx("a", {
+              href: joinUrl(`${WELLKNOWN_SERVICE_PATH_PREFIX}/api/project/${blocklet.meta.did}/${projectId}/${releaseId}/download/${(release.files || [])[0]}`),
+              children: t('common.download')
+            })
+          })]
         })]
       })]
     }), /*#__PURE__*/_jsxs(Box, {
@@ -624,6 +697,9 @@ export default function CreateRelease({
             uploaderLogoRef.current.close();
           },
           plugins: ['ImageEditor'],
+          installerProps: {
+            disabled: true
+          },
           apiPathProps: {
             uploader: uploadLogoPrefix,
             disableMediaKitPrefix: true

package/es/blocklet/router/action/add-rule.js

@@ -104,7 +104,9 @@ export default function AddRule({
           autoComplete: "off",
           variant: "outlined",
           name: "pathPrefix",
-          "data-cy": "path-prefix-input",
+          inputProps: {
+            'data-cy': 'path-prefix-input'
+          },
           fullWidth: true,
           autoFocus: true,
           helperText: params.pathPrefixHint || t('router.rule.add.pathPrefixTip'),

package/es/blocklet/router/action/config-routing-rule.js

@@ -111,7 +111,9 @@ export default function ConfigRoutingRule({
       autoComplete: "off",
       variant: "outlined",
       name: "url",
-      "data-cy": "redirect-url-input",
+      inputProps: {
+        'data-cy': 'redirect-url-input'
+      },
       fullWidth: true,
       value: params.url,
       helperText: t('router.urlHelperText'),

package/es/blocklet/router/action/update-rule.js

@@ -108,7 +108,9 @@ export default function UpdateRule({
           autoComplete: "off",
           variant: "outlined",
           name: "pathPrefix",
-          "data-cy": "path-prefix-input",
+          inputProps: {
+            'data-cy': 'path-prefix-input'
+          },
           fullWidth: true,
           autoFocus: true,
           helperText: params.helperText || t('router.rule.add.pathPrefixTip'),

package/es/locales/en.js

@@ -648,6 +648,10 @@ export default {
       saveDraftSuccess: 'Draft saved successfully',
       packTip: 'Components and application configuration will be automatically included in the blocklet',
       resourceChangedWarning: 'You have modified the resource, please save it in time',
+      installResourceTip: 'Please add the component in an application, component URL:',
+      installResourceTip2: 'If you want to see more tips, please visit',
+      // translate to en
+      installResourceHelp: 'Help Document',
       connect: {
         title: 'Create Blocklet DID',
         scan: 'Scan the QR code below to generate Blocklet DID',

package/es/locales/zh.js

@@ -657,6 +657,9 @@ export default {
       saveDraftSuccess: '保存成功',
       packTip: 'Blocklet 中将自动包含组件和应用配置',
       resourceChangedWarning: '您修改了资源，请及时保存',
+      installResourceTip: '请在应用中添加组件，组件 URL：',
+      installResourceTip2: '如果你需要更多提示，请查看',
+      installResourceHelp: '帮助文档',
       connect: {
         title: '创建 Blocklet DID',
         scan: '扫描下面的二维码来生成 Blocklet DID',

package/lib/blocklet/logo-uploader.js

@@ -60,6 +60,9 @@ function LogoUploader(_ref) {
       popup: true,
       onUploadFinish: onFinish,
       plugins: ['ImageEditor'],
+      installerProps: {
+        disabled: true
+      },
       apiPathProps: {
         uploader: (0, _urlJoin.default)(prefix, uploadPrefix, type, did),
         disableMediaKitPrefix: true

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

@@ -20,6 +20,7 @@ var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _DeleteOutline = _interopRequireDefault(require("@mui/icons-material/DeleteOutline"));
 var _InputAdornment = _interopRequireDefault(require("@mui/material/InputAdornment"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
+var _Dialog = _interopRequireDefault(require("@mui/material/Dialog"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
@@ -32,10 +33,11 @@ var _bundleAvatar = _interopRequireDefault(require("../bundle-avatar"));
 var _node = require("../../contexts/node");
 var _blocklet = require("../../contexts/blocklet");
 var _emptySpinner = _interopRequireDefault(require("../../empty-spinner"));
+var _clickToCopy = _interopRequireDefault(require("../../click-to-copy"));
 var _util = require("../../util");
 var _resource = _interopRequireDefault(require("./resource"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _templateObject;
+var _window$env, _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -49,6 +51,8 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
 const allowedFileTypes = ['image/*', '.jpg', '.jpeg', '.png', '.gif', '.svg'];
 const maxFileSize = 1024 * 1024 * 10; // 10 MB
 
+const serverEndpoint = (_window$env = window.env) === null || _window$env === void 0 ? void 0 : _window$env.serverEndpoint;
+
 // eslint-disable-next-line import/no-unresolved
 const UploaderComponent = /*#__PURE__*/(0, _react.lazy)(() => Promise.resolve().then(() => _interopRequireWildcard(require('@blocklet/uploader/react'))).then(res => ({
   default: res.Uploader
@@ -146,6 +150,7 @@ function CreateRelease(_ref2) {
   const uploaderLogoRef = (0, _react.useRef)(null);
   const uploaderScreenshotRef = (0, _react.useRef)(null);
   const [projectType, setProjectType] = (0, _react.useState)();
+  const [installResourceTip, setInstallResourceTip] = (0, _react.useState)();
   const releaseId = inputReleaseId === 'create' ? '' : inputReleaseId;
   const mode = inputReleaseId === 'create' ? 'create' : 'edit';
   const tabs = [];
@@ -325,6 +330,72 @@ function CreateRelease(_ref2) {
   const onTabChange = x => {
     setTab(x);
   };
+  let installButton = null;
+  if (isPublished && serverEndpoint) {
+    const blockletMetaUrl = (0, _urlJoin.default)(serverEndpoint, "/api/project/".concat(blocklet.meta.did, "/").concat(projectId, "/").concat(releaseId, "/release/blocklet.json"));
+    if (projectType === 'pack') {
+      const url = new URL(serverEndpoint);
+      url.pathname = (0, _urlJoin.default)(url.pathname, '/launch-blocklet/agreement');
+      url.searchParams.set('blocklet_meta_url', blockletMetaUrl);
+      installButton = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+        variant: "outlined",
+        style: {
+          marginRight: 8
+        },
+        children: /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
+          href: url.href,
+          target: "_blank",
+          rel: "noreferrer",
+          children: t('common.install')
+        })
+      });
+    } else {
+      installButton = /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+          variant: "outlined",
+          style: {
+            marginRight: 8
+          },
+          onClick: () => setInstallResourceTip(blockletMetaUrl),
+          children: t('common.install')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dialog.default, {
+          fullWidth: true,
+          maxWidth: "sm",
+          open: installResourceTip,
+          onClose: () => setInstallResourceTip(''),
+          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+            sx: {
+              py: 5,
+              px: 4,
+              wordBreak: 'break-all'
+            },
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
+              variant: "h6",
+              sx: {
+                mb: 2
+              },
+              children: t('blocklet.publish.installResourceTip')
+            }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_clickToCopy.default, {
+              children: installResourceTip
+            }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Typography.default, {
+              sx: {
+                mt: 2
+              },
+              children: [t('blocklet.publish.installResourceTip2'), /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
+                style: {
+                  marginLeft: 4
+                },
+                href: "https://www.arcblock.io/docs/blocklet-developer/R3weqCy7WPI8ggudt0C2alWv",
+                target: "_blank",
+                rel: "noreferrer",
+                children: t('blocklet.publish.installResourceHelp')
+              })]
+            })]
+          })
+        })]
+      });
+    }
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Main, _objectSpread(_objectSpread({}, rest), {}, {
     children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
       className: "sticky-header",
@@ -369,12 +440,14 @@ function CreateRelease(_ref2) {
               color: "inherit"
             }), t('common.release')]
           })]
-        }), isPublished && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
-          variant: "contained",
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
-            href: (0, _urlJoin.default)("".concat(_constant2.WELLKNOWN_SERVICE_PATH_PREFIX, "/api/project/").concat(blocklet.meta.did, "/").concat(projectId, "/").concat(releaseId, "/download/").concat((release.files || [])[0])),
-            children: t('common.download')
-          })
+        }), isPublished && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+          children: [installButton, /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+            variant: "contained",
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)("a", {
+              href: (0, _urlJoin.default)("".concat(_constant2.WELLKNOWN_SERVICE_PATH_PREFIX, "/api/project/").concat(blocklet.meta.did, "/").concat(projectId, "/").concat(releaseId, "/download/").concat((release.files || [])[0])),
+              children: t('common.download')
+            })
+          })]
         })]
       })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
@@ -639,6 +712,9 @@ function CreateRelease(_ref2) {
             uploaderLogoRef.current.close();
           },
           plugins: ['ImageEditor'],
+          installerProps: {
+            disabled: true
+          },
           apiPathProps: {
             uploader: uploadLogoPrefix,
             disableMediaKitPrefix: true

package/lib/blocklet/router/action/add-rule.js

@@ -114,7 +114,9 @@ function AddRule(_ref) {
           autoComplete: "off",
           variant: "outlined",
           name: "pathPrefix",
-          "data-cy": "path-prefix-input",
+          inputProps: {
+            'data-cy': 'path-prefix-input'
+          },
           fullWidth: true,
           autoFocus: true,
           helperText: params.pathPrefixHint || t('router.rule.add.pathPrefixTip'),

package/lib/blocklet/router/action/config-routing-rule.js

@@ -124,7 +124,9 @@ function ConfigRoutingRule(_ref) {
       autoComplete: "off",
       variant: "outlined",
       name: "url",
-      "data-cy": "redirect-url-input",
+      inputProps: {
+        'data-cy': 'redirect-url-input'
+      },
       fullWidth: true,
       value: params.url,
       helperText: t('router.urlHelperText'),

package/lib/blocklet/router/action/update-rule.js

@@ -116,7 +116,9 @@ function UpdateRule(_ref) {
           autoComplete: "off",
           variant: "outlined",
           name: "pathPrefix",
-          "data-cy": "path-prefix-input",
+          inputProps: {
+            'data-cy': 'path-prefix-input'
+          },
           fullWidth: true,
           autoFocus: true,
           helperText: params.helperText || t('router.rule.add.pathPrefixTip'),

package/lib/locales/en.js

@@ -654,6 +654,10 @@ var _default = exports.default = {
       saveDraftSuccess: 'Draft saved successfully',
       packTip: 'Components and application configuration will be automatically included in the blocklet',
       resourceChangedWarning: 'You have modified the resource, please save it in time',
+      installResourceTip: 'Please add the component in an application, component URL:',
+      installResourceTip2: 'If you want to see more tips, please visit',
+      // translate to en
+      installResourceHelp: 'Help Document',
       connect: {
         title: 'Create Blocklet DID',
         scan: 'Scan the QR code below to generate Blocklet DID',

package/lib/locales/zh.js

@@ -663,6 +663,9 @@ var _default = exports.default = {
       saveDraftSuccess: '保存成功',
       packTip: 'Blocklet 中将自动包含组件和应用配置',
       resourceChangedWarning: '您修改了资源，请及时保存',
+      installResourceTip: '请在应用中添加组件，组件 URL：',
+      installResourceTip2: '如果你需要更多提示，请查看',
+      installResourceHelp: '帮助文档',
       connect: {
         title: '创建 Blocklet DID',
         scan: '扫描下面的二维码来生成 Blocklet DID',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.23-beta-abdda301",
+  "version": "1.16.23-beta-035db744",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -15,11 +15,13 @@
     "lint:fix": "npm run lint -- --fix",
     "prepublishOnly": "npm run build",
     "prebuild": "rm -fr lib/",
+    "build:core-ux": "npm run build",
     "build": "npm run build:lib && npm run build:es && npm run autoexports",
     "build:lib": "babel src --out-dir lib --copy-files",
     "build:es": "babel --config-file ./babel.config.es.js src --out-dir es --copy-files",
     "autoexports": "node tools/auto-exports.js",
     "watch": "npm run build:es -- -w",
+    "turbo:client": "npm run watch",
     "coverage": "npm run test -- --coverage",
     "test": "node tools/jest.js"
   },
@@ -27,35 +29,35 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.23-beta-abdda301",
-    "@abtnode/constant": "1.16.23-beta-abdda301",
-    "@abtnode/util": "1.16.23-beta-abdda301",
+    "@abtnode/auth": "1.16.23-beta-035db744",
+    "@abtnode/constant": "1.16.23-beta-035db744",
+    "@abtnode/util": "1.16.23-beta-035db744",
     "@ahooksjs/use-url-state": "^3.5.1",
-    "@arcblock/did": "^1.18.108",
-    "@arcblock/did-connect": "^2.9.19",
+    "@arcblock/did": "^1.18.110",
+    "@arcblock/did-connect": "^2.9.24",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.9.19",
-    "@arcblock/nft-display": "2.9.19",
-    "@arcblock/react-hooks": "^2.9.19",
-    "@arcblock/terminal": "^2.9.19",
-    "@arcblock/ux": "^2.9.19",
-    "@blocklet/constant": "1.16.23-beta-abdda301",
+    "@arcblock/icons": "^2.9.24",
+    "@arcblock/nft-display": "2.9.24",
+    "@arcblock/react-hooks": "^2.9.24",
+    "@arcblock/terminal": "^2.9.24",
+    "@arcblock/ux": "^2.9.24",
+    "@blocklet/constant": "1.16.23-beta-035db744",
     "@blocklet/launcher-layout": "2.2.51",
-    "@blocklet/list": "^0.12.67",
-    "@blocklet/meta": "1.16.23-beta-abdda301",
-    "@blocklet/ui-react": "^2.9.19",
-    "@blocklet/uploader": "^0.0.67",
+    "@blocklet/list": "^0.12.69",
+    "@blocklet/meta": "1.16.23-beta-035db744",
+    "@blocklet/ui-react": "^2.9.24",
+    "@blocklet/uploader": "^0.0.69",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
     "@material-table/core": "^0.2.62",
-    "@mui/icons-material": "^5.15.6",
+    "@mui/icons-material": "5.15.5",
     "@mui/lab": "5.0.0-alpha.162",
-    "@mui/material": "^5.15.6",
-    "@mui/styles": "^5.15.6",
+    "@mui/material": "5.15.5",
+    "@mui/styles": "5.15.5",
     "@mui/x-date-pickers": "^6.19.0",
     "@mui/x-tree-view": "^6.17.0",
-    "@ocap/client": "1.18.108",
+    "@ocap/client": "1.18.110",
     "@uiw/react-markdown-preview": "4.0.6",
     "ahooks": "^3.7.8",
     "axios": "^0.27.2",
@@ -105,7 +107,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "2b064df15b34007f6145170ee691ae9e91ff1528",
+  "gitHead": "43b1f85fa413b81be8b8015031ac271a9d9f3456",
   "exports": {
     ".": {
       "import": "./es/index.js",