Merge branch 'ENV-STAGING' into 'ENV-PROD'

Env staging

See merge request !2146

src/container/MasterData/Parameter/CreateParameter.js

@@ -1020,7 +1020,7 @@ export default class CreateParameter extends Component {
     validasiRegexValue() {
         let obj = null
         if (R.isNil(this.state.getTypes)) {
-            obj = { regexValue: "", valueLength: "" }
+            obj = { regexValue: (/null.*$/), valueLength: 0 }
         } else {
             if (this.state.getTypes.setting_group_name === "CURRENCY") {
                 obj = { regexValue: (/\d+(\.\d+)?/), valueLength: 20 }
@@ -1054,6 +1054,8 @@ export default class CreateParameter extends Component {
                             obj = { regexValue: (/Q1\s\d{4}/), valueLength: 7 }
                     }
                 }
+            }else{
+                obj = { regexValue: (/null.*$/), valueLength: 20 }
             }
         }
         return obj;

src/container/MonthlyReport/MonthlyReport.js

@@ -951,7 +951,7 @@ export default class MonthlyReport extends Component {
                     visibleOI: false,
                     visibleCF: false,
                 })
-            } else if (item === 'List Of Credit Facilities and Investment') {
+            } else if (item === 'List of Credit Facilities') {
                 this.setState({
                     visibleMonthlyReport: false,
                     visibleBS: false,

src/container/OutlookPA/CashFlowOLPA.js

@@ -916,8 +916,8 @@ export default class CashFlow extends Component {
                                                                 type="text"
                                                                 placeholder=""
                                                                 disabled={true}
-                                                                // value={Number(tableMeta.rowData[6].value).toFixed(1)}
-                                                                value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
+                                                                // value={fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1)}
+                                                                value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
                                                             />
                                                         </span>
                                                         :
@@ -929,7 +929,7 @@ export default class CashFlow extends Component {
                                                                 placeholder=""
                                                                 disabled={true}
                                                                 // value={Number(tableMeta.rowData[6].value).toFixed(1)}
-                                                                value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
+                                                                value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
                                                             />
                                                             :
                                                             tableMeta.rowData[0] === 7 ?
@@ -951,7 +951,7 @@ export default class CashFlow extends Component {
                                                                             placeholder=""
                                                                             disabled={true}
                                                                             // value={Number(tableMeta.rowData[6].value).toFixed(1)}
-                                                                            value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
+                                                                            value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
                                                                         />
                                                                         :
                                                                         <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[24]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
@@ -970,7 +970,7 @@ export default class CashFlow extends Component {
                                                                                 placeholder=""
                                                                                 disabled={true}
                                                                                 // value={Number(tableMeta.rowData[6].value).toFixed(1)}
-                                                                                value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
+                                                                                value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
                                                                             />
                                                                         </LightTooltip>
                                                                     :
@@ -990,7 +990,7 @@ export default class CashFlow extends Component {
                                                                             placeholder=""
                                                                             disabled={true}
                                                                             // value={Number(tableMeta.rowData[6].value).toFixed(1)}
-                                                                            value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
+                                                                            value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
                                                                         />
                                                                         :
                                                                         <LightTooltip title={this.state.minValue === null ? `Value Should be ${tableMeta.rowData[24]}` : `Value Should be (${this.state.minValue}) up to (${this.state.maxValue})`} arrow>
@@ -1009,7 +1009,7 @@ export default class CashFlow extends Component {
                                                                                 placeholder=""
                                                                                 disabled={true}
                                                                                 // value={Number(tableMeta.rowData[6].value).toFixed(1)}
-                                                                                value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value).toFixed(1), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
+                                                                                value={Number(tableMeta.rowData[6].value) == 0 ? "0.0" : this.props.defaultCurrency.id == 1 ? (this.props.PLBSFAMSubmitted ? fixNumber(Number(tableMeta.rowData[6].value), 1) : fixNumber(Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)), 1)) : (this.props.PLBSFAMSubmitted ? Number(tableMeta.rowData[6].value) : Number(handleValueFormula(tableMeta.rowData[6], tableMeta, 6)))}
                                                                             />
                                                                         </LightTooltip>
                                                                 :