Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into rifka

src/container/Laporan/SubHolding.js

@@ -424,6 +424,7 @@ export default class SubHolding extends Component {
                 console.log(response);
                 let dataTable = []
                 if (response.data) {
+                    if (response.data.status === 'success') {
                         let res = response.data.data
                         const handlePushChild = (item) => {
                             let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
@@ -554,6 +555,16 @@ export default class SubHolding extends Component {
                         //     console.log(this.state.dataTable)
                         //     this.getPLDetailMR(payload)
                         // })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }
                 } else {
                     this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
                 }
@@ -564,6 +575,7 @@ export default class SubHolding extends Component {
                 console.log(response);
                 let dataTable = []
                 if (response.data) {
+                    if (response.data.status === 'success') {
                         let res = response.data.data
                         const handlePushChild = (item) => {
                             let indexIDzz = dataTable.findIndex((val) => val[1] === item.id)
@@ -693,6 +705,16 @@ export default class SubHolding extends Component {
                             // console.log(this.state.dataTable)
                         //     this.getBalanceSheetMR(payload)
                         // })
+                    } else {
+                        this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                            if (response.data.message.includes("Someone Logged In")) {
+                                setTimeout(() => {
+                                    localStorage.removeItem(Constant.TOKEN)
+                                    window.location.reload();
+                                }, 1000);
+                            }
+                        })
+                    }    
                 } else {
                     this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
                 }
@@ -718,6 +740,7 @@ export default class SubHolding extends Component {
                     api.create().getReportPL(payloads).then(response => {
                         console.log(response);
                         if (response.data) {
+                            if (response.data.status === 'success') {
                                 let dataTable = []
                                 console.log(response)
                                 let res = response.data.data
@@ -885,6 +908,16 @@ export default class SubHolding extends Component {
                                     console.log(this.state.dataTable)
                                     // this.getReportPLMR(payload)
                                 // })
+                            } else {
+                                this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
+                                    if (response.data.message.includes("Someone Logged In")) {
+                                        setTimeout(() => {
+                                            localStorage.removeItem(Constant.TOKEN)
+                                            window.location.reload();
+                                        }, 1000);
+                                    }
+                                })
+                            }
                         } else {
                             this.setState({ dataTable: [], previewTable: false, loading: false, previewDownload: false })
                         }

src/router/homeRoutes.js

@@ -18,7 +18,8 @@ import MonthlyReport from '../container/MonthlyReport';
 import DocumentManagement from '../container/DocumentManagement/DocumentManagement';
 import OutlookPA from '../container/OutlookPA';
 import SubHolding from '../container/Laporan/SubHolding';
-import SummaryTriputra from '../container/SummaryTriputra/SummaryOfTriputra'
+import SummaryTriputra from '../container/SummaryTriputra/SummaryOfTriputra';
+import MasterDataCAT from '../container/MasterData/MasterDataCAT/MasterDataCAT'
 
 const routes = [
   {
@@ -69,6 +70,10 @@ const routes = [
     path: "/home/parameters",
     main: Parameter
   },
+  {
+    path: "/home/master-data-cat",
+    main: MasterDataCAT
+  },
   {
     path: "/home/cat-dashboard",
     main: DashboardCAT