Merge branch 'ENV-DEV' into 'BACKUP-DEV'

Backup 2023-07-25

See merge request !1922

.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/assets/Images.js

@@ -56,6 +56,8 @@ const Images = {
     dotOverdue: require('./dot-overdue.svg'),
     dotOpen: require('./dot-open.svg'),
     zip: require('./zip.png'),
+    warning: require('./warning.png'),
+    simulasiUpload: require('./upload-simulasi.png'),
 }
 
 export default Images
\ No newline at end of file

src/container/ApprovalMatrix/EditApprovalMatrix.js

@@ -51,7 +51,7 @@ export default class EditApprovalMatrix extends Component {
 
     getDetailAM() {
         api.create().getDetailAM(this.props.data[1]).then(response => {
-            // console.log(response)
+            console.log(response)
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === "success") {
@@ -89,6 +89,8 @@ export default class EditApprovalMatrix extends Component {
 
     getUserData() {
         api.create().getApprovedByAM().then((response) => {
+            console.log(response);
+            console.log(this.state.getUserId);
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status == 'success') {

src/container/Auth/Login.js

@@ -48,7 +48,6 @@ class Login extends Component {
   componentDidMount() {
     this.getUser()
     var email = localStorage.getItem(Constant.EMAIL)
-    console.log(email)
   }
 
   getWindowDimensions() {
@@ -112,6 +111,7 @@ class Login extends Component {
             } else {
               localStorage.setItem(Constant.TOKEN, datas.token)
               localStorage.setItem(Constant.USER, datas.user_id)
+              localStorage.setItem(Constant.ROLE, datas.role_id)
               if (this.state.rememberMe) {
                 localStorage.setItem(Constant.EMAIL, this.state.email)
                 localStorage.setItem(Constant.PASSWORD, this.state.password)

src/container/DownloadReport/DownloadReport.js

@@ -97,6 +97,10 @@ class DownloadReport extends Component {
         return () => clearInterval(interval);
     }
 
+    closeAlert() {
+        this.setState({ alert: false })
+    }
+
     getListDownload() {
         api.create().getListDownload().then((response) => {
             // console.log(response);

src/container/MasterData/Company/EditCompany.js

@@ -34,6 +34,7 @@ export default class EditPerusahaan extends Component {
             msgErrorSD: '',
             msgErrorED: '',
             msgErrorJL: '',
+            optionCurrecy: [] 
         }
     }