@blocklet/launcher-workflow 2.1.58 → 2.1.60

package/lib/components/in-progress-session.js

@@ -0,0 +1,95 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = InProgressSession;
+var _Button = _interopRequireDefault(require("@arcblock/ux/lib/Button"));
+var _Dialog = _interopRequireDefault(require("@arcblock/ux/lib/Dialog"));
+var _launcherUtil = require("@blocklet/launcher-util");
+var _Box = _interopRequireDefault(require("@mui/material/Box"));
+var _Link = require("@mui/material/Link");
+var _react = require("react");
+var _useAsync = _interopRequireDefault(require("react-use/lib/useAsync"));
+var _urlJoin = _interopRequireDefault(require("url-join"));
+var _locale = require("../contexts/locale");
+var _request = _interopRequireDefault(require("../contexts/request"));
+var _workflow = require("../contexts/workflow");
+var _jsxRuntime = require("react/jsx-runtime");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// 不考虑 localstorage 的过期时间
+const IGNORE_LAUNCH_SESSION_KEY = 'launcher-ignore-launch-session';
+function InProgressSession() {
+  var _state$value;
+  const {
+    t
+  } = (0, _locale.useLocaleContext)();
+  const {
+    create
+  } = (0, _request.default)();
+  const {
+    routerPrefix
+  } = (0, _workflow.useWorkflowContext)();
+  const [open, setOpen] = (0, _react.useState)(false);
+  const api = create();
+  const state = (0, _useAsync.default)(async () => {
+    const {
+      data
+    } = await api.get((0, _urlJoin.default)(routerPrefix, '/launches/in-progress'));
+    if (data.launch) {
+      if (localStorage.getItem(IGNORE_LAUNCH_SESSION_KEY) === data.launch._id) {
+        return null;
+      }
+      setOpen(true);
+    }
+    return data.launch;
+  });
+  if (state.loading || !state.value) {
+    return '';
+  }
+  if (state.error) {
+    console.error('load in progress session failed', state.error);
+    return '';
+  }
+  const handleClose = () => {
+    setOpen(false);
+    localStorage.setItem(IGNORE_LAUNCH_SESSION_KEY, state.value._id);
+  };
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dialog.default, {
+    open: open,
+    showCloseButton: true,
+    PaperProps: {
+      style: {
+        maxWidth: 700,
+        minWidth: 400,
+        minHeight: 200
+      }
+    },
+    title: t('purchase.inProgress.title'),
+    onClose: () => handleClose(null),
+    actions: /*#__PURE__*/(0, _jsxRuntime.jsxs)(_Box.default, {
+      display: "flex",
+      gap: 2,
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+        variant: "outlined",
+        size: "small",
+        onClick: handleClose,
+        children: t('purchase.inProgress.notRemind')
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+        component: _Link.Link,
+        autoFocus: true,
+        variant: "contained",
+        color: "primary",
+        size: "small",
+        href: (0, _launcherUtil.getContinueLaunchURL)({
+          baseURL: window.location.origin,
+          launch: state.value
+        }),
+        children: t('purchase.inProgress.continue')
+      })]
+    }),
+    children: t('purchase.inProgress.content', {
+      blockletName: (_state$value = state.value) === null || _state$value === void 0 || (_state$value = _state$value.blockletMeta) === null || _state$value === void 0 ? void 0 : _state$value.title
+    })
+  });
+}

package/lib/locales/en.js

@@ -117,6 +117,12 @@ module.exports = {
       title: 'Purchase successfully',
       redirectToStoreButton: 'Go to install the application →',
       purchaseServerlessSuccess: 'The purchase of Running Space is successful and you can go ahead and install Blocklet.'
+    },
+    inProgress: {
+      title: 'Unfinished Order',
+      continue: 'Continue',
+      content: 'You have an incomplete order {blockletName}, Continue this order?',
+      notRemind: 'No more reminders'
     }
   },
   checkout: {

package/lib/locales/zh.js

@@ -116,6 +116,12 @@ module.exports = {
       title: '购买成功',
       redirectToStoreButton: '去安装应用 →',
       purchaseServerlessSuccess: '购买运行空间成功，您可以去安装应用.'
+    },
+    inProgress: {
+      title: '未完成的订单',
+      continue: '继续',
+      content: '您有一个未完成的订单: {blockletName}，继续该订单？',
+      notRemind: '不再提醒'
     }
   },
   checkout: {

package/lib/purchase.js

@@ -15,16 +15,17 @@ var _CircularProgress = _interopRequireDefault(require("@mui/material/CircularPr
 var _Tooltip = _interopRequireDefault(require("@mui/material/Tooltip"));
 var _reactSplide = require("@splidejs/react-splide");
 var _splideExtensionGrid = require("@splidejs/splide-extension-grid");
+var _lodash = _interopRequireDefault(require("lodash.get"));
 var _propTypes = _interopRequireDefault(require("prop-types"));
 var _react = _interopRequireWildcard(require("react"));
 var _reactRouterDom = require("react-router-dom");
 var _useMeasure = _interopRequireDefault(require("react-use/lib/useMeasure"));
 var _useSetState = _interopRequireDefault(require("react-use/lib/useSetState"));
 var _urlJoin = _interopRequireDefault(require("url-join"));
-var _lodash = _interopRequireDefault(require("lodash.get"));
 require("@splidejs/splide/dist/css/splide.min.css");
 var _launchResultMessage = _interopRequireDefault(require("@blocklet/launcher-layout/lib/launch-result-message"));
 var _formatError = _interopRequireDefault(require("@blocklet/launcher-util/lib/format-error"));
+var _inProgressSession = _interopRequireDefault(require("./components/in-progress-session"));
 var _layout = _interopRequireDefault(require("./components/layout"));
 var _body = _interopRequireDefault(require("./components/layout/body"));
 var _footer = _interopRequireDefault(require("./components/layout/footer"));
@@ -513,7 +514,7 @@ function PurchasePage(_ref) {
           })
         })]
       })
-    }), state.showRedeem && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
+    }), session.user && /*#__PURE__*/(0, _jsxRuntime.jsx)(_inProgressSession.default, {}), state.showRedeem && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Connect.default, {
       open: true,
       popup: true,
       useSocket: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.1.58",
+  "version": "2.1.60",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -40,9 +40,9 @@
     "@arcblock/license": "^2.5.66",
     "@arcblock/react-hooks": "^2.5.66",
     "@arcblock/ux": "^2.5.66",
-    "@blocklet/launcher-layout": "2.1.58",
-    "@blocklet/launcher-util": "2.1.58",
-    "@blocklet/launcher-ux": "2.1.58",
+    "@blocklet/launcher-layout": "2.1.60",
+    "@blocklet/launcher-util": "2.1.60",
+    "@blocklet/launcher-ux": "2.1.60",
     "@blocklet/payment": "^1.12.29",
     "@emotion/react": "^11.11.1",
     "@emotion/styled": "^11.11.0",
@@ -76,5 +76,5 @@
     "babel-plugin-inline-react-svg": "^2.0.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "6ca5c3cb3116700025424f95aceb7d85ef3e6814"
+  "gitHead": "890f1974f0f1f87d73680658d723c4d9ad0a39f5"
 }