Merge branch 'dev/arfin' into 'ENV-DEPLOYMENT'

update issue score MR CAT

See merge request !1625

src/container/MonthlyReport/CorporateAnnualTargetMR.js

@@ -133,24 +133,28 @@ export default class CorporateAnnualTargetMR extends Component {
     }
 
     getParameterGroup() {
-        api.create().getParameterByGroupName({
-            "group_name": 'ACHIEVEMENT_KPI'
-        }).then((response) => {
-            console.log(response.data)
-            if (response.data) {
-                this.setState({ parameterScore: response.data.data })
-            }
+        this.setState({ loading: true }, () => {
+            api.create().getParameterByGroupName({
+                "group_name": 'ACHIEVEMENT_KPI'
+            }).then((response) => {
+                console.log(response.data)
+                if (response.data) {
+                    this.setState({ parameterScore: response.data.data, loading: false })
+                }
+            })
         })
     }
 
     getParameterGroupPerfom() {
-        api.create().getParameterByGroupName({
-            "group_name": "PERFORMANCE_KPI"
-        }).then((response) => {
-            console.log(response.data)
-            if (response.data) {
-                this.setState({ parameterPerfom: response.data.data })
-            }
+        this.setState({ loading: true }, () => {
+            api.create().getParameterByGroupName({
+                "group_name": "PERFORMANCE_KPI"
+            }).then((response) => {
+                console.log(response.data)
+                if (response.data) {
+                    this.setState({ parameterPerfom: response.data.data, loading: false })
+                }
+            })
         })
     }
 
@@ -582,7 +586,9 @@ export default class CorporateAnnualTargetMR extends Component {
                             getOptionLabel: (option) => titleCase(option.value),
                         };
                         // setTimeout(() => {
-                        this.setState({ maxAchList: defaultProps })
+                        this.setState({ maxAchList: defaultProps }, () => {
+                            this.getItemHierarki()
+                        })
                         // }, 300);
                     } else {
                         this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
@@ -601,7 +607,7 @@ export default class CorporateAnnualTargetMR extends Component {
             } else {
                 this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
             }
-            this.getItemHierarki()
+            
         })
     }