@abtnode/ux 1.16.6-beta-8be2fe37 → 1.16.6-beta-4ea1eb90

package/lib/blocklet/actions.js

@@ -87,20 +87,32 @@ function BlockletActions(_ref) {
         setConfirmSetting(null);
         let isRemoved = false;
         try {
-          var _blocklet$settings;
           if (action === 'remove') {
             await fn(params);
-          } else if (action === 'start' && !inService && !skipSetup && !((_blocklet$settings = blocklet.settings) !== null && _blocklet$settings !== void 0 && _blocklet$settings.initialized)) {
-            // 启动 blocklet 并跳转到 setup 流程界面时携带 serverUrl 查询参数
-            const serverUrl = (0, _util3.getServerUrl)(node.info);
-            const url = new URL(recommendedUrl);
-            url.searchParams.set('serverUrl', serverUrl);
-            window.open(url.href);
-            onComplete({
-              action,
-              blocklet
+          } else if (action === 'start') {
+            var _blocklet$settings;
+            if (!inService && !skipSetup && !((_blocklet$settings = blocklet.settings) !== null && _blocklet$settings !== void 0 && _blocklet$settings.initialized)) {
+              // 跳转到 setup 流程界面时携带 serverUrl 查询参数
+              const serverUrl = (0, _util3.getServerUrl)(node.info);
+              const url = new URL(recommendedUrl);
+              url.searchParams.set('serverUrl', serverUrl);
+              window.open(url.href);
+              onComplete({
+                action,
+                blocklet
+              });
+              return;
+            }
+            if (!(0, _util.hasRunnableComponent)(blocklet)) {
+              _toast.default.error(t('blocklet.noComponent'));
+              return;
+            }
+            const input = {
+              did: blocklet.meta.did
+            };
+            await fn({
+              input
             });
-            return;
           } else {
             const input = {
               did: blocklet.meta.did
@@ -283,7 +295,7 @@ function BlockletActions(_ref) {
     icon: _icons.default.Start,
     name: t('common.start'),
     handler: createHandler('start', node.api.startBlocklet),
-    disabled: !(0, _util.hasRunnableComponent)(blocklet) || blocklet.status === 'running' || blocklet.status === 'corrupted' || missingRequiredConfigs.length > 0 || (0, _util2.isDownloading)(blocklet.status) || blocklet.mode === _constant.BLOCKLET_MODES.DEVELOPMENT || recommendedUrlLoading || inProgress
+    disabled: blocklet.status === 'running' || blocklet.status === 'corrupted' || missingRequiredConfigs.length > 0 || (0, _util2.isDownloading)(blocklet.status) || blocklet.mode === _constant.BLOCKLET_MODES.DEVELOPMENT || recommendedUrlLoading || inProgress
   }, {
     action: 'stop',
     icon: _icons.default.Stop,

package/lib/blocklet/component/environment.js

@@ -30,6 +30,20 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+const getDescription = (data, t) => {
+  let {
+    description
+  } = data;
+  if (Object.values(_constant.CHAIN_PROP_MAP).includes(data.key)) {
+    description = "".concat(data.description, " (").concat(t('blocklet.config.sharedToAllComponents'), ")");
+  }
+  return description && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+    style: {
+      marginLeft: 12
+    },
+    children: description
+  });
+};
 function ComponentEnvironment(_ref) {
   let {
     blocklet,
@@ -141,7 +155,7 @@ function ComponentEnvironment(_ref) {
   const sharedConfigObj = (0, _util.getSharedConfigObj)(blocklet, ancestors);
   const missingRequiredConfigs = (0, _util.getComponentMissingConfigs)(blocklet, ancestors);
   const configs = componentConfigs.map(x => _objectSpread(_objectSpread({}, x), {}, {
-    value: sharedConfigObj[x.key] || x.value
+    value: Object.values(_constant.CHAIN_PROP_MAP).includes(x.key) && Object.keys(sharedConfigObj).includes(x.key) ? sharedConfigObj[x.key] : sharedConfigObj[x.key] || x.value
   }));
   const hasBWAConfig = configs.some(x => x.key && x.key.startsWith('BWA_'));
   const action = {
@@ -224,12 +238,7 @@ function ComponentEnvironment(_ref) {
           placeholder: t('blocklet.config.environment.value'),
           margin: "dense",
           autoFocus: true
-        }), rowData.description && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          style: {
-            marginLeft: 12
-          },
-          children: rowData.description
-        })]
+        }), getDescription(rowData, t)]
       });
     }
   }];

