payment-kit 1.13.145 → 1.13.147

package/.eslintrc.js

@@ -11,5 +11,6 @@ module.exports = {
     '@typescript-eslint/no-use-before-define': 'off',
     '@typescript-eslint/lines-between-class-members': 'off',
     'import/prefer-default-export': 'off',
+    "react-hooks/exhaustive-deps": "off"
   },
 };

package/api/src/libs/api.ts

@@ -71,9 +71,10 @@ export function getWhereFromQuery(query: string) {
   return handleCondition(parsed);
 }
 
-export const getWhereFromKvQuery = (query: string) => {
+export const getWhereFromKvQuery = (query: string, isSubWhere?: boolean) => {
   const out: any = {};
   const likes: any = [];
+  const subLikes: any = [];
   query.split(' ').forEach((kv: string) => {
     const [k, v] = kv.split(':');
 
@@ -81,19 +82,33 @@ export const getWhereFromKvQuery = (query: string) => {
       let value = decodeURIComponent(v).replace('+', ' ');
       if ((k as any).indexOf('like') > -1) {
         let kk = k?.slice(5);
+
         if (kk === 'did' || kk === 'name' || kk === 'email') {
-          kk = `$customer.${kk}$`;
+          kk = isSubWhere ? kk : `$customer.${kk}$`;
+          value = { [kk as any]: { [Op.like]: `%${v}%` } } as any;
+          subLikes.push(value);
+        } else {
+          value = { [kk as any]: { [Op.like]: `%${v}%` } } as any;
+          likes.push(value);
         }
-        value = { [kk as any]: { [Op.like]: `%${v}%` } } as any;
-
-        likes.push(value);
       } else {
         out[k as string] = value;
       }
     }
   });
-  if (likes.length > 0) {
-    out[Op.or] = likes;
+
+  if (isSubWhere) {
+    return [
+      {
+        [Op.or]: likes,
+      },
+      {
+        [Op.or]: subLikes,
+      },
+    ];
+  }
+  if (likes.length || subLikes.length) {
+    out[Op.or] = subLikes.concat(likes);
   }
   return out;
 };

package/api/src/routes/subscriptions.ts

@@ -157,23 +157,41 @@ router.get('/search', auth, async (req, res) => {
     allowUnknown: true,
   });
 
-  const where = q ? getWhereFromKvQuery(q) : getWhereFromQuery(query);
+  const where = q ? getWhereFromKvQuery(q, true) : getWhereFromQuery(query);
   if (typeof livemode === 'boolean') {
     where.livemode = livemode;
   }
-  const { rows: list, count } = await Subscription.findAndCountAll({
-    where,
+  // fix here https://github.com/blocklet/payment-kit/issues/394
+  const { rows: list1, count: count1 } = await Subscription.findAndCountAll({
+    where: where[0],
     order: [['created_at', 'DESC']],
     offset: (page - 1) * pageSize,
     limit: pageSize,
+    distinct: true,
     include: [
+      { model: Customer, as: 'customer' },
       { model: PaymentCurrency, as: 'paymentCurrency' },
       { model: PaymentMethod, as: 'paymentMethod' },
       { model: SubscriptionItem, as: 'items' },
-      { model: Customer, as: 'customer' },
     ],
   });
 
+  const { rows: list2, count: count2 } = await Subscription.findAndCountAll({
+    order: [['created_at', 'DESC']],
+    offset: (page - 1) * pageSize,
+    limit: pageSize,
+    distinct: true,
+    include: [
+      { model: Customer, as: 'customer', where: where[1] },
+      { model: PaymentCurrency, as: 'paymentCurrency' },
+      { model: PaymentMethod, as: 'paymentMethod' },
+      { model: SubscriptionItem, as: 'items' },
+    ],
+  });
+
+  const count = count1 + count2;
+  const list = list1.concat(list2);
+
   res.json({ count, list });
 });
 

package/api/tests/libs/util.spec.ts

@@ -216,4 +216,20 @@ describe('getWhereFromKvQuery', () => {
       ],
     });
   });
