From 3902101aec6537397493ade5f12ea9a4583c6d7d Mon Sep 17 00:00:00 2001
From: Taras Hlukhovetskyi
 <Taras_Bohdanovych_Hlukhovetskyi@external.mckinsey.com>
Date: Mon, 22 Jun 2026 14:57:33 +0300
Subject: [PATCH 1/3] [FIX] [UI] API Gateway tab displays incorrect values for
 SSL Redirect and Port settings

---
 .../ApiGateways/ApplicationApiGateways.jsx    |  4 ++--
 .../ApiGateways/apiGatewaysColumns.jsx        | 20 +++++++++++--------
 .../applicationDetails.constants.js           |  1 +
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/ApplicationApiGateways.jsx b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/ApplicationApiGateways.jsx
index b7f6897e9..8d71e6489 100644
--- a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/ApplicationApiGateways.jsx
+++ b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/ApplicationApiGateways.jsx
@@ -30,7 +30,7 @@ import { filterApiGatewaysBySearchFields } from './applicationApiGateways.util'
 import {
   API_GATEWAYS_FILTER_CONFIG,
   API_GATEWAYS_NO_DATA_MESSAGE,
-  DEFAULT_NAME_SORTING,
+  DEFAULT_CREATED_AT_SORTING,
   FILTER_ALL_OPTION,
   VIEW_YAML_LABEL
 } from '../applicationDetails.constants'
@@ -85,7 +85,7 @@ const ApplicationApiGateways = ({ application }) => {
         renderFilters={renderFilters}
         rowActions={rowActions}
         showRefreshButton={false}
-        initialSorting={DEFAULT_NAME_SORTING}
+        initialSorting={DEFAULT_CREATED_AT_SORTING}
         noDataMessage={API_GATEWAYS_NO_DATA_MESSAGE}
       />
       <YamlModal open={!!yamlGateway} data={yamlGateway} onClose={handleCloseYaml} />
diff --git a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
index a3cb71586..3dbe3205a 100644
--- a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
+++ b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
@@ -98,12 +98,12 @@ export const apiGatewaysColumns = [
     id: 'sslRedirect',
     header: 'SSL redirect',
     size: 8,
-    accessorFn: row => row.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION] ?? '',
+    accessorFn: row => Boolean(row.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION]) ? 'True' : 'False',
     cell: ({ row }) => (
-      <span className="text-igz-secondary">
-        {row.original.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION] ?? ''}
-      </span>
-    )
+        <span className="text-igz-secondary">
+        {Boolean(row.original.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION]) ? 'True' : 'False'}
+        </span>
+      )
   },
   {
     id: 'createdAt',
@@ -121,9 +121,13 @@ export const apiGatewaysColumns = [
     header: 'Port',
     size: 6,
     accessorFn: row => row.matchedUpstream?.port ?? '',
-    cell: ({ row }) => (
-      <span className="text-igz-secondary">{row.original.matchedUpstream?.port ?? ''}</span>
-    )
+    cell: ({ row }) => {
+      return (
+        <span className="text-igz-secondary">
+          {parseInt(row.original.matchedUpstream?.port) || ''}
+        </span>
+      )
+    }
   },
   {
     id: 'owner',
diff --git a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/applicationDetails.constants.js b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/applicationDetails.constants.js
index c33f6b55e..c8c1fd58b 100644
--- a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/applicationDetails.constants.js
+++ b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/applicationDetails.constants.js
@@ -109,3 +109,4 @@ export const API_GATEWAYS_NO_DATA_MESSAGE = 'No API gateways found for this appl
 export const FILTER_ALL_OPTION = { value: 'all', label: 'All' }
 export const FILTER_ALL_OPTION_VALUE = FILTER_ALL_OPTION.value
 export const DEFAULT_NAME_SORTING = [{ id: 'name', desc: false }]
+export const DEFAULT_CREATED_AT_SORTING = [{ id: 'createdAt', desc: true }]

From e10348620129d98342a19164b672edd03cb0c8c5 Mon Sep 17 00:00:00 2001
From: Taras Hlukhovetskyi
 <Taras_Bohdanovych_Hlukhovetskyi@external.mckinsey.com>
Date: Mon, 22 Jun 2026 15:02:39 +0300
Subject: [PATCH 2/3] formatting

---
 .../ApiGateways/apiGatewaysColumns.jsx              | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
index 3dbe3205a..20e0b9153 100644
--- a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
+++ b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
@@ -98,12 +98,15 @@ export const apiGatewaysColumns = [
     id: 'sslRedirect',
     header: 'SSL redirect',
     size: 8,
-    accessorFn: row => Boolean(row.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION]) ? 'True' : 'False',
+    accessorFn: row =>
+      Boolean(row.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION]) ? 'True' : 'False',
     cell: ({ row }) => (
-        <span className="text-igz-secondary">
-        {Boolean(row.original.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION]) ? 'True' : 'False'}
-        </span>
-      )
+      <span className="text-igz-secondary">
+        {Boolean(row.original.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION])
+          ? 'True'
+          : 'False'}
+      </span>
+    )
   },
   {
     id: 'createdAt',

From 5c92cf0595defdc6991e386cd704c886f9160f8d Mon Sep 17 00:00:00 2001
From: Taras Hlukhovetskyi
 <Taras_Bohdanovych_Hlukhovetskyi@external.mckinsey.com>
Date: Mon, 22 Jun 2026 15:09:45 +0300
Subject: [PATCH 3/3] fix lint

---
 .../ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
index 20e0b9153..f0b2885f0 100644
--- a/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
+++ b/src/nextGenComponents/pages/ApplicationsPage/ApplicationDetails/ApiGateways/apiGatewaysColumns.jsx
@@ -99,10 +99,10 @@ export const apiGatewaysColumns = [
     header: 'SSL redirect',
     size: 8,
     accessorFn: row =>
-      Boolean(row.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION]) ? 'True' : 'False',
+      row.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION] === 'true' ? 'True' : 'False',
     cell: ({ row }) => (
       <span className="text-igz-secondary">
-        {Boolean(row.original.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION])
+        {row.original.metadata?.annotations?.[FORCE_SSL_REDIRECT_ANNOTATION] === 'true'
           ? 'True'
           : 'False'}
       </span>