Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/manager/apps/web-domains/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"@tanstack/react-query": "5.90.2",
"axios": "^1.1.2",
"clsx": "^1.2.1",
"export-to-csv": "^1.4.0",
"i18next": "23.8.2",
"i18next-http-backend": "2.4.3",
"punycode": "2.3.1",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,44 @@
{
"title": "Noms de domaine",
"domain_table_header_serviceName": "Nom de domaine",
"domain_table_header_tags": "Mes tags",
"domain_table_header_status": "Statut",
"domain_table_header_technical_status": "Statut technique",
"domain_table_header_transfer_protection": "Protection contre le transfert",
"domain_table_header_renew_frequency": "Fréquence de renouvellement",
"domain_table_header_pending_actions": "Actions en cours",
"domain_table_header_expiration": "Expiration",
"domain_table_header_contact_owner": "Contact titulaire",
"domain_table_header_contact_tech": "Contact technique",
"domain_table_header_contact_billing": "Contact facturation",
"domain_table_header_contact_admin": "Contact administratif",
"domain_table_modal_renew_restore_title": "Renouveler ou restaurer mes noms de domaine ({{count}})",
"domain_table_modal_renew_restore_description": "Afin de renouveler ou restaurer vos noms de domaine, vous devez utiliser l'interface de renouvellement OVHcloud (hors de l'espace Client Web)",
"domain_table_modal_renew_restore_order": "<strong>Cliquez sur le bouton ci-dessous pour accéder à l'interface de renouvellement OVHcloud.</strong> Un nouvel onglet s'ouvrira pour vous rediriger vers l'interface de renouvellement OVHcloud.",
"domain_table_modal_renew_restore_button": "Restaurer / Renouveler ({{count}})",
"domain_table_modal_renew_restore_message_info": "Veuillez noter qu'un délai d'environ 2 heures à compter de l'acceptation de votre paiement est nécessaire pour que le renouvellement soit effectif sur votre nom de domaine.",
"domain_table_export_csv": "Exporter tout",
"domain_table_export_csv_selection": "Exporter la sélection ({{count}})",
"domain_table_drawer_title": "Exporter les noms de domaine",
"domain_table_drawer_selected_all": "Tous les noms de domaine",
"domain_table_drawer_selected_count": "{{count}} nom(s) de domaine sélectionné(s)",
"domain_table_drawer_info": "Sélectionnez les informations à inclure dans l'export CSV. Les noms de domaine MX plan ne seront pas exportés.",
"domain_table_drawer_column_domain": "Options des noms de domaine",
"domain_table_drawer_column_contact": "Contacts",
"domain_table_drawer_column_info_message": "L'export de vos noms de domaine peut prendre quelques minutes en fonction du nombre de noms de domaine sélectionnés.",
"domain_table_drawer_contact_treeview": "Sélectionner tous les contacts",
"domain_table_drawer_domain_treeview": "Sélectionner toutes les options",
"domain_table_drawer_domain_ascii": "Nom de domaine ASCII (Punycode)",
"domain_table_drawer_domain_utf8": "Nom de domaine UTF-8",
"domain_table_drawer_domain_creation_date": "Date de création",
"domain_table_drawer_domain_anycast": "DNS Anycast",
"domain_table_progress_fetching": "Récupération de la liste des noms de domaine en cours. Veuillez patienter...",
"domain_table_progress_exporting": "Préparation de la sauvegarde des fichiers pour le téléchargement en cours. Veuillez patienter...",
"domain_table_header_dnssec": "DNSSEC",
"domain_export_done_title": "Export terminé",
"domain_export_success": "Le téléchargement de votre fichier va commencer automatiquement. ({{count}} nom(s) de domaine exporté(s)). Si le téléchargement ne se lance pas automatiquement, vous pouvez effectuer un <Link>téléchargement manuel</Link>.",
"domain_export_error": "Une erreur est survenue lors de l'export de vos noms de domaine : {{error}}",
"domain_table_modal_renew_restore_message_limit_warning": "Vous avez sélectionné plus de vingt noms de domaine. Veuillez noter que cela peut entraîner des limitations lors du renouvellement ou de la restauration.",
"domain_tab_name_general_information": "Informations générales",
"domain_tab_name_dns_zone": "Zone DNS",
"domain_tab_name_dns_server": "Serveurs DNS",
Expand All @@ -27,7 +65,6 @@
"domain_dns_table_type_dedicated": "Secondaire",
"domain_dns_table_type_standard_tooltip": "Mettez à niveau vers une offre Anycast pour de meilleures performances.",
"domain_dns_tab_button_modify_dns": "Modifier les DNS",
"domain_dns_tab_button_order_anycast": "Commander DNS Anycast",
"domain_dns_tab_button_cancel_terminate_anycast": "{{action}} DNS Anycast",
"domain_dns_tab_terminate_description_anycast": "La résiliation prendre effet à la date d'expiration du service, le <strong>{{expirationDate}}</strong>.",
"domain_dns_tab_terminate_description_suite_anycast": "Êtes-vous sûr(e) de vouloir {{action}} le service DNS Anycast ?",
Expand All @@ -43,8 +80,9 @@
"domain_dns_tab_terminate_anycast_error": "Une erreur est survenue : {{error}}",
"domain_dns_tab_terminate_anycast_success": "Votre service Anycast a bien été {{action}}",
"domain_dns_tab_restore_anycast_description": "Vous avez demandé la résiliation de l'option DNS Anycast. Celle-ci sera effective à la date d'expiration du service, le <strong>{{expirationDate}}</strong>. Souhaitez-vous annuler la résiliation ?",
"domain_action_terminate": "résilié",
"domain_action_restore": "restauré",
"domain_action_terminate": "Résilier",
"domain_action_restore": "Restaurer",
"domain_action_cancel_terminate": "Annuler la résiliation",
"domain_tab_DNS_anycast_order_description_suite": "DNS Anycast sera automatiquement renouvelé pour ",
"domain_tab_DNS_modification_title": "Modifier les serveurs DNS",
"domain_tab_DNS_modification_DNS_used": "Vous utilisez actuellement les DNS suivants : ",
Expand Down Expand Up @@ -136,6 +174,18 @@
"domain_tab_general_information_associated_subdomains_multisite_content": "Aucun sous-domaine ou multisite",
"domain_tab_general_not_suspended": "Actif",
"domain_tab_general_suspended": "Suspendu",
"domain_status_technical_suspended": "Procédure en cours",
"domain_status_pending_installation": "En cours d'installation",
"domain_status_auto_renew_in_progress": "Renouvellement en cours",
"domain_tab_general_information_status_enabled": "Activé",
"domain_tab_general_information_status_enabling": "En cours d'activation",
"domain_tab_general_information_status_unavailable": "Indisponible",
"domain_tab_general_information_status_disabled": "Désactivé",
"domain_tab_general_information_status_disabling": "En cours de désactivation",
"domain_status_terminate_asked": "Résiliation demandée",
"domain_status_early_renewal": "Renouvellement en cours",
"domain_action_early_renewal": "Renouveler",
"domain_status_terminate": "Résilié",
"domain_tab_DNS_modification_form_dns_number": "Veuillez renseigner entre {{min}} et {{max}} DNS.",
"domain_tab_DNS_modification_form_server_field": "Serveur DNS",
"domain_tab_DNS_modification_form_ip_field": "IP associée",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ import {
ActionEnum,
LifecycleCapacitiesEnum,
} from '@/alldoms/enum/service.enum';
import { allDomManagerService, RENEW_URL } from '@/alldoms/constants';
import { allDomManagerService } from '@/alldoms/constants';
import { hasTerminateAtExpirationDateAction } from '@/alldoms/utils/utils';
import { RENEW_URL } from '@/common/constants';

interface DatagridColumnActionMenuProps {
readonly id: string;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { DataGridTextCell } from '@ovh-ux/manager-react-components';
import { Link } from '@ovhcloud/ods-react';
import React from 'react';

interface DatagridColumnContactProps {
readonly contact: string;
Expand Down
28 changes: 0 additions & 28 deletions packages/manager/apps/web-domains/src/alldoms/constants.ts
Original file line number Diff line number Diff line change
@@ -1,31 +1,3 @@
const URL_SUFFIX = 'cgi-bin/order/renew.cgi?domainChooser=';

export const RENEW_URL: Record<string, string> = {
DEFAULT: `https://www.ovh.com/${URL_SUFFIX}`,
AU: `https://ca.ovh.com/au/${URL_SUFFIX}`,
CA: `https://ca.ovh.com/fr/${URL_SUFFIX}`,
SG: `https://ca.ovh.com/sg/${URL_SUFFIX}`,
QC: `https://ca.ovh.com/fr/${URL_SUFFIX}`,
WE: `https://ca.ovh.com/fr/${URL_SUFFIX}`,
CZ: `https://www.ovh.cz/${URL_SUFFIX}`,
DE: `https://www.ovh.de/${URL_SUFFIX}`,
EN: `https://www.ovh.co.uk/${URL_SUFFIX}`,
ES: `https://www.ovh.es/${URL_SUFFIX}`,
FI: `https://www.ovh-hosting.fi/${URL_SUFFIX}`,
FR: `https://eu.ovh.com/fr/${URL_SUFFIX}`,
GB: `https://www.ovh.co.uk/${URL_SUFFIX}`,
IE: `https://www.ovh.ie/${URL_SUFFIX}`,
IT: `https://www.ovh.it/${URL_SUFFIX}`,
LT: `https://www.ovh.lt/${URL_SUFFIX}`,
MA: `https://www.ovh.com/ma/${URL_SUFFIX}`,
NL: `https://www.ovh.nl/${URL_SUFFIX}`,
PL: `https://www.ovh.pl/${URL_SUFFIX}`,
PT: `https://www.ovh.pt/${URL_SUFFIX}`,
RU: `https://www.ovh.co.uk/${URL_SUFFIX}`,
SN: `https://www.ovh.sn/${URL_SUFFIX}`,
TN: `https://www.ovh.com/tn/${URL_SUFFIX}`,
};

export const allDomManagerService = 'ALL_DOM';

export const TERMINATE_URL = (serviceName?: string) =>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { LifecycleCapacitiesEnum } from '@/alldoms/enum/service.enum';
import { LifecycleCapacitiesEnum } from '@/common/enum/common.enum';

export const hasTerminateAtExpirationDateAction = (
actions: LifecycleCapacitiesEnum[],
Expand Down
29 changes: 29 additions & 0 deletions packages/manager/apps/web-domains/src/common/constants.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
const URL_SUFFIX = 'cgi-bin/order/renew.cgi?domainChooser=';

export const RENEW_URL: Record<string, string> = {
DEFAULT: `https://www.ovh.com/${URL_SUFFIX}`,
AU: `https://ca.ovh.com/au/${URL_SUFFIX}`,
CA: `https://ca.ovh.com/fr/${URL_SUFFIX}`,
SG: `https://ca.ovh.com/sg/${URL_SUFFIX}`,
QC: `https://ca.ovh.com/fr/${URL_SUFFIX}`,
WE: `https://ca.ovh.com/fr/${URL_SUFFIX}`,
CZ: `https://www.ovh.cz/${URL_SUFFIX}`,
DE: `https://www.ovh.de/${URL_SUFFIX}`,
EN: `https://www.ovh.co.uk/${URL_SUFFIX}`,
ES: `https://www.ovh.es/${URL_SUFFIX}`,
FI: `https://www.ovh-hosting.fi/${URL_SUFFIX}`,
FR: `https://eu.ovh.com/fr/${URL_SUFFIX}`,
GB: `https://www.ovh.co.uk/${URL_SUFFIX}`,
IE: `https://www.ovh.ie/${URL_SUFFIX}`,
IT: `https://www.ovh.it/${URL_SUFFIX}`,
LT: `https://www.ovh.lt/${URL_SUFFIX}`,
MA: `https://www.ovh.com/ma/${URL_SUFFIX}`,
NL: `https://www.ovh.nl/${URL_SUFFIX}`,
PL: `https://www.ovh.pl/${URL_SUFFIX}`,
PT: `https://www.ovh.pt/${URL_SUFFIX}`,
RU: `https://www.ovh.co.uk/${URL_SUFFIX}`,
SN: `https://www.ovh.sn/${URL_SUFFIX}`,
TN: `https://www.ovh.com/tn/${URL_SUFFIX}`,
};

export const DOMAIN = 'DOMAIN';
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ export enum ServiceInfoRenewModeEnum {
export enum LifecycleCapacitiesEnum {
EarlyRenewal = 'earlyRenewal',
Terminate = 'terminate',
AutorRenewInProgress = 'autorenewInProgress',
DeleteAtExpiration = 'deleteAtExpiration',
TerminateAtEngagementDate = 'terminateAtEngagementDate',
TerminateAtExpirationDate = 'terminateAtExpirationDate',
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ export const useGetServiceInformation = (
serviceName: string,
serviceRoute: ServiceRoutes,
) => {
const { data, isLoading } = useQuery({
const { data, isFetching } = useQuery({
queryKey: [key, 'service', serviceName],
queryFn: () => getServiceInformation(serviceName, serviceRoute),
});

return {
serviceInfo: data,
isServiceInfoLoading: isLoading,
isServiceInfoLoading: isFetching,
};
};
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('AnycastOrderButtonComponent', () => {
/>,
);
expect(
screen.getByText('domain_dns_tab_button_order_anycast'),
screen.getByText('domain_tab_DNS_anycast_order'),
).toBeInTheDocument();
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default function AnycastOrderButtonComponent({
)
}
>
{t('domain_dns_tab_button_order_anycast')}
{t('domain_tab_DNS_anycast_order')}
</Button>
)}
{anycastOption && restoreAnycast && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import {
useNavigationGetUrl,
} from '@ovh-ux/manager-react-shell-client';
import { NAMESPACES } from '@ovh-ux/manager-common-translations';
import { RENEW_URL } from '@/alldoms/constants';
import { bannerTypeFromFlags } from '@/domain/utils/bannerStatus';
import { useGetDomainResource } from '@/domain/hooks/data/query';
import { RENEW_URL } from '@/common/constants';

interface BannerErrorWarningProps {
readonly serviceName: string;
Expand Down
Loading
Loading