QT/bigcapital
1
0
Fork 0
mirror of https://github.com/bigcapitalhq/bigcapital.git synced 2026-02-19 22:30:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(BS|PL): integrate report query with location query.

Browse Source
This commit is contained in:
a.bouhuolia
2022-02-09 21:12:32 +02:00
parent c361a5852c
commit 8b4d841023
6 changed files with 102 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/containers/FinancialStatements/BalanceSheet/BalanceSheetHeader.js
View File

@@ -13,8 +13,8 @@ import FinancialStatementHeader from '../../FinancialStatements/FinancialStateme
import { compose, transformToForm } from 'utils';
import {
getBalanceSheetHeaderDefaultValues,
getBalanceSheetHeaderValidationSchema,
getDefaultBalanceSheetQuery,
} from './utils';
/**
@@ -31,7 +31,7 @@ function BalanceSheetHeader({
// #withBalanceSheetActions
toggleBalanceSheetFilterDrawer: toggleFilterDrawer,
}) {
const defaultValues = getBalanceSheetHeaderDefaultValues();
const defaultValues = getDefaultBalanceSheetQuery();
// Filter form initial values.
const initialValues = transformToForm(

13
src/containers/FinancialStatements/BalanceSheet/utils.js
View File

@@ -5,7 +5,7 @@ import * as Yup from 'yup';
import intl from 'react-intl-universal';
import { transformToForm } from 'utils';
import { useLocationQuery, useMutateLocationQuery } from 'hooks';
import { useAppQueryString } from 'hooks';
/**
* Retrieves the default balance sheet query.
@@ -27,8 +27,8 @@ export const getDefaultBalanceSheetQuery = () => ({
previousPeriodPercentageChange: false,
// Percentage columns.
percentageColumn: false,
percentageRow: false,
percentageOfColumn: false,
percentageOfRow: false,
});
/**
@@ -36,10 +36,7 @@ export const getDefaultBalanceSheetQuery = () => ({
*/
export const useBalanceSheetQuery = () => {
// Retrieves location query.
const locationQuery = useLocationQuery();
// Mutates the location query.
const { mutate: setLocationQuery } = useMutateLocationQuery();
const [locationQuery, setLocationQuery] = useAppQueryString();
// Merges the default filter query with location URL query.
const query = React.useMemo(() => {
@@ -47,7 +44,7 @@ export const useBalanceSheetQuery = () => {
return {
...defaultQuery,
...transformToForm(Object.fromEntries([...locationQuery]), defaultQuery),
...transformToForm(locationQuery, defaultQuery),
};
}, [locationQuery]);

9
src/containers/FinancialStatements/ProfitLossSheet/utils.js
View File

@@ -4,7 +4,7 @@ import moment from 'moment';
import intl from 'react-intl-universal';
import * as Yup from 'yup';
import { useMutateLocationQuery, useLocationQuery } from 'hooks';
import { useAppQueryString } from 'hooks';
import { transformToForm } from 'utils';
/**
@@ -38,10 +38,7 @@ export const getDefaultProfitLossQuery = () => ({
*/
export const useProfitLossSheetQuery = () => {
// Retrieves location query.
const locationQuery = useLocationQuery();
// Mutate the location query.
const { mutate: setLocationQuery } = useMutateLocationQuery();
const [locationQuery, setLocationQuery] = useAppQueryString();
// Merges the default query with location query.
const query = React.useMemo(() => {
@@ -49,7 +46,7 @@ export const useProfitLossSheetQuery = () => {
return {
...defaultQuery,
...transformToForm(Object.fromEntries([...locationQuery]), defaultQuery),
...transformToForm(locationQuery, defaultQuery),
};
}, [locationQuery]);