Merge branch 'didam' into 'master'

update handle response

See merge request !617

src/container/BudgetTahunan/CashFlow.js

-import { createMuiTheme, FormControlLabel, MuiThemeProvider, Paper, TableCell, Tooltip, Typography, withStyles } from '@material-ui/core'
+import { createMuiTheme, FormControlLabel, MuiThemeProvider, Paper, Snackbar, TableCell, Tooltip, Typography, withStyles } from '@material-ui/core'
 import MUIDataTable from 'mui-datatables';
 import React, { Component } from 'react'
 import NumberFormat from 'react-number-format';
@@ -7,6 +7,8 @@ import api from '../../api';
 import Images from '../../assets/Images';
 import * as R from 'ramda'
 import { PropagateLoader } from 'react-spinners';
+import Constant from '../../library/Constant';
+import { Alert } from '@material-ui/lab';
 
 var ct = require("../../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable3());
@@ -78,7 +80,10 @@ export default class CashFlow extends Component {
         // console.log(JSON.stringify(payload))
         api.create().getDetailReportCF(payload).then(response => {
             let dataTable = []
-            console.log(response)
+            // console.log(response)
+            if (response.data) {
+                if (response.ok) {
+                    if (response.data.status == 'success') {
                         let res = response.data.data
                         const handlePushChild = (item) => {
                             dataTable.push([
@@ -156,6 +161,22 @@ export default class CashFlow extends Component {
                             }
                         })
                         this.setState({ dataTable, loading: false, dataReal: res, editable: true })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    } 
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false})
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+            }
         })
     }
 
@@ -180,6 +201,10 @@ export default class CashFlow extends Component {
         }
     }
 
+    closeAlert() {
+        this.setState({ alert: false })
+    }
+
     render() {
         let dataTable2 = this.state.dataTable
         let loading = false
@@ -2049,6 +2074,11 @@ export default class CashFlow extends Component {
                 <div className={"main-color"} style={{ height: 78, flex: 1, display: 'flex', alignItems: 'center', paddingLeft: 20 }}>
                     <Typography style={{ fontSize: '16px', color: 'white' }}>Pengajuan Budget Tahunan</Typography>
                 </div>
+                <Snackbar open={this.state.alert} autoHideDuration={3000} onClose={() => this.closeAlert()}>
+                    <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
+                        {this.state.messageAlert}
+                    </Alert>
+                </Snackbar>
                 <div style={{ flex: 1, padding: 20, width: '100%' }}>
                     <Paper style={{ paddingTop: 10, paddingBottom: 20 }}>
                         <div style={{ borderBottom: 'solid 1px #c4c4c4' }} >

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -111,6 +111,8 @@ export default class CorporateAnnualTarget extends Component {
             let dataInternalBsn = []
             // // console.log(response)\
             if (response.data) {
+                if (response.ok) {
+                    if (response.data.status == 'success') {
                         let res = response.data.data
                         const handlePushChild = (item) => {
                             let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
@@ -223,10 +225,23 @@ export default class CorporateAnnualTarget extends Component {
                             // console.log(dataCustomerPrs)
                         })
                     } else {
-                this.setState({ dataTable, loading: false, dataReal: [], editable: true, dataCustomerPrs, dataInternalBsn }, () => {
-                    // console.log(dataCustomerPrs)
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
                         })
                     }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
+            }
+        
+                
         })
     }
 
@@ -361,6 +376,7 @@ export default class CorporateAnnualTarget extends Component {
             // console.log(JSON.stringify(this.state.payload));
             // console.log(response)
             if (response.data) {
+                if (response. ok) {
                     if (response.data.status === 'success') {
                         // this.setState({ visibleUpload: false, visibleCAT: false })
                         this.setState({ visibleUpload: false, visibleCAT: false })
@@ -434,7 +450,21 @@ export default class CorporateAnnualTarget extends Component {
                             })
                             // // // console.log(this.state.dataTable);
                         })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
                     } 
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -499,14 +529,25 @@ export default class CorporateAnnualTarget extends Component {
         api.create('UPLOAD').uploadMasterBudget(body).then(response => {
             // // console.log(response);
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status === "success") {
                         this.props.onClickClose()
                         this.props.getReport()
                     } else {
-                    alert(response.data.status)
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
                 }
             } else {
-                alert(response.problem)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }
@@ -752,7 +793,6 @@ export default class CorporateAnnualTarget extends Component {
                                 }, 1000);
                             }
                         })
-                        // alert(response.data.message)
                     }
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })