Merge branch 'dev/arfin' into 'ENV-DEV-CR-CAFRM'

Dev/arfin

See merge request !1599

src/container/CRFM/TableDocument.js → src/container/CAFRM/TableCafrmDocument.js

@@ -57,7 +57,6 @@ export default class TableDocument extends Component {
                         let dataTable = []
                         response.data.data.map((item, index) => {
                             let indexId = this.props.userCompActive.findIndex((val) => val == item.company_id)
-
                                 if (indexId !== -1) {
                                     dataTable.push( [
                                         index,
@@ -73,22 +72,22 @@ export default class TableDocument extends Component {
                                         item.values
                                     ])
                                 }
-
                         })
-                        // console.log(dataTable)
-                        this.setState({ dataTable, loading: false })
+
                         let docPath = response.data.data.map((item) => {
                             return [
                                 item.document_filepath
                             ]
                         })
-                        this.setState({ docPath, loading: false })
+
                         let docId = response.data.data.map((item) => {
                             return [
                                 item.document_id
                             ]
                         })
-                        this.setState({ docId, loading: false })
+
+                        // console.log(dataTable)
+                        this.setState({ dataTable, docPath, docId, loading: false })
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {
                             if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) {

src/container/DocumentManagement/DocumentManagement.js

@@ -22,6 +22,7 @@ export default class DocumentManagement extends Component {
     constructor(props) {
         super(props)
         this.state = {
+            alert: false,
             tab: 0,
             listData: [],
             id: 0,

src/router/homeRoutes.js

@@ -20,7 +20,7 @@ import SubHolding from '../container/Reports/SubHolding';
 import SummaryTriputra from '../container/SummaryTriputra/SummaryOfTriputra';
 import MasterDataCAT from '../container/MasterData/MasterDataCAT/MasterDataCAT';
 import ProgressReport from '../container/ProgressReport/ProgressReport';
-import CarfmDocument from "../container/CRFM/CarfmDocument";
+import CarfmDocument from "../container/CAFRM/CafrmDocument";
 
 const routes = [
   {