Merge branch 'ENV-DEV' into 'ENV-DEPLOYMENT'

Fix blank page olpa

See merge request !2433

src/container/OutlookPA/CorporateAnnualTargetOLPA.js

@@ -663,9 +663,10 @@ export default class CorporateAnnualTargetRO extends Component {
             }
 
             if (String(i[5]) == 'revenue'){
-                console.log(String(Number(i[22]?.formula[1].value)/1000))
+                const value = i[22]?.formula?.[1]?.value;
+                console.log(String(Number(value ?? 0) / 1000));
             }
-            // if (this.state.defaultCurrencyUpload?.id == 2) {
+            // if (this.state.defaultCurrencyUpload?.id == 2) { 
                 data.push({
                     "item_report_id": i[1] == "" || i[1] == null ? 0 : i[1],
                     "item_report": String(i[5]),

src/container/OutlookPA/OutlookPA.js

@@ -316,7 +316,7 @@ export default class OutlookPA extends Component {
                 // console.log(response)
                 if (response.data) {
                     if (response.data.status === "success") {
-                        this.setState({ listAttachment: response.data.data })
+                        this.setState({ [master_report_type_id === 2 ? 'listAttachmentCAT' : 'listAttachment']: response.data.data })
                     }
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning', loading: false }, () => {

src/container/RollingOutlook/RollingOutlook.js

@@ -340,7 +340,7 @@ export default class RollingOutlook extends Component {
                 console.log(response)
                 if (response.data) {
                     if (response.data.status === "success") {
-                        this.setState({ listAttachment: response.data.data })
+                        this.setState({ [master_report_type_id === 2 ? 'listAttachmentCAT' : 'listAttachment']: response.data.data })
                     }
                 }
                 // console.log(response);