Merge branch 'rifka' into 'master'

someone

See merge request !625

src/container/ApprovalMatrix/ApprovalMatrix.js

@@ -452,7 +452,7 @@ export default class ApprovalMatrix extends Component {
                         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({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -462,10 +462,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -479,7 +479,7 @@ export default class ApprovalMatrix extends Component {
                         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({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -489,10 +489,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -506,7 +506,7 @@ export default class ApprovalMatrix extends Component {
                         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({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -516,10 +516,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -563,7 +563,7 @@ export default class ApprovalMatrix extends Component {
                         this.getData()
                         this.setState({ visibleAM: true, alert: true, messageAlert: response.data.message, tipeAlert: 'success' })
                     } else {
-                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -573,10 +573,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }
@@ -595,7 +595,7 @@ export default class ApprovalMatrix extends Component {
                         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({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                             if (response.data.message.includes("Someone Logged In")) {
                                 setTimeout(() => {
                                     localStorage.removeItem(Constant.TOKEN)
@@ -605,10 +605,10 @@ export default class ApprovalMatrix extends Component {
                         })
                     }
                 } else {
-                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
+                    this.setState({ loading: false, alert: true, messageAlert: response.data.message, tipeAlert: 'error' })
                 }
             } else {
-                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+                this.setState({ loading: false, alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
         })
     }

src/container/DocumentManagement/DocumentManagement.js

@@ -82,11 +82,9 @@ export default class DocumentManagement extends Component {
                         loadTable: true,
                         refresh: id === undefined ? '' : 'create'
                     })
-                } else {
-
                 }
             } else {
-
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error', loading: false })
             }
         })
     }