From 87cb0a27b101002546eca2ee3a414f7457872698 Mon Sep 17 00:00:00 2001
From: raymondnguyen8 <148518354+raymondnguyen8@users.noreply.github.com>
Date: Fri, 23 Feb 2024 14:48:07 +0700
Subject: [PATCH] [PH-38] Instance types setting cannot be saved properly
 (#499)

Signed-off-by: raymond nguyen <raymond.nguyen@vmogroup.com>
---
 .../client/src/admin/InstanceTypes/InstanceTypeForm.tsx    | 7 +++----
 packages/graphql-server/src/resolvers/instanceType.ts      | 3 ++-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/client/src/admin/InstanceTypes/InstanceTypeForm.tsx b/packages/client/src/admin/InstanceTypes/InstanceTypeForm.tsx
index d5c5e63c9..a4aeb2a22 100644
--- a/packages/client/src/admin/InstanceTypes/InstanceTypeForm.tsx
+++ b/packages/client/src/admin/InstanceTypes/InstanceTypeForm.tsx
@@ -232,10 +232,9 @@ export function _InstanceTypeForm({
 
   React.useEffect(() => {
     if (data) {
-      if (data?.tolerations.length > 0) {
-        const tolerations = data.tolerations.map(t => omit(t, ['__typename']));
-        setTolerations(tolerations);
-      }
+      
+      const tolerations = data.tolerations.map(t => omit(t, ['__typename']));
+      setTolerations(tolerations);
 
       if (data?.groups.length > 0) {
         dispatchUserGroups({ type: 'GROUPS', groups: data.groups });
diff --git a/packages/graphql-server/src/resolvers/instanceType.ts b/packages/graphql-server/src/resolvers/instanceType.ts
index 1612d3fe2..9c5595844 100644
--- a/packages/graphql-server/src/resolvers/instanceType.ts
+++ b/packages/graphql-server/src/resolvers/instanceType.ts
@@ -179,6 +179,7 @@ export const updateMapping = (data: any) => {
   expectInputLargerThanZero(data.memoryLimit, 'memoryLimit');
 
   const tolerations = validateAndMapTolerations(get(data, 'tolerations.set'), 'update');
+  const nodeSelector = (data.nodeSelector && isEmpty(data.nodeSelector)) ? null : data.nodeSelector;
 
   return {
     metadata: {
@@ -192,7 +193,7 @@ export const updateMapping = (data: any) => {
       'limits.nvidia.com/gpu': data.gpuLimit,
       'requests.cpu': data.cpuRequest,
       'requests.memory': parseRequestField(data.memoryRequest, stringifyMemory),
-      'nodeSelector': data.nodeSelector,
+      'nodeSelector': nodeSelector,
       tolerations,
     }
   };