omar/sgeUpdated
1
0
Fork 0
forked from Abdulbari/sgeUpdated
Code Pull Requests Actions Activity

Merge pull request 'permission fixes and small fixes' (#7) from not-main into main

Browse Source 
Fix issue: BLC/sgeUpdated#4
This commit is contained in:
Khaled
2025-08-08 14:08:57 +03:00
parent c57b073581 5c0b325005
commit bc670a4dfa
5 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sge-frontend/src/navigation/horizontal/index.js
View File

@@ -52,7 +52,11 @@ export default [
title: "DataCenters.title", title: "DataCenters.title",
icon: <Home size={20} />, icon: <Home size={20} />,
navLink: "/organizasyonlar", navLink: "/organizasyonlar",
display: permissionCheck("paginate_organizations_get") ? "" : "none", display: (permissionCheck("paginate_datacenters_get") ||
permissionCheck("data_center_create") ||
permissionCheck("data_center_update") ||
permissionCheck("data_center_delete") ||
permissionCheck("data_center_read")) ? "" : "none",
}, },
{ {
id: "UserManagement", id: "UserManagement",

6
sge-frontend/src/navigation/vertical/index.js
View File

@@ -52,7 +52,11 @@ export default [
title: "DataCenters.title", title: "DataCenters.title",
icon: <Zap size={20} />, icon: <Zap size={20} />,
navLink: "/organizasyonlar", navLink: "/organizasyonlar",
display: permissionCheck("paginate_datacenters_get") ? "" : "none", display: (permissionCheck("paginate_datacenters_get") ||
permissionCheck("data_center_create") ||
permissionCheck("data_center_update") ||
permissionCheck("data_center_delete") ||
permissionCheck("data_center_read")) ? "" : "none",
}, },
{ {
id: "UserManagement", id: "UserManagement",

42
sge-frontend/src/redux/actions/dataCenter/index.js
View File

@@ -35,8 +35,9 @@ export const getDataCenters = () => {
longitude longitude
area { area {
tag tag
cityNames name
districtNames cityId
districtId
} }
projects { projects {
id id
@@ -143,7 +144,7 @@ export const createDataCenter = (dataCenterData) => {
"/graphql", "/graphql",
{ {
query: ` query: `
mutation CreateDataCenter($input: DataCenterInput!) { mutation CreateDataCenter($input: DataCenterCreateInput!) {
createDataCenter(input: $input) { createDataCenter(input: $input) {
id id
dataCenter dataCenter
@@ -155,8 +156,9 @@ export const createDataCenter = (dataCenterData) => {
longitude longitude
area { area {
tag tag
cityNames name
districtNames cityId
districtId
} }
} }
} }
@@ -227,7 +229,7 @@ export const updateDataCenter = (id, dataCenterData) => {
"/graphql", "/graphql",
{ {
query: ` query: `
mutation UpdateDataCenter($id: ID!, $input: DataCenterInput!) { mutation UpdateDataCenter($id: ID!, $input: DataCenterUpdateInput!) {
updateDataCenter(id: $id, input: $input) { updateDataCenter(id: $id, input: $input) {
id id
dataCenter dataCenter
@@ -239,8 +241,9 @@ export const updateDataCenter = (id, dataCenterData) => {
longitude longitude
area { area {
tag tag
cityNames name
districtNames cityId
districtId
} }
} }
} }
@@ -366,18 +369,10 @@ export const getDataCenterVMs = (dataCenterId) => {
id id
name name
vms { vms {
active { id
id name
name status
status power
power
}
inactive {
id
name
status
power
}
} }
} }
} }
@@ -402,12 +397,7 @@ export const getDataCenterVMs = (dataCenterId) => {
if (project.physicalMachines) { if (project.physicalMachines) {
project.physicalMachines.forEach(pm => { project.physicalMachines.forEach(pm => {
if (pm.vms) { if (pm.vms) {
if (pm.vms.active) { allVMs = allVMs.concat(pm.vms);
allVMs = allVMs.concat(pm.vms.active);
}
if (pm.vms.inactive) {
allVMs = allVMs.concat(pm.vms.inactive);
}
} }
}); });
} }

6
sge-frontend/src/router/routes/index.js
View File

@@ -27,7 +27,11 @@ const Routes = [
{ {
path: "/organizasyonlar", path: "/organizasyonlar",
component: lazy(() => import("../../views/DataCenterManagement")), component: lazy(() => import("../../views/DataCenterManagement")),
display: permissionCheck("paginate_datacenters_get"), display: permissionCheck("paginate_datacenters_get") ||
permissionCheck("data_center_create") ||
permissionCheck("data_center_update") ||
permissionCheck("data_center_delete") ||
permissionCheck("data_center_read"),
}, },
{ {
path: "/roller", path: "/roller",

2
sge-frontend/src/views/DataCenterManagement.js
View File

@@ -848,7 +848,7 @@ const DataCenterManagement = () => {
<Card> <Card>
<CardHeader className="border-bottom"> <CardHeader className="border-bottom">
<CardTitle tag="h4">{t("DataCenter.title")}</CardTitle> <CardTitle tag="h4">{t("DataCenter.title")}</CardTitle>
{permissionCheck("datacenter_create") && ( {permissionCheck("data_center_create") && (
<Button <Button
className="ml-2" className="ml-2"
color="primary" color="primary"