Merge remote-tracking branch 'upstream/main' into bi-multi-project

Author: madushajg

workspaces/ballerina/ballerina-side-panel/src/components/editors/ExpressionField.tsx

@@ -159,6 +159,7 @@ export const ExpressionField: React.FC<ExpressionField> = ({
             targetLineRange={targetLineRange}
             extractArgsFromFunction={extractArgsFromFunction}
             onOpenExpandedMode={onOpenExpandedMode}
+            onRemove={onRemove}
             isInExpandedMode={isInExpandedMode}
         />
     );

workspaces/ballerina/ballerina-side-panel/src/components/editors/MultiModeExpressionEditor/ChipExpressionEditor/ChipExpressionBaseComponent.tsx

@@ -37,7 +37,7 @@ import {
     setCursorPositionToExpressionModel,
     updateTokens,
 } from "./utils";
-import { CompletionItem, FnSignatureDocumentation, HelperPaneHeight } from "@wso2/ui-toolkit";
+import { Button, Codicon, CompletionItem, FnSignatureDocumentation, HelperPaneHeight, ThemeColors } from "@wso2/ui-toolkit";
 import { useFormContext } from "../../../../context";
 import { DATA_ELEMENT_ID_ATTRIBUTE, FOCUS_MARKER, ARROW_LEFT_MARKER, ARROW_RIGHT_MARKER, BACKSPACE_MARKER, COMPLETIONS_MARKER, HELPER_MARKER, DELETE_MARKER } from "./constants";
 import { LineRange } from "@wso2/ballerina-core/lib/interfaces/common";
@@ -63,6 +63,7 @@ export type ChipExpressionBaseComponentProps = {
     }>;
     targetLineRange?: LineRange;
     onOpenExpandedMode?: () => void;
+    onRemove?: () => void;
     isInExpandedMode?: boolean;
 }
 
@@ -553,6 +554,11 @@ export const ChipExpressionBaseComponent = (props: ChipExpressionBaseComponentPr
                     />
                 </AutoExpandingEditableDiv>
             </div>
+            {props.onRemove && (
+                <Button appearance="icon" onClick={props.onRemove} tooltip="Remove Expression" sx={{ marginLeft: '4px' }}>
+                    <Codicon name="trash" sx={{ color: ThemeColors.ERROR, fontSize: '16px' }} />
+                </Button>
+            )}
         </ChipEditorContainer >
     )
 }

workspaces/ballerina/ballerina-visualizer/src/views/BI/Connection/AddConnectionWizard/index.tsx

