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

Anomali CAT

See merge request !1878

.env_staging

+// contents of .env 
+
+REACT_APP_URL_MAIN_BE=https://tia.eksad.com/tia-reporting-staging
+REACT_APP_URL_MAIN_FE=/web
\ No newline at end of file

package.json

@@ -55,14 +55,18 @@
     "start": "react-scripts start",
     "build": "react-scripts --max_old_space_size=8192 build",
     "build_dev": "copy .env_dev .env && react-scripts --max_old_space_size=8192 build",
+    "build_staging": "copy .env_staging .env && react-scripts --max_old_space_size=8192 build",
     "build_prod": "copy .env_prod .env && react-scripts --max_old_space_size=8192 build",
     "build_dev_linux": "cp .env_dev .env && react-scripts --max_old_space_size=8192 build",
+    "build_staging_linux": "cp .env_staging .env && react-scripts --max_old_space_size=8192 build",
     "build_prod_linux": "cp .env_prod .env && react-scripts --max_old_space_size=8192 build",
     "test": "react-scripts test",
     "eject": "react-scripts eject",
     "dev": "copy .env_dev .env && react-scripts start",
+    "staging": "copy .env_staging .env && react-scripts start",
     "prod": "copy .env_prod .env && react-scripts start",
     "dev_linux": "cp .env_dev .env && react-scripts start",
+    "staging_linux": "cp .env_staging .env && react-scripts start",
     "prod_linux": "cp .env_prod .env && react-scripts start"
   },
   "eslintConfig": {

src/container/BudgetTahunan/BudgetTahunan.js

@@ -628,7 +628,7 @@ export default class BudgetTahunan extends Component {
             console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
-                    if (type === "CAT") {
+                    if (type === "CAT" || type === "DraftCAT") {
                         this.setState({ visibleCAT: false, visibleBudgetTahunan: true, loading: false })
                     } else {
                         this.setState({ visibleBudgetTahunan: true, loading: false })

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -428,7 +428,7 @@ export default class CorporateAnnualTarget extends Component {
                     report_id: this.props.report_id,
                     status: '',
                     cat: payload,
-                    status: 'submitted'
+                    status: 'submitted' 
                 }
                 // // // // console.log(body)
                 this.setState({ payload: body, judul: resp.rows[1][0] })
@@ -825,10 +825,10 @@ export default class CorporateAnnualTarget extends Component {
                         if (type == 'submitted') {
                             this.props.getReport(body, 'CAT')
                         } else {
-                            this.props.getReport(body)
+                            this.props.getReport(body, 'DraftCAT')
                         }
                         this.setState({ loading: false })
-                        // this.props.onClickClose()
+                        this.props.onClickClose()
                         // this.props.getReport()
                     } else {
                         if (response.data?.message == "Please Set Up Rate Currency First") {

src/library/Constant.js

@@ -4,9 +4,11 @@ const Constant = {
     EMAIL: 'TOKEN',
     PASSWORD: 'PASSWORD',
     URL_BE_DEV: '${process.env.REACT_APP_URL_MAIN_BE}',
+    URL_BE_STAGING: 'https://tia.eksad.com/tia-reporting-staging',
     URL_BE_DEMO: 'https://tia.eksad.com/tia-reporting-demo',
     URL_BE_PROD: 'https://dashboard.triputra-group.com/tia-reporting',
     URL_FE_DEV: 'https://tia.eksad.com/tia-web-dev',
+    URL_FE_STAGING: 'https://tia.eksad.com/tia-web-staging',
     URL_FE_DEMO: 'https://tia.eksad.com/tia-web-demo',
     URL_FE_PROD: 'https://dashboard.triputra-group.com/tia-web',
     DATACAT: 'datacat'