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

feat: wizard organization step depends on organization ready.

Browse Source
This commit is contained in:
a.bouhuolia
2021-09-20 13:24:16 +02:00
parent 8d249dd70c
commit 4034cdd398
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/containers/Setup/SetupRightSection.js
View File

@@ -44,13 +44,13 @@ export default compose(
withOrganization( withOrganization(
({ ({
organization, organization,
isOrganizationInitialized, isOrganizationReady,
isOrganizationSeeded, isOrganizationSeeded,
isOrganizationSetupCompleted, isOrganizationSetupCompleted,
isOrganizationBuildRunning, isOrganizationBuildRunning,
}) => ({ }) => ({
organization, organization,
isOrganizationInitialized, isOrganizationReady,
isOrganizationSeeded, isOrganizationSeeded,
isOrganizationSetupCompleted, isOrganizationSetupCompleted,
isOrganizationBuildRunning, isOrganizationBuildRunning,

4
client/src/store/organizations/withSetupWizard.js
View File

@@ -4,7 +4,7 @@ export default (mapState) => {
const mapStateToProps = (state, props) => { const mapStateToProps = (state, props) => {
const { const {
isOrganizationSetupCompleted, isOrganizationSetupCompleted,
isOrganizationInitialized, isOrganizationReady,
isSubscriptionActive, isSubscriptionActive,
isOrganizationBuildRunning isOrganizationBuildRunning
} = props; } = props;
@@ -13,7 +13,7 @@ export default (mapState) => {
isCongratsStep: isOrganizationSetupCompleted, isCongratsStep: isOrganizationSetupCompleted,
isSubscriptionStep: !isSubscriptionActive, isSubscriptionStep: !isSubscriptionActive,
isInitializingStep: isOrganizationBuildRunning, isInitializingStep: isOrganizationBuildRunning,
isOrganizationStep: !isOrganizationInitialized && !isOrganizationBuildRunning, isOrganizationStep: !isOrganizationReady && !isOrganizationBuildRunning,
}; };
const scenarios = [ const scenarios = [
{ condition: condits.isSubscriptionStep, step: 'subscription' }, { condition: condits.isSubscriptionStep, step: 'subscription' },