@abtnode/ux 1.16.25 → 1.16.26-beta-e0056285

package/lib/locales/vi.js

@@ -263,7 +263,7 @@ var _default = exports.default = {
     protected: 'Bảo vệ',
     protocol: 'Giao thức',
     publish: 'Xuất bản',
-    published: 'Đã xuất bản',
+    published: 'Công bố',
     purchase: 'Mua hàng',
     readMore: 'Nhiều hơn',
     redirect: 'Chuyển hướng',
@@ -354,7 +354,12 @@ var _default = exports.default = {
     endTime: 'Thời gian kết thúc',
     selected: 'Đã chọn',
     timeoutError: 'Lỗi thời gian chờ',
-    tags: 'Tags'
+    tags: 'Tags',
+    publishToStore: 'Xuất bản vào Cửa hàng',
+    connectToStore: 'Kết nối tới Cửa hàng',
+    uploaded: 'Đã tải lên',
+    uploadToStore: 'Tải lên Cửa hàng',
+    upload: 'Tải lên'
   },
   blocklet: {
     external: 'Bên ngoài',
@@ -697,7 +702,10 @@ var _default = exports.default = {
       download: 'Tải về {name}',
       delete: 'Xóa {name}',
       copyInstallUrl: 'Sao chép URL cài đặt',
-      install: 'Cài đặt {name}'
+      install: 'Cài đặt {name}',
+      publishToStoreSuccess: 'Blocklet đã được xuất bản vào cửa hàng thành công',
+      connectStoreSuccess: 'Kết nối Blocklet Store thành công',
+      uploadToStoreSuccess: 'Blocklet đã tải lên Store thành công, bạn cần phải xuất bản nó trong Store'
     },
     titleValidationError: 'Độ dài tiêu đề phải ít nhất 3 ký tự',
     descriptionValidationError: 'Chiều dài mô tả phải từ 3 đến 160 ký tự.'

package/lib/locales/zh-tw.js

@@ -354,7 +354,12 @@ var _default = exports.default = {
     endTime: '結束時間',
     selected: '已選取',
     timeoutError: '超時錯誤',
-    tags: '標籤'
+    tags: '標籤',
+    publishToStore: '發布到商店',
+    connectToStore: '連接至商店',
+    uploaded: '已上傳',
+    uploadToStore: '上傳至 Store',
+    upload: '上傳'
   },
   blocklet: {
     external: '外部的',
@@ -697,7 +702,10 @@ var _default = exports.default = {
       download: '下載 {name}',
       delete: '刪除 {name}',
       copyInstallUrl: '複製安裝連結',
-      install: '安裝{name}'
+      install: '安裝{name}',
+      publishToStoreSuccess: '成功發佈到 Store 的區塊鏈',
+      connectStoreSuccess: 'Store 連線成功',
+      uploadToStoreSuccess: 'Blocklet 成功上傳至 Store，請在 Store 中發布'
     },
     titleValidationError: '標題長度必須至少為3到40個字符',
     descriptionValidationError: '描述長度必須介於3到160個字符之間'

package/lib/locales/zh.js

@@ -263,7 +263,7 @@ var _default = exports.default = {
     protected: '受保护',
     protocol: '协议',
     publish: '发布',
-    published: '发布于',
+    published: '已发布',
     purchase: '购买',
     readMore: '更多',
     redirect: '重定向',
@@ -354,7 +354,12 @@ var _default = exports.default = {
     endTime: '结束时间',
     selected: '已选中',
     timeoutError: '超时错误',
-    tags: '标签'
+    tags: '标签',
+    publishToStore: '发布到 Store',
+    connectToStore: '连接 Store',
+    uploaded: '已上传',
+    uploadToStore: '上传到 Store',
+    upload: '上传'
   },
   blocklet: {
     external: '外部',
@@ -700,7 +705,10 @@ var _default = exports.default = {
       download: '下载 {name}',
       delete: '删除 {name}',
       copyInstallUrl: '复制安装链接',
-      install: '安装 {name}'
+      install: '安装 {name}',
+      publishToStoreSuccess: '成功发布 Blocklet 到 Store',
+      connectStoreSuccess: 'Blocklet 成功连接 Store',
+      uploadToStoreSuccess: 'Blocklet 成功上传至 Store，请在 Store 中发布'
     },
     titleValidationError: '标题长度必须至少为3到40个字符',
     descriptionValidationError: '描述长度必须在3到160个字符之间'

package/lib/store/add.js

@@ -23,6 +23,7 @@ var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 const useStyles = (0, _styles.makeStyles)(theme => ({
   addMenuItemRoot: {
+    marginTop: '8px',
     justifyContent: 'center',
     color: theme.palette.primary.main,
     lineHeight: '3.2'

package/lib/store/delete.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = DeleteStore;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _useTheme = _interopRequireDefault(require("@mui/material/styles/useTheme"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _DeleteOutline = _interopRequireDefault(require("@mui/icons-material/DeleteOutline"));
 var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
+var _material = require("@mui/material");
 var _node = require("../contexts/node");
 var _deleteConfirm = _interopRequireDefault(require("../delete-confirm"));
 var _util = require("../util");
@@ -74,11 +74,16 @@ function DeleteStore(_ref) {
     setConfirmSetting(setting);
   };
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+      color: "primary",
       disabled: loading,
       onClick: onMenuItemClick,
-      size: "large",
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DeleteOutline.default, {})
+      size: "small",
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_DeleteOutline.default, {
+        sx: {
+          zoom: 0.95
+        }
+      })
     }), confirmSetting && /*#__PURE__*/(0, _jsxRuntime.jsx)(_deleteConfirm.default, {
       keyName: confirmSetting.keyName,
       title: confirmSetting.title,

package/lib/store/item.js

@@ -5,16 +5,21 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = StoreItem;
 var _styles = require("@mui/styles");
-var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
-var _ListItemSecondaryAction = _interopRequireDefault(require("@mui/material/ListItemSecondaryAction"));
+var _material = require("@mui/material");
 var _Launch = _interopRequireDefault(require("@mui/icons-material/Launch"));
-var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
+var _BackupOutlined = _interopRequireDefault(require("@mui/icons-material/BackupOutlined"));
+var _LinkOutlined = _interopRequireDefault(require("@mui/icons-material/LinkOutlined"));
+var _Done = _interopRequireDefault(require("@mui/icons-material/Done"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
+var _react = require("react");
+var _urlJoin = _interopRequireDefault(require("url-join"));
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _delete = _interopRequireDefault(require("./delete"));
+var _node = require("../contexts/node");
+var _util = require("../util");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-/* eslint-disable react/jsx-one-expression-per-line */
-
 const useStyles = (0, _styles.makeStyles)(() => ({
   buttonText: {
     textTransform: 'none !important'
@@ -22,63 +27,254 @@ const useStyles = (0, _styles.makeStyles)(() => ({
   iconRoot: {
     minWidth: 24
   },
+  box: {
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    overflow: 'hidden',
+    width: '100%'
+  },
   menuName: {
+    flexShrink: 1,
     display: 'flex',
     flexDirection: 'column',
-    marginRight: '100px',
-    '& span': {
-      overflow: 'hidden',
-      textOverflow: 'ellipsis',
-      whiteSpace: 'nowrap'
-    }
+    overflow: 'hidden',
+    flex: 1
+  },
+  actions: {
+    flex: 1,
+    display: 'flex',
+    flexDirection: 'row',
+    justifyContent: 'flex-end',
+    alignItems: 'center'
+  },
+  title: {
+    fontSize: 16,
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap'
+  },
+  url: {
+    fontSize: 14,
+    opacity: 0.5,
+    overflow: 'hidden',
+    textOverflow: 'ellipsis',
+    whiteSpace: 'nowrap'
+  },
+  buttonLine: {
+    height: '100%',
+    width: '1px',
+    backgroundColor: '#e0e0e0'
   }
 }));
 function StoreItem(_ref) {
   let {
     teamDid,
+    projectId,
+    releaseId,
     store,
-    onDelete
+    onDelete,
+    kind,
+    published,
+    connected,
+    releaseType,
+    onPublish
   } = _ref;
   const classes = useStyles();
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
+  const {
+    api
+  } = (0, _node.useNodeContext)();
+  const [loading, setLoading] = (0, _react.useState)(false);
+  const isPublish = kind === 'publish';
+  const handleOpenUrl = e => {
+    e.stopPropagation();
+    if (isPublish) {
+      window.open((0, _urlJoin.default)(store.url, 'developer/blocklets'));
+      return;
+    }
+    window.open(store.url);
+  };
+  const handleConnectToStore = () => {
+    setLoading(true);
+    setTimeout(() => {
+      setLoading(false);
+    }, 10000);
+    api.connectToStore({
+      input: {
+        did: teamDid,
+        storeUrl: store.url,
+        storeId: store.id,
+        storeName: store.name
+      }
+    }).then(res => {
+      if (!(res !== null && res !== void 0 && res.url)) {
+        _Toast.default.error('failed to connect to store');
+        return;
+      }
+      window.open(res.url);
+    }).catch(err => {
+      _Toast.default.error((0, _util.formatError)(err));
+    });
+  };
+  const handleUploadToStore = () => {
+    setLoading(true);
+    api.publishToStore({
+      input: {
+        did: teamDid,
+        storeId: store.id,
+        storeName: store.name,
+        projectId,
+        releaseId,
+        type: releaseType
+      }
+    }).then(res => {
+      if (res.url === 'uploaded') {
+        _Toast.default.success(t('blocklet.publish.uploadToStoreSuccess'));
+      } else if (res.url === 'published') {
+        _Toast.default.success(t('blocklet.publish.publishToStoreSuccess'));
+      }
+      onPublish === null || onPublish === void 0 || onPublish(null);
+    }).catch(err => {
+      _Toast.default.error((0, _util.formatError)(err));
+      onPublish === null || onPublish === void 0 || onPublish(err);
+    }).finally(() => {
+      setLoading(false);
+    });
+  };
+  (0, _react.useEffect)(() => {
+    if (connected) {
+      setLoading(false);
+    }
+  }, [connected]);
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: classes.menuName,
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
-      component: "span",
-      variant: "subtitle1",
-      style: {
-        fontWeight: '400'
+    className: classes.box,
+    children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.CircularProgress, {
+      sx: {
+        marginRight: 2
       },
-      children: store.name
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Typography.default, {
-      className: "url",
-      component: "span",
-      variant: "inherit",
-      children: "".concat(store.url)
-    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ListItemSecondaryAction.default, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_IconButton.default, {
-        onClick: e => {
-          e.stopPropagation();
-          window.open(store.url);
+      size: 16
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: classes.menuName,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+        component: "span",
+        className: classes.title,
+        variant: "subtitle1",
+        children: store.name
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+        className: classes.url,
+        component: "span",
+        variant: "inherit",
+        children: "".concat(store.url)
+      })]
+    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      className: classes.actions,
+      children: [isPublish && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.ButtonGroup, {
+        disabled: loading,
+        variant: "outlined",
+        sx: {
+          height: 36
+        },
+        size: "small",
+        children: [!connected && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Button, {
+          sx: {
+            paddingLeft: 2,
+            paddingRight: 2,
+            fontSize: 15
+          },
+          onClick: handleConnectToStore,
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_LinkOutlined.default, {
+            sx: {
+              marginRight: 1
+            }
+          }), t('common.connect')]
+        }), connected && published && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Button, {
+          disabled: true,
+          sx: {
+            paddingLeft: 2,
+            paddingRight: 2,
+            fontSize: 15
+          },
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Done.default, {
+            sx: {
+              marginRight: 1
+            }
+          }), t('common.uploaded')]
+        }), connected && !published && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Button, {
+          sx: {
+            paddingLeft: 2,
+            paddingRight: 2,
+            fontSize: 15
+          },
+          onClick: handleUploadToStore,
+          children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_BackupOutlined.default, {
+            sx: {
+              marginRight: 1
+            }
+          }), t('common.upload')]
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+          onClick: handleOpenUrl,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Launch.default, {
+            sx: {
+              zoom: 0.9
+            }
+          })
+        }), !store.protected && /*#__PURE__*/(0, _jsxRuntime.jsx)(_delete.default, {
+          store: store,
+          onDelete: onDelete,
+          teamDid: teamDid
+        })]
+      }), !isPublish && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.ButtonGroup, {
+        disabled: loading,
+        variant: "outlined",
+        sx: {
+          height: 36
         },
-        size: "large",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Launch.default, {})
-      }), !store.protected && /*#__PURE__*/(0, _jsxRuntime.jsx)(_delete.default, {
-        store: store,
-        onDelete: onDelete,
-        teamDid: teamDid
+        size: "small",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Button, {
+          onClick: handleOpenUrl,
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Launch.default, {
+            sx: {
+              zoom: 0.9
+            }
+          })
+        }), !store.protected && /*#__PURE__*/(0, _jsxRuntime.jsx)(_delete.default, {
+          store: store,
+          onDelete: onDelete,
+          teamDid: teamDid
+        })]
       })]
     })]
   });
 }
 StoreItem.propTypes = {
+  kind: _propTypes.default.string,
   teamDid: _propTypes.default.string.isRequired,
+  published: _propTypes.default.bool,
+  connected: _propTypes.default.bool,
+  projectId: _propTypes.default.string,
+  releaseId: _propTypes.default.string,
+  releaseType: _propTypes.default.string,
   store: _propTypes.default.shape({
+    id: _propTypes.default.string.isRequired,
     name: _propTypes.default.string.isRequired,
     url: _propTypes.default.string.isRequired,
-    protected: _propTypes.default.bool
+    protected: _propTypes.default.bool,
+    connected: _propTypes.default.bool
   }).isRequired,
-  onDelete: _propTypes.default.func
+  onDelete: _propTypes.default.func,
+  onPublish: _propTypes.default.func
 };
 StoreItem.defaultProps = {
+  kind: 'store',
+  published: false,
+  connected: false,
+  releaseId: '',
+  projectId: '',
+  releaseType: '',
+  onPublish: () => {},
   onDelete: () => {}
 };

