@abtnode/ux 1.16.25-next-b726d470 → 1.16.25

package/lib/locales/zh-tw.js

@@ -661,12 +661,12 @@ var _default = exports.default = {
       resourceTitle: '資源',
       blockletEmptyTip: '這裡沒有任何區塊元件',
       createBlockletTip: '您可以透過現有的資源、元件和設定，在此應用程式中建立新的 blocklet',
-      createBlocklet: '建立新的 blocklet',
+      createBlocklet: '新的區塊',
       deleteBlockletTip: '刪除後無法恢復區塊，請確認',
       componentNotRunning: '{name}元件未運行，請先啟動。',
       releaseEmptyTip: '這裡沒有任何發布',
       createReleaseTip: '您可以創建一個區塊釋出，附帶釋出說明和資源，供其他人使用',
-      createRelease: '建立一個新的發布',
+      createRelease: '新版本發布',
       deleteReleaseTip: '刪除後無法還原發布',
       createBlockletDid: '從DID錢包創建',
       createReleaseSuccess: '發佈成功',
@@ -686,13 +686,18 @@ var _default = exports.default = {
         noDescription: '需要提供 Blocklet 描述',
         noNote: '需要提供發佈說明'
       },
-      packTip: '組件和應用程式配置將自動包含在區塊中',
+      packTip: '目前，blocklet可以直接安裝為應用程序。組件和應用程序配置將自動包含在blocklet中',
       resourceChangedWarning: '您已修改資源，請儘速保存',
-      installResourceTip: '請將元件新增到應用程式中，元件URL:',
+      installResourceTip: '安裝網址:',
       installResourceTip2: '如果您想查看更多提示，請訪問 {name}',
       installResourceHelp: '幫助文件',
       componentIncluded: '已包含',
-      componentForceRequired: '強制要求'
+      componentForceRequired: '強制要求',
+      productListTitle: '發布 Blocklets',
+      download: '下載 {name}',
+      delete: '刪除 {name}',
+      copyInstallUrl: '複製安裝連結',
+      install: '安裝{name}'
     },
     titleValidationError: '標題長度必須至少為3到40個字符',
     descriptionValidationError: '描述長度必須介於3到160個字符之間'
