feat(ManualJournals): Auto-increment.

fix(BillPayment): Validate the opened payment bills.
fix(redux): presist redux state.
fix(useRequestQuery): hook.
This commit is contained in:
a.bouhuolia
2021-03-18 14:23:37 +02:00
parent 4e8bdee97a
commit 9ff8e3159d
79 changed files with 1326 additions and 889 deletions

View File

@@ -1,7 +1,7 @@
import { useMutation } from 'react-query';
import t from './types';
import useApiRequest from '../useRequest';
import { useQueryTenant } from '../useQueryTenant';
import { useRequestQuery } from '../useQueryRequest';
import { useEffect } from 'react';
import { useSetOrganizations, useSetSubscriptions } from '../state';
import { omit } from 'lodash';
@@ -10,11 +10,9 @@ import { omit } from 'lodash';
* Retrieve organizations of the authenticated user.
*/
export function useOrganizations(props) {
const apiRequest = useApiRequest();
return useQueryTenant(
return useRequestQuery(
[t.ORGANIZATIONS],
() => apiRequest.get(`organization/all`),
{ method: 'get', url: `organization/all` },
{
select: (res) => res.data.organizations,
initialDataUpdatedAt: 0,
@@ -32,21 +30,15 @@ export function useOrganizations(props) {
* Retrieve the current organization metadata.
*/
export function useCurrentOrganization(props) {
const apiRequest = useApiRequest();
const setOrganizations = useSetOrganizations();
const setSubscriptions = useSetSubscriptions();
const query = useQueryTenant(
const query = useRequestQuery(
[t.ORGANIZATION_CURRENT],
() => apiRequest.get(`organization/current`),
{ method: 'get', url: `organization/current` },
{
select: (res) => res.data.organization,
initialDataUpdatedAt: 0,
initialData: {
data: {
organization: {},
},
},
defaultData: {},
...props,
},
);