package/lib/util/index.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", {
 exports.checkIsWildcardDomain = exports.checkInputByType = exports.appendParams = exports.BlockletAdminRoles = exports.APP_PREFIX = void 0;
 exports.deepDecodeURIComponent = deepDecodeURIComponent;
 exports.extractStatusUrlFromNextWorkflow = extractStatusUrlFromNextWorkflow;
+exports.filesize = filesize;
 exports.formatDateTime = formatDateTime;
-exports.formatDiskSize = void 0;
 Object.defineProperty(exports, "formatError", {
   enumerable: true,
   get: function get() {
@@ -41,7 +41,7 @@ exports.shouldCheckDomainStatus = void 0;
 exports.sleep = sleep;
 exports.validateDomain = exports.toSlotDomain = exports.stringSortHandlerAsc = exports.sortDomains = void 0;
 var _constant = require("@abtnode/constant");
-var _filesize = _interopRequireDefault(require("filesize"));
+var _filesize2 = require("filesize");
 var _humanizeUrl = _interopRequireDefault(require("humanize-url"));
 var _isUrl = _interopRequireDefault(require("is-url"));
 var _get = _interopRequireDefault(require("lodash/get"));
@@ -58,10 +58,19 @@ var _checkAccessibleBrowser = _interopRequireDefault(require("@abtnode/util/lib/
 var _constant2 = require("@blocklet/constant");
 var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
 var _window$env;
-/* eslint-disable max-len */
-/* eslint-disable implicit-arrow-linebreak */
-/* eslint-disable import/prefer-default-export */
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+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; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } /* eslint-disable max-len */ /* eslint-disable implicit-arrow-linebreak */ /* eslint-disable import/prefer-default-export */
+function filesize(size) {
+  let options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  return (0, _filesize2.filesize)(size, _objectSpread({
+    base: 2,
+    round: 2
+  }, options));
+}
 function sleep(t) {
   // eslint-disable-next-line no-promise-executor-return
   return new Promise(resolve => setTimeout(resolve, t));
@@ -272,14 +281,6 @@ const isDownloading = status => ['waiting', 'downloading'].includes(status);
 exports.isDownloading = isDownloading;
 const isRunning = status => status === 'running';
 exports.isRunning = isRunning;
-const formatDiskSize = exports.formatDiskSize = function formatDiskSize(size) {
-  let serverPlatform = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
-  const base = serverPlatform === 'linux' ? 2 : 10;
-  return (0, _filesize.default)(size, {
-    base,
-    round: 2
-  });
-};
 const checkInputByType = (type, value) => {
   const typesMap = {
     url: _isUrl.default

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/ux",
-  "version": "1.16.25",
+  "version": "1.16.26-beta-e0056285",
   "description": "UX components shared across abtnode packages",
   "publishConfig": {
     "access": "public"
@@ -28,9 +28,9 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "Apache-2.0",
   "dependencies": {
-    "@abtnode/auth": "1.16.25",
-    "@abtnode/constant": "1.16.25",
-    "@abtnode/util": "1.16.25",
+    "@abtnode/auth": "1.16.26-beta-e0056285",
+    "@abtnode/constant": "1.16.26-beta-e0056285",
+    "@abtnode/util": "1.16.26-beta-e0056285",
     "@ahooksjs/use-url-state": "^3.5.1",
     "@arcblock/did": "^1.18.113",
     "@arcblock/did-connect": "^2.9.63",
@@ -40,10 +40,10 @@
     "@arcblock/react-hooks": "^2.9.63",
     "@arcblock/terminal": "^2.9.63",
     "@arcblock/ux": "^2.9.63",
-    "@blocklet/constant": "1.16.25",
+    "@blocklet/constant": "1.16.26-beta-e0056285",
     "@blocklet/launcher-layout": "2.2.66",
     "@blocklet/list": "^0.12.79",
-    "@blocklet/meta": "1.16.25",
+    "@blocklet/meta": "1.16.26-beta-e0056285",
     "@blocklet/ui-react": "^2.9.63",
     "@blocklet/uploader": "^0.0.75",
     "@emotion/react": "^11.10.4",
@@ -64,7 +64,7 @@
     "copy-to-clipboard": "^3.3.3",
     "date-fns": "^2.30.0",
     "dsbridge": "3.1.4",
-    "filesize": "^6.4.0",
+    "filesize": "^10.1.1",
     "flat": "^5.0.2",
     "humanize-url": "^2.1.1",
     "is-absolute-url": "3",
@@ -107,7 +107,7 @@
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0"
   },
-  "gitHead": "8752b9a0caa8745e16e1de8db4ef696b713ffb4d",
+  "gitHead": "a79b8637ad50d136e7c5d91bfb41dc7a7c337485",
   "exports": {
     ".": {
       "import": "./es/index.js",