+
+  it('should return a customer likes object when the subWhere is true', () => {
+    const q = 'like-did:123 like-number:1533';
+    const result = getWhereFromKvQuery(q, true);
+    expect(result).toEqual([
+      {
+        [Op.or]: [
+          { number: { [Op.like]: `%1533%` } }
+        ],
+      }, {
+        [Op.or]: [
+          { did: { [Op.like]: `%123%` } }
+        ],
+      }
+    ]);
+  });
 });

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.145
+version: 1.13.147
 logo: logo.png
 files:
   - dist

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payment-kit",
-  "version": "1.13.145",
+  "version": "1.13.147",
   "scripts": {
     "dev": "cross-env COMPONENT_STORE_URL=https://test.store.blocklet.dev blocklet dev --open",
     "eject": "vite eject",
@@ -50,7 +50,7 @@
     "@arcblock/jwt": "^1.18.110",
     "@arcblock/ux": "^2.9.29",
     "@blocklet/logger": "1.16.23",
-    "@blocklet/payment-react": "1.13.145",
+    "@blocklet/payment-react": "1.13.147",
     "@blocklet/sdk": "1.16.23",
     "@blocklet/ui-react": "^2.9.29",
     "@blocklet/uploader": "^0.0.73",
@@ -110,7 +110,7 @@
   "devDependencies": {
     "@abtnode/types": "1.16.23",
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@blocklet/payment-types": "1.13.145",
+    "@blocklet/payment-types": "1.13.147",
     "@types/cookie-parser": "^1.4.6",
     "@types/cors": "^2.8.17",
     "@types/dotenv-flow": "^3.3.3",
@@ -149,5 +149,5 @@
       "parser": "typescript"
     }
   },
-  "gitHead": "9ca5d8a2a30ae0da5630b25c409949f978a93190"
+  "gitHead": "9fd7b32ada89697a6e5c8b5a1c5c4729dca50c51"
 }

package/src/components/invoice/list.tsx

@@ -3,9 +3,8 @@ import { getDurableData } from '@arcblock/ux/lib/Datatable';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { Status, api, formatTime, getInvoiceStatusColor } from '@blocklet/payment-react';
 import type { TInvoiceExpanded } from '@blocklet/payment-types';
-import { Alert, CircularProgress, ToggleButton, ToggleButtonGroup, Typography } from '@mui/material';
+import { CircularProgress, ToggleButton, ToggleButtonGroup, Typography } from '@mui/material';
 import { fromUnitToToken } from '@ocap/util';
-import { useRequest } from 'ahooks';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -95,21 +94,20 @@ export default function InvoiceList({ customer_id, subscription_id, features, st
     page: persisted.page ? persisted.page + 1 : 1,
   });
 
-  const { loading, error, data, refresh } = useRequest(() => fetchData(search));
-  useEffect(() => {
-    debounce(() => {
-      refresh();
-    }, 1000)();
-  }, [search, refresh]);
+  const [data, setData] = useState({}) as any;
 
-  if (error) {
-    return <Alert severity="error">{error.message}</Alert>;
-  }
+  const refresh = () =>
+    fetchData(search).then((res: any) => {
+      setData(res);
+    });
 
