Merge remote-tracking branch 'upstream/main'

madushajg · madushajg · commit 3a9d55acdd90 · 2025-12-02T13:53:41.000+05:30
diff --git a/workspaces/ballerina/ballerina-extension/CHANGELOG.md b/workspaces/ballerina/ballerina-extension/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to the **Ballerina** extension will be documented in this fi
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [5.6.3](https://github.com/wso2/vscode-extensions/compare/ballerina-integrator-1.5.2...ballerina-integrator-1.5.3) - 2025-12-01
+
+### Changed
+
+- **Data Mapper** — Improved completion support for the expression bar and clause editor. Re-enabled array aggregating options.
+
+### Fixed
+
+- **Data Mapper** — Fixed expression bar focusing, inline undo button, and crashes during mapping clearance.
+- **AI Data Mapper** — Fixed error handling, output formatting, and compilation errors.
 
 ## [5.6.2](https://github.com/wso2/vscode-extensions/compare/ballerina-integrator-1.5.1...ballerina-integrator-1.5.2) - 2025-11-18
 
diff --git a/workspaces/ballerina/ballerina-extension/package.json b/workspaces/ballerina/ballerina-extension/package.json
@@ -2,7 +2,7 @@
     "name": "ballerina",
     "displayName": "Ballerina",
     "description": "Ballerina Language support, debugging, graphical visualization, AI-based data-mapping and many more.",
-    "version": "5.6.2",
+    "version": "5.6.3",
     "publisher": "wso2",
     "icon": "resources/images/ballerina.png",
     "homepage": "https://wso2.com/ballerina/vscode/docs",
diff --git a/workspaces/ballerina/ballerina-extension/src/features/ai/service/datamapper/datamapper.ts b/workspaces/ballerina/ballerina-extension/src/features/ai/service/datamapper/datamapper.ts
@@ -43,6 +43,12 @@ import { URI } from "vscode-uri";
 import fs from 'fs';
 import { writeBallerinaFileDidOpenTemp } from "../../../../../src/utils/modification";
 
+const NO_MAPPINGS_GENERATED_WARNING = `**No Relevant Mappings Generated**\n\n` +
+    `The AI was unable to identify compatible field mappings between the input and output structures.\n\n` +
+    `**Suggestions:**\n` +
+    `- Check if input and output record structures are correct\n` +
+    `- Try providing mapping hints or examples\n`;
+
 // =============================================================================
 // ENHANCED MAIN ORCHESTRATOR FUNCTION
 // =============================================================================
@@ -340,6 +346,13 @@ export async function generateMappingCodeCore(mappingRequest: ProcessMappingPara
         attachments: mappingRequest.attachments
     }, context, eventHandler);
 
+    // Check if no mappings were generated
+    if (!allMappingsRequest.mappings || allMappingsRequest.mappings.length === 0) {
+        eventHandler({ type: "content_block", content: NO_MAPPINGS_GENERATED_WARNING });
+        eventHandler({ type: "stop", command: Command.DataMap });
+        return;
+    }
+
     const sourceCodeResponse = await getAllDataMapperSource(allMappingsRequest);
 
     await updateSourceCode({ textEdits: sourceCodeResponse.textEdits, skipPayloadCheck: true });
