From 8940d25df3226ea17d0c71b99ceddc8a1258289a Mon Sep 17 00:00:00 2001 From: Selmen AKRMI Date: Fri, 11 Oct 2024 09:37:15 +0200 Subject: [PATCH 01/39] feat(pci-object-storage): s3 localzones ref: TAPC-1189 Signed-off-by: Selmen AKRMI --- .../storages/containers/add/add.controller.js | 19 +++++++++++++++ .../project/storages/containers/add/add.html | 24 +++++++++++++------ .../add/translations/Messages_fr_FR.json | 5 +++- .../container/container.controller.js | 7 ++++++ .../containers/container/container.html | 11 +++++---- .../container/object/add/add.controller.js | 1 + .../containers/containers.constants.js | 16 +++++++++++++ .../containers/containers.controller.js | 2 ++ .../storages/containers/containers.html | 8 ++++++- .../translations/Messages_fr_FR.json | 3 ++- .../objects/object/object.routing.js | 11 +++++++-- .../object-storage/objects/objects.routing.js | 1 + .../user-add/translations/Messages_fr_FR.json | 3 ++- .../users/add/user-add/user-add.html | 3 +++ .../users/translations/Messages_fr_FR.json | 3 ++- .../storages/object-storage/users/users.html | 6 +++++ 16 files changed, 104 insertions(+), 19 deletions(-) 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 049aa12b0370..582e35f3693f 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 @@ -19,6 +19,7 @@ import { OBJECT_CONTAINER_MODE_MONO_ZONE, STORAGE_STANDARD_PLANCODE, SWIFT_PLANCODE, + OBJECT_CONTAINER_MODE_LOCAL_ZONE, } from '../containers.constants'; import { CONTAINER_USER_ASSOCIATION_MODES } from './components/associate-user-to-container/constant'; @@ -237,9 +238,27 @@ export default class PciStoragesContainersAddController { OBJECT_CONTAINER_MODE_MONO_ZONE, ), ); + + this.OBJECT_CONTAINER_DEPLOYMENT_MODES_LABELS[ + OBJECT_CONTAINER_MODE_LOCAL_ZONE + ].price = + this.getLowestPriceAddon( + productCapability, + OBJECT_CONTAINER_MODE_LOCAL_ZONE, + ) && + this.PriceFormatter.format( + this.getLowestPriceAddon( + productCapability, + OBJECT_CONTAINER_MODE_LOCAL_ZONE, + ), + ); }); } + isLocalZone() { + return this.container.deploymentMode === OBJECT_CONTAINER_MODE_LOCAL_ZONE; + } + isRightOffer() { return OBJECT_CONTAINER_OFFER_STORAGE_STANDARD === this.container.offer; } 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 15d6ff37c8b6..0a65c4426e59 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,12 +197,12 @@

> data-ng-if="$ctrl.OBJECT_CONTAINER_DEPLOYMENT_MODES_LABELS[deploymentModeName].isMultiZone" data-translate="pci_projects_project_storages_containers_add_deployment_mode_soon" > +

> + @@ -364,7 +374,7 @@

({ ...object, diff --git a/packages/manager/modules/pci/src/projects/project/storages/containers/container/container.html b/packages/manager/modules/pci/src/projects/project/storages/containers/container/container.html index 39df2345de68..af6c447b4d4e 100644 --- a/packages/manager/modules/pci/src/projects/project/storages/containers/container/container.html +++ b/packages/manager/modules/pci/src/projects/project/storages/containers/container/container.html @@ -63,7 +63,7 @@

@@ -77,13 +77,14 @@

@@ -103,7 +104,7 @@

-

+

@@ -118,7 +119,7 @@ >

-

+