From f0158fbb5ad72b0154529c34126830083c1f1472 Mon Sep 17 00:00:00 2001 From: nfoufeovh Date: Tue, 28 Oct 2025 16:10:59 +0100 Subject: [PATCH 1/4] fix(web): add "ASIA" subsidiary to language overrides (#19872) ref: #DCE-78 Signed-off-by: Noemie Foufe --- .../web/client/app/domain/list/list-domain-layout.constants.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/manager/apps/web/client/app/domain/list/list-domain-layout.constants.js b/packages/manager/apps/web/client/app/domain/list/list-domain-layout.constants.js index fc5dc1d94c89..510228e1af1e 100644 --- a/packages/manager/apps/web/client/app/domain/list/list-domain-layout.constants.js +++ b/packages/manager/apps/web/client/app/domain/list/list-domain-layout.constants.js @@ -110,7 +110,7 @@ export const DOMAIN_DNSSEC_STATE_CLASS = { export const DOMAIN_COLUMN_DNSSEC = 'DNSSEC'; export const IDN_PREFIX = 'xn--'; -export const LANGUAGE_OVERRIDE = { IN: `en-IN` }; +export const LANGUAGE_OVERRIDE = { IN: `en-IN`, ASIA: `en-ASIA` }; export const MONTH_DATE_FORMAT = { month: '2-digit', From 64cfef9c0ddc65f9851598bdd63652fa801897ea Mon Sep 17 00:00:00 2001 From: Kylian Bainvel Date: Tue, 28 Oct 2025 16:36:19 +0100 Subject: [PATCH 2/4] feat(web-ongoing-operations): fix translations (#19561) fix(web-ongoing-operations): fix translations ref: #DCE-69 Signed-off-by: Kylian Bainvel --- .../public/translations/dashboard/Messages_en_GB.json | 8 ++++---- .../public/translations/dashboard/Messages_fr_CA.json | 8 ++++---- .../public/translations/dashboard/Messages_fr_FR.json | 8 ++++---- .../public/translations/dashboard/Messages_it_IT.json | 8 ++++---- .../public/translations/dashboard/Messages_pl_PL.json | 2 +- .../public/translations/dashboard/Messages_pt_PT.json | 8 ++++---- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_en_GB.json b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_en_GB.json index 54556d7b4735..e24a326eb931 100644 --- a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_en_GB.json +++ b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_en_GB.json @@ -70,7 +70,7 @@ "domain_operations_update_nicowner_click_whoisContactBilling": "Click here to change billing contact details", "domain_operations_update_nicowner_click_whoisContactTech": "Click here to change technical contact details", "domain_operations_update_nicowner_click_identityEvidence": "Provide a copy of the registrant’s identity card, driving licence, or passport (front and back).", - "tracking_transfert_domain_title": "Transfer monitoring for the domain “{{t0}}”", + "tracking_transfert_domain_title": "Transfer monitoring for the \"{{t0}}\" domain name", "tracking_transfert_last_update": "Last updated: {{t0}}", "tracking_transfert_finalized": "Your transfer is complete!", "tracking_transfert_sub_finalized": "Thank you for choosing OVHcloud!", @@ -79,7 +79,7 @@ "tracking_transfert_first_step_operation_create": "Your operation has been created.", "tracking_transfert_first_step_operation_steps": "Nine steps performed by the robot before sending the request to the register.", "tracking_transfert_second_step_title": "Verification of contact details.", - "tracking_transfert_second_step_info": "The domain will remain online during this time, until the DNS records are changed.", + "tracking_transfert_second_step_info": "The domain name will remain online during this time, until the DNS records are changed.", "tracking_transfert_second_step_mail": "You may receive an email from your previous registrar asking you to verify your contact details (this email will be sent to the address saved in WHOIS/RDAP for administrative purposes).", "tracking_transfert_second_step_validate": "Please validate transfer by following the link or steps provided in this message.", "tracking_transfert_third_step_operation_title": "Confirmation by your previous registrar", @@ -92,7 +92,7 @@ "domain_operations_progress_instructions": "How to accelerate the transfer:", "domain_operations_progress_instructions_7": "You can contact your domain’s current service provider to get their approval.", "domain_operations_progress_step_askForAuthInfo": "Incorrect auth info", - "domain_operations_upload_title": "Add documents for the “{{t0}}” domain", + "domain_operations_upload_title": "Add documents for the \"{{t0}}\" domain name", "domain_operations_upload_max_size_label": "File size limit:", "domain_operations_upload_file_label": "Browse files", "domain_operations_upload_dropzone_label": "Drag and drop files", @@ -137,7 +137,7 @@ "domain_operations_upload_error_wrong-format": "Unsupported file format", "domain_operations_update_key_validationToken": "Validation token", "domain_operations_update_key_document": "Document", - "domain_operations_update_title": "Operation update for the {{t0}} domain", + "domain_operations_update_title": "Operation update for the {{t0}} domain name", "domain_operations_nicOperation_ContactControlNotify": "Contact verification notification", "domain_operations_nicOperation_DomainSendRDRPNotice": "Sending the RDRP instruction manual", "domain_operations_guides": "General information", diff --git a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_fr_CA.json b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_fr_CA.json index b5ace6e43621..3e712339339b 100644 --- a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_fr_CA.json +++ b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_fr_CA.json @@ -76,7 +76,7 @@ "domain_operations_update_nicowner_click_identityEvidence": "Fournir une copie de la carte d'identité, du permis de conduire ou du passeport de la personne inscrite.", "domain_operations_update_dns_click": "Cliquez ici pour corriger la configuration de vos serveurs DNS", "domain_operations_update_contact_administrator": "Contactez votre administrateur pour corriger ce problème.", - "tracking_transfert_domain_title": "Suivi du transfert pour le domaine \"{{t0}}\"", + "tracking_transfert_domain_title": "Suivi du transfert pour le nom de domaine \"{{t0}}\"", "tracking_transfert_last_update": "Dernière mise à jour : {{t0}}", "tracking_transfert_finalized": "Votre transfert est finalisé !", "tracking_transfert_sub_finalized": "Merci d'avoir choisi OVHcloud !", @@ -85,7 +85,7 @@ "tracking_transfert_first_step_operation_create": "Votre opération a été créée.", "tracking_transfert_first_step_operation_steps": "Neuf étapes effectuées par le robot avant envoie de la demande au registre.", "tracking_transfert_second_step_title": "Vérification de la validité des informations de contact.", - "tracking_transfert_second_step_info": "Pendant ce temps le domaine reste fonctionnel tant que les DNS ne sont pas modifiés.", + "tracking_transfert_second_step_info": "Pendant ce temps le nom de domaine reste fonctionnel tant que les DNS ne sont pas modifiés.", "tracking_transfert_second_step_mail": "Vous pourriez recevoir un email de votre ancien registrar vous invitant à vérifier vos informations de contact (cet email sera envoyé à l'adresse enregistrée pour le contact administratif dans le WHOIS/RDAP).", "tracking_transfert_second_step_validate": "Merci de valider le transfert en suivant le lien ou les instructions indiquées dans ce message.", "tracking_transfert_third_step_operation_title": "Confirmation par votre ancien registrar", @@ -98,7 +98,7 @@ "domain_operations_progress_instructions": "Instructions pour accélérer le transfert :", "domain_operations_progress_instructions_7": "Vous pouvez contacter le prestataire actuel de votre domaine afin que celui-ci donne son accord.", "domain_operations_progress_step_askForAuthInfo": "Authinfo incorrect", - "domain_operations_upload_title": "Ajout de documents pour le domaine \"{{t0}}\"", + "domain_operations_upload_title": "Ajout de documents pour le nom de domaine \"{{t0}}\"", "domain_operations_upload_file_template_1": "Seuls les fichiers suivant ce ", "domain_operations_upload_file_template_link": "modèle de document", "domain_operations_upload_file_template_2": " seront acceptés.", @@ -120,7 +120,7 @@ "domain_operations_update_key_validationToken": "Jeton de validation", "domain_operations_update_key_document": "Document", "domain_operations_update_field_bad_value": "La valeur saisie dans le champ {{t0}} est invalide", - "domain_operations_update_title": "Mise à jour de l'opération pour le domaine {{t0}}", + "domain_operations_update_title": "Mise à jour de l'opération pour le nom de domaine {{t0}}", "domain_operations_update_me_fields": "Modification du {{t0}}", "domain_operations_update_contact_not_me": "Seul(s) le(s) {{t0}} peuvent changer {{t1}}", "domain_operations_update_nicadmin_click": "Changez les informations du contact administrateur en cliquant ici", diff --git a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_fr_FR.json b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_fr_FR.json index b5ace6e43621..3e712339339b 100644 --- a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_fr_FR.json +++ b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_fr_FR.json @@ -76,7 +76,7 @@ "domain_operations_update_nicowner_click_identityEvidence": "Fournir une copie de la carte d'identité, du permis de conduire ou du passeport de la personne inscrite.", "domain_operations_update_dns_click": "Cliquez ici pour corriger la configuration de vos serveurs DNS", "domain_operations_update_contact_administrator": "Contactez votre administrateur pour corriger ce problème.", - "tracking_transfert_domain_title": "Suivi du transfert pour le domaine \"{{t0}}\"", + "tracking_transfert_domain_title": "Suivi du transfert pour le nom de domaine \"{{t0}}\"", "tracking_transfert_last_update": "Dernière mise à jour : {{t0}}", "tracking_transfert_finalized": "Votre transfert est finalisé !", "tracking_transfert_sub_finalized": "Merci d'avoir choisi OVHcloud !", @@ -85,7 +85,7 @@ "tracking_transfert_first_step_operation_create": "Votre opération a été créée.", "tracking_transfert_first_step_operation_steps": "Neuf étapes effectuées par le robot avant envoie de la demande au registre.", "tracking_transfert_second_step_title": "Vérification de la validité des informations de contact.", - "tracking_transfert_second_step_info": "Pendant ce temps le domaine reste fonctionnel tant que les DNS ne sont pas modifiés.", + "tracking_transfert_second_step_info": "Pendant ce temps le nom de domaine reste fonctionnel tant que les DNS ne sont pas modifiés.", "tracking_transfert_second_step_mail": "Vous pourriez recevoir un email de votre ancien registrar vous invitant à vérifier vos informations de contact (cet email sera envoyé à l'adresse enregistrée pour le contact administratif dans le WHOIS/RDAP).", "tracking_transfert_second_step_validate": "Merci de valider le transfert en suivant le lien ou les instructions indiquées dans ce message.", "tracking_transfert_third_step_operation_title": "Confirmation par votre ancien registrar", @@ -98,7 +98,7 @@ "domain_operations_progress_instructions": "Instructions pour accélérer le transfert :", "domain_operations_progress_instructions_7": "Vous pouvez contacter le prestataire actuel de votre domaine afin que celui-ci donne son accord.", "domain_operations_progress_step_askForAuthInfo": "Authinfo incorrect", - "domain_operations_upload_title": "Ajout de documents pour le domaine \"{{t0}}\"", + "domain_operations_upload_title": "Ajout de documents pour le nom de domaine \"{{t0}}\"", "domain_operations_upload_file_template_1": "Seuls les fichiers suivant ce ", "domain_operations_upload_file_template_link": "modèle de document", "domain_operations_upload_file_template_2": " seront acceptés.", @@ -120,7 +120,7 @@ "domain_operations_update_key_validationToken": "Jeton de validation", "domain_operations_update_key_document": "Document", "domain_operations_update_field_bad_value": "La valeur saisie dans le champ {{t0}} est invalide", - "domain_operations_update_title": "Mise à jour de l'opération pour le domaine {{t0}}", + "domain_operations_update_title": "Mise à jour de l'opération pour le nom de domaine {{t0}}", "domain_operations_update_me_fields": "Modification du {{t0}}", "domain_operations_update_contact_not_me": "Seul(s) le(s) {{t0}} peuvent changer {{t1}}", "domain_operations_update_nicadmin_click": "Changez les informations du contact administrateur en cliquant ici", diff --git a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_it_IT.json b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_it_IT.json index c6bc1de642bd..9c0e252f544e 100644 --- a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_it_IT.json +++ b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_it_IT.json @@ -70,7 +70,7 @@ "domain_operations_update_nicowner_click_whoisContactBilling": "Modifica le informazioni del contatto di fatturazione cliccando qui", "domain_operations_update_nicowner_click_whoisContactTech": "Modifica le informazioni del contatto tecnico cliccando qui", "domain_operations_update_nicowner_click_identityEvidence": "Fornire una copia della carta d'identità, patente di guida o passaporto della persona iscritta.", - "tracking_transfert_domain_title": "Stato del trasferimento per il dominio \"{{t0}}\"", + "tracking_transfert_domain_title": "Stato del trasferimento per il nome di dominio \"{{t0}}\"", "tracking_transfert_last_update": "Ultimo aggiornamento: {{t0}}", "tracking_transfert_finalized": "Il trasferimento è completato!", "tracking_transfert_sub_finalized": "Grazie per aver scelto OVHcloud!", @@ -79,7 +79,7 @@ "tracking_transfert_first_step_operation_create": "L'operazione è stata creata.", "tracking_transfert_first_step_operation_steps": "Nove step effettuati dal robot prima dell’invio della richiesta al Registro.", "tracking_transfert_second_step_title": "Verifica della validità delle informazioni di contatto.", - "tracking_transfert_second_step_info": "Durante questo periodo il dominio resta funzionante finché i DNS non vengono modificati.", + "tracking_transfert_second_step_info": "Durante questo periodo il nome di dominio resta funzionante finché i DNS non vengono modificati.", "tracking_transfert_second_step_mail": "Potresti ricevere un'email dal tuo Registrar precedente che ti invita a verificare le informazioni di contatto (questo messaggio verrà inviato all'indirizzo registrato per il contatto amministrativo nel WHOIS/RDAP).", "tracking_transfert_second_step_validate": "Conferma il trasferimento cliccando sul link o seguendo le istruzioni indicate in questo messaggio.", "tracking_transfert_third_step_operation_title": "Conferma da parte del tuo precedente Registrar", @@ -92,7 +92,7 @@ "domain_operations_progress_instructions": "Istruzioni per accelerare il trasferimento:", "domain_operations_progress_instructions_7": "È possibile contattare l'attuale provider del dominio per richiedere la sua autorizzazione.", "domain_operations_progress_step_askForAuthInfo": "Authinfo non corretto", - "domain_operations_upload_title": "Aggiunta di documenti per il dominio \"{{t0}}\"", + "domain_operations_upload_title": "Aggiunta di documenti per il nome di dominio \"{{t0}}\"", "domain_operations_upload_max_size_label": "La dimensione massima autorizzato per il file è di:", "domain_operations_upload_file_label": "Cercare i file", "domain_operations_upload_dropzone_label": "Trascina un file", @@ -137,7 +137,7 @@ "domain_operations_upload_error_wrong-format": "Formato del file non autorizzato.", "domain_operations_update_key_validationToken": "Token di conferma", "domain_operations_update_key_document": "Documento", - "domain_operations_update_title": "Aggiornamento dell'operazione per il dominio {{t0}}", + "domain_operations_update_title": "Aggiornamento dell'operazione per il nome di dominio {{t0}}", "domain_operations_nicOperation_ContactControlNotify": "Notifica di verifica del contatto", "domain_operations_nicOperation_DomainSendRDRPNotice": "Invio della notifica RDRP", "domain_operations_guides": "Informazioni generali", diff --git a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_pl_PL.json b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_pl_PL.json index 2a80819eb128..d93b1589ee94 100644 --- a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_pl_PL.json +++ b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_pl_PL.json @@ -70,7 +70,7 @@ "domain_operations_update_nicowner_click_whoisContactBilling": "Zmień dane kontaktu księgowego, klikając tutaj", "domain_operations_update_nicowner_click_whoisContactTech": "Zmień dane kontaktu technicznego, klikając tutaj", "domain_operations_update_nicowner_click_identityEvidence": "Dostarcz kopię dowodu osobistego, prawa jazdy lub paszportu zarejestrowanej osoby.", - "tracking_transfert_domain_title": "Śledzenie transferu dla domeny \"{{t0}}\"", + "tracking_transfert_domain_title": "Śledzenie transferu dla domeny „{{t0}}”", "tracking_transfert_last_update": "Ostatnia aktualizacja z dnia: {{t0}}", "tracking_transfert_finalized": "Transfer został zakończony!", "tracking_transfert_sub_finalized": "Dziękujemy, że wybrałeś OVHcloud!", diff --git a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_pt_PT.json b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_pt_PT.json index 84801e826448..27467d7ba24c 100644 --- a/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_pt_PT.json +++ b/packages/manager/apps/web-ongoing-operations/public/translations/dashboard/Messages_pt_PT.json @@ -70,7 +70,7 @@ "domain_operations_update_nicowner_click_whoisContactBilling": "Altere as informações do contacto para faturação clicando aqui", "domain_operations_update_nicowner_click_whoisContactTech": "Altere as informações do contacto técnico clicando aqui", "domain_operations_update_nicowner_click_identityEvidence": "Fornecer uma cópia do cartão de cidadão, da carta de condução ou do passaporte da pessoa inscrita.", - "tracking_transfert_domain_title": "Acompanhamento da transferência para o domínio \"{{t0}}\"", + "tracking_transfert_domain_title": "Acompanhamento da transferência para o nome de domínio \"{{t0}}\"", "tracking_transfert_last_update": "Última atualização: {{t0}}", "tracking_transfert_finalized": "A transferência está finalizada!", "tracking_transfert_sub_finalized": "Obrigado por ter escolhido a OVHcloud!", @@ -79,7 +79,7 @@ "tracking_transfert_first_step_operation_create": "A sua operação foi criada com sucesso.", "tracking_transfert_first_step_operation_steps": "Nove etapas realizadas pelo robô antes do envio do pedido para o Registry.", "tracking_transfert_second_step_title": "Verificação da validade das informações de contacto.", - "tracking_transfert_second_step_info": "Entretanto, o domínio permanecerá funcional enquanto os DNS não forem alterados.", + "tracking_transfert_second_step_info": "Entretanto, o nome de domínio permanecerá funcional enquanto os DNS não forem alterados.", "tracking_transfert_second_step_mail": "Poderá receber um email do seu antigo Registrar a convidá-lo a verificar as suas informações de contacto (esse email será enviado para o endereço registado para o contacto administrativo no WHOIS/RDAP).", "tracking_transfert_second_step_validate": "Valide a transferência clicando no link ou seguindo as instruções indicadas nesta mensagem.", "tracking_transfert_third_step_operation_title": "Confirmação pelo seu antigo Registrar", @@ -92,7 +92,7 @@ "domain_operations_progress_instructions": "Instruções para acelerar a transferência:", "domain_operations_progress_instructions_7": "Pode contactar o fornecedor atual do seu domínio para que este dê o seu consentimento.", "domain_operations_progress_step_askForAuthInfo": "Authinfo incorreto", - "domain_operations_upload_title": "Adição de documentos para o domínio \"{{t0}}\"", + "domain_operations_upload_title": "Adição de documentos para o nome de domínio \"{{t0}}\"", "domain_operations_upload_max_size_label": "O peso máximo do ficheiro autorizado é de:", "domain_operations_upload_file_label": "Procurar os ficheiros", "domain_operations_upload_dropzone_label": "Arrastar e soltar um ficheiro", @@ -134,7 +134,7 @@ "domain_operations_nicOperation_ZoneRestore": "Restauro da zona DNS", "wizard_close": "Fechar", "domain_operations_upload_error_wrong-format": "Formato do ficheiro não autorizado", - "domain_operations_update_title": "Atualização da operação para o domínio {{t0}}", + "domain_operations_update_title": "Atualização da operação para o nome de domínio {{t0}}", "domain_operations_update_error": "Ocorreu uma falha ao atualizar a operação", "domain_operations_update_key_validationToken": "Token de validação", "domain_operations_update_key_document": "Documento", From 823f81838fd47698caa2d1d1c4a61374b4655e2b Mon Sep 17 00:00:00 2001 From: louisbensiovh Date: Tue, 28 Oct 2025 16:55:22 +0100 Subject: [PATCH 3/4] fix(web-domains): remove navigate (-1) (#19724) ref: #DCE-2 Signed-off-by: Louis BENSI --- .../ServiceActionMenu.tsx | 3 +- .../DatagridColumnContact.tsx | 0 .../DatagridColumnDate.tsx | 0 ...tagridColumnDomainRegisteredAuthorized.tsx | 0 .../DatagridColumnRenewMode.tsx | 0 .../DatagridColumnServiceName.tsx | 0 .../DatagridColumnSkeleton.tsx | 0 .../DomainDatagridColumnDate.tsx | 1 - .../DomainDatagridColumnDomain.tsx | 1 - .../DomainDatagridColumnRegisteredStatus.tsx | 1 - .../DomainDatagridColumnRenewMode.tsx | 2 +- .../ServiceDetailDomains.tsx | 0 .../ServiceDetailInformation.tsx | 0 .../ServiceDetailSubscribing.component.tsx | 6 ++-- .../ServiceDetailSubscribingRenewDate.tsx | 0 .../ServiceDetailSubscribingRenewMode.tsx | 0 .../DomainCheckboxItem.tsx | 0 .../DomainsCheckboxList.tsx | 2 +- .../terminate/steps/Terminate.stepOne.tsx | 17 ++++++--- .../useAllDomDatagridColumns.tsx | 14 ++++---- .../useDomainDatagridColumns.tsx | 8 ++--- .../useCancelAllDomTerminate.tsx | 9 +++-- .../useTerminateService.tsx | 10 ++++-- .../serviceCancelTerminate.tsx | 10 ++++-- .../service/serviceDetail/serviceDetail.tsx | 6 ++-- .../service/serviceList/serviceList.spec.tsx | 3 +- .../web-domains/src/alldoms/setupTests.tsx | 1 + .../web-domains/src/alldoms/types/index.ts | 1 - .../common/hooks/closeModal/useCloseModal.ts | 14 ++++++++ .../hooks/generateUrl/useGenerateUrl.ts | 36 +++++++++++++++++++ 30 files changed, 108 insertions(+), 37 deletions(-) rename packages/manager/apps/web-domains/src/alldoms/components/{ActionMenu => actionMenu}/ServiceActionMenu.tsx (97%) rename packages/manager/apps/web-domains/src/alldoms/components/{AllDomDatagridColumns => allDomDatagridColumns}/DatagridColumnContact.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/{AllDomDatagridColumns => allDomDatagridColumns}/DatagridColumnDate.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/{AllDomDatagridColumns => allDomDatagridColumns}/DatagridColumnDomainRegisteredAuthorized.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/{AllDomDatagridColumns => allDomDatagridColumns}/DatagridColumnRenewMode.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/{AllDomDatagridColumns => allDomDatagridColumns}/DatagridColumnServiceName.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/{AllDomDatagridColumns => allDomDatagridColumns}/DatagridColumnSkeleton.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/{DomainDatagridColumns => domainDatagridColumns}/DomainDatagridColumnDate.tsx (94%) rename packages/manager/apps/web-domains/src/alldoms/components/{DomainDatagridColumns => domainDatagridColumns}/DomainDatagridColumnDomain.tsx (94%) rename packages/manager/apps/web-domains/src/alldoms/components/{DomainDatagridColumns => domainDatagridColumns}/DomainDatagridColumnRegisteredStatus.tsx (98%) rename packages/manager/apps/web-domains/src/alldoms/components/{DomainDatagridColumns => domainDatagridColumns}/DomainDatagridColumnRenewMode.tsx (98%) rename packages/manager/apps/web-domains/src/alldoms/components/{ServiceDetail => serviceDetail}/ServiceDetailDomains.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/{ServiceDetail => serviceDetail}/ServiceDetailInformation.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/{ServiceDetail/ServiceDetailSubscribing => serviceDetail/serviceDetailSubscribing}/ServiceDetailSubscribing.component.tsx (93%) rename packages/manager/apps/web-domains/src/alldoms/components/{ServiceDetail/ServiceDetailSubscribing => serviceDetail/serviceDetailSubscribing}/ServiceDetailSubscribingRenewDate.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/{ServiceDetail/ServiceDetailSubscribing => serviceDetail/serviceDetailSubscribing}/ServiceDetailSubscribingRenewMode.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/terminate/{DomainsCheckboxes => domainsCheckboxes}/DomainCheckboxItem.tsx (100%) rename packages/manager/apps/web-domains/src/alldoms/components/terminate/{DomainsCheckboxes => domainsCheckboxes}/DomainsCheckboxList.tsx (96%) create mode 100644 packages/manager/apps/web-domains/src/common/hooks/closeModal/useCloseModal.ts create mode 100644 packages/manager/apps/web-domains/src/common/hooks/generateUrl/useGenerateUrl.ts diff --git a/packages/manager/apps/web-domains/src/alldoms/components/ActionMenu/ServiceActionMenu.tsx b/packages/manager/apps/web-domains/src/alldoms/components/actionMenu/ServiceActionMenu.tsx similarity index 97% rename from packages/manager/apps/web-domains/src/alldoms/components/ActionMenu/ServiceActionMenu.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/actionMenu/ServiceActionMenu.tsx index d53f8ae15dc6..fb1a35b30a44 100644 --- a/packages/manager/apps/web-domains/src/alldoms/components/ActionMenu/ServiceActionMenu.tsx +++ b/packages/manager/apps/web-domains/src/alldoms/components/actionMenu/ServiceActionMenu.tsx @@ -6,7 +6,7 @@ import { ShellContext, useNavigationGetUrl, } from '@ovh-ux/manager-react-shell-client'; -import { useNavigate } from 'react-router-dom'; +import { useLocation, useNavigate } from 'react-router-dom'; import { ActionEnum, LifecycleActionsEnum } from '@/alldoms/enum/service.enum'; import { allDomManagerService, RENEW_URL } from '@/alldoms/constants'; import { hasTerminateAtExpirationDateAction } from '@/alldoms/utils/utils'; @@ -30,6 +30,7 @@ export default function ServiceActionMenu({ }: DatagridColumnActionMenuProps) { const { t } = useTranslation('allDom'); const navigate = useNavigate(); + const location = useLocation(); const { environment: { user }, diff --git a/packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnContact.tsx b/packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnContact.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnContact.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnContact.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnDate.tsx b/packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnDate.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnDate.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnDate.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnDomainRegisteredAuthorized.tsx b/packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnDomainRegisteredAuthorized.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnDomainRegisteredAuthorized.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnDomainRegisteredAuthorized.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnRenewMode.tsx b/packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnRenewMode.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnRenewMode.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnRenewMode.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnServiceName.tsx b/packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnServiceName.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnServiceName.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnServiceName.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnSkeleton.tsx b/packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnSkeleton.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/AllDomDatagridColumns/DatagridColumnSkeleton.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/allDomDatagridColumns/DatagridColumnSkeleton.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnDate.tsx b/packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnDate.tsx similarity index 94% rename from packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnDate.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnDate.tsx index b0cb8b994321..d3afb497f9f5 100644 --- a/packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnDate.tsx +++ b/packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnDate.tsx @@ -2,7 +2,6 @@ import { DataGridTextCell, useFormatDate, } from '@ovh-ux/manager-react-components'; -import React from 'react'; interface DomainDatagridColumnDateProps { readonly date: string; diff --git a/packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnDomain.tsx b/packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnDomain.tsx similarity index 94% rename from packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnDomain.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnDomain.tsx index 882f4b1e42c4..dac375659c06 100644 --- a/packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnDomain.tsx +++ b/packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnDomain.tsx @@ -1,5 +1,4 @@ import { useNavigationGetUrl } from '@ovh-ux/manager-react-shell-client'; -import React from 'react'; import { toUnicode } from 'punycode'; import { Link } from '@ovhcloud/ods-react'; diff --git a/packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnRegisteredStatus.tsx b/packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnRegisteredStatus.tsx similarity index 98% rename from packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnRegisteredStatus.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnRegisteredStatus.tsx index c7b916f20a7e..164655a8afb3 100644 --- a/packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnRegisteredStatus.tsx +++ b/packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnRegisteredStatus.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { useTranslation } from 'react-i18next'; import { Badge, diff --git a/packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnRenewMode.tsx b/packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnRenewMode.tsx similarity index 98% rename from packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnRenewMode.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnRenewMode.tsx index be9e5b662bf2..39a11e0335c0 100644 --- a/packages/manager/apps/web-domains/src/alldoms/components/DomainDatagridColumns/DomainDatagridColumnRenewMode.tsx +++ b/packages/manager/apps/web-domains/src/alldoms/components/domainDatagridColumns/DomainDatagridColumnRenewMode.tsx @@ -1,4 +1,3 @@ -import React from 'react'; import { useTranslation } from 'react-i18next'; import { Badge, BADGE_COLOR, Spinner, SPINNER_SIZE } from '@ovhcloud/ods-react'; import { @@ -10,6 +9,7 @@ import { hasTerminateAtExpirationDateAction } from '@/alldoms/utils/utils'; interface DomainDatagridColumnRenewModeProps { readonly alldomTerminated: boolean; + readonly serviceName: string; } diff --git a/packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailDomains.tsx b/packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/ServiceDetailDomains.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailDomains.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/ServiceDetailDomains.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailInformation.tsx b/packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/ServiceDetailInformation.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailInformation.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/ServiceDetailInformation.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailSubscribing/ServiceDetailSubscribing.component.tsx b/packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/serviceDetailSubscribing/ServiceDetailSubscribing.component.tsx similarity index 93% rename from packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailSubscribing/ServiceDetailSubscribing.component.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/serviceDetailSubscribing/ServiceDetailSubscribing.component.tsx index dbeb22d58802..0459b789ef7b 100644 --- a/packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailSubscribing/ServiceDetailSubscribing.component.tsx +++ b/packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/serviceDetailSubscribing/ServiceDetailSubscribing.component.tsx @@ -10,11 +10,11 @@ import { Text, TEXT_PRESET, } from '@ovhcloud/ods-react'; -import ServiceActionMenu from '@/alldoms/components/ActionMenu/ServiceActionMenu'; +import ServiceActionMenu from '@/alldoms/components/actionMenu/ServiceActionMenu'; import { AlldomService } from '@/alldoms/types'; -import ServiceDetailSubscribingRenewDate from '@/alldoms/components/ServiceDetail/ServiceDetailSubscribing/ServiceDetailSubscribingRenewDate'; +import ServiceDetailSubscribingRenewDate from '@/alldoms/components/serviceDetail/serviceDetailSubscribing/ServiceDetailSubscribingRenewDate'; import { ActionEnum } from '@/alldoms/enum/service.enum'; -import ServiceDetailSubscribingRenewMode from './ServiceDetailSubscribingRenewMode'; +import ServiceDetailSubscribingRenewMode from '@/alldoms/components/serviceDetail/serviceDetailSubscribing/ServiceDetailSubscribingRenewMode'; import { CANCEL_TERMINATE_URL, TERMINATE_URL } from '@/alldoms/constants'; interface ServiceDetailSubscribingProps { diff --git a/packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailSubscribing/ServiceDetailSubscribingRenewDate.tsx b/packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/serviceDetailSubscribing/ServiceDetailSubscribingRenewDate.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailSubscribing/ServiceDetailSubscribingRenewDate.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/serviceDetailSubscribing/ServiceDetailSubscribingRenewDate.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailSubscribing/ServiceDetailSubscribingRenewMode.tsx b/packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/serviceDetailSubscribing/ServiceDetailSubscribingRenewMode.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/ServiceDetail/ServiceDetailSubscribing/ServiceDetailSubscribingRenewMode.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/serviceDetail/serviceDetailSubscribing/ServiceDetailSubscribingRenewMode.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/terminate/DomainsCheckboxes/DomainCheckboxItem.tsx b/packages/manager/apps/web-domains/src/alldoms/components/terminate/domainsCheckboxes/DomainCheckboxItem.tsx similarity index 100% rename from packages/manager/apps/web-domains/src/alldoms/components/terminate/DomainsCheckboxes/DomainCheckboxItem.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/terminate/domainsCheckboxes/DomainCheckboxItem.tsx diff --git a/packages/manager/apps/web-domains/src/alldoms/components/terminate/DomainsCheckboxes/DomainsCheckboxList.tsx b/packages/manager/apps/web-domains/src/alldoms/components/terminate/domainsCheckboxes/DomainsCheckboxList.tsx similarity index 96% rename from packages/manager/apps/web-domains/src/alldoms/components/terminate/DomainsCheckboxes/DomainsCheckboxList.tsx rename to packages/manager/apps/web-domains/src/alldoms/components/terminate/domainsCheckboxes/DomainsCheckboxList.tsx index e88d1a69db17..386557f8e16f 100644 --- a/packages/manager/apps/web-domains/src/alldoms/components/terminate/DomainsCheckboxes/DomainsCheckboxList.tsx +++ b/packages/manager/apps/web-domains/src/alldoms/components/terminate/domainsCheckboxes/DomainsCheckboxList.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { TServiceInfo } from '@/alldoms/types'; -import DomainsCheckboxItem from '@/alldoms/components/terminate/DomainsCheckboxes/DomainCheckboxItem'; +import DomainsCheckboxItem from '@/alldoms/components/terminate/domainsCheckboxes/DomainCheckboxItem'; import { hasTerminateAtExpirationDateAction } from '@/alldoms/utils/utils'; interface DomainsCheckboxesProps { diff --git a/packages/manager/apps/web-domains/src/alldoms/components/terminate/steps/Terminate.stepOne.tsx b/packages/manager/apps/web-domains/src/alldoms/components/terminate/steps/Terminate.stepOne.tsx index cc87e3061f45..e535820a5e77 100644 --- a/packages/manager/apps/web-domains/src/alldoms/components/terminate/steps/Terminate.stepOne.tsx +++ b/packages/manager/apps/web-domains/src/alldoms/components/terminate/steps/Terminate.stepOne.tsx @@ -1,7 +1,5 @@ -import React from 'react'; import { useTranslation } from 'react-i18next'; import { NAMESPACES } from '@ovh-ux/manager-common-translations'; -import { useNavigate } from 'react-router-dom'; import { Button, BUTTON_VARIANT, @@ -12,9 +10,12 @@ import { Text, TEXT_PRESET, } from '@ovhcloud/ods-react'; +import { useNavigate, useParams } from 'react-router-dom'; import { ModalStepsProps } from '@/alldoms/types'; -import DomainsCheckboxList from '@/alldoms/components/terminate/DomainsCheckboxes/DomainsCheckboxList'; +import DomainsCheckboxList from '@/alldoms/components/terminate/domainsCheckboxes/DomainsCheckboxList'; import { hasTerminateAtExpirationDateAction } from '@/alldoms/utils/utils'; +import { useCloseModal } from '@/common/hooks/closeModal/useCloseModal'; +import { urls } from '@/alldoms/routes/routes.constant'; export default function TerminateModalStepOne({ services, @@ -25,7 +26,12 @@ export default function TerminateModalStepOne({ setCheckAllDomains, }: Readonly) { const { t } = useTranslation(['allDom', NAMESPACES.ACTIONS]); + const { serviceName } = useParams(); const navigate = useNavigate(); + const closeUrl = useCloseModal( + serviceName, + `${urls.alldomsRoot}/${urls.alldomsListingTerminate}`, + ); return (
@@ -78,7 +84,10 @@ export default function TerminateModalStepOne({
-