@@ -796,7 +801,7 @@ var _default = exports.default = {
         switchLabel: '歡迎頁面'
       },
       upgrade: {
-        title: '升級 Blocklet 伺服器 {version}',
+        title: '升級 Blocklet 伺服器',
         description: '在升級期間，您的 Blocklet 伺服器將進入維護模式，更新完成後將持續幾分鐘。',
         dialog: '點擊"確認"安裝更新。Blocklet服務器將進入維護模式，直到更新完成並自動返回生產模式。',
         confirm: '升級',
@@ -809,7 +814,7 @@ var _default = exports.default = {
         verifying: '正在驗證Blocklet服務器v{version}',
         rollback: '回滾Blocklet伺服器',
         complete: '升級完成！',
-        progress: '正在升級Blocklet伺服器{version}',
+        progress: '升級 {name}',
         check: '檢查更新',
         latest: '您正在執行最新版本。'
       },
@@ -824,7 +829,7 @@ var _default = exports.default = {
         cleanup: '確保一切正常',
         rollback: '清理髒污狀態',
         complete: '維護完成！',
-        progress: '重新啟動 Blocklet 伺服器'
+        progress: '重新啟動 {name}'
       },
       register: {
         titleAdded: '已新增至 Blocklet Launcher',

package/lib/locales/zh.js

@@ -661,26 +661,26 @@ var _default = exports.default = {
       productTitle: 'Blocklet 详情',
       versionTitle: '版本信息',
       imgTitle: '图片资源',
-      resourceTitle: '组件资源',
-      blockletEmptyTip: '这里没有任何 blocklet',
+      resourceTitle: '资源型 Blocklet',
+      blockletEmptyTip: '这里没有任何 Blocklet',
       createBlockletTip: '你可以使用此应用的资源，组件，配置制作新的 Blocklet',
-      createBlocklet: '创建 Blocklet',
+      createBlocklet: '新的块',
       deleteBlockletTip: '此 Blocklet 删除后不可恢复，是否继续？',
       componentNotRunning: '组件 {name} 未运行',
       releaseEmptyTip: '这里没有任何发布',
-      createReleaseTip: '您可以创建 Blocklet 发布，在发布中包含说明和资源，以供其他人使用',
-      createRelease: '创建新的发布',
+      createReleaseTip: '您可以创建 Blocklet 新版本，在发布中包含说明和资源，以供其他人使用',
+      createRelease: '创建新的版本',
       deleteReleaseTip: '此发布删除后不可恢复，是否继续？',
       createBlockletDid: '通过 DID 钱包创建',
       createReleaseSuccess: '发布成功',
       saveDraftSuccess: '保存成功',
-      packTip: 'Blocklet 中将自动包含组件和应用配置',
+      packTip: '您的 Blocklet 现在可以直接安装为应用程序。应用程序配置将自动包含在内',
       resourceChangedWarning: '您修改了资源，请及时保存',
-      installResourceTip: '请在应用中添加组件，组件 URL：',
+      installResourceTip: '安装网址:',
       installResourceTip2: '如果你需要更多提示，请查看',
       installResourceHelp: '帮助文档',
       componentIncluded: '包含',
-      componentForceRequired: '强制依赖',
+      componentForceRequired: '强依赖',
       connect: {
         title: '创建 Blocklet DID',
         scan: '扫描下面的二维码来生成 Blocklet DID',
@@ -695,7 +695,12 @@ var _default = exports.default = {
         noVersion: '请填写 Blocklet 版本号',
         noDescription: '请填写 Blocklet 描述',
         noNote: '请填写 发布说明'
-      }
+      },
+      productListTitle: '发布 Blocklets',
+      download: '下载 {name}',
+      delete: '删除 {name}',
+      copyInstallUrl: '复制安装链接',
+      install: '安装 {name}'
     },
     titleValidationError: '标题长度必须至少为3到40个字符',
     descriptionValidationError: '描述长度必须在3到160个字符之间'
@@ -792,7 +797,7 @@ var _default = exports.default = {
       nftDomainUrl: 'NFT Domain 地址',
       nftDomainUrlPlaceholder: '你可以选择其它的 NFT Domain 服务器, 也可以使用官方提供的版本',
       upgrade: {
-        title: '升级节点 {version}',
+        title: '升级 Blocklet 服务器',
         description: '在升级期间，节点将会进入维护模式几分钟。',
         dialog: '点击 “确认” 安装更新。节点将进入维护模式，直到更新完成并自动返回生产模式。',
         confirm: '升级',
@@ -805,7 +810,7 @@ var _default = exports.default = {
         verifying: '验证节点新版本 v{version}',
         rollback: '回滚此次升级',
         complete: '升级完成!',
-        progress: '正在升级节点 {version}',
+        progress: '升级 {name}',
         check: '检查更新',
         latest: '太棒了，你的节点已经是最新版！'
       },
@@ -820,7 +825,7 @@ var _default = exports.default = {
         cleanup: '验证重启成功',
         rollback: '撤销重启操作',
         complete: '维护完成',
-        progress: '正在重启节点'
+        progress: '重新开始 {name}'
       },
       welcome: {
         switchLabel: 'Welcome 页面'

package/lib/subscription/blocklet.js

@@ -69,6 +69,9 @@ function SubscriptionBlocklet(_ref) {
       launcherSessionId,
       locale
     })]);
+    if (data !== null && data !== void 0 && data.error) {
+      throw new Error(data.error);
+    }
     return {
       launcherSession: data.launcherSession,
       subscriptionURL

package/lib/subscription/server.js

@@ -58,9 +58,12 @@ function SubscriptionServer(_ref) {
     rest = _objectWithoutProperties(props, _excluded2);
   const typoKey = isMobile ? 'mobile' : 'desktop';
   const asyncState = (0, _useAsyncRetry.default)(async () => {
-    const [asset, subscriptionURL] = await Promise.all([node.api.getLauncherSession({
+    const [data, subscriptionURL] = await Promise.all([
+    // 新 Launch 的 Server 会有 launcherSessionId 信息，旧的 Server 只有 nftId
+    // 这里做兼容处理，优先使用 launcherSessionId, 如果没有则使用 nftId
+    node.api.getLauncherSession({
       input: {
-        launcherSessionId,
+        launcherSessionId: launcherSessionId || nftId,
         launcherUrl
       }
     }), (0, _util.getSubscriptionUrlV2)({
@@ -69,8 +72,11 @@ function SubscriptionServer(_ref) {
       launcherSessionId,
       locale
     })]);
+    if (data !== null && data !== void 0 && data.error) {
+      throw new Error(data.error);
+    }
     return {
-      asset,
+      launcherSession: data.launcherSession,
       subscriptionURL
     };
   }, [locale]);
@@ -102,7 +108,7 @@ function SubscriptionServer(_ref) {
       onClick: () => asyncState.retry()
     }));
   }
-  const expirationDate = (0, _util.getAssetExpiration)((_asyncState$value = asyncState.value) === null || _asyncState$value === void 0 ? void 0 : _asyncState$value.asset);
+  const expirationDate = (_asyncState$value = asyncState.value) === null || _asyncState$value === void 0 || (_asyncState$value = _asyncState$value.launcherSession) === null || _asyncState$value === void 0 ? void 0 : _asyncState$value.expirationDate;
   const isExpired = (0, _dayjs.default)(expirationDate).isBefore((0, _dayjs.default)());
   const validityMs = (0, _dayjs.default)(expirationDate).diff((0, _dayjs.default)(), 'ms');
   let status = 'success';

package/lib/team/members/connections.js

@@ -24,7 +24,8 @@ function UserConnections(_ref) {
       nameWidth: 120,
       name: account.provider,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
-        did: account.did
+        did: account.did,
+        showQrcode: true
       })
     }, account.did);
   });

package/lib/team/members/member.js

@@ -351,7 +351,8 @@ function Member(_ref2) {
               className: "did",
               mt: 1,
               children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
-                did: pageState.user.did
+                did: pageState.user.did,
+                showQrcode: true
               })
             })]
           })]

