refactor(okms): use okms instead of domain

ref: #MANAGER-19656

Signed-off-by: Romain Jamet <[email protected]>

Author: Romain Jamet

packages/manager/apps/key-management-service/public/translations/secret-manager/Messages_fr_FR.json

@@ -4,20 +4,20 @@
   "activated": "Activé",
   "add_new_version": "Ajouter une nouvelle version",
   "add_new_version_error": "Une erreur est survenue lors de la création de la version",
-  "back_to_domain_list": "Retour à la liste de domaines",
+  "back_to_okms_list": "Retour à la liste des domaines OKMS",
   "back_to_secret_list": "Retour à la liste des secrets",
   "cas_with_description": "CAS (Check-And-Set Version Control)",
   "cas_with_description_tooltip": "Avec le CAS activé, il est nécessaire de systématiquement préciser le numéro de version actuelle lors des modifications.",
   "create_a_secret": "Créer un secret",
-  "create_domain_success": "Votre domain a été créé avec succès.",
-  "create_domain_tc_confirm_label": "J'ai pris connaissance et j'accepte les conditions générales, l'annexe relative au traitement des données personnelles et les conditions particulières de services d'OVH.",
-  "create_domain_tc_description": "Pour activer votre région il est nécessaire de créer un domaine OKMS. Souhaitez-vous continuer l'activation de votre région ?",
-  "create_domain_tc_title": "Activation de la région",
-  "create_secret_form_domain_section_title": "1. Sélection du domaine",
-  "create_secret_form_domain_selector_title": "Sélectionnez un domaine",
-  "create_secret_form_payment_section_title": "3. Moyen de paiement",
+  "create_okms_success": "Votre domaine OKMS a été créé avec succès.",
+  "create_okms_terms_and_conditions_confirm_label": "J'ai pris connaissance et j'accepte les conditions générales, l'annexe relative au traitement des données personnelles et les conditions particulières de services d'OVH.",
+  "create_okms_terms_and_conditions_description": "Pour activer votre région il est nécessaire de créer un domaine OKMS. Souhaitez-vous continuer l'activation de votre région ?",
+  "create_okms_terms_and_conditions_title": "Activation de la région",
+  "create_secret_form_region_section_title": "1. Sélection de la région",
   "create_secret_form_region_selector_title": "Sélectionnez une région",
+  "create_secret_form_okms_selector_title": "Sélectionnez un domaine OKMS",
   "create_secret_form_secret_section_title": "2. Configuration du secret",
+  "create_secret_form_payment_section_title": "3. Moyen de paiement",
   "custom_metadata_title": "Custom Metadata",
   "deactivate_version_after": "Durée d'expiration d'une version",
   "delete_secret": "Supprimer le secret",
@@ -26,8 +26,8 @@
   "delete_secret_success": "Votre secret a été supprimé avec succès",
   "delete_version_modal_description": "Êtes-vous sûr de vouloir supprimer cette version ? Cette action est irréversible.",
   "delete_version_modal_title": "Supprimer la version {{versionId}}",
-  "domain_activation_in_progress": "Veuillez patienter, création en cours.",
-  "domains_list": "Liste de domaines",
+  "okms_activation_in_progress": "Veuillez patienter, création en cours.",
+  "okms_list": "Liste de domaines OKMS",
   "editor": "Éditeur",
   "error_invalid_json": "JSON non valide",
   "error_path_allowed_characters": "Le path ne peut contenir que les caractères suivants: A-Z a-z 0-9 . _ : / = @ et -",

packages/manager/apps/key-management-service/src/common/components/okmsDatagrid/ListingCells.component.tsx

