From 40237c40771a3a8597f27635a28698e3bcd5dc3c Mon Sep 17 00:00:00 2001
From: ChamodA <chamoda@wso2.com>
Date: Tue, 2 Dec 2025 14:23:11 +0530
Subject: [PATCH 1/2] Fix condition for processing focus inputs in
 processTypeFields function

---
 .../src/rpc-managers/data-mapper/utils.ts                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts b/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts
index b3357ad269..f9e45db90d 100644
--- a/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts
+++ b/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts
@@ -732,7 +732,7 @@ function processTypeFields(
 
         let isFocused = false;
         let isSeq = !!model.groupById;
-        if (model.focusInputs) {
+        if (isSeq && model.focusInputs) {
             const focusMember = model.focusInputs[fieldId];
             if (focusMember) {
                 field = focusMember;
@@ -751,8 +751,8 @@ function processTypeFields(
             displayName: field.displayName,
             typeName: field.typeName,
             kind: field.kind,
-            ...(isFocused && { isFocused }),
-            ...(isSeq && { isSeq }),
+            // ...(isFocused && { isFocused }),
+            // ...(isSeq && { isSeq }),
             ...(field.optional !== undefined && { optional: field.optional }),
             ...(field.typeInfo && { typeInfo: field.typeInfo })
         };

From 44a799bdedf189455227e6e585d2ceeb9da3651e Mon Sep 17 00:00:00 2001
From: ChamodA <chamoda@wso2.com>
Date: Tue, 2 Dec 2025 14:27:32 +0530
Subject: [PATCH 2/2] Fix processTypeFields to correctly include isFocused and
 isSeq properties

---
 .../ballerina-extension/src/rpc-managers/data-mapper/utils.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts b/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts
index f9e45db90d..eb84089cc1 100644
--- a/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts
+++ b/workspaces/ballerina/ballerina-extension/src/rpc-managers/data-mapper/utils.ts
@@ -751,8 +751,8 @@ function processTypeFields(
             displayName: field.displayName,
             typeName: field.typeName,
             kind: field.kind,
-            // ...(isFocused && { isFocused }),
-            // ...(isSeq && { isSeq }),
+            ...(isFocused && { isFocused }),
+            ...(isSeq && { isSeq }),
             ...(field.optional !== undefined && { optional: field.optional }),
             ...(field.typeInfo && { typeInfo: field.typeInfo })
         };