Merge branch 'deni-' into 'master'

kpis

See merge request !1229

src/container/Laporan/DashboardCAT.js

@@ -95,8 +95,8 @@ export default class DashboardCAT extends Component {
                             company_id: item.company_id,
                             company_name: item.company_name,
                         }
-                    })
-
+                    }) 
+                    
                     let arrayBaru = []
                     this.state.userCompany.map((item, index) => {
                         let indexID = companyData.findIndex((val) => val.company_id == item)
@@ -106,7 +106,7 @@ export default class DashboardCAT extends Component {
                     })
 
                     let defaultProps = {
-                        options: arrayBaru,
+                        options: arrayBaru.sort((a, b) => a.company_name.localeCompare(b.company_name)),
                         getOptionLabel: (option) => titleCase(option.company_name),
                     };
                     let index = arrayBaru.findIndex((val) => val.company_id == comID)