@blocklet/launcher-workflow 2.1.26 → 2.1.28

package/lib/locales/en.js

@@ -100,6 +100,8 @@ module.exports = {
   },
   purchase: {
     pageTitle: 'Purchase Space',
+    noPlan: 'Select space to continue',
+    hasPlan: 'Continue with {name}',
     selectSpaceHint: 'Already have dedicated space? Click here to select >',
     morePlanPrompt: 'Flip the page to see more plans',
     redeem: 'Select purchased space',

package/lib/locales/zh.js

@@ -102,6 +102,8 @@ module.exports = {
     selectSpaceHint: '已有专用空间？点击这里选择 >',
     morePlanPrompt: '翻页看更多方案',
     redeem: '我已购买空间',
+    noPlan: '选择套餐以继续',
+    hasPlan: '选用{name}',
     noProducts: '没有可购买的商品，请检查 PaymentKit 的配置',
     serverlessNotSupported: '该应用被禁止能在单应用或者按需空间中运行，请选择专用空间',
     dialog: {

package/lib/purchase.js

@@ -245,7 +245,9 @@ function PurchasePage(_ref) {
     }
     if (state.sessionId !== params.get('sessionId')) {
       params.set('sessionId', state.sessionId);
-      setParams(params);
+      setParams(params, {
+        replace: true
+      });
     }
   }, [state.sessionId]);
   (0, _react.useEffect)(() => {
@@ -298,7 +300,9 @@ function PurchasePage(_ref) {
     }
     if (state.planId !== params.get('planId')) {
       params.set('planId', state.planId);
-      setParams(params);
+      setParams(params, {
+        replace: true
+      });
     }
   }, [state.planId]);
   (0, _react.useEffect)(() => {
@@ -307,7 +311,9 @@ function PurchasePage(_ref) {
     }
     if (state.paymentMethod !== params.get('paymentMethod')) {
       params.set('paymentMethod', state.paymentMethod);
-      setParams(params);
+      setParams(params, {
+        replace: true
+      });
     }
   }, [state.paymentMethod]);
   (0, _react.useEffect)(() => {
@@ -365,6 +371,7 @@ function PurchasePage(_ref) {
       search: params.toString()
     });
   };
+  const plan = state.planId && state.plans ? state.plans.find(x => x._id === state.planId) : null;
   return /*#__PURE__*/(0, _jsxRuntime.jsxs)(Container, {
     embed: embed,
     children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_header.default, {
@@ -406,7 +413,9 @@ function PurchasePage(_ref) {
                 to: (0, _urlJoin.default)(routerPrefix, "/purchase/checkout?".concat(params.toString())),
                 className: "button-next",
                 variant: "contained",
-                children: t('common.next')
+                children: plan ? t('purchase.hasPlan', {
+                  name: plan.name[locale]
+                }) : t('purchase.noPlan')
               })]
             }),
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -531,7 +540,7 @@ function PurchasePage(_ref) {
     })]
   });
 }
