@abtnode/ux 1.8.69-beta-b0bb2d67 → 1.8.69-beta-650a290b

package/lib/blocklet/actions.js

@@ -27,6 +27,7 @@ var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _util = require("@blocklet/meta/lib/util");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@blocklet/constant");
+var _constant2 = require("@abtnode/constant");
 var _toast = _interopRequireDefault(require("../toast"));
 var _util2 = require("../util");
 var _util3 = require("./util");
@@ -258,7 +259,7 @@ function BlockletActions(_ref) {
       }
     }
   };
-  const removeAction = !inService && (0, _util.isDeletableBlocklet)(blocklet) ? {
+  const removeAction = !inService && (0, _util.isDeletableBlocklet)(blocklet) && blocklet.structVersion === _constant2.APP_STRUCT_VERSION ? {
     action: 'remove',
     icon: _icons.default.Remove,
     name: t('common.remove'),

package/lib/blocklet/component/add.js

@@ -28,7 +28,6 @@ var _step = require("@blocklet/launcher-layout/lib/context/step");
 var _constant2 = require("@abtnode/constant");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
-var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
 var _AnimationWaiter = _interopRequireDefault(require("@arcblock/ux/lib/AnimationWaiter"));
 var _launchResultMessage = _interopRequireDefault(require("@blocklet/launcher-layout/lib/launch-result-message"));
 var _util = require("@blocklet/meta/lib/util");
@@ -138,7 +137,6 @@ function AddComponent(_ref2) {
   const [editingItem, setEditingItem] = (0, _react.useState)(null);
   const [error, setError] = (0, _react.useState)('');
   const [showDialog, setShowDialog] = (0, _react.useState)('');
-  const [configs, setConfigs] = (0, _react.useState)([]);
   const [mountPointHelperText, setMountPointHelperText] = (0, _react.useState)('');
   const {
     api,
@@ -324,9 +322,10 @@ function AddComponent(_ref2) {
         }
       }
     } catch (err) {
-      _toast.default.error(err.message);
+      const errMsg = (0, _util2.formatError)(err);
+      _toast.default.error(errMsg);
       console.error('installComponent error: ', err);
-      setInstallErrorResult(err.message);
+      setInstallErrorResult(errMsg);
     } finally {
       setLoading(false);
       component.current.installInput = installInput;
@@ -431,7 +430,7 @@ function AddComponent(_ref2) {
     onNext();
   };
   const setConfigValue = _ref4 => {
-    var _blocklet$settings, _list$, _list$$meta, _meta$environments;
+    var _blocklet$settings, _meta$environments;
     let {
       chooseParams = component.current,
       componentDid: componentDidValue,
@@ -451,9 +450,8 @@ function AddComponent(_ref2) {
     } = meta;
 
     // deleted history list
-    const list = (((_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.children) || []).filter(x => x.status === 'deleted' && x.meta.bundleDid === bundleDid).sort((a, b) => new Date(a.deletedAt) > new Date(b.deletedAt) ? -1 : 1);
-    setConfigs(list);
-    const componentDid = componentDidValue || ((_list$ = list[0]) === null || _list$ === void 0 ? void 0 : (_list$$meta = _list$.meta) === null || _list$$meta === void 0 ? void 0 : _list$$meta.did) || '';
+    const list = (((_blocklet$settings = blocklet.settings) === null || _blocklet$settings === void 0 ? void 0 : _blocklet$settings.children) || []).filter(x => x.status === 'deleted' && x.meta.bundleDid === bundleDid);
+    const componentDid = componentDidValue || '';
     const newConfigs = (_meta$environments = meta.environments) === null || _meta$environments === void 0 ? void 0 : _meta$environments.map(item => {
       const {
           name: key,
@@ -534,21 +532,22 @@ function AddComponent(_ref2) {
         hasMissRequiredConfigs: hasMissRequiredConfigs(configsList, configsValue)
       });
     }
+    const hasRootPath = blocklet.children.some(x => x.mountPoint === '/');
 
     // use deleted history
-    if (componentDid && componentDid !== '_empty_') {
-      const config = list.find(x => x.meta.did === componentDid);
+    const config = list.find(x => x.meta.bundleDid === bundleDid);
+    if (config) {
       doc = _objectSpread(_objectSpread({}, doc), {}, {
-        pathPrefix: config === null || config === void 0 ? void 0 : config.mountPoint,
-        title: config === null || config === void 0 ? void 0 : config.meta.title,
-        componentName: config === null || config === void 0 ? void 0 : config.meta.name,
+        pathPrefix: config.mountPoint,
+        title: config.meta.title,
+        componentName: config.meta.name,
         // use history's environments
         hasEnvironmentsStep: false
       });
     } else {
       var _component$current$me, _component$current$me2;
       doc = _objectSpread(_objectSpread({}, doc), {}, {
-        pathPrefix: "/".concat((0, _urlFriendly.default)(name)),
+        pathPrefix: hasRootPath ? "/".concat((0, _urlFriendly.default)(name)) : '/',
         title: title || '',
         componentName: '',
         hasEnvironmentsStep: ((_component$current$me = component.current.meta) === null || _component$current$me === void 0 ? void 0 : (_component$current$me2 = _component$current$me.environments) === null || _component$current$me2 === void 0 ? void 0 : _component$current$me2.length) > 0
@@ -679,7 +678,15 @@ function AddComponent(_ref2) {
             },
             extraFilter: allBlocklets => {
               // only use blocklets that are component
-              return allBlocklets === null || allBlocklets === void 0 ? void 0 : allBlocklets.filter(x => !!(0, _util.isComponentBlocklet)(x));
+              return allBlocklets === null || allBlocklets === void 0 ? void 0 : allBlocklets.filter(x => {
+                if (!(0, _util.isComponentBlocklet)(x)) {
+                  return false;
+                }
+                if ((blocklet.children || []).some(y => y.meta.did === x.did)) {
+                  return false;
+                }
+                return true;
+              });
             }
           });
         }
@@ -777,40 +784,6 @@ function AddComponent(_ref2) {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(PageHeaderWrapper, {
         title: t('common.config'),
         subTitle: t('blocklet.component.addComponentTip.config')
-      }), !!params.bundleDid && !!configs.length && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_TextField.default, {
-        select: true,
-        label: t('blocklet.component.selectInstance'),
-        autoComplete: "off",
-        variant: "outlined",
-        name: "did",
-        helperText: t('blocklet.component.selectInstanceTip'),
-        "data-cy": "component-instance-select",
-        fullWidth: true,
-        value: params.componentDid || '_empty_',
-        onChange: e => {
-          setConfigValue({
-            componentDid: e.target.value
-          });
-        },
-        style: {
-          marginBottom: 32
-        },
-        margin: "normal",
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_MenuItem.default, {
-          value: "_empty_",
-          children: t('blocklet.component.newInstance')
-        }, "_empty_"), configs.map(x => {
-          return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_MenuItem.default, {
-            value: x.meta.did,
-            "data-cy": x.meta.did,
-            children: [x.meta.title, /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tag.default, {
-              style: {
-                marginLeft: 8
-              },
-              children: (0, _util2.formatToDatetime)(x.deletedAt)
-            })]
-          }, x.meta.did);
-        })]
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_TextField.default, {
         label: t('blocklet.component.mountPoint'),
         autoComplete: "off",
@@ -845,7 +818,6 @@ function AddComponent(_ref2) {
         },
         margin: "normal",
         value: params.title,
-        helperText: t('blocklet.component.titleTip'),
         onChange: e => {
           const title = e.target.value;
           setParams(_objectSpread(_objectSpread({}, params), {}, {

package/lib/blocklet/component/configuration.js

@@ -32,9 +32,9 @@ function ComponentConfiguration(_ref) {
     t
   } = (0, _context.useLocaleContext)();
   const isRoot = !ancestors.map(x => x.meta.did)[0];
-  const isDynamic = blocklet.dynamic;
+  const isLevel1 = ancestors.length === 1;
   const [tab, setTab] = (0, _react.useState)('settings');
-  const name = ancestors.concat(blocklet).map(x => (0, _util.getDisplayName)(x, true)).join(' / ');
+  const name = ancestors.concat(blocklet).slice(1).map(x => (0, _util.getDisplayName)(x, true)).join(' / ');
   if ((0, _util2.isInstalling)(blocklet.status)) {
     return null;
   }
@@ -98,7 +98,7 @@ function ComponentConfiguration(_ref) {
         minHeight: 'auto'
       }
     },
-    children: isRoot || isDynamic ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+    children: isRoot || isLevel1 ? /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
       mt: 1,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Tabs.default, {
         tabs: tabs,

package/lib/blocklet/component/index.js

@@ -7,7 +7,6 @@ exports.default = BlockletComponent;
 var _react = require("react");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _semver = _interopRequireDefault(require("semver"));
 var _Dialog = _interopRequireDefault(require("@mui/material/Dialog"));
 var _Box = _interopRequireDefault(require("@mui/material/Box"));
 var _DialogContent = _interopRequireDefault(require("@mui/material/DialogContent"));
@@ -27,6 +26,8 @@ var _ArrowForward = _interopRequireDefault(require("@mui/icons-material/ArrowFor
 var _ExpandMore = _interopRequireDefault(require("@mui/icons-material/ExpandMore"));
 var _ChevronRight = _interopRequireDefault(require("@mui/icons-material/ChevronRight"));
 var _Checkbox = _interopRequireDefault(require("@mui/material/Checkbox"));
+var _react2 = require("@iconify/react");
+var _constant = require("@abtnode/constant");
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _InfoRow = _interopRequireDefault(require("@arcblock/ux/lib/InfoRow"));
 var _context = require("@arcblock/ux/lib/Locale/context");
@@ -113,14 +114,31 @@ const getSourceInfo = blocklet => {
   }
   return {};
 };
+const getComponentName = (componentId, app) => {
+  const ids = componentId.split('/').slice(1);
+  let parent = app;
+  let index = 0;
+  const names = [];
+  while (parent && index < ids.length) {
+    // eslint-disable-next-line no-loop-func
+    const component = parent.children.find(x => x.meta.did === ids[index]);
+    parent = component;
+    index++;
+    if (component) {
+      names.push(component.meta.title);
+    }
+  }
+  return names.join(' / ');
+};
 function ComponentItem(_ref) {
-  var _blocklet$children;
+  var _blocklet$dependents, _blocklet$dependents2, _blocklet$dependents3, _blocklet$children;
   let {
     blocklet,
     ancestors,
     depth,
     onRemove,
-    getComponentUrl
+    getComponentUrl,
+    app
   } = _ref;
   const {
     t
@@ -227,12 +245,27 @@ function ComponentItem(_ref) {
         children: value
       }, name);
     })
-  }].filter(Boolean) : [];
+  }, (_blocklet$dependents = blocklet.dependents) !== null && _blocklet$dependents !== void 0 && _blocklet$dependents.length ? {
+    name: t('common.dependents'),
+    value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      children: blocklet.dependents.map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+        children: "".concat(getComponentName(x.id, app), " ").concat(x.required ? "(".concat(t('common.required'), ")") : '')
+      }))
+    })
+  } : null].filter(Boolean) : [];
   let deleteDisabledTip = '';
-  if (depth !== 1 || !blocklet.dynamic) {
+  if (depth !== 1) {
     deleteDisabledTip = t('blocklet.component.tip.notDynamic');
   } else if ((0, _util2.isInProgress)(root.status) || depth === 1 && deletingComponents.includes(blocklet.meta.did)) {
     deleteDisabledTip = t('blocklet.component.tip.stopBlocklet');
+  } else if ((_blocklet$dependents2 = blocklet.dependents) !== null && _blocklet$dependents2 !== void 0 && _blocklet$dependents2.length) {
+    const requires = blocklet.dependents.filter(x => x.required);
+    if (requires.length) {
+      const names = requires.map(x => getComponentName(x.id, app));
+      deleteDisabledTip = t('blocklet.component.tip.requiredBy', {
+        name: names.join(', ')
+      });
+    }
   }
   return [(depth > 0 || blocklet.meta.group !== 'gateway') && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
     display: "flex",
@@ -282,6 +315,19 @@ function ComponentItem(_ref) {
             },
             status: status,
             source: blocklet.source
+          }), !!((_blocklet$dependents3 = blocklet.dependents) !== null && _blocklet$dependents3 !== void 0 && _blocklet$dependents3.length) && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
+            title: ["".concat(t('common.dependents'), ": "), blocklet.dependents.map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+              pl: 1,
+              children: "".concat(getComponentName(x.id, app), " ").concat(x.required ? "(".concat(t('common.required'), ")") : '')
+            }))],
+            children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+              display: "flex",
+              color: "primary.main",
+              ml: 1,
+              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_react2.Icon, {
+                icon: "octicon:package-dependents-16"
+              })
+            })
           })]
         })]
       })]
