@blocklet/launcher-workflow 2.5.4 → 2.5.6

package/es/components/launch-serverless/shared/success-display.js

@@ -4,17 +4,19 @@ import ContentCopyIcon from '@mui/icons-material/ContentCopy';
 import DashboardIcon from '@mui/icons-material/Dashboard';
 import OpenInNewIcon from '@mui/icons-material/OpenInNew';
 import TaskAltIcon from '@mui/icons-material/TaskAlt';
-import { alpha, Box, Button, CircularProgress, Typography, useTheme } from '@mui/material';
+import InfoIcon from '@mui/icons-material/Info';
+import { alpha, Box, Button, CircularProgress, Typography, useTheme, Alert } from '@mui/material';
 import Chip from '@mui/material/Chip';
 import IconButton from '@mui/material/IconButton';
 import { useSetState } from 'ahooks';
 import PropTypes from 'prop-types';
 import React, { useEffect, useMemo } from 'react';
-import { joinURL } from 'ufo';
+import { joinURL, withQuery } from 'ufo';
 import { useLocaleContext } from '../../../contexts/locale';
 import useRequest from '../../../contexts/request';
 import useSerialPolling from '../../../hooks/use-serial-polling';
 import { checkBlockletAccessible, checkUrlAccessible } from '../../../util';
+import { useSessionContext } from '../../../contexts/session';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export default function AppSuccessDisplay({
   accessibleUrl,
@@ -25,11 +27,15 @@ export default function AppSuccessDisplay({
 }) {
   const theme = useTheme();
   const {
-    t
+    t,
+    locale
   } = useLocaleContext();
   const {
     api
   } = useRequest();
+  const {
+    session
+  } = useSessionContext();
   const [state, setState] = useSetState({
     accessibleUrls: [accessibleUrl],
     checkingBlockletStatus: true,
@@ -335,6 +341,39 @@ export default function AppSuccessDisplay({
           })]
         }, url))]
       })]
