From 5c0b325005d09949480d07a6a729a7eceeba6f95 Mon Sep 17 00:00:00 2001
From: k3n9achi <duffali16@gmail.com>
Date: Thu, 7 Aug 2025 14:26:10 +0300
Subject: [PATCH] permission fixes and small fixes

---
 .../src/navigation/horizontal/index.js        |  6 ++-
 sge-frontend/src/navigation/vertical/index.js |  6 ++-
 .../src/redux/actions/dataCenter/index.js     | 42 +++++++------------
 sge-frontend/src/router/routes/index.js       |  6 ++-
 .../src/views/DataCenterManagement.js         |  2 +-
 5 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/sge-frontend/src/navigation/horizontal/index.js b/sge-frontend/src/navigation/horizontal/index.js
index 1f8375b..04271b6 100644
--- a/sge-frontend/src/navigation/horizontal/index.js
+++ b/sge-frontend/src/navigation/horizontal/index.js
@@ -52,7 +52,11 @@ export default [
         title: "DataCenters.title",
         icon: <Home size={20} />,
         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",
diff --git a/sge-frontend/src/navigation/vertical/index.js b/sge-frontend/src/navigation/vertical/index.js
index 0e2e4fb..fe24dbf 100644
--- a/sge-frontend/src/navigation/vertical/index.js
+++ b/sge-frontend/src/navigation/vertical/index.js
@@ -52,7 +52,11 @@ export default [
         title: "DataCenters.title",
         icon: <Zap size={20} />,
         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",
diff --git a/sge-frontend/src/redux/actions/dataCenter/index.js b/sge-frontend/src/redux/actions/dataCenter/index.js
index 941364a..8adf43a 100644
--- a/sge-frontend/src/redux/actions/dataCenter/index.js
+++ b/sge-frontend/src/redux/actions/dataCenter/index.js
@@ -35,8 +35,9 @@ export const getDataCenters = () => {
                 longitude
                 area {
                   tag
-                  cityNames
-                  districtNames
+                  name
+                  cityId
+                  districtId
                 }
                 projects {
                   id
@@ -143,7 +144,7 @@ export const createDataCenter = (dataCenterData) => {
         "/graphql",
         {
           query: `
-            mutation CreateDataCenter($input: DataCenterInput!) {
+            mutation CreateDataCenter($input: DataCenterCreateInput!) {
               createDataCenter(input: $input) {
                 id
                 dataCenter
@@ -155,8 +156,9 @@ export const createDataCenter = (dataCenterData) => {
                 longitude
                 area {
                   tag
-                  cityNames
-                  districtNames
+                  name
+                  cityId
+                  districtId
                 }
               }
             }
@@ -227,7 +229,7 @@ export const updateDataCenter = (id, dataCenterData) => {
         "/graphql",
         {
           query: `
-            mutation UpdateDataCenter($id: ID!, $input: DataCenterInput!) {
+            mutation UpdateDataCenter($id: ID!, $input: DataCenterUpdateInput!) {
               updateDataCenter(id: $id, input: $input) {
                 id
                 dataCenter
@@ -239,8 +241,9 @@ export const updateDataCenter = (id, dataCenterData) => {
                 longitude
                 area {
                   tag
-                  cityNames
-                  districtNames
+                  name
+                  cityId
+                  districtId
                 }
               }
             }
@@ -366,18 +369,10 @@ export const getDataCenterVMs = (dataCenterId) => {
                       id
                       name
                       vms {
-                        active {
-                          id
-                          name
-                          status
-                          power
-                        }
-                        inactive {
-                          id
-                          name
-                          status
-                          power
-                        }
+                        id
+                        name
+                        status
+                        power
                       }
                     }
                   }
@@ -402,12 +397,7 @@ export const getDataCenterVMs = (dataCenterId) => {
           if (project.physicalMachines) {
             project.physicalMachines.forEach(pm => {
               if (pm.vms) {
-                if (pm.vms.active) {
-                  allVMs = allVMs.concat(pm.vms.active);
-                }
-                if (pm.vms.inactive) {
-                  allVMs = allVMs.concat(pm.vms.inactive);
-                }
+                allVMs = allVMs.concat(pm.vms);
               }
             });
           }
diff --git a/sge-frontend/src/router/routes/index.js b/sge-frontend/src/router/routes/index.js
index 7ddb657..9ce00a0 100644
--- a/sge-frontend/src/router/routes/index.js
+++ b/sge-frontend/src/router/routes/index.js
@@ -27,7 +27,11 @@ const Routes = [
   {
     path: "/organizasyonlar",
     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",
diff --git a/sge-frontend/src/views/DataCenterManagement.js b/sge-frontend/src/views/DataCenterManagement.js
index 4ac0344..c344df6 100644
--- a/sge-frontend/src/views/DataCenterManagement.js
+++ b/sge-frontend/src/views/DataCenterManagement.js
@@ -848,7 +848,7 @@ const DataCenterManagement = () => {
     <Card>
       <CardHeader className="border-bottom">
         <CardTitle tag="h4">{t("DataCenter.title")}</CardTitle>
-        {permissionCheck("datacenter_create") && (
+        {permissionCheck("data_center_create") && (
           <Button
             className="ml-2"
             color="primary"