sync: master to develop

ovh · Oct 18, 2024 · 4720767 · 4720767
2 parents 01677dc + e62d5d0
commit 4720767
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 6 deletions.
diff --git a/packages/manager/modules/pci/src/components/project/regions-list/regions-list.controller.js b/packages/manager/modules/pci/src/components/project/regions-list/regions-list.controller.js
@@ -163,7 +163,9 @@ export default class RegionsListController {
           }
         })
         .finally(() => {
-          this.loadEnd();
+          if (this.loadEnd) {
+            this.loadEnd();
+          }
         });
     } else {
       this.regionsByDeploymentMode = this.regions;
@@ -221,7 +223,9 @@ export default class RegionsListController {
         );
         this.macroRegion = this.region?.macroRegion.text;
       }
-      this.loadEnd();
+      if (this.loadEnd) {
+        this.loadEnd();
+      }
     }
   }
 

diff --git a/...anager/modules/pci/src/projects/project/storages/cloud-archives/cloud-archives.routing.js b/...anager/modules/pci/src/projects/project/storages/cloud-archives/cloud-archives.routing.js
@@ -105,6 +105,17 @@ export default /* @ngInject */ ($stateProvider) => {
         $translate.instant(
           'pci_projects_project_storages_containers_archive_title',
         ),
+
+      regions: /* @ngInject */ (PciProjectRegions, projectId) =>
+        PciProjectRegions.getAvailableRegions(projectId).then((regions) => {
+          return regions.reduce((acc, region) => {
+            acc[region.name] = region;
+            return acc;
+          }, {});
+        }),
+
+      catalog: /* @ngInject */ (PciStoragesObjectStorageService) =>
+        PciStoragesObjectStorageService.getCatalog(),
     },
   });
 };
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
@@ -78,7 +78,9 @@ export default class PciStoragesContainersAddController {
       deploymentMode: null,
     });
     this.container.region = null;
-    this.container.offer = OBJECT_CONTAINER_OFFER_STORAGE_STANDARD;
+    this.container.offer = this.archive
+      ? null
+      : OBJECT_CONTAINER_OFFER_STORAGE_STANDARD;
 
     this.userModel = {
       linkedMode: {

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
@@ -302,7 +302,7 @@ <h2 class="oui-header__description mb-5">
     <!--Regions list-->
     <oui-step-form
         data-position="{{!$ctrl.archive && $ctrl.isRightOffer() ? 2 : 1}}"
-        ata-ng-if="!$ctrl.archive && (!$ctrl.isRightOffer() || $ctrl.container.deploymentMode)"
+        data-ng-if="!$ctrl.archive && (!$ctrl.isRightOffer() || $ctrl.container.deploymentMode)"
         data-name="storage_container_add_region"
         data-header="{{:: 'pci_projects_project_storages_containers_add_region_title' | translate }}"
         data-navigation="$ctrl.container.region"
@@ -364,7 +364,7 @@ <h2 class="oui-header__description mb-5">
     <!--Create/Linked user-->
     <oui-step-form
         data-position="3"
-        data-ng-if="$ctrl.isRightOffer()"
+        data-ng-if="!$ctrl.archive && $ctrl.isRightOffer()"
         data-header="{{:: 'pci_projects_project_storages_containers_add_create_or_linked_user_title' | translate }}"
         data-navigation="$ctrl.isReadyForValidation()"
         data-name="storage_container_add_user"

diff --git a/...ges/manager/modules/pci/src/projects/project/storages/containers/containers.controller.js b/...ges/manager/modules/pci/src/projects/project/storages/containers/containers.controller.js
@@ -79,7 +79,7 @@ export default class PciStoragesContainersController {
     this.containers = this.containers.reduce((acc, container) => {
       acc.push({
         ...container,
-        deploymentMode: this.regions[container.region].type,
+        deploymentMode: this.regions?.[container.region].type || null,
       });
       return acc;
     }, []);