Merge branch 'syadziy' into 'master'

Syadziy

See merge request !141

src/container/Otorisasi/User/AddUser.js

@@ -287,6 +287,8 @@ export default class AddUser extends Component {
             padding = 20
         }
         return (
+            <div>
+                {item.children.length > 0 && (
                     <ul>
                         {item.children.map((data, index) => {
                             return (
@@ -328,6 +330,8 @@ export default class AddUser extends Component {
                             )
                         })}
                     </ul>
+                )}
+            </div>
         )
     }
 

src/container/Otorisasi/User/EditUser.js

@@ -289,6 +289,8 @@ export default class EditUser extends Component {
             padding = 20
         }
         return (
+            <div>
+                {item.children.length > 0 && (
                     <ul>
                         {item.children.map((data, index) => {
                             return (
@@ -330,6 +332,8 @@ export default class EditUser extends Component {
                             )
                         })}
                     </ul>
+                )}
+            </div>
         )
     }
 

src/container/Profile.js

 import React, { Component } from 'react';
-import { Typography, AppBar, Tabs, Tab, TextField, Collapse, withStyles, Checkbox, InputAdornment, IconButton } from '@material-ui/core';
+import { Typography, AppBar, Tabs, Tab, TextField, Snackbar, Collapse, withStyles, Checkbox, InputAdornment, IconButton } from '@material-ui/core';
 import Visibility from '@material-ui/icons/Visibility';
 import VisibilityOff from '@material-ui/icons/VisibilityOff';
-import HomePage from './HomePage';
+import MuiAlert from '@material-ui/lab/Alert';
 import Images from '../assets/Images';
 import api from '../api';
 import Constant from '../library/Constant';
@@ -22,6 +22,9 @@ const CustomCheckbox = withStyles({
     checked: {},
 })((props) => <Checkbox color="default" {...props} />);
 
+const Alert = withStyles({
+})((props) => <MuiAlert elevation={6} variant="filled" {...props} />);
+
 export default class Profile extends Component {
     constructor(props) {
         super(props)
@@ -43,7 +46,10 @@ export default class Profile extends Component {
             showPass2: false,
             showPass3: false,
             pictures: [],
-            name: ""
+            name: "",
+            alert: false,
+            tipeAlert: '',
+            messageAlert: ''
         }
         this.onDrop = this.onDrop.bind(this);
     }
@@ -111,12 +117,20 @@ export default class Profile extends Component {
         api.create().changePassword(body).then(response => {
             console.log(response);
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status === "success") {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                         this.setState({ oldPassword: "", password: "", confirmPassword: "" })
                         localStorage.removeItem(Constant.TOKEN)
                         window.location.reload();
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
                     }
-                alert(response.data.message)
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -136,11 +150,20 @@ export default class Profile extends Component {
         let userId = localStorage.getItem(Constant.USER)
         api.create().getDetailUser(userId).then((response) => {
             console.log(response);
+            if (response.data) {
+                if (response.ok) {
                     if (response.data.status == 'success') {
                         this.setState({ company: response.data.data.company, photo: response.data.data.photo, name: response.data.data.fullname })
                         console.log(response)
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
-
         })
     }
 
@@ -148,10 +171,18 @@ export default class Profile extends Component {
         api.create().getPerusahaanHierarki().then((response) => {
             // console.log(response);
             if (response.data) {
+                if (response.ok) {
                     if (response.data.status == 'success') {
                         this.setState({ listCompany: 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.data.message, tipeAlert: 'error' })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -169,6 +200,8 @@ export default class Profile extends Component {
             padding = 20
         }
         return (
+        <div>
+            {item.children.length > 0 && (
                 <ul>
                     {item.children.map((data, index) => {
                         return (
@@ -199,6 +232,8 @@ export default class Profile extends Component {
                         )
                     })}
                 </ul>
+            )}
+        </div>
         )
     }
 
@@ -269,20 +304,37 @@ export default class Profile extends Component {
         api.create().uploadFoto(formData).then(response => {
             console.log(response)
             if (response.data) {
+                if (response.ok){
                     if (response.data.status === "success") {
                         this.setState({ uploadVisible: false }, () => {
-                        alert(response.data.message)
+                            this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                             this.getUser()
                             window.location.reload()
                         })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' })
+                    }
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
 
+    closeAlert() {
+      this.setState({ alert: false })
+    }
+
     render() {
         return (
             <div style={{ height: this.props.height, backgroundColor: '#f8f8f8', marginBottom: 100, minHeight: 1000 }}>
+                <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={"main-color"} style={{ height: 203, flex: 1, display: 'flex', alignItems: 'flex-end', padding: 20 }}>
                     <div style={{ display: 'flex', alignItems: 'center', justifyContent: 'space-between', width: '100%' }}>
                         <div style={{ display: 'flex', alignItems: 'center' }}>