Merge branch 'faisal' into 'master'

fixed issue company

See merge request !202

src/container/MasterData/Perusahaan/CreatePerusahaan.js

 import React, { Component } from 'react';
-import { TextField, Typography } from '@material-ui/core';
+import { TextField, Typography, withStyles, Snackbar } from '@material-ui/core';
 import * as R from 'ramda';
-import { DateTimePicker, KeyboardDatePicker, DatePicker } from "@material-ui/pickers";
+import { DatePicker } from "@material-ui/pickers";
 import format from "date-fns/format";
 import Autocomplete from '@material-ui/lab/Autocomplete';
+import MuiAlert from '@material-ui/lab/Alert';
 import api from '../../../api';
 import Images from '../../../assets/Images';
 
+const Alert = withStyles({
+})((props) => <MuiAlert elevation={6} variant="filled" {...props} />);
+
 export default class CreatePerusahaan extends Component {
     constructor(props) {
         super(props)
@@ -35,7 +39,10 @@ export default class CreatePerusahaan extends Component {
             msgErrorSD: '',
             msgErrorED: '',
             msgErrorJL: '',
-            msgErrorUB: ''
+            msgErrorUB: '',
+            alert: false,
+            tipeAlert: '',
+            messageAlert: '',
         }
     }
 
@@ -45,7 +52,7 @@ export default class CreatePerusahaan extends Component {
     }
 
     componentDidMount() {
-        this.getParentCompany()
+        this.getCompanyActive()
         this.getAllUnitBisnis()
         if(this.props.type === 'edit') {
             this.getDetailPerusahaan()
@@ -62,8 +69,9 @@ export default class CreatePerusahaan extends Component {
 
     getDetailPerusahaan() {
         api.create().getDetailPerusahaan(this.props.data[1]).then(response => {
+            console.log(response)
+            if (response.data) {
                 if (response.data.status === "success") {
-                console.log(response);
                     this.setState({
                         businessID: response.data.data.business_unit_id,
                         companyID: response.data.data.company_id,
@@ -77,12 +85,24 @@ export default class CreatePerusahaan extends Component {
                         created: response.data.data.created,
                         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' })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }            
         })
     }
 
     getCompanyActive() {
-        api.create().getPerusahaanActive().then(response => {
+        if (this.state.company !== null) {
+            console.log(this.state.company)
+            let payload = {
+                "company_id": this.state.company.company_id
+            }
+            api.create().getPerusahaanActive(payload).then(response => {
+                console.log(response)
+                if (response.data) { 
                     if (response.data.status == 'success') {
                         let data = response.data.data
                         let perusahaanData = data.map((item) => {
@@ -98,13 +118,18 @@ export default class CreatePerusahaan extends Component {
                         };
                         this.setState({ perusahaan: typeProps, perusahaanData: response.data.data, getPerusahaan: index == -1 ? null : perusahaanData[index] })
                     } else {
-                alert(response.data.message)
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
                 }                
             })
         }
+    }
 
     getAllUnitBisnis() {
         api.create().getUnitBisnisActive().then(response => {
+            if (response.data) {
                 if (response.data.status === 'success') {
                     let data = response.data.data
                     let typeData = data.map((item) => {
@@ -122,32 +147,35 @@ export default class CreatePerusahaan extends Component {
                     };
                     this.setState({ types: typeProps, typeData: response.data.data, getTypes: index == -1 ? null : typeData[index] })
                 } else {
-                alert(response.data.message)
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
                 }
-        })
-    }
-
-    getParentCompany() {
-        api.create().getPerusahaanActive().then((response) => {
-            if (response.data.status === 'success') {
-                let data = response.data.data
-                let typeData = data.map((item) => {
-                    return {
-                        company_id: item.company_id,
-                        company_name: item.company_name
-                    }
-                })
-                let typeProps = {
-                    options: typeData.sort((a, b) => a.company_id - b.company_id),
-                    getOptionLabel: (option) => option.company_name,
-                };
-                this.setState({ perusahaan: typeProps, perusahaanData: response.data.data })
             } else {
-                alert(response.data.message)
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }            
         })
     }
 
+    // getParentCompany() {
+    //     api.create().getPerusahaanActive().then((response) => {
+    //         if (response.data.status === 'success') {
+    //             let data = response.data.data
+    //             let typeData = data.map((item) => {
+    //                 return {
+    //                     company_id: item.company_id,
+    //                     company_name: item.company_name
+    //                 }
+    //             })
+    //             let typeProps = {
+    //                 options: typeData.sort((a, b) => a.company_id - b.company_id),
+    //                 getOptionLabel: (option) => option.company_name,
+    //             };
+    //             this.setState({ perusahaan: typeProps, perusahaanData: response.data.data })
+    //         } else {
+    //             alert(response.data.message)
+    //         }
+    //     })
+    // }
+
     handleChange(e, type) {
         let data = this.state
         let isDate = type !== '' ? true : false
@@ -229,9 +257,18 @@ export default class CreatePerusahaan extends Component {
         }
     }
 
+    closeAlert() {
+        this.setState({ alert: false })
+    }
+
     renderEdit() {
         return (
             <div className="test app-popup-show">
+                <Snackbar open={this.state.alert} autoHideDuration={6000} onClose={() => this.closeAlert()}>
+                    <Alert onClose={() => this.closeAlert()} severity={this.state.tipeAlert}>
+                        {this.state.messageAlert}
+                    </Alert>
+                </Snackbar>
                 <div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}>
                     <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
                         <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>

src/container/MasterData/Perusahaan/VisualPerusahaan.js

 import React, { Component } from 'react';
 import { Container, Row, Col } from "react-bootstrap";
-import { makeStyles, createMuiTheme, MuiThemeProvider } from '@material-ui/core/styles';
-import { TextField } from '@material-ui/core';
-import MenuItem from '@material-ui/core/MenuItem';
+import { Typography, withStyles, Snackbar } from '@material-ui/core';
 import Perusahaan from "./Perusahaan";
-import TreeView from '@material-ui/lab/TreeView';
-import ExpandMoreIcon from '@material-ui/icons/ExpandMore';
-import ChevronRightIcon from '@material-ui/icons/ChevronRight';
-import TreeItem from '@material-ui/lab/TreeItem';
+import MuiAlert from '@material-ui/lab/Alert';
 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';
 
+const Alert = withStyles({
+})((props) => <MuiAlert elevation={6} variant="filled" {...props} />);
+
 export default class VisualPerusahaan extends Component {
     constructor(props) {
         super(props)
@@ -40,7 +38,10 @@ export default class VisualPerusahaan extends Component {
                 },
             ],
             arrayCollapse: [],
-            defaultCollapsed: false
+            defaultCollapsed: false,
+            alert: false,
+            tipeAlert: '',
+            messageAlert: '',
         }
     }
 
@@ -50,9 +51,16 @@ export default class VisualPerusahaan extends Component {
 
     getPerusahaan() {
         api.create().getPerusahaanHierarki().then((response) => {
+            console.log(response)
+            if (response.data) {                
                 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' })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -98,6 +106,9 @@ export default class VisualPerusahaan extends Component {
         )
     };
 
+    closeAlert() {
+        this.setState({ alert: false })
+    }
 
     render() {