@autobusal/account-transactions 1.0.0 → 1.0.2

package/Browse/Admin.tsx

@@ -4,7 +4,7 @@ import { Meta, Table, Row } from '@autobusal/common';
 import { usePage } from '@autobusal/hooks';
 import { getParams } from '@autobusal/utilities';
 import Information from '../Information';
-import { GetTransactions } from '../services';
+import { useGetTransactions } from '../services';
 
 interface Props {
   url: string
@@ -16,7 +16,7 @@ const Admin = ({ url, t }: Props): JSX.Element => {
 
   usePage('transactions');
 
-  const { data, isLoading, isFetching } = GetTransactions(getParams(searchParams, ['page', 'sort', 'order', 'q', 'id']));
+  const { data, isLoading, isFetching } = useGetTransactions(getParams(searchParams, ['page', 'sort', 'order', 'q', 'id']));
 
   const rows = data?.data.map(item => (
     <Row

package/Browse/Simple.tsx

@@ -4,7 +4,7 @@ import { Meta, Table, Row } from '@autobusal/common';
 import { usePage } from '@autobusal/hooks';
 import { getParams } from '@autobusal/utilities';
 import Information from '../Information';
-import { GetTransactions } from '../services';
+import { useGetTransactions } from '../services';
 
 interface Props {
   url: string
@@ -16,7 +16,7 @@ const Simple = ({ url, t }: Props): JSX.Element => {
 
   usePage('transactions');
 
-  const { data, isLoading, isFetching } = GetTransactions(getParams(searchParams, ['page', 'sort', 'order', 'q']));
+  const { data, isLoading, isFetching } = useGetTransactions(getParams(searchParams, ['page', 'sort', 'order', 'q']));
 
   const rows = data?.data.map(item => (
     <Row

package/Manage/Admin.tsx

@@ -5,7 +5,7 @@ import { usePage } from '@autobusal/hooks';
 import { success } from '@autobusal/utilities';
 import { getText, getStatuses } from '../utilities';
 import { TransactionData } from '@autobusal/providers/types/account';
-import { GetTransaction, PostTransaction } from '../services';
+import { useGetTransaction, usePostTransaction } from '../services';
 
 interface Props {
   url: string
@@ -21,9 +21,9 @@ const Admin = ({ url, t }: Props): JSX.Element => {
 
   const navigate = useNavigate();
 
-  const { data } = GetTransaction(id);
+  const { data, isFetching } = useGetTransaction(id);
 
-  const { mutate: Update, isPending } = PostTransaction(id);
+  const { mutate: Update, isPending } = usePostTransaction(id);
 
   if (id === 0) {
     return <Navigate to={ url } />;
@@ -99,6 +99,7 @@ const Admin = ({ url, t }: Props): JSX.Element => {
           type: 'textarea',
           value: data?.comment
         }] }
+        fetching={ isFetching }
         pending={ isPending }
         t={ t }
         actions={ [

package/Manage/Simple.tsx

@@ -5,7 +5,7 @@ import { usePage } from '@autobusal/hooks';
 import { success } from '@autobusal/utilities';
 import { getText } from '../utilities';
 import { TransactionData } from '@autobusal/providers/types/account';
-import { GetTransaction, PostTransaction } from '../services';
+import { useGetTransaction, usePostTransaction } from '../services';
 
 interface Props {
   url: string
@@ -21,9 +21,9 @@ const Simple = ({ url, t }: Props): JSX.Element => {
 
   const navigate = useNavigate();
 
-  const { data } = GetTransaction(id);
+  const { data, isFetching } = useGetTransaction(id);
 
-  const { mutate: Update, isPending } = PostTransaction(id);
+  const { mutate: Update, isPending } = usePostTransaction(id);
 
   if (id === 0) {
     return <Navigate to={ url } />;
@@ -78,6 +78,7 @@ const Simple = ({ url, t }: Props): JSX.Element => {
           type: 'display',
           value: t(`data.transaction_status.${ data?.status }`)
         }] }
+        fetching={ isFetching }
         pending={ isPending }
         t={ t }
         actions={ [] }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autobusal/account-transactions",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "type": "module",
   "main": "index.ts"
 }

package/services.ts

@@ -4,7 +4,7 @@ import { PaginationData } from '@autobusal/providers/types/pagination';
 import { TransactionData } from '@autobusal/providers/types/account';
 import { TableParamsData } from '@autobusal/providers/types/other';
 
-export const GetTransactions = (params: TableParamsData): UseQueryResult<PaginationData<TransactionData>> => (
+export const useGetTransactions = (params: TableParamsData): UseQueryResult<PaginationData<TransactionData>> => (
   useQuery({
     queryKey: ['account-transactions', params],
     queryFn: async () => (
@@ -17,7 +17,7 @@ export const GetTransactions = (params: TableParamsData): UseQueryResult<Paginat
   })
 );
 
-export const GetTransaction = (id: number): UseSuspenseQueryResult<TransactionData> => (
+export const useGetTransaction = (id: number): UseSuspenseQueryResult<TransactionData> => (
   useSuspenseQuery({
     queryKey: ['account-transactions-manage', { id }],
     queryFn: async () => (
@@ -32,7 +32,7 @@ export const GetTransaction = (id: number): UseSuspenseQueryResult<TransactionDa
   })
 );
 
-export const PostTransaction = (id: number): UseMutationResult<void, Error, TransactionData, unknown> => (
+export const usePostTransaction = (id: number): UseMutationResult<void, Error, TransactionData, unknown> => (
   useMutation({
     mutationKey: ['account-transactions-save', { id }],
     mutationFn: async (data: TransactionData) => (