@abtnode/ux 1.8.69-beta-76f8a46f → 1.8.69-beta-650a290b

package/lib/blocklet/component/setting.js

@@ -44,8 +44,7 @@ function ComponentSetting(_ref) {
   const rootDid = isRoot ? blocklet.meta.did : ancestors.map(x => x.meta.did)[0];
   const [loading, setLoading] = (0, _react.useState)('');
   const [mountPointHelperText, setMountPointHelperText] = (0, _react.useState)('');
-  const isDev = (0, _util.isBlockletDev)(blocklet);
-  const disabled = isDev || loading || !hasPermission;
+  const disabled = loading || !hasPermission;
   if (!rootDid) {
     return null;
   }

package/lib/blocklet/migration.js

@@ -65,7 +65,7 @@ function BlockletMigration() {
     const {
       href
     } = window.location;
-    const newHref = href.replace(blocklet.meta.bundleDid, blocklet.appDid);
+    const newHref = href.replace(blocklet.meta.bundleDid, blocklet.appPid);
     setTimeout(() => {
       window.location.href = newHref;
     }, 5000);
@@ -84,22 +84,22 @@ function BlockletMigration() {
       display: "flex",
       alignItems: "center",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+        variant: "contained",
+        size: "small",
+        color: "primary",
         onClick: () => onMigrate(),
+        style: {
+          marginRight: 8
+        },
         children: t('blocklet.migrate.intro.l1')
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         children: t('blocklet.migrate.intro.l2')
       })]
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-      ml: 3,
+    }), ['l3', 'l4', 'l5', 'l6'].map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
       display: "flex",
       alignItems: "center",
-      children: t('blocklet.migrate.intro.l3')
-    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
-      ml: 3,
-      display: "flex",
-      alignItems: "center",
-      children: t('blocklet.migrate.intro.l4')
-    })]
+      children: t("blocklet.migrate.intro.".concat(x))
+    }, x))]
   }), blocklet && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
     popup: true,
     open: openConnect,

package/lib/blocklet/preferences/app-sk.js

@@ -10,6 +10,7 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _constant = require("@abtnode/constant");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _formTextInput = _interopRequireDefault(require("../../form/form-text-input"));
 var _confirm = _interopRequireDefault(require("../../confirm"));
