@abtnode/ux 1.16.11-beta-069c3537 → 1.16.11-next-a232f5fb

package/lib/blocklet/purchase/component-purchase.js

@@ -12,7 +12,7 @@ var _context = require("@arcblock/ux/lib/Locale/context");
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _pWaitFor = _interopRequireDefault(require("p-wait-for"));
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _util2 = require("../../util");
 var _api = require("../../util/api");
@@ -57,7 +57,7 @@ function ComponentPurchase(_ref) {
       });
     };
     const failure = async errorMessage => {
-      _toast.default.error(errorMessage);
+      _Toast.default.error(errorMessage);
       onCancel(errorMessage);
     };
     async function handleConnectSessionStatus(url) {

package/lib/blocklet/router/action/add-domain-alias.js

@@ -12,7 +12,7 @@ var _Typography = _interopRequireDefault(require("@mui/material/Typography"));
 var _TextField = _interopRequireDefault(require("@mui/material/TextField"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _context = require("@arcblock/ux/lib/Locale/context");
-var _toast = _interopRequireDefault(require("../../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _confirm = _interopRequireDefault(require("../../../confirm"));
 var _util = require("../../../util");
 var _node = require("../../../contexts/node");
@@ -58,7 +58,7 @@ function AddDomainAlias(_ref) {
       });
       await (0, _util.sleep)(2000);
     } catch (err) {
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
     } finally {
       setConfirmSetting(null);
       setLoading(false);

package/lib/blocklet/router/action/add-rule.js

@@ -14,10 +14,10 @@ var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@abtnode/constant");
 var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../../contexts/node");
 var _blocklet = require("../../../contexts/blocklet");
 var _confirm = _interopRequireDefault(require("../../../confirm"));
-var _toast = _interopRequireDefault(require("../../../toast"));
 var _util = require("../util");
 var _configRoutingRule = _interopRequireDefault(require("./config-routing-rule"));
 var _util2 = require("../../../util");
@@ -76,7 +76,7 @@ function AddRule(_ref) {
         }
       });
     } catch (error) {
-      _toast.default.error(error.message);
+      _Toast.default.error(error.message);
     } finally {
       setLoading(false);
       setConfirmSetting(null);

package/lib/blocklet/router/action/delete-domain-alias.js

@@ -10,8 +10,8 @@ var _Delete = _interopRequireDefault(require("@mui/icons-material/Delete"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _confirm = _interopRequireDefault(require("../../../confirm"));
-var _toast = _interopRequireDefault(require("../../../toast"));
 var _node = require("../../../contexts/node");
 var _util = require("../../../util");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -47,7 +47,7 @@ function DeleteDomainAlias(props) {
       });
       await (0, _util.sleep)(2000);
     } catch (err) {
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
     } finally {
       setConfirmSetting(null);
       setLoading(false);

package/lib/blocklet/router/action/delete-rule.js

@@ -10,10 +10,10 @@ var _Delete = _interopRequireDefault(require("@mui/icons-material/Delete"));
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../../contexts/node");
 var _blocklet = require("../../../contexts/blocklet");
 var _deleteConfirm = _interopRequireDefault(require("../../../delete-confirm"));
-var _toast = _interopRequireDefault(require("../../../toast"));
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function DeleteRule(_ref) {
@@ -51,7 +51,7 @@ function DeleteRule(_ref) {
         }
       });
     } catch (error) {
-      _toast.default.error(error.message);
+      _Toast.default.error(error.message);
     } finally {
       setConfirmSetting(null);
       setLoading(false);

package/lib/blocklet/router/action/update-rule.js

@@ -14,10 +14,10 @@ var _MenuItem = _interopRequireDefault(require("@mui/material/MenuItem"));
 var _constant = require("@abtnode/constant");
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _urlPathFriendly = _interopRequireDefault(require("@blocklet/meta/lib/url-path-friendly"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../../contexts/node");
 var _blocklet = require("../../../contexts/blocklet");
 var _confirm = _interopRequireDefault(require("../../../confirm"));
-var _toast = _interopRequireDefault(require("../../../toast"));
 var _util = require("../util");
 var _configRoutingRule = _interopRequireDefault(require("./config-routing-rule"));
 var _util2 = require("../../../util");
@@ -81,7 +81,7 @@ function UpdateRule(_ref) {
         }
       });
     } catch (error) {
-      _toast.default.error(error.message);
+      _Toast.default.error(error.message);
     } finally {
       setLoading(false);
       setConfirmSetting(null);

package/lib/blocklet/storage/connect.js

@@ -14,7 +14,7 @@ var _lodash = require("lodash");
 var _urlJoin = _interopRequireDefault(require("url-join"));
 var _axios = _interopRequireDefault(require("axios"));
 var _util = require("@blocklet/meta/lib/util");
-var _toast = _interopRequireDefault(require("../../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("../../contexts/node");
 var _blocklet = require("../../../lib/contexts/blocklet");
 var _spaces = require("../../util/spaces");
@@ -163,7 +163,7 @@ function ConnectDIDSpaces(_ref) {
     try {
       setLoading(true);
       if ((0, _lodash.isEmpty)(url)) {
-        _toast.default.error(t('storage.spaces.addressCannotEmpty', locale));
+        _Toast.default.error(t('storage.spaces.addressCannotEmpty', locale));
         return;
       }
 

package/lib/blocklet/storage/delete.js

@@ -10,8 +10,8 @@ var _material = require("@mui/material");
 var _DeleteOutline = _interopRequireDefault(require("@mui/icons-material/DeleteOutline"));
 var _confirm = _interopRequireDefault(require("@arcblock/ux/lib/Dialog/confirm"));
 var _context = require("@arcblock/ux/lib/Locale/context");
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _util = require("../../util");
-var _toast = _interopRequireDefault(require("../../toast"));
 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); }
@@ -56,7 +56,7 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
       setOpen(false);
     } catch (error) {
       console.error(error);
-      _toast.default.error("".concat(t('storage.space.gateway.delete.failed'), ": ").concat((0, _util.formatError)(error)));
+      _Toast.default.error("".concat(t('storage.space.gateway.delete.failed'), ": ").concat((0, _util.formatError)(error)));
     } finally {
       setLoading(false);
     }

package/lib/blocklet/storage/index.js

@@ -17,10 +17,10 @@ var _ahooks = require("ahooks");
 var _Tag = _interopRequireDefault(require("@arcblock/ux/lib/Tag"));
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _HelpOutline = _interopRequireDefault(require("@mui/icons-material/HelpOutline"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _lodash = require("lodash");
 var _node = require("../../contexts/node");
 var _blocklet = require("../../../lib/contexts/blocklet");
-var _toast = _interopRequireDefault(require("../../toast"));
 var _switchDidSpaces = _interopRequireDefault(require("./switch-did-spaces"));
 var _spaces = require("../../util/spaces");
 var _switchControl = _interopRequireDefault(require("../component/switch-control"));
@@ -167,7 +167,7 @@ function Storage() {
         }
       });
     } catch (error) {
-      _toast.default.error(error.message);
+      _Toast.default.error(error.message);
       console.error(error);
     }
   };
@@ -283,9 +283,9 @@ function Storage() {
   (0, _react.useEffect)(() => {
     if (progress !== null && progress !== void 0 && progress.completed) {
       if ((progress === null || progress === void 0 ? void 0 : progress.progress) === 100) {
-        _toast.default.success(t('storage.spaces.backupSuccessfully'));
+        _Toast.default.success(t('storage.spaces.backupSuccessfully'));
       } else if ((progress === null || progress === void 0 ? void 0 : progress.progress) === -1) {
-        _toast.default.error(progress === null || progress === void 0 ? void 0 : progress.message);
+        _Toast.default.error(progress === null || progress === void 0 ? void 0 : progress.message);
       }
       setLoading(false);
       progress.progress = 0;

package/lib/blocklet/storage/switch-did-spaces.js

@@ -17,12 +17,12 @@ var _constant = require("@blocklet/constant");
 var _ahooks = require("ahooks");
 var _lodash = require("lodash");
 var _styled = _interopRequireDefault(require("@emotion/styled"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _add = _interopRequireDefault(require("./add"));
 var _item = _interopRequireDefault(require("./item"));
 var _connect = _interopRequireDefault(require("./connect"));
 var _session = require("../../../lib/contexts/session");
 var _blocklet = require("../../../lib/contexts/blocklet");
-var _toast = _interopRequireDefault(require("../../toast"));
 var _node = require("../../contexts/node");
 var _spaces = require("../../util/spaces");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -175,7 +175,7 @@ function SwitchDIDSpaces(_ref) {
       return;
     }
     if (spaceBackupEndpoint === (spaceGateway === null || spaceGateway === void 0 ? void 0 : spaceGateway.endpoint)) {
-      _toast.default.warning(t('storage.spaces.gateway.delete.failedForConnected'));
+      _Toast.default.warning(t('storage.spaces.gateway.delete.failedForConnected'));
       return;
     }
     await nodeApi.deleteBlockletSpaceGateway({
@@ -230,7 +230,7 @@ function SwitchDIDSpaces(_ref) {
         }
       });
     }
-    _toast.default.success(t('storage.spaces.connectedWithName', {
+    _Toast.default.success(t('storage.spaces.connectedWithName', {
       name: (_spaceGateway$name = spaceGateway === null || spaceGateway === void 0 ? void 0 : spaceGateway.name) !== null && _spaceGateway$name !== void 0 ? _spaceGateway$name : 'DID Spaces'
     }));
     refreshBlocklet();

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 _notistack = require("notistack");
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
 var _ArrowUpward = _interopRequireDefault(require("@mui/icons-material/ArrowUpward"));
@@ -47,9 +46,6 @@ function Version(_ref) {
   const [error, setError] = (0, _react.useState)('');
   const [newVersionBlocklet, setNewVersionBlocklet] = (0, _react.useState)(null);
   const [confirmSetting, setConfirmSetting] = (0, _react.useState)(null);
-  const {
-    enqueueSnackbar
-  } = (0, _notistack.useSnackbar)();
   (0, _react.useEffect)(() => {
     setNewVersionBlocklet(null);
     if (checkUpgrade && blocklet.mode !== _constant.BLOCKLET_MODES.DEVELOPMENT) {
@@ -74,10 +70,7 @@ function Version(_ref) {
         input
       });
     } catch (err) {
-      enqueueSnackbar("Blocklet upgrade failed: ".concat((0, _util2.formatError)(err)), {
-        autoHideDuration: 5000,
-        variant: 'error'
-      });
+      _Toast.default.error("Blocklet upgrade failed: ".concat((0, _util2.formatError)(err)));
     } finally {
       setLoading(false);
       setConfirmSetting(null);

package/lib/contexts/audit-log.js

@@ -8,7 +8,7 @@ exports.AuditLogProvider = AuditLogProvider;
 exports.useAuditLogContext = useAuditLogContext;
 var _react = require("react");
 var _useLocalStorage = _interopRequireDefault(require("react-use/lib/useLocalStorage"));
-var _toast = _interopRequireDefault(require("../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _node = require("./node");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -105,7 +105,7 @@ function AuditLogProvider(_ref) {
       setPaging(res.paging);
       setLoading(false);
     } catch (err) {
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
       setLoading(false);
     }
   };

package/lib/exchange-passport.js

@@ -9,11 +9,11 @@ var _styled = _interopRequireDefault(require("@emotion/styled"));
 var _reactRouterDom = require("react-router-dom");
 var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularProgress"));
 var _Center = _interopRequireDefault(require("@arcblock/ux/lib/Center"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _Connect = _interopRequireDefault(require("@arcblock/did-connect/lib/Connect"));
 var _context = require("@arcblock/ux/lib/Locale/context");
 var _constant = require("@abtnode/constant");
 var _wrapLocale = _interopRequireDefault(require("./wrap-locale"));
-var _toast = _interopRequireDefault(require("./toast"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _templateObject;
 /* eslint-disable react/jsx-one-expression-per-line */
@@ -43,7 +43,7 @@ function ExchangePassport(_ref) {
   const onDone = async (result, decrypt) => {
     onSuccess(result, decrypt);
     await session.refresh();
-    _toast.default.success(t('exchangePassport.success'));
+    _Toast.default.success(t('exchangePassport.success'));
     setTimeout(() => {
       if (redirect) {
         const url = decodeURIComponent(redirect);
@@ -60,7 +60,7 @@ function ExchangePassport(_ref) {
     }, 3000);
   };
   const onError = err => {
-    _toast.default.error(err.message);
+    _Toast.default.error(err.message);
   };
   const extraParams = {};
   const componentId = searchParams.get('componentId');

package/lib/hooks/blocklet.js

@@ -8,7 +8,7 @@ var _react = require("react");
 var _merge = _interopRequireDefault(require("lodash/merge"));
 var _omit = _interopRequireDefault(require("lodash/omit"));
 var _constant = require("@blocklet/constant");
-var _toast = _interopRequireDefault(require("../toast"));
+var _Toast = _interopRequireDefault(require("@arcblock/ux/lib/Toast"));
 var _util = require("../util");
 var _util2 = require("../blocklet/util");
 var _urlEvaluation = require("./url-evaluation");
@@ -68,7 +68,7 @@ function useBlocklet(_ref) {
       });
       setBlocklet(data);
     } catch (err) {
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
     } finally {
       setLoadingRuntimeInfo(false);
     }
@@ -94,7 +94,7 @@ function useBlocklet(_ref) {
         });
       }
     } catch (err) {
-      _toast.default.error(err.message);
+      _Toast.default.error(err.message);
     }
   };
   const refreshBlocklet = async function refreshBlocklet() {
@@ -135,7 +135,7 @@ function useBlocklet(_ref) {
       setLoading(false);
       setError(err);
       if (showError) {
-        _toast.default.error(err.message);
+        _Toast.default.error(err.message);
       }
     }
   };

package/lib/hooks/use-navigation.js

@@ -133,7 +133,7 @@ function useNavigation() {
   }, [components, state.rawNavigation]);
   function getNavigationFullLink(navigationItem) {
     if (!navigationItem.id) return '';
-    const fullList = (0, _parseNavigationFromBlocklet.flatternNavigation)((0, _parseNavigationFromBlocklet.joinLink)(navigation, components));
+    const fullList = (0, _parseNavigationFromBlocklet.flattenNavigation)((0, _parseNavigationFromBlocklet.joinLink)(navigation, components));
     const findItem = fullList.find(item => item.id === navigationItem.id);
     // eslint-disable-next-line react/prop-types
     function Uninstalled(_ref) {

package/lib/locales/en.js

@@ -264,7 +264,7 @@ module.exports = {
     storage: 'Storage',
     backup: 'Backup',
     store: 'Store',
-    succeeded: 'succeeded',
+    succeeded: 'Succeeded',
     support: 'Support',
     team: 'Team',
     the: 'The',
@@ -1173,7 +1173,6 @@ module.exports = {
     alreadyRunning: 'Application {name} is already running on this Blocklet Server',
     alreadyInstalled: 'Application {name} is already installed on this Blocklet Server',
     alreadyExists: 'This application already exists, redirecting...',
-    selectAbtNode: 'Select Blocklet Server',
     purchased: 'Already Purchased',
     purchase: 'Purchase',
     nextStep: 'Next Step',
@@ -1194,7 +1193,6 @@ module.exports = {
     newVersionDesc: 'The application already exists, but the current version can be upgraded',
     upgradeNow: 'Upgrade Now',
     later: 'Later',
-    abtnodeLicenseName: 'Blocklet Server License',
     introduction: 'Introduction',
     welcome: 'Welcome to the Blocklet Launch Wizard',
     accept: 'I agree to the Blocklet EULA',
@@ -1205,36 +1203,37 @@ module.exports = {
     launched: 'Complete',
     confirmInstall: 'Confirm Installation',
     dialog: {
-      title: 'Authorization Required',
-      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',
+      title: 'Become App Owner',
+      nftFreeDescription: 'Please present app space NFT and create app account to continue',
+      nftPaidDescription: 'Please present app space NFT and app purchase NFT to continue',
+      freeDescription: 'Please create app account to continue',
+      paidDescription: 'Please present app purchase NFT and create app account to continue',
       confirm: 'Confirm on your DID Wallet',
       success: 'Authorization Successfully',
       authorizationTimeout: 'Authorization timeout'
     },
     waiting: {
-      verifying: 'Verifying blocklet meta',
-      downloading: 'Downloading blocklet bundle',
-      downloadingComponent: 'Downloading: {name}',
-      extractingComponent: 'Extracting: {name}',
-      extracting: 'Extracting blocklet bundle',
-      installing: 'Installing blocklet and setup components',
+      verifying: 'Verifying app meta...',
+      downloading: 'Downloading app bundle...',
+      downloadingComponent: 'Downloading {name}',
+      extractingComponent: 'Extracting {name}',
+      extracting: 'Extracting app bundle...',
+      installing: 'Installing app components...',
       installed: 'Installed',
-      starting: 'Starting...',
-      done: 'Installation Complete'
+      starting: 'Starting the app...',
+      done: 'Waiting for app ready...'
     },
     error: {
-      loadMetaFailed: 'Load Blocklet information failed',
-      appMetaNotFound: 'No information found for this Blocklet',
-      downloadFailed: 'Failed to download the Blocklet, please try again',
-      installFailed: 'Failed to install the Blocklet, please try again',
-      startFailed: 'Failed to start the Blocklet, please try again',
-      launchFailed: 'Failed to launch the Blocklet, please try again',
-      installedButStopped: 'The Blocklet is installed successfully, but cannot be started. You can start it manually after resolving blocking issues',
-      installedButError: 'The Blocklet is successfully installed, but failed to start',
+      loadMetaFailed: 'Load app information failed',
+      appMetaNotFound: 'No information found for this app',
+      downloadFailed: 'Failed to download the app, please try again',
+      installFailed: 'Failed to install the app, please try again',
+      startFailed: 'Failed to start the app, please try again',
+      launchFailed: 'Failed to launch the app, please try again',
+      installedButStopped: 'The app is installed successfully, but cannot be started. You can start it manually after resolving blocking issues',
+      installedButError: 'The app is successfully installed, but failed to start',
       upgradeFailed: 'Upgrade Failed',
-      restoreFailed: 'Failed to restore blocklet, please try again'
+      restoreFailed: 'Failed to restore app, please try again'
     },
     steps: {
       introduction: 'Introduction',