sync(*): master to develop

sync(*): master to develop

Author: ovh-cds

packages/components/ovh-at-internet/src/constants.ts

@@ -18,6 +18,7 @@ export const AT_INTERNET_LEVEL2: Record<string, string> = {
   140: 'Manager-identity-security-operations',
   150: 'Manager-DedicatedServers',
   152: 'Manager-Network',
+  157: 'Manager-Communications',
 };
 
 export const AT_INTERNET_WEBSITE: Record<string, string> = {

packages/manager-tools/manager-pm/src/playbook/catalog/pnpm-private-modules.json

@@ -15,10 +15,6 @@
     "turbo": "--filter @ovh-ux/manager-account",
     "pnpm": "packages/manager/modules/account"
   },
-  {
-    "turbo": "--filter @ovh-ux/manager-account-migration",
-    "pnpm": "packages/manager/modules/account-migration"
-  },
   {
     "turbo": "--filter @ovh-ux/manager-advices",
     "pnpm": "packages/manager/modules/advices"

packages/manager-tools/manager-pm/src/playbook/catalog/yarn-catalog.json

@@ -82,7 +82,6 @@
   "packages/manager/core/url-builder",
   "packages/manager/core/utils",
   "packages/manager/modules/account",
-  "packages/manager/modules/account-migration",
   "packages/manager/modules/advices",
   "packages/manager/modules/at-internet-configuration",
   "packages/manager/modules/banner",

packages/manager/apps/account-creation/package.json

@@ -21,17 +21,17 @@
     "@hookform/resolvers": "^5.1.1",
     "@ovh-ux/manager-common-translations": "^0.24.0",
     "@ovh-ux/manager-config": "^8.7.2",
-    "@ovh-ux/manager-core-api": "^0.12.0",
     "@ovh-ux/manager-core-utils": "^0.4.9",
     "@ovh-ux/manager-gcj-module": "^0.5.1",
+    "@ovh-ux/manager-core-api": "^0.19.1",
     "@ovh-ux/manager-react-components": "^2.43.1",
     "@ovh-ux/manager-react-core-application": "^0.13.2",
     "@ovh-ux/manager-react-shell-client": "^0.11.2",
-    "@ovh-ux/request-tagger": "^0.4.1",
     "@ovh-ux/shell": "^4.9.0",
+    "@ovh-ux/request-tagger": "^0.5.7",
     "@ovhcloud/ods-components": "^18.6.2",
     "@ovhcloud/ods-themes": "^18.6.2",
-    "@tanstack/react-query": "^5.51.21",
+    "@tanstack/react-query": "^5.64.1",
     "axios": "^1.1.2",
     "clsx": "^1.2.1",
     "element-internals-polyfill": "^3.0.0",
@@ -49,7 +49,7 @@
     "@ovh-ux/manager-vite-config": "^0.15.1",
     "@tanstack/react-query-devtools": "^5.51.21",
     "tailwindcss": "^3.4.4",
-    "typescript": "^5.1.6",
+    "typescript": "^5.9.2",
     "vite": "^6.0.7",
     "vitest": "^3.1.3"
   },

packages/manager/apps/account-creation/src/context/user/user.provider.spec.tsx

@@ -13,6 +13,10 @@ import * as useApplicationsApi from '@/data/hooks/useApplications';
 import { urls } from '@/routes/routes.constant';
 import UserProvider from '@/context/user/user.provider';
 
