Merge branch 'didam' into 'master'

push ink

See merge request !428

src/container/BudgetTahunan.js

@@ -231,7 +231,7 @@ export default class BudgetTahunan extends Component {
                         getOptionLabel: (option) => titleCase(option.company_name),
                     };
                     let index = arrayBaru.findIndex((val) => val.company_id == comID)
-                    this.setState({ listCompany: defaultProps, company: index == -1 ? arrayBaru[0] : arrayBaru[index] }, () => {
+                    this.setState({ listCompany: defaultProps, company: arrayBaru.length < 1? companyData[0] : (index == -1 ? arrayBaru[0] : arrayBaru[index]) }, () => {
                         this.getPeriode()
                     })
                 } else {
@@ -1162,6 +1162,7 @@ export default class BudgetTahunan extends Component {
                         status={this.state.status}
                         isApprover={this.state.isApprover}
                         lastStatus={this.state.lastStatus}
+                        prevRevision={this.state.prevRevision}
                     />
 
                 )}
@@ -1181,6 +1182,7 @@ export default class BudgetTahunan extends Component {
                         status={this.state.status}
                         isApprover={this.state.isApprover}
                         lastStatus={this.state.lastStatus}
+                        prevRevision={this.state.prevRevision}
                     />
                 )}
                 {this.state.visibleFAM && (
@@ -1199,6 +1201,7 @@ export default class BudgetTahunan extends Component {
                         status={this.state.status}
                         isApprover={this.state.isApprover}
                         lastStatus={this.state.lastStatus}
+                        prevRevision={this.state.prevRevision}
                     />
                 )}
                 {this.state.visibleCAT && (
@@ -1216,6 +1219,7 @@ export default class BudgetTahunan extends Component {
                         getReport={this.getSubmission.bind(this)}
                         isApprover={this.state.isApprover}
                         lastStatus={this.state.lastStatus}
+                        prevRevision={this.state.prevRevision}
                     />
                 )}
                 {this.state.visibleCF && (
@@ -1231,6 +1235,7 @@ export default class BudgetTahunan extends Component {
                         saveToMasterBudget={this.saveToMasterBudget.bind(this)}
                         onClickClose={() => this.setState({ visibleCF: false, visibleBudgetTahunan: true })}
                         getReport={this.getSubmission.bind(this)}
+                        prevRevision={this.state.prevRevision}
                     />
                 )}
 

src/container/OprIndicator/OperatingIndicator.js

@@ -128,7 +128,7 @@ export default class OperatingIndicator extends Component {
                         getOptionLabel: (option) => titleCase(option.company_name),
                     };
     
-                    this.setState({ listCompany: defaultProps, company: arrayBaru[0] }, () => {
+                    this.setState({ listCompany: defaultProps, company: arrayBaru.length < 1? companyData[0] : arrayBaru[0] }, () => {
                         this.getPeriode()
                     })
                 } else {