@abtnode/ux 1.16.0-beta-ad6df3ae → 1.16.0-beta-7a7d5d97

package/lib/blocklet/install-from-url.js

@@ -23,6 +23,7 @@ var _util = require("@blocklet/meta/lib/util");
 var _node = require("../contexts/node");
 var _session = require("../contexts/session");
 var _util2 = require("../util");
+var _util3 = require("./util");
 var _didAddress = _interopRequireDefault(require("../did-address"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -319,6 +320,7 @@ function InstallFromUrl(_ref) {
       onSuccess: onEndInstall,
       extraParams: {
         title: meta.title,
+        wt: (0, _util3.getWalletType)(meta),
         blockletMetaUrl: decodeURIComponent(url.trim())
       },
       messages: {

package/lib/blocklet/migration.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = BlockletMigration;
-var _react = require("react");
+var _react = _interopRequireWildcard(require("react"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
@@ -17,8 +17,11 @@ var _blocklet = require("../contexts/blocklet");
 var _session = require("../contexts/session");
 var _toast = _interopRequireDefault(require("../toast"));
 var _util2 = require("../util");
+var _util3 = require("./util");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const findDuplicate = blocklet => {
   const map = {};
   let duplicate = null;
@@ -137,6 +140,7 @@ function BlockletMigration() {
     onSuccess: onSuccess,
     extraParams: {
       did: blocklet.meta.did,
+      wt: (0, _util3.getWalletType)(blocklet, true),
       title: (0, _util.getDisplayName)(blocklet)
     },
     messages: {

package/lib/blocklet/util.js

@@ -8,7 +8,7 @@ exports.fixBlocklet = exports.ensureDomainAliases = void 0;
 exports.genExportedMeta = genExportedMeta;
 exports.getLaunchAgreementUrl = exports.getAppCapabilities = void 0;
 exports.getNameByTitle = getNameByTitle;
-exports.getServerUrl = void 0;
+exports.getWalletType = exports.getServerUrl = void 0;
 var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 var _pick = _interopRequireDefault(require("lodash/pick"));
 var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
@@ -230,4 +230,30 @@ const fixBlocklet = async function fixBlocklet(blocklet) {
   }
   blocklet.capabilities = getAppCapabilities(blocklet);
 };
-exports.fixBlocklet = fixBlocklet;
+exports.fixBlocklet = fixBlocklet;
+const DEFAULT_WALLET_TYPE = 'default';
+const getWalletType = function getWalletType(raw) {
+  let fromState = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+  let item;
+
+  // from state: migrating
+  if (fromState) {
+    item = (raw.configs || []).find(x => x.key === 'BLOCKLET_WALLET_TYPE');
+    if (item && item.value) {
+      return item.value;
+    }
+    item = (raw.environments || []).find(x => x.key === 'BLOCKLET_WALLET_TYPE');
+    if (item && item.value) {
+      return item.value;
+    }
+    return DEFAULT_WALLET_TYPE;
+  }
+
+  // from meta: installing
+  item = (raw.environments || []).find(x => x.name === 'BLOCKLET_WALLET_TYPE');
+  if (item && item.default) {
+    return item.default;
+  }
+  return DEFAULT_WALLET_TYPE;
+};
+exports.getWalletType = getWalletType;

package/lib/locales/en.js

@@ -228,6 +228,7 @@ module.exports = {
     requiredErrorText: '{name} is required',
     resource: 'Resource',
     restart: 'Restart',
+    restore: 'Restore',
     retry: 'Retry',
     revoke: 'Revoke',
     role: 'Role',
@@ -306,6 +307,7 @@ module.exports = {
     reloadSuccess: 'Blocklet was reloaded successfully',
     statusTip: 'Blocklet is {status}',
     initialUptime: 'Less than 1m',
+    dashboard: 'Blocklet Dashboard',
     fromUrl: {
       title: 'Install Blocklet',
       label: 'Blocklet Meta URL',
@@ -321,8 +323,8 @@ module.exports = {
       confirmStop: 'Yes, Stop It',
       cancelDownloadDescription: 'Cancel download {name} ?',
       removeApplicationDescription: 'Removing the application will erase code and data generated by this application, which is not recoverable if you do not have any backups',
-      removeApplicationAfterBackup: 'Backup and delete the application. You can restore the application from this server if you need',
-      removeApplicationComplete: 'Delete the application directly',
+      removeApplicationAfterBackup: 'Backup and remove the application. You can restore the application from this server if you need',
+      removeApplicationComplete: 'Remove both code and data for this application',
       removeComponentDescription: 'Removing the component will erase code and data generated by this component, which is not recoverable if you do not have any backups',
       removeComponentKeepData: 'Keep data for this component, only remove code',
       removeComponentComplete: 'Remove both code and data for this component',
@@ -1105,8 +1107,8 @@ module.exports = {
     confirmInstall: 'Confirm Installation',
     dialog: {
       title: 'Authorization Required',
-      freeDescription: 'You need to present Blocklet Server Ownership NFT or Blocklet Server Passport to launch application',
-      freeServerlessDescription: 'Please provide serverless NFT',
+      freeDescription: 'You need to present Blocklet Space NFT or Blocklet Server Passport to launch application',
+      freeServerlessDescription: 'Please provide Blocklet Space NFT',
       nonFreeDescription: 'You need to present application purchase NFT and Blocklet Server NFT to launch application',
       confirm: 'Confirm on your DID Wallet',
       success: 'Authorization Successfully',
@@ -1151,6 +1153,7 @@ module.exports = {
     title: 'Lost Passport',
     description: 'The owner of {name} can scan the QR code to retrieve the passport, members please contact the owner to reissue the passport',
     dialog: {
+      title: 'Recover Passport',
       scan: 'Use your DID Wallet to recover the passport',
       confirm: 'Confirm on your DID Wallet',
       success: 'The passport has been successfully added in your wallet'

package/lib/locales/zh.js

@@ -234,6 +234,7 @@ module.exports = {
     requiredErrorText: '{name}是必填的',
     resource: '资源',
     restart: '重启',
+    restore: '还原',
     retry: '重试',
     revoke: '撤销',
     role: '角色',
@@ -312,13 +313,14 @@ module.exports = {
     reloadSuccess: 'Blocklet 重启成功',
     statusTip: 'Blocklet {status}',
     initialUptime: '少于1分钟',
+    dashboard: 'Blocklet 控制台',
     action: {
       stopDescription: '停止该基石程序将会使页面不可以访问，可能会导致使用它的用户出现错误',
       confirmStop: '是的，停止',
       cancelDownloadDescription: '取消下载 {name} ？',
       removeApplicationDescription: '如果没有备份数据，删除应用将会删除所有数据，包括应用运行时产生的所有数据',
-      removeApplicationAfterBackup: '备份和删除该应用。 需要时您可以从此服务器恢复该应用',
-      removeApplicationComplete: '直接删除该应用',
+      removeApplicationAfterBackup: '备份后删除应用。 需要时您可以从此服务器恢复该应用',
+      removeApplicationComplete: '直接删除应用程序和数据',
       removeComponentDescription: '如果没有备份数据，删除该组件将会删除所有数据，包括组件运行时产生的所有数据',
       removeComponentKeepData: '保留该组件的数据，只删除组件',
       removeComponentComplete: '删除组件和数据',
@@ -1111,8 +1113,8 @@ module.exports = {
     confirmInstall: '确认安装',
     dialog: {
       title: '需要您的授权',
-      freeDescription: '你需要提供节点所有权 NFT 或节点通行证凭据来启动应用',
-      freeServerlessDescription: '请提供无服务 NFT',
+      freeDescription: '你需要提供应用空间 NFT 或节点通行证凭据来启动应用',
+      freeServerlessDescription: '请提应用空间 NFT',
       nonFreeDescription: '你需要提供应用购买凭证和节点通行证来启动应用',
       confirm: '在您的 DID 钱包上确认',
       success: '授权成功',
@@ -1156,6 +1158,7 @@ module.exports = {
     title: '找回通行证',
     description: '{name} 所有者可扫描二维码找回通行证，成员请联系所有者重新颁发通行证',
     dialog: {
+      title: '找回通行证',
       scan: '用您的 DID 钱包扫描下面的二维码',
       confirm: '在您的 DID 钱包上确认',
       success: '通行证已成功添加到您的 DID 钱包'

package/lib/lost-passport.js

@@ -170,6 +170,7 @@ function LostPassport(_ref2) {
           onSuccess: onGetUser,
           locale: locale,
           messages: {
+            title: t('lostPassport.dialog.title'),
             scan: t('lostPassport.dialog.scan'),
             confirm: t('lostPassport.dialog.confirm'),
             success: t('lostPassport.dialog.success')
@@ -260,6 +261,7 @@ function LostPassport(_ref2) {
         onSuccess: onReceivePassport,
         locale: locale,
         messages: {
+          title: "".concat(t('lostPassport.dialog.title')),
           scan: t('lostPassport.dialog.scan'),
           confirm: t('lostPassport.dialog.confirm'),
           success: t('lostPassport.dialog.success')

package/lib/util/index.js

@@ -471,6 +471,9 @@ const getBlockletLogoUrl = _ref4 => {
     baseUrl,
     logoPath
   } = _ref4;
+  if (logoPath && logoPath.startsWith('http')) {
+    return logoPath;
+  }
   if (baseUrl.startsWith('http') && logoPath) {
     return (0, _urlJoin.default)(baseUrl, formatRegistryLogoPath(did, logoPath));
   }

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.16.0-beta-ad6df3ae",
+  "version": "1.16.0-beta-7a7d5d97",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -15,25 +15,26 @@
     "prepublishOnly": "npm run build",
     "build": "babel src --out-dir lib --copy-files",
     "watch": "babel src --out-dir lib -w --copy-files",
+    "coverage": "npm run test -- --coverage",
     "test": "node tools/jest.js"
   },
   "keywords": [],
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.16.0-beta-ad6df3ae",
-    "@abtnode/constant": "1.16.0-beta-ad6df3ae",
-    "@abtnode/util": "1.16.0-beta-ad6df3ae",
+    "@abtnode/auth": "1.16.0-beta-7a7d5d97",
+    "@abtnode/constant": "1.16.0-beta-7a7d5d97",
+    "@abtnode/util": "1.16.0-beta-7a7d5d97",
     "@arcblock/did-connect": "^2.5.16",
     "@arcblock/did-motif": "^1.1.10",
     "@arcblock/icons": "^2.5.16",
     "@arcblock/react-hooks": "^2.5.16",
     "@arcblock/terminal": "^2.5.16",
     "@arcblock/ux": "^2.5.16",
-    "@blocklet/constant": "1.16.0-beta-ad6df3ae",
+    "@blocklet/constant": "1.16.0-beta-7a7d5d97",
     "@blocklet/launcher-layout": "1.9.65",
     "@blocklet/list": "^0.11.10",
-    "@blocklet/meta": "1.16.0-beta-ad6df3ae",
+    "@blocklet/meta": "1.16.0-beta-7a7d5d97",
     "@blocklet/ui-react": "^2.5.16",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -88,5 +89,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "8fa60176a00400cd412b308df3c7d6dcd9af2db1"
+  "gitHead": "c25ddcc371454b2e2f7038aa5e64c7b7c27763cb"
 }