@abtnode/ux 1.16.6-beta-8be2fe37 → 1.16.6-beta-4562aa60

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/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/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',
@@ -995,8 +996,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: '是的，停止',
@@ -997,8 +998,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-4562aa60",
   "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-4562aa60",
+    "@abtnode/constant": "1.16.6-beta-4562aa60",
+    "@abtnode/util": "1.16.6-beta-4562aa60",
+    "@arcblock/did-connect": "^2.5.27",
     "@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.27",
+    "@arcblock/react-hooks": "^2.5.27",
+    "@arcblock/terminal": "^2.5.27",
+    "@arcblock/ux": "^2.5.27",
+    "@blocklet/constant": "1.16.6-beta-4562aa60",
+    "@blocklet/launcher-layout": "2.0.30",
     "@blocklet/list": "^0.11.18",
-    "@blocklet/meta": "1.16.6-beta-8be2fe37",
-    "@blocklet/ui-react": "^2.5.25",
+    "@blocklet/meta": "1.16.6-beta-4562aa60",
+    "@blocklet/ui-react": "^2.5.27",
     "@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": "e49856099ffc3c16eda77480a7ad93b2e9760764"
 }