-const Container = (0, _styled.default)(_layout.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .container-inner {\n    position: absolute;\n    left: 0;\n    top: 0;\n    width: 100%;\n    height: 100%;\n  }\n\n  .plan-list {\n    display: flex;\n    justify-content: center;\n    align-items: center;\n\n    @media (min-width: 900px) {\n      margin-top: 20px;\n    }\n\n    @media (min-width: 680px) and (max-width: 899px) {\n      justify-content: center;\n    }\n\n    .toc {\n      min-width: 180px;\n      margin-right: 20px;\n    }\n\n    button.splide__pagination__page.is-active {\n      background: #9397a1;\n    }\n  }\n\n  .splide__pagination-custom {\n    bottom: -24px;\n  }\n\n  .footer {\n    display: flex;\n    justify-content: ", ";\n    align-item: center;\n    margin-top: auto;\n    padding-top: 16px;\n\n    > * {\n      margin: 0 8px;\n      ", " {\n        margin: 0 16px;\n      }\n    }\n\n    @media (max-width: ", "px) {\n      flex-direction: column;\n      align-items: center;\n    }\n\n    .footer-left {\n      display: flex;\n      gap: 16px;\n      align-items: center;\n      justify-content: space-between;\n\n      .select-space {\n        order: 1;\n        color: #000;\n\n        &:hover {\n          text-decoration: underline !important;\n        }\n      }\n\n      .redeem-button {\n        order: 1;\n      }\n\n      @media (max-width: ", "px) {\n        width: 100%;\n        flex-direction: column;\n\n        .redeem-button {\n          width: 100%;\n          order: 2;\n        }\n      }\n    }\n\n    .button-next {\n      width: 200px;\n\n      @media (max-width: ", "px) {\n        width: 100%;\n        margin-top: 20px;\n      }\n    }\n  }\n"])), props => props.embed ? 'space-between' : 'flex-end', props => props.theme.breakpoints.up('md'), props => props.theme.breakpoints.values.sm, props => props.theme.breakpoints.values.sm, props => props.theme.breakpoints.values.sm);
+const Container = (0, _styled.default)(_layout.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  .container-inner {\n    position: absolute;\n    left: 0;\n    top: 0;\n    width: 100%;\n    height: 100%;\n  }\n\n  .plan-list {\n    display: flex;\n    justify-content: center;\n    align-items: center;\n\n    @media (min-width: 900px) {\n      margin-top: 20px;\n    }\n\n    @media (min-width: 680px) and (max-width: 899px) {\n      justify-content: center;\n    }\n\n    .toc {\n      min-width: 180px;\n      margin-right: 20px;\n    }\n\n    button.splide__pagination__page.is-active {\n      background: #9397a1;\n    }\n  }\n\n  .splide__pagination-custom {\n    bottom: -24px;\n  }\n\n  .footer {\n    display: flex;\n    justify-content: ", ";\n    align-item: center;\n    margin-top: auto;\n    padding-top: 16px;\n\n    > * {\n      margin: 0 8px;\n      ", " {\n        margin: 0 16px;\n      }\n    }\n\n    @media (max-width: ", "px) {\n      flex-direction: column;\n      align-items: center;\n    }\n\n    .footer-left {\n      display: flex;\n      gap: 16px;\n      align-items: center;\n      justify-content: space-between;\n\n      .select-space {\n        order: 1;\n        color: #000;\n\n        &:hover {\n          text-decoration: underline !important;\n        }\n      }\n\n      .redeem-button {\n        order: 1;\n      }\n\n      @media (max-width: ", "px) {\n        width: 100%;\n        flex-direction: column;\n\n        .redeem-button {\n          width: 100%;\n          order: 2;\n        }\n      }\n    }\n\n    .button-next {\n      min-width: 200px;\n\n      @media (max-width: ", "px) {\n        width: 100%;\n        margin-top: 20px;\n      }\n    }\n  }\n"])), props => props.embed ? 'space-between' : 'flex-end', props => props.theme.breakpoints.up('md'), props => props.theme.breakpoints.values.sm, props => props.theme.breakpoints.values.sm, props => props.theme.breakpoints.values.sm);
 PurchasePage.propTypes = {
   disableBack: _propTypes.default.bool
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.1.26",
+  "version": "2.1.28",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -35,15 +35,15 @@
     "react": ">=18.1.0"
   },
   "dependencies": {
-    "@arcblock/did-connect": "^2.5.52",
-    "@arcblock/icons": "^2.5.52",
-    "@arcblock/license": "^2.5.52",
-    "@arcblock/react-hooks": "^2.5.52",
-    "@arcblock/ux": "^2.5.52",
-    "@blocklet/launcher-layout": "2.1.26",
-    "@blocklet/launcher-util": "2.1.26",
-    "@blocklet/launcher-ux": "2.1.26",
-    "@blocklet/payment": "^1.12.12",
+    "@arcblock/did-connect": "^2.5.53",
+    "@arcblock/icons": "^2.5.53",
+    "@arcblock/license": "^2.5.53",
+    "@arcblock/react-hooks": "^2.5.53",
+    "@arcblock/ux": "^2.5.53",
+    "@blocklet/launcher-layout": "2.1.28",
+    "@blocklet/launcher-util": "2.1.28",
+    "@blocklet/launcher-ux": "2.1.28",
+    "@blocklet/payment": "^1.12.15",
     "@emotion/react": "^11.11.0",
     "@emotion/styled": "^11.11.0",
     "@mui/icons-material": "^5.11.16",
@@ -75,5 +75,5 @@
     "babel-plugin-inline-react-svg": "^2.0.2",
     "jest": "^27.5.1"
   },
-  "gitHead": "835f9d82ed43b4eb75a15a35e087e5fbaf51f32a"
+  "gitHead": "8f18d43e67331df2eee7f983f20d61fb47f7183f"
 }