From 8940d25df3226ea17d0c71b99ceddc8a1258289a Mon Sep 17 00:00:00 2001
From: Selmen AKRMI
>
+
@@ -364,7 +374,7 @@
>
data-ng-if="$ctrl.OBJECT_CONTAINER_DEPLOYMENT_MODES_LABELS[deploymentModeName].isMultiZone"
data-translate="pci_projects_project_storages_containers_add_deployment_mode_soon"
>
+
+
@@ -118,7 +119,7 @@ >
-+
+ +
+
+ diff --git a/packages/manager/modules/pci/src/components/project/regions-list/translations/Messages_fr_FR.json b/packages/manager/modules/pci/src/components/project/regions-list/translations/Messages_fr_FR.json index 3636220a7593..d38914daf563 100644 --- a/packages/manager/modules/pci/src/components/project/regions-list/translations/Messages_fr_FR.json +++ b/packages/manager/modules/pci/src/components/project/regions-list/translations/Messages_fr_FR.json @@ -4,5 +4,7 @@ "pci_project_regions_list_add": "Nous vous invitons à activer les dernières localisations de chaque zone dans la partie Localisations", "pci_project_regions_list_region": "Localisation", "pci_project_regions_list_quota": "Augmenter mon quota", - "pci_project_regions_list_current_offer": "Offre actuelle" + "pci_project_regions_list_current_offer": "Offre actuelle", + "pci_project_regions_list_activate_project_banner_message": "Pour accéder aux étapes suivantes, vous devez", + "pci_project_regions_list_activate_project_banner_link_text": "activer votre projet." } diff --git a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.component.js b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.component.js index 065f2eaafbdf..bf15aea0a3da 100644 --- a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.component.js +++ b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.component.js @@ -23,5 +23,6 @@ export default { trackEncryptionAction: '<', catalog: '<', is3azAvailable: '<', + projectActivationPageHref: '<', }, }; diff --git a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.controller.js b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.controller.js index 582e35f3693f..2162b70f4b12 100644 --- a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.controller.js +++ b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.controller.js @@ -159,7 +159,7 @@ export default class PciStoragesContainersAddController { .filter((addon) => addon.planCode === planCode) .map((addon) => addon.pricings[0].price)[0]; - return hourlyPrice * 720 * 1024 * 0.00000001; + return hourlyPrice * 730 * 1024 * 0.00000001; } setOffersPrices() { @@ -193,7 +193,7 @@ export default class PciStoragesContainersAddController { if (price > 0) { if (!lowestPrice || price < lowestPrice) { - lowestPrice = price * 720 * 1024 * 0.00000001; + lowestPrice = price * 730 * 1024 * 0.00000001; } } } diff --git a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.html b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.html index 0a65c4426e59..1775e028603c 100644 --- a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.html +++ b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.html @@ -197,7 +197,7 @@
diff --git a/packages/manager/modules/pci/src/projects/project/storages/containers/container/delete/delete.controller.js b/packages/manager/modules/pci/src/projects/project/storages/containers/container/delete/delete.controller.js
index 611959459c32..36aa5d240b90 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/containers/container/delete/delete.controller.js
+++ b/packages/manager/modules/pci/src/projects/project/storages/containers/container/delete/delete.controller.js
@@ -18,6 +18,16 @@ export default class PciBlockStorageDetailsDeleteController {
this.isLoading = false;
}
+ isPrimaryDisabled() {
+ return (
+ this.isLoading ||
+ (this.container &&
+ !this.container.containerType &&
+ this.container.objects &&
+ this.container.objects.length > 0)
+ );
+ }
+
deleteStorage() {
this.atInternet.trackClick({
name: `${this.trackingPrefix}delete::confirm`,
diff --git a/packages/manager/modules/pci/src/projects/project/storages/containers/container/delete/delete.html b/packages/manager/modules/pci/src/projects/project/storages/containers/container/delete/delete.html
index ea986a746f36..fefd123582f0 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/containers/container/delete/delete.html
+++ b/packages/manager/modules/pci/src/projects/project/storages/containers/container/delete/delete.html
@@ -2,7 +2,7 @@
data-heading="{{ 'pci_projects_project_storages_containers_container_delete_'+ ($ctrl.archive ? 'archive' : 'object') + '_title' | translate }}"
data-primary-action="$ctrl.deleteStorage()"
data-primary-label="{{:: 'pci_projects_project_storages_containers_container_delete_submit_label' | translate }}"
- data-primary-disabled="$ctrl.isLoading || ($ctrl.container.objects && $ctrl.container.objects.length > 0)"
+ data-primary-disabled="$ctrl.isPrimaryDisabled()"
data-secondary-action="$ctrl.cancel()"
data-secondary-label="{{:: 'pci_projects_project_storages_containers_container_delete_cancel_label' | translate }}"
data-on-dismiss="$ctrl.goBack()"
From 4b277e819fe333d8874cba676da838807fb1cb6e Mon Sep 17 00:00:00 2001
From: Selmen AKRMI
diff --git a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.component.js b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.component.js
index 7c005468a523..0c5595c19d3d 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.component.js
+++ b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.component.js
@@ -26,5 +26,6 @@ export default {
projectActivationPageHref: '<',
isLocalzoneAvailable: '<',
is3azAvailable: '<',
+ projectActivationPageHref: '<',
},
};
From f1dce18bec67b7be16b431c6a6637d6bca8b43e2 Mon Sep 17 00:00:00 2001
From: Selmen AKRMI
diff --git a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.controller.js b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.controller.js
index 6594c9dd98fa..827f6b740d3d 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.controller.js
+++ b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.controller.js
@@ -108,7 +108,7 @@ export default class PciStoragesContainersAddController {
},
);
- this.featureFlipLocalzoneContainer();
+ // this.featureFlipLocalzoneContainer();
this.setOffersPrices();
this.setDeploymentModePrices();
this.featureFlip3azContainer();
diff --git a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.html b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.html
index daa1de808024..8b93495e3633 100644
--- a/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.html
+++ b/packages/manager/modules/pci/src/projects/project/storages/containers/add/add.html
@@ -273,7 +273,9 @@
>
>
>
Date: Wed, 30 Oct 2024 16:16:40 +0100
Subject: [PATCH 16/39] feat(pci-object-storage): enable feature flipping usa
again
ref: TAPC-1189
Signed-off-by: Selmen AKRMI
{children}
diff --git a/packages/manager-react-components/src/components/table/table.module.scss b/packages/manager-react-components/src/components/table/table.module.scss
new file mode 100644
index 000000000000..99266e8a5d8a
--- /dev/null
+++ b/packages/manager-react-components/src/components/table/table.module.scss
@@ -0,0 +1,20 @@
+.table {
+ th {
+ padding: 1rem 1rem;
+ border-bottom: solid 1px var(--ods-color-blue-200);
+ }
+ tbody {
+ td {
+ padding: 1rem 1rem;
+ border-bottom: solid 1px var(--ods-color-blue-200);
+ }
+
+ td:first-child {
+ border-left: solid 1px var(--ods-color-blue-200);
+ }
+
+ td:last-child {
+ border-right: solid 1px var(--ods-color-blue-200);
+ }
+ }
+}
diff --git a/packages/manager-react-components/public/assets/error-banner-oops.png b/packages/manager-react-components/src/components/templates/error/assets/error-banner-oops.png
similarity index 100%
rename from packages/manager-react-components/public/assets/error-banner-oops.png
rename to packages/manager-react-components/src/components/templates/error/assets/error-banner-oops.png
diff --git a/packages/manager-react-components/src/components/templates/error/error.component.tsx b/packages/manager-react-components/src/components/templates/error/error.component.tsx
index a52f2437e893..a4a847d86033 100644
--- a/packages/manager-react-components/src/components/templates/error/error.component.tsx
+++ b/packages/manager-react-components/src/components/templates/error/error.component.tsx
@@ -12,12 +12,11 @@ import {
ODS_BUTTON_VARIANT,
} from '@ovhcloud/ods-components';
import './translations/translations';
+import OOPS from './assets/error-banner-oops.png';
import { ErrorBannerProps } from './error.types';
import { useTranslation } from 'react-i18next';
-import ErrorImg from '../../../../public/assets/error-banner-oops.png';
-
export const ErrorBanner = ({
error,
onRedirectHome,
@@ -28,7 +27,7 @@ export const ErrorBanner = ({
return (
{children}
diff --git a/packages/manager-react-components/src/components/table/table.module.scss b/packages/manager-react-components/src/components/table/table.module.scss
deleted file mode 100644
index 99266e8a5d8a..000000000000
--- a/packages/manager-react-components/src/components/table/table.module.scss
+++ /dev/null
@@ -1,20 +0,0 @@
-.table {
- th {
- padding: 1rem 1rem;
- border-bottom: solid 1px var(--ods-color-blue-200);
- }
- tbody {
- td {
- padding: 1rem 1rem;
- border-bottom: solid 1px var(--ods-color-blue-200);
- }
-
- td:first-child {
- border-left: solid 1px var(--ods-color-blue-200);
- }
-
- td:last-child {
- border-right: solid 1px var(--ods-color-blue-200);
- }
- }
-}
diff --git a/packages/manager-react-components/src/components/templates/error/error.component.tsx b/packages/manager-react-components/src/components/templates/error/error.component.tsx
index a4a847d86033..a52f2437e893 100644
--- a/packages/manager-react-components/src/components/templates/error/error.component.tsx
+++ b/packages/manager-react-components/src/components/templates/error/error.component.tsx
@@ -12,11 +12,12 @@ import {
ODS_BUTTON_VARIANT,
} from '@ovhcloud/ods-components';
import './translations/translations';
-import OOPS from './assets/error-banner-oops.png';
import { ErrorBannerProps } from './error.types';
import { useTranslation } from 'react-i18next';
+import ErrorImg from '../../../../public/assets/error-banner-oops.png';
+
export const ErrorBanner = ({
error,
onRedirectHome,
@@ -27,7 +28,7 @@ export const ErrorBanner = ({
return (
>