From bc9b855b7500170a00fb4808df553169e8babcfe Mon Sep 17 00:00:00 2001
From: root <root@db2.oslog.id>
Date: Tue, 21 Nov 2023 14:56:07 +0700
Subject: [PATCH 1/3] save update from server

---
 .../CreatedProyek/.DialogHierarchy.js.swp       | Bin 0 -> 16384 bytes
 .../SimproV2/CreatedProyek/DialogHierarchy.js   |   2 +-
 .../CreatedProyek/ImportActivity/index.js       |  14 +++++++-------
 src/views/SimproV2/CreatedProyek/index.js       |   2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 src/views/SimproV2/CreatedProyek/.DialogHierarchy.js.swp

diff --git a/src/views/SimproV2/CreatedProyek/.DialogHierarchy.js.swp b/src/views/SimproV2/CreatedProyek/.DialogHierarchy.js.swp
new file mode 100644
index 0000000000000000000000000000000000000000..426e022212eed132edc77a6f21437bfbeb612060
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001

diff --git a/src/views/SimproV2/CreatedProyek/DialogHierarchy.js b/src/views/SimproV2/CreatedProyek/DialogHierarchy.js
index feeedf9..2bb089d 100644
--- a/src/views/SimproV2/CreatedProyek/DialogHierarchy.js
+++ b/src/views/SimproV2/CreatedProyek/DialogHierarchy.js
@@ -47,7 +47,7 @@ const DialogHierarchy = ({ openDialog, closeDialog, toggleDialog, idTask, proyek
       setLoading(true);
       getdataHierarchy();
     }
-  }, [saveHierarchy, idTask, openDialog, closeDialog, openDialogFormGantt])
+  }, [idTask, openDialog, closeDialog, openDialogFormGantt])
 
   useEffect(() => {
     if (!openDialog) {
diff --git a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js
index 4e20276..2e9212d 100644
--- a/src/views/SimproV2/CreatedProyek/ImportActivity/index.js
+++ b/src/views/SimproV2/CreatedProyek/ImportActivity/index.js
@@ -9,13 +9,13 @@ import './table.css';
 import { BASE_OSPRO, ASSIGN_HR_PROJECT_SEARCH } from '../../../../const/ApiConst';
 import { Prompt } from 'react-router-dom';
 //
-const config = {
-	headers:
-	{
-		Authorization: `Bearer ${token}`,
-		"Content-type": `application/json`
-	}
-};
+//const config = {
+//	headers:
+//	{
+//		Authorization: `Bearer ${token}`,
+//		"Content-type": `application/json`
+//	}
+//};
 //const token = window.localStorage.getItem('token');
 const token = localStorage.getItem("token");
 const HEADER = {
diff --git a/src/views/SimproV2/CreatedProyek/index.js b/src/views/SimproV2/CreatedProyek/index.js
index f331f84..f2942ce 100644
--- a/src/views/SimproV2/CreatedProyek/index.js
+++ b/src/views/SimproV2/CreatedProyek/index.js
@@ -304,7 +304,7 @@ const CreatedProyek = ({ params, ...props }) => {
   const getDataProyek = async () => {
     let start = 0;
     let hierarchy = [];
-    hierarchy.push(JSON.parse(localStorage.getItem("hierarchy")));
+    //hierarchy.push(JSON.parse(localStorage.getItem("hierarchy")));
     if (currentPage !== 1 && currentPage > 1) {
       start = currentPage * rowsPerPage - rowsPerPage;
     }

From ec2b0224e41cb4cfb440500fb08eddb02568a6ba Mon Sep 17 00:00:00 2001
From: farhantock <achmadfarhanmushafa@gmail.com>
Date: Wed, 22 Nov 2023 16:25:36 +0700
Subject: [PATCH 2/3] update condition by company_id or super admin

---
 src/views/Master/MasterRoles/DialogForm.js |  1 -
 src/views/Master/MasterRoles/index.js      | 61 ++++++++++++----------
 src/views/Master/ProjectPhase/index.js     | 40 +++++++-------
 src/views/Master/RoleProject/index.js      | 18 ++++++-
 src/views/Pages/Login/Login.js             | 10 ++--
 src/views/SimproV2/Divisi/index.js         | 35 +++++++------
 src/views/SimproV2/Gantt/index.js          |  6 +--
 src/views/SimproV2/ProjectType/index.js    | 42 +++++++--------
 src/views/SimproV2/ResourceWorker/index.js | 43 +++++++--------
 src/views/SimproV2/Satuan/index.js         | 36 +++++++------
 10 files changed, 156 insertions(+), 136 deletions(-)

diff --git a/src/views/Master/MasterRoles/DialogForm.js b/src/views/Master/MasterRoles/DialogForm.js
index 4bc3ab1..fab37b4 100644
--- a/src/views/Master/MasterRoles/DialogForm.js
+++ b/src/views/Master/MasterRoles/DialogForm.js
@@ -37,7 +37,6 @@ class DialogForm extends Component {
     this.props.showDialog(this.showDialog);
     this.getAllMenu();
   }
-
   async componentDidUpdate() {
     if (this.state.isParentClick === true) {
       if (this.props.typeDialog === "Edit") {
diff --git a/src/views/Master/MasterRoles/index.js b/src/views/Master/MasterRoles/index.js
index af94704..243519f 100644
--- a/src/views/Master/MasterRoles/index.js
+++ b/src/views/Master/MasterRoles/index.js
@@ -11,28 +11,33 @@ import { Pagination, Tooltip, Table } from 'antd';
 import { ROLE_ADD, ROLE_SEARCH, ROLE_EDIT, ROLE_DELETE, ROLEMENU_ADD, ROLEMENU_SEARCH, ROLEMENU_DELETE_ROLE } from '../../../const/ApiConst.js';
 import { withTranslation } from 'react-i18next';
 
-const token = window.localStorage.getItem('token');
-const company_id = window.localStorage.getItem('company_id');
-const role_name = window.localStorage.getItem('role_name');
-
-
-const BASE_URL = "http://siopas.co.id/custom-php/api/geohr/";
-
-const config = {
-	headers:
-	{
-		Authorization: `Bearer ${token}`,
-		"Content-type": `application/json`
-	}
-};
-
-const momentFormat = 'HH:mm';
 
 const LENGTH_DATA = 10
 
 class index extends Component {
 	constructor(props) {
+		let role_id = '', user_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+		if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+			role_id = props.location.state.role_id;
+			user_id = props.location.state.user_id;
+			token = props.location.state.token;
+			isLogin = props.location.state.isLogin;
+			company_id = props.location.state.company_id;
+			role_name = props.location.state.role_name;
+
+
+		} else {
+			token = window.localStorage.getItem('token');
+			role_name = window.localStorage.getItem('role_name');
+			company_id = window.localStorage.getItem('company_id');
+		}
 		super(props)
+		this.config = {
+			headers: {
+				Authorization: `Bearer ${token}`,
+				"Content-type": "application/json"
+			}
+		};
 		this.state = {
 			alertDelete: false,
 			alertNotDelete: false,
@@ -58,9 +63,9 @@ class index extends Component {
 			tooltipTambah: false,
 			totalPage: 0,
 			typeDialog: 'Save',
-			company_id: company_id
+			company_id: company_id,
+			role_name: role_name
 		}
-
 		this.columns = [
 			{
 				title: this.props.t('action'),
@@ -117,7 +122,7 @@ class index extends Component {
 			"joins": [],
 			"orders": { "columns": ["id"], "ascending": false }
 		}
-		if (role_name !== "Super Admin") {
+		if (this.state.role_name !== "Super Admin") {
 			formData.columns.push(
 				{ "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" },
 			)
@@ -127,7 +132,7 @@ class index extends Component {
 			)
 		}
 		const result = await axios
-			.post(ROLE_SEARCH, formData, config)
+			.post(ROLE_SEARCH, formData, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 
@@ -172,7 +177,7 @@ class index extends Component {
 		const { idDelete } = this.state
 		const url = ROLE_DELETE(idDelete)
 
-		const result = await axios.delete(url, config)
+		const result = await axios.delete(url, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 
@@ -193,10 +198,10 @@ class index extends Component {
 			name: data.name,
 			description: data.description,
 			default_page: data.selectedMenu,
-			company_id: company_id
+			company_id: this.company_id
 		}
 
-		const result = await axios.post(ROLE_ADD, formData, config)
+		const result = await axios.post(ROLE_ADD, formData, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 
@@ -216,7 +221,7 @@ class index extends Component {
 			default_page: data.selectedMenu
 		}
 		const url = ROLE_EDIT(data.id)
-		const result = await axios.put(url, formData, config)
+		const result = await axios.put(url, formData, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 
@@ -285,7 +290,7 @@ class index extends Component {
 		}
 
 		const result = await axios
-			.post(ROLEMENU_SEARCH, formData, config)
+			.post(ROLEMENU_SEARCH, formData, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 		if (result && result.data && result.data.code == 200) {
@@ -309,7 +314,7 @@ class index extends Component {
 					menu_id: val.menu_id,
 					role_id: val.roles_id
 				}
-				promises.push(axios.post(ROLEMENU_ADD, formData, config)
+				promises.push(axios.post(ROLEMENU_ADD, formData, this.config)
 					.then(res => result.push(res)))
 			}
 		})
@@ -329,7 +334,7 @@ class index extends Component {
 
 	deleteCurrentRoleMenu = async (id) => {
 		let urlDel = ROLEMENU_DELETE_ROLE(id)
-		const result = await axios.delete(urlDel, config)
+		const result = await axios.delete(urlDel, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 		if (result && result.data && result.data.code === 200) {
@@ -352,7 +357,7 @@ class index extends Component {
 		}
 
 		const result = await axios
-			.post(ROLE_SEARCH, formData, config)
+			.post(ROLE_SEARCH, formData, this.config)
 			.then(res => res)
 			.catch((error) => error.response);
 
diff --git a/src/views/Master/ProjectPhase/index.js b/src/views/Master/ProjectPhase/index.js
index 56a3821..8d80b93 100644
--- a/src/views/Master/ProjectPhase/index.js
+++ b/src/views/Master/ProjectPhase/index.js
@@ -9,27 +9,27 @@ import { NotificationContainer, NotificationManager } from 'react-notifications'
 import { PROJECT_PHASE_ADD, PROJECT_PHASE_EDIT, PROJECT_PHASE_DELETE, PROJECT_PHASE_SEARCH, PROJECT_PHASE_LIST, BASE_OSPRO } from '../../../const/ApiConst';
 import { Pagination, Button, Tooltip, Table } from 'antd';
 import { useTranslation } from 'react-i18next';
-const token = window.localStorage.getItem('token');
-const company_id = window.localStorage.getItem('company_id');
-const role_name = window.localStorage.getItem('role_name');
-const config = {
-  headers:
-  {
-    Authorization: `Bearer ${token}`,
-    "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
+
+
+const ProjectPhase = ({ params, ...props }) => {
+  let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+  if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+    role_id = props.location.state.role_id;
+    user_id = props.location.state.user_id;
+    token = props.location.state.token;
+    isLogin = props.location.state.isLogin;
+    role_name = props.location.state.role_name;
+  } else {
+    role_id = localStorage.getItem("role_id");
+    proyek_id = localStorage.getItem("proyek_id");
+    user_id = localStorage.getItem("user_id");
+    token = localStorage.getItem("token");
+    isLogin = localStorage.getItem("isLogin");
+    company_id = localStorage.getItem('company_id');
+    role_name = localStorage.getItem('role_name');
   }
-};
 
-const ProjectPhase = ({ params }) => {
-  const token = localStorage.getItem("token")
-  const company_id = localStorage.getItem("company_id")
-  /*const HEADER = {
-    headers: {
-      "Content-Type": "application/x-www-form-urlencoded; charset=UTF-8",
-      "Access-Control-Allow-Origin": "*",
-      "Authorization": `Bearer ${token}`
-    }
-  }*/
+  console.log('company_id', company_id);
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -257,7 +257,7 @@ const ProjectPhase = ({ params }) => {
   const onConfirmDelete = async () => {
     let url = PROJECT_PHASE_DELETE(idDelete);
 
-    const result = await axios.delete(url, config)
+    const result = await axios.delete(url, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
diff --git a/src/views/Master/RoleProject/index.js b/src/views/Master/RoleProject/index.js
index d96c1d7..1a91e10 100644
--- a/src/views/Master/RoleProject/index.js
+++ b/src/views/Master/RoleProject/index.js
@@ -35,6 +35,19 @@ const LENGTH_DATA = 10
 
 class index extends Component {
   constructor(props) {
+    let role_id = '', user_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+    if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+      role_id = props.location.state.role_id;
+      user_id = props.location.state.user_id;
+      token = props.location.state.token;
+      isLogin = props.location.state.isLogin;
+      company_id = props.location.state.company_id;
+      role_name = props.location.state.role_name;
+    } else {
+      token = window.localStorage.getItem('token');
+      role_name = window.localStorage.getItem('role_name');
+      company_id = window.localStorage.getItem('company_id');
+    }
     super(props)
     this.state = {
       alertDelete: false,
@@ -61,7 +74,8 @@ class index extends Component {
       tooltipTambah: false,
       totalPage: 0,
       typeDialog: 'Save',
-      company_id
+      company_id: company_id,
+      role_name: role_name
     }
     this.columns = [
       {
@@ -115,7 +129,7 @@ class index extends Component {
       "joins": [],
       "orders": { "columns": ["id"], "ascending": false }
     }
-    if (role_name !== "Super Admin") {
+    if (this.state.role_name !== "Super Admin") {
       formData.columns.push(
         { "name": "company_id", "logic_operator": "=", "value": this.state.company_id, "operator": "AND" },
       )
diff --git a/src/views/Pages/Login/Login.js b/src/views/Pages/Login/Login.js
index 9b64976..f3c7379 100644
--- a/src/views/Pages/Login/Login.js
+++ b/src/views/Pages/Login/Login.js
@@ -133,7 +133,7 @@ class Login extends Component {
 		}
 	}
 
-	getDataMenu = async (token, role_id, user_id) => {
+	getDataMenu = async (token, role_id, user_id, company_id, role_name) => {
 		const config = {
 			headers:
 			{
@@ -159,14 +159,14 @@ class Login extends Component {
 			else {
 				this.props.history.push({
 					pathname: "/dashboard",
-					state: { role_id: role_id, user_id: user_id, token: token, isLogin: true }
+					state: { role_id: role_id, user_id: user_id, token: token, isLogin: true, company_id: company_id, role_name: role_name }
 				});
 			}
 			if (this.state.defaultPage) {
 				if (role_id === 44) {
 					this.props.history.push({
 						pathname: this.state.defaultPage,
-						state: { role_id: role_id, user_id: user_id, token: token, isLogin: true }
+						state: { role_id: role_id, user_id: user_id, token: token, isLogin: true, company_id: company_id, role_name: role_name }
 					});
 				} else {
 					this.props.history.push(this.state.defaultPage);
@@ -177,7 +177,7 @@ class Login extends Component {
 			else {
 				this.props.history.push({
 					pathname: "/dashboard",
-					state: { role_id: role_id, user_id: user_id, token: token, isLogin: true }
+					state: { role_id: role_id, user_id: user_id, token: token, isLogin: true, company_id: company_id, role_name: role_name }
 				});
 			}
 		} else {
@@ -222,7 +222,7 @@ class Login extends Component {
 		if (doLogin && doLogin.data && doLogin.data.code === 200) {
 			const { access_token, data_user } = doLogin.data.data
 			this.getDataRole(access_token, data_user.role_id)
-			this.getDataMenu(access_token, data_user.role_id, data_user.id)
+			this.getDataMenu(access_token, data_user.role_id, data_user.id, data_user.company_id, data_user.role.name)
 			window.localStorage.setItem('isLogin', true);
 			window.localStorage.setItem('token', access_token);
 			window.localStorage.setItem('user_id', data_user.id);
diff --git a/src/views/SimproV2/Divisi/index.js b/src/views/SimproV2/Divisi/index.js
index 89b0b79..08a4d0d 100644
--- a/src/views/SimproV2/Divisi/index.js
+++ b/src/views/SimproV2/Divisi/index.js
@@ -9,20 +9,6 @@ import { NotificationContainer, NotificationManager } from 'react-notifications'
 import { Pagination, Button, Tooltip } from 'antd';
 import { useTranslation } from 'react-i18next';
 
-const url = "";
-const proyek_id = localStorage.getItem('proyek_id');
-const role_id = localStorage.getItem('role_id');
-const company_id = localStorage.getItem("company_id")
-const role_name = window.localStorage.getItem('role_name');
-const format = "DD-MM-YYYY";
-const token = window.localStorage.getItem('token');
-const config = {
-	headers:
-	{
-		Authorization: `Bearer ${token}`,
-		"Content-type": `application/json`
-	}
-};
 
 const column = [
 	{ name: "Nama" },
@@ -30,8 +16,23 @@ const column = [
 	{ name: "Color" },
 ]
 
-const ProjectType = ({ params }) => {
-	const token = localStorage.getItem("token")
+const ProjectType = ({ params, ...props }) => {
+	let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+	if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+		role_id = props.location.state.role_id;
+		user_id = props.location.state.user_id;
+		token = props.location.state.token;
+		isLogin = props.location.state.isLogin;
+		role_name = props.location.state.role_name;
+	} else {
+		role_id = localStorage.getItem("role_id");
+		proyek_id = localStorage.getItem("proyek_id");
+		user_id = localStorage.getItem("user_id");
+		token = localStorage.getItem("token");
+		isLogin = localStorage.getItem("isLogin");
+		company_id = localStorage.getItem('company_id');
+		role_name = localStorage.getItem('role_name');
+	}
 	const HEADER = {
 		headers: {
 			"Content-Type": "application/json",
@@ -256,7 +257,7 @@ const ProjectType = ({ params }) => {
 
 	const onConfirmDelete = async () => {
 		let url = DIVISI_DELETE(idDelete);
-		const result = await axios.delete(url, config)
+		const result = await axios.delete(url, HEADER)
 			.then(res => res)
 			.catch((error) => error.response);
 
diff --git a/src/views/SimproV2/Gantt/index.js b/src/views/SimproV2/Gantt/index.js
index b46b34d..4693f66 100644
--- a/src/views/SimproV2/Gantt/index.js
+++ b/src/views/SimproV2/Gantt/index.js
@@ -15,7 +15,7 @@ import GanttFrame from "./GanttFrame";
 let roCount = 0;
 
 const Gantt = (props) => {
-  let role_id = '', userId='',isLogin='',token='';
+  let role_id = '', userId = '', isLogin = '', token = '';
   if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
     role_id = props.location.state.role_id;
     userId = props.location.state.user_id;
@@ -56,7 +56,7 @@ const Gantt = (props) => {
     cekPermission();
   }, [listUserGant]);
 
-  useEffect(() => {}, [ro]);
+  useEffect(() => { }, [ro]);
 
   const getDataUserGantt = async () => {
     const payload = {
@@ -94,7 +94,7 @@ const Gantt = (props) => {
   };
 
   const cekPermission = () => {
-    let check = listUserGant.includes(userId);
+    let check = listUserGant.includes(parseInt(userId));
     if (check) {
       setRo(0);
     } else {
diff --git a/src/views/SimproV2/ProjectType/index.js b/src/views/SimproV2/ProjectType/index.js
index 408fb93..9ca0621 100644
--- a/src/views/SimproV2/ProjectType/index.js
+++ b/src/views/SimproV2/ProjectType/index.js
@@ -11,28 +11,24 @@ import { NotificationContainer, NotificationManager } from 'react-notifications'
 import { PROJECT_TYPE_ADD, PROJECT_TYPE_EDIT, PROJECT_TYPE_DELETE, PROJECT_TYPE_SEARCH } from '../../../const/ApiConst';
 import { Pagination, Button, Tooltip, Table } from 'antd';
 import { useTranslation } from 'react-i18next';
-const url = "";
-const proyek_id = localStorage.getItem('proyek_id');
-const role_id = localStorage.getItem('role_id');
-const format = "DD-MM-YYYY";
-const token = window.localStorage.getItem('token');
-const company_id = window.localStorage.getItem('company_id');
-const role_name = window.localStorage.getItem('role_name');
-const config = {
-  headers:
-  {
-    Authorization: `Bearer ${token}`,
-    "Content-type": `application/json`
-  }
-};
-
-const column = [
-  { name: "Nama" },
-  { name: "Deskripsi" },
-]
 
-const ProjectType = ({ params }) => {
-  const token = localStorage.getItem("token")
+const ProjectType = ({ params, ...props }) => {
+  let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+  if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+    role_id = props.location.state.role_id;
+    user_id = props.location.state.user_id;
+    token = props.location.state.token;
+    isLogin = props.location.state.isLogin;
+    role_name = props.location.state.role_name;
+  } else {
+    role_id = localStorage.getItem("role_id");
+    proyek_id = localStorage.getItem("proyek_id");
+    user_id = localStorage.getItem("user_id");
+    token = localStorage.getItem("token");
+    isLogin = localStorage.getItem("isLogin");
+    company_id = localStorage.getItem('company_id');
+    role_name = localStorage.getItem('role_name');
+  }
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -106,7 +102,7 @@ const ProjectType = ({ params }) => {
       )
     }
     const result = await axios
-      .post(PROJECT_TYPE_SEARCH, payload, config, HEADER)
+      .post(PROJECT_TYPE_SEARCH, payload, HEADER, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
@@ -263,7 +259,7 @@ const ProjectType = ({ params }) => {
   const onConfirmDelete = async () => {
     let url = PROJECT_TYPE_DELETE(idDelete);
 
-    const result = await axios.delete(url, config)
+    const result = await axios.delete(url, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
diff --git a/src/views/SimproV2/ResourceWorker/index.js b/src/views/SimproV2/ResourceWorker/index.js
index a466811..e7e9c78 100644
--- a/src/views/SimproV2/ResourceWorker/index.js
+++ b/src/views/SimproV2/ResourceWorker/index.js
@@ -13,24 +13,25 @@ import {
   PROYEK_SEARCH, USER_ADD, USER_SEARCH, USER_EDIT, USER_DELETE, ROLE_SEARCH, DIVISI_SEARCH, USER_SHIFT_ADD, USER_SYNC
 } from '../../../const/ApiConst';
 import { useTranslation } from 'react-i18next';
-const url = "";
-const proyek_id = localStorage.getItem('proyek_id');
-const role_id = localStorage.getItem('role_id');
-const format = "DD-MM-YYYY";
-const token = window.localStorage.getItem('token');
-
-const config = {
-  headers:
-  {
-    Authorization: `Bearer ${token}`,
-    "Content-type": `application/json`
+
+const ResourceWorker = ({ params, ...props }) => {
+  let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+  if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+    role_id = props.location.state.role_id;
+    user_id = props.location.state.user_id;
+    token = props.location.state.token;
+    isLogin = props.location.state.isLogin;
+    role_name = props.location.state.role_name;
+  } else {
+    role_id = localStorage.getItem("role_id");
+    proyek_id = localStorage.getItem("proyek_id");
+    user_id = localStorage.getItem("user_id");
+    token = localStorage.getItem("token");
+    isLogin = localStorage.getItem("isLogin");
+    company_id = localStorage.getItem('company_id');
+    role_name = localStorage.getItem('role_name');
   }
-};
-const role_name = window.localStorage.getItem('role_name');
-const company_id = window.localStorage.getItem('company_id');
-const ResourceWorker = ({ params }) => {
-  const token = localStorage.getItem("token")
-  const company_id = localStorage.getItem("company_id")
+
   const HEADER = {
     headers: {
       "Content-Type": "application/json",
@@ -90,7 +91,7 @@ const ResourceWorker = ({ params }) => {
     }
 
     const result = await axios
-      .post(ROLE_SEARCH, formData, config)
+      .post(ROLE_SEARCH, formData, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
@@ -106,7 +107,7 @@ const ResourceWorker = ({ params }) => {
     }
 
     const result = await axios
-      .post(DIVISI_SEARCH, formData, config)
+      .post(DIVISI_SEARCH, formData, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
@@ -215,7 +216,7 @@ const ResourceWorker = ({ params }) => {
     }
 
     const result = await axios
-      .post(USER_SEARCH, payload, config)
+      .post(USER_SEARCH, payload, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
@@ -468,7 +469,7 @@ const ResourceWorker = ({ params }) => {
   const onConfirmDelete = async () => {
     let url = USER_DELETE(idDelete);
 
-    const result = await axios.delete(url, config)
+    const result = await axios.delete(url, HEADER)
       .then(res => res)
       .catch((error) => error.response);
 
diff --git a/src/views/SimproV2/Satuan/index.js b/src/views/SimproV2/Satuan/index.js
index 6db7072..f849360 100644
--- a/src/views/SimproV2/Satuan/index.js
+++ b/src/views/SimproV2/Satuan/index.js
@@ -9,20 +9,24 @@ import { Pagination, Button, Tooltip } from 'antd';
 import { SATUAN_ADD, SATUAN_EDIT, SATUAN_DELETE, SATUAN_SEARCH } from '../../../const/ApiConst';
 import { useTranslation } from 'react-i18next';
 
-const token = window.localStorage.getItem('token');
-const company_id = window.localStorage.getItem('company_id');
-const role_name = window.localStorage.getItem('role_name');
-const config = {
-	headers:
-	{
-		Authorization: `Bearer ${token}`,
-		"Content-type": `application/json`
-	}
-};
 
-const Satuan = ({ params }) => {
-	const token = localStorage.getItem("token")
-	const company_id = localStorage.getItem("company_id")
+const Satuan = ({ params, ...props }) => {
+	let role_id = '', user_id = '', proyek_id = '', isLogin = '', token = '', company_id = 0, role_name = '';
+	if (props.location.state && props.location.state.role_id && props.location.state.user_id) {
+		role_id = props.location.state.role_id;
+		user_id = props.location.state.user_id;
+		token = props.location.state.token;
+		isLogin = props.location.state.isLogin;
+		role_name = props.location.state.role_name;
+	} else {
+		role_id = localStorage.getItem("role_id");
+		proyek_id = localStorage.getItem("proyek_id");
+		user_id = localStorage.getItem("user_id");
+		token = localStorage.getItem("token");
+		isLogin = localStorage.getItem("isLogin");
+		company_id = localStorage.getItem('company_id');
+		role_name = localStorage.getItem('role_name');
+	}
 	const HEADER = {
 		headers: {
 			"Content-Type": "application/json",
@@ -101,7 +105,7 @@ const Satuan = ({ params }) => {
 
 
 		const result = await axios
-			.post(SATUAN_SEARCH, payload, config)
+			.post(SATUAN_SEARCH, payload, HEADER)
 			.then(res => res)
 			.catch((error) => error.response);
 		if (result && result.data && result.data.code == 200) {
@@ -132,7 +136,7 @@ const Satuan = ({ params }) => {
 			"orders": { "columns": ["id"], "ascending": false }
 		}
 		const result = await axios
-			.post(SATUAN_SEARCH, payload, config)
+			.post(SATUAN_SEARCH, payload, HEADER)
 			.then(res => res)
 			.catch((error) => error.response);
 		if (result && result.data && result.data.code == 200) {
@@ -218,7 +222,7 @@ const Satuan = ({ params }) => {
 	const onConfirmDelete = async () => {
 		let url = SATUAN_DELETE(idDelete);
 
-		const result = await axios.delete(url, config)
+		const result = await axios.delete(url, HEADER)
 			.then(res => res)
 			.catch((error) => error.response);
 

From eebe4834448ee0823a3ec32221dfa368692d4d36 Mon Sep 17 00:00:00 2001
From: root <root@db2.oslog.id>
Date: Wed, 22 Nov 2023 16:31:32 +0700
Subject: [PATCH 3/3] update Url

---
 src/views/Dashboard/DashboardProjectCarousell.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/Dashboard/DashboardProjectCarousell.js b/src/views/Dashboard/DashboardProjectCarousell.js
index 64e9f94..4378a39 100644
--- a/src/views/Dashboard/DashboardProjectCarousell.js
+++ b/src/views/Dashboard/DashboardProjectCarousell.js
@@ -272,7 +272,7 @@ const DashboardProject = (args) => {
     let URL_GANTT = "";
     let version_gantt = "";
     item.project.gantt.map((itemGantt, index) => {
-      URL_GANTT = `http://localhost:8444/adw-gantt/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${itemGantt.gantt_id}&proyek_id=${itemGantt.proyek_id}&token=${token}&ro=1`;
+      URL_GANTT = `https://konstruksi-gantt.ospro.id/view-mode/index.html?base_url=${BASE_OSPRO}/api&gantt_id=${itemGantt.gantt_id}&proyek_id=${itemGantt.proyek_id}&token=${token}&ro=1`;
       version_gantt = itemGantt.name_version
     });
     const today = moment();