Merge branch 'master' into 'didam'

# Conflicts:
#   src/container/HomePage.js

src/container/BudgetTahunan.js

@@ -372,7 +372,7 @@ export default class BudgetTahunan extends Component {
         }
         api.create().getSubmission(payload).then(response => {
             console.log(response)
-            if (response) {
+            if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({
                         submissionID: response.data.data.submission_id,

src/container/HomePage.js

@@ -27,11 +27,13 @@ class HomePage extends Component {
             listSubcoMB: [],
             valueSubmit: 0,
             listdmb: [],
-            dataTableMB: []
+            dataTableMB: [],
+            loading: false
         }
     }
 
     componentDidMount() {
+        this.setState({ loading: true })
         let userId = localStorage.getItem(Constant.USER)
         api.create().getDetailUser(userId).then((response) => {
             if (response.data) {
@@ -77,7 +79,8 @@ class HomePage extends Component {
                     })
                     this.setState({
                         listSubcoMB: response.data.data,
-                        valueSubmit
+                        valueSubmit,
+                        loading: false
                     })
                 }
             }
@@ -112,16 +115,18 @@ class HomePage extends Component {
             let indexId = actAM.findIndex((val) => val.user_id == userId)
             if (indexId === -1) {
                 this.setState({ isApprover: false })
+                this.getListUserSubco()
             }
+            this.getDashboardMB()
             console.log(actAM)
             this.setState({loading: false})
         })
     }
 
     getDashboardMB() {
-        api.create().getDashboardMB().then((response) =>{
+        api.create().getDashboardMB().then((response) => {
             console.log(response)
-            if(String(response.data.status).toLocaleLowerCase() == 'success'){
+            if (String(response.data.status).toLocaleLowerCase() == 'success') {
                 let data = response.data.data
                 let listdmb = data.sort((a, b) => a.company_id - b.company_id).map((item, index) => {
                     return [
@@ -130,12 +135,23 @@ class HomePage extends Component {
                         item.operating_indicator
                     ]
                 })
-                this.setState({ dataTableMB: listdmb })
+                this.setState({ dataTableMB: listdmb, loading: false })
             }
         })
     }
 
     render() {
+        const loadingComponent = (
+            <div style={{ position: 'absolute', zIndex: 110, top: 0, left: 0, width: '100%', height: '100%', display: 'flex', justifyContent: 'center', alignItems: 'center', background: 'rgba(255,255,255,0.8)' }}>
+                <PropagateLoader
+                    // css={override}
+                    size={20}
+                    color={"#274B80"}
+                    loading={this.state.loading}
+                />
+            </div>
+        );
+
         const columns = ["#", "ID", "Company", "Report Type", "Revision", "Status", {
             name: "Action",
             options: {