Merge branch 'syadziy' into 'master'

Syadziy

See merge request !216

src/container/MasterData/Perusahaan/CreatePerusahaan.js

@@ -7,6 +7,7 @@ import Autocomplete from '@material-ui/lab/Autocomplete';
 import MuiAlert from '@material-ui/lab/Alert';
 import api from '../../../api';
 import Images from '../../../assets/Images';
+import Constant from '../../../library/Constant';
 
 const Alert = withStyles({
 })((props) => <MuiAlert elevation={6} variant="filled" {...props} />);
@@ -71,6 +72,7 @@ export default class CreatePerusahaan extends Component {
         api.create().getDetailPerusahaan(this.props.data[1]).then(response => {
             console.log(response)
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status === "success") {
                         this.setState({
                             businessID: response.data.data.business_unit_id,
@@ -86,7 +88,17 @@ export default class CreatePerusahaan extends Component {
                             updated: response.data.data.updated === null ? "" : response.data.data.updated
                         }, () => this.getAllUnitBisnis(), this.getCompanyActive())
                     } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Token")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }   
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
@@ -103,6 +115,7 @@ export default class CreatePerusahaan extends Component {
             api.create().getPerusahaanActive(payload).then(response => {
                 console.log(response)
                 if (response.data) { 
+                    if (response.ok) {
                         if (response.data.status == 'success') {
                             let data = response.data.data
                             let perusahaanData = data.map((item) => {
@@ -118,7 +131,17 @@ export default class CreatePerusahaan extends Component {
                             };
                             this.setState({ perusahaan: typeProps, perusahaanData: response.data.data, getPerusahaan: index == -1 ? null : perusahaanData[index] })
                         } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                                if (response.data.message.includes("Token")) {
+                                    setTimeout(() => {
+                                        localStorage.removeItem(Constant.TOKEN)
+                                        window.location.reload();
+                                    }, 1000);
+                                }
+                            })
+                        }
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                     }   
                 } else {
                     this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
@@ -130,6 +153,7 @@ export default class CreatePerusahaan extends Component {
     getAllUnitBisnis() {
         api.create().getUnitBisnisActive().then(response => {
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status === 'success') {
                         let data = response.data.data
                         let typeData = data.map((item) => {
@@ -147,7 +171,17 @@ export default class CreatePerusahaan extends Component {
                         };
                         this.setState({ types: typeProps, typeData: response.data.data, getTypes: index == -1 ? null : typeData[index] })
                     } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Token")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }   
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })

src/container/MasterData/Perusahaan/Perusahaan.js

@@ -15,6 +15,7 @@ import ReactTooltip from 'react-tooltip';
 import MuiAlert from '@material-ui/lab/Alert';
 import { TextField, InputBase, Snackbar, withStyles } from "@material-ui/core";
 import PopUpFailedSave from '../../../library/PopUpFailedSave';
+import Constant from '../../../library/Constant';
 
 var ct = require("../../../library/CustomTable");
 const getMuiTheme = () => createMuiTheme(ct.customTable());
@@ -78,6 +79,8 @@ export default class Perusahaan extends Component {
                 this.setState({ payload: body, buttonError: false })
                 api.create().checkUploadPerusahaan(body).then(response => {
                     console.log(response);
+                    if (response.data) {
+                        if (response.ok) {
                             if (response.data.status === "success") {
                                 let dataRow = response.data.data.map((item, index) => {
                                     return [
@@ -231,6 +234,21 @@ export default class Perusahaan extends Component {
                                     cols: columns,
                                     rows: dataRow
                                 });
+                            } else {
+                                this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                                    if (response.data.message.includes("Token")) {
+                                        setTimeout(() => {
+                                            localStorage.removeItem(Constant.TOKEN)
+                                            window.location.reload();
+                                        }, 1000);
+                                    }
+                                })
+                            }
+                        } else {
+                            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                        }
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
                     }
                     console.log(response);
                 })
@@ -270,6 +288,7 @@ export default class Perusahaan extends Component {
         api.create().getPerusahaan().then((response) => {
             console.log(response)
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status == 'success') {
                         let data = response.data.data
                         let listData = data.sort((a, b) => a.company_id - b.company_id).map((item, index) => {
@@ -277,7 +296,17 @@ export default class Perusahaan extends Component {
                         })
                         this.setState({ dataTable: listData, listData: response.data.data })
                     } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Token")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error', dataTable: [] })
                 }
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', dataTable: [] })
@@ -306,6 +335,7 @@ export default class Perusahaan extends Component {
         }
         api.create().searchPerusahaan(body).then(response => {
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status == 'success') {
                         let data = response.data.data
                         let listData = data.map((item, index) => {
@@ -313,7 +343,17 @@ export default class Perusahaan extends Component {
                         })
                         this.setState({ dataTable: listData, listData: response.data.data })
                     } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Token")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
@@ -325,11 +365,22 @@ export default class Perusahaan extends Component {
         this.setState({ visibleEdit: false })
         api.create().updatePerusahaan(payload).then(response => {
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status == 'success') {
                         this.getData()
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Token")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
@@ -341,11 +392,22 @@ export default class Perusahaan extends Component {
         this.setState({ visibleCreate: false })
         api.create().createPerusahaan(payload).then(response => {
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status == 'success') {
                         this.getData()
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Token")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
@@ -387,11 +449,22 @@ export default class Perusahaan extends Component {
         api.create().uploadPerusahaan(this.state.payload).then(response => {
             console.log(response)
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status == "success") {
                         this.getData()
                         this.setState({ visiblePerusahaan: true, alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Token")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })

src/container/MasterData/Perusahaan/VisualPerusahaan.js

@@ -7,6 +7,7 @@ import Nestable from 'react-nestable/dist/Nestable';
 import AddIcon from '@material-ui/icons/Add';
 import RemoveIcon from '@material-ui/icons/Remove';
 import api from '../../../api';
+import Constant from '../../../library/Constant';
 
 const Alert = withStyles({
 })((props) => <MuiAlert elevation={6} variant="filled" {...props} />);
@@ -55,11 +56,22 @@ export default class VisualPerusahaan extends Component {
         api.create().getPerusahaanHierarki().then((response) => {
             console.log(response)
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status == 'success') {
                         this.setState({ items: response.data.data })
                         console.log(response.data.data)
                     } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Token")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
@@ -89,8 +101,26 @@ export default class VisualPerusahaan extends Component {
             "company": this.state.items
         }
         api.create().saveVisualisasiPerusahaan(payload).then((response) => {
-            // if (response.data.status == 'ucces') {
+            if (response.data) {
+                if (response.ok) {
+                    if (response.data.status == 'success') {
                         this.props.onClickClose()
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                            if (response.data.message.includes("Token")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+            }
             // } else {
             // alert(response.data.message)
             // }