@@ -57,13 +58,13 @@ function AppSk(_ref) {
   const onClose = () => setState({
     isConnectOpen: false
   });
-  const triggers = [{
+  const triggers = blocklet.structVersion === _constant.APP_STRUCT_VERSION ? [{
     key: 'rotate-with-did-wallet',
     title: 'Migrate with DID Wallet',
     handler: () => setState({
       isConnectOpen: true
     })
-  }];
+  }] : [];
   return [/*#__PURE__*/(0, _jsxRuntime.jsx)(_formTextInput.default, {
     disabled: disabled,
     loading: loading,

package/lib/locales/en.js

@@ -528,9 +528,11 @@ module.exports = {
       success: 'Your application is successfully migrated, the page will be refreshed in {sec} seconds',
       intro: {
         l1: 'Click here',
-        l2: 'to migrate your application',
-        l3: '1. Your Application DID will be fully controlled in your DID Wallet.',
-        l4: '2. The component structure will be updated and you can manage your components more flexibly.'
+        l2: 'to migrate your application to new version (changes are disabled before the migration completes)',
+        l3: '1. The application DID will be fully controlled from your DID Wallet.',
+        l4: '2. The application data will be migrated, and no further changes required.',
+        l5: '3. The new application structure will give you more flexibly when change components.',
+        l6: '4. Please do not change component mount points before component new version is out.'
       },
       tip: {
         duplicate: 'Find duplicate component {name}, please delete useless components and migrate again',

package/lib/locales/zh.js

@@ -536,9 +536,11 @@ module.exports = {
       success: '你的应用已迁移成功，页面将在 {sec} 秒后刷新',
       intro: {
         l1: '点击这里',
-        l2: '迁移你的应用',
-        l3: '1. 应用程序的 DID 将在你的钱包中完全控制。',
-        l4: '2. 组件结构将更新，你可以更灵活地管理您的组件。'
+        l2: '迁移应用到新版（迁移完成之前组件升级将被禁用）',
+        l3: '1. 应用的钥匙对将完全由钱包管理',
+        l4: '2. 应用的数据将平滑迁移，不会丢失',
+        l5: '3. 新的结构将为你组合应用提供更大的灵活性',
+        l6: '4. 在组件有新版之前，请不要在迁移之后随意变更组件挂载点'
       },
       tip: {
         duplicate: '发现重复的组件 {name}，请删除无用组件并重新迁移',

package/lib/team/members/passports.js

@@ -24,6 +24,7 @@ var _createPassportSvg = _interopRequireDefault(require("@abtnode/auth/lib/util/
 var _node = require("../../contexts/node");
 var _session = require("../../contexts/session");
 var _team = require("../../contexts/team");
+var _blocklet = require("../../contexts/blocklet");
 var _util = require("../../util");
 var _confirm = _interopRequireDefault(require("../../confirm"));
 var _permission = _interopRequireDefault(require("../../permission"));
@@ -91,6 +92,9 @@ function Passports(_ref2) {
     passportColor,
     blocklet
   } = (0, _team.useTeamContext)();
+  const {
+    appIdList: idList
+  } = (0, _blocklet.useBlockletContext)();
   const {
     api,
     inService
@@ -102,6 +106,7 @@ function Passports(_ref2) {
   const [toggleConfirm, setToggleConfirm] = (0, _react.useState)(null);
   const [showIssueDialog, setShowIssueDialog] = (0, _react.useState)(false);
   const [search, setSearch] = (0, _react.useState)('');
+  const appIdList = [teamIssuerDid, ...(idList || [])].filter(Boolean);
   const passports = ((0, _get.default)(user, 'passports') || []).map(x => _objectSpread(_objectSpread({}, x), {}, {
     revoked: x.status === _constant.PASSPORT_STATUS.REVOKED
   }));
@@ -249,9 +254,9 @@ function Passports(_ref2) {
                 alignItems: "center",
                 children: [(0, _upperFirst.default)(x.title), /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
                   className: "status-icons",
-                  children: [!!teamIssuerDid && x.issuer.id !== teamIssuerDid && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExternalIssuerIcon.default, {}), x.revoked && /*#__PURE__*/(0, _jsxRuntime.jsx)(_RevokeIcon.default, {})]
+                  children: [!!appIdList.length && !appIdList.includes(x.issuer.id) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_ExternalIssuerIcon.default, {}), x.revoked && /*#__PURE__*/(0, _jsxRuntime.jsx)(_RevokeIcon.default, {})]
                 })]
-              }), !!teamIssuerDid && x.issuer.id !== teamIssuerDid && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+              }), !!appIdList.length && !appIdList.includes(x.issuer.id) && /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
                 className: "tip",
                 children: [x.issuer.id !== teamIssuerDid && !trustedPassports.some(y => y.issuerDid === x.issuer.id) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
                   title: t('team.passport.notTrustedIssuerTip'),

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.69-beta-76f8a46f",
+  "version": "1.8.69-beta-650a290b",
   "description": "UX components shared across abtnode packages",
   "main": "lib/index.js",
   "files": [
@@ -21,19 +21,19 @@
   "author": "linchen <linchen1987@foxmail.com> (http://github.com/linchen1987)",
   "license": "MIT",
   "dependencies": {
-    "@abtnode/auth": "1.8.69-beta-76f8a46f",
-    "@abtnode/constant": "1.8.69-beta-76f8a46f",
-    "@abtnode/util": "1.8.69-beta-76f8a46f",
-    "@arcblock/did-connect": "^2.5.5",
+    "@abtnode/auth": "1.8.69-beta-650a290b",
+    "@abtnode/constant": "1.8.69-beta-650a290b",
+    "@abtnode/util": "1.8.69-beta-650a290b",
+    "@arcblock/did-connect": "^2.5.10",
     "@arcblock/did-motif": "^1.1.10",
-    "@arcblock/icons": "^2.5.5",
-    "@arcblock/terminal": "^2.5.5",
-    "@arcblock/ux": "^2.5.5",
-    "@blocklet/constant": "1.8.69-beta-76f8a46f",
+    "@arcblock/icons": "^2.5.10",
+    "@arcblock/terminal": "^2.5.10",
+    "@arcblock/ux": "^2.5.10",
+    "@blocklet/constant": "1.8.69-beta-650a290b",
     "@blocklet/launcher-layout": "^1.9.65",
     "@blocklet/list": "^0.11.6",
-    "@blocklet/meta": "1.8.69-beta-76f8a46f",
-    "@blocklet/ui-react": "^2.5.5",
+    "@blocklet/meta": "1.8.69-beta-650a290b",
+    "@blocklet/ui-react": "^2.5.10",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
     "@iconify/react": "^4.0.0",
@@ -86,5 +86,5 @@
     "@babel/preset-react": "^7.18.6",
     "babel-plugin-inline-react-svg": "^1.1.2"
   },
-  "gitHead": "07415e674443b85648ea80b734f7a3690abfc15e"
+  "gitHead": "a33c9ce6a52b8d522d13860e85809dcbba236712"
 }