feat(dedicated): add choice partitioning scheme in ovh templates

ref: MANAGER-11680 Signed-off-by: Jean-Baptiste Delon <[email protected]>
ovh · Aug 10, 2023 · 27a856d · 27a856d
1 parent 8febde3
commit 27a856d
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 8 deletions.
diff --git a/...nager/apps/dedicated/client/app/dedicated/server/details/translations/Messages_fr_CA.json b/...nager/apps/dedicated/client/app/dedicated/server/details/translations/Messages_fr_CA.json
@@ -676,7 +676,7 @@
   "server_configuration_installation_ovh_step2_remaining_size": "Espace restant :",
   "server_configuration_installation_ovh_step2_remaining_size_button": "Espace restant",
   "server_configuration_installation_ovh_step2_info": "Configuration du schéma de partition de la distribution <b>{{t0}}</b>",
-  "server_configuration_installation_ovh_step2_scheme": "Choix du schéma de partion :",
+  "server_configuration_installation_ovh_step2_scheme": "Schéma de partitionnement prédéfini :",
   "server_configuration_installation_ovh_step2_raid_hard": "(Raid hard)",
   "server_configuration_installation_ovh_step2_info_partition_cachecade": "Dans une configuration CacheCade, l'espace disque dédié au cache ne peut être partitionné",
   "server_configuration_installation_ovh_step2_error_empty_scheme": "Aucun schema de parition n'est compatible pour le server {{t0}} pour la distribution {{t1}}. Veuillez choisir une autre distribition.",
@@ -718,6 +718,7 @@
   "server_configuration_installation_ovh_step3_partition_size": "Taille : <b>{{t0}}</b>",
   "server_configuration_installation_ovh_step3_error_integrity": "Une erreur a été détecté lors du test de coherence de votre installation personnalisé ({{t0}}). Installation impossible.",
   "server_configuration_installation_ovh_step3_error_integrity_info": "Veuillez corriger l'erreur en cliquant sur le bouton précédent",
+  "server_configuration_installation_ovh_step3_scheme": "Schéma de partitionnement :",
   "server_configuration_installation_ovh_step3_partition_variable": "Partition de taille variable :",
   "server_configuration_installation_ovh_step3_partition_variable_help": "Cette partition occupera l'espace disponible restant afin d'adapter ce gabarit sur un serveur dont l'espace total est différent.",
   "server_configuration_installation_ovh_step3_partition_variable_info": "La partition <b>{{t0}}</b> adaptera donc sa taille afin d'occuper l'espace disponible restant d'un autre serveur",

diff --git a/...nager/apps/dedicated/client/app/dedicated/server/details/translations/Messages_fr_FR.json b/...nager/apps/dedicated/client/app/dedicated/server/details/translations/Messages_fr_FR.json
@@ -676,7 +676,7 @@
   "server_configuration_installation_ovh_step2_remaining_size": "Espace restant :",
   "server_configuration_installation_ovh_step2_remaining_size_button": "Espace restant",
   "server_configuration_installation_ovh_step2_info": "Configuration du schéma de partition de la distribution <b>{{t0}}</b>",
-  "server_configuration_installation_ovh_step2_scheme": "Choix du schéma de partion :",
+  "server_configuration_installation_ovh_step2_scheme": "Schéma de partitionnement prédéfini :",
   "server_configuration_installation_ovh_step2_raid_hard": "(Raid hard)",
   "server_configuration_installation_ovh_step2_info_partition_cachecade": "Dans une configuration CacheCade, l'espace disque dédié au cache ne peut être partitionné",
   "server_configuration_installation_ovh_step2_error_empty_scheme": "Aucun schema de parition n'est compatible pour le server {{t0}} pour la distribution {{t1}}. Veuillez choisir une autre distribition.",
