feat: retrieve organization subscriptions list api.

feat: subscriptions reducers.
This commit is contained in:
Ahmed Bouhuolia
2020-10-13 21:46:32 +02:00
parent d71845a4c4
commit 8b97673100
23 changed files with 289 additions and 55 deletions

View File

@@ -13,7 +13,6 @@ export default function DashboardLoadingIndicator({
<div className={classNames('bigcapital-loading', className)}>
<div class="center">
<Icon icon="bigcapital" height={37} width={214} />
<span class="text">Please wait while resources loading...</span>
</div>
</div>
</Choose.When>

View File

@@ -13,9 +13,9 @@ function EnsureOrganizationIsReady({
redirectTo = '/setup',
// #withOrganizationByOrgId
isOrganizationBuilt,
isOrganizationInitialized,
}) {
return (isOrganizationBuilt) ? children : (
return (isOrganizationInitialized) ? children : (
<Redirect
to={{ pathname: redirectTo }}
/>
@@ -27,5 +27,5 @@ export default compose(
connect((state, props) => ({
organizationId: props.currentOrganizationId,
})),
withOrganization(({ isOrganizationBuilt }) => ({ isOrganizationBuilt })),
withOrganization(({ isOrganizationInitialized }) => ({ isOrganizationInitialized })),
)(EnsureOrganizationIsReady);

View File

@@ -7,6 +7,7 @@ import SetupWizardPage from 'containers/Setup/WizardSetupPage';
import DashboardLoadingIndicator from 'components/Dashboard/DashboardLoadingIndicator';
import withOrganizationActions from 'containers/Organization/withOrganizationActions';
import withSubscriptionsActions from 'containers/Subscriptions/withSubscriptionsActions';
import { compose } from 'utils';
@@ -17,13 +18,26 @@ function DashboardPrivatePages({
// #withOrganizationActions
requestAllOrganizations,
// #withSubscriptionsActions
requestFetchSubscriptions,
}) {
// Fetch all user's organizatins.
const fetchOrganizations = useQuery(
['organizations'], () => requestAllOrganizations(),
);
// Fetchs organization subscriptions.
const fetchSuscriptions = useQuery(
['susbcriptions'], () => requestFetchSubscriptions(),
{ enabled: fetchOrganizations.data },
)
return (
<DashboardLoadingIndicator isLoading={fetchOrganizations.isFetching}>
<DashboardLoadingIndicator isLoading={
fetchOrganizations.isFetching ||
fetchSuscriptions.isFetching
}>
<Switch>
<Route path={'/setup'}>
<SetupWizardPage />
@@ -39,4 +53,5 @@ function DashboardPrivatePages({
export default compose(
withOrganizationActions,
withSubscriptionsActions,
)(DashboardPrivatePages);