sync(*): master to develop

ovh-cds · web-flow · commit f94452cbc385 · 2026-03-24T17:03:43.000+01:00
diff --git a/.sonarcloud.properties b/.sonarcloud.properties
@@ -7,7 +7,7 @@ sonar.projectName=manager
 sonar.sources=.
 sonar.sourceEncoding=UTF-8
 sonar.ws.timeout=60
-sonar.projectVersion=berkelium-locust-4
+sonar.projectVersion=berkelium-locust-5
 
 sonar.exclusions=node_modules/**, **/node_modules/**, **/dist/**, **/semantic/**, **/coverage/**, **/static/**, **/mock/**, **/mockServiceWorker.js
 sonar.coverage.exclusions=**/*.spec.js
diff --git a/packages/manager/apps/pci-billing/CHANGELOG.md b/packages/manager/apps/pci-billing/CHANGELOG.md
@@ -3,6 +3,24 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.16.0](https://github.com/ovh/manager/compare/@ovh-ux/manager-pci-billing-app@0.15.2...@ovh-ux/manager-pci-billing-app@0.16.0) (2026-03-23)
+
+
+### Bug Fixes
+
+* **pci-billing:** improve history total price display ([d673109](https://github.com/ovh/manager/commit/d673109bc2c67b841b0867c89f96fbbd7714e511)), closes [#TAPC-6148](https://github.com/ovh/manager/issues/TAPC-6148)
+* **pci-billing:** several date & currency issues ([b9ed16c](https://github.com/ovh/manager/commit/b9ed16caa44c3a585bf0353b340a79213f48da20)), closes [#TAPC-6093](https://github.com/ovh/manager/issues/TAPC-6093)
+
+
+### Features
+
+* **pci-billing:** add hidden products feature flag ([8ccf9c5](https://github.com/ovh/manager/commit/8ccf9c5227ea86639a5c7135ab00b0ca76c70204)), closes [#TAPC-6093](https://github.com/ovh/manager/issues/TAPC-6093)
+* **pci-billing:** add us old billing banner ([ef732af](https://github.com/ovh/manager/commit/ef732af124ce575d8adde49cd6590e4ffbe4b16f)), closes [#TAPC-6093](https://github.com/ovh/manager/issues/TAPC-6093)
+
+
+
+
+
 ## [0.15.2](https://github.com/ovh/manager/compare/@ovh-ux/manager-pci-billing-app@0.15.1...@ovh-ux/manager-pci-billing-app@0.15.2) (2026-03-18)
 
 
diff --git a/packages/manager/apps/pci-billing/package.json b/packages/manager/apps/pci-billing/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ovh-ux/manager-pci-billing-app",
-  "version": "0.15.2",
+  "version": "0.16.0",
   "private": true,
   "description": "PCI Billing react app",
   "type": "module",
@@ -67,4 +67,4 @@
   "universes": [
     "@ovh-ux/manager-public-cloud"
   ]
-}
+}
diff --git a/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_en_GB.json b/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_en_GB.json
@@ -5,6 +5,7 @@
   "model": "Template",
   "quantity": "Quantity",
   "duration": "Duration",
+  "deployment": "Region",
   "renew": "Renewal",
   "reactivate": "Active",
   "terminate": "Disabled",
diff --git a/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_es_ES.json b/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_es_ES.json
@@ -5,6 +5,7 @@
   "model": "Modelo",
   "quantity": "Cantidad",
   "duration": "Duración",
+  "deployment": "Región",
   "renew": "Renovación",
   "reactivate": "Activo",
   "terminate": "Inactivo",
diff --git a/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_fr_CA.json b/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_fr_CA.json
@@ -6,6 +6,7 @@
   "model": "Modèle",
   "quantity": "Quantité",
   "duration": "Durée",
+  "deployment": "Région",
   "renew": "Renouvellement",
   "reactivate": "Actif",
   "terminate": "Inactif",
diff --git a/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_fr_FR.json b/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_fr_FR.json
@@ -6,6 +6,7 @@
   "model": "Modèle",
   "quantity": "Quantité",
   "duration": "Durée",
+  "deployment": "Région",
   "renew": "Renouvellement",
   "reactivate": "Actif",
   "terminate": "Inactif",
diff --git a/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_it_IT.json b/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_it_IT.json
@@ -5,6 +5,7 @@
   "model": "Modello",
   "quantity": "Quantità",
   "duration": "Durata",
+  "deployment": "Regione",
   "renew": "Rinnovo",
   "reactivate": "Attivo",
   "terminate": "Disattivo",
diff --git a/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_pl_PL.json b/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_pl_PL.json
@@ -5,6 +5,7 @@
   "model": "Model",
   "quantity": "Ilość",
   "duration": "Czas trwania",
+  "deployment": "Region",
   "renew": "Odnowienie",
   "reactivate": "Aktywny",
   "terminate": "Nieaktywny",
diff --git a/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_pt_PT.json b/packages/manager/apps/pci-savings-plan/public/translations/listing/Messages_pt_PT.json
@@ -5,6 +5,7 @@
   "model": "Modelo",
   "quantity": "Quantidade",
   "duration": "Duração",
+  "deployment": "Região",
   "renew": "Renovação",
   "reactivate": "Ativo",
   "terminate": "Inativo",
diff --git a/packages/manager/apps/pci-savings-plan/src/__mocks__/savingsPlan.ts b/packages/manager/apps/pci-savings-plan/src/__mocks__/savingsPlan.ts
@@ -8,6 +8,7 @@ export const pciSavingsPlanMocked: SavingsPlanService = {
   displayName: 'saving-plan-001',
   model: 'B3-8',
   flavor: 'b3-8',
+  deploymentMode: 'REGION-1-AZ',
   endDate: '2024-08-23',
   id: '0dda0458-e425-448a-aa64-ff644cbf3e96',
   offerId: 'urn:fake-saving-plan-offer:1',
@@ -37,6 +38,7 @@ export const pciSavingsPlanListMocked: SavingsPlanService[] = [
     offerId: 'urn:fake-saving-plan-offer:1',
     period: 'P6M',
     flavor: 'Rancher',
+    deploymentMode: 'REGION-1-AZ',
     periodEndAction: SavingsPlanPlanedChangeStatus.REACTIVATE,
     periodEndDate: '2024-08-23',
     periodStartDate: '2024-02-23',
@@ -60,6 +62,7 @@ export const pciSavingsPlanListMocked: SavingsPlanService[] = [
     offerId: 'urn:fake-saving-plan-offer:1',
     period: 'P6M',
     flavor: 'b3-8',
+    deploymentMode: 'REGION-1-AZ',
     periodEndAction: SavingsPlanPlanedChangeStatus.TERMINATE,
     periodEndDate: '2024-08-23',
     periodStartDate: '2024-02-23',
@@ -83,6 +86,7 @@ export const pciSavingsPlanListMocked: SavingsPlanService[] = [
     offerId: 'urn:fake-saving-plan-offer:1',
     period: 'P6M',
     flavor: 'b3-8',
+    deploymentMode: 'REGION-1-AZ',
     periodEndAction: SavingsPlanPlanedChangeStatus.REACTIVATE,
     periodEndDate: '2024-08-23',
     periodStartDate: '2024-02-23',
@@ -106,6 +110,7 @@ export const pciSavingsPlanListMocked: SavingsPlanService[] = [
     offerId: 'urn:fake-saving-plan-offer:1',
     period: 'P6M',
     flavor: 'b3-16',
+    deploymentMode: 'REGION-1-AZ',
     periodEndAction: SavingsPlanPlanedChangeStatus.REACTIVATE,
     periodEndDate: '2024-08-23',
     periodStartDate: '2024-02-23',
diff --git a/packages/manager/apps/pci-savings-plan/src/components/CreatePlanForm/CreatePlan.test.tsx b/packages/manager/apps/pci-savings-plan/src/components/CreatePlanForm/CreatePlan.test.tsx
@@ -94,6 +94,7 @@ const defaultProps: CreatePlanFormProps = {
   onCreatePlan: mockOnCreatePlan,
   setDeploymentMode: vi.fn(),
   deploymentMode: DeploymentMode['1AZ'],
+  deploymentModeOptions: [],
   isCreatePlanPending: false,
 };
 
@@ -135,6 +136,55 @@ describe('CreatePlanForm', () => {
     expect(input).toHaveValue('Test Plan');
   });
 
+  describe('deployment mode options display', () => {
+    it('should not show any deployment option when list is empty', async () => {
+      await setupSpecTest();
+
+      expect(screen.queryByText('region 1AZ')).toBeNull();
+      expect(screen.queryByText('region 3AZ')).toBeNull();
+    });
+
+    it('should show only 1AZ when deploymentModeOptions contains only 1AZ', async () => {
+      await setupSpecTest({
+        ...defaultProps,
+        deploymentModeOptions: [
+          { name: DeploymentMode['1AZ'], description: 'deployment_one_az' },
+        ],
+      });
+
+      expect(screen.getByText('region 1AZ')).toBeDefined();
+      expect(screen.queryByText('region 3AZ')).toBeNull();
+    });
+
+    it('should show both 1AZ and 3AZ when deploymentModeOptions contains both', async () => {
+      await setupSpecTest({
+        ...defaultProps,
+        deploymentModeOptions: [
+          { name: DeploymentMode['1AZ'], description: 'deployment_one_az' },
+          { name: DeploymentMode['3AZ'], description: 'deployment_three_az' },
+        ],
+      });
+
+      expect(screen.getByText('region 1AZ')).toBeDefined();
+      expect(screen.getByText('region 3AZ')).toBeDefined();
+    });
+
+    it('should not show deployment section when Rancher resource is selected', async () => {
+      await setupSpecTest({
+        ...defaultProps,
+        deploymentModeOptions: [
+          { name: DeploymentMode['1AZ'], description: 'deployment_one_az' },
+          { name: DeploymentMode['3AZ'], description: 'deployment_three_az' },
+        ],
+      });
+
+      fireEvent.click(screen.getByText('Rancher'));
+
+      expect(screen.queryByText('region 1AZ')).toBeNull();
+      expect(screen.queryByText('region 3AZ')).toBeNull();
+    });
+  });
+
   describe('When we want to submit form', () => {
     it('should submit the form with correct data', async () => {
       await setupSpecTest();
diff --git a/packages/manager/apps/pci-savings-plan/src/components/CreatePlanForm/CreatePlanForm.tsx b/packages/manager/apps/pci-savings-plan/src/components/CreatePlanForm/CreatePlanForm.tsx
@@ -50,6 +50,7 @@ import {
   InstanceTechnicalName,
   Resource,
   ResourceType,
+  TDeploymentOptions,
   TechnicalInfo,
 } from '@/types/CreatePlan.type';
 import CommitmentWrapper from '../Commitment/CommitmentWrapper';
@@ -63,13 +64,15 @@ import { toLocalDateUTC } from '../../utils/formatter/date';
 import {
   buildDisplayName,
   DeploymentMode,
+  getDeploymentOptions,
   getInstanceDisplayName,
   getInstancesInformation,
   isValidSavingsPlanName,
 } from '../../utils/savingsPlan';
 import SelectResource from './SelectResource';
 import CreatePlanConfirmModal from './CreatePlanConfirmModal';
 import { usePlanPricing } from '@/hooks/planCreation/usePlanPricing';
+import { useSavingsPlanCreationOptionsFeatureAvailability } from '@/hooks/useSavingsPlanCreationOptionsFeatureAvailability';
 
 const COMMON_SPACING = 'my-4';
 
@@ -112,6 +115,7 @@ export type CreatePlanFormProps = {
   isDiscoveryProject: boolean;
   setDeploymentMode: (deploymentMode: DeploymentMode) => void;
   deploymentMode: DeploymentMode;
+  deploymentModeOptions: TDeploymentOptions;
   isCreatePlanPending: boolean;
 };
 
@@ -129,6 +133,7 @@ const CreatePlanForm: FC<CreatePlanFormProps> = ({
   isDiscoveryProject,
   setDeploymentMode,
   deploymentMode,
+  deploymentModeOptions,
   isCreatePlanPending,
 }: CreatePlanFormProps) => {
   const { trackClick } = useOvhTracking();
@@ -334,6 +339,7 @@ const CreatePlanForm: FC<CreatePlanFormProps> = ({
         <SelectDeployment
           setDeploymentMode={setDeploymentMode}
           deploymentMode={deploymentMode}
+          deploymentModeOptions={deploymentModeOptions}
         />
       )}
       <SelectModel
@@ -431,6 +437,11 @@ export const CreatePlanFormContainer = ({
   const { t } = useTranslation(['create', 'listing']);
   const { addSuccess } = useNotifications();
 
+  const {
+    isDeployment3AZAvailable,
+    isRancherServiceAvailable,
+  } = useSavingsPlanCreationOptionsFeatureAvailability();
+
   const [instanceCategory, setInstanceCategory] = useState<
     InstanceTechnicalName
   >(InstanceTechnicalName.b3);
@@ -487,7 +498,23 @@ export const CreatePlanFormContainer = ({
     (a, b) => (a.duration ?? 0) - (b.duration ?? 0),
   );
 
-  const resources: Resource[] = getResources(t);
+  const availableResourcesOptions = useMemo(() => {
+    const resourcesOptions: Resource[] = getResources(t);
+    return isRancherServiceAvailable
+      ? resourcesOptions
+      : resourcesOptions.filter(
+          (resource) => resource.value !== ResourceType.rancher,
+        );
+  }, [t, isRancherServiceAvailable]);
+
+  const availableDeploymentModeOptions = useMemo(() => {
+    const deploymentModeOptions = getDeploymentOptions(t);
+    return isDeployment3AZAvailable
+      ? deploymentModeOptions
+      : deploymentModeOptions.filter(
+          (mode) => mode.name !== DeploymentMode['3AZ'],
+        );
+  }, [t, isDeployment3AZAvailable]);
 
   const instancesInformation = useMemo(
     () =>
@@ -502,7 +529,7 @@ export const CreatePlanFormContainer = ({
     <Suspense fallback={<OdsSpinner />}>
       <CreatePlanForm
         onCreatePlan={onCreatePlan}
-        resources={resources}
+        resources={availableResourcesOptions}
         instancesInfo={instancesInformation}
         instanceCategory={instanceCategory}
         setInstanceCategory={setInstanceCategory}
@@ -514,6 +541,7 @@ export const CreatePlanFormContainer = ({
         isDiscoveryProject={isDiscoveryProject}
         setDeploymentMode={setDeploymentMode}
         deploymentMode={deploymentMode}
+        deploymentModeOptions={availableDeploymentModeOptions}
         isCreatePlanPending={isCreatePlanPending}
       />
     </Suspense>
diff --git a/packages/manager/apps/pci-savings-plan/src/components/CreatePlanForm/SelectDeployment.tsx b/packages/manager/apps/pci-savings-plan/src/components/CreatePlanForm/SelectDeployment.tsx
@@ -5,18 +5,19 @@ import { useTranslation } from 'react-i18next';
 import React from 'react';
 import { DescriptionWrapper } from './CreatePlanForm';
 import SimpleTile, { Block } from '../SimpleTile/SimpleTile';
-import { DeploymentMode, getDeploymentOptions } from '@/utils/savingsPlan';
-
-import './select-deployment.css';
+import { DeploymentMode } from '@/utils/savingsPlan';
+import { TDeploymentOptions } from '@/types/CreatePlan.type';
 
 type SelectDeploymentProps = {
   setDeploymentMode: (deploymentMode: DeploymentMode) => void;
   deploymentMode: DeploymentMode;
+  deploymentModeOptions: TDeploymentOptions;
 };
 
 const SelectDeployment = ({
   setDeploymentMode,
   deploymentMode,
+  deploymentModeOptions,
 }: SelectDeploymentProps) => {
   const { t } = useTranslation(['create', 'listing']);
 
@@ -31,7 +32,7 @@ const SelectDeployment = ({
       </DescriptionWrapper>
 
       <div className="flex flex-row w-full overflow-x-auto mb-[32px] gap-6">
-        {getDeploymentOptions(t).map((option) => (
+        {deploymentModeOptions.map((option) => (
           <SimpleTile
             onClick={() => {
               setDeploymentMode(option.name);
diff --git a/packages/manager/apps/pci-savings-plan/src/components/CreatePlanForm/select-deployment.css b/packages/manager/apps/pci-savings-plan/src/components/CreatePlanForm/select-deployment.css
diff --git a/packages/manager/apps/pci-savings-plan/src/components/Table/TableContainer.tsx b/packages/manager/apps/pci-savings-plan/src/components/Table/TableContainer.tsx
@@ -15,11 +15,14 @@ import PlannedChangeStatusChip from '../PlannedChangeStatusChip/PlannedChangeSta
 import StatusChip from '../StatusChip/StatusChip';
 import ActionsCell from './ActionsCell';
 import { SavingsPlanDatagridWrapper } from './Table.type';
+import { getDeploymentLabel } from '@/utils/savingsPlan';
+import { OdsBadge } from '@ovhcloud/ods-components/react';
 
 type SortableKey = Pick<
   SavingsPlanService,
   'displayName' | 'endDate' | 'period' | 'periodEndDate'
 >;
+type TDeploymentMode = 'REGION-3-AZ' | 'REGION-1-AZ';
 
 export default function TableContainer({
   data,
@@ -61,6 +64,12 @@ export default function TableContainer({
     );
   }, [data, pagination, sorting]);
 
+  const getDeploymentBadge = (mode: TDeploymentMode) => {
+    const text = getDeploymentLabel(mode);
+    const classname = mode === 'REGION-3-AZ' ? 'chip-3AZ' : 'chip-1AZ';
+    return <OdsBadge className={classname} label={text} />;
+  };
+
   const columns: DatagridColumn<SavingsPlanService>[] = useMemo(
     () => [
       {
@@ -96,6 +105,12 @@ export default function TableContainer({
           </DataGridTextCell>
         ),
       },
+      {
+        id: 'deployment',
+        label: t('region'),
+        cell: (props: SavingsPlanService) =>
+          getDeploymentBadge(props.deploymentMode),
+      },
       {
         id: 'periodEndAction',
         label: t('renew'),
diff --git a/packages/manager/apps/pci-savings-plan/src/hooks/useCatalogCommercial.tsx b/packages/manager/apps/pci-savings-plan/src/hooks/useCatalogCommercial.tsx
diff --git a/packages/manager/apps/pci-savings-plan/src/hooks/useSavingsPlanCreationOptionsFeatureAvailability.tsx b/packages/manager/apps/pci-savings-plan/src/hooks/useSavingsPlanCreationOptionsFeatureAvailability.tsx
diff --git a/packages/manager/apps/pci-savings-plan/src/index.scss b/packages/manager/apps/pci-savings-plan/src/index.scss
diff --git a/packages/manager/apps/pci-savings-plan/src/types/CreatePlan.type.ts b/packages/manager/apps/pci-savings-plan/src/types/CreatePlan.type.ts
diff --git a/packages/manager/apps/pci-savings-plan/src/types/api.type.ts b/packages/manager/apps/pci-savings-plan/src/types/api.type.ts
diff --git a/packages/manager/apps/pci-savings-plan/src/utils/savingsPlan.ts b/packages/manager/apps/pci-savings-plan/src/utils/savingsPlan.ts

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@ovh-ux/manager-pci-billing-app",`
`3`		`- "version": "0.15.2",`
	`3`	`+ "version": "0.16.0",`
`4`	`4`	`"private": true,`
`5`	`5`	`"description": "PCI Billing react app",`
`6`	`6`	`"type": "module",`
`@@ -67,4 +67,4 @@`
`67`	`67`	`"universes": [`
`68`	`68`	`"@ovh-ux/manager-public-cloud"`
`69`	`69`	`]`
`70`		`-}`
	`70`	`+}`