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({
-