package/lib/blocklet/component/space-connector.js

@@ -74,7 +74,10 @@ const SpaceConnector = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
   } = (0, _react.useContext)(_context.LocaleContext);
   /** @type {{ blocklet: import('@abtnode/client').BlockletState }} */
   const {
-    blocklet
+    blocklet,
+    actions: {
+      refreshBlocklet
+    }
   } = (0, _blocklet.useBlockletContext)();
   const [gatewayUrl, setGatewayUrl] = (0, _react.useState)('');
   const spaceProps = (0, _react.useMemo)(() => {
@@ -116,6 +119,7 @@ const SpaceConnector = /*#__PURE__*/(0, _react.forwardRef)((_ref, ref) => {
         open: false
       }));
       onConnect === null || onConnect === void 0 ? void 0 : onConnect();
+      refreshBlocklet();
     }, 3000);
   };
   const [authorizeConnect, setAuthorizeConnect] = (0, _react.useState)({

package/lib/blocklet/configuration.js

@@ -553,7 +553,7 @@ function BlockletEnvironment(_ref) {
             edge: "end",
             color: "error",
             size: "small",
-            "data-cy": "invite-member",
+            "data-cy": "transfer-app",
             onClick: () => setShowTransferOwner(true),
             children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Loop.default, {
               style: {

package/lib/blocklet/preferences/index.js

@@ -43,28 +43,31 @@ const addComponentTabs = function addComponentTabs(tabs, blocklet) {
   let ancestors = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
   let depth = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
   const key = [...ancestors.map(x => x.meta.did), blocklet.meta.did].join('/');
-  tabs.push({
-    label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
-      pl: Math.max(1, depth - 1) * 2,
-      display: "flex",
-      alignItems: "center",
-      justifyContent: "flex-start",
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_bundleAvatar.default, {
-        size: 24,
-        blocklet: blocklet,
-        ancestors: ancestors
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
-        ml: "16px",
-        children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
-          style: {
-            color: '#222'
-          },
-          children: (0, _util.getDisplayName)(blocklet, true)
-        })
-      })]
-    }, key),
-    value: key
-  });
+  const isContainer = !(ancestors !== null && ancestors !== void 0 && ancestors.length);
+  if (!isContainer) {
+    tabs.push({
+      label: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
+        pl: Math.max(1, depth - 1) * 2,
+        display: "flex",
+        alignItems: "center",
+        justifyContent: "flex-start",
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_bundleAvatar.default, {
+          size: 24,
+          blocklet: blocklet,
+          ancestors: ancestors
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+          ml: "16px",
+          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+            style: {
+              color: '#222'
+            },
+            children: (0, _util.getDisplayName)(blocklet, true)
+          })
+        })]
+      }, key),
+      value: key
+    });
+  }
   if (blocklet.children.length > 0) {
     blocklet.children.forEach(x => {
       addComponentTabs(tabs, x, [...ancestors, blocklet], depth + 1);

package/lib/blocklet/storage.js

@@ -44,17 +44,14 @@ function useBackupProgress(_ref) {
     completed: false
   });
   const node = (0, _node.useNodeContext)();
-  const webSocketClient = node.ws.getWsClient();
-  (0, _react.useEffect)(() => {
-    webSocketClient.on(_constant.BlockletEvents.backupProgress, data => {
-      if (appDid === (data === null || data === void 0 ? void 0 : data.appDid)) {
-        setProgress(preValue => _objectSpread(_objectSpread({}, preValue), data));
-      }
-    });
-    return () => {
-      webSocketClient.off(_constant.BlockletEvents.backupProgress);
-    };
-  }, [appDid, webSocketClient]);
+  const {
+    ws: {
+      useSubscription
+    }
+  } = node;
+  useSubscription(_constant.BlockletEvents.backupProgress, data => {
+    setProgress(preValue => _objectSpread(_objectSpread({}, preValue), data));
+  }, [appDid]);
   return progress;
 }
 function Storage() {
@@ -162,7 +159,7 @@ function Storage() {
           },
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.LinearProgress, {
             color: "primary",
-            variant: "indeterminate",
+            variant: "determinate",
             value: progress === null || progress === void 0 ? void 0 : progress.progress
           })
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {

package/lib/blocklet/transfer-owner.js

@@ -115,24 +115,29 @@ function TransferOwner(_ref) {
       return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
           component: Bold,
-          children: t('team.transferApp.transferDialog.createSuccessTip', {
-            expireDate: (0, _util.formatToDatetime)(result.expireDate)
-          })
+          dangerouslySetInnerHTML: {
+            __html: t('team.transferApp.transferDialog.createSuccessTip1')
+          }
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
           component: Bold,
-          mt: 1,
+          mt: 2,
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Bold, {
-            children: t('team.transferApp.transferDialog.createSuccessTip2')
+            children: t('team.transferApp.transferDialog.createSuccessTip3')
           })
-        }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-          style: {
-            marginTop: '20px'
-          }
         }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
           children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-            children: t('team.transferApp.transferDialog.link')
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_clickToCopy.default, {
-            children: link
+            component: Bold,
+            mt: 2,
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(Bold, {
+              children: t('team.transferApp.transferDialog.createSuccessTip2', {
+                expireDate: (0, _util.formatToDatetime)(result.expireDate)
+              })
+            })
+          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+            my: 1,
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_clickToCopy.default, {
+              children: link
+            })
           })]
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_FormControlLabel.default, {

package/lib/locales/en.js

@@ -321,6 +321,7 @@ module.exports = {
     statusTip: 'Blocklet is {status}',
     initialUptime: 'Less than 1m',
     dashboard: 'Blocklet Dashboard',
+    noComponent: 'Application has no components and cannot be started',
     fromUrl: {
       title: 'Install Blocklet',
       label: 'Blocklet Meta URL',
@@ -423,7 +424,8 @@ module.exports = {
       appDidChangeTipL2: 'The DID domain name of the application will change, and the original domain name will become invalid',
       appSkChangeTip: 'You are changing application secret key',
       walletTypeTitle: 'Update Wallet Type',
-      appSkTitle: 'Update Application Secret Key'
+      appSkTitle: 'Update Application Secret Key',
+      sharedToAllComponents: 'Will be shared to all components'
     },
     overview: {
       source: 'Source',
@@ -660,6 +662,7 @@ module.exports = {
         dialog: 'Click on "confirm" to install the update. Blocklet Server will enter maintenance mode until the update is completed and return to production mode automatically.',
         confirm: 'Upgrade',
         switchLabel: 'Auto Update Check',
+        enableBetaRelease: 'Enable Beta Release',
         setup: 'Preparing the upgrade',
         installing: 'Installing Blocklet Server v{version}',
         restarting: 'Restarting Blocklet Server',
@@ -995,8 +998,9 @@ module.exports = {
           newOwnerPermissions: 'The new Owner will have the right to manage all operations such as members, passports, and settings.'
         },
         createTransferLink: 'Generate Transfer Link',
-        createSuccessTip: 'The transfer link is successfully created, click to copy and send the link to the invited member, please note that this invitation link can not be reused and will expire on {expireDate}',
-        createSuccessTip2: 'Your transfer link will only be shown once and will not be viewable again after closing this dialog',
+        createSuccessTip1: 'The transfer link is successfully created, the invitee must use <a style="color: rgb(29, 193, 199)" target="_blank" href="https://www.didwallet.io/">DID Wallet</a> to receive the app ownership',
+        createSuccessTip2: 'Please click to copy and send the link to the invited member, please note that this transfer link can not be reused and will expire on {expireDate}. Your transfer link will only be shown once and will not be viewable again after closing this dialog',
+        createSuccessTip3: 'After the transfer is successful, the application will automatically restart to make the changes take effect',
         link: 'Transfer Link',
         iKnow: 'I have copied and saved the link'
       },

package/lib/locales/zh.js

@@ -326,6 +326,7 @@ module.exports = {
     statusTip: 'Blocklet {status}',
     initialUptime: '少于1分钟',
     dashboard: 'Blocklet 控制台',
+    noComponent: '应用没有组件，无法启动',
     action: {
       stopDescription: '停止该基石程序将会使页面不可以访问，可能会导致使用它的用户出现错误',
       confirmStop: '是的，停止',
@@ -428,7 +429,8 @@ module.exports = {
       appDidChangeTipL2: '应用的 DID 域名会发生变化，原域名将会失效',
       appSkChangeTip: '你正在修改应用私钥',
       walletTypeTitle: '修改钱包类型',
-      appSkTitle: '修改应用私钥'
+      appSkTitle: '修改应用私钥',
+      sharedToAllComponents: '将共享给所有组件'
     },
     overview: {
       source: '来源',
@@ -660,6 +662,7 @@ module.exports = {
         dialog: '点击 “确认” 安装更新。节点将进入维护模式，直到更新完成并自动返回生产模式。',
         confirm: '升级',
         switchLabel: '自动更新检查',
+        enableBetaRelease: '允许安装测试版',
         setup: '准备升级中',
         installing: '安装节点新版本（v{version}）',
         restarting: '重新启动节点',
@@ -997,8 +1000,9 @@ module.exports = {
           newOwnerPermissions: '新 Owner 将有权管理成员、通行证，以及设置等所有操作。'
         },
         createTransferLink: '生成转移链接',
-        createSuccessTip: '创建转移链接成功，请复制并发送给被邀请人。该链接只能使用一次，并将在 {expireDate} 过期',
-        createSuccessTip2: '你的转移链接只会展示一次，关闭此窗口后将无法再次查看',
+        createSuccessTip1: '创建转移链接成功，被邀请人必须使用 <a style="color: rgb(29, 193, 199)" target="_blank" href="https://www.didwallet.io/">DID Wallet</a> 接收应用所有权',
+        createSuccessTip2: '请复制并发送给被邀请人。该链接只能使用一次，并将在 {expireDate} 过期。你的转移链接只会展示一次，关闭此窗口后将无法再次查看',
+        createSuccessTip3: '转移成功之后应用会自动重启以使变更生效',
         link: '邀请链接',
         iKnow: '我已复制保存好该链接'
       },

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.6-beta-8be2fe37",
+  "version": "1.16.6-beta-4ea1eb90",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -22,20 +22,20 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.6-beta-8be2fe37",
-    "@abtnode/constant": "1.16.6-beta-8be2fe37",
-    "@abtnode/util": "1.16.6-beta-8be2fe37",
-    "@arcblock/did-connect": "^2.5.25",
+    "@abtnode/auth": "1.16.6-beta-4ea1eb90",
+    "@abtnode/constant": "1.16.6-beta-4ea1eb90",
+    "@abtnode/util": "1.16.6-beta-4ea1eb90",
+    "@arcblock/did-connect": "^2.5.29",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.25",
-    "@arcblock/react-hooks": "^2.5.25",
-    "@arcblock/terminal": "^2.5.25",
-    "@arcblock/ux": "^2.5.25",
-    "@blocklet/constant": "1.16.6-beta-8be2fe37",
-    "@blocklet/launcher-layout": "^2.0.30",
+    "@arcblock/icons": "^2.5.29",
+    "@arcblock/react-hooks": "^2.5.29",
+    "@arcblock/terminal": "^2.5.29",
+    "@arcblock/ux": "^2.5.29",
+    "@blocklet/constant": "1.16.6-beta-4ea1eb90",
+    "@blocklet/launcher-layout": "2.0.32",
     "@blocklet/list": "^0.11.18",
-    "@blocklet/meta": "1.16.6-beta-8be2fe37",
-    "@blocklet/ui-react": "^2.5.25",
+    "@blocklet/meta": "1.16.6-beta-4ea1eb90",
+    "@blocklet/ui-react": "^2.5.29",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -90,5 +90,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "27229a1a62850e95907b7a53e0259a809d99377b"
+  "gitHead": "0f0f63b552a88343a3f8e0d434b47c3bca6a75b9"
 }