@@ -367,7 +413,8 @@ function ComponentItem(_ref) {
       ancestors: [...ancestors, blocklet],
       depth: depth + 1,
       onRemove: onRemove,
-      getComponentUrl: getComponentUrl
+      getComponentUrl: getComponentUrl,
+      app: app
     }, "".concat(depth + 1, "-").concat(x.meta.did)))
   }, "blocklet-collapse") : null, !!componentInfo && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dialog.default, {
     open: true,
@@ -391,17 +438,18 @@ ComponentItem.propTypes = {
   ancestors: _propTypes.default.array,
   depth: _propTypes.default.number,
   onRemove: _propTypes.default.func,
-  getComponentUrl: _propTypes.default.func
+  getComponentUrl: _propTypes.default.func,
+  app: _propTypes.default.object
 };
 ComponentItem.defaultProps = {
   ancestors: [],
   depth: 0,
   onRemove: () => {},
-  getComponentUrl: () => window.location.origin
+  getComponentUrl: () => window.location.origin,
+  app: null
 };
 const StyledBadge = (0, _styled.default)(_Badge.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .BaseBadge-badge {\n    top: ", "px;\n    right: ", "px;\n  }\n"])), props => props.top * 8 || 6, props => props.right * 8 || 6);
 function BlockletComponent(_ref4) {
-  var _blocklet$meta;
   let {
       blocklet,
       onUpdate,
@@ -422,6 +470,9 @@ function BlockletComponent(_ref4) {
   } = (0, _deletingBlocklets.useDeletingBlockletContext)();
   const [loading, setLoading] = (0, _react.useState)(false);
   const [updateConfirm, setUpdateConfirm] = (0, _react.useState)(null);
+  const needMigration = blocklet && blocklet.structVersion !== _constant.APP_STRUCT_VERSION;
+
+  // update dot is not used but maybe useful in the further
   const [showUpdateDot, setShowUpdateDot] = (0, _react.useState)(false);
   const components = [...blocklet.children] || [];
   if (blocklet.meta.group !== 'gateway') {
@@ -429,59 +480,12 @@ function BlockletComponent(_ref4) {
     components.unshift(blocklet);
   }
   matchDeletingDid(components.map(e => e.meta.did));
-  (0, _react.useEffect)(() => {
-    if (blocklet && !(0, _util2.isInProgress)(blocklet.status)) {
-      api.getLatestBlockletVersion({
-        input: {
-          did: blocklet.meta.did,
-          version: blocklet.meta.version
-        }
-      }).then(res => {
-        const {
-          version
-        } = res.data || {};
-        if (version && _semver.default.gt(version, blocklet.meta.version)) {
-          setShowUpdateDot(true);
-        }
-      }).catch(err => {
-        console.error(err.message);
-      });
-    }
-  }, [blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.did]); // eslint-disable-line
-
   const checkForUpdates = async () => {
     if (loading) {
       return;
     }
     setLoading(true);
     try {
-      // check app version
-      const {
-        version,
-        registryUrl
-      } = (await api.getLatestBlockletVersion({
-        input: {
-          did: blocklet.meta.did,
-          version: blocklet.meta.version
-        }
-      })).data || {};
-      if (version && _semver.default.gt(version, blocklet.meta.version)) {
-        setUpdateConfirm({
-          type: 'app',
-          params: {
-            version,
-            registryUrl
-          },
-          list: [{
-            name: (0, _util.getDisplayName)(blocklet),
-            version: blocklet.meta.version,
-            newVersion: version
-          }]
-        });
-        setLoading(false);
-        return;
-      }
-
       // check child component version
       const {
         updateId,
@@ -525,7 +529,6 @@ function BlockletComponent(_ref4) {
         }
       });
       setUpdateConfirm({
-        type: 'component',
         params: {
           updateId
         },
@@ -542,27 +545,15 @@ function BlockletComponent(_ref4) {
     if (loading) {
       return;
     }
-    let fn;
-    let input;
-    if (updateConfirm.type === 'app') {
-      fn = api.upgradeBlocklet.bind(api);
-      input = {
-        did: blocklet.meta.did,
-        version: updateConfirm.params.version,
-        storeUrl: updateConfirm.params.registryUrl || ''
-      };
-    } else {
-      fn = api.upgradeComponents.bind(api);
+    try {
+      setLoading(true);
       const selectedComponents = Object.keys(updateConfirm.checks).filter(x => updateConfirm.checks[x]);
-      input = {
+      const input = {
         updateId: updateConfirm.params.updateId,
         rootDid: blocklet.meta.did,
         selectedComponents
       };
-    }
-    try {
-      setLoading(true);
-      await fn({
+      await api.upgradeComponents({
         input
       });
       setLoading(false);
@@ -615,7 +606,7 @@ function BlockletComponent(_ref4) {
       alignItems: "center",
       children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
         className: "title",
-        children: [t('common.components'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_permission.default, {
+        children: [t('common.components'), !needMigration && /*#__PURE__*/(0, _jsxRuntime.jsx)(_permission.default, {
           permission: inService ? '' : 'mutate_blocklets',
           role: inService ? _util2.BlockletAdminRoles : [],
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(StyledBadge, {
@@ -671,7 +662,7 @@ function BlockletComponent(_ref4) {
                 }), t('router.rule.add.title')]
               });
             }
-          }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_add.default, {
+          }), !needMigration && /*#__PURE__*/(0, _jsxRuntime.jsx)(_add.default, {
             blocklet: blocklet,
             children: _ref8 => {
               let {
@@ -702,6 +693,7 @@ function BlockletComponent(_ref4) {
       },
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(ComponentItem, {
         blocklet: blocklet,
+        app: blocklet,
         onRemove: removeComponent,
         getComponentUrl: getComponentUrl
       }, "0-".concat(blocklet.meta.did))
@@ -723,15 +715,14 @@ function BlockletComponent(_ref4) {
       children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
         paddingY: 1.5,
         children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_DialogTitle.default, {
-          children: updateConfirm.type === 'component' ? t('blocklet.component.updateTitle') : t('blocklet.component.updateAppTitle')
+          children: t('blocklet.component.updateTitle')
         }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
           component: _DialogContent.default,
           py: 4,
-          ml: updateConfirm.type === 'component' ? 0 : 4,
           children: updateConfirm.list.map(x => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
             display: "flex",
             alignItems: "center",
-            children: [updateConfirm.type === 'component' && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Checkbox.default, {
+            children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Checkbox.default, {
               checked: updateConfirm.checks[x.groupId],
               onChange: e => onUpdateChecksChange(e, x.groupId),
               style: {
@@ -789,7 +780,7 @@ function BlockletComponent(_ref4) {
               onConfirmUpdate();
             },
             color: "primary",
-            disabled: loading || updateConfirm.type === 'component' && !updateConfirm.hasChecks,
+            disabled: loading || !updateConfirm.hasChecks,
             variant: "contained",
             autoFocus: true,
             children: [loading && /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {

package/lib/blocklet/component/setting.js

@@ -41,12 +41,10 @@ function ComponentSetting(_ref) {
     api
   } = (0, _node.useNodeContext)();
   const isRoot = !ancestors.length;
-  const isDynamic = blocklet.dynamic;
   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;
   }
@@ -103,7 +101,7 @@ function ComponentSetting(_ref) {
   }, rest), {}, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
       mt: 3,
-      children: [isDynamic && /*#__PURE__*/(0, _jsxRuntime.jsx)(_formTextInput.default, {
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_formTextInput.default, {
         label: t('common.title'),
         style: {
           marginTop: -24

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

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = InstallFromUrl;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _semver = _interopRequireDefault(require("semver"));
 var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _DialogContentText = _interopRequireDefault(require("@mui/material/DialogContentText"));
@@ -20,7 +19,6 @@ var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _Alert = _interopRequireDefault(require("@arcblock/ux/lib/Alert"));
-var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
 var _util = require("@blocklet/meta/lib/util");
 var _node = require("../contexts/node");
 var _session = require("../contexts/session");
@@ -59,9 +57,7 @@ function InstallFromUrl(_ref) {
   const [url, setUrl] = (0, _react.useState)(defaultUrl);
   const [activeStep, setActiveStep] = (0, _react.useState)(defaultUrl ? 1 : 0);
   const [meta, setMeta] = (0, _react.useState)(initMeta);
-  const [existingMeta, setExistingMeta] = (0, _react.useState)(null);
   const [isConnectOpen, setConnectOpen] = (0, _react.useState)(false);
-  const [canUpgrade, setCanUpgrade] = (0, _react.useState)(false);
   const [params, setParams] = (0, _react.useState)({});
   const isComponentMode = mode === 'component';
   // if mode is component , we need to always show the step, that means the user can return to the previous step
@@ -89,25 +85,7 @@ function InstallFromUrl(_ref) {
           url: decoded
         }
       });
-
-      // if mode is component, never check existing blocklet
-      if (isComponentMode) {
-        setMeta(newer);
-      } else {
-        const {
-          blocklet: existedBlocklet
-        } = await api.getBlocklet({
-          input: {
-            did: newer.did,
-            attachRuntimeInfo: false
-          }
-        });
-        if (existedBlocklet) {
-          setExistingMeta(existedBlocklet.meta);
-          setCanUpgrade(_semver.default.lt(existedBlocklet.meta.version, newer.version));
-        }
-        setMeta(newer);
-      }
+      setMeta(newer);
       setParams({
         inStore,
         registryUrl,
@@ -130,26 +108,6 @@ function InstallFromUrl(_ref) {
       _onCancel();
       return;
     }
-    if (canUpgrade) {
-      try {
-        setLoading(true);
-        await api.installBlocklet({
-          input: {
-            url: decodeURIComponent(url.trim())
-          }
-        });
-        onSuccess(_objectSpread({
-          meta
-        }, params));
-        _onCancel();
-      } catch (err) {
-        const errMsg = "Blocklet Install failed: ".concat((0, _util2.formatError)(err));
-        setError(errMsg);
-      } finally {
-        setLoading(false);
-      }
-      return;
-    }
     setLoading(true);
     setConnectOpen(true);
   };
@@ -206,11 +164,11 @@ function InstallFromUrl(_ref) {
       });
     }
     if (meta.did) {
-      return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         style: {
           paddingLeft: '10%'
         },
-        children: [rows.map(row => {
+        children: rows.map(row => {
           if (row.name === t('common.did')) {
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InfoRow.default, {
               valueComponent: "div",
@@ -226,21 +184,7 @@ function InstallFromUrl(_ref) {
             name: row.name,
             children: row.value
           }, row.name);
-        }), existingMeta && !canUpgrade && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Alert.default, {
-          type: "error",
-          variant: "icon",
-          style: {
-            margin: '15px 0 0 -16px'
-          },
-          children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-            children: [t('blocklet.fromUrl.existTipPrefix'), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tag.default, {
-              content: existingMeta.version,
-              style: {
-                margin: '0 5px'
-              }
-            }), t('blocklet.fromUrl.existTipSuffix')]
-          })
-        })]
+        })
       });
     }
     return null;
@@ -288,7 +232,7 @@ function InstallFromUrl(_ref) {
     label: t('blocklet.fromUrl.step1'),
     body: getStep1Body(),
     cancel: alwayShowSteps ? t('common.pre') : t('common.cancel'),
-    confirm: (handleText === null || handleText === void 0 ? void 0 : handleText.confirm) || (existingMeta ? t('common.confirm') : t('blocklet.fromUrl.confirm')),
+    confirm: (handleText === null || handleText === void 0 ? void 0 : handleText.confirm) || t('blocklet.fromUrl.confirm'),
     onCancel: () => {
       if (alwayShowSteps) {
         setActiveStep(s => s - 1);
@@ -297,11 +241,7 @@ function InstallFromUrl(_ref) {
       }
     },
     onConfirm: () => {
-      if (existingMeta && !canUpgrade) {
-        _onCancel();
-      } else {
-        _onConfirm();
-      }
+      _onConfirm();
     }
   }];
   const step = steps[activeStep];

package/lib/blocklet/migration.js

@@ -0,0 +1,127 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = BlockletMigration;
+var _react = 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"));
+var _constant = require("@abtnode/constant");
+var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
+var _context = require("@arcblock/ux/lib/Locale/context");
+var _util = require("@blocklet/meta/lib/util");
+var _blocklet = require("../contexts/blocklet");
+var _session = require("../contexts/session");
+var _toast = _interopRequireDefault(require("../toast"));
+var _util2 = require("../util");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+const findDuplicate = blocklet => {
+  const map = {};
+  let duplicate = null;
+  (0, _util.forEachBlockletSync)(blocklet, component => {
+    if (map[component.meta.bundleDid]) {
+      duplicate = (0, _util.getDisplayName)(component, true);
+    } else if (component.meta.bundleDid) {
+      map[component.meta.bundleDid] = true;
+    }
+  });
+  return duplicate;
+};
+function BlockletMigration() {
+  const {
+    t
+  } = (0, _context.useLocaleContext)();
+  const {
+    api
+  } = (0, _session.useSessionContext)();
+  const {
+    blocklet
+  } = (0, _blocklet.useBlockletContext)();
+  const [openConnect, setOpenConnect] = (0, _react.useState)(false);
+  const [leftSec, setLeftSec] = (0, _react.useState)(5);
+  const needMigration = blocklet && blocklet.structVersion !== _constant.APP_STRUCT_VERSION;
+  const onMigrate = async () => {
+    try {
+      if (blocklet.status === 'running') {
+        _toast.default.error(t('blocklet.migrate.tip.running'));
+        return;
+      }
+      const duplicate = findDuplicate(blocklet);
+      if (duplicate) {
+        _toast.default.error(t('blocklet.migrate.tip.duplicate', {
+          name: duplicate
+        }));
+        return;
+      }
+      setOpenConnect(true);
+    } catch (error) {
+      _toast.default.error((0, _util2.formatError)(error));
+    }
+  };
+  const onSuccess = () => {
+    const {
+      href
+    } = window.location;
+    const newHref = href.replace(blocklet.meta.bundleDid, blocklet.appPid);
+    setTimeout(() => {
+      window.location.href = newHref;
+    }, 5000);
+    setLeftSec(5);
+    setInterval(() => {
+      setLeftSec(sec => sec - 1);
+    }, 1000);
+  };
+  const onClose = () => setOpenConnect(false);
+  return [needMigration && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Alert.default, {
+    type: "warning",
+    style: {
+      margin: '12px 0'
+    },
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      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')
+      })]
+    }), ['l3', 'l4', 'l5', 'l6'].map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_Box.default, {
+      display: "flex",
+      alignItems: "center",
+      children: t("blocklet.migrate.intro.".concat(x))
+    }, x))]
+  }), blocklet && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
+    popup: true,
+    open: openConnect,
+    saveConnect: false,
+    forceConnected: false,
+    action: "migrate-app-to-struct-v2",
+    checkFn: api.get,
+    checkTimeout: 5 * 60 * 1000,
+    onSuccess: onSuccess,
+    extraParams: {
+      did: blocklet.meta.did,
+      title: (0, _util.getDisplayName)(blocklet)
+    },
+    messages: {
+      title: t('blocklet.migrate.title'),
+      scan: t('blocklet.migrate.scan'),
+      confirm: t('blocklet.migrate.confirm'),
+      success: t('blocklet.migrate.success', {
+        sec: leftSec
+      })
+    },
+    onClose: onClose
+  })];
+}
+BlockletMigration.propTypes = {};

package/lib/blocklet/overview.js

@@ -21,9 +21,7 @@ var _blocklet = require("../contexts/blocklet");
 var _node = require("../contexts/node");
 var _util2 = require("../util");
 var _didAddress = _interopRequireDefault(require("../did-address"));
-var _blockletSource = _interopRequireDefault(require("./blocklet-source"));
 var _status = _interopRequireDefault(require("./status"));
-var _version = _interopRequireDefault(require("./version"));
 var _domainStatus = _interopRequireDefault(require("./router/domain-status"));
 var _types = require("./types");
 var _expiration = _interopRequireDefault(require("./component/expiration"));
@@ -82,23 +80,6 @@ DomainLink.propTypes = {
   children: _propTypes.default.any.isRequired
 };
 const LinkDiv = _styled.default.span(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  &,\n  & > * {\n    color: #222;\n    font-size: 18px;\n  }\n\n  .status {\n    margin-left: 8px;\n  }\n"])));
-const getEngineRows = (engine, t) => {
-  if (!engine) {
-    return [];
-  }
-  return [{
-    name: t('common.name'),
-    value: engine.displayName
-  }, {
-    name: t('common.description'),
-    value: engine.description
-  }, {
-    name: t('common.version'),
-    value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tag.default, {
-      children: engine.version
-    })
-  }];
-};
 function BlockletOverview() {
   var _blocklet$settings, _blocklet$site;
   const {
@@ -128,9 +109,9 @@ function BlockletOverview() {
     value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
       did: appPid
     })
-  } : null, migratedFrom !== null && migratedFrom !== void 0 && migratedFrom.length ? {
+  } : null, (migratedFrom === null || migratedFrom === void 0 ? void 0 : migratedFrom.length) > 1 ? {
     name: t('blocklet.alsoKnownAs'),
-    value: migratedFrom.map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
+    value: migratedFrom.slice(1).map(x => /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
       did: x.appDid
     }))
   } : null, {
@@ -142,20 +123,6 @@ function BlockletOverview() {
       status: blocklet.status,
       source: blocklet.source
     })
-  }, {
-    name: t('common.version'),
-    value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_version.default, {
-      blocklet: blocklet
-    })
-  }, {
-    name: t('common.group'),
-    value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tag.default, {
-      type: "success",
-      children: blocklet.meta.group
-    })
-  }, {
-    name: t('common.author'),
-    value: (0, _util2.formatPerson)(blocklet.meta.author)
   }, blocklet.controller ? {
     name: t('common.expires'),
     value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_expiration.default, {
@@ -172,25 +139,8 @@ function BlockletOverview() {
     name: t('blocklet.stoppedAt'),
     value: (0, _util2.formatToDatetime)(blocklet.stoppedAt)
   } : null, {
-    name: t('blocklet.overview.source'),
-    value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_blockletSource.default, {
-      sourceInfo: {
-        source: blocklet.source,
-        deployedFrom: blocklet.deployedFrom
-      },
-      blocklet: blocklet
-    })
-  }, {
-    name: t('blocklet.overview.deployedFrom'),
-    value: blocklet.deployedFrom || '-'
-  }, {
     name: t('blocklet.overview.accessControl'),
     value: t("team.whoCanAccess.".concat((0, _util.getWhoCanAccess)(blocklet), ".title"))
-  }, {
-    name: t('common.did'),
-    value: /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
-      did: blocklet.meta.did
-    })
   }, {
     name: t('common.owner'),
     value: (_blocklet$settings = blocklet.settings) !== null && _blocklet$settings !== void 0 && _blocklet$settings.owner ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_didAddress.default, {
@@ -210,7 +160,6 @@ function BlockletOverview() {
       })
     });
   }
-  const engineRows = getEngineRows(blocklet.engine, t);
   const renderRows = rows => rows.map(row => {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InfoRow.default, {
       valueComponent: "div",
@@ -280,21 +229,6 @@ function BlockletOverview() {
     }), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
       className: "basicInfo",
       children: renderRows(infoRows)
-    }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-        className: "title",
-        children: t('common.engine')
-      }), engineRows.map(_ref2 => {
-        let {
-          name,
-          value
-        } = _ref2;
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_InfoRow.default, {
-          nameWidth: 120,
-          name: name,
-          children: value
-        }, name);
-      })]
     })]
   });
 }

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/blocklet/status.js

