From 5f040bf788258a56665ce67cae0eab06f1ca26a7 Mon Sep 17 00:00:00 2001
From: Ali <83188384+testA113@users.noreply.github.com>
Date: Fri, 19 Jan 2024 12:20:44 +1300
Subject: [PATCH] fix(app): namespace selector fixes [EE-6561] (#10977)

---
 .../applications/create/createApplication.html   | 16 ++++++++--------
 .../ResourceReservationFormSection.tsx           |  7 -------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html
index 63b41adbc..dfc0156c1 100644
--- a/app/kubernetes/views/applications/create/createApplication.html
+++ b/app/kubernetes/views/applications/create/createApplication.html
@@ -66,7 +66,7 @@
               <namespace-selector
                 values="ctrl.formValues.ResourcePool.Namespace.Name"
                 on-change="(ctrl.onChangeNamespaceName)"
-                validation-data="{hasQuota: ctrl.state.resourcePoolHasQuota, isResourceQuotaCapacityExceeded: ctrl.resourceQuotaCapacityExceeded(), namespaceOptionCount: ctrl.resourcePools.length, isEnvironmentAdmin: ctrl.state.isEnvironmentAdmin}"
+                validation-data="{hasQuota: ctrl.state.resourcePoolHasQuota, isResourceQuotaCapacityExceeded: ctrl.resourceQuotaCapacityExceeded(), namespaceOptionCount: ctrl.resourcePools.length, isEnvironmentAdmin: ctrl.isAdmin}"
                 is-edit="ctrl.state.isEdit"
               ></namespace-selector>
               <!-- kubernetes services options -->
@@ -325,14 +325,14 @@
                   <!-- #endregion -->
                 </div>
 
-                <placement-form-section
-                  ng-show="ctrl.formValues.DeploymentType === ctrl.ApplicationDeploymentTypes.Replicated"
-                  values="{placements: ctrl.formValues.Placements, placementType: ctrl.formValues.PlacementType}"
-                  on-change="(ctrl.onChangePlacements)"
-                ></placement-form-section>
-
-                <!-- kubernetes services options -->
                 <div class="mb-8" ng-if="ctrl.formValues.ResourcePool">
+                  <placement-form-section
+                    ng-show="ctrl.formValues.DeploymentType === ctrl.ApplicationDeploymentTypes.Replicated"
+                    values="{placements: ctrl.formValues.Placements, placementType: ctrl.formValues.PlacementType}"
+                    on-change="(ctrl.onChangePlacements)"
+                  ></placement-form-section>
+
+                  <!-- kubernetes services options -->
                   <kube-services-form
                     on-change="(ctrl.onServicesChange)"
                     values="ctrl.formValues.Services"
diff --git a/app/react/kubernetes/applications/components/ResourceReservationFormSection/ResourceReservationFormSection.tsx b/app/react/kubernetes/applications/components/ResourceReservationFormSection/ResourceReservationFormSection.tsx
index ef38d63dc..1a5d8283c 100644
--- a/app/react/kubernetes/applications/components/ResourceReservationFormSection/ResourceReservationFormSection.tsx
+++ b/app/react/kubernetes/applications/components/ResourceReservationFormSection/ResourceReservationFormSection.tsx
@@ -42,13 +42,6 @@ export function ResourceReservationFormSection({
           application. Maximums are inherited from the namespace quota.
         </TextTip>
       )}
-      {namespaceHasQuota && resourceQuotaCapacityExceeded && (
-        <TextTip color="red">
-          This namespace has exhausted its resource capacity and you will not be
-          able to deploy the application. Contact your administrator to expand
-          the capacity of the namespace.
-        </TextTip>
-      )}
       <FormControl
         className="flex flex-row"
         label="Memory limit (MB)"