Merge branch 'riri' into 'master'

push response api

See merge request !623

src/container/BudgetTahunan/ProfitLoss.js

@@ -10,6 +10,7 @@ import UploadFile from "../../library/Upload";
 import { ExcelRenderer } from 'react-excel-renderer';
 import { Alert } from '@material-ui/lab';
 import * as R from 'ramda';
+import Constant from '../../library/Constant';
 
 const LightTooltip = withStyles((theme) => ({
     tooltip: {
@@ -106,6 +107,8 @@ export default class ProfitLoss extends Component {
             let dataTable = []
             this.setState({ visibleProfitLoss: true })
             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)
@@ -182,10 +185,22 @@ export default class ProfitLoss extends Component {
                         })
                         // console.log(dataTable)
                         this.setState({ dataTable, loading: false, buttonError: true, editable: true }, () => {
-                    // console.log(dataTable)
                         })
                     } else {
-                this.setState({ dataTable, loading: false, buttonError: true, editable: true })
+                        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 })
             }
 
         })
@@ -406,17 +421,25 @@ export default class ProfitLoss 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({ loading: false })
-                alert(response.problem)
-                // this.props.onClickClose()
-                // this.props.getReport()
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', loading: false })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }