From b8660ed2a018ee9a13876fc37abe423b5fb9217a Mon Sep 17 00:00:00 2001
From: Alice Groux <alice.grx@gmail.com>
Date: Thu, 3 Jun 2021 13:42:44 +0200
Subject: [PATCH] feat(k8s/applications): reorder placement policies and select
 mandatory by default (#5063)

---
 .../models/application/formValues.js          |  2 +-
 .../create/createApplication.html             | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/kubernetes/models/application/formValues.js b/app/kubernetes/models/application/formValues.js
index 1b65b3efb..4d47a5ba5 100644
--- a/app/kubernetes/models/application/formValues.js
+++ b/app/kubernetes/models/application/formValues.js
@@ -23,7 +23,7 @@ const _KubernetesApplicationFormValues = Object.freeze({
   Configurations: [], // KubernetesApplicationConfigurationFormValue list
   PublishingType: KubernetesApplicationPublishingTypes.INTERNAL,
   PublishedPorts: [], // KubernetesApplicationPublishedPortFormValue list
-  PlacementType: KubernetesApplicationPlacementTypes.PREFERRED,
+  PlacementType: KubernetesApplicationPlacementTypes.MANDATORY,
   Placements: [], // KubernetesApplicationPlacementFormValue list
   OriginalIngresses: undefined,
 });
diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html
index 3303511fc..1e0b85111 100644
--- a/app/kubernetes/views/applications/create/createApplication.html
+++ b/app/kubernetes/views/applications/create/createApplication.html
@@ -1037,16 +1037,6 @@
                 <!-- placement policy options -->
                 <div class="form-group" style="margin-bottom: 0;" ng-if="ctrl.formValues.Placements.length">
                   <div class="boxselector_wrapper">
-                    <div>
-                      <input type="radio" id="placement_soft" ng-value="ctrl.ApplicationPlacementTypes.PREFERRED" ng-model="ctrl.formValues.PlacementType" />
-                      <label for="placement_soft">
-                        <div class="boxselector_header">
-                          <i class="fa fa-list" aria-hidden="true" style="margin-right: 2px;"></i>
-                          Preferred
-                        </div>
-                        <p>Schedule this application on nodes that match the rules if possible</p>
-                      </label>
-                    </div>
                     <div>
                       <input type="radio" id="placement_hard" ng-value="ctrl.ApplicationPlacementTypes.MANDATORY" ng-model="ctrl.formValues.PlacementType" />
                       <label for="placement_hard">
@@ -1057,6 +1047,16 @@
                         <p>Schedule this application <b>ONLY</b> on nodes that match <b>ALL</b> Rules</p>
                       </label>
                     </div>
+                    <div>
+                      <input type="radio" id="placement_soft" ng-value="ctrl.ApplicationPlacementTypes.PREFERRED" ng-model="ctrl.formValues.PlacementType" />
+                      <label for="placement_soft">
+                        <div class="boxselector_header">
+                          <i class="fa fa-list" aria-hidden="true" style="margin-right: 2px;"></i>
+                          Preferred
+                        </div>
+                        <p>Schedule this application on nodes that match the rules if possible</p>
+                      </label>
+                    </div>
                   </div>
                 </div>
                 <!-- !placement policy options -->