From d750389c6743deed2885d4969c892df790ff086c Mon Sep 17 00:00:00 2001
From: Ali <83188384+testA113@users.noreply.github.com>
Date: Mon, 15 Jan 2024 11:03:38 +1300
Subject: [PATCH] fix(app): fix exhaused error message [EE-6231] (#10949)

Co-authored-by: testa113 <testa113>
---
 .../views/applications/create/createApplication.html        | 4 ++--
 .../applications/create/createApplicationController.js      | 1 +
 .../NamespaceSelector/namespaceSelectorValidation.ts        | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html
index 51a00f257..5373e20a4 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, isAdmin: ctrl.isAdmin}"
+                validation-data="{hasQuota: ctrl.state.resourcePoolHasQuota, isResourceQuotaCapacityExceeded: ctrl.resourceQuotaCapacityExceeded(), namespaceOptionCount: ctrl.resourcePools.length, isEnvironmentAdmin: ctrl.state.isEnvironmentAdmin}"
                 is-edit="ctrl.state.isEdit"
               ></namespace-selector>
               <!-- kubernetes services options -->
@@ -159,7 +159,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, isAdmin: ctrl.isAdmin}"
+                validation-data="{hasQuota: ctrl.state.resourcePoolHasQuota, isResourceQuotaCapacityExceeded: ctrl.resourceQuotaCapacityExceeded(), namespaceOptionCount: ctrl.resourcePools.length, isEnvironmentAdmin: ctrl.state.isEnvironmentAdmin}"
                 is-edit="ctrl.state.isEdit"
               ></namespace-selector>
               <!-- #endregion -->
diff --git a/app/kubernetes/views/applications/create/createApplicationController.js b/app/kubernetes/views/applications/create/createApplicationController.js
index ddb7e8462..77d5da03f 100644
--- a/app/kubernetes/views/applications/create/createApplicationController.js
+++ b/app/kubernetes/views/applications/create/createApplicationController.js
@@ -121,6 +121,7 @@ class KubernetesCreateApplicationController {
       persistedFoldersUseExistingVolumes: false,
       pullImageValidity: false,
       nodePortServices: [],
+      isEnvironmentAdmin: this.Authentication.hasAuthorizations(['K8sResourcePoolsW']),
     };
 
     this.isAdmin = this.Authentication.isAdmin();
diff --git a/app/react/kubernetes/applications/components/NamespaceSelector/namespaceSelectorValidation.ts b/app/react/kubernetes/applications/components/NamespaceSelector/namespaceSelectorValidation.ts
index 222a50c1f..d00b5cc8b 100644
--- a/app/react/kubernetes/applications/components/NamespaceSelector/namespaceSelectorValidation.ts
+++ b/app/react/kubernetes/applications/components/NamespaceSelector/namespaceSelectorValidation.ts
@@ -4,7 +4,7 @@ type ValidationData = {
   hasQuota: boolean;
   isResourceQuotaCapacityExceeded: boolean;
   namespaceOptionCount: number;
-  isAdmin: boolean;
+  isEnvironmentAdmin: boolean;
 };
 
 const emptyValue =
@@ -17,7 +17,7 @@ export function namespaceSelectorValidation(
     hasQuota,
     isResourceQuotaCapacityExceeded,
     namespaceOptionCount,
-    isAdmin,
+    isEnvironmentAdmin,
   } = validationData || {};
   return string()
     .required(emptyValue)
@@ -25,7 +25,7 @@ export function namespaceSelectorValidation(
     .test(
       'resourceQuotaCapacityExceeded',
       `This namespace has exhausted its resource capacity and you will not be able to deploy the application.${
-        isAdmin
+        isEnvironmentAdmin
           ? ''
           : ' Contact your administrator to expand the capacity of the namespace.'
       }`,