payment-kit 1.13.111 → 1.13.112

package/api/src/routes/products.ts

@@ -155,6 +155,7 @@ router.get('/', auth, async (req, res) => {
     offset: (page - 1) * pageSize,
     limit: pageSize,
     include: [{ model: Price, as: 'prices' }],
+    distinct: true,
   });
 
   res.json({ count, list });

package/api/src/routes/subscriptions.ts

@@ -124,6 +124,8 @@ router.get('/', authMine, async (req, res) => {
         { model: SubscriptionItem, as: 'items' },
         { model: Customer, as: 'customer' },
       ],
+      // https://github.com/sequelize/sequelize/issues/9481
+      distinct: true,
     });
 
     const products = (await Product.findAll()).map((x) => x.toJSON());

package/blocklet.yml

@@ -14,7 +14,7 @@ repository:
   type: git
   url: git+https://github.com/blocklet/payment-kit.git
 specVersion: 1.2.8
-version: 1.13.111
+version: 1.13.112
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.111",
+  "version": "1.13.112",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev",
     "eject": "vite eject",
@@ -110,7 +110,7 @@
     "@abtnode/types": "1.16.23-beta-aeb9f5bd",
     "@arcblock/eslint-config": "^0.2.4",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@did-pay/types": "1.13.111",
+    "@did-pay/types": "1.13.112",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "a1c55e8564750b51e18edeebd08f81fe53ab59b1"
+  "gitHead": "5db3e4ba2c5126a2ff6b8962b58d585b0eb0f01e"
 }

package/src/pages/admin/billing/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tabs from '@arcblock/ux/lib/Tabs';
 import { Typography } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 const SubscriptionDetail = React.lazy(() => import('./subscriptions/detail'));
@@ -26,7 +26,9 @@ export default function BillingIndex() {
   }
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/billing/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/billing/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/admin/customers/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tabs from '@arcblock/ux/lib/Tabs';
 import { Typography } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 const CustomerDetail = React.lazy(() => import('./customers/detail'));
@@ -20,7 +20,9 @@ export default function CustomerIndex() {
   }
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/customers/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/customers/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/admin/developers/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tabs from '@arcblock/ux/lib/Tabs';
 import { Typography } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 const EventDetail = React.lazy(() => import('./events/detail'));
@@ -28,7 +28,9 @@ export default function DevelopersIndex() {
   }
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/developers/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/developers/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/admin/index.tsx

@@ -1,6 +1,6 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { Box, Chip, Stack } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 import Layout from '../../components/layout/admin';
@@ -50,7 +50,9 @@ function Admin() {
   };
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/admin/payments/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tabs from '@arcblock/ux/lib/Tabs';
 import { Stack, Typography } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 const PaymentLinkCreate = React.lazy(() => import('./links/create'));
@@ -27,7 +27,9 @@ export default function PaymentIndex() {
   }
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/payments/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/payments/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/admin/settings/index.tsx

@@ -1,7 +1,7 @@
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import Tabs from '@arcblock/ux/lib/Tabs';
 import { Stack, Typography } from '@mui/material';
-import React, { isValidElement } from 'react';
+import React, { isValidElement, startTransition } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
 
 const PaymentMethodCreate = React.lazy(() => import('./payment-methods/create'));
@@ -18,7 +18,9 @@ export default function SettingsIndex() {
   const { page = 'payment-methods' } = useParams();
 
   const onTabChange = (newTab: string) => {
-    navigate(`/admin/settings/${newTab}`);
+    startTransition(() => {
+      navigate(`/admin/settings/${newTab}`);
+    });
   };
 
   // @ts-ignore

package/src/pages/checkout/pay.tsx

@@ -57,14 +57,14 @@ export default function Payment({ id }: Props) {
       setTimeout(() => {
         const tmp = new URL(data.checkoutSession.success_url as string, window.location.origin);
         tmp.searchParams.set('checkout_session_id', data.checkoutSession.id);
-        window.location.href = tmp.href;
+        window.location.replace(tmp.href);
       }, 1000);
     } else if (data?.paymentLink) {
       if (data.paymentLink.after_completion?.type === 'redirect' && data.paymentLink.after_completion?.redirect?.url) {
         setTimeout(() => {
           const tmp = new URL(data.paymentLink?.after_completion?.redirect?.url as string, window.location.origin);
           tmp.searchParams.set('checkout_session_id', data.checkoutSession.id);
-          window.location.href = tmp.href;
+          window.location.replace(tmp.href);
         }, 1000);
       }
     }