Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

fix white screen

See merge request !2424

src/container/OutlookPA/OutlookPA.js

@@ -906,7 +906,7 @@ export default class OutlookPA extends Component {
         if (remarksKosong > 0) {
             this.setState({ alert: true, messageAlert: 'Remarks Cannot be Empty', tipeAlert: 'error' })
         } else {
-            this.setState({ visibleRevision: false }, () => this.approvalSubmission('revision', master_report_type_id))
+            this.setState({ visibleRevision: false, currentMasterReportTypeId: null }, () => this.approvalSubmission('revision', master_report_type_id))
         }
     }
 
@@ -2768,7 +2768,7 @@ export default class OutlookPA extends Component {
                                     <MuiThemeProvider theme={getMuiTheme()}>
                                         <MUIDataTable
                                             data={this.state.currentMasterReportTypeId === 2 ? this.state.dataTableRevisionCAT : this.state.dataTableRevision}
-                                            columns={columnRevisi}
+                                            columns={columnRevisi(this.state.currentMasterReportTypeId)}
                                             options={optionsRevision}
                                         />
                                     </MuiThemeProvider>