-  if (loading || !data) {
+  useEffect(() => {
+    debounce(refresh, 1000)();
+  }, [search]);
+
+  if (!data.list) {
     return <CircularProgress />;
   }
-
   const columns = [
     {
       label: t('common.amount'),
@@ -218,7 +216,7 @@ export default function InvoiceList({ customer_id, subscription_id, features, st
       durableKeys={['page', 'rowsPerPage']}
       data={data.list}
       columns={columns}
-      loading={loading}
+      loading={!data.list}
       onChange={onTableChange}
       options={{
         count: data.count,

package/src/components/payment-intent/list.tsx

@@ -93,7 +93,7 @@ export default function PaymentList({ customer_id, invoice_id, features }: ListP
     }, 1000)();
   }, [search]);
 
-  if (!data) {
+  if (!data.length) {
     return <CircularProgress />;
   }
 
@@ -187,7 +187,7 @@ export default function PaymentList({ customer_id, invoice_id, features }: ListP
       durableKeys={['page', 'rowsPerPage']}
       data={data.list || []}
       columns={columns}
-      loading={!data}
+      loading={!data.list}
       onChange={onTableChange}
       options={{
         count: data.count,

package/src/components/subscription/list.tsx

@@ -3,8 +3,7 @@ import { getDurableData } from '@arcblock/ux/lib/Datatable';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { Status, api, formatTime } from '@blocklet/payment-react';
 import type { TSubscriptionExpanded } from '@blocklet/payment-types';
-import { Alert, CircularProgress, ToggleButton, ToggleButtonGroup } from '@mui/material';
-import { useRequest } from 'ahooks';
+import { CircularProgress, ToggleButton, ToggleButtonGroup } from '@mui/material';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -79,18 +78,18 @@ export default function SubscriptionList({ customer_id, features, status }: List
     page: persisted.page ? persisted.page + 1 : 1,
   });
 
-  const { loading, error, data, refresh } = useRequest(() => fetchData(search));
-  useEffect(() => {
-    debounce(() => {
-      refresh();
-    }, 1000)();
-  }, [search, refresh]);
+  const [data, setData] = useState({}) as any;
 
-  if (error) {
-    return <Alert severity="error">{error.message}</Alert>;
-  }
+  const refresh = () =>
+    fetchData(search).then((res: any) => {
+      setData(res);
+    });
+
+  useEffect(() => {
+    debounce(refresh, 1000)();
+  }, [search]);
 
-  if (loading || !data) {
+  if (!data.list) {
     return <CircularProgress />;
   }
 
@@ -184,7 +183,7 @@ export default function SubscriptionList({ customer_id, features, status }: List
       durableKeys={['page', 'rowsPerPage']}
       data={data.list}
       columns={columns}
-      loading={loading}
+      loading={!data.list}
       onChange={onTableChange}
       options={{
         count: data.count,

package/src/libs/util.ts

@@ -194,7 +194,7 @@ export function getSupportedPaymentCurrencies(items: TLineItemExpanded[]) {
 
 export const debounce = (fun: Function, wait: number) => {
   let timeout: any = null;
-  return function () {
+  return function inner() {
     if (timeout) {
       clearTimeout(timeout);
     }

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

@@ -4,8 +4,7 @@ import DidAddress from '@arcblock/ux/lib/DID';
 import { useLocaleContext } from '@arcblock/ux/lib/Locale/context';
 import { api, formatTime } from '@blocklet/payment-react';
 import type { TCustomer } from '@blocklet/payment-types';
-import { Alert, Avatar, CircularProgress, Stack, Typography } from '@mui/material';
-import { useRequest } from 'ahooks';
+import { Avatar, CircularProgress, Stack, Typography } from '@mui/material';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'react-router-dom';
 
@@ -40,18 +39,18 @@ export default function CustomersList() {
     page: persisted.page ? persisted.page + 1 : 1,
   });
 
-  const { loading, error, data, refresh } = useRequest(() => fetchData(search));
-  useEffect(() => {
-    debounce(() => {
-      refresh();
-    }, 1000)();
-  }, [search, refresh]);
+  const [data, setData] = useState({}) as any;
 
-  if (error) {
-    return <Alert severity="error">{error.message}</Alert>;
-  }
+  const refresh = () =>
+    fetchData(search).then((res: any) => {
+      setData(res);
+    });
+
+  useEffect(() => {
+    debounce(refresh, 1000)();
+  }, [search]);
 
-  if (loading || !data) {
+  if (!data.list) {
     return <CircularProgress />;
   }
 
@@ -144,7 +143,7 @@ export default function CustomersList() {
           }
         },
       }}
-      loading={loading}
+      loading={!data.list}
       onChange={onTableChange}
     />
   );

package/src/pages/checkout/pricing-table.tsx

@@ -25,7 +25,7 @@ export default function PricingTablePage({ id }: Props) {
         theme={undefined}
       />
       <Center relative="parent">
-        <CheckoutTable id={id} mode="standalone" />;
+        <CheckoutTable id={id} mode="standalone" />
       </Center>
     </Box>
   );