@@ -718,6 +718,7 @@
   "server_configuration_installation_ovh_step3_partition_size": "Taille : <b>{{t0}}</b>",
   "server_configuration_installation_ovh_step3_error_integrity": "Une erreur a été détecté lors du test de coherence de votre installation personnalisé ({{t0}}). Installation impossible.",
   "server_configuration_installation_ovh_step3_error_integrity_info": "Veuillez corriger l'erreur en cliquant sur le bouton précédent",
+  "server_configuration_installation_ovh_step3_scheme": "Schéma de partitionnement :",
   "server_configuration_installation_ovh_step3_partition_variable": "Partition de taille variable :",
   "server_configuration_installation_ovh_step3_partition_variable_help": "Cette partition occupera l'espace disponible restant afin d'adapter ce gabarit sur un serveur dont l'espace total est différent.",
   "server_configuration_installation_ovh_step3_partition_variable_info": "La partition <b>{{t0}}</b> adaptera donc sa taille afin d'occuper l'espace disponible restant d'un autre serveur",

diff --git a/...ent/app/dedicated/server/installation/ovh/dedicated-server-installation-ovh.controller.js b/...ent/app/dedicated/server/installation/ovh/dedicated-server-installation-ovh.controller.js
@@ -586,10 +586,12 @@ angular
       }
 
       function showPartition() {
-        // Select hight priority partition scheme
-        [
-          $scope.installation.selectPartitionScheme,
-        ] = $scope.installation.partitionSchemesList;
+        if ($scope.installation.selectPartitionScheme === null) {
+          // Select hight priority partition scheme
+          [
+            $scope.installation.selectPartitionScheme,
+          ] = $scope.installation.partitionSchemesList;
+        }
 
         // Get Partition list of largest partition scheme
         Server.getOvhPartitionSchemesTemplatesDetail(
@@ -732,7 +734,7 @@ angular
                   )
                   .then(() => {
                     $scope.installation.partitionSchemesList.unshift(
-                      newPartitioningScheme,
+                      newPartitioningScheme.name,
                     );
                     showPartition();
                   })

diff --git a/...cated/client/app/dedicated/server/installation/ovh/dedicated-server-installation-ovh.html b/...cated/client/app/dedicated/server/installation/ovh/dedicated-server-installation-ovh.html
@@ -518,7 +518,20 @@ <h4 class="panel-title">
                     ></span>
                     <strong
                         data-ng-bind="getDisplaySize(informations.remainingSize)"
-                    ></strong>
+                    ></strong
+                    >&nbsp;
+                    <span
+                        data-translate="server_configuration_installation_ovh_step2_scheme"
+                        data-ng-show="installation.partitionSchemesList.length > 1 && !installation.noPartitioning"
+                    ></span>
+                    <select
+                        class="form-control"
+                        data-ng-show="installation.partitionSchemesList.length > 1 && !installation.noPartitioning"
+                        data-ng-options="partitionScheme as partitionScheme for partitionScheme in installation.partitionSchemesList"
+                        data-ng-model="installation.selectPartitionScheme"
+                        data-ng-change="loadPartition()"
+                    >
+                    </select>
                 </div>
 
                 <div
@@ -1364,6 +1377,27 @@ <h4 class="panel-title">
                     data-translate="server_configuration_installation_ovh_step3_info"
                 ></p>
 
+                <p
+                    class="form-inline"
+                    data-ng-show="installation.partitionSchemesList.length > 1 && installation.noPartitioning"
+                >
+                    <label
+                        for="selectPartitionScheme"
+                        class="control-label"
+                        data-translate="server_configuration_installation_ovh_step3_scheme"
+                    >
+                    </label>
+                    <select
+                        class="form-control"
+                        id="selectPartitionScheme"
+                        name="selectPartitionScheme"
+                        data-ng-options="partitionScheme as partitionScheme for partitionScheme in installation.partitionSchemesList"
+                        data-ng-model="installation.selectPartitionScheme"
+                        data-ng-change="loadPartition()"
+                    >
+                    </select>
+                </p>
+
                 <div class="table-responsive">
                     <table class="table table-striped">
                         <thead>