@blocklet/launcher-workflow 2.3.7 → 2.3.9

package/es/components/confirm.js

@@ -30,7 +30,8 @@ export default function ConfirmDialog({
   params: initialParams,
   onCancel,
   onConfirm,
-  locale
+  locale,
+  disableCancel
 }) {
   const {
     locale: innerLocale
@@ -58,7 +59,7 @@ export default function ConfirmDialog({
       style: {
         padding: '8px 24px 24px'
       },
-      children: [/*#__PURE__*/_jsx(Button, {
+      children: [!disableCancel && /*#__PURE__*/_jsx(Button, {
         onClick: () => onCallback(onCancel),
         children: cancel || get(translations, `${innerLocale}.cancel`)
       }), /*#__PURE__*/_jsx(Button, {
@@ -82,7 +83,8 @@ ConfirmDialog.propTypes = {
   // This object holds states managed in the dialog
   onCancel: PropTypes.func,
   onConfirm: PropTypes.func.isRequired,
-  locale: PropTypes.oneOf(['en', 'zh'])
+  locale: PropTypes.oneOf(['en', 'zh']),
+  disableCancel: PropTypes.bool
 };
 ConfirmDialog.defaultProps = {
   onCancel: () => {},
@@ -90,5 +92,6 @@ ConfirmDialog.defaultProps = {
   confirm: '',
   color: 'error',
   params: {},
-  locale: 'en'
+  locale: 'en',
+  disableCancel: false
 };

package/es/locales/en.js

@@ -29,7 +29,8 @@ export default {
     space: 'Space',
     subscription: 'Subscription',
     price: 'Pricing',
-    unitPrice: 'Unit'
+    unitPrice: 'Unit',
+    visit: 'Visit'
   },
   license: {
     title: 'End User License Agreement',
@@ -134,6 +135,15 @@ export default {
     },
     paid: {
       redirecting: 'Payment success, redirecting...'
+    },
+    unexpectedLaunchSession: {
+      purchaseNewSpace: 'Purchase New Space',
+      paid: 'Current order has been paid',
+      paidDescription: 'The current order has been paid, you can choose to purchase a new space or continue the launch process.',
+      installed: 'Order has been installed',
+      installedDescription: 'The current order has been successfully installed, you can choose to purchase a new space or jump to the current application.',
+      expired: 'Order has been expired',
+      expiredDescription: 'The current order has expired, you can choose to purchase a new space.'
     }
   },
   checkout: {

package/es/locales/zh.js

@@ -29,7 +29,8 @@ export default {
     space: '空间',
     subscription: '订阅',
     payWith: '用{currency}支付',
-    unitPrice: '单价'
+    unitPrice: '单价',
+    visit: '访问'
   },
   license: {
     title: '空间用户协议',
@@ -133,6 +134,15 @@ export default {
     },
     paid: {
       redirecting: '支付成功，正在跳转...'
+    },
+    unexpectedLaunchSession: {
+      purchaseNewSpace: '购买新空间',
+      paid: '订单已支付',
+      paidDescription: '检测当前订单已经支付，您可以选择购买新的空间，或者继续启动流程',
+      installed: '订单已安装',
+      installedDescription: '检测当前订单已经安装成功，您可以选择购买新的空间，或者跳转到当前应用。',
+      expired: '订单已过期',
+      expiredDescription: '检测当前订单已经过期，您可以选择购买新的空间。'
     }
   },
   checkout: {

package/es/prepare.js

@@ -1,5 +1,6 @@
 import Center from '@arcblock/ux/lib/Center';
-import { getBlockletLogoUrl, getBlockletMetaUrlFromQuery, getDefaultTrialEnd } from '@blocklet/launcher-util/es/util';
+import { LAUNCH_STATUS } from '@blocklet/launcher-util/es/constant';
+import { getBlockletAdminURL, getBlockletLogoUrl, getBlockletMetaUrlFromQuery, getDefaultTrialEnd } from '@blocklet/launcher-util/es/util';
 import CheckoutOnDemand from '@blocklet/launcher-ux/lib/payment/checkout/on-demand';
 import { CheckoutTable, PaymentProvider } from '@blocklet/payment-react';
 import styled from '@emotion/styled';
@@ -9,11 +10,12 @@ import Stack from '@mui/material/Stack';
 import ToggleButton from '@mui/material/ToggleButton';
 import ToggleButtonGroup from '@mui/material/ToggleButtonGroup';
 import PropTypes from 'prop-types';
-import { useEffect } from 'react';
+import { useCallback, useEffect } from 'react';
 import { Link, useNavigate, useSearchParams } from 'react-router-dom';
 import useAsync from 'react-use/lib/useAsync';
 import useSetState from 'react-use/lib/useSetState';
 import joinURL from 'url-join';
+import ConfirmDialog from './components/confirm';
 import Body from './components/layout/body';
 import Header from './components/layout/header';
 import { useLocaleContext } from './contexts/locale';
@@ -72,7 +74,7 @@ function Content({
       });
     }
   }, [defaultProductType, params, setParams, setState]);
-  const getLaunchState = useAsync(async () => {
+  const launchState = useAsync(async () => {
     const createPromiseFn = (fn, ...args) => new Promise((resolve, reject) => {
       fn(...args, (err, value) => {
         if (err) {
@@ -89,8 +91,14 @@ function Content({
     const launch = await createPromiseFn(launchSession.create, launchSessionAPI, routerPrefix, blockletMetaUrl);
     return launch;
   });
+  const getPurchaseNewLink = useCallback(() => {
+    window.location = launchState?.value?.app?.appURL;
+    const urlObj = new URL(window.location.href);
+    urlObj.searchParams.delete('sessionId');
+    return urlObj.href;
+  }, [launchState?.value?.app?.appURL]);
   useEffect(() => {
-    const tmpLaunch = getLaunchState.value;
+    const tmpLaunch = launchState.value;
     if (!tmpLaunch) {
       return;
     }
@@ -100,14 +108,14 @@ function Content({
         replace: true
       });
     }
-  }, [getLaunchState.value, params, setParams]);
-  if (getLaunchState.loading || blocklet.loading) {
+  }, [launchState.value, params, setParams]);
+  if (launchState.loading || blocklet.loading) {
     return /*#__PURE__*/_jsx(Center, {
       relative: "parent",
       children: /*#__PURE__*/_jsx(CircularProgress, {})
     });
   }
-  if (getLaunchState.error) {
+  if (launchState.error) {
     return t('common.serviceError');
   }
   const handlePaid = () => {
@@ -128,7 +136,47 @@ function Content({
 
   // TODO: PaymentKitV2 处理支付失败的情况
 
-  const launch = getLaunchState.value;
+  const launch = launchState.value;
+  if ([LAUNCH_STATUS.paid, LAUNCH_STATUS.nftMinted, LAUNCH_STATUS.allocated].includes(launch.status)) {
+    return /*#__PURE__*/_jsx(ConfirmDialog, {
+      title: t('purchase.unexpectedLaunchSession.paid'),
+      description: t('purchase.unexpectedLaunchSession.paidDescription'),
+      color: "primary",
+      cancel: t('purchase.unexpectedLaunchSession.purchaseNewSpace'),
+      confirm: t('common.continue'),
+      onCancel: () => {
+        window.location = getPurchaseNewLink();
+      },
+      onConfirm: handlePaid
+    });
+  }
+  if (launch.status === LAUNCH_STATUS.installed) {
+    return /*#__PURE__*/_jsx(ConfirmDialog, {
+      title: t('purchase.unexpectedLaunchSession.installed'),
+      description: t('purchase.unexpectedLaunchSession.installedDescription'),
+      color: "primary",
+      cancel: t('purchase.unexpectedLaunchSession.purchaseNewSpace'),
+      confirm: t('common.visit'),
+      onCancel: () => {
+        window.location = getPurchaseNewLink();
+      },
+      onConfirm: () => {
+        window.location = getBlockletAdminURL(launch?.app?.appURL);
+      }
+    });
+  }
+  if ([LAUNCH_STATUS.expired, LAUNCH_STATUS.terminated, LAUNCH_STATUS.timeout].includes(launch.status)) {
+    return /*#__PURE__*/_jsx(ConfirmDialog, {
+      title: t('purchase.unexpectedLaunchSession.expired'),
+      description: t('purchase.unexpectedLaunchSession.expiredDescription'),
+      color: "primary",
+      confirm: t('purchase.unexpectedLaunchSession.purchaseNewSpace'),
+      disableCancel: true,
+      onConfirm: () => {
+        window.location = getPurchaseNewLink();
+      }
+    });
+  }
   return /*#__PURE__*/_jsx(Root, {
     children: /*#__PURE__*/_jsxs(Stack, {
       direction: "column",

package/lib/components/confirm.js

@@ -38,7 +38,8 @@ function ConfirmDialog(_ref) {
     params: initialParams,
     onCancel,
     onConfirm,
-    locale
+    locale,
+    disableCancel
   } = _ref;
   const {
     locale: innerLocale
@@ -66,7 +67,7 @@ function ConfirmDialog(_ref) {
       style: {
         padding: '8px 24px 24px'
       },
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+      children: [!disableCancel && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
         onClick: () => onCallback(onCancel),
         children: cancel || (0, _lodash.default)(translations, "".concat(innerLocale, ".cancel"))
       }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
@@ -90,7 +91,8 @@ ConfirmDialog.propTypes = {
   // This object holds states managed in the dialog
   onCancel: _propTypes.default.func,
   onConfirm: _propTypes.default.func.isRequired,
-  locale: _propTypes.default.oneOf(['en', 'zh'])
+  locale: _propTypes.default.oneOf(['en', 'zh']),
+  disableCancel: _propTypes.default.bool
 };
 ConfirmDialog.defaultProps = {
   onCancel: () => {},
@@ -98,5 +100,6 @@ ConfirmDialog.defaultProps = {
   confirm: '',
   color: 'error',
   params: {},
-  locale: 'en'
+  locale: 'en',
+  disableCancel: false
 };

package/lib/locales/en.js

@@ -35,7 +35,8 @@ var _default = exports.default = {
     space: 'Space',
     subscription: 'Subscription',
     price: 'Pricing',
-    unitPrice: 'Unit'
+    unitPrice: 'Unit',
+    visit: 'Visit'
   },
   license: {
     title: 'End User License Agreement',
@@ -140,6 +141,15 @@ var _default = exports.default = {
     },
     paid: {
       redirecting: 'Payment success, redirecting...'
+    },
+    unexpectedLaunchSession: {
+      purchaseNewSpace: 'Purchase New Space',
+      paid: 'Current order has been paid',
+      paidDescription: 'The current order has been paid, you can choose to purchase a new space or continue the launch process.',
+      installed: 'Order has been installed',
+      installedDescription: 'The current order has been successfully installed, you can choose to purchase a new space or jump to the current application.',
+      expired: 'Order has been expired',
+      expiredDescription: 'The current order has expired, you can choose to purchase a new space.'
     }
   },
   checkout: {

package/lib/locales/zh.js

@@ -35,7 +35,8 @@ var _default = exports.default = {
     space: '空间',
     subscription: '订阅',
     payWith: '用{currency}支付',
-    unitPrice: '单价'
+    unitPrice: '单价',
+    visit: '访问'
   },
   license: {
     title: '空间用户协议',
@@ -139,6 +140,15 @@ var _default = exports.default = {
     },
     paid: {
       redirecting: '支付成功，正在跳转...'
+    },
+    unexpectedLaunchSession: {
+      purchaseNewSpace: '购买新空间',
+      paid: '订单已支付',
+      paidDescription: '检测当前订单已经支付，您可以选择购买新的空间，或者继续启动流程',
+      installed: '订单已安装',
+      installedDescription: '检测当前订单已经安装成功，您可以选择购买新的空间，或者跳转到当前应用。',
+      expired: '订单已过期',
+      expiredDescription: '检测当前订单已经过期，您可以选择购买新的空间。'
     }
   },
   checkout: {

package/lib/prepare.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _Center = _interopRequireDefault(require("@arcblock/ux/lib/Center"));
+var _constant = require("@blocklet/launcher-util/es/constant");
 var _util = require("@blocklet/launcher-util/es/util");
 var _onDemand = _interopRequireDefault(require("@blocklet/launcher-ux/lib/payment/checkout/on-demand"));
 var _paymentReact = require("@blocklet/payment-react");
@@ -20,6 +21,7 @@ var _reactRouterDom = require("react-router-dom");
 var _useAsync = _interopRequireDefault(require("react-use/lib/useAsync"));
 var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
+var _confirm = _interopRequireDefault(require("./components/confirm"));
 var _body = _interopRequireDefault(require("./components/layout/body"));
 var _header = _interopRequireDefault(require("./components/layout/header"));
 var _locale = require("./contexts/locale");
@@ -33,7 +35,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 const Root = (0, _styled.default)('div')(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n  height: 100%;\n  padding-top: 0;\n\n  @media (max-width: 960px) {\n    width: 100%;\n  }\n"])));
 function Content(_ref) {
-  var _window$blocklet, _ref2, _window$blocklet2, _window$blocklet3, _window$blocklet4;
+  var _window$blocklet, _launchState$value2, _ref2, _window$blocklet2, _window$blocklet3, _window$blocklet4;
   let {
     blocklet
   } = _ref;
@@ -75,7 +77,7 @@ function Content(_ref) {
       });
     }
   }, [defaultProductType, params, setParams, setState]);
-  const getLaunchState = (0, _useAsync.default)(async () => {
+  const launchState = (0, _useAsync.default)(async () => {
     const createPromiseFn = function createPromiseFn(fn) {
       for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
         args[_key - 1] = arguments[_key];
@@ -97,8 +99,15 @@ function Content(_ref) {
     const launch = await createPromiseFn(_util2.launchSession.create, launchSessionAPI, routerPrefix, blockletMetaUrl);
     return launch;
   });
+  const getPurchaseNewLink = (0, _react.useCallback)(() => {
+    var _launchState$value;
+    window.location = launchState === null || launchState === void 0 || (_launchState$value = launchState.value) === null || _launchState$value === void 0 || (_launchState$value = _launchState$value.app) === null || _launchState$value === void 0 ? void 0 : _launchState$value.appURL;
+    const urlObj = new URL(window.location.href);
+    urlObj.searchParams.delete('sessionId');
+    return urlObj.href;
+  }, [launchState === null || launchState === void 0 || (_launchState$value2 = launchState.value) === null || _launchState$value2 === void 0 || (_launchState$value2 = _launchState$value2.app) === null || _launchState$value2 === void 0 ? void 0 : _launchState$value2.appURL]);
   (0, _react.useEffect)(() => {
-    const tmpLaunch = getLaunchState.value;
+    const tmpLaunch = launchState.value;
     if (!tmpLaunch) {
       return;
     }
@@ -108,14 +117,14 @@ function Content(_ref) {
         replace: true
       });
     }
-  }, [getLaunchState.value, params, setParams]);
-  if (getLaunchState.loading || blocklet.loading) {
+  }, [launchState.value, params, setParams]);
+  if (launchState.loading || blocklet.loading) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Center.default, {
       relative: "parent",
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_CircularProgress.default, {})
     });
   }
-  if (getLaunchState.error) {
+  if (launchState.error) {
     return t('common.serviceError');
   }
   const handlePaid = () => {
@@ -136,7 +145,48 @@ function Content(_ref) {
 
   // TODO: PaymentKitV2 处理支付失败的情况
 
-  const launch = getLaunchState.value;
+  const launch = launchState.value;
+  if ([_constant.LAUNCH_STATUS.paid, _constant.LAUNCH_STATUS.nftMinted, _constant.LAUNCH_STATUS.allocated].includes(launch.status)) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
+      title: t('purchase.unexpectedLaunchSession.paid'),
+      description: t('purchase.unexpectedLaunchSession.paidDescription'),
+      color: "primary",
+      cancel: t('purchase.unexpectedLaunchSession.purchaseNewSpace'),
+      confirm: t('common.continue'),
+      onCancel: () => {
+        window.location = getPurchaseNewLink();
+      },
+      onConfirm: handlePaid
+    });
+  }
+  if (launch.status === _constant.LAUNCH_STATUS.installed) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
+      title: t('purchase.unexpectedLaunchSession.installed'),
+      description: t('purchase.unexpectedLaunchSession.installedDescription'),
+      color: "primary",
+      cancel: t('purchase.unexpectedLaunchSession.purchaseNewSpace'),
+      confirm: t('common.visit'),
+      onCancel: () => {
+        window.location = getPurchaseNewLink();
+      },
+      onConfirm: () => {
+        var _launch$app;
+        window.location = (0, _util.getBlockletAdminURL)(launch === null || launch === void 0 || (_launch$app = launch.app) === null || _launch$app === void 0 ? void 0 : _launch$app.appURL);
+      }
+    });
+  }
+  if ([_constant.LAUNCH_STATUS.expired, _constant.LAUNCH_STATUS.terminated, _constant.LAUNCH_STATUS.timeout].includes(launch.status)) {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_confirm.default, {
+      title: t('purchase.unexpectedLaunchSession.expired'),
+      description: t('purchase.unexpectedLaunchSession.expiredDescription'),
+      color: "primary",
+      confirm: t('purchase.unexpectedLaunchSession.purchaseNewSpace'),
+      disableCancel: true,
+      onConfirm: () => {
+        window.location = getPurchaseNewLink();
+      }
+    });
+  }
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(Root, {
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Stack.default, {
       direction: "column",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.3.7",
+  "version": "2.3.9",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -46,9 +46,9 @@
     "@arcblock/license": "^2.9.64",
     "@arcblock/react-hooks": "^2.9.64",
     "@arcblock/ux": "^2.9.64",
-    "@blocklet/launcher-layout": "2.3.7",
-    "@blocklet/launcher-util": "2.3.7",
-    "@blocklet/launcher-ux": "2.3.7",
+    "@blocklet/launcher-layout": "2.3.9",
+    "@blocklet/launcher-util": "2.3.9",
+    "@blocklet/launcher-ux": "2.3.9",
     "@blocklet/payment": "^1.13.210",
     "@blocklet/payment-react": "^1.13.210",
     "@emotion/react": "^11.11.4",
@@ -106,5 +106,5 @@
       "require": "./lib/locales/index.js"
     }
   },
-  "gitHead": "a95cc2bfb9cc2abf2e32abe64cc9ed36bef904a7"
+  "gitHead": "a9859828087d0e65bafe0b9fa2947b33f0cba7da"
 }