fix (*): correct names

This commit is contained in:
elforjani3
2021-05-08 17:28:01 +02:00
parent 0795aeb914
commit b3f9767a2c
11 changed files with 94 additions and 46 deletions

View File

@@ -1,12 +1,12 @@
import React, { createContext, useContext, useMemo } from 'react';
import FinancialReportPage from '../FinancialReportPage';
import { useVendorsTranscationsReport } from 'hooks/query';
import { useVendorsTransactionsReport } from 'hooks/query';
import { transformFilterFormToQuery } from '../common';
const VendorsTransactionsContext = createContext();
/**
* Vendors transcations provider.
* Vendors transactions provider.
*/
function VendorsTransactionsProvider({ filter, ...props }) {
const query = useMemo(() => transformFilterFormToQuery(filter), [filter]);
@@ -16,7 +16,7 @@ function VendorsTransactionsProvider({ filter, ...props }) {
isFetching: isVendorsTransactionFetching,
isLoading: isVendorsTransactionsLoading,
refetch,
} = useVendorsTranscationsReport();
} = useVendorsTransactionsReport(query, { keepPreviousData: true });
const provider = {
vendorsTransactions,
@@ -34,7 +34,7 @@ function VendorsTransactionsProvider({ filter, ...props }) {
);
}
const useVendorsTranscationsContext = () =>
const useVendorsTransactionsContext = () =>
useContext(VendorsTransactionsContext);
export { VendorsTransactionsProvider, useVendorsTranscationsContext };
export { VendorsTransactionsProvider, useVendorsTransactionsContext };

View File

@@ -5,12 +5,12 @@ import classNames from 'classnames';
import FinancialSheet from 'components/FinancialSheet';
import DataTable from 'components/DataTable';
import { useVendorsTransactionsColumns } from './components';
import { useVendorsTranscationsContext } from './VendorsTransactionsProvider';
import { useVendorsTransactionsContext } from './VendorsTransactionsProvider';
import { defaultExpanderReducer, getColumnWidth } from 'utils';
/**
* Vendors transcations table.
* Vendors transactions table.
*/
export default function VendorsTransactionsTable({
@@ -22,8 +22,8 @@ export default function VendorsTransactionsTable({
const {
vendorsTransactions: { tableRows },
isVendorsTransactionsLoading,
filter,
} = useVendorsTranscationsContext();
query,
} = useVendorsTransactionsContext();
const columns = useVendorsTransactionsColumns();
@@ -41,8 +41,8 @@ export default function VendorsTransactionsTable({
companyName={companyName}
sheetType={formatMessage({ id: 'vendors_transactions' })}
loading={isVendorsTransactionsLoading}
fromDate={filter.fromDate}
toDate={filter.toDate}
fromDate={query.fromDate}
toDate={query.toDate}
>
<DataTable
className="bigcapital-datatable--financial-report"

View File

@@ -1,18 +1,18 @@
import React from 'react';
import { formatMessage } from 'services/intl';
import { If } from 'components';
import { useVendorsTranscationsContext } from './VendorsTransactionsProvider';
import { useVendorsTransactionsContext } from './VendorsTransactionsProvider';
import FinancialLoadingBar from '../FinancialLoadingBar';
import { defaultExpanderReducer, getColumnWidth, getForceWidth } from 'utils';
import { CellTextSpan } from 'components/Datatable/Cells';
/**
* Retrieve vendors transcations columns.
* Retrieve vendors transactions columns.
*/
export const useVendorsTransactionsColumns = () => {
const {
vendorsTransactions: { tableRows },
} = useVendorsTranscationsContext();
} = useVendorsTransactionsContext();
return React.useMemo(
() => [
@@ -87,10 +87,10 @@ export const useVendorsTransactionsColumns = () => {
};
/**
* vendors transcations loading bar.
* vendors transactions loading bar.
*/
export function VendorsTransactionsLoadingBar() {
const { isVendorsTransactionsLoading } = useVendorsTranscationsContext();
const { isVendorsTransactionsLoading } = useVendorsTransactionsContext();
return (
<If condition={isVendorsTransactionsLoading}>
<FinancialLoadingBar />