put api injection into componentWillMount, not render

This commit is contained in:
Eric Schultz 2018-07-18 13:09:53 -05:00
parent d03869375f
commit 65b451a8ad
2 changed files with 16 additions and 13 deletions

View file

@ -3,7 +3,7 @@ import * as React from 'react';
import {observer, inject} from 'mobx-react' import {observer, inject} from 'mobx-react'
import NonprofitInfoPanel from './NonprofitInfoPanel' import NonprofitInfoPanel from './NonprofitInfoPanel'
import {action, observable, computed} from 'mobx'; import {action, observable, computed, runInAction} from 'mobx';
import {Wizard} from '../common/wizard/Wizard' import {Wizard} from '../common/wizard/Wizard'
import {Form} from 'mobx-react-form'; import {Form} from 'mobx-react-form';
@ -165,15 +165,16 @@ export class InnerRegistrationWizard extends React.Component<RegistrationWizardP
this.registrationWizardState.initialize() this.registrationWizardState.initialize()
} }
componentWillMount()
{
runInAction(() => {
this.form.nonprofitApi = this.props.ApiManager.get(NonprofitApi)
this.form.signinApi = this.props.ApiManager.get(WebUserSignInOut)
})
}
render() { render() {
if (!this.form.nonprofitApi) {
this.form.nonprofitApi = this.props.ApiManager.get(NonprofitApi)
}
if(!this.form.signinApi){
this.form.signinApi = this.props.ApiManager.get(WebUserSignInOut)
}
return <Wizard wizardState={this.registrationWizardState} disableTabs={this.form.submitting}> return <Wizard wizardState={this.registrationWizardState} disableTabs={this.form.submitting}>
<NonprofitInfoPanel tab={this.registrationWizardState.tabsByName['nonprofitTab']} <NonprofitInfoPanel tab={this.registrationWizardState.tabsByName['nonprofitTab']}

View file

@ -7,7 +7,7 @@ import {Validations} from "../../lib/vjf_rules";
import {WebLoginModel, WebUserSignInOut} from "../../lib/api/sign_in"; import {WebLoginModel, WebUserSignInOut} from "../../lib/api/sign_in";
import {HoudiniForm, StaticFormToErrorAndBackConverter} from "../../lib/houdini_form"; import {HoudiniForm, StaticFormToErrorAndBackConverter} from "../../lib/houdini_form";
import {observable, action} from 'mobx' import {observable, action, runInAction} from 'mobx'
import {ApiManager} from "../../lib/api_manager"; import {ApiManager} from "../../lib/api_manager";
import {BasicField} from "../common/fields"; import {BasicField} from "../common/fields";
import ProgressableButton from "../common/ProgressableButton"; import ProgressableButton from "../common/ProgressableButton";
@ -91,14 +91,16 @@ class InnerSessionLoginForm extends React.Component<SessionLoginFormProps & Inje
this.form = new SessionPageForm({fields: FieldDefinitions}) this.form = new SessionPageForm({fields: FieldDefinitions})
} }
componentWillMount(){
runInAction(() => {
this.form.signinApi = this.props.ApiManager.get(WebUserSignInOut)
})
}
@observable form: SessionPageForm @observable form: SessionPageForm
render() { render() {
if(!this.form.signinApi){
this.form.signinApi = this.props.ApiManager.get(WebUserSignInOut)
}
let errorDiv = !this.form.isValid || this.form.hasServerError ? <div className="form-group has-error"><div className="help-block" role="alert">{this.form.serverError}</div></div> : '' let errorDiv = !this.form.isValid || this.form.hasServerError ? <div className="form-group has-error"><div className="help-block" role="alert">{this.form.serverError}</div></div> : ''
return <form onSubmit={this.form.onSubmit}> return <form onSubmit={this.form.onSubmit}>