+vi.mock('@ovh-ux/manager-react-components', () => ({
+  useFeatureAvailability: vi.fn(),
+}));
+
 const url = 'https://fake-manager.com/signup';
 vi.spyOn(useApplicationsApi, 'useApplications').mockReturnValue({
   isFetched: true,
@@ -33,6 +37,12 @@ vi.spyOn(useApplicationsApi, 'useApplications').mockReturnValue({
 const mockedUsedNavigate = vi.fn();
 vi.mock('react-router-dom', () => ({
   useNavigate: () => mockedUsedNavigate,
+  useSearchParams: () => [
+    new URLSearchParams({
+      test: 'test',
+    }),
+    vi.fn(),
+  ], 
 }));
 
 vi.mock('@/context/tracking/useTracking', () => ({
@@ -51,7 +61,20 @@ const renderComponent = () =>
     </QueryClientProvider>,
   );
 
+
 describe('User Provider', () => {
+  beforeEach(() => {
+    vi.mocked(MRC.useFeatureAvailability).mockReturnValue(({
+      data: { 'account-creation': false },
+      isFetched: true,
+      isLoading: false,
+      isError: false,
+      error: null,
+      status: 'success',
+      refetch: vi.fn(),
+    } as unknown) as MRC.UseFeatureAvailabilityResult<Record<string, boolean>>);
+  });
+
   it('should redirect to the settings page if there is no active session', async () => {
     vi.spyOn(useMeApi, 'useMe').mockReturnValue({
       isFetched: true,
@@ -60,7 +83,7 @@ describe('User Provider', () => {
     renderComponent();
 
     await vi.waitFor(() => {
-      expect(mockedUsedNavigate).toHaveBeenCalledWith(urls.settings);
+      expect(mockedUsedNavigate).toHaveBeenCalledWith(`${urls.settings}?test=test`);
     });
   });
 
@@ -74,7 +97,7 @@ describe('User Provider', () => {
     renderComponent();
 
     await vi.waitFor(() => {
-      expect(mockedUsedNavigate).toHaveBeenCalledWith(urls.accountType);
+      expect(mockedUsedNavigate).toHaveBeenCalledWith(`${urls.accountType}?test=test`);
     });
   });
 

packages/manager/apps/account-creation/src/context/user/user.provider.tsx

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import { useNavigate } from 'react-router-dom';
+import { useNavigate, useSearchParams } from 'react-router-dom';
 import {
   Country,
   LegalForm,
@@ -24,6 +24,7 @@ type Props = {
 
 export const UserProvider = ({ children = [] }: Props): JSX.Element => {
   const navigate = useNavigate();
+  const [ searchParams ] = useSearchParams();
   const { setUser } = useTrackingContext();
   const { data: me, isFetched, error } = useMe({ retry: 0 });
   const { data: availability } = useFeatureAvailability(
@@ -50,7 +51,7 @@ export const UserProvider = ({ children = [] }: Props): JSX.Element => {
   useEffect(() => {
     if (isFetched) {
       if (error?.status === 401) {
-        navigate(urls.settings);
+        navigate(`${urls.settings}?${searchParams.toString()}`);
         return;
       }
       setLegalForm(me?.legalform);
@@ -70,7 +71,7 @@ export const UserProvider = ({ children = [] }: Props): JSX.Element => {
       if (!availability[NEW_ACCOUNT_CREATION_ACCESS_FEATURE]) {
         redirectToLegacySignup();
       } else {
-        navigate(urls.accountType);
+        navigate(`${urls.accountType}?${searchParams.toString()}`);
       }
     }
   }, [availability]);

packages/manager/apps/account-creation/src/data/api/settings.ts

@@ -1,16 +1,11 @@
 import { Region } from '@ovh-ux/manager-config';
-import { v2 } from '@ovh-ux/manager-core-api';
+import { v6 } from '@ovh-ux/manager-core-api';
 import { Setting } from '@/types/settings';
-import {
-  MockedCASettings,
-  MockedEUSettings,
-  MockedUSSettings,
-} from '../mocks/settings.mock';
 
 export const getSettings = async (region: Region) => {
-  // const { data } = await v2.get<Setting[]>(`/account/settings?ovhIS=${region}`);
-  console.log(region);
-  const data = MockedEUSettings;
+  const { data } = await v6.get<Setting[]>(
+    `/newAccount/residentialCountry?ovhIS=${region}`,
+  );
   const result = new Map();
   data.forEach((setting) => {
     if (setting.billingCountries?.length) {

packages/manager/apps/account-creation/src/data/hooks/settings/useSettings.ts

@@ -6,95 +6,84 @@ import { getSettings } from '../../api/settings';
 import { BillingCountry, SupportLanguage } from '@/types/settings';
 import { getRegion } from '@/helpers/region/regionHelper';
 
-export const useCountrySettings = () => {
-  const { t } = useTranslation(NAMESPACES.COUNTRY);
-  return useQuery({
+const useSettingsQuery = <T>(
+  select: (settings: Map<string, BillingCountry[]>) => T,
+) =>
+  useQuery({
     queryKey: ['settings'],
     queryFn: () => getSettings(getRegion()),
-    select: (settings: Map<string, BillingCountry[]>) =>
-      Array.from(settings.keys())
-        .map((countryCode) => ({
-          code: countryCode,
-          label: t(`country_${countryCode}`),
-        }))
-        .sort((countryA, countryB) =>
-          countryA.label > countryB.label ? 1 : -1,
-        ),
+    select,
   });
+
+export const useCountrySettings = () => {
+  const { t } = useTranslation(NAMESPACES.COUNTRY);
+
+  return useSettingsQuery((settings) =>
+    Array.from(settings.keys())
+      .map((countryCode) => ({
+        code: countryCode,
+        label: t(`country_${countryCode}`),
+      }))
+      .sort((countryA, countryB) => (countryA.label > countryB.label ? 1 : -1)),
+  );
 };
 
 export const useCurrencySettings = (country?: string) =>
-  useQuery({
-    queryKey: ['settings'],
-    queryFn: () => getSettings(getRegion()),
-    select: (settings: Map<string, BillingCountry[]>) => {
-      if (!country) {
-        return [];
-      }
-      return (
-        settings
-          .get(country)
-          ?.reduce((currencies: Currency[], billingCountry) => {
-            if (
-              !currencies.find(
-                (currency) => currency.code === billingCountry.currency.code,
-              )
-            ) {
-              currencies.push(billingCountry.currency);
-            }
-            return currencies;
-          }, []) ?? []
-      );
-    },
+  useSettingsQuery((settings) => {
+    if (!country) return [];
+
+    return (
+      settings
+        .get(country)
+        ?.reduce((currencies: Currency[], billingCountry) => {
+          if (
+            !currencies.find(
+              (currency) => currency.code === billingCountry.currency.code,
+            )
+          ) {
+            currencies.push(billingCountry.currency);
+          }
+          return currencies;
+        }, []) ?? []
+    );
   });
 
 export const useLanguageSettings = (country?: string, currency?: string) =>
-  useQuery({
-    queryKey: ['settings'],
-    queryFn: () => getSettings(getRegion()),
-    select: (settings: Map<string, BillingCountry[]>) => {
-      if (!(country && currency)) {
-        return [];
-      }
-      return (
-        settings
-          .get(country)
-          ?.reduce((languages: SupportLanguage[], billingCountry) => {
-            if (
-              currency === billingCountry.currency.code &&
-              !languages.includes(billingCountry.ietfLanguageTag)
-            ) {
-              languages.push(billingCountry.ietfLanguageTag);
-            }
-            return languages;
-          }, []) ?? []
-      );
-    },
+  useSettingsQuery((settings) => {
+    if (!(country && currency)) return [];
+
+    return (
+      settings
+        .get(country)
+        ?.reduce((languages: SupportLanguage[], billingCountry) => {
+          if (
+            currency === billingCountry.currency.code &&
+            !languages.includes(billingCountry.ietfLanguageTag)
+          ) {
+            languages.push(billingCountry.ietfLanguageTag);
+          }
+          return languages;
+        }, []) ?? []
+    );
   });
 
 export const useSubsidiarySettings = (
   country?: string,
   currency?: string,
   language?: string,
 ) => {
-  return useQuery({
-    queryKey: ['settings'],
-    queryFn: () => getSettings(getRegion()),
-    select: (settings: Map<string, BillingCountry[]>) => {
-      if (!(country && currency && language)) {
-        return null;
-      }
-      const foundCountry = settings
-        .get(country)
-        ?.find(
-          (billingCountry) =>
-            billingCountry.currency.code === currency &&
-            billingCountry.ietfLanguageTag === language,
-        );
-      if (!foundCountry) {
-        return null;
-      }
-      return foundCountry.ovhSubsidiary;
-    },
+  return useSettingsQuery<string | null>((settings) => {
+    if (!(country && currency && language)) {
+      return null;
+    }
+    const foundCountry = settings
+      .get(country)
+      ?.find(
+        (billingCountry) =>
+          billingCountry.currency.code === currency &&
+          billingCountry.ietfLanguageTag === language,
+      );
+
+    return foundCountry ? foundCountry.ovhSubsidiary : null;
   });
 };

packages/manager/apps/account-creation/src/data/hooks/useApplications.ts

@@ -1,9 +1,12 @@
-import { useQuery } from '@tanstack/react-query';
-import { getApplications } from '../api/applications';
+import { DefinedInitialDataOptions, useQuery } from '@tanstack/react-query';
 
-export const useApplications = (enabled: boolean) =>
+import { Application } from '@ovh-ux/manager-config';
+
+import { getApplications } from '@/data/api/applications';
+
+export const useApplications = <Response = Record<string, Application>>(options: Partial<DefinedInitialDataOptions<Record<string, Application>, Error, Response>> = {},) =>
   useQuery({
+    ...options,
     queryKey: ['applications'],
     queryFn: getApplications,
-    enabled,
   });

packages/manager/apps/account-creation/src/data/hooks/useMe.ts

@@ -16,5 +16,6 @@ export const useMe = (
   useQuery({
     queryKey: [`me`],
     queryFn: getMe,
+    retry: 0,
     ...options,
   });