Merge branch 'didam' into 'master'

Didam

See merge request !1096

src/container/BudgetTahunan.js

@@ -213,7 +213,7 @@ export default class BudgetTahunan extends Component {
                             }
                         })
 
-                        if (arrayBaru.length > 0) {
+                        if (companyData.length > 0) {
                             companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
                         }
 

src/container/Home.js

@@ -213,24 +213,21 @@ export default function MiniDrawer() {
         path: '',
         subItem: [
           {
+            img: '',
+            label: 'Subco',
+            path: 'beranda',
+          }, {
             img: 'beranda',
-            label: 'CAT Dashboard',
-            path: 'dashboard-cat',
-          },
-          {
+            label: 'Summary of Triputra Group',
+            path: 'beranda',
+          }, {
             img: 'beranda',
             label: 'Financial Dashboard',
             path: 'dashboard-financial',
-          },
-          {
+          }, {
             img: 'beranda',
-            label: 'Summary of Triputra Group',
-            path: 'beranda',
-          },
-          {
-            img: '',
-            label: 'Sub Holding',
-            path: 'beranda',
+            label: 'CAT Dashboard',
+            path: 'dashboard-cat',
           }
         ],
         collapse: false,

src/container/OutlookPA.js

@@ -110,7 +110,7 @@ export default class OutlookPA extends Component {
                         }
                     })
 
-                    if (arrayBaru.length > 0) {
+                    if (companyData.length > 0) {
                         companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
                     }
 
@@ -245,6 +245,10 @@ export default class OutlookPA extends Component {
                         }
                     })
 
+                    if (companyData.length > 0) {
+                        companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
+                    }
+
                     let arrayBaru = []
                     this.state.userCompany.map((item, index) => {
                         let indexID = companyData.findIndex((val) => val.company_id == item)
@@ -253,6 +257,13 @@ export default class OutlookPA extends Component {
                         }
                     })
 
+                    if (arrayBaru.length > 0) {
+                        arrayBaru = arrayBaru.sort((a,b) => a.company_name.localeCompare(b.company_name))
+                    }
+
+                    console.log(companyData)
+                    console.log(arrayBaru)
+                    
                     let defaultProps = {
                         options: arrayBaru,
                         getOptionLabel: (option) => titleCase(option.company_name),

src/container/RollingOutlook.js

@@ -112,6 +112,10 @@ export default class RollingOutlook extends Component {
                         }
                     })
 
+                    if (companyData.length > 0) {
+                        companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
+                    }
+
                     let defaultProps = {
                         options: companyData,
                         getOptionLabel: (option) => titleCase(option.company_name),
@@ -242,6 +246,10 @@ export default class RollingOutlook extends Component {
                         }
                     })
 
+                    if (companyData.length > 0) {
+                        companyData = companyData.sort((a,b) => a.company_name.localeCompare(b.company_name))
+                    }
+
                     let arrayBaru = []
                     this.state.userCompany.map((item, index) => {
                         let indexID = companyData.findIndex((val) => val.company_id == item)
@@ -250,6 +258,10 @@ export default class RollingOutlook extends Component {
                         }
                     })
 
+                    if (arrayBaru.length > 0) {
+                        arrayBaru = arrayBaru.sort((a,b) => a.company_name.localeCompare(b.company_name))
+                    }
+
                     let defaultProps = {
                         options: arrayBaru,
                         getOptionLabel: (option) => titleCase(option.company_name),