@@ -71,7 +71,7 @@ function BlockletStatus(_ref) {
     deleting: colors.yellow
   };
   const inProgress = (0, _util.isInProgress)(status);
-  const statusTxt = t("blocklet.status.".concat(source === 'custom' && status === 'installed' ? 'created' : status));
+  const statusTxt = t("blocklet.status.".concat(status));
   if (variant === 'dot') {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Tooltip.default, {
       title: t('blocklet.statusTip', {

package/lib/blocklet/version.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = BlockletVersion;
 var _react = require("react");
 var _propTypes = _interopRequireDefault(require("prop-types"));
-var _semver = _interopRequireDefault(require("semver"));
 var _notistack = require("notistack");
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
@@ -54,30 +53,7 @@ function Version(_ref) {
   (0, _react.useEffect)(() => {
     setNewVersionBlocklet(null);
     if (checkUpgrade && blocklet.mode !== _constant.BLOCKLET_MODES.DEVELOPMENT) {
-      api.getLatestBlockletVersion({
-        input: {
-          did: blocklet.meta.did,
-          version: blocklet.meta.version
-        }
-      }).then(_ref2 => {
-        let {
-          data
-        } = _ref2;
-        if (data) {
-          const {
-            version,
-            registryUrl
-          } = data;
-          if (version && _semver.default.gt(version, blocklet.meta.version)) {
-            setNewVersionBlocklet({
-              version,
-              registryUrl
-            });
-          }
-        }
-      })
-      // eslint-disable-next-line max-len
-      .catch(err => console.error("Failed to fetch latest version: ".concat(blocklet.meta.name, ", error: ").concat((0, _util2.formatError)(err)))); // prettier-ignore
+      // The implementation was removed and will be restore in the further
     }
   }, [blocklet, checkUpgrade]); // eslint-disable-line
 
@@ -164,7 +140,7 @@ Version.propTypes = {
   hasPermission: _propTypes.default.bool
 };
 Version.defaultProps = {
-  checkUpgrade: true,
+  checkUpgrade: false,
   hasPermission: false
 };
 const BlockletVersionInDaemon = (0, _permission.withPermission)(Version, 'mutate_blocklets');

package/lib/hooks/use-app-logo.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = useAppLogo;
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _node = require("../contexts/node");
+var _util = require("../util");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function useAppLogo(_ref) {
   var _window$env, _blocklet$meta;
@@ -16,7 +17,7 @@ function useAppLogo(_ref) {
     inService
   } = (0, _node.useNodeContext)();
   const prefix = ((_window$env = window.env) === null || _window$env === void 0 ? void 0 : _window$env.apiPrefix) || '/';
-  const search = "?v=".concat(blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.version);
+  const search = "?v=".concat(blocklet === null || blocklet === void 0 ? void 0 : (_blocklet$meta = blocklet.meta) === null || _blocklet$meta === void 0 ? void 0 : _blocklet$meta.version).concat((0, _util.isInstalling)(blocklet === null || blocklet === void 0 ? void 0 : blocklet.status) ? '~' : '');
   const logoUrl = (0, _urlJoin.default)(prefix, "/blocklet/logo/".concat(inService ? '' : blocklet.meta.did), search);
   return {
     logoUrl

package/lib/locales/en.js

@@ -121,6 +121,7 @@ module.exports = {
     delConfirm: 'Delete',
     delConfirmDescription: 'Confirm delete?',
     delete: 'Delete',
+    dependents: 'Dependents',
     description: 'Description',
     detail: 'Detail',
     did: 'DID',
@@ -222,6 +223,7 @@ module.exports = {
     remove: 'Remove',
     renew: 'Renew',
     reportIssue: 'Report an issue',
+    required: 'Required',
     requiredErrorText: '{name} is required',
     resource: 'Resource',
     restart: 'Restart',
@@ -458,7 +460,6 @@ module.exports = {
     component: {
       checkUpdateTitle: 'Check for Updates',
       updateTitle: 'Update Components',
-      updateAppTitle: 'Update Blocklet',
       noUpdate: 'No components to update',
       add: 'Add Component',
       selectComponent: 'Select Component',
@@ -470,13 +471,13 @@ module.exports = {
       noComponent: 'No components',
       mountPoint: "What's the mount point?",
       mountPointTip: "If you set mount point to '/my-prefix', then all requests that begins with that mount point will be routed to the selected component",
-      titleTip: 'You can customize different titles for identical components',
       delete: 'Delete Component',
       deleteDescription: 'This component will not be accessible after deletion. Confirm delete?',
       purchase: 'Payment Required',
       tip: {
         stopBlocklet: 'Please stop running Blocklet first',
-        notDynamic: 'Only dynamically added component can be removed'
+        notDynamic: 'Only dynamically added component can be removed',
+        requiredBy: 'The component is required by {name}'
       },
       choose: 'Choose',
       addWithName: 'Add Component To {name}',
@@ -519,6 +520,24 @@ module.exports = {
       resultTipStart: 'With',
       resultTipEnd: 'you can build and publish this blocklet within minutes',
       uploadedComponentTip: 'Directly uploaded components cannot be exported:'
+    },
+    migrate: {
+      title: 'Migrate Application',
+      scan: 'Connect your DID Wallet to generate a key-pair for this application',
+      confirm: 'Review this operation on your DID Wallet',
+      success: 'Your application is successfully migrated, the page will be refreshed in {sec} seconds',
+      intro: {
+        l1: 'Click here',
+        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',
+        running: 'Please stop blocklet before migration'
+      }
     }
   },
   dashboard: {

package/lib/locales/zh.js

@@ -125,6 +125,7 @@ module.exports = {
     delConfirm: '删除',
     delConfirmDescription: '确认删除？',
     delete: '删除',
+    dependents: '被依赖',
     description: '描述',
     detail: '详情',
     did: 'DID',
@@ -228,6 +229,7 @@ module.exports = {
     remove: '删除',
     renew: '续期',
     reportIssue: '问题反馈',
+    required: '必需的',
     requiredErrorText: '{name}是必填的',
     resource: '资源',
     restart: '重启',
@@ -466,7 +468,6 @@ module.exports = {
     component: {
       checkUpdateTitle: '检查更新',
       updateTitle: '更新组件',
-      updateAppTitle: '更新 Blocklet',
       noUpdate: '没有需要更新的组件',
       add: '添加组件',
       selectComponent: '选择组件',
@@ -478,13 +479,13 @@ module.exports = {
       noComponent: '暂无组件',
       mountPoint: '组件的挂载点是什么？',
       mountPointTip: "如果你填写了 '/my-prefix'，那么所有以其为前缀的请求都会被转发到配置的组件",
-      titleTip: '你可以为相同的组件自定义不同的名称',
       delete: '删除组件',
       deleteDescription: '删除后此组件将无法访问。确认删除？',
       purchase: '需要支付',
       tip: {
         stopBlocklet: '请先停止运行 Blocklet',
-        notDynamic: '只有动态添加的组件才能被删除'
+        notDynamic: '只有动态添加的组件才能被删除',
+        requiredBy: '{name} 需要该组件'
       },
       choose: '选择',
       addWithName: '添加组件到 {name}',
@@ -527,6 +528,24 @@ module.exports = {
       resultTipStart: '使用',
       resultTipEnd: '你可以在几分钟内构建并发布这个 Blocklet',
       uploadedComponentTip: '无法导出直接上传的组件：'
+    },
+    migrate: {
+      title: '迁移应用',
+      scan: '用你的 DID 钱包扫码为这个应用生成钥匙对',
+      confirm: '请在 DID 钱包上确认',
+      success: '你的应用已迁移成功，页面将在 {sec} 秒后刷新',
+      intro: {
+        l1: '点击这里',
+        l2: '迁移应用到新版（迁移完成之前组件升级将被禁用）',
+        l3: '1. 应用的钥匙对将完全由钱包管理',
+        l4: '2. 应用的数据将平滑迁移，不会丢失',
+        l5: '3. 新的结构将为你组合应用提供更大的灵活性',
+        l6: '4. 在组件有新版之前，请不要在迁移之后随意变更组件挂载点'
+      },
+      tip: {
+        duplicate: '发现重复的组件 {name}，请删除无用组件并重新迁移',
+        running: '迁移前请先停止应用'
+      }
     }
   },
   dashboard: {

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/lib/util/index.js

@@ -576,8 +576,8 @@ function extractStatusUrlFromNextWorkflow(nextWorkflow) {
     token: new URL(nextWorkflowURL).searchParams.get('_t_')
   };
 }
-function getBlockletMetaUrl(registry, did) {
-  return (0, _urlJoin.default)(registry, "/api/blocklets/".concat(did, "/blocklet.json?source=webapp"));
+function getBlockletMetaUrl(storeUrl, did) {
+  return (0, _urlJoin.default)(storeUrl, _constant.BLOCKLET_STORE_API_PREFIX, "/blocklets/".concat(did, "/blocklet.json"));
 }
 async function getAsset(chainHost, address) {
   const result = await _axios.default.post((0, _urlJoin.default)(chainHost, '/api/gql/'), JSON.stringify({

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "1.8.69-beta-b0bb2d67",
+  "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-b0bb2d67",
-    "@abtnode/constant": "1.8.69-beta-b0bb2d67",
-    "@abtnode/util": "1.8.69-beta-b0bb2d67",
-    "@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-b0bb2d67",
-    "@blocklet/launcher-layout": "^1.9.61",
-    "@blocklet/list": "^0.11.4",
-    "@blocklet/meta": "1.8.69-beta-b0bb2d67",
-    "@blocklet/ui-react": "^2.5.5",
+    "@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-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": "d6853c4b55a67526748017268257b869a5092cb1"
+  "gitHead": "a33c9ce6a52b8d522d13860e85809dcbba236712"
 }