package/lib/util/index.js

@@ -23,7 +23,6 @@ exports.formatUrl = void 0;
 exports.getAccessUrl = getAccessUrl;
 exports.getAccessibleUrl = void 0;
 exports.getAsset = getAsset;
-exports.getAssetExpiration = getAssetExpiration;
 exports.getBlockletLogoUrl = void 0;
 exports.getBlockletMetaUrl = getBlockletMetaUrl;
 exports.getBlockletUrl = getBlockletUrl;
@@ -46,7 +45,6 @@ var _filesize = _interopRequireDefault(require("filesize"));
 var _humanizeUrl = _interopRequireDefault(require("humanize-url"));
 var _isUrl = _interopRequireDefault(require("is-url"));
 var _get = _interopRequireDefault(require("lodash/get"));
-var _last = _interopRequireDefault(require("lodash/last"));
 var _trimEnd = _interopRequireDefault(require("lodash/trimEnd"));
 var _querystring = _interopRequireDefault(require("querystring"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
@@ -617,9 +615,6 @@ async function getAsset(chainHost, address) {
   }
   return state;
 }
-function getAssetExpiration(asset) {
-  return (0, _last.default)((0, _get.default)(asset, 'data.value.expirationDate', []));
-}
 
 /**
  * 检查url是否 未添加到 store list 中

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.25-next-b726d470",
+  "version": "1.16.25",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -28,23 +28,23 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.25-next-b726d470",
-    "@abtnode/constant": "1.16.25-next-b726d470",
-    "@abtnode/util": "1.16.25-next-b726d470",
+    "@abtnode/auth": "1.16.25",
+    "@abtnode/constant": "1.16.25",
+    "@abtnode/util": "1.16.25",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.113",
-    "@arcblock/did-connect": "^2.9.60",
+    "@arcblock/did-connect": "^2.9.63",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.9.60",
-    "@arcblock/nft-display": "2.9.60",
-    "@arcblock/react-hooks": "^2.9.60",
-    "@arcblock/terminal": "^2.9.60",
-    "@arcblock/ux": "^2.9.60",
-    "@blocklet/constant": "1.16.25-next-b726d470",
-    "@blocklet/launcher-layout": "2.2.60",
-    "@blocklet/list": "^0.12.78",
-    "@blocklet/meta": "1.16.25-next-b726d470",
-    "@blocklet/ui-react": "^2.9.60",
+    "@arcblock/icons": "^2.9.63",
+    "@arcblock/nft-display": "2.9.63",
+    "@arcblock/react-hooks": "^2.9.63",
+    "@arcblock/terminal": "^2.9.63",
+    "@arcblock/ux": "^2.9.63",
+    "@blocklet/constant": "1.16.25",
+    "@blocklet/launcher-layout": "2.2.66",
+    "@blocklet/list": "^0.12.79",
+    "@blocklet/meta": "1.16.25",
+    "@blocklet/ui-react": "^2.9.63",
     "@blocklet/uploader": "^0.0.75",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -107,7 +107,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "3adef75441748e01ccba82fa1bfd875cbd096185",
+  "gitHead": "8752b9a0caa8745e16e1de8db4ef696b713ffb4d",
   "exports": {
     ".": {
       "import": "./es/index.js",

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

@@ -1,205 +0,0 @@
-import { useState } from 'react';
-import { Link, useNavigate, useParams } from 'react-router-dom';
-import useLocalStorage from 'react-use/lib/useLocalStorage';
-import MenuItem from '@mui/material/MenuItem';
-import TextField from '@mui/material/TextField';
-import Typography from '@mui/material/Typography';
-import Breadcrumbs from '@mui/material/Breadcrumbs';
-import InputAdornment from '@mui/material/InputAdornment';
-import styled from '@emotion/styled';
-import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
-import Box from '@mui/material/Box';
-import Button from '@arcblock/ux/lib/Button';
-import DidConnect from '@arcblock/did-connect/lib/Connect';
-import Toast from '@arcblock/ux/lib/Toast';
-import { useNodeContext } from '../../contexts/node';
-import { useBlockletContext } from '../../contexts/blocklet';
-import { useSessionContext } from '../../contexts/session';
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-const Types = [{
-  label: {
-    en: 'Resource',
-    zh: '资源'
-  },
-  value: 'resource'
-}, {
-  label: {
-    en: 'Application',
-    zh: '应用'
-  },
-  value: 'pack'
-}];
-export default function CreateProject({
-  ...rest
-}) {
-  const navigate = useNavigate();
-  const {
-    t,
-    locale
-  } = useLocaleContext();
-  const {
-    blocklet
-  } = useBlockletContext();
-  const [blockletTitle, setBlockletTitle] = useState('');
-  const [loading, setLoading] = useState(false);
-  const [type, setType] = useState('resource'); // resource, pack
-  const {
-    api: sessionApi
-  } = useSessionContext();
-  const {
-    api
-  } = useNodeContext();
-  const [blockletDid, setBlockletDid] = useState();
-  const [openConnect, setOpenConnect] = useState(false);
-  const [manualCreateBlockletDid] = useLocalStorage('manual-create-blocklet-did', false);
-  const {
-    componentDid = ''
-  } = useParams();
-  const handleCreateBlockletDidError = err => {
-    Toast.error(err.message);
-    setOpenConnect(false);
-  };
-  const handleCreateBlockletDidSuccess = result => {
-    const did = result?.blockletWallet?.address;
-    if (!did) {
-      Toast.error('Empty Blocklet DID');
-    } else {
-      setBlockletDid(did);
-    }
-    setOpenConnect(false);
-  };
-  const onCreate = () => {
-    if (!blockletDid) {
-      Toast.error(t('blocklet.publish.errorTip.noDid'));
-      return;
-    }
-    if (!blockletTitle) {
-      Toast.error(t('blocklet.publish.errorTip.noTitle'));
-      return;
-    }
-    setLoading(true);
-    api.createProject({
-      input: {
-        did: blocklet.meta.did,
-        blockletTitle: blockletTitle || '',
-        blockletDid,
-        type,
-        componentDid
-      }
-    }).then(() => {
-      setLoading(false);
-      navigate('../', {
-        replace: true
-      });
-    }).catch(err => {
-      setLoading(false);
-      Toast.error(err.message);
-    });
-  };
-  return /*#__PURE__*/_jsxs(Main, {
-    ...rest,
-    children: [/*#__PURE__*/_jsxs(Breadcrumbs, {
-      className: "breadcrumbs",
-      "aria-label": "breadcrumb",
-      children: [/*#__PURE__*/_jsx(Link, {
-        to: "..",
-        children: t('common.publish')
-      }), /*#__PURE__*/_jsxs(Typography, {
-        color: "text.primary",
-        children: [t('common.create'), " Blocklet"]
-      })]
-    }), /*#__PURE__*/_jsxs(Box, {
-      style: {
-        maxWidth: 500
-      },
-      children: [/*#__PURE__*/_jsx(TextField, {
-        required: true,
-        sx: {
-          mb: 4
-        },
-        label: "Blocklet DID",
-        fullWidth: true,
-        readonly: true,
-        autoComplete: "off",
-        variant: "outlined",
-        onChange: e => manualCreateBlockletDid && setBlockletDid(e.target.value),
-        onClick: () => !manualCreateBlockletDid && !blockletDid && setOpenConnect(true),
-        InputProps: {
-          'data-cy': 'export-blocklet-did',
-          endAdornment: !manualCreateBlockletDid && /*#__PURE__*/_jsx(InputAdornment, {
-            position: "end",
-            children: /*#__PURE__*/_jsx(Button, {
-              onClick: () => setOpenConnect(true),
-              children: t(blockletDid ? 'common.update' : 'common.create')
-            })
-          })
-        },
-        helperText: "",
-        value: blockletDid || ''
-      }), openConnect && /*#__PURE__*/_jsx(DidConnect, {
-        open: true,
-        popup: true,
-        onClose: () => setOpenConnect(false),
-        action: "gen-blocklet-key-pair",
-        locale: locale,
-        checkFn: sessionApi.get,
-        saveConnect: false,
-        forceConnected: false,
-        checkTimeout: 5 * 60 * 1000,
-        onSuccess: handleCreateBlockletDidSuccess,
-        onError: handleCreateBlockletDidError,
-        extraParams: {
-          did: blocklet.meta.did
-        },
-        messages: {
-          title: t('blocklet.publish.connect.title'),
-          scan: t('blocklet.publish.connect.scan'),
-          confirm: t('blocklet.publish.connect.confirm'),
-          success: t('blocklet.publish.connect.success')
-        }
-      }), /*#__PURE__*/_jsx(TextField, {
-        required: true,
-        label: `Blocklet ${t('common.title')}`,
-        autoComplete: "off",
-        variant: "outlined",
-        InputProps: {
-          'data-cy': 'export-blocklet-title'
-        },
-        fullWidth: true,
-        helperText: "",
-        value: blockletTitle || '',
-        onChange: e => {
-          setBlockletTitle(e.target.value);
-        }
-      }), /*#__PURE__*/_jsx(TextField, {
-        sx: {
-          my: 4
-        },
-        id: "blocklet-type",
-        select: true,
-        label: `Blocklet ${t('common.type')}`,
-        helperText: "",
-        fullWidth: true,
-        value: type,
-        onChange: e => setType(e.target.value),
-        children: Types.map(x => /*#__PURE__*/_jsx(MenuItem, {
-          value: x.value,
-          disabled: x.disabled,
-          children: x.label[locale] || x.label.en
-        }, x.value))
-      })]
-    }), /*#__PURE__*/_jsx(Button, {
-      variant: "contained",
-      disabled: loading,
-      onClick: onCreate,
-      children: t('common.create')
-    })]
-  });
-}
-CreateProject.propTypes = {};
-CreateProject.defaultProps = {};
-const Main = styled.div`
-  .breadcrumbs {
-    margin-bottom: 24px;
-  }
-`;