feat(pci.private-network): rework on using mutation delete

ref: -1826 Signed-off-by: tsiorifamonjena <[email protected]>
ovh · Dec 6, 2024 · 6df59c7 · 6df59c7
1 parent 75f4218
commit 6df59c7
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 27 deletions.
diff --git a/packages/manager/apps/pci-private-network/public/translations/listing/Messages_fr_FR.json b/packages/manager/apps/pci-private-network/public/translations/listing/Messages_fr_FR.json
@@ -24,7 +24,5 @@
   "pci_projects_project_network_private_subnet_create": "Créer un sous-réseau",
   "pci_projects_project_network_private_ip_version": "IP Version",
   "pci_projects_project_network_private_action": "Actions",
-  "pci_projects_project_network_private_subnet_show": "Voir les sous-réseaux",
-  "ACTIVE": "actif",
-  "DISABLED": "désactivé"
+  "pci_projects_project_network_private_subnet_show": "Voir les sous-réseaux"
 }
diff --git a/...ages/manager/apps/pci-private-network/src/components/status-info/StatusInfo.component.tsx b/...ages/manager/apps/pci-private-network/src/components/status-info/StatusInfo.component.tsx
@@ -2,7 +2,6 @@ import { FC } from 'react';
 import { ODS_CHIP_SIZE } from '@ovhcloud/ods-components';
 import { ODS_THEME_COLOR_INTENT } from '@ovhcloud/ods-common-theming';
 import { OsdsChip } from '@ovhcloud/ods-components/react';
-import { useTranslation } from 'react-i18next';
 import { ResourceStatus } from '@/types/network.type';
 
 const color = {
@@ -11,19 +10,16 @@ const color = {
 };
 
 const StatusInfo: FC<{
-  label: ResourceStatus;
-}> = ({ label }) => {
-  const { t } = useTranslation('listing');
-
-  return (
-    <OsdsChip
-      className="inline-flex m-3"
-      size={ODS_CHIP_SIZE.sm}
-      color={color[label]}
-    >
-      {t(label)}
-    </OsdsChip>
-  );
-};
+  label: string;
+  status: ResourceStatus;
+}> = ({ label, status }) => (
+  <OsdsChip
+    className="inline-flex m-3"
+    size={ODS_CHIP_SIZE.sm}
+    color={color[status]}
+  >
+    {label}
+  </OsdsChip>
+);
 
 export default StatusInfo;
diff --git a/packages/manager/apps/pci-private-network/src/data/hooks/networks/useNetworks.ts b/packages/manager/apps/pci-private-network/src/data/hooks/networks/useNetworks.ts
@@ -177,8 +177,8 @@ export const useDeletePrivateNetwork = ({
   networkId,
   onError,
   onSuccess,
-}: DeletePrivateNetworkProps) => {
-  const mutation = useMutation({
+}: DeletePrivateNetworkProps) =>
+  useMutation({
     mutationFn: () => apiDeleteNetwork(projectId, region, networkId),
     onError,
     onSuccess: async () => {
@@ -189,9 +189,3 @@ export const useDeletePrivateNetwork = ({
       onSuccess();
     },
   });
-
-  return {
-    deletePrivateNetwork: () => mutation.mutate(),
-    ...mutation,
-  };
-};
diff --git a/packages/manager/apps/pci-private-network/src/hooks/useColumns/useColumns.tsx b/packages/manager/apps/pci-private-network/src/hooks/useColumns/useColumns.tsx
@@ -185,6 +185,11 @@ export function usePrivateNetworkLZColumns() {
             <DataGridTextCell>
               <StatusInfo
                 label={
+                  dhcpEnabled
+                    ? t('pci_projects_project_network_private_dhcp_active')
+                    : t('pci_projects_project_network_private_dhcp_disabled')
+                }
+                status={
                   dhcpEnabled ? ResourceStatus.ACTIVE : ResourceStatus.DISABLED
                 }
               />

diff --git a/packages/manager/apps/pci-private-network/src/pages/delete/DeleteNetwork.page.tsx b/packages/manager/apps/pci-private-network/src/pages/delete/DeleteNetwork.page.tsx
@@ -18,7 +18,7 @@ export default function DeleteLocalZone() {
 
   const onClose = () => navigate('..');
 
-  const { deletePrivateNetwork, isPending } = useDeletePrivateNetwork({
+  const { mutate: deletePrivateNetwork, isPending } = useDeletePrivateNetwork({
     projectId,
     region,
     networkId,