@@ -694,6 +707,13 @@ export async function generateInlineMappingCodeCore(inlineMappingRequest: Metada
     const inlineMappingsResult: InlineMappingsSourceResult =
         await generateInlineMappingsSource(inlineMappingRequest, langClient, context, eventHandler);
 
+    // Check if no mappings were generated
+    if (!inlineMappingsResult.allMappingsRequest.mappings || inlineMappingsResult.allMappingsRequest.mappings.length === 0) {
+        eventHandler({ type: "content_block", content: NO_MAPPINGS_GENERATED_WARNING });
+        eventHandler({ type: "stop", command: Command.DataMap });
+        return;
+    }
+
     await updateSourceCode({ textEdits: inlineMappingsResult.sourceResponse.textEdits, skipPayloadCheck: true });
     await new Promise((resolve) => setTimeout(resolve, 100));
 
diff --git a/workspaces/ballerina/ballerina-side-panel/src/components/editors/MultiModeExpressionEditor/ChipExpressionEditor/CodeUtils.ts b/workspaces/ballerina/ballerina-side-panel/src/components/editors/MultiModeExpressionEditor/ChipExpressionEditor/CodeUtils.ts
@@ -32,6 +32,7 @@ import {
     getTokenTypeColor,
     getChipDisplayContent
 } from "./chipStyles";
+import { HELPER_PANE_WIDTH } from "./constants";
 
 export type TokenStream = number[];
 
@@ -443,7 +444,6 @@ export const buildOnFocusListner = (onTrigger: (cursor: CursorInfo) => void) =>
                 let relativeTop = coords.bottom - editorRect.top + 5;
                 let relativeLeft = coords.left - editorRect.left;
 
-                const HELPER_PANE_WIDTH = 300;
                 const editorWidth = editorRect.width;
                 const relativeRight = relativeLeft + HELPER_PANE_WIDTH;
                 const overflow = relativeRight - editorWidth;
@@ -477,7 +477,6 @@ export const buildOnSelectionChange = (onTrigger: (cursor: CursorInfo) => void)
             let relativeTop = coords.bottom - editorRect.top + 5;
             let relativeLeft = coords.left - editorRect.left;
 
-            const HELPER_PANE_WIDTH = 300;
             const editorWidth = editorRect.width;
             const relativeRight = relativeLeft + HELPER_PANE_WIDTH;
             const overflow = relativeRight - editorWidth;
@@ -548,7 +547,6 @@ export const buildOnChangeListner = (onTrigeer: (newValue: string, cursor: Curso
             let relativeTop = coords.bottom - editorRect.top + 5;
             let relativeLeft = coords.left - editorRect.left;
 
-            const HELPER_PANE_WIDTH = 300;
             const editorWidth = editorRect.width;
             const relativeRight = relativeLeft + HELPER_PANE_WIDTH;
             const overflow = relativeRight - editorWidth;
diff --git a/workspaces/ballerina/ballerina-side-panel/src/components/editors/MultiModeExpressionEditor/ChipExpressionEditor/components/ChipExpressionEditor.tsx b/workspaces/ballerina/ballerina-side-panel/src/components/editors/MultiModeExpressionEditor/ChipExpressionEditor/components/ChipExpressionEditor.tsx
@@ -49,6 +49,7 @@ import FXButton from "./FxButton";
 import { HelperPaneToggleButton } from "./HelperPaneToggleButton";
 import { HelperPane } from "./HelperPane";
 import { listContinuationKeymap } from "../../../ExpandedEditor/utils/templateUtils";
+import { HELPER_PANE_WIDTH } from "../constants";
 
 type HelperPaneState = {
     isOpen: boolean;
@@ -245,11 +246,10 @@ export const ChipExpressionEditorComponent = (props: ChipExpressionEditorCompone
         let top = buttonRect.bottom - editorRect.top;
         let left = buttonRect.left - editorRect.left;
 
-        // Add overflow correction for window boundaries
-        const HELPER_PANE_WIDTH = 300;
-        const viewportWidth = window.innerWidth;
-        const absoluteLeft = buttonRect.left;
-        const overflow = absoluteLeft + HELPER_PANE_WIDTH - viewportWidth;
+        // Add overflow correction for editor boundaries
+        const editorWidth = editorRect.width;
+        const relativeRight = left + HELPER_PANE_WIDTH;
+        const overflow = relativeRight - editorWidth;
 
         if (overflow > 0) {
             left -= overflow;
diff --git a/workspaces/ballerina/ballerina-side-panel/src/components/editors/MultiModeExpressionEditor/ChipExpressionEditor/constants.ts b/workspaces/ballerina/ballerina-side-panel/src/components/editors/MultiModeExpressionEditor/ChipExpressionEditor/constants.ts
@@ -18,6 +18,7 @@
 
 export const CHIP_EXPRESSION_EDITOR_HEIGHT = 26;
 export const EXPANDED_EDITOR_HEIGHT = 500;
+export const HELPER_PANE_WIDTH = 300;
 
 // Data attributes
 export const DATA_CHIP_ATTRIBUTE = 'data-chip';
diff --git a/workspaces/ballerina/data-mapper/src/components/DataMapper/Header/DataMapperHeader.tsx b/workspaces/ballerina/data-mapper/src/components/DataMapper/Header/DataMapperHeader.tsx
@@ -67,7 +67,6 @@ export function DataMapperHeader(props: DataMapperHeaderProps) {
                 </BreadCrumb>
                 <RightContainer isClickable={!hasEditDisabled}>
                     <ActionGroupContaner>
-                        {undoRedoGroup && undoRedoGroup()}
                         <ActionIconButton
                             onClick={onReset}
                             iconName="clear-all"
diff --git a/workspaces/ballerina/data-mapper/src/components/DataMapper/SidePanel/QueryClauses/ClauseEditor.tsx b/workspaces/ballerina/data-mapper/src/components/DataMapper/SidePanel/QueryClauses/ClauseEditor.tsx
@@ -47,8 +47,7 @@ export function ClauseEditor(props: ClauseEditorProps) {
         { content: "Sort by", value: IntermediateClauseType.ORDER_BY },
         { content: "Limit", value: IntermediateClauseType.LIMIT },
         { content: "From", value: IntermediateClauseType.FROM },
-        { content: "Join", value: IntermediateClauseType.JOIN },
-        { content: "Group by", value: IntermediateClauseType.GROUP_BY }
+        { content: "Join", value: IntermediateClauseType.JOIN }
     ]
 
     const nameField: DMFormField = {
diff --git a/workspaces/bi/bi-extension/CHANGELOG.md b/workspaces/bi/bi-extension/CHANGELOG.md
@@ -4,6 +4,16 @@ All notable changes to the **WSO2 Integrator: BI** extension will be documented
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/) and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [1.5.3](https://github.com/wso2/vscode-extensions/compare/ballerina-integrator-1.5.2...ballerina-integrator-1.5.3) - 2025-12-01
+
+### Changed
+
+- **Data Mapper** — Improved completion support for the expression bar and clause editor. Re-enabled array aggregating options.
+
+### Fixed
+
+- **Data Mapper** — Fixed expression bar focusing, inline undo button, and crashes during mapping clearance.
+- **AI Data Mapper** — Fixed error handling, output formatting, and compilation errors.
 
 ## [1.5.2](https://github.com/wso2/vscode-extensions/compare/ballerina-integrator-1.5.1...ballerina-integrator-1.5.2) - 2025-11-18
 
diff --git a/workspaces/bi/bi-extension/package.json b/workspaces/bi/bi-extension/package.json
@@ -2,7 +2,7 @@
     "name": "ballerina-integrator",
     "displayName": "WSO2 Integrator: BI",
     "description": "An extension which gives a development environment for designing, developing, debugging, and testing integration solutions.",
-    "version": "1.5.2",
+    "version": "1.5.3",
     "publisher": "wso2",
     "icon": "resources/images/wso2-ballerina-integrator-logo.png",
     "repository": {
@@ -201,4 +201,4 @@
         "@playwright/test": "~1.55.1",
         "@wso2/playwright-vscode-tester": "workspace:*"
     }
-}
+}
diff --git a/workspaces/bi/bi-extension/src/project-explorer/activate.ts b/workspaces/bi/bi-extension/src/project-explorer/activate.ts
@@ -82,9 +82,15 @@ function registerCoreCommands(dataProvider: ProjectExplorerEntryProvider, isInWI
 			dataProvider.revealInTreeView(event.documentUri, event.projectPath, event.position, event.view);
 		}
 	);
-	
+
 	// Register the refresh command
-	commands.registerCommand(isInWI ? WI_PROJECT_EXPLORER_VIEW_REFRESH_COMMAND : BI_COMMANDS.REFRESH_COMMAND, () => dataProvider.refresh());
+	commands.registerCommand(BI_COMMANDS.REFRESH_COMMAND, () => {
+		if (isInWI) {
+			commands.executeCommand(WI_PROJECT_EXPLORER_VIEW_REFRESH_COMMAND);
+			return;
+		}
+		dataProvider.refresh()
+	});
 }
 
 function registerBallerinaCommands(
diff --git a/workspaces/mi/mi-extension/src/constants/index.ts b/workspaces/mi/mi-extension/src/constants/index.ts
@@ -53,6 +53,7 @@ export const COMMANDS = {
     OPEN_DSS_SERVICE_DESIGNER: "MI.project-explorer.open-dss-service-designer",
     ADD_MEDIATOR: "MI.addMediator",
     REFRESH_COMMAND: 'MI.project-explorer.refresh',
+    WI_PROJECT_EXPLORER_VIEW_REFRESH: 'wso2-integrator.explorer.refresh',
     ADD_COMMAND: 'MI.project-explorer.add',
     ADD_ARTIFACT_COMMAND: 'MI.project-explorer.add.artifact',
     ADD_API_COMMAND: 'MI.project-explorer.add-api',
@@ -131,7 +132,7 @@ export const DEFAULT_PROJECT_VERSION = "1.0.0";
 
 export const READONLY_MAPPING_FUNCTION_NAME = "mapFunction";
 
-export const REFRESH_ENABLED_DOCUMENTS = ["SynapseXml", "typescript", "markdown", "json"];
+export const REFRESH_ENABLED_DOCUMENTS = ["xml", "SynapseXml", "typescript", "markdown", "json"];
 
 export enum EndpointTypes {
     DEFAULT_ENDPOINT = "DEFAULT_ENDPOINT",
@@ -206,5 +207,4 @@ export const ERROR_MESSAGES = {
 
 export const WI_EXTENSION_ID = 'wso2.wso2-integrator';
 export const WI_PROJECT_EXPLORER_VIEW_ID = 'wso2-integrator.explorer';
-export const WI_PROJECT_EXPLORER_VIEW_REFRESH_COMMAND = 'wso2-integrator.explorer.refresh';
 export const MI_PROJECT_EXPLORER_VIEW_ID = 'MI.project-explorer';
diff --git a/workspaces/mi/mi-extension/src/project-explorer/activate.ts b/workspaces/mi/mi-extension/src/project-explorer/activate.ts
@@ -20,7 +20,7 @@ import * as vscode from 'vscode';
 import { ProjectExplorerEntry, ProjectExplorerEntryProvider } from './project-explorer-provider';
 import { getStateMachine, openView, refreshUI } from '../stateMachine';
 import { EVENT_TYPE, MACHINE_VIEW, VisualizerLocation } from '@wso2/mi-core';
-import { COMMANDS, WI_PROJECT_EXPLORER_VIEW_REFRESH_COMMAND } from '../constants';
+import { COMMANDS } from '../constants';
 import { ExtensionContext, TreeItem, Uri, ViewColumn, commands, window, workspace } from 'vscode';
 import path = require("path");
 import { deleteRegistryResource, deleteDataMapperResources, deleteSchemaResources } from '../util/fileOperations';
@@ -52,7 +52,13 @@ export async function activateProjectExplorer(treeviewId: string, context: Exten
 	const runtimeVersion = projectDetailsRes.primaryDetails.runtimeVersion.value;
 	const isRegistrySupported = compareVersions(runtimeVersion, RUNTIME_VERSION_440) < 0;
 
-	commands.registerCommand(isInWI ? WI_PROJECT_EXPLORER_VIEW_REFRESH_COMMAND : COMMANDS.REFRESH_COMMAND, () => { return projectExplorerDataProvider.refresh(); });
+	commands.registerCommand(COMMANDS.REFRESH_COMMAND, () => { 
+		if (isInWI) {
+			commands.executeCommand(COMMANDS.WI_PROJECT_EXPLORER_VIEW_REFRESH);
+			return;
+		}
+		return projectExplorerDataProvider.refresh(); 
+	});
 
 	commands.registerCommand(COMMANDS.ADD_ARTIFACT_COMMAND, (entry: ProjectExplorerEntry) => {
 		openView(EVENT_TYPE.OPEN_VIEW, { view: MACHINE_VIEW.ADD_ARTIFACT, projectUri: entry.info?.path });
diff --git a/workspaces/mi/mi-extension/src/stateMachine.ts b/workspaces/mi/mi-extension/src/stateMachine.ts
@@ -699,7 +699,7 @@ export const getStateMachine = (projectUri: string, context?: VisualizerLocation
         if (!workspaces) {
             console.warn('No workspace folder is open.');
         }
-        log(vscode.extensions.all.map(ext => ext.id).join(', '));
+
         stateService = interpret(stateMachine.withContext({
             projectUri: projectUri,
             langClient: null,
diff --git a/workspaces/mi/mi-extension/src/visualizer/activate.ts b/workspaces/mi/mi-extension/src/visualizer/activate.ts
@@ -208,9 +208,8 @@ export function activateVisualizer(context: vscode.ExtensionContext, firstProjec
     // Listen for pom changes and update dependencies
     context.subscriptions.push(
         // Handle the text change and diagram update with rpc notification
-        vscode.workspace.onDidChangeTextDocument(async function (document) {
-            const projectUri = vscode.workspace.getWorkspaceFolder(document.document.uri)?.uri.fsPath;
-
+        vscode.workspace.onDidChangeTextDocument(async function (e : vscode.TextDocumentChangeEvent) {
+            const projectUri = vscode.workspace.getWorkspaceFolder(e.document.uri)?.uri.fsPath;
             if (!projectUri) {
                 return;
             }
@@ -221,19 +220,19 @@ export function activateVisualizer(context: vscode.ExtensionContext, firstProjec
                 return;
             }
 
-            if (!REFRESH_ENABLED_DOCUMENTS.includes(document.document.languageId) || !projectUri) {
+            if (!REFRESH_ENABLED_DOCUMENTS.includes(e.document.languageId) || !projectUri) {
                 return;
             }
 
             if (webview?.getWebview()?.active || AiPanelWebview.currentPanel?.getWebview()?.active) {
-                await document.document.save();
-                if (!getStateMachine(projectUri).context().view?.endsWith('Form') && document?.document?.uri?.fsPath?.includes(artifactsDir)) {
+                await e.document.save();
+                if (!getStateMachine(projectUri).context().view?.endsWith('Form') && e?.document?.uri?.fsPath?.includes(artifactsDir)) {
                     refreshDiagram(projectUri);
                 }
             }
 
-            if (document.document.uri.fsPath.endsWith('pom.xml')) {
-                const projectUri = vscode.workspace.getWorkspaceFolder(document.document.uri)?.uri.fsPath;
+            if (e.document.uri.fsPath.endsWith('pom.xml')) {
+                const projectUri = vscode.workspace.getWorkspaceFolder(e.document.uri)?.uri.fsPath;
                 const langClient = getStateMachine(projectUri!).context().langClient;
                 
                 const confirmUpdate = await vscode.window.showInformationMessage(

Original file line number	Diff line number	Diff line change
`@@ -47,8 +47,7 @@ export function ClauseEditor(props: ClauseEditorProps) {`
`47`	`47`	`{ content: "Sort by", value: IntermediateClauseType.ORDER_BY },`
`48`	`48`	`{ content: "Limit", value: IntermediateClauseType.LIMIT },`
`49`	`49`	`{ content: "From", value: IntermediateClauseType.FROM },`
`50`		`- { content: "Join", value: IntermediateClauseType.JOIN },`
`51`		`- { content: "Group by", value: IntermediateClauseType.GROUP_BY }`
	`50`	`+ { content: "Join", value: IntermediateClauseType.JOIN }`
`52`	`51`	`]`
`53`	`52`
`54`	`53`	`const nameField: DMFormField = {`