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

ref: MANAGER-11680 Signed-off-by: Jean-Baptiste Delon <[email protected]>
ovh · Aug 9, 2023 · 4628d34 · 4628d34
1 parent 8ac58a2
commit 4628d34
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 11 deletions.
diff --git a/packages/manager/apps/dedicated/client/app/dedicated/server/details/server.service.js b/packages/manager/apps/dedicated/client/app/dedicated/server/details/server.service.js
@@ -8,7 +8,7 @@ import map from 'lodash/map';
 import parseInt from 'lodash/parseInt';
 import set from 'lodash/set';
 import snakeCase from 'lodash/snakeCase';
-import sortBy from 'lodash/sortBy';
+import orderBy from 'lodash/orderBy';
 import uniq from 'lodash/uniq';
 
 export default class Server {
@@ -2152,16 +2152,14 @@ export default class Server {
     );
   }
 
-  getHighestPriorityPartitionScheme(productId, templateName) {
+  getPartitionSchemesByPriority(productId, templateName) {
     return this.getPartitionSchemes(productId, templateName).then((schemes) => {
       const getSchemes = map(schemes, (scheme) =>
         this.getPartitionSchemePriority(productId, templateName, scheme),
       );
 
       return this.$q.all(getSchemes).then((schemesDetails) => {
-        const list = sortBy(schemesDetails, 'priority').reverse();
-
-        return list[0];
+        return map(orderBy(schemesDetails, 'priority', 'desc'), 'name');
       });
     });
   }

diff --git a/...dedicated/server/installation/gabarit/dedicated-server-installation-gabarit.controller.js b/...dedicated/server/installation/gabarit/dedicated-server-installation-gabarit.controller.js
@@ -77,6 +77,8 @@ angular
       $scope.load = function load() {
         $scope.loader.loading = true;
         $scope.installation.selectGabarit = null;
+        $scope.installation.partitionSchemesList = null;
+        $scope.installation.selectPartitionScheme = null;
         $scope.installation.selectFamily = null;
         $scope.installation.selectLanguage = null;
         $scope.installation.selectSoftRaidOnlyMirroring = null;
@@ -165,20 +167,24 @@ angular
           validForm: true,
         };
 
-        Server.getHighestPriorityPartitionScheme(
+        Server.getPartitionSchemesByPriority(
           $stateParams.productId,
           $scope.installation.selectGabarit.id,
         )
+          .then((response) => {
+            $scope.installation.partitionSchemesList = response;
+            [$scope.installation.selectPartitionScheme] = response;
+          })
           .then((response) =>
             Server.getPartitionSchemeHardwareRaid(
               $stateParams.productId,
               $scope.installation.selectGabarit.id,
-              response.name,
+              response[0],
             ),
           )
           .then((response) => {
-            if (response) {
-              tempHardwareRaid = response;
+            if (response[0]) {
+              [tempHardwareRaid] = response;
               return Server.getHardwareRaidProfile($stateParams.productId);
             }
             return null;

diff --git a/...ient/app/dedicated/server/installation/gabarit/dedicated-server-installation-gabarit.html b/...ient/app/dedicated/server/installation/gabarit/dedicated-server-installation-gabarit.html
@@ -476,7 +476,7 @@ <h4 class="panel-title">
                     </div>
 
                     <!-- nbDisk -->
-                    <div
+                    <p
                         class="form-inline"
                         data-ng-if="informations.nbDisk > 1"
                     >
@@ -505,7 +505,28 @@ <h4 class="panel-title">
                             data-ng-model="installation.nbDiskUse"
                         >
                         </select>
-                    </div>
+                    </p>
+
+                    <!-- selectPartitionScheme -->
+                    <p
+                        class="form-inline"
+                        data-ng-show="installation.partitionSchemesList.length > 1"
+                    >
+                        <label
+                            for="selectPartitionScheme"
+                            class="control-label"
+                            data-translate="server_configuration_installation_ovh_step2_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"
+                        >
+                        </select>
+                    </p>
                 </form>
 
                 <p