+    }), session.user?.email && /*#__PURE__*/_jsxs(Alert, {
+      icon: /*#__PURE__*/_jsx(InfoIcon, {
+        fontSize: "inherit"
+      }),
+      severity: "info",
+      sx: {
+        mb: 3
+      },
+      children: [/*#__PURE__*/_jsxs(Typography, {
+        variant: "body1",
+        sx: {
+          mb: 1,
+          textAlign: 'left'
+        },
+        children: [/*#__PURE__*/_jsx("strong", {
+          children: t('startApp.ownerAccount')
+        }), /*#__PURE__*/_jsx(Box, {
+          component: "span",
+          sx: {
+            color: 'primary.main',
+            fontWeight: '500',
+            backgroundColor: alpha(theme.palette.primary.main, 0.05),
+            px: 1,
+            py: 0.25,
+            borderRadius: 0.5
+          },
+          children: session.user.email
+        })]
+      }), /*#__PURE__*/_jsx(Typography, {
+        variant: "body2",
+        color: "text.secondary",
+        children: t('startApp.ownerAccountDescription')
+      })]
     }), /*#__PURE__*/_jsxs(Box, {
       display: "flex",
       flexDirection: "column",
@@ -359,7 +398,13 @@ export default function AppSuccessDisplay({
               minWidth: 220
             },
             color: "primary",
-            onClick: () => window.open(joinURL(getBaseURL(), `/api/launches/${sessionId}/redirect/dashboard?appUrl=${appUrl}&appDid=${blockletInfo.appPid}&ownerDid=${blockletInfo.ownerDid}`), '_blank'),
+            onClick: () => window.open(withQuery(joinURL(getBaseURL(), `/api/launches/${sessionId}/redirect/dashboard`), {
+              appUrl,
+              appDid: blockletInfo.appPid,
+              ownerDid: blockletInfo.ownerDid,
+              locale,
+              theme: theme.palette.mode
+            }), '_blank'),
             startIcon: /*#__PURE__*/_jsx(DashboardIcon, {
               sx: {
                 fontSize: 24,
@@ -381,7 +426,13 @@ export default function AppSuccessDisplay({
                 color: theme.palette.text.secondary
               }
             },
-            onClick: () => started && window.open(joinURL(getBaseURL(), `/api/launches/${sessionId}/redirect/app?appUrl=${appUrl}&appDid=${blockletInfo.appPid}&ownerDid=${blockletInfo.ownerDid}`), '_blank'),
+            onClick: () => started && window.open(withQuery(joinURL(getBaseURL(), `/api/launches/${sessionId}/redirect/app`), {
+              appUrl,
+              appDid: blockletInfo.appPid,
+              ownerDid: blockletInfo.ownerDid,
+              locale,
+              theme: theme.palette.mode
+            }), '_blank'),
             startIcon: started ? /*#__PURE__*/_jsx(OpenInNewIcon, {
               sx: {
                 fontSize: 24,

package/es/locales/en.js

@@ -127,7 +127,9 @@ export default {
     error: {
       expired: 'Blocklet has expired or terminated, please purchase a new one',
       noAppUrl: 'No accessible URL found, please contact the administrator'
-    }
+    },
+    ownerAccount: 'Owner Account:',
+    ownerAccountDescription: 'This account will be used to log in and manage your Blocklet application.'
   },
   loading: {
     completed: 'completed',

package/es/locales/zh.js

@@ -126,7 +126,9 @@ export default {
     error: {
       expired: 'Blocklet 已过期或已终止，请重新购买',
       noAppUrl: '没有发现 Blocklet 的访问地址，请联系管理员'
-    }
+    },
+    ownerAccount: 'Owner 账户：',
+    ownerAccountDescription: '此账户将用于登录和管理您的 Blocklet 应用。'
   },
   loading: {
     completed: '完成',

package/lib/components/launch-serverless/shared/success-display.js

@@ -10,6 +10,7 @@ var _ContentCopy = _interopRequireDefault(require("@mui/icons-material/ContentCo
 var _Dashboard = _interopRequireDefault(require("@mui/icons-material/Dashboard"));
 var _OpenInNew = _interopRequireDefault(require("@mui/icons-material/OpenInNew"));
 var _TaskAlt = _interopRequireDefault(require("@mui/icons-material/TaskAlt"));
+var _Info = _interopRequireDefault(require("@mui/icons-material/Info"));
 var _material = require("@mui/material");
 var _Chip = _interopRequireDefault(require("@mui/material/Chip"));
 var _IconButton = _interopRequireDefault(require("@mui/material/IconButton"));
@@ -21,6 +22,7 @@ var _locale = require("../../../contexts/locale");
 var _request = _interopRequireDefault(require("../../../contexts/request"));
 var _useSerialPolling = _interopRequireDefault(require("../../../hooks/use-serial-polling"));
 var _util2 = require("../../../util");
+var _session = require("../../../contexts/session");
 var _jsxRuntime = require("react/jsx-runtime");
 function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function _interopRequireWildcard(e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
@@ -30,7 +32,7 @@ function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 function AppSuccessDisplay(_ref) {
-  var _launchSession$appInf, _launchSession$blockl, _launchSession$appInf2, _launchSession$metada, _state$blockletInfo;
+  var _launchSession$appInf, _launchSession$blockl, _launchSession$appInf2, _launchSession$metada, _state$blockletInfo, _session$user;
   let {
     accessibleUrl,
     sessionId,
@@ -40,11 +42,15 @@ function AppSuccessDisplay(_ref) {
   } = _ref;
   const theme = (0, _material.useTheme)();
   const {
-    t
+    t,
+    locale
   } = (0, _locale.useLocaleContext)();
   const {
     api
   } = (0, _request.default)();
+  const {
+    session
+  } = (0, _session.useSessionContext)();
   const [state, setState] = (0, _ahooks.useSetState)({
     accessibleUrls: [accessibleUrl],
     checkingBlockletStatus: true,
@@ -346,6 +352,39 @@ function AppSuccessDisplay(_ref) {
           })]
         }, url))]
       })]
+    }), ((_session$user = session.user) === null || _session$user === void 0 ? void 0 : _session$user.email) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Alert, {
+      icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Info.default, {
+        fontSize: "inherit"
+      }),
+      severity: "info",
+      sx: {
+        mb: 3
+      },
+      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Typography, {
+        variant: "body1",
+        sx: {
+          mb: 1,
+          textAlign: 'left'
+        },
+        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("strong", {
+          children: t('startApp.ownerAccount')
+        }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Box, {
+          component: "span",
+          sx: {
+            color: 'primary.main',
+            fontWeight: '500',
+            backgroundColor: (0, _material.alpha)(theme.palette.primary.main, 0.05),
+            px: 1,
+            py: 0.25,
+            borderRadius: 0.5
+          },
+          children: session.user.email
+        })]
+      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_material.Typography, {
+        variant: "body2",
+        color: "text.secondary",
+        children: t('startApp.ownerAccountDescription')
+      })]
     }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_material.Box, {
       display: "flex",
       flexDirection: "column",
@@ -370,7 +409,13 @@ function AppSuccessDisplay(_ref) {
               minWidth: 220
             },
             color: "primary",
-            onClick: () => window.open((0, _ufo.joinURL)((0, _util.getBaseURL)(), "/api/launches/".concat(sessionId, "/redirect/dashboard?appUrl=").concat(appUrl, "&appDid=").concat(blockletInfo.appPid, "&ownerDid=").concat(blockletInfo.ownerDid)), '_blank'),
+            onClick: () => window.open((0, _ufo.withQuery)((0, _ufo.joinURL)((0, _util.getBaseURL)(), "/api/launches/".concat(sessionId, "/redirect/dashboard")), {
+              appUrl,
+              appDid: blockletInfo.appPid,
+              ownerDid: blockletInfo.ownerDid,
+              locale,
+              theme: theme.palette.mode
+            }), '_blank'),
             startIcon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_Dashboard.default, {
               sx: {
                 fontSize: 24,
@@ -392,7 +437,13 @@ function AppSuccessDisplay(_ref) {
                 color: theme.palette.text.secondary
               }
             },
-            onClick: () => started && window.open((0, _ufo.joinURL)((0, _util.getBaseURL)(), "/api/launches/".concat(sessionId, "/redirect/app?appUrl=").concat(appUrl, "&appDid=").concat(blockletInfo.appPid, "&ownerDid=").concat(blockletInfo.ownerDid)), '_blank'),
+            onClick: () => started && window.open((0, _ufo.withQuery)((0, _ufo.joinURL)((0, _util.getBaseURL)(), "/api/launches/".concat(sessionId, "/redirect/app")), {
+              appUrl,
+              appDid: blockletInfo.appPid,
+              ownerDid: blockletInfo.ownerDid,
+              locale,
+              theme: theme.palette.mode
+            }), '_blank'),
             startIcon: started ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_OpenInNew.default, {
               sx: {
                 fontSize: 24,

package/lib/locales/en.js

@@ -133,7 +133,9 @@ var _default = exports.default = {
     error: {
       expired: 'Blocklet has expired or terminated, please purchase a new one',
       noAppUrl: 'No accessible URL found, please contact the administrator'
-    }
+    },
+    ownerAccount: 'Owner Account:',
+    ownerAccountDescription: 'This account will be used to log in and manage your Blocklet application.'
   },
   loading: {
     completed: 'completed',

package/lib/locales/zh.js

@@ -132,7 +132,9 @@ var _default = exports.default = {
     error: {
       expired: 'Blocklet 已过期或已终止，请重新购买',
       noAppUrl: '没有发现 Blocklet 的访问地址，请联系管理员'
-    }
+    },
+    ownerAccount: 'Owner 账户：',
+    ownerAccountDescription: '此账户将用于登录和管理您的 Blocklet 应用。'
   },
   loading: {
     completed: '完成',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/launcher-workflow",
-  "version": "2.5.4",
+  "version": "2.5.6",
   "description": "Purchase components for Launcher UI",
   "publishConfig": {
     "access": "public"
@@ -43,16 +43,16 @@
   "dependencies": {
     "@abtnode/constant": "^1.16.46",
     "@abtnode/util": "^1.16.46",
-    "@arcblock/did-connect": "^3.0.27",
-    "@arcblock/icons": "^3.0.27",
-    "@arcblock/license": "^3.0.27",
-    "@arcblock/react-hooks": "^3.0.27",
-    "@arcblock/ux": "^3.0.27",
-    "@blocklet/launcher-layout": "^3.0.27",
-    "@blocklet/launcher-util": "2.5.4",
-    "@blocklet/launcher-ux": "2.5.4",
+    "@arcblock/did-connect": "^3.0.37",
+    "@arcblock/icons": "^3.0.37",
+    "@arcblock/license": "^3.0.37",
+    "@arcblock/react-hooks": "^3.0.37",
+    "@arcblock/ux": "^3.0.37",
+    "@blocklet/launcher-layout": "^3.0.37",
+    "@blocklet/launcher-util": "2.5.6",
+    "@blocklet/launcher-ux": "2.5.6",
     "@blocklet/payment": "^1.14.8",
-    "@blocklet/payment-react": "^1.19.5",
+    "@blocklet/payment-react": "^1.19.10",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@mui/icons-material": "^7.2.0",
@@ -109,5 +109,5 @@
       "require": "./lib/locales/index.js"
     }
   },
-  "gitHead": "ab803d74fbf3fee05cb34f25e860043d401d0a20"
+  "gitHead": "5026dbb0d285ba0818cce2c18a211f44a96327f5"
 }