From 37dae954f81294f8424fcbb74c36a8cb87d791f2 Mon Sep 17 00:00:00 2001
From: Jonathan Perchoc <jonathan.perchoc@ovhcloud.com>
Date: Wed, 25 Sep 2024 17:28:47 +0200
Subject: [PATCH 1/8] fix: use localisation to correctly format prices

ref: DATATR-1481
Signed-off-by: Jonathan Perchoc <jonathan.perchoc@ovhcloud.com>
---
 .../translations/pricing/Messages_fr_FR.json  |  4 +-
 .../src/__tests__/helpers/mocks/user.ts       |  2 +-
 .../order/flavor/FlavorSelect.spec.tsx        | 19 ++++++++++
 .../components/order/plan/PlanSelect.spec.tsx | 19 ++++++++++
 .../components/order/plan/PlanTile.spec.tsx   | 19 ++++++++++
 .../order/price/OrderPrice.spec.tsx           | 19 ++++++++++
 .../src/components/price/Price.component.tsx  | 32 +++++++++++-----
 .../src/components/price/Price.spec.tsx       | 37 ++++++++++++++-----
 8 files changed, 129 insertions(+), 22 deletions(-)

diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_fr_FR.json b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_fr_FR.json
index 3cda061b01a6..f9727224e2cb 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_fr_FR.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_fr_FR.json
@@ -1,6 +1,6 @@
 {
-  "pricing_ht": "{{ price }} {{ unit }} HT",
-  "pricing_ttc": "{{ price }} {{ unit }} TTC",
+  "pricing_ht": "{{ price }} HT",
+  "pricing_ttc": "{{ price }} TTC",
   "pricing_button_hourly": "Heure",
   "pricing_button_monthly": "Mensuel",
   "pricing_unit_hourly": "/heure",
diff --git a/packages/manager/apps/pci-databases-analytics/src/__tests__/helpers/mocks/user.ts b/packages/manager/apps/pci-databases-analytics/src/__tests__/helpers/mocks/user.ts
index 5936b0a1c122..4efc2f5724dd 100644
--- a/packages/manager/apps/pci-databases-analytics/src/__tests__/helpers/mocks/user.ts
+++ b/packages/manager/apps/pci-databases-analytics/src/__tests__/helpers/mocks/user.ts
@@ -38,7 +38,7 @@ export const mockedUser: User = {
   nationalIdentificationNumber: 0,
   organisation: '',
   ovhCompany: '',
-  ovhSubsidiary: '',
+  ovhSubsidiary: 'FR',
   phone: '',
   phoneCountry: '',
   sex: '',
diff --git a/packages/manager/apps/pci-databases-analytics/src/components/order/flavor/FlavorSelect.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/components/order/flavor/FlavorSelect.spec.tsx
index 644ed0e4bf65..dbd02ddd8953 100644
--- a/packages/manager/apps/pci-databases-analytics/src/components/order/flavor/FlavorSelect.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/components/order/flavor/FlavorSelect.spec.tsx
@@ -11,6 +11,25 @@ import { mockedBasicOrderFunnelFlavor } from '@/__tests__/helpers/mocks/order-fu
 import { Flavor } from '@/types/orderFunnel';
 
 describe('FlavorsSelect component', () => {
+  beforeEach(() => {
+    vi.mock('@/hooks/api/catalog/useGetCatalog.hook', () => {
+      return {
+        useGetCatalog: vi.fn(() => ({
+          isSuccess: true,
+          data: {
+            locale: {
+              currencyCode: 'EUR',
+            },
+          },
+        })),
+      };
+    });
+    vi.mock('@/hooks/useLocale', () => {
+      return {
+        useLocale: vi.fn(() => 'fr_FR'),
+      };
+    });
+  });
   afterEach(() => {
     vi.clearAllMocks();
   });
diff --git a/packages/manager/apps/pci-databases-analytics/src/components/order/plan/PlanSelect.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/components/order/plan/PlanSelect.spec.tsx
index 841951ec2749..a7d781a3b9ae 100644
--- a/packages/manager/apps/pci-databases-analytics/src/components/order/plan/PlanSelect.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/components/order/plan/PlanSelect.spec.tsx
@@ -10,6 +10,25 @@ import PlansSelect from '@/components/order/plan/PlanSelect.component';
 import { mockedBasicOrderFunnelPlan } from '@/__tests__/helpers/mocks/order-funnel';
 
 describe('PlansSelect component', () => {
+  beforeEach(() => {
+    vi.mock('@/hooks/api/catalog/useGetCatalog.hook', () => {
+      return {
+        useGetCatalog: vi.fn(() => ({
+          isSuccess: true,
+          data: {
+            locale: {
+              currencyCode: 'EUR',
+            },
+          },
+        })),
+      };
+    });
+    vi.mock('@/hooks/useLocale', () => {
+      return {
+        useLocale: vi.fn(() => 'fr_FR'),
+      };
+    });
+  });
   afterEach(() => {
     vi.clearAllMocks();
   });
diff --git a/packages/manager/apps/pci-databases-analytics/src/components/order/plan/PlanTile.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/components/order/plan/PlanTile.spec.tsx
index 3bd17262bb70..97fe2db2ec8a 100644
--- a/packages/manager/apps/pci-databases-analytics/src/components/order/plan/PlanTile.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/components/order/plan/PlanTile.spec.tsx
@@ -11,6 +11,25 @@ import { mockedBasicOrderFunnelPlan } from '@/__tests__/helpers/mocks/order-funn
 import { Plan } from '@/types/orderFunnel';
 
 describe('PlanTile component', () => {
+  beforeEach(() => {
+    vi.mock('@/hooks/api/catalog/useGetCatalog.hook', () => {
+      return {
+        useGetCatalog: vi.fn(() => ({
+          isSuccess: true,
+          data: {
+            locale: {
+              currencyCode: 'EUR',
+            },
+          },
+        })),
+      };
+    });
+    vi.mock('@/hooks/useLocale', () => {
+      return {
+        useLocale: vi.fn(() => 'fr_FR'),
+      };
+    });
+  });
   afterEach(() => {
     vi.clearAllMocks();
   });
diff --git a/packages/manager/apps/pci-databases-analytics/src/components/order/price/OrderPrice.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/components/order/price/OrderPrice.spec.tsx
index bfdb603074ad..e843feb8ade5 100644
--- a/packages/manager/apps/pci-databases-analytics/src/components/order/price/OrderPrice.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/components/order/price/OrderPrice.spec.tsx
@@ -3,6 +3,25 @@ import { describe, it, vi } from 'vitest';
 import OrderPrice from '@/components/order/price/OrderPrice.component';
 
 describe('OrderPrice component', () => {
+  beforeEach(() => {
+    vi.mock('@/hooks/api/catalog/useGetCatalog.hook', () => {
+      return {
+        useGetCatalog: vi.fn(() => ({
+          isSuccess: true,
+          data: {
+            locale: {
+              currencyCode: 'EUR',
+            },
+          },
+        })),
+      };
+    });
+    vi.mock('@/hooks/useLocale', () => {
+      return {
+        useLocale: vi.fn(() => 'fr_FR'),
+      };
+    });
+  });
   afterEach(() => {
     vi.clearAllMocks();
   });
diff --git a/packages/manager/apps/pci-databases-analytics/src/components/price/Price.component.tsx b/packages/manager/apps/pci-databases-analytics/src/components/price/Price.component.tsx
index 8a07ce0d498e..de8c1bd5982a 100644
--- a/packages/manager/apps/pci-databases-analytics/src/components/price/Price.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/components/price/Price.component.tsx
@@ -1,4 +1,6 @@
 import { useTranslation } from 'react-i18next';
+import { useLocale } from '@/hooks/useLocale';
+import { useGetCatalog } from '@/hooks/api/catalog/useGetCatalog.hook';
 
 interface PriceProps {
   priceInUcents: number;
@@ -7,25 +9,37 @@ interface PriceProps {
 }
 const Price = ({ priceInUcents, taxInUcents, decimals = 2 }: PriceProps) => {
   const { t } = useTranslation('pricing');
-  const unit = '€';
+  const catalog = useGetCatalog();
+  const locale = useLocale();
+
+  if (!catalog.isSuccess) {
+    return (
+      <span
+        data-testid="pricing-skeleton"
+        className="animate-pulse rounded-md bg-muted w-40"
+      />
+    );
+  }
+
   const ucentToEur = 100_000_000;
   const price = priceInUcents / ucentToEur;
   const priceWithTax = (priceInUcents + taxInUcents) / ucentToEur;
   const formatPrice = (value: number) => {
-    if (value === 0) {
-      return '0.00';
-    }
-    // Using toFixed to get 3 decimals and convert to string
-    const formattedPrice = value.toFixed(decimals);
-    return formattedPrice;
+    const formatter = new Intl.NumberFormat(locale.replace('_', '-'), {
+      style: 'currency',
+      currency: catalog.data.locale.currencyCode,
+      minimumFractionDigits: decimals,
+      maximumFractionDigits: decimals,
+    });
+    return formatter.format(value);
   };
   return (
     <>
       <span data-testid="pricing-ht" className="font-bold">
-        {t('pricing_ht', { price: formatPrice(price), unit })}
+        {t('pricing_ht', { price: formatPrice(price) })}
       </span>{' '}
       <span data-testid="pricing-ttc" className="text-xs">
-        ({t('pricing_ttc', { price: formatPrice(priceWithTax), unit })})
+        ({t('pricing_ttc', { price: formatPrice(priceWithTax) })})
       </span>
     </>
   );
diff --git a/packages/manager/apps/pci-databases-analytics/src/components/price/Price.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/components/price/Price.spec.tsx
index 41d92d024925..318aa8151240 100644
--- a/packages/manager/apps/pci-databases-analytics/src/components/price/Price.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/components/price/Price.spec.tsx
@@ -5,11 +5,28 @@ import Price from '@/components/price/Price.component';
 vi.mock('react-i18next', () => ({
   useTranslation: () => ({
     t: (key: string, options: Record<string, string | number>): string => {
-      return `${key} ${options.price} ${options.unit}`;
+      return `${key} ${options.price}`;
     },
   }),
   Trans: ({ children }: { children: React.ReactNode }) => children,
 }));
+vi.mock('@/hooks/api/catalog/useGetCatalog.hook', () => {
+  return {
+    useGetCatalog: vi.fn(() => ({
+      isSuccess: true,
+      data: {
+        locale: {
+          currencyCode: 'EUR',
+        },
+      },
+    })),
+  };
+});
+vi.mock('@/hooks/useLocale', () => {
+  return {
+    useLocale: vi.fn(() => 'fr_FR'),
+  };
+});
 
 describe('Price component renders', () => {
   it('should display the 2 span', () => {
@@ -27,20 +44,20 @@ describe('Price component value', () => {
       <Price priceInUcents={1000000000} taxInUcents={200000000} decimals={2} />,
     );
     expect(screen.getByTestId('pricing-ht')).toHaveTextContent(
-      'pricing_ht 10.00 €',
+      'pricing_ht 10,00 €',
     );
     expect(screen.getByTestId('pricing-ttc')).toHaveTextContent(
-      '(pricing_ttc 12.00 €)',
+      '(pricing_ttc 12,00 €)',
     );
   });
 
   it('should display price without tax', () => {
     render(<Price priceInUcents={1000000000} taxInUcents={0} decimals={2} />);
     expect(screen.getByTestId('pricing-ht')).toHaveTextContent(
-      'pricing_ht 10.00 €',
+      'pricing_ht 10,00 €',
     );
     expect(screen.getByTestId('pricing-ttc')).toHaveTextContent(
-      '(pricing_ttc 10.00 €)',
+      '(pricing_ttc 10,00 €)',
     );
   });
 
@@ -49,20 +66,20 @@ describe('Price component value', () => {
       <Price priceInUcents={1000000000} taxInUcents={200000000} decimals={3} />,
     );
     expect(screen.getByTestId('pricing-ht')).toHaveTextContent(
-      'pricing_ht 10.000 €',
+      'pricing_ht 10,000 €',
     );
     expect(screen.getByTestId('pricing-ttc')).toHaveTextContent(
-      '(pricing_ttc 12.000 €)',
+      '(pricing_ttc 12,000 €)',
     );
   });
 
-  it('should display 0.00 when given 0', () => {
+  it('should display 0,00 when given 0', () => {
     render(<Price priceInUcents={0} taxInUcents={0} decimals={2} />);
     expect(screen.getByTestId('pricing-ht')).toHaveTextContent(
-      'pricing_ht 0.00 €',
+      'pricing_ht 0,00 €',
     );
     expect(screen.getByTestId('pricing-ttc')).toHaveTextContent(
-      '(pricing_ttc 0.00 €)',
+      '(pricing_ttc 0,00 €)',
     );
   });
 });

From 2ebe52010f94d14b040dc954ccddadc4172ef546 Mon Sep 17 00:00:00 2001
From: Jonathan Perchoc <jonathan.perchoc@ovhcloud.com>
Date: Wed, 25 Sep 2024 17:31:04 +0200
Subject: [PATCH 2/8] feat: add missing region translations for US

ref: DATATR-1481
Signed-off-by: Jonathan Perchoc <jonathan.perchoc@ovhcloud.com>
---
 .../public/translations/regions/Messages_fr_FR.json         | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_fr_FR.json b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_fr_FR.json
index c4ccd622b70f..59738a24785d 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_fr_FR.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_fr_FR.json
@@ -30,6 +30,10 @@
   "region_SYD_micro": "Sydney ({{ micro }})",
   "region_US": "États-Unis",
   "region_US_micro": "États-Unis ({{ micro }})",
+  "region_US-EAST-VA": "Virginie",
+  "region_US-EAST-VA_micro": "Virginie ({{ micro }})",
+  "region_US-WEST-OR": "Oregon",
+  "region_US-WEST-OR_micro": "Oregon ({{ micro }})",
   "region_GS": "GS",
   "region_MAD": "Madrid",
   "region_BRU": "Bruxelles",
@@ -70,6 +74,8 @@
   "region_continent_MUM": "Asie Pacifique",
   "region_continent_SYD": "Océanie",
   "region_continent_US": "États-Unis",
+  "region_continent_US-EAST-VA": "Amérique du Nord",
+  "region_continent_US-WEST-OR": "Amérique du Nord",
   "region_continent_SHA": "Europe de l'Ouest",
   "region_continent_all": "Toutes les localisations"
 }

From 3ea12ba22d8ceea4321532a04d71914c22a2a6d2 Mon Sep 17 00:00:00 2001
From: Jonathan Perchoc <jonathan.perchoc@ovhcloud.com>
Date: Wed, 25 Sep 2024 17:31:58 +0200
Subject: [PATCH 3/8] fix: invalidate services list query on update

ref: DATATR-1497
Signed-off-by: Jonathan Perchoc <jonathan.perchoc@ovhcloud.com>
---
 .../hooks/api/catalog/useGetCatalog.hook.tsx  |  1 +
 .../hooks/api/catalog/useGetCatalog.spec.tsx  | 10 +--
 .../service/useDeleteService.hook.tsx         | 14 +++-
 .../service/useDeleteService.spec.tsx         | 73 +------------------
 .../database/service/useEditService.hook.tsx  | 13 +++-
 .../database/service/useEditService.spec.tsx  |  6 +-
 6 files changed, 28 insertions(+), 89 deletions(-)

diff --git a/packages/manager/apps/pci-databases-analytics/src/hooks/api/catalog/useGetCatalog.hook.tsx b/packages/manager/apps/pci-databases-analytics/src/hooks/api/catalog/useGetCatalog.hook.tsx
index 1904b04c3ad5..efe4b1eabfbf 100644
--- a/packages/manager/apps/pci-databases-analytics/src/hooks/api/catalog/useGetCatalog.hook.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/hooks/api/catalog/useGetCatalog.hook.tsx
@@ -13,6 +13,7 @@ export function useGetCatalog(
   const queryKey = ['order/catalog/public/cloud', subsidiary, product];
   return useQueryImmediateRefetch({
     queryKey,
+    enabled: !!user?.ovhSubsidiary,
     queryFn: () => catalogApi.getCatalog(subsidiary, product),
     ...options,
   }) as UseQueryResult<order.publicOrder.Catalog, Error>;
diff --git a/packages/manager/apps/pci-databases-analytics/src/hooks/api/catalog/useGetCatalog.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/hooks/api/catalog/useGetCatalog.spec.tsx
index a5f21aaba297..56091e30566a 100644
--- a/packages/manager/apps/pci-databases-analytics/src/hooks/api/catalog/useGetCatalog.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/hooks/api/catalog/useGetCatalog.spec.tsx
@@ -13,15 +13,9 @@ vi.mock('@/data/api/catalog/catalog.api', () => ({
   },
 }));
 
-vi.mock('@ovh-ux/manager-react-shell-client', () => {
+vi.mock('@/hooks/useUser', () => {
   return {
-    useShell: vi.fn(() => ({
-      environment: {
-        getEnvironment: vi.fn(() => ({
-          getUser: vi.fn(() => mockedUser),
-        })),
-      },
-    })),
+    useUser: vi.fn(() => mockedUser),
   };
 });
 
diff --git a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.hook.tsx b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.hook.tsx
index d06e595e39a2..f4bec1aca908 100644
--- a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.hook.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.hook.tsx
@@ -1,4 +1,6 @@
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useParams } from 'react-router-dom';
+import * as database from '@/types/cloud/project/database';
 import { deleteService } from '@/data/api/database/service.api';
 import { CdbError, ServiceData } from '@/data/api/database';
 
@@ -8,12 +10,20 @@ interface UseDeleteService {
 }
 
 export function useDeleteService({ onError, onSuccess }: UseDeleteService) {
+  const queryClient = useQueryClient();
+  const { projectId } = useParams();
   const mutation = useMutation({
     mutationFn: (serviceInfo: ServiceData) => {
       return deleteService(serviceInfo);
     },
     onError,
-    onSuccess,
+    onSuccess: () => {
+      onSuccess();
+      // Invalidate service list query to get the latest data
+      queryClient.invalidateQueries({
+        queryKey: [projectId, 'database/service'],
+      });
+    },
   });
 
   return {
diff --git a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.spec.tsx
index 2764f233f815..9b73f7a1c1f9 100644
--- a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.spec.tsx
@@ -1,81 +1,14 @@
 import { renderHook, waitFor } from '@testing-library/react';
 import { vi } from 'vitest';
 import { useDeleteService } from './useDeleteService.hook';
-import { useEditService } from './useEditService.hook';
-import { useAddService } from './useAddService.hook';
 import * as databaseAPI from '@/data/api/database/service.api';
 import * as database from '@/types/cloud/project/database';
 import { QueryClientWrapper } from '@/__tests__/helpers/wrappers/QueryClientWrapper';
-import {
-  mockedService,
-  mockedServiceCreation,
-  mockedServiceCreationWithEngine,
-} from '@/__tests__/helpers/mocks/services';
 
 vi.mock('@/data/api/database/service.api', () => ({
-  getServices: vi.fn(),
-  getService: vi.fn(),
-  addService: vi.fn(),
-  editService: vi.fn(),
   deleteService: vi.fn(),
 }));
 
-describe('useAddService', () => {
-  it('should call useAddService on mutation with data', async () => {
-    const onSuccess = vi.fn();
-    const onError = vi.fn();
-
-    vi.mocked(databaseAPI.addService).mockResolvedValue(mockedService);
-    const { result } = renderHook(() => useAddService({ onError, onSuccess }), {
-      wrapper: QueryClientWrapper,
-    });
-
-    result.current.addService(mockedServiceCreationWithEngine);
-
-    await waitFor(() => {
-      expect(databaseAPI.addService).toHaveBeenCalledWith({
-        projectId: undefined,
-        engine: database.EngineEnum.mongodb,
-        serviceInfo: mockedServiceCreation,
-      });
-      expect(onSuccess).toHaveBeenCalledWith(mockedService);
-    });
-  });
-});
-
-describe('useEditService', () => {
-  it('should call useEditService on mutation with data', async () => {
-    const projectId = 'projectId';
-    const engine = database.EngineEnum.mysql;
-    const serviceId = 'serviceId';
-    const onSuccess = vi.fn();
-    const onError = vi.fn();
-
-    vi.mocked(databaseAPI.editService).mockResolvedValue(mockedService);
-    const { result } = renderHook(
-      () => useEditService({ onError, onSuccess }),
-      { wrapper: QueryClientWrapper },
-    );
-
-    const editServiceProps: databaseAPI.EditService = {
-      projectId,
-      engine,
-      serviceId,
-      data: mockedService,
-    };
-    result.current.editService(editServiceProps);
-
-    await waitFor(() => {
-      expect(databaseAPI.editService).toHaveBeenCalledWith(editServiceProps);
-      expect(onSuccess).toHaveBeenCalledWith(
-        mockedService,
-        editServiceProps,
-        undefined,
-      );
-    });
-  });
-});
-
 describe('useDeleteService', () => {
   it('should call useDeleteService on mutation with data', async () => {
     const projectId = 'projectId';
@@ -102,11 +35,7 @@ describe('useDeleteService', () => {
       expect(databaseAPI.deleteService).toHaveBeenCalledWith(
         deleteServiceProps,
       );
-      expect(onSuccess).toHaveBeenCalledWith(
-        undefined,
-        deleteServiceProps,
-        undefined,
-      );
+      expect(onSuccess).toHaveBeenCalledWith();
     });
   });
 });
diff --git a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.hook.tsx b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.hook.tsx
index b7d7d9bd8b5b..4b9de168c93f 100644
--- a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.hook.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.hook.tsx
@@ -1,4 +1,5 @@
-import { useMutation } from '@tanstack/react-query';
+import { useMutation, useQueryClient } from '@tanstack/react-query';
+import { useParams } from 'react-router-dom';
 import * as database from '@/types/cloud/project/database';
 import { EditService, editService } from '@/data/api/database/service.api';
 import { CdbError } from '@/data/api/database';
@@ -8,10 +9,18 @@ interface UseEditService {
   onSuccess: (service: database.Service) => void;
 }
 export function useEditService({ onError, onSuccess }: UseEditService) {
+  const queryClient = useQueryClient();
+  const { projectId } = useParams();
   const mutation = useMutation({
     mutationFn: (serviceUpdate: EditService) => editService(serviceUpdate),
     onError,
-    onSuccess,
+    onSuccess: (data: database.Service) => {
+      onSuccess(data);
+      // Invalidate service list query to get the latest data
+      queryClient.invalidateQueries({
+        queryKey: [projectId, 'database/service'],
+      });
+    },
   });
 
   return {
diff --git a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.spec.tsx
index ad465d60a0f0..fae365c80764 100644
--- a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.spec.tsx
@@ -38,11 +38,7 @@ describe('useEditService', () => {
 
     await waitFor(() => {
       expect(databaseAPI.editService).toHaveBeenCalledWith(editServiceProps);
-      expect(onSuccess).toHaveBeenCalledWith(
-        mockedService,
-        editServiceProps,
-        undefined,
-      );
+      expect(onSuccess).toHaveBeenCalledWith(mockedService);
     });
   });
 });

From 133a3cdfc30bb9a4aee940fceef0d9447da401ac Mon Sep 17 00:00:00 2001
From: Jonathan Perchoc <jonathan.perchoc@ovhcloud.com>
Date: Fri, 27 Sep 2024 16:25:00 +0200
Subject: [PATCH 4/8] fix: translate the unit provided by the api for the
 metrics (#13341)

ref: DATATR-1517

Signed-off-by: Jonathan Perchoc <jonathan.perchoc@ovhcloud.com>
---
 .../service/metrics/Messages_fr_FR.json       | 24 ++++++++++++++-----
 .../_components/MetricChart.component.tsx     | 15 ++++++++----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_fr_FR.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_fr_FR.json
index b2452d3eba63..13fc7a5d7ac0 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_fr_FR.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_fr_FR.json
@@ -8,12 +8,24 @@
   "interval-lastWeek": "1W",
   "interval-lastMonth": "1M",
   "interval-lastYear": "1Y",
-  "metricName-cpu_usage_percent": "CPU utilisé (%)",
-  "metricName-disk_usage_percent": "Espace disque utilisé (%)",
+  "metricUnit-BYTES": "octets",
+  "metricUnit-BYTES_PER_SECOND": "octets/s",
+  "metricUnit-GIGABYTES": "Go",
+  "metricUnit-GIGABYTES_PER_HOUR": "Go/s",
+  "metricUnit-MEGABYTES": "Mo",
+  "metricUnit-MEGABYTES_PER_SECOND": "Mo/s",
+  "metricUnit-MILLISECONDS": "millisecondes",
+  "metricUnit-PERCENT": "%",
+  "metricUnit-SCALAR": "scalaire",
+  "metricUnit-SCALAR_PER_SECOND": "scalaire/s",
+  "metricUnit-SECONDS": "secondes",
+  "metricUnit-UNKNOWN": "inconnu",
+  "metricName-cpu_usage_percent": "CPU utilisé ({{unit}})",
+  "metricName-disk_usage_percent": "Espace disque utilisé ({{unit}})",
   "metricName-diskio_read": "Nb d'IOPS (lecture)",
   "metricName-diskio_writes": "Nb d'IOPS (écriture)",
-  "metricName-mem_usage_percent": "Mémoire utilisée (%)",
-  "metricName-mem_usage": "Mémoire utilisée (Mo)",
-  "metricName-net_receive": "Réception réseau (Mo/s)",
-  "metricName-net_send": "Transmission réseau (Mo/s)"
+  "metricName-mem_usage_percent": "Mémoire utilisée ({{unit}})",
+  "metricName-mem_usage": "Mémoire utilisée ({{unit}})",
+  "metricName-net_receive": "Réception réseau ({{unit}})",
+  "metricName-net_send": "Transmission réseau ({{unit}})"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/metrics/_components/MetricChart.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/metrics/_components/MetricChart.component.tsx
index c22d14b36da2..35a190b59942 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/metrics/_components/MetricChart.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/metrics/_components/MetricChart.component.tsx
@@ -133,10 +133,17 @@ const MetricChart = ({
             },
             title: {
               display: true,
-              text: t(
-                `metricName-${metricQuery.data.name}`,
-                `${metricQuery.data.name} (${metricQuery.data.units})`,
-              ),
+              text: t(`metricName-${metricQuery.data.name}`, {
+                interpolation: { escapeValue: false },
+                defaultValue: `${metricQuery.data.name} (${t(
+                  `metricUnit-${metricQuery.data.units}`,
+                  {
+                    defaultValue: metricQuery.data.units,
+                    interpolation: { escapeValue: false },
+                  },
+                )})`,
+                unit: t(`metricUnit-${metricQuery.data.units}`),
+              }),
             },
             tooltip: {
               mode: 'index',

From 8eeba07203b6b899dfd4558507ef933cb256a905 Mon Sep 17 00:00:00 2001
From: abullet33 <106544940+abullet33@users.noreply.github.com>
Date: Wed, 9 Oct 2024 18:08:03 +0200
Subject: [PATCH 5/8] Fix/databases restore pop up not working well (#13506)

* fix(pci-databases-analytics): dashboard rework
ref:datatr-1479, datatr-1506

* fix(pci-databases-analytics): restore pop-up fixes
ref:datatr-1439

* fix(pci-databases-analytics): add terminate button for service deletion
ref:datatr-1450

* fix(pci-databases-analytics): display number of services result
ref:datatr-1484

Signed-off-by: Arthur Bullet <arthur.bullet@ovhcloud.com>
---
 .../services/service/Messages_fr_FR.json      |  1 +
 .../service/backups/Messages_fr_FR.json       |  2 +-
 .../service/dashboard/Messages_fr_FR.json     |  1 +
 .../src/components/ui/data-table.tsx          | 11 ++++-
 .../src/configuration/polling.constants.ts    |  2 +
 .../src/pages/services/Services.spec.tsx      | 12 +++++
 .../_components/DeleteService.component.tsx   | 18 ++++++-
 .../[serviceId]/backups/Backups.page.tsx      |  6 ++-
 .../[serviceId]/dashboard/Dashboard.page.tsx  | 47 +++++++++++--------
 .../_components/ServiceConfiguration.spec.tsx | 12 +++++
 .../ServiceListTable.component.tsx            |  7 ++-
 11 files changed, 93 insertions(+), 26 deletions(-)

diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_fr_FR.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_fr_FR.json
index ec10a75be839..5e2d54e78647 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_fr_FR.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_fr_FR.json
@@ -25,6 +25,7 @@
   "deleteServiceToastSuccessDescription": "Le service a été supprimé",
   "deleteServiceTitle": "Supprimer le service",
   "deleteServiceDescription": "Etes-vous sur de vouloir supprimer le service {{name}}?",
+  "deleteServiceConfirmation": "Entrez « TERMINATE » pour confirmer votre choix.",
   "deleteServiceButtonCancel": "Annuler",
   "deleteServiceButtonConfirm": "Supprimer",
   "deleteServiceIntegrationDescription": "Supprimer ce service entrainera la suppression de l'association d'intégration suivante :",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_fr_FR.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_fr_FR.json
index 17c6bf8886e4..c446601fb1c8 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_fr_FR.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_fr_FR.json
@@ -17,7 +17,7 @@
   "actionRestore": "Restaurer",
   "restoreBackupToastErrorTitle": "Une erreur est survenue lors de la restauration de votre service",
   "restoreBackupToastSuccessTitle": "Succès",
-  "restoreBackupToastSuccessDescription": "La restauration de votre service a été effectuée avec succès",
+  "restoreBackupToastSuccessDescription": "La restauration du service a été prise en compte et débutera sous peu.",
   "errorSourceTypeFieldInvalid": "Ce type de point de restauration n'est pas disponible pour ce service",
   "errorSourcePITFieldInvalidDate": "La date choisie n'est pas valide",
   "errorSourceBackupFieldEmpty": "Veuillez choisir un backup",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_fr_FR.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_fr_FR.json
index 02afca80ad54..74a01f570c61 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_fr_FR.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_fr_FR.json
@@ -28,6 +28,7 @@
   "noMaintenanceLink": "Plannifier mes futures maintenances",
   "maintenanceLink": "Gérer et plannifier mes maintenances",
   "networkTitle": "Réseau utilisé",
+  "networkPublicTitle": "Réseau public (internet)",
   "networkLink": "Réseau privée: vRack n°{{vrack}}",
   "priceBillingTitle": "Support & Facturation",
   "serviceIdLabel": "Id du service",
diff --git a/packages/manager/apps/pci-databases-analytics/src/components/ui/data-table.tsx b/packages/manager/apps/pci-databases-analytics/src/components/ui/data-table.tsx
index a71a1c699516..a7d6ce4e7ee6 100644
--- a/packages/manager/apps/pci-databases-analytics/src/components/ui/data-table.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/components/ui/data-table.tsx
@@ -25,14 +25,21 @@ import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '.
 
 interface DataTablePaginationProps<TData> {
   table: TanStackTable<TData>
+  itemNumber?: number
 }
 export function DataTablePagination<TData>({
   table,
+  itemNumber,
 }: DataTablePaginationProps<TData>) {
   return (
     <div className="flex justify-end mt-4">
       <div className="flex items-center">
         <div className="flex items-center space-x-2">
+        {itemNumber > 0 && (
+          <div className="flex px-4 items-center justify-center text-sm font-medium">
+            <span>{itemNumber} Results</span>
+          </div>
+        )}
           <Select
             value={`${table.getState().pagination.pageSize}`}
             onValueChange={(value) => {
@@ -102,12 +109,14 @@ interface DataTableProps<TData, TValue> {
   columns: ColumnDef<TData, TValue>[];
   data: TData[];
   pageSize?: number;
+  itemNumber?: number;
 }
 
 export function DataTable<TData, TValue>({
   columns,
   data,
   pageSize,
+  itemNumber,
 }: DataTableProps<TData, TValue>) {
   const [sorting, setSorting] = useState<SortingState>([]);
   const table = useReactTable({
@@ -178,7 +187,7 @@ export function DataTable<TData, TValue>({
           </TableBody>
         </Table>
       </div>
-      <DataTablePagination table={table} />
+      <DataTablePagination table={table} itemNumber={itemNumber} />
     </>
   );
 }
diff --git a/packages/manager/apps/pci-databases-analytics/src/configuration/polling.constants.ts b/packages/manager/apps/pci-databases-analytics/src/configuration/polling.constants.ts
index 768940abbe15..b571b69c7cf3 100644
--- a/packages/manager/apps/pci-databases-analytics/src/configuration/polling.constants.ts
+++ b/packages/manager/apps/pci-databases-analytics/src/configuration/polling.constants.ts
@@ -14,3 +14,5 @@ export const POLLING = {
 };
 
 export const USER_INACTIVITY_TIMEOUT = 5 * 60_000; // inactivity after 5 minutes
+
+export const TERMINATE_CONFIRMATION = 'TERMINATE';
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/Services.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/Services.spec.tsx
index db1fb6225460..5483f208748d 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/Services.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/Services.spec.tsx
@@ -13,6 +13,7 @@ import * as serviceApi from '@/data/api/database/service.api';
 import { RouterWithQueryClientWrapper } from '@/__tests__/helpers/wrappers/RouterWithQueryClientWrapper';
 import { mockedUser } from '@/__tests__/helpers/mocks/user';
 import { mockedService } from '@/__tests__/helpers/mocks/services';
+import { TERMINATE_CONFIRMATION } from '@/configuration/polling.constants';
 
 describe('Services List page', () => {
   beforeEach(() => {
@@ -183,8 +184,19 @@ describe('Open modals', () => {
     await openButtonInMenu('service-action-delete-button');
     await waitFor(() => {
       expect(screen.getByTestId('delete-service-modal')).toBeInTheDocument();
+      expect(
+        screen.getByTestId('delete-service-confirmation-input'),
+      ).toBeInTheDocument();
     });
     act(() => {
+      fireEvent.change(
+        screen.getByTestId('delete-service-confirmation-input'),
+        {
+          target: {
+            value: TERMINATE_CONFIRMATION,
+          },
+        },
+      );
       fireEvent.click(screen.getByTestId('delete-service-submit-button'));
     });
     await waitFor(() => {
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/DeleteService.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/DeleteService.component.tsx
index 5c84ed85ba11..13230a983785 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/DeleteService.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/DeleteService.component.tsx
@@ -1,6 +1,6 @@
 import { useParams } from 'react-router-dom';
 import { useTranslation } from 'react-i18next';
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
 import { AlertTriangle } from 'lucide-react';
 import { Button } from '@/components/ui/button';
 import {
@@ -12,6 +12,7 @@ import {
   DialogTitle,
 } from '@/components/ui/dialog';
 import { useToast } from '@/components/ui/use-toast';
+import { Input } from '@/components/ui/input';
 
 import { ModalController } from '@/hooks/useModale';
 
@@ -23,6 +24,7 @@ import { useTrackAction, useTrackPage } from '@/hooks/useTracking';
 import { TRACKING } from '@/configuration/tracking.constants';
 import { useGetIntegrations } from '@/hooks/api/database/integration/useGetIntegrations.hook';
 import { getCdbApiErrorMessage } from '@/lib/apiHelper';
+import { TERMINATE_CONFIRMATION } from '@/configuration/polling.constants';
 
 interface DeleteServiceModalProps {
   service: database.Service;
@@ -44,6 +46,7 @@ const DeleteService = ({
   const track = useTrackAction();
   const { t } = useTranslation('pci-databases-analytics/services/service');
   const toast = useToast();
+  const [confirmationInput, setConfirmationInput] = useState('');
   const integrationsQuery = useGetIntegrations(
     projectId,
     service.engine,
@@ -152,6 +155,16 @@ const DeleteService = ({
             name: service.description,
           })}
         </p>
+        <div className="flex flex-col gap-2">
+          <p>{t('deleteServiceConfirmation')}</p>
+          <Input
+            data-testid="delete-service-confirmation-input"
+            type="text"
+            onChange={(event) => {
+              setConfirmationInput(event.target.value);
+            }}
+          />
+        </div>
         <DialogFooter className="flex justify-end">
           <DialogClose asChild>
             <Button
@@ -176,7 +189,8 @@ const DeleteService = ({
             disabled={
               isPending ||
               serivcesQuery.isLoading ||
-              integrationsQuery.isLoading
+              integrationsQuery.isLoading ||
+              confirmationInput !== TERMINATE_CONFIRMATION
             }
             onClick={handleDelete}
           >
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/backups/Backups.page.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/backups/Backups.page.tsx
index 04a1a0d1b218..2f6220caf168 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/backups/Backups.page.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/backups/Backups.page.tsx
@@ -26,7 +26,7 @@ const Backups = () => {
   );
   const restoreModal = useModale('restore');
   const navigate = useNavigate();
-  const { projectId, service } = useServiceData();
+  const { projectId, service, serviceQuery } = useServiceData();
   const { isUserActive } = useUserActivityContext();
   const backupsQuery = useGetBackups(projectId, service.engine, service.id, {
     refetchInterval: isUserActive && POLLING.BACKUPS,
@@ -138,6 +138,10 @@ const Backups = () => {
           controller={restoreModal.controller}
           backup={selectedBackup}
           backups={backupsQuery.data}
+          onSuccess={() => {
+            restoreModal.close();
+            serviceQuery.refetch();
+          }}
         />
       )}
     </>
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/dashboard/Dashboard.page.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/dashboard/Dashboard.page.tsx
index 7a5cf05889a5..3be7b4212076 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/dashboard/Dashboard.page.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/dashboard/Dashboard.page.tsx
@@ -6,6 +6,7 @@ import {
   Globe2,
   HardDrive,
   MemoryStick,
+  ShieldAlert,
   ShieldCheck,
   TrafficCone,
   UserCheck,
@@ -150,8 +151,6 @@ const Dashboard = () => {
         ) : (
           <div data-testid="dashboard-metrics-skeleton">
             <Skeleton className="w-full h-[200px]" />
-            <Skeleton className="w-full h-[200px]" />
-            <Skeleton className="w-full h-[200px]" />
           </div>
         )}
       </div>
@@ -178,26 +177,34 @@ const Dashboard = () => {
           </CardHeader>
           <CardContent>
             <Maintenance />
-            {service.networkType === database.NetworkTypeEnum.private &&
-              vrackQuery.isSuccess && (
-                <div data-testid="dashboard-vrack-container">
-                  <h5 className="py-6">
-                    <ShieldCheck className="size-4 inline mr-2 text-green-500" />
-                    {t('networkTitle')}
-                  </h5>
-                  <div className="flex flex-row gap-1">
-                    <OvhLink
-                      application="dedicated"
-                      path={`#/vrack/${vrackQuery.data.id}`}
-                    >
-                      {t('networkLink', {
-                        vrack: vrackQuery.data.id,
-                      })}
-                    </OvhLink>
-                    <ArrowRight className="w-4 h-4 ml-1 mt-1 text-primary" />
+            <div data-testid="dashboard-vrack-container">
+              {service.networkType === database.NetworkTypeEnum.private ? (
+                vrackQuery.isSuccess && (
+                  <div>
+                    <h5 className="py-6">
+                      <ShieldCheck className="size-4 inline mr-2 text-green-500" />
+                      {t('networkTitle')}
+                    </h5>
+                    <div className="flex flex-row gap-1">
+                      <OvhLink
+                        application="dedicated"
+                        path={`#/vrack/${vrackQuery.data.id}`}
+                      >
+                        {t('networkLink', {
+                          vrack: vrackQuery.data.id,
+                        })}
+                      </OvhLink>
+                      <ArrowRight className="w-4 h-4 ml-1 mt-1 text-primary" />
+                    </div>
                   </div>
-                </div>
+                )
+              ) : (
+                <h5 className="py-6">
+                  <ShieldAlert className="size-4 inline mr-2 text-amber-400" />
+                  {t('networkPublicTitle')}
+                </h5>
               )}
+            </div>
           </CardContent>
         </Card>
         <Card>
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/ServiceConfiguration.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/ServiceConfiguration.spec.tsx
index e9fefd949585..f27a6cdef418 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/ServiceConfiguration.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/ServiceConfiguration.spec.tsx
@@ -29,6 +29,7 @@ import { mockedMaintenance } from '@/__tests__/helpers/mocks/maintenances';
 import { mockedUser } from '@/__tests__/helpers/mocks/user';
 import { Locale } from '@/hooks/useLocale';
 import { mockedIntegrations } from '@/__tests__/helpers/mocks/integrations';
+import { TERMINATE_CONFIRMATION } from '@/configuration/polling.constants';
 
 // Override mock to add capabilities
 const mockedService = {
@@ -321,8 +322,19 @@ describe('Open modals', () => {
     });
     await waitFor(() => {
       expect(screen.getByTestId('delete-service-modal')).toBeInTheDocument();
+      expect(
+        screen.getByTestId('delete-service-confirmation-input'),
+      ).toBeInTheDocument();
     });
     act(() => {
+      fireEvent.change(
+        screen.getByTestId('delete-service-confirmation-input'),
+        {
+          target: {
+            value: TERMINATE_CONFIRMATION,
+          },
+        },
+      );
       fireEvent.click(screen.getByTestId('delete-service-submit-button'));
     });
     await waitFor(() => {
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/_components/ServiceListTable.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/_components/ServiceListTable.component.tsx
index 332ac43b1724..4d7ab6e02690 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/_components/ServiceListTable.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/_components/ServiceListTable.component.tsx
@@ -49,7 +49,12 @@ export default function ServicesList({
 
   return (
     <>
-      <DataTable columns={columns} data={services} pageSize={25} />
+      <DataTable
+        columns={columns}
+        data={services}
+        pageSize={25}
+        itemNumber={services.length}
+      />
       {editingService && (
         <RenameService
           controller={renameModale.controller}

From 056cc646678730d614e3f2e62ef83b6019cdccd8 Mon Sep 17 00:00:00 2001
From: Arthur Bullet <arthur.bullet@ovhcloud.com>
Date: Thu, 10 Oct 2024 14:41:39 +0200
Subject: [PATCH 6/8] fix(pci-databases-analytics): remove name regex in
 database form

ref:datatr-1539
Signed-off-by: Arthur Bullet <arthur.bullet@ovhcloud.com>
---
 .../databases/_components/AddDatabase.component.tsx        | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/databases/_components/AddDatabase.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/databases/_components/AddDatabase.component.tsx
index a300696a2036..2543e0811c9f 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/databases/_components/AddDatabase.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/databases/_components/AddDatabase.component.tsx
@@ -77,11 +77,8 @@ const AddDatabase = ({
       .min(3, {
         message: t('addDatabaseErrorMinLength', { min: 1 }),
       })
-      .max(30, {
-        message: t('addDatabaseErrorMaxLength', { max: 30 }),
-      })
-      .regex(/^[A-Za-z0-9]+$/, {
-        message: t('addDatabaseErrorFormat'),
+      .max(100, {
+        message: t('addDatabaseErrorMaxLength', { max: 100 }),
       }),
   });
   // generate a form controller

From 98c4f26e8b705fdc09cb3010459c52b177d8b517 Mon Sep 17 00:00:00 2001
From: Arthur Bullet <arthur.bullet@ovhcloud.com>
Date: Thu, 10 Oct 2024 18:28:01 +0200
Subject: [PATCH 7/8] feat(pci-databases-analytics): fix pr comments

Signed-off-by: Arthur Bullet <arthur.bullet@ovhcloud.com>
---
 .../hooks/api/database/service/useDeleteService.hook.tsx | 9 ++++++---
 .../hooks/api/database/service/useDeleteService.spec.tsx | 6 +++---
 .../hooks/api/database/service/useEditService.hook.tsx   | 6 +++---
 .../hooks/api/database/service/useEditService.spec.tsx   | 6 +++---
 .../[serviceId]/_components/DeleteService.component.tsx  | 2 +-
 .../[serviceId]/_components/RenameService.component.tsx  | 2 +-
 .../_components/IpRestrictionsUpdate.component.tsx       | 2 +-
 .../_components/ServiceConfiguration.component.tsx       | 2 +-
 .../update/_components/modals/UpdateFlavor.component.tsx | 2 +-
 .../update/_components/modals/UpdatePlan.component.tsx   | 2 +-
 .../_components/modals/UpdateVersion.component.tsx       | 2 +-
 11 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.hook.tsx b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.hook.tsx
index f4bec1aca908..9f6afb1ba91b 100644
--- a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.hook.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.hook.tsx
@@ -6,10 +6,13 @@ import { CdbError, ServiceData } from '@/data/api/database';
 
 interface UseDeleteService {
   onError: (cause: CdbError) => void;
-  onSuccess: () => void;
+  onDeleteSuccess: () => void;
 }
 
-export function useDeleteService({ onError, onSuccess }: UseDeleteService) {
+export function useDeleteService({
+  onError,
+  onDeleteSuccess,
+}: UseDeleteService) {
   const queryClient = useQueryClient();
   const { projectId } = useParams();
   const mutation = useMutation({
@@ -18,7 +21,7 @@ export function useDeleteService({ onError, onSuccess }: UseDeleteService) {
     },
     onError,
     onSuccess: () => {
-      onSuccess();
+      onDeleteSuccess();
       // Invalidate service list query to get the latest data
       queryClient.invalidateQueries({
         queryKey: [projectId, 'database/service'],
diff --git a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.spec.tsx
index 9b73f7a1c1f9..665f5ac3f315 100644
--- a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useDeleteService.spec.tsx
@@ -14,13 +14,13 @@ describe('useDeleteService', () => {
     const projectId = 'projectId';
     const engine = database.EngineEnum.mysql;
     const serviceId = 'serviceId';
-    const onSuccess = vi.fn();
+    const onDeleteSuccess = vi.fn();
     const onError = vi.fn();
 
     vi.mocked(databaseAPI.deleteService).mockResolvedValue(undefined);
 
     const { result } = renderHook(
-      () => useDeleteService({ onError, onSuccess }),
+      () => useDeleteService({ onError, onDeleteSuccess }),
       { wrapper: QueryClientWrapper },
     );
 
@@ -35,7 +35,7 @@ describe('useDeleteService', () => {
       expect(databaseAPI.deleteService).toHaveBeenCalledWith(
         deleteServiceProps,
       );
-      expect(onSuccess).toHaveBeenCalledWith();
+      expect(onDeleteSuccess).toHaveBeenCalledWith();
     });
   });
 });
diff --git a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.hook.tsx b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.hook.tsx
index 4b9de168c93f..c63d1c485152 100644
--- a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.hook.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.hook.tsx
@@ -6,16 +6,16 @@ import { CdbError } from '@/data/api/database';
 
 interface UseEditService {
   onError: (cause: CdbError) => void;
-  onSuccess: (service: database.Service) => void;
+  onEditSuccess: (service: database.Service) => void;
 }
-export function useEditService({ onError, onSuccess }: UseEditService) {
+export function useEditService({ onError, onEditSuccess }: UseEditService) {
   const queryClient = useQueryClient();
   const { projectId } = useParams();
   const mutation = useMutation({
     mutationFn: (serviceUpdate: EditService) => editService(serviceUpdate),
     onError,
     onSuccess: (data: database.Service) => {
-      onSuccess(data);
+      onEditSuccess(data);
       // Invalidate service list query to get the latest data
       queryClient.invalidateQueries({
         queryKey: [projectId, 'database/service'],
diff --git a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.spec.tsx b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.spec.tsx
index fae365c80764..fd46cebadb70 100644
--- a/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.spec.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/hooks/api/database/service/useEditService.spec.tsx
@@ -19,12 +19,12 @@ describe('useEditService', () => {
     const projectId = 'projectId';
     const engine = database.EngineEnum.mysql;
     const serviceId = 'serviceId';
-    const onSuccess = vi.fn();
+    const onEditSuccess = vi.fn();
     const onError = vi.fn();
 
     vi.mocked(databaseAPI.editService).mockResolvedValue(mockedService);
     const { result } = renderHook(
-      () => useEditService({ onError, onSuccess }),
+      () => useEditService({ onError, onEditSuccess }),
       { wrapper: QueryClientWrapper },
     );
 
@@ -38,7 +38,7 @@ describe('useEditService', () => {
 
     await waitFor(() => {
       expect(databaseAPI.editService).toHaveBeenCalledWith(editServiceProps);
-      expect(onSuccess).toHaveBeenCalledWith(mockedService);
+      expect(onEditSuccess).toHaveBeenCalledWith(mockedService);
     });
   });
 });
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/DeleteService.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/DeleteService.component.tsx
index 13230a983785..7b3dee627cf7 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/DeleteService.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/DeleteService.component.tsx
@@ -93,7 +93,7 @@ const DeleteService = ({
         onError(err);
       }
     },
-    onSuccess: () => {
+    onDeleteSuccess: () => {
       track(
         TRACKING.deleteService.success(service.engine, service.nodes[0].region),
       );
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/RenameService.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/RenameService.component.tsx
index 150688d2d63e..5e534c1ea7e3 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/RenameService.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/_components/RenameService.component.tsx
@@ -61,7 +61,7 @@ const RenameService = ({
         onError(err);
       }
     },
-    onSuccess: (renamedService) => {
+    onEditSuccess: (renamedService) => {
       toast.toast({
         title: t('renameServiceToastSuccessTitle'),
         description: t('renameServiceToastSuccessDescription', {
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/IpRestrictionsUpdate.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/IpRestrictionsUpdate.component.tsx
index d0d2aa6172e5..cf1fcb5965a2 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/IpRestrictionsUpdate.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/IpRestrictionsUpdate.component.tsx
@@ -51,7 +51,7 @@ const IpsRestrictionsUpdate = ({
         description: getCdbApiErrorMessage(err),
       });
     },
-    onSuccess: (updatedService) => {
+    onEditSuccess: (updatedService) => {
       toast.toast({
         title: t('ipsUpdateSuccessTitle'),
         description: t('ipsUpdateSuccessDescription'),
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/ServiceConfiguration.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/ServiceConfiguration.component.tsx
index 980c65532bc0..8b9eced4fe51 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/ServiceConfiguration.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/_components/ServiceConfiguration.component.tsx
@@ -34,7 +34,7 @@ const ServiceConfiguration = () => {
         description: getCdbApiErrorMessage(err),
       });
     },
-    onSuccess: () => {
+    onEditSuccess: () => {
       toast.toast({
         title: t('serviceConfigurationUpdateToastSuccessTitle'),
         description: t('serviceConfigurationUpdateToastSuccessDescription'),
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdateFlavor.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdateFlavor.component.tsx
index d601cc9b3f25..97a6d30a20ea 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdateFlavor.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdateFlavor.component.tsx
@@ -79,7 +79,7 @@ const UpdateFlavorContent = ({
         onError(err);
       }
     },
-    onSuccess: (updatedService) => {
+    onEditSuccess: (updatedService) => {
       toast.toast({
         title: t('updateFlavorToastSuccessTitle'),
         description: hasStorage
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdatePlan.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdatePlan.component.tsx
index 336e83fcc6c1..79ca50e32c27 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdatePlan.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdatePlan.component.tsx
@@ -76,7 +76,7 @@ const UpdatePlanContent = ({
         onError(err);
       }
     },
-    onSuccess: (updatedService) => {
+    onEditSuccess: (updatedService) => {
       toast.toast({
         title: t('updatePlanToastSuccessTitle'),
         description: t('updatePlanToastSuccessDescription', {
diff --git a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdateVersion.component.tsx b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdateVersion.component.tsx
index 55de625b0b19..b4aafab4b930 100644
--- a/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdateVersion.component.tsx
+++ b/packages/manager/apps/pci-databases-analytics/src/pages/services/[serviceId]/settings/update/_components/modals/UpdateVersion.component.tsx
@@ -67,7 +67,7 @@ const UpdateVersionContent = ({
         onError(err);
       }
     },
-    onSuccess: (updatedService) => {
+    onEditSuccess: (updatedService) => {
       toast.toast({
         title: t('updateVersionToastSuccessTitle'),
         description: t('updateVersionToastSuccessDescription', {

From 3aea5b61c50ad5e02d822b9b4e385e6958c870ef Mon Sep 17 00:00:00 2001
From: CDS Translator Agent <arthur.bullet@ovhcloud.com>
Date: Tue, 15 Oct 2024 09:18:52 +0000
Subject: [PATCH 8/8] fix(pci-databases-analytics): merge translation file

Signed-off-by: Arthur Bullet <arthur.bullet@ovhcloud.com>
---
 .../services/service/Messages_de_DE.json      |  3 ++-
 .../services/service/Messages_en_GB.json      |  3 ++-
 .../services/service/Messages_es_ES.json      |  3 ++-
 .../services/service/Messages_fr_CA.json      |  1 +
 .../services/service/Messages_it_IT.json      |  3 ++-
 .../services/service/Messages_pl_PL.json      |  3 ++-
 .../services/service/Messages_pt_PT.json      |  3 ++-
 .../service/backups/Messages_de_DE.json       |  2 +-
 .../service/backups/Messages_en_GB.json       |  2 +-
 .../service/backups/Messages_es_ES.json       |  2 +-
 .../service/backups/Messages_fr_CA.json       |  2 +-
 .../service/backups/Messages_it_IT.json       |  2 +-
 .../service/backups/Messages_pl_PL.json       |  2 +-
 .../service/backups/Messages_pt_PT.json       |  2 +-
 .../service/dashboard/Messages_de_DE.json     |  1 +
 .../service/dashboard/Messages_en_GB.json     |  1 +
 .../service/dashboard/Messages_es_ES.json     |  1 +
 .../service/dashboard/Messages_fr_CA.json     |  1 +
 .../service/dashboard/Messages_it_IT.json     |  1 +
 .../service/dashboard/Messages_pl_PL.json     |  1 +
 .../service/dashboard/Messages_pt_PT.json     |  1 +
 .../service/metrics/Messages_de_DE.json       | 24 ++++++++++++++-----
 .../service/metrics/Messages_en_GB.json       | 24 ++++++++++++++-----
 .../service/metrics/Messages_es_ES.json       | 24 ++++++++++++++-----
 .../service/metrics/Messages_fr_CA.json       | 24 ++++++++++++++-----
 .../service/metrics/Messages_it_IT.json       | 24 ++++++++++++++-----
 .../service/metrics/Messages_pl_PL.json       | 24 ++++++++++++++-----
 .../service/metrics/Messages_pt_PT.json       | 24 ++++++++++++++-----
 .../translations/pricing/Messages_de_DE.json  |  4 ++--
 .../translations/pricing/Messages_en_GB.json  |  4 ++--
 .../translations/pricing/Messages_es_ES.json  |  4 ++--
 .../translations/pricing/Messages_fr_CA.json  |  4 ++--
 .../translations/pricing/Messages_it_IT.json  |  4 ++--
 .../translations/pricing/Messages_pl_PL.json  |  4 ++--
 .../translations/pricing/Messages_pt_PT.json  |  4 ++--
 .../translations/regions/Messages_de_DE.json  |  8 ++++++-
 .../translations/regions/Messages_en_GB.json  |  8 ++++++-
 .../translations/regions/Messages_es_ES.json  |  8 ++++++-
 .../translations/regions/Messages_fr_CA.json  |  6 +++++
 .../translations/regions/Messages_it_IT.json  |  8 ++++++-
 .../translations/regions/Messages_pl_PL.json  |  8 ++++++-
 .../translations/regions/Messages_pt_PT.json  |  8 ++++++-
 42 files changed, 215 insertions(+), 75 deletions(-)

diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_de_DE.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_de_DE.json
index 360478891aad..f6fa8fa9cd97 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_de_DE.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_de_DE.json
@@ -28,5 +28,6 @@
   "deleteServiceButtonCancel": "Abbrechen",
   "deleteServiceButtonConfirm": "Löschen",
   "deleteServiceIntegrationDescription": "Wenn Sie diesen Dienst löschen, wird die folgende Integrationszuordnung gelöscht:",
-  "deleteServiceIntegrationsDescription": "Wenn Sie diesen Dienst löschen, werden die folgenden Integrationszuordnungen gelöscht:"
+  "deleteServiceIntegrationsDescription": "Wenn Sie diesen Dienst löschen, werden die folgenden Integrationszuordnungen gelöscht:",
+  "deleteServiceConfirmation": "Geben Sie „TERMINATE“ ein, um Ihre Auswahl zu bestätigen."
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_en_GB.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_en_GB.json
index 0c0a41415f2a..bfab4491fd2a 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_en_GB.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_en_GB.json
@@ -28,5 +28,6 @@
   "deleteServiceButtonCancel": "Cancel",
   "deleteServiceButtonConfirm": "Delete",
   "deleteServiceIntegrationDescription": "Deleting this service will delete the following integration association:",
-  "deleteServiceIntegrationsDescription": "Deleting this service will delete the following integration associations:"
+  "deleteServiceIntegrationsDescription": "Deleting this service will delete the following integration associations:",
+  "deleteServiceConfirmation": "Enter “TERMINATE” to confirm your choice."
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_es_ES.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_es_ES.json
index 091deba78283..397b783ae97c 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_es_ES.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_es_ES.json
@@ -28,5 +28,6 @@
   "deleteServiceButtonCancel": "Cancelar",
   "deleteServiceButtonConfirm": "Eliminar",
   "deleteServiceIntegrationDescription": "Si elimina este servicio, también se eliminará la siguiente asociación de integración:",
-  "deleteServiceIntegrationsDescription": "Si elimina este servicio, también se eliminarán las siguientes asociaciones de integración:"
+  "deleteServiceIntegrationsDescription": "Si elimina este servicio, también se eliminarán las siguientes asociaciones de integración:",
+  "deleteServiceConfirmation": "Introduzca «TERMINATE» para confirmar su elección."
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_fr_CA.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_fr_CA.json
index ec10a75be839..5e2d54e78647 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_fr_CA.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_fr_CA.json
@@ -25,6 +25,7 @@
   "deleteServiceToastSuccessDescription": "Le service a été supprimé",
   "deleteServiceTitle": "Supprimer le service",
   "deleteServiceDescription": "Etes-vous sur de vouloir supprimer le service {{name}}?",
+  "deleteServiceConfirmation": "Entrez « TERMINATE » pour confirmer votre choix.",
   "deleteServiceButtonCancel": "Annuler",
   "deleteServiceButtonConfirm": "Supprimer",
   "deleteServiceIntegrationDescription": "Supprimer ce service entrainera la suppression de l'association d'intégration suivante :",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_it_IT.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_it_IT.json
index a0bac8c1d55f..9d82fca840d7 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_it_IT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_it_IT.json
@@ -28,5 +28,6 @@
   "deleteServiceButtonCancel": "Annullare",
   "deleteServiceButtonConfirm": "Eliminare",
   "deleteServiceIntegrationDescription": "L'eliminazione di questo servizio comporterà la rimozione della seguente associazione di integrazione:",
-  "deleteServiceIntegrationsDescription": "L'eliminazione di questo servizio comporterà la rimozione delle seguenti associazioni di integrazione:"
+  "deleteServiceIntegrationsDescription": "L'eliminazione di questo servizio comporterà la rimozione delle seguenti associazioni di integrazione:",
+  "deleteServiceConfirmation": "Inserisci \"TERMINATE\" per confermare la scelta."
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_pl_PL.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_pl_PL.json
index d8d6fa527e53..1614cbc25f58 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_pl_PL.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_pl_PL.json
@@ -28,5 +28,6 @@
   "deleteServiceButtonCancel": "Anuluj",
   "deleteServiceButtonConfirm": "Usuń",
   "deleteServiceIntegrationDescription": "Usunięcie tej usługi spowoduje usunięcie następującego powiązania integracji:",
-  "deleteServiceIntegrationsDescription": "Usunięcie tej usługi spowoduje usunięcie następujących powiązań integracji:"
+  "deleteServiceIntegrationsDescription": "Usunięcie tej usługi spowoduje usunięcie następujących powiązań integracji:",
+  "deleteServiceConfirmation": "Wpisz \"TERMINATE\", aby potwierdzić wybór."
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_pt_PT.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_pt_PT.json
index ef15ebf544a3..0f40f80e0ea9 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_pt_PT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/Messages_pt_PT.json
@@ -28,5 +28,6 @@
   "deleteServiceButtonCancel": "Anular",
   "deleteServiceButtonConfirm": "Eliminar",
   "deleteServiceIntegrationDescription": "Ao eliminar este serviço, irá eliminar a seguinte associação de integração:",
-  "deleteServiceIntegrationsDescription": "Ao eliminar este serviço, irá eliminar as seguintes associações de integração:"
+  "deleteServiceIntegrationsDescription": "Ao eliminar este serviço, irá eliminar as seguintes associações de integração:",
+  "deleteServiceConfirmation": "Introduza « TERMINATE » para confirmar a sua escolha."
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_de_DE.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_de_DE.json
index 6abdf991c33f..3d6c6c08083c 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_de_DE.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_de_DE.json
@@ -17,7 +17,7 @@
   "actionRestore": "Wiederherstellen",
   "restoreBackupToastErrorTitle": "Bei der Wiederherstellung Ihres Dienstes ist ein Fehler aufgetreten.",
   "restoreBackupToastSuccessTitle": "Erfolgreich",
-  "restoreBackupToastSuccessDescription": "Die Wiederherstellung Ihres Dienstes wurde erfolgreich durchgeführt.",
+  "restoreBackupToastSuccessDescription": "Die Wiederherstellung des Dienstes wurde registriert und wird in Kürze gestartet.",
   "errorSourceTypeFieldInvalid": "Dieser Wiederherstellungspunkttyp ist für diesen Dienst nicht verfügbar.",
   "errorSourcePITFieldInvalidDate": "Das gewählte Datum ist ungültig.",
   "errorSourceBackupFieldEmpty": "Bitte wählen Sie ein Backup aus.",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_en_GB.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_en_GB.json
index b547839c8ac3..fc70b1a876a8 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_en_GB.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_en_GB.json
@@ -17,7 +17,7 @@
   "actionRestore": "Restore",
   "restoreBackupToastErrorTitle": "An error occurred while restoring your service",
   "restoreBackupToastSuccessTitle": "Success",
-  "restoreBackupToastSuccessDescription": "Your service has been successfully restored",
+  "restoreBackupToastSuccessDescription": "Service restoration has been processed and will begin shortly.",
   "errorSourceTypeFieldInvalid": "This restore point type is not available for this service",
   "errorSourcePITFieldInvalidDate": "The date chosen is not valid",
   "errorSourceBackupFieldEmpty": "Please choose a backup",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_es_ES.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_es_ES.json
index 59f2d62f41b9..a37b85b98045 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_es_ES.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_es_ES.json
@@ -17,7 +17,7 @@
   "actionRestore": "Restaurar",
   "restoreBackupToastErrorTitle": "Se ha producido un error al restaurar el servicio.",
   "restoreBackupToastSuccessTitle": "Realizado",
-  "restoreBackupToastSuccessDescription": "El servicio se ha restaurado correctamente.",
+  "restoreBackupToastSuccessDescription": "La restauración del servicio se ha registrado y comenzará en breve.",
   "errorSourceTypeFieldInvalid": "Este tipo de punto de restauración no está disponible para este servicio.",
   "errorSourcePITFieldInvalidDate": "La fecha seleccionada no es válida.",
   "errorSourceBackupFieldEmpty": "Seleccione un backup",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_fr_CA.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_fr_CA.json
index 17c6bf8886e4..c446601fb1c8 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_fr_CA.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_fr_CA.json
@@ -17,7 +17,7 @@
   "actionRestore": "Restaurer",
   "restoreBackupToastErrorTitle": "Une erreur est survenue lors de la restauration de votre service",
   "restoreBackupToastSuccessTitle": "Succès",
-  "restoreBackupToastSuccessDescription": "La restauration de votre service a été effectuée avec succès",
+  "restoreBackupToastSuccessDescription": "La restauration du service a été prise en compte et débutera sous peu.",
   "errorSourceTypeFieldInvalid": "Ce type de point de restauration n'est pas disponible pour ce service",
   "errorSourcePITFieldInvalidDate": "La date choisie n'est pas valide",
   "errorSourceBackupFieldEmpty": "Veuillez choisir un backup",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_it_IT.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_it_IT.json
index 18df2fe4dacc..c77fba74a767 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_it_IT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_it_IT.json
@@ -17,7 +17,7 @@
   "actionRestore": "Ripristinare",
   "restoreBackupToastErrorTitle": "Si è verificato un errore durante il ripristino del tuo servizio",
   "restoreBackupToastSuccessTitle": "Completato",
-  "restoreBackupToastSuccessDescription": "Il ripristino del tuo servizio è stato effettuato correttamente",
+  "restoreBackupToastSuccessDescription": "Il ripristino del servizio è stato avviato e verrà avviato a breve.",
   "errorSourceTypeFieldInvalid": "Questo tipo di punto di ripristino non è disponibile per questo servizio",
   "errorSourcePITFieldInvalidDate": "La data scelta non è valida",
   "errorSourceBackupFieldEmpty": "Scegli un backup",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_pl_PL.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_pl_PL.json
index f7c5070bc994..ff3aac5636a3 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_pl_PL.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_pl_PL.json
@@ -17,7 +17,7 @@
   "actionRestore": "Przywróć",
   "restoreBackupToastErrorTitle": "Wystąpił błąd podczas przywracania usługi",
   "restoreBackupToastSuccessTitle": "Operacja zakończona pomyślnie",
-  "restoreBackupToastSuccessDescription": "Przywrócenie usługi zostało wykonane",
+  "restoreBackupToastSuccessDescription": "Przywrócenie usługi zostało zarejestrowane i wkrótce się rozpocznie.",
   "errorSourceTypeFieldInvalid": "Ten typ punktu przywracania nie jest dostępny dla tej usługi",
   "errorSourcePITFieldInvalidDate": "Wybrana data jest nieprawidłowa",
   "errorSourceBackupFieldEmpty": "Wybierz backup",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_pt_PT.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_pt_PT.json
index 49f29dc9064a..35c9d6090bed 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_pt_PT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/backups/Messages_pt_PT.json
@@ -17,7 +17,7 @@
   "actionRestore": "Restaurar",
   "restoreBackupToastErrorTitle": "Ocorreu um erro aquando do restauro do seu serviço",
   "restoreBackupToastSuccessTitle": "Êxito",
-  "restoreBackupToastSuccessDescription": "O restauro do seu serviço foi efetuado com êxito",
+  "restoreBackupToastSuccessDescription": "O restauro do serviço foi tido em conta e começará em breve.",
   "errorSourceTypeFieldInvalid": "Este tipo de ponto de restauro não está disponível para este serviço",
   "errorSourcePITFieldInvalidDate": "A data escolhida não é válida",
   "errorSourceBackupFieldEmpty": "Escolha um backup",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_de_DE.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_de_DE.json
index 35112302b3e3..4ff004a52770 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_de_DE.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_de_DE.json
@@ -26,6 +26,7 @@
   "maintenanceLink": "Wartungsarbeiten verwalten und planen",
   "networkTitle": "Verwendetes Netzwerk",
   "networkLink": "Privates Netzwerk: vRack Nr. {{vrack}}",
+  "networkPublicTitle": "Öffentliches Netzwerk (Internet)",
   "priceBillingTitle": "Support und Abrechnung",
   "serviceIdLabel": "Dienst-ID",
   "serviceIdCopyToast": "Die Dienst-ID wurde kopiert.",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_en_GB.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_en_GB.json
index c17689b50319..357b8b7e4aab 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_en_GB.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_en_GB.json
@@ -26,6 +26,7 @@
   "maintenanceLink": "Manage and schedule my maintenance tasks",
   "networkTitle": "Network used",
   "networkLink": "Private network: vRack no. {{vrack}}",
+  "networkPublicTitle": "Public network (internet)",
   "priceBillingTitle": "Support &amp; Billing",
   "serviceIdLabel": "Service ID",
   "serviceIdCopyToast": "The service ID has been copied",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_es_ES.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_es_ES.json
index 5ad546989d78..42638483c3b4 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_es_ES.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_es_ES.json
@@ -26,6 +26,7 @@
   "maintenanceLink": "Gestionar y planificar mis operaciones de mantenimiento",
   "networkTitle": "Red utilizada",
   "networkLink": "Red privada: vRack n.° {{vrack}}",
+  "networkPublicTitle": "Red pública (internet)",
   "priceBillingTitle": "Soporte y facturación",
   "serviceIdLabel": "ID del servicio",
   "serviceIdCopyToast": "Se ha copiado el ID del servicio",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_fr_CA.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_fr_CA.json
index 02afca80ad54..74a01f570c61 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_fr_CA.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_fr_CA.json
@@ -28,6 +28,7 @@
   "noMaintenanceLink": "Plannifier mes futures maintenances",
   "maintenanceLink": "Gérer et plannifier mes maintenances",
   "networkTitle": "Réseau utilisé",
+  "networkPublicTitle": "Réseau public (internet)",
   "networkLink": "Réseau privée: vRack n°{{vrack}}",
   "priceBillingTitle": "Support & Facturation",
   "serviceIdLabel": "Id du service",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_it_IT.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_it_IT.json
index af3923825cb9..7939e1e7fef0 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_it_IT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_it_IT.json
@@ -26,6 +26,7 @@
   "maintenanceLink": "Gestire e pianificare le mie manutenzioni",
   "networkTitle": "Rete utilizzata",
   "networkLink": "Rete privata: vRack n°{{vrack}}",
+  "networkPublicTitle": "Rete pubblica (Internet)",
   "priceBillingTitle": "Supporto e fatturazione",
   "serviceIdLabel": "ID del servizio",
   "serviceIdCopyToast": "L'ID del servizio è stato copiato",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_pl_PL.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_pl_PL.json
index f1a17339bdda..7ff5e0ce79cc 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_pl_PL.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_pl_PL.json
@@ -26,6 +26,7 @@
   "maintenanceLink": "Zarządzaj i planuj prace konserwacyjne",
   "networkTitle": "Wykorzystana sieć",
   "networkLink": "Sieć prywatna: vRack nr {{vrack}}",
+  "networkPublicTitle": "Sieć publiczna (Internet)",
   "priceBillingTitle": "Pomoc i Płatności",
   "serviceIdLabel": "Identyfikator usługi",
   "serviceIdCopyToast": "Identyfikator usługi został skopiowany",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_pt_PT.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_pt_PT.json
index c8ded2abd805..4a234261c7bb 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_pt_PT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/dashboard/Messages_pt_PT.json
@@ -26,6 +26,7 @@
   "maintenanceLink": "Gerir e planear as minhas manutenções",
   "networkTitle": "Rede utilizada",
   "networkLink": "Rede privada: vRack n°{{vrack}}",
+  "networkPublicTitle": "Rede pública (Internet)",
   "priceBillingTitle": "Suporte &amp; Faturação",
   "serviceIdLabel": "ID do serviço",
   "serviceIdCopyToast": "O ID do serviço foi copiado",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_de_DE.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_de_DE.json
index 6e076a1f3abf..fdb7088c4f3e 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_de_DE.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_de_DE.json
@@ -8,12 +8,24 @@
   "interval-lastWeek": "1W",
   "interval-lastMonth": "1M",
   "interval-lastYear": "1Y",
-  "metricName-cpu_usage_percent": "CPU-Auslastung (%)",
-  "metricName-disk_usage_percent": "Belegter Festplattenspeicher (%)",
+  "metricName-cpu_usage_percent": "Verwendete CPU ({{unit}})",
+  "metricName-disk_usage_percent": "Verwendeter Speicherplatz ({{unit}})",
   "metricName-diskio_read": "Anzahl IOPS (Lesen)",
   "metricName-diskio_writes": "Anzahl IOPS (Schreiben)",
-  "metricName-mem_usage_percent": "Verwendeter Speicher (%)",
-  "metricName-mem_usage": "Verwendeter Speicher (MB)",
-  "metricName-net_receive": "Netzwerkempfang (MB/s)",
-  "metricName-net_send": "Netzwerkübertragung (MB/s)"
+  "metricName-mem_usage_percent": "Verwendeter Speicher ({{unit}})",
+  "metricName-mem_usage": "Verwendeter Speicher ({{unit}})",
+  "metricName-net_receive": "Netzwerkempfang ({{unit}})",
+  "metricName-net_send": "Netzwerkübertragung ({{unit}})",
+  "metricUnit-BYTES": "Bytes",
+  "metricUnit-BYTES_PER_SECOND": "Bytes/s",
+  "metricUnit-GIGABYTES": "GB",
+  "metricUnit-GIGABYTES_PER_HOUR": "GB/s",
+  "metricUnit-MEGABYTES": "MB",
+  "metricUnit-MEGABYTES_PER_SECOND": "MB/s",
+  "metricUnit-MILLISECONDS": "Millisekunden",
+  "metricUnit-PERCENT": "%",
+  "metricUnit-SCALAR": "Skalar",
+  "metricUnit-SCALAR_PER_SECOND": "Skalar/Sekunde",
+  "metricUnit-SECONDS": "Sekunden",
+  "metricUnit-UNKNOWN": "Unbekannt"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_en_GB.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_en_GB.json
index 13cbcdf1a041..81ef76817e66 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_en_GB.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_en_GB.json
@@ -8,12 +8,24 @@
   "interval-lastWeek": "1 week",
   "interval-lastMonth": "1 month",
   "interval-lastYear": "1 year",
-  "metricName-cpu_usage_percent": "CPU used (%)",
-  "metricName-disk_usage_percent": "Disk space used (%)",
+  "metricName-cpu_usage_percent": "CPU used ({{unit}})",
+  "metricName-disk_usage_percent": "Disk space used ({{unit}})",
   "metricName-diskio_read": "No. of IOPS (read)",
   "metricName-diskio_writes": "No. of IOPS (write)",
-  "metricName-mem_usage_percent": "Memory used (%)",
-  "metricName-mem_usage": "Memory Used (MB)",
-  "metricName-net_receive": "Network Reception (MB/s)",
-  "metricName-net_send": "Network Transmission (MB/s)"
+  "metricName-mem_usage_percent": "Memory used ({{unit}})",
+  "metricName-mem_usage": "Memory used ({{unit}})",
+  "metricName-net_receive": "Network reception ({{unit}})",
+  "metricName-net_send": "Network transmission ({{unit}})",
+  "metricUnit-BYTES": "bytes",
+  "metricUnit-BYTES_PER_SECOND": "bytes/sec",
+  "metricUnit-GIGABYTES": "GB",
+  "metricUnit-GIGABYTES_PER_HOUR": "Gb/s",
+  "metricUnit-MEGABYTES": "MB",
+  "metricUnit-MEGABYTES_PER_SECOND": "MB/s",
+  "metricUnit-MILLISECONDS": "milliseconds",
+  "metricUnit-PERCENT": "%",
+  "metricUnit-SCALAR": "scalar",
+  "metricUnit-SCALAR_PER_SECOND": "scalar/sec",
+  "metricUnit-SECONDS": "seconds",
+  "metricUnit-UNKNOWN": "unknown"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_es_ES.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_es_ES.json
index bb2b45525de1..f0a1eed07608 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_es_ES.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_es_ES.json
@@ -8,12 +8,24 @@
   "interval-lastWeek": "1W",
   "interval-lastMonth": "1M",
   "interval-lastYear": "1Y",
-  "metricName-cpu_usage_percent": "CPU utilizada (%)",
-  "metricName-disk_usage_percent": "Espacio en disco utilizado (%)",
+  "metricName-cpu_usage_percent": "CPU utilizada ({{unit}})",
+  "metricName-disk_usage_percent": "Espacio en disco utilizado ({{unit}})",
   "metricName-diskio_read": "N.º de IOPS (lectura)",
   "metricName-diskio_writes": "N.º de IOPS (escritura)",
-  "metricName-mem_usage_percent": "Memoria utilizada (%)",
-  "metricName-mem_usage": "Memoria utilizada (MB)",
-  "metricName-net_receive": "Recepción de red (MB/s)",
-  "metricName-net_send": "Transmisión de red (MB/s)"
+  "metricName-mem_usage_percent": "Memoria usada ({{unit}})",
+  "metricName-mem_usage": "Memoria usada ({{unit}})",
+  "metricName-net_receive": "Recepción de red ({{unit}})",
+  "metricName-net_send": "Transmisión de red ({{unit}})",
+  "metricUnit-BYTES": "bytes",
+  "metricUnit-BYTES_PER_SECOND": "bytes/s",
+  "metricUnit-GIGABYTES": "GB",
+  "metricUnit-GIGABYTES_PER_HOUR": "GB/s",
+  "metricUnit-MEGABYTES": "MB",
+  "metricUnit-MEGABYTES_PER_SECOND": "MB/s",
+  "metricUnit-MILLISECONDS": "milisegundos",
+  "metricUnit-PERCENT": "%",
+  "metricUnit-SCALAR": "escalar",
+  "metricUnit-SCALAR_PER_SECOND": "escalar/s",
+  "metricUnit-SECONDS": "segundos",
+  "metricUnit-UNKNOWN": "desconocido"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_fr_CA.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_fr_CA.json
index b2452d3eba63..13fc7a5d7ac0 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_fr_CA.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_fr_CA.json
@@ -8,12 +8,24 @@
   "interval-lastWeek": "1W",
   "interval-lastMonth": "1M",
   "interval-lastYear": "1Y",
-  "metricName-cpu_usage_percent": "CPU utilisé (%)",
-  "metricName-disk_usage_percent": "Espace disque utilisé (%)",
+  "metricUnit-BYTES": "octets",
+  "metricUnit-BYTES_PER_SECOND": "octets/s",
+  "metricUnit-GIGABYTES": "Go",
+  "metricUnit-GIGABYTES_PER_HOUR": "Go/s",
+  "metricUnit-MEGABYTES": "Mo",
+  "metricUnit-MEGABYTES_PER_SECOND": "Mo/s",
+  "metricUnit-MILLISECONDS": "millisecondes",
+  "metricUnit-PERCENT": "%",
+  "metricUnit-SCALAR": "scalaire",
+  "metricUnit-SCALAR_PER_SECOND": "scalaire/s",
+  "metricUnit-SECONDS": "secondes",
+  "metricUnit-UNKNOWN": "inconnu",
+  "metricName-cpu_usage_percent": "CPU utilisé ({{unit}})",
+  "metricName-disk_usage_percent": "Espace disque utilisé ({{unit}})",
   "metricName-diskio_read": "Nb d'IOPS (lecture)",
   "metricName-diskio_writes": "Nb d'IOPS (écriture)",
-  "metricName-mem_usage_percent": "Mémoire utilisée (%)",
-  "metricName-mem_usage": "Mémoire utilisée (Mo)",
-  "metricName-net_receive": "Réception réseau (Mo/s)",
-  "metricName-net_send": "Transmission réseau (Mo/s)"
+  "metricName-mem_usage_percent": "Mémoire utilisée ({{unit}})",
+  "metricName-mem_usage": "Mémoire utilisée ({{unit}})",
+  "metricName-net_receive": "Réception réseau ({{unit}})",
+  "metricName-net_send": "Transmission réseau ({{unit}})"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_it_IT.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_it_IT.json
index b386dc3ad507..8789ed5a80f1 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_it_IT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_it_IT.json
@@ -8,12 +8,24 @@
   "interval-lastWeek": "1W",
   "interval-lastMonth": "1 m",
   "interval-lastYear": "1 a",
-  "metricName-cpu_usage_percent": "CPU utilizzata (%)",
-  "metricName-disk_usage_percent": "Spazio disco utilizzato (%)",
+  "metricName-cpu_usage_percent": "CPU utilizzata ({{unit}})",
+  "metricName-disk_usage_percent": "Spazio disco utilizzato ({{unit}})",
   "metricName-diskio_read": "N° di IOPS (lettura)",
   "metricName-diskio_writes": "N° di IOPS (scrittura)",
-  "metricName-mem_usage_percent": "Memoria utilizzata (%)",
-  "metricName-mem_usage": "Memoria utilizzata (MB)",
-  "metricName-net_receive": "Ricezione di rete (MB/s)",
-  "metricName-net_send": "Trasmissione di rete (MB/s)"
+  "metricName-mem_usage_percent": "Memoria utilizzata ({{unit}})",
+  "metricName-mem_usage": "Memoria utilizzata ({{unit}})",
+  "metricName-net_receive": "Ricezione di rete ({{unit}})",
+  "metricName-net_send": "Trasmissione di rete ({{unit}})",
+  "metricUnit-BYTES": "byte",
+  "metricUnit-BYTES_PER_SECOND": "byte/sec",
+  "metricUnit-GIGABYTES": "GB",
+  "metricUnit-GIGABYTES_PER_HOUR": "GB/s",
+  "metricUnit-MEGABYTES": "MB",
+  "metricUnit-MEGABYTES_PER_SECOND": "MB/s",
+  "metricUnit-MILLISECONDS": "millisecondi",
+  "metricUnit-PERCENT": "%",
+  "metricUnit-SCALAR": "scalare",
+  "metricUnit-SCALAR_PER_SECOND": "scalare/sec",
+  "metricUnit-SECONDS": "secondi",
+  "metricUnit-UNKNOWN": "sconosciuto"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_pl_PL.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_pl_PL.json
index 9acd26c7083f..259d41c77b84 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_pl_PL.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_pl_PL.json
@@ -8,12 +8,24 @@
   "interval-lastWeek": "1 W",
   "interval-lastMonth": "1 M",
   "interval-lastYear": "1 Y",
-  "metricName-cpu_usage_percent": "Poziom wykorzystania procesora (%)",
-  "metricName-disk_usage_percent": "Poziom wykorzystania przestrzeni dyskowej (%)",
+  "metricName-cpu_usage_percent": "Wykorzystany procesor ({{unit}})",
+  "metricName-disk_usage_percent": "Wykorzystana przestrzeń dyskowa ({{unit}})",
   "metricName-diskio_read": "Liczba IOPS (odczyt)",
   "metricName-diskio_writes": "Liczba IOPS (zapis)",
-  "metricName-mem_usage_percent": "Wykorzystana pamięć (%)",
-  "metricName-mem_usage": "Wykorzystana pamięć (MB)",
-  "metricName-net_receive": "Odbiór danych w sieci (MB/s)",
-  "metricName-net_send": "Transmisja danych w sieci (MB/s)"
+  "metricName-mem_usage_percent": "Wykorzystana pamięć ({{unit}})",
+  "metricName-mem_usage": "Wykorzystana pamięć ({{unit}})",
+  "metricName-net_receive": "Odbiór danych w sieci ({{unit}})",
+  "metricName-net_send": "Transmisja danych w sieci ({{unit}})",
+  "metricUnit-BYTES": "bajty",
+  "metricUnit-BYTES_PER_SECOND": "bajty/s",
+  "metricUnit-GIGABYTES": "GB",
+  "metricUnit-GIGABYTES_PER_HOUR": "GB/s",
+  "metricUnit-MEGABYTES": "MB",
+  "metricUnit-MEGABYTES_PER_SECOND": "MB/s",
+  "metricUnit-MILLISECONDS": "milisekund",
+  "metricUnit-PERCENT": "%",
+  "metricUnit-SCALAR": "skalarny",
+  "metricUnit-SCALAR_PER_SECOND": "skalarny/s",
+  "metricUnit-SECONDS": "sekund",
+  "metricUnit-UNKNOWN": "nieznany"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_pt_PT.json b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_pt_PT.json
index 7344dc350014..0576bcbc8a30 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_pt_PT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pci-databases-analytics/services/service/metrics/Messages_pt_PT.json
@@ -8,12 +8,24 @@
   "interval-lastWeek": "1W",
   "interval-lastMonth": "1M",
   "interval-lastYear": "1A",
-  "metricName-cpu_usage_percent": "CPU utilizado (%)",
-  "metricName-disk_usage_percent": "Espaço de disco utilizado",
+  "metricName-cpu_usage_percent": "CPU utilizado ({{unit}})",
+  "metricName-disk_usage_percent": "Espaço de disco utilizado ({{unit}})",
   "metricName-diskio_read": "Nº de IOPS (leitura)",
   "metricName-diskio_writes": "Nº de IOPS (escrita)",
-  "metricName-mem_usage_percent": "Memória utilizada (%)",
-  "metricName-mem_usage": "Memória utilizada (MB)",
-  "metricName-net_receive": "Receção de rede (MB/s)",
-  "metricName-net_send": "Transmissão de rede (MB/s)"
+  "metricName-mem_usage_percent": "Memória utilizada ({{unit}})",
+  "metricName-mem_usage": "Memória utilizada ({{unit}})",
+  "metricName-net_receive": "Receção de rede ({{unit}})",
+  "metricName-net_send": "Transmissão de rede ({{unit}})",
+  "metricUnit-BYTES": "bytes",
+  "metricUnit-BYTES_PER_SECOND": "bytes/s",
+  "metricUnit-GIGABYTES": "GB",
+  "metricUnit-GIGABYTES_PER_HOUR": "GB/s",
+  "metricUnit-MEGABYTES": "MB",
+  "metricUnit-MEGABYTES_PER_SECOND": "MB/s",
+  "metricUnit-MILLISECONDS": "milissegundos",
+  "metricUnit-PERCENT": "%",
+  "metricUnit-SCALAR": "escalar",
+  "metricUnit-SCALAR_PER_SECOND": "escalar/s",
+  "metricUnit-SECONDS": "segundos",
+  "metricUnit-UNKNOWN": "desconhecido"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_de_DE.json b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_de_DE.json
index 2aba95f5f10c..4224fc0d1d2a 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_de_DE.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_de_DE.json
@@ -1,6 +1,6 @@
 {
-  "pricing_ht": "{{ price }} {{ unit }} zzgl. MwSt",
-  "pricing_ttc": "{{ price }} {{ unit }} inkl. MwSt",
+  "pricing_ht": "{{ price }} zzgl. MwSt",
+  "pricing_ttc": "{{ price }} inkl. MwSt",
   "pricing_button_hourly": "Uhr",
   "pricing_button_monthly": "Monatlich",
   "pricing_unit_hourly": "/Stunde",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_en_GB.json b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_en_GB.json
index 22413d5cd19d..35a1799775c7 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_en_GB.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_en_GB.json
@@ -1,6 +1,6 @@
 {
-  "pricing_ht": "{{ price }} {{ unit }} ex. VAT",
-  "pricing_ttc": "{{ price }} {{ unit }} inc. VAT",
+  "pricing_ht": "{{ price }} EX. VAT",
+  "pricing_ttc": "{{ price }} INCL. VAT",
   "pricing_button_hourly": "Hour",
   "pricing_button_monthly": "Monthly",
   "pricing_unit_hourly": "/hour",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_es_ES.json b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_es_ES.json
index 854e9e595467..8592d151408f 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_es_ES.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_es_ES.json
@@ -1,6 +1,6 @@
 {
-  "pricing_ht": "{{ price }} {{ unit }} + IVA",
-  "pricing_ttc": "{{ price }} {{ unit }} IVA incl.",
+  "pricing_ht": "{{ price }} + IVA",
+  "pricing_ttc": "{{ price }} IVA incl",
   "pricing_button_hourly": "Hora",
   "pricing_button_monthly": "Mensual",
   "pricing_unit_hourly": "/hora",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_fr_CA.json b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_fr_CA.json
index 3cda061b01a6..f9727224e2cb 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_fr_CA.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_fr_CA.json
@@ -1,6 +1,6 @@
 {
-  "pricing_ht": "{{ price }} {{ unit }} HT",
-  "pricing_ttc": "{{ price }} {{ unit }} TTC",
+  "pricing_ht": "{{ price }} HT",
+  "pricing_ttc": "{{ price }} TTC",
   "pricing_button_hourly": "Heure",
   "pricing_button_monthly": "Mensuel",
   "pricing_unit_hourly": "/heure",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_it_IT.json b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_it_IT.json
index 201a2a7b5eff..2290091ac22e 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_it_IT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_it_IT.json
@@ -1,6 +1,6 @@
 {
-  "pricing_ht": "{{ price }} {{ unit }} +IVA",
-  "pricing_ttc": "{{ price }} {{ unit }} IVA incl.",
+  "pricing_ht": "{{ price }} +IVA",
+  "pricing_ttc": "{{ price }} IVA INCL",
   "pricing_button_hourly": "Ora",
   "pricing_button_monthly": "Mensile",
   "pricing_unit_hourly": "/ora",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_pl_PL.json b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_pl_PL.json
index 63d51b9cfdb1..3958f13d69e8 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_pl_PL.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_pl_PL.json
@@ -1,6 +1,6 @@
 {
-  "pricing_ht": "{{price } {{unit}} netto",
-  "pricing_ttc": "{{price}} {{unit}} brutto",
+  "pricing_ht": "{{ price }} NETTO",
+  "pricing_ttc": "{{ price }} BRUTTO",
   "pricing_button_hourly": "Godzina",
   "pricing_button_monthly": "Abonament miesięczny",
   "pricing_unit_hourly": "/godz.",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_pt_PT.json b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_pt_PT.json
index 9a2be5026350..3e2ca4381304 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_pt_PT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/pricing/Messages_pt_PT.json
@@ -1,6 +1,6 @@
 {
-  "pricing_ht": "{{ price }} {{ unit }} s/IVA",
-  "pricing_ttc": "{{ price }} {{ unit }} c/IVA",
+  "pricing_ht": "{{ price }} s/IVA",
+  "pricing_ttc": "{{ price }} c/IVA",
   "pricing_button_hourly": "Hora",
   "pricing_button_monthly": "Mensal",
   "pricing_unit_hourly": "/hora",
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_de_DE.json b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_de_DE.json
index c998b7cd3f7f..4f847bc52f82 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_de_DE.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_de_DE.json
@@ -75,5 +75,11 @@
   "region_PAR": "Paris",
   "region_PAR_micro": "Paris ({{ micro }})",
   "region_location_PAR": "Westeuropa (Frankreich)",
-  "region_continent_PAR": "Westeuropa"
+  "region_continent_PAR": "Westeuropa",
+  "region_US-EAST-VA": "Virginia",
+  "region_US-EAST-VA_micro": "Virginia ({{ micro }})",
+  "region_US-WEST-OR": "Oregon",
+  "region_US-WEST-OR_micro": "Oregon ({{ micro }})",
+  "region_continent_US-EAST-VA": "Nordamerika",
+  "region_continent_US-WEST-OR": "Nordamerika"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_en_GB.json b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_en_GB.json
index 0a623db117f8..e4809e5eaeba 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_en_GB.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_en_GB.json
@@ -75,5 +75,11 @@
   "region_PAR": "Paris",
   "region_PAR_micro": "Paris ({{ micro }})",
   "region_location_PAR": "Western Europe (France)",
-  "region_continent_PAR": "Western Europe"
+  "region_continent_PAR": "Western Europe",
+  "region_US-EAST-VA": "Virginia",
+  "region_US-EAST-VA_micro": "Virginia ({{ micro }})",
+  "region_US-WEST-OR": "Oregon",
+  "region_US-WEST-OR_micro": "Oregon ({{ micro }})",
+  "region_continent_US-EAST-VA": "North America",
+  "region_continent_US-WEST-OR": "North America"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_es_ES.json b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_es_ES.json
index df60e18de76a..2e139692bca9 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_es_ES.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_es_ES.json
@@ -75,5 +75,11 @@
   "region_PAR": "París",
   "region_PAR_micro": "París ({{ micro }})",
   "region_location_PAR": "Europa occidental (Francia)",
-  "region_continent_PAR": "Europa occidental"
+  "region_continent_PAR": "Europa occidental",
+  "region_US-EAST-VA": "Virginia",
+  "region_US-EAST-VA_micro": "Virginia ({{ micro }})",
+  "region_US-WEST-OR": "Oregón",
+  "region_US-WEST-OR_micro": "Oregón ({{ micro }})",
+  "region_continent_US-EAST-VA": "Norteamérica",
+  "region_continent_US-WEST-OR": "Norteamérica"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_fr_CA.json b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_fr_CA.json
index c4ccd622b70f..59738a24785d 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_fr_CA.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_fr_CA.json
@@ -30,6 +30,10 @@
   "region_SYD_micro": "Sydney ({{ micro }})",
   "region_US": "États-Unis",
   "region_US_micro": "États-Unis ({{ micro }})",
+  "region_US-EAST-VA": "Virginie",
+  "region_US-EAST-VA_micro": "Virginie ({{ micro }})",
+  "region_US-WEST-OR": "Oregon",
+  "region_US-WEST-OR_micro": "Oregon ({{ micro }})",
   "region_GS": "GS",
   "region_MAD": "Madrid",
   "region_BRU": "Bruxelles",
@@ -70,6 +74,8 @@
   "region_continent_MUM": "Asie Pacifique",
   "region_continent_SYD": "Océanie",
   "region_continent_US": "États-Unis",
+  "region_continent_US-EAST-VA": "Amérique du Nord",
+  "region_continent_US-WEST-OR": "Amérique du Nord",
   "region_continent_SHA": "Europe de l'Ouest",
   "region_continent_all": "Toutes les localisations"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_it_IT.json b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_it_IT.json
index 7d7dfe99ec94..b0e8bc8efbdd 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_it_IT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_it_IT.json
@@ -75,5 +75,11 @@
   "region_PAR": "Parigi",
   "region_PAR_micro": "Parigi ({{ micro }})",
   "region_location_PAR": "Europa occidentale (Francia)",
-  "region_continent_PAR": "Europa occidentale"
+  "region_continent_PAR": "Europa occidentale",
+  "region_US-EAST-VA": "Virginia",
+  "region_US-EAST-VA_micro": "Virginia ({{ micro }})",
+  "region_US-WEST-OR": "Oregon",
+  "region_US-WEST-OR_micro": "Oregon ({{ micro }})",
+  "region_continent_US-EAST-VA": "Nord America",
+  "region_continent_US-WEST-OR": "Nord America"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_pl_PL.json b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_pl_PL.json
index a9727610fc63..6d0a390f4cb9 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_pl_PL.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_pl_PL.json
@@ -75,5 +75,11 @@
   "region_PAR": "Paryż",
   "region_PAR_micro": "Paryż ({{micro}})",
   "region_location_PAR": "Europa Zachodnia (Francja)",
-  "region_continent_PAR": "Europa Zachodnia"
+  "region_continent_PAR": "Europa Zachodnia",
+  "region_US-EAST-VA": "Wirginia",
+  "region_US-EAST-VA_micro": "Wirginia ({{ micro }})",
+  "region_US-WEST-OR": "Oregon",
+  "region_US-WEST-OR_micro": "Oregon ({{ micro }})",
+  "region_continent_US-EAST-VA": "Ameryka Północna",
+  "region_continent_US-WEST-OR": "Ameryka Północna"
 }
diff --git a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_pt_PT.json b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_pt_PT.json
index 837d3c274abc..6efad59c7ae4 100644
--- a/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_pt_PT.json
+++ b/packages/manager/apps/pci-databases-analytics/public/translations/regions/Messages_pt_PT.json
@@ -75,5 +75,11 @@
   "region_PAR": "Paris",
   "region_PAR_micro": "Paris ({{ micro }})",
   "region_location_PAR": "Europa Ocidental (França)",
-  "region_continent_PAR": "Europa Ocidental"
+  "region_continent_PAR": "Europa Ocidental",
+  "region_US-EAST-VA": "Virgínia",
+  "region_US-EAST-VA_micro": "Virgínia ({{ micro }})",
+  "region_US-WEST-OR": "Oregon",
+  "region_US-WEST-OR_micro": "Oregon ({{ micro }})",
+  "region_continent_US-EAST-VA": "América do Norte",
+  "region_continent_US-WEST-OR": "América do Norte"
 }