@@ -31,7 +31,7 @@ export const DatagridCellName = (
 
   const urls: Record<OkmsDatagridType, string> = {
     kms: KMS_ROUTES_URLS.kmsDashboard(okms.id),
-    'secret-manager': SECRET_MANAGER_ROUTES_URLS.secretListing(okms.id),
+    'secret-manager': SECRET_MANAGER_ROUTES_URLS.secretList(okms.id),
   };
   const tracking: Record<OkmsDatagridType, string> = {
     kms: 'go-to-kms',

packages/manager/apps/key-management-service/src/common/pages/OrderOkmsModal/OrderOkmsModal.page.spec.tsx

@@ -177,7 +177,9 @@ describe('Order Okms Modal test suite', () => {
       await renderOrderOkmsModal();
 
       // THEN
-      await assertTextVisibility(labels.secretManager.create_domain_tc_title);
+      await assertTextVisibility(
+        labels.secretManager.create_okms_terms_and_conditions_title,
+      );
     });
 
     it('should display a notification and a retry button on error', async () => {
@@ -212,9 +214,11 @@ describe('Order Okms Modal test suite', () => {
       await renderOrderOkmsModal();
 
       // THEN
-      await assertTextVisibility(labels.secretManager.create_domain_tc_title);
       await assertTextVisibility(
-        labels.secretManager.create_domain_tc_description,
+        labels.secretManager.create_okms_terms_and_conditions_title,
+      );
+      await assertTextVisibility(
+        labels.secretManager.create_okms_terms_and_conditions_description,
       );
 
       mockedContracts.forEach(async (contract) => {
@@ -241,7 +245,9 @@ describe('Order Okms Modal test suite', () => {
     it('should enable confirm button on condition approval', async () => {
       // GIVEN
       await renderOrderOkmsModal();
-      await assertTextVisibility(labels.secretManager.create_domain_tc_title);
+      await assertTextVisibility(
+        labels.secretManager.create_okms_terms_and_conditions_title,
+      );
 
       // WHEN
       await clickOnConfirmCheckbox();
@@ -262,7 +268,9 @@ describe('Order Okms Modal test suite', () => {
       );
 
       await renderOrderOkmsModal();
-      await assertTextVisibility(labels.secretManager.create_domain_tc_title);
+      await assertTextVisibility(
+        labels.secretManager.create_okms_terms_and_conditions_title,
+      );
 
       // WHEN
       await clickOnConfirmCheckbox();
@@ -282,7 +290,9 @@ describe('Order Okms Modal test suite', () => {
 
       // GIVEN - Use fast default mock
       await renderOrderOkmsModal();
-      await assertTextVisibility(labels.secretManager.create_domain_tc_title);
+      await assertTextVisibility(
+        labels.secretManager.create_okms_terms_and_conditions_title,
+      );
 
       // WHEN
       await clickOnConfirmCheckbox();
@@ -312,7 +322,9 @@ describe('Order Okms Modal test suite', () => {
       mockedPostOrderCartCartIdCheckout.mockRejectedValueOnce(mockError);
 
       await renderOrderOkmsModal();
-      await assertTextVisibility(labels.secretManager.create_domain_tc_title);
+      await assertTextVisibility(
+        labels.secretManager.create_okms_terms_and_conditions_title,
+      );
 
       // WHEN
       await clickOnConfirmCheckbox();

packages/manager/apps/key-management-service/src/common/pages/OrderOkmsModal/OrderOkmsModal.page.tsx

@@ -66,9 +66,11 @@ const TermsAndConditions = ({
   return (
     <>
       <div className="flex flex-col gap-3 pb-6">
-        <OdsText preset="heading-4">{t('create_domain_tc_title')}</OdsText>
+        <OdsText preset="heading-4">
+          {t('create_okms_terms_and_conditions_title')}
+        </OdsText>
         <OdsText preset="paragraph">
-          {t('create_domain_tc_description')}
+          {t('create_okms_terms_and_conditions_description')}
         </OdsText>
         <div className="flex flex-col gap-2">
           {cart.contractList.map(({ name, url }) => (
@@ -91,7 +93,7 @@ const TermsAndConditions = ({
           />
           <label className="cursor-pointer" htmlFor="confirm-contract">
             <OdsText preset="span">
-              {t('create_domain_tc_confirm_label')}
+              {t('create_okms_terms_and_conditions_confirm_label')}
             </OdsText>
           </label>
         </div>

packages/manager/apps/key-management-service/src/data/hooks/useOkms.ts

@@ -19,7 +19,7 @@ export const useOkmsById = (okmsId: string) => {
  * okms list hook
  *
  * @description only use this hook to manage side-effects on the UI (region selector, back button, redirection).
- * for the domain datagrid, use `useOkmsDatagridList`
+ * for the okms list datagrid, use `useOkmsDatagridList`
  */
 export const useOkmsList = (
   options: Partial<UseQueryOptions<OKMS[], ErrorResponse>> = {},

packages/manager/apps/key-management-service/src/mocks/kms/okms.mock.ts

@@ -10,7 +10,7 @@ type OkmsByRegion = {
   okmsMock?: OKMS[];
 };
 
-export const kmsRoubaix1Mock: OKMS = {
+export const okmsRoubaix1Mock: OKMS = {
   iam: {
     displayName: 'kms-roubaix-1',
     id: '5c7d984a-e0c9-4d40-942a-2b6c1a3b11b5',
@@ -26,7 +26,7 @@ export const kmsRoubaix1Mock: OKMS = {
   secretCount: 2,
 };
 
-export const kmsRoubaix2Mock: OKMS = {
+export const okmsRoubaix2Mock: OKMS = {
   iam: {
     displayName: 'kms-roubaix-2',
     id: '1b4e7c8e-d1b8-4b46-a584-52c8b4b0225c',
@@ -42,7 +42,7 @@ export const kmsRoubaix2Mock: OKMS = {
   secretCount: 2,
 };
 
-export const kmsStrasbourg1Mock: OKMS = {
+export const okmsStrasbourg1Mock: OKMS = {
   iam: {
     displayName: 'kms-strasbourg-1',
     id: '331b05a0-2963-4f42-9e85-0474e4a5b265',
@@ -60,18 +60,18 @@ export const kmsStrasbourg1Mock: OKMS = {
 
 export const regionWithMultipleOkms: OkmsByRegion = {
   region: REGION_EU_WEST_RBX,
-  okmsMock: [kmsRoubaix1Mock, kmsRoubaix2Mock],
+  okmsMock: [okmsRoubaix1Mock, okmsRoubaix2Mock],
 };
 
 export const regionWithOneOkms: OkmsByRegion = {
   region: REGION_EU_WEST_SBG,
-  okmsMock: [kmsStrasbourg1Mock],
+  okmsMock: [okmsStrasbourg1Mock],
 };
 
 export const regionWithoutOkms: OkmsByRegion = { region: REGION_CA_EAST_BHS };
 
 export const okmsMock: OKMS[] = [
-  kmsRoubaix1Mock,
-  kmsRoubaix2Mock,
-  kmsStrasbourg1Mock,
+  okmsRoubaix1Mock,
+  okmsRoubaix2Mock,
+  okmsStrasbourg1Mock,
 ];

packages/manager/apps/key-management-service/src/modules/secret-manager/components/breadcrumb/index.ts

@@ -1,10 +1,10 @@
-import { DomainBreadcrumbItem } from './items/DomainBreadcrumbItem.component';
+import { OkmsBreadcrumbItem } from './items/OkmsBreadcrumbItem.component';
 import { RootBreadcrumbItem } from './items/RootBreadcrumbItem.component';
 import { CreateSecretBreadcrumbItem } from './items/CreateSecretBreadcrumbItem.component';
 import { SecretBreadcrumbItem } from './items/SecretBreadcrumbItem.component';
 
 export {
-  DomainBreadcrumbItem,
+  OkmsBreadcrumbItem,
   RootBreadcrumbItem,
   CreateSecretBreadcrumbItem,
   SecretBreadcrumbItem,

packages/manager/apps/key-management-service/src/modules/secret-manager/components/breadcrumb/items/CreateSecretBreadcrumbItem.component.tsx

@@ -17,7 +17,7 @@ export const CreateSecretBreadcrumbItem = () => {
       data-testid={CREATE_SECRET_BREADCRUMB_ITEM_TEST_ID}
       key={SECRET_MANAGER_ROUTES_URIS.root}
       label={t('create_a_secret')}
-      onClick={() => navigate(SECRET_MANAGER_ROUTES_URLS.secretCreate)}
+      onClick={() => navigate(SECRET_MANAGER_ROUTES_URLS.createSecret)}
       href={null}
     />
   );

packages/manager/apps/key-management-service/src/modules/secret-manager/components/breadcrumb/items/DomainBreadcrumbItem.component.tsx

@@ -0,0 +1,39 @@
+import React from 'react';
+import { useNavigate, useParams } from 'react-router-dom';
+import { OdsBreadcrumbItem, OdsSkeleton } from '@ovhcloud/ods-components/react';
+import {
+  LocationPathParams,
+  SECRET_MANAGER_ROUTES_URLS,
+} from '@secret-manager/routes/routes.constants';
+import { OKMS_BREADCRUMB_ITEM_TEST_ID } from '@secret-manager/utils/tests/breadcrumb.constants';
+import { isLocationParamsDefined } from '@secret-manager/utils/locationParams';
+import { useOkmsById } from '@/data/hooks/useOkms';
+
+const Item = ({ okmsId }: { okmsId: string }) => {
+  const navigate = useNavigate();
+
+  const { data: okms, isPending, error } = useOkmsById(okmsId);
+
+  if (isPending)
+    return (
+      <div className="flex items-center">
+        <OdsSkeleton className="w-9" />
+      </div>
+    );
+
+  return (
+    <OdsBreadcrumbItem
+      data-testid={OKMS_BREADCRUMB_ITEM_TEST_ID}
+      key={okmsId}
+      label={error ? okmsId : okms?.data?.iam?.displayName || okmsId}
+      onClick={() => navigate(SECRET_MANAGER_ROUTES_URLS.secretList(okmsId))}
+      href={null}
+    />
+  );
+};
+
+export const OkmsBreadcrumbItem = () => {
+  const { okmsId } = useParams<LocationPathParams>();
+
+  return isLocationParamsDefined([okmsId]) ? <Item okmsId={okmsId} /> : null;
+};