@@ -20,6 +20,7 @@ import { useEffect, useRef, useState } from "react";
 import styled from "@emotion/styled";
 import {
     AvailableNode,
+    DataMapperDisplayMode,
     DIRECTORY_MAP,
     EVENT_TYPE,
     FlowNode,
@@ -42,6 +43,7 @@ import { HelperView } from "../../HelperView";
 import { BodyText } from "../../../styles";
 import { DownloadIcon } from "../../../../components/DownloadIcon";
 import FormGeneratorNew from "../../Forms/FormGeneratorNew";
+import { FormSubmitOptions } from "../../FlowDiagram";
 
 const Container = styled.div`
     width: 100%;
@@ -232,7 +234,7 @@ export function AddConnectionWizard(props: AddConnectionWizardProps) {
         setCurrentStep(WizardStep.GENERATE_CONNECTOR);
     };
 
-    const handleOnFormSubmit = async (node: FlowNode) => {
+    const handleOnFormSubmit = async (node: FlowNode, _dataMapperMode?: DataMapperDisplayMode, options?: FormSubmitOptions) => {
         console.log(">>> on form submit", node);
         if (selectedNodeRef.current) {
             setSavingFormStatus(SavingFormStatus.SAVING);
@@ -258,15 +260,28 @@ export function AddConnectionWizard(props: AddConnectionWizardProps) {
                 };
             }
 
+            // Check if the node is a connector
+            // otherwise, this is a new variable creation or something else 
+            // triggered by the helper pane
+            const isConnector = node.codedata.node === "NEW_CONNECTION";
+
             rpcClient
                 .getBIDiagramRpcClient()
                 .getSourceCode({
                     filePath: connectionsFilePath,
                     flowNode: node,
-                    isConnector: true,
+                    isConnector: isConnector,
                 })
                 .then((response) => {
                     console.log(">>> Updated source code", response);
+                    if (!isConnector) {
+                        setSavingFormStatus(SavingFormStatus.SUCCESS);
+                        selectedNodeRef.current = undefined;
+                        if (options?.postUpdateCallBack) {
+                            options.postUpdateCallBack();
+                        }
+                        return;
+                    };
                     if (response.artifacts.length > 0) {
                         // clear memory
                         selectedNodeRef.current = undefined;
@@ -295,12 +310,12 @@ export function AddConnectionWizard(props: AddConnectionWizardProps) {
                 prevFields.map((field) =>
                     field.key === "module"
                         ? {
-                              ...field,
-                              diagnostics: [
-                                  ...field.diagnostics,
-                                  { message: response.errorMessage, severity: "ERROR" },
-                              ],
-                          }
+                            ...field,
+                            diagnostics: [
+                                ...field.diagnostics,
+                                { message: response.errorMessage, severity: "ERROR" },
+                            ],
+                        }
                         : field
                 )
             );

workspaces/ballerina/ballerina-visualizer/src/views/BI/Connection/ConnectionConfigView/index.tsx

@@ -19,11 +19,12 @@
 import React, { ReactNode, useEffect, useState } from "react";
 import styled from "@emotion/styled";
 import { ExpressionFormField } from "@wso2/ballerina-side-panel";
-import { FlowNode, LineRange, SubPanel } from "@wso2/ballerina-core";
+import { DataMapperDisplayMode, FlowNode, LineRange, SubPanel } from "@wso2/ballerina-core";
 import FormGenerator from "../../Forms/FormGenerator";
 import { useRpcContext } from "@wso2/ballerina-rpc-client";
 import { SidePanelView } from "../../FlowDiagram/PanelManager";
 import { ConnectionKind } from "../../../../components/ConnectionSelector";
+import { FormSubmitOptions } from "../../FlowDiagram";
 
 const Container = styled.div`
     max-width: 600px;
@@ -50,7 +51,7 @@ interface ConnectionConfigViewProps {
     submitText?: string;
     isSaving?: boolean;
     selectedNode: FlowNode;
-    onSubmit: (node?: FlowNode) => void;
+    onSubmit: (updatedNode?: FlowNode, dataMapperMode?: DataMapperDisplayMode, options?: FormSubmitOptions) => void;
     openSubPanel?: (subPanel: SubPanel) => void;
     updatedExpressionField?: ExpressionFormField;
     resetUpdatedExpressionField?: () => void;
@@ -114,6 +115,7 @@ export function ConnectionConfigView(props: ConnectionConfigViewProps) {
                     resetUpdatedExpressionField={resetUpdatedExpressionField}
                     disableSaveButton={isPullingConnector}
                     navigateToPanel={navigateToPanel}
+                    handleOnFormSubmit={onSubmit}
                 />
             )}
         </Container>

workspaces/ballerina/type-editor/src/RecordFromJson/RecordFromJson.tsx

@@ -92,29 +92,29 @@ export const RecordFromJson = (props: RecordFromJsonProps) => {
                 typeName: name
             });
 
-            //  find the record with the name
-            const record = typesFromJson.types.find((t) => t.type.name === name);
-            // if there are other records than the matching name, get the types
+            const record = typesFromJson.types[typesFromJson.types.length - 1];
             const otherRecords = typesFromJson.types
-                .filter((t) => t.type.name !== name)
+                .slice(0, -1)
                 .map((t) => t.type);
 
-
             if (otherRecords.length > 0) {
-                const response: UpdateTypesResponse = await rpcClient.getBIDiagramRpcClient().updateTypes({
+                await rpcClient.getBIDiagramRpcClient().updateTypes({
                     filePath: 'types.bal',
                     types: otherRecords
                 });
 
                 if (!isPopupTypeForm) {
-                    await props.rpcClient.getVisualizerRpcClient().openView(
+                    await rpcClient.getVisualizerRpcClient().openView(
                         { type: EVENT_TYPE.UPDATE_PROJECT_LOCATION, location: { addType: false } }
                     );
                 }
             }
 
             if (record) {
                 onImport([record.type]);
+            } else {
+                setIsSaving(false);
+                setError("Could not import JSON as type.");
             }
         } catch (err) {
             setError("Could not import JSON as type.");