update fixing UAT

src/container/CAFRM/CreateCarfmDocument.js

@@ -23,8 +23,6 @@ export default class CreateCarfmDoc extends Component {
             errorPerusahaan: false,
             msgErrorPerusahaan: '',
             document: null,
-            documentData: null,
-            getDocument: null,
             errorDocument: false,
             msgErrorDocument: '',
             listPeriode: null,
@@ -45,29 +43,25 @@ export default class CreateCarfmDoc extends Component {
             fileType: '',
             docId: '',
             sizeUpload: "1",
-            menuName: null,
             saveDisable: false,
             submitVal: 0
         }
     }
 
-    async componentDidMount() {
-        this.props.handleLoading(1)
-        await this.getMenuName()
-        await this.getDataCompany()
-        await this.getPeriode()
-        await this.getMonth()
-        await this.getFileSize()
-        this.props.handleLoading(0)
+    componentDidMount() {
+        this.getDataCompany()
+        this.getPeriode()
+        this.getMonth()
+        this.getFileSize()
     }
 
-    async getFileSize() {
+    getFileSize() {
         let body = {
             group: 'MAX_FILE_SIZE',
             company_id: 0,
             type: 'MAX_FILE_SIZE'
         }
-        await api.create().getAllSettingByType(body).then(response => {
+        api.create().getAllSettingByType(body).then(response => {
             // console.log(response);
             if (response.data) {
                 if (response.data.status === "success") {
@@ -95,8 +89,8 @@ export default class CreateCarfmDoc extends Component {
         })
     }
 
-    async getDataCompany() {
-        await api.create().getPerusahaanUserActive().then((response) => {
+    getDataCompany() {
+        api.create().getPerusahaanUserActive().then((response) => {
             if (response.data) {
                 if (response.data.status == 'success') {
                     let data = response.data.data
@@ -111,10 +105,10 @@ export default class CreateCarfmDoc extends Component {
                     //     company_name: 'Default'
                     // })
                     let typeProps = {
-                        options: typeData.sort((a, b) => a.company_name.localeCompare(b.company_name)),
+                        options: typeData.sort((a, b) => a.company_name - b.company_name),
                         getOptionLabel: (option) => option.company_name,
                     };
-                    this.setState({ perusahaan: typeProps}, () => console.log(this.state.perusahaan))
+                    this.setState({ perusahaan: typeProps })
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                         if (response.data.message.includes("Someone Logged In") || response.data.message.includes("Token Expired")) {
@@ -131,30 +125,8 @@ export default class CreateCarfmDoc extends Component {
         })
     }
 
-    async getMenuName(){
-
-        await api.create().getMenuByUser().then(
-            response => {
-                if(response.data){
-                    if(response.data.status === 'success'){
-                        response.data.data.map(
-                            (item) => {
-                                if(item.menu_id == this.props.submenu_id){
-                                    this.setState({
-                                            menuName : item.menu_name
-                                        }
-                                    );
-                                }
-                            }
-                        )
-                    }
-                }
-            }
-        )
-    }
-
-    async getPeriode() {
-        await api.create().getPeriodeTransaction().then(response => {
+    getPeriode() {
+        api.create().getPeriodeTransaction().then(response => {
             let dateNow = new Date
             let year = format(dateNow, 'yyyy')
             if (response.data) {
@@ -185,8 +157,8 @@ export default class CreateCarfmDoc extends Component {
         })
     }
 
-    async getMonth() {
-        await api.create().getMonthTransaction().then(response => {
+    getMonth() {
+        api.create().getMonthTransaction().then(response => {
             let dateNow = new Date
             // let bulan = format(dateNow, 'MMMM')
             if (response.data) {
@@ -271,7 +243,7 @@ export default class CreateCarfmDoc extends Component {
                 formData.append("documentPeriode", this.state.periode.periode);
                 formData.append("documentMonth", this.state.monthId.month_id);
                 this.setState({ formData }, () => {
-                    this.props.createDocument(this.state.formData, )
+                    this.props.createDocument(this.state.formData)
                 })
             }
     }
@@ -340,7 +312,7 @@ export default class CreateCarfmDoc extends Component {
                                     <div style={{ padding: 10, borderRadius: 5, marginTop: "1.2em" }}>
 
                                                 <TextField
-                                                           value={this.state.menuName}
+                                                           value={this.props.menuName}
                                                            InputProps={{ style: { fontSize: 11 } }}
                                                            InputLabelProps={{ style: { fontSize: 11, color: '#7e8085' } }}
                                                            placeholder="Category"

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,