From a5699344bba6a9465b0291baea12e96c9ea3a37c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sergey=20G=D0=BEr=D0=B5I=D0=BEv?= <srjm7x@gmail.com>
Date: Fri, 27 Feb 2026 17:45:52 +0300
Subject: [PATCH] =?UTF-8?q?[DOP-33475]=20[SyncMaster=20UI=20OSS]=20=D0=94?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D1=82=D1=8C=20=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BD=D0=B5=D0=BD=D1=82=20=D0=B4=D0=BB=D1=8F=20?=
 =?UTF-8?q?=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20SQL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |  2 +
 src/app/styles/variables.less                 |  1 +
 src/entities/transformation/constants.ts      |  3 +
 src/entities/transformation/types.ts          | 33 ++++++-
 .../TransformationForm/TransformationForm.tsx | 22 +++--
 .../components/FilterComponent/index.tsx      |  9 +-
 .../components/FilterComponent/types.ts       |  4 +-
 .../components/FilterSql/constants.ts         |  7 ++
 .../components/FilterSql/index.tsx            | 25 ++++++
 .../components/FilterSql/styles.module.less   |  5 ++
 .../components/FilterSql/types.ts             |  5 ++
 .../TransformationFormItem.tsx                | 75 +++++++++++-----
 .../TransformationFormItem/constants.ts       |  2 +
 .../useGetNestedTypesSelectOptions/index.ts   |  5 +-
 .../TransformationFormItem/styles.module.less |  4 +
 .../TransformationFormItem/types.ts           |  8 +-
 .../ui/TransformationForm/types.ts            |  8 +-
 .../utils/prepareTransformationForm/index.ts  |  2 +
 .../prepareTransformationRequest/index.ts     | 31 +++++--
 .../FilterColumnsFormItem.tsx                 |  4 +-
 .../FilterColumnsNode/FilterColumnsNode.tsx   |  2 +-
 .../FilterFileFormItem/FilterFileFormItem.tsx |  4 +-
 .../FilterRowsFormItem/FilterRowsFormItem.tsx |  4 +-
 .../FilterSqlFormItem/FilterSqlFormItem.tsx   | 14 +++
 .../components/FilterSqlFormItem/index.ts     |  1 +
 .../FilterSqlNode/FilterSqlNode.tsx           | 42 +++++++++
 .../components/FilterSqlNode/index.ts         |  2 +
 .../FilterSqlNode/styles.module.less          |  3 +
 .../components/FilterSqlNode/types.ts         |  5 ++
 .../TransferConnectionsCanvas.tsx             |  3 +
 .../TransferConnectionsCanvas/constants.ts    | 20 ++---
 .../TransferConnectionsCanvas/types.ts        |  6 ++
 .../utils/getInitialEdges/index.ts            |  5 +-
 .../utils/getInitialNodes/getInitialNodes.ts  | 11 +++
 .../utils/getInitialNodes/types.ts            |  1 +
 .../TransferConnectionsDefault/constants.tsx  |  6 +-
 .../TransferConnectionsDefault/types.ts       |  2 +-
 .../hooks/useHandleNodes/index.ts             | 88 ++++++++-----------
 .../TransformButtons/styles.module.less       |  4 +-
 .../useSupportedTransformationTypes/index.ts  |  7 +-
 src/shared/config/i18n/translations/en.json   |  2 +
 src/shared/config/i18n/translations/ru.json   |  2 +
 src/shared/ui/AceSqlEditor/constants.ts       | 24 +++++
 src/shared/ui/AceSqlEditor/index.tsx          | 13 +++
 src/shared/ui/AceSqlEditor/types.ts           |  4 +
 src/shared/utils/getCountLines/index.ts       |  3 +
 src/shared/utils/index.ts                     |  1 +
 yarn.lock                                     | 46 ++++++++++
 48 files changed, 456 insertions(+), 124 deletions(-)
 create mode 100644 src/entities/transformation/ui/TransformationForm/components/FilterSql/constants.ts
 create mode 100644 src/entities/transformation/ui/TransformationForm/components/FilterSql/index.tsx
 create mode 100644 src/entities/transformation/ui/TransformationForm/components/FilterSql/styles.module.less
 create mode 100644 src/entities/transformation/ui/TransformationForm/components/FilterSql/types.ts
 create mode 100644 src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/constants.ts
 create mode 100644 src/features/transfer/MutateTransferForm/components/FilterSqlFormItem/FilterSqlFormItem.tsx
 create mode 100644 src/features/transfer/MutateTransferForm/components/FilterSqlFormItem/index.ts
 create mode 100644 src/features/transfer/MutateTransferForm/components/FilterSqlNode/FilterSqlNode.tsx
 create mode 100644 src/features/transfer/MutateTransferForm/components/FilterSqlNode/index.ts
 create mode 100644 src/features/transfer/MutateTransferForm/components/FilterSqlNode/styles.module.less
 create mode 100644 src/features/transfer/MutateTransferForm/components/FilterSqlNode/types.ts
 create mode 100644 src/shared/ui/AceSqlEditor/constants.ts
 create mode 100644 src/shared/ui/AceSqlEditor/index.tsx
 create mode 100644 src/shared/ui/AceSqlEditor/types.ts
 create mode 100644 src/shared/utils/getCountLines/index.ts

diff --git a/package.json b/package.json
index 0bef214d..0a483e0b 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "@tanstack/react-query": "5.90.21",
     "@tanstack/react-query-devtools": "5.91.3",
     "@xyflow/react": "12.10.1",
+    "ace-builds": "1.43.6",
     "antd": "4.24.16",
     "axios": "1.13.5",
     "clsx": "2.1.1",
@@ -32,6 +33,7 @@
     "i18next": "24.2.3",
     "rc-picker": "4.11.3",
     "react": "18.3.1",
+    "react-ace": "14.0.1",
     "react-dom": "18.3.1",
     "react-error-boundary": "4.1.2",
     "react-i18next": "15.7.4",
diff --git a/src/app/styles/variables.less b/src/app/styles/variables.less
index f0ad101e..d1596a24 100644
--- a/src/app/styles/variables.less
+++ b/src/app/styles/variables.less
@@ -18,6 +18,7 @@
 @typography-title-margin-bottom: 0;
 
 @input-bg: #f1f3f5;
+@input-border: 1px solid #d9d9d9;
 @select-background: #f1f3f5;
 @picker-bg: #f1f3f5;
 @tooltip-bg: #000000;
diff --git a/src/entities/transformation/constants.ts b/src/entities/transformation/constants.ts
index 272f5db8..4b09662f 100644
--- a/src/entities/transformation/constants.ts
+++ b/src/entities/transformation/constants.ts
@@ -21,6 +21,7 @@ export const TRANSFORMATIONS_FORM_DEFAULT_VALUE: TransformationsForm = {
   [TransformationType.FILTER_FILE]: [],
   [TransformationType.FILTER_ROWS]: [],
   [TransformationType.FILTER_COLUMNS]: [],
+  [TransformationType.FILTER_SQL]: [],
 };
 
 export const TRANSFORMATIONS_REQUEST_DEFAULT_VALUE: Transformations = [
@@ -71,6 +72,8 @@ const FILE_TRANSFORMATION_TYPES = Object.values(TransformationType);
 
 const DB_TRANSFORMATION_TYPES = FILE_TRANSFORMATION_TYPES.filter((type) => type !== TransformationType.FILTER_FILE);
 
+export const DEFAULT_TRANSFORMATION_TYPES = DB_TRANSFORMATION_TYPES;
+
 export const CONNECTION_TYPE_SUPPORT_TRANSFORMATION_TYPES: Record<ConnectionType, TransformationType[]> = {
   [ConnectionType.CLICKHOUSE]: DB_TRANSFORMATION_TYPES,
   [ConnectionType.FTP]: FILE_TRANSFORMATION_TYPES,
diff --git a/src/entities/transformation/types.ts b/src/entities/transformation/types.ts
index 2e81e09e..748a097f 100644
--- a/src/entities/transformation/types.ts
+++ b/src/entities/transformation/types.ts
@@ -4,6 +4,7 @@ export enum TransformationType {
   FILTER_ROWS = 'dataframe_rows_filter',
   FILTER_COLUMNS = 'dataframe_columns_filter',
   FILTER_FILE = 'file_metadata_filter',
+  FILTER_SQL = 'sql',
 }
 
 export enum TransformationFilterRowsType {
@@ -107,15 +108,43 @@ export interface TransformationFilterFileForm {
   filters: Array<TransformationFilterFileRegexpItemForm | TransformationFilterFileSizeItemForm>;
 }
 
-export type Transformations = Array<TransformationFilterRows | TransformationFilterColumns | TransformationFilterFile>;
+export enum TransformationFilterSqlDialect {
+  SPARK = 'spark',
+}
+
+export type TransformationFilterSql = {
+  type: TransformationType.FILTER_SQL;
+  dialect: TransformationFilterSqlDialect;
+  query: string;
+};
+
+export type Transformations = Array<
+  TransformationFilterRows | TransformationFilterColumns | TransformationFilterFile | TransformationFilterSql
+>;
+
+export interface TransformationFilterSqlSparkItemForm {
+  dialect: TransformationFilterSqlDialect;
+  query: string;
+}
+
+export type TransformationFormFilterSql = {
+  type: TransformationType.FILTER_SQL;
+  filters: Array<TransformationFilterSqlSparkItemForm>;
+};
 
 export interface TransformationsForm {
   [TransformationType.FILTER_FILE]?: TransformationFilterFileForm['filters'];
   [TransformationType.FILTER_ROWS]?: TransformationFilterRows['filters'];
   [TransformationType.FILTER_COLUMNS]?: TransformationFilterColumns['filters'];
+  [TransformationType.FILTER_SQL]?: TransformationFormFilterSql['filters'];
 }
 
-export type TransformationsFormNestedType<T extends keyof TransformationsForm> =
+export type TransformationsFormWithNestedType =
+  | TransformationType.FILTER_FILE
+  | TransformationType.FILTER_ROWS
+  | TransformationType.FILTER_COLUMNS;
+
+export type TransformationsFormNestedType<T extends TransformationsFormWithNestedType> =
   Required<TransformationsForm>[T][number]['type'];
 
 export interface ShowButtonsContextProps {
diff --git a/src/entities/transformation/ui/TransformationForm/TransformationForm.tsx b/src/entities/transformation/ui/TransformationForm/TransformationForm.tsx
index 0642b9f0..6dd8bf3b 100644
--- a/src/entities/transformation/ui/TransformationForm/TransformationForm.tsx
+++ b/src/entities/transformation/ui/TransformationForm/TransformationForm.tsx
@@ -1,9 +1,9 @@
 import { Button, Form, FormListFieldData } from 'antd';
-import React, { memo, useLayoutEffect } from 'react';
+import { memo, useLayoutEffect } from 'react';
 import { useTranslation } from 'react-i18next';
 
 import { useShowButtons } from '../../hooks';
-import { Transformations, TransformationType } from '../../types';
+import { TransformationsForm, TransformationType } from '../../types';
 
 import { TransformationFormItem } from './components';
 import { TransformationFormProps } from './types';
@@ -17,20 +17,24 @@ const TransformationFormComponent = <T extends TransformationType>({
   const { isDisplayed } = useShowButtons();
 
   const formInstance = Form.useFormInstance();
-  const filtersValues: Transformations[number]['filters'] | undefined = formInstance.getFieldValue([
+  const filtersValues: TransformationsForm[T] | undefined = formInstance.getFieldValue([
     'transformations',
     transformationType,
   ]);
+  const isFilterEmpty = !filtersValues?.length;
 
   /** Add at least one element to array form value here,
    * because it is inconvenient to check for the presence of a default value of this array,
    * when forming a request to backend or initial form values */
   useLayoutEffect(() => {
-    const needFillEmpty = !canHaveEmptyRecordsList && !filtersValues?.length;
+    const needFillEmpty = !canHaveEmptyRecordsList && isFilterEmpty;
     if (needFillEmpty) {
       formInstance.setFieldValue(['transformations', transformationType], [{}]);
     }
-  }, [formInstance, filtersValues, transformationType, canHaveEmptyRecordsList]);
+  }, [formInstance, isFilterEmpty, transformationType, canHaveEmptyRecordsList]);
+
+  const isNeedShowAddNew = (fields: FormListFieldData[]) =>
+    isDisplayed && !(transformationType === TransformationType.FILTER_SQL && fields.length);
 
   const canRemoveItem = ({ name }: FormListFieldData) => (name || canHaveEmptyRecordsList) && isDisplayed;
 
@@ -47,9 +51,11 @@ const TransformationFormComponent = <T extends TransformationType>({
               key={field.key}
             />
           ))}
-          <Button className="nodrag" size="large" type="primary" onClick={() => add()} hidden={!isDisplayed}>
-            {t('add')}
-          </Button>
+          {isNeedShowAddNew(fields) && (
+            <Button className="nodrag" size="large" type="primary" onClick={() => add()}>
+              {t('add')}
+            </Button>
+          )}
         </div>
       )}
     </Form.List>
diff --git a/src/entities/transformation/ui/TransformationForm/components/FilterComponent/index.tsx b/src/entities/transformation/ui/TransformationForm/components/FilterComponent/index.tsx
index 8f24e0c8..a7151704 100644
--- a/src/entities/transformation/ui/TransformationForm/components/FilterComponent/index.tsx
+++ b/src/entities/transformation/ui/TransformationForm/components/FilterComponent/index.tsx
@@ -1,5 +1,8 @@
-import React from 'react';
-import { TransformationsFormNestedType, TransformationType } from '@entities/transformation';
+import {
+  TransformationsFormNestedType,
+  TransformationsFormWithNestedType,
+  TransformationType,
+} from '@entities/transformation';
 
 import { FilterColumnsValue } from '../FilterColumnsValue';
 import { FilterFileValue } from '../FilterFileValue';
@@ -7,7 +10,7 @@ import { FilterRowsValue } from '../FilterRowsValue';
 
 import { FilterComponentProps } from './types';
 
-export const FilterComponent = <T extends TransformationType>({
+export const FilterComponent = <T extends TransformationsFormWithNestedType>({
   transformationType,
   nestedType,
   name,
diff --git a/src/entities/transformation/ui/TransformationForm/components/FilterComponent/types.ts b/src/entities/transformation/ui/TransformationForm/components/FilterComponent/types.ts
index 1e08f86b..5ee599ca 100644
--- a/src/entities/transformation/ui/TransformationForm/components/FilterComponent/types.ts
+++ b/src/entities/transformation/ui/TransformationForm/components/FilterComponent/types.ts
@@ -1,6 +1,6 @@
-import { TransformationsFormNestedType, TransformationType } from '@entities/transformation';
+import { TransformationsFormNestedType, TransformationsFormWithNestedType } from '@entities/transformation';
 
-export interface FilterComponentProps<T extends TransformationType> {
+export interface FilterComponentProps<T extends TransformationsFormWithNestedType> {
   name: number;
   transformationType: T;
   nestedType?: TransformationsFormNestedType<T>;
diff --git a/src/entities/transformation/ui/TransformationForm/components/FilterSql/constants.ts b/src/entities/transformation/ui/TransformationForm/components/FilterSql/constants.ts
new file mode 100644
index 00000000..4652a7cb
--- /dev/null
+++ b/src/entities/transformation/ui/TransformationForm/components/FilterSql/constants.ts
@@ -0,0 +1,7 @@
+export const LINE_HEIGHT = 1.7;
+
+export const WIDTH = '100%';
+
+export const HEIGHT = '100px';
+
+export const FONT_SIZE = 1.5;
diff --git a/src/entities/transformation/ui/TransformationForm/components/FilterSql/index.tsx b/src/entities/transformation/ui/TransformationForm/components/FilterSql/index.tsx
new file mode 100644
index 00000000..77f61f99
--- /dev/null
+++ b/src/entities/transformation/ui/TransformationForm/components/FilterSql/index.tsx
@@ -0,0 +1,25 @@
+import { AceSqlEditor } from '@shared/ui/AceSqlEditor';
+import { getCountLines } from '@shared/utils';
+
+import { FilterSqlProps } from './types';
+import { FONT_SIZE, LINE_HEIGHT, WIDTH } from './constants';
+import * as classes from './styles.module.less';
+
+export const FilterSql = ({ autoHeightMaxLineCount, value, onChange }: FilterSqlProps) => {
+  /** Calc the number of lines in the SQL expression to set the height of the editor */
+  const linesCount = Math.max(1, getCountLines(value as string));
+  const heightLinesCount = autoHeightMaxLineCount ? Math.min(linesCount, autoHeightMaxLineCount) : linesCount;
+
+  return (
+    <AceSqlEditor
+      className={classes.root}
+      tabSize={2}
+      fontSize={`${FONT_SIZE}em`}
+      width={WIDTH}
+      height={`${heightLinesCount * LINE_HEIGHT + 0.2}em`}
+      lineHeight={`${LINE_HEIGHT}em`}
+      value={value}
+      onChange={onChange}
+    />
+  );
+};
diff --git a/src/entities/transformation/ui/TransformationForm/components/FilterSql/styles.module.less b/src/entities/transformation/ui/TransformationForm/components/FilterSql/styles.module.less
new file mode 100644
index 00000000..d4f8be73
--- /dev/null
+++ b/src/entities/transformation/ui/TransformationForm/components/FilterSql/styles.module.less
@@ -0,0 +1,5 @@
+.root {
+  border: @input-border;
+  background-color: @input-bg;
+  border-radius: 8px;
+}
diff --git a/src/entities/transformation/ui/TransformationForm/components/FilterSql/types.ts b/src/entities/transformation/ui/TransformationForm/components/FilterSql/types.ts
new file mode 100644
index 00000000..dc139f00
--- /dev/null
+++ b/src/entities/transformation/ui/TransformationForm/components/FilterSql/types.ts
@@ -0,0 +1,5 @@
+export interface FilterSqlProps {
+  autoHeightMaxLineCount: number;
+  value?: string;
+  onChange?: (value: string) => void;
+}
diff --git a/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/TransformationFormItem.tsx b/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/TransformationFormItem.tsx
index 57c96044..9f0b0c42 100644
--- a/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/TransformationFormItem.tsx
+++ b/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/TransformationFormItem.tsx
@@ -1,31 +1,49 @@
 import { Button, Form, Input } from 'antd';
-import React, { useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { DeleteOutlined } from '@ant-design/icons';
 import { Select } from '@shared/ui';
 import { useTranslation } from 'react-i18next';
 import clsx from 'clsx';
 
-import { TransformationsFormNestedType, TransformationType } from '../../../../types';
+import {
+  TransformationsFormNestedType,
+  TransformationsFormWithNestedType,
+  TransformationType,
+} from '../../../../types';
 import { FilterComponent } from '../FilterComponent';
+import { FilterSql } from '../FilterSql';
 
 import { TransformationFormItemProps } from './types';
 import { useGetNestedTypesSelectOptions } from './hooks';
 import * as classes from './styles.module.less';
+import { SQL_AUTO_HEIGHT_MAX_LINE_COUNT } from './constants';
 
 export const TransformationFormItem = <T extends TransformationType>({
   name,
   transformationType,
   nestedTypeSelectLabel,
   hasColumnField,
+  hasNestedTypeSelectField,
+  hasFilterComponent,
+  hasSqlField,
   onRemove,
 }: TransformationFormItemProps<T>) => {
   const { t } = useTranslation('transformation');
-  const nestedTypesSelectOptions = useGetNestedTypesSelectOptions(transformationType);
+  const nestedTypesSelectOptions = useGetNestedTypesSelectOptions(
+    transformationType as TransformationsFormWithNestedType,
+  );
   const formInstance = Form.useFormInstance();
 
-  const initialType: TransformationsFormNestedType<T> | undefined = useMemo(() => {
-    return formInstance.getFieldValue(['transformations', transformationType, name, 'type']);
-  }, [formInstance, name, transformationType]);
+  const initialType = useMemo(() => {
+    if (!hasNestedTypeSelectField) return undefined;
+
+    return formInstance.getFieldValue([
+      'transformations',
+      transformationType as TransformationsFormWithNestedType,
+      name,
+      'type',
+    ]) as TransformationsFormNestedType<TransformationsFormWithNestedType>;
+  }, [formInstance, hasNestedTypeSelectField, name, transformationType]);
 
   /** Use custom type state, because Form.useWatch doesn't support dynamic fieldname like in Form.List */
   const [type, setType] = useState(() => initialType);
@@ -41,23 +59,36 @@ export const TransformationFormItem = <T extends TransformationType>({
           <Input className="nodrag" size="large" />
         </Form.Item>
       )}
-      <Form.Item
-        className={classes.type}
-        label={nestedTypeSelectLabel}
-        name={[name, 'type']}
-        rules={[{ required: true }]}
-      >
-        <Select
-          /** className "nodrag" and "nowheel" for select in custom node React Flow https://reactflow.dev/api-reference/react-flow#no-drag-class-name */
-          className="nodrag"
-          popupClassName="nowheel"
-          size="large"
-          options={nestedTypesSelectOptions}
-          onChange={setType}
-          placeholder={t('selectOption')}
+      {hasFilterComponent && (
+        <Form.Item
+          className={classes.type}
+          label={nestedTypeSelectLabel}
+          name={[name, 'type']}
+          rules={[{ required: true }]}
+        >
+          <Select
+            /** className "nodrag" and "nowheel" for select in custom node React Flow https://reactflow.dev/api-reference/react-flow#no-drag-class-name */
+            className="nodrag"
+            popupClassName="nowheel"
+            size="large"
+            options={nestedTypesSelectOptions}
+            onChange={setType}
+            placeholder={t('selectOption')}
+          />
+        </Form.Item>
+      )}
+      {hasNestedTypeSelectField && (
+        <FilterComponent
+          name={name}
+          nestedType={type}
+          transformationType={transformationType as TransformationsFormWithNestedType}
         />
-      </Form.Item>
-      <FilterComponent name={name} nestedType={type} transformationType={transformationType} />
+      )}
+      {hasSqlField && (
+        <Form.Item className={classes.sql} label={t('query')} name={[name, 'query']} rules={[{ required: true }]}>
+          <FilterSql autoHeightMaxLineCount={SQL_AUTO_HEIGHT_MAX_LINE_COUNT} />
+        </Form.Item>
+      )}
       {onRemove && (
         <Button
           className={clsx('nodrag', [classes.deleteButton])}
diff --git a/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/constants.ts b/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/constants.ts
new file mode 100644
index 00000000..8df5afeb
--- /dev/null
+++ b/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/constants.ts
@@ -0,0 +1,2 @@
+// The maximum number of lines by which we stretch the editor before the scrollbar appears
+export const SQL_AUTO_HEIGHT_MAX_LINE_COUNT = 20;
diff --git a/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/hooks/useGetNestedTypesSelectOptions/index.ts b/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/hooks/useGetNestedTypesSelectOptions/index.ts
index dc51bde5..31db7e19 100644
--- a/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/hooks/useGetNestedTypesSelectOptions/index.ts
+++ b/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/hooks/useGetNestedTypesSelectOptions/index.ts
@@ -6,12 +6,13 @@ import {
   TransformationFilterRowsType,
   TRANSFORMATION_FILTER_ROWS_TYPE_DISPLAY,
   TransformationType,
+  TransformationsFormWithNestedType,
 } from '@entities/transformation';
 import { OptionItem, prepareOptionsForSelect } from '@shared/ui';
 import { useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 
-export const useGetNestedTypesSelectOptions = (transformationType: TransformationType) => {
+export const useGetNestedTypesSelectOptions = (transformationType: TransformationsFormWithNestedType) => {
   const { t } = useTranslation('transformation');
 
   const options = useMemo(() => {
@@ -34,7 +35,7 @@ export const useGetNestedTypesSelectOptions = (transformationType: Transformatio
     });
 
     const filterOptions: Record<
-      TransformationType,
+      TransformationsFormWithNestedType,
       OptionItem<TransformationFilterRowsType | TransformationFilterColumnsType | TransformationFilterFileType>[]
     > = {
       [TransformationType.FILTER_FILE]: filterFileTypeSelectOptions,
diff --git a/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/styles.module.less b/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/styles.module.less
index 5eeef18a..6b95d4c4 100644
--- a/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/styles.module.less
+++ b/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/styles.module.less
@@ -16,6 +16,10 @@
     flex-grow: 1;
   }
 
+  .sql {
+    flex-grow: 1;
+  }
+
   .deleteButton {
     margin-top: calc(1rem * @line-height-base);
   }
diff --git a/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/types.ts b/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/types.ts
index 76dcb37a..c4f34be8 100644
--- a/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/types.ts
+++ b/src/entities/transformation/ui/TransformationForm/components/TransformationFormItem/types.ts
@@ -10,9 +10,15 @@ export interface TransformationFormItemProps<T extends TransformationType> exten
   /** Transformation type */
   transformationType: T;
   /** Label for select of nested types options */
-  nestedTypeSelectLabel: string;
+  nestedTypeSelectLabel?: string;
   /** Need to render Column field */
   hasColumnField?: boolean;
+  /** Need to render NestedType field */
+  hasNestedTypeSelectField?: boolean;
+  /** Need to render Filter field */
+  hasFilterComponent?: boolean;
+  /** Need to render SQL field */
+  hasSqlField?: boolean;
   /** Callback for deleting transformation form item */
   onRemove?: FormListOperation['remove'];
 }
diff --git a/src/entities/transformation/ui/TransformationForm/types.ts b/src/entities/transformation/ui/TransformationForm/types.ts
index 69d439c7..d93f4704 100644
--- a/src/entities/transformation/ui/TransformationForm/types.ts
+++ b/src/entities/transformation/ui/TransformationForm/types.ts
@@ -4,7 +4,13 @@ import { TransformationFormItemProps } from './components';
 
 export interface TransformationFormProps<T extends TransformationType> extends Pick<
   TransformationFormItemProps<T>,
-  'transformationType' | 'nestedTypeSelectLabel' | 'hasColumnField'
+  | 'transformationType'
+  | 'nestedTypeSelectLabel'
+  | 'hasColumnField'
+  | 'hasNestedTypeSelectField'
+  | 'nestedTypeSelectLabel'
+  | 'hasFilterComponent'
+  | 'hasSqlField'
 > {
   /** Can have empty records list */
   canHaveEmptyRecordsList?: boolean;
diff --git a/src/entities/transformation/utils/prepareTransformationForm/index.ts b/src/entities/transformation/utils/prepareTransformationForm/index.ts
index ebb20479..6107d605 100644
--- a/src/entities/transformation/utils/prepareTransformationForm/index.ts
+++ b/src/entities/transformation/utils/prepareTransformationForm/index.ts
@@ -24,6 +24,8 @@ export const prepareTransformationForm = (data: Transformations): Partial<Transf
             }
           }),
         };
+      case TransformationType.FILTER_SQL:
+        return curr.query ? { ...prev, [curr.type]: [{ query: curr.query }] } : prev;
     }
   }, {});
 };
diff --git a/src/entities/transformation/utils/prepareTransformationRequest/index.ts b/src/entities/transformation/utils/prepareTransformationRequest/index.ts
index fae8b29d..b036b899 100644
--- a/src/entities/transformation/utils/prepareTransformationRequest/index.ts
+++ b/src/entities/transformation/utils/prepareTransformationRequest/index.ts
@@ -1,5 +1,11 @@
 import { TRANSFORMATIONS_FORM_DEFAULT_VALUE, TRANSFORMATIONS_REQUEST_DEFAULT_VALUE } from '../../constants';
-import { TransformationFilterFileType, Transformations, TransformationsForm, TransformationType } from '../../types';
+import {
+  TransformationFilterFileType,
+  TransformationFilterSqlDialect,
+  Transformations,
+  TransformationsForm,
+  TransformationType,
+} from '../../types';
 
 /** Util for mapping of transformations data from form value to appropriate type for backend  */
 export const prepareTransformationRequest = (data?: TransformationsForm): Transformations => {
@@ -7,8 +13,8 @@ export const prepareTransformationRequest = (data?: TransformationsForm): Transf
     return TRANSFORMATIONS_REQUEST_DEFAULT_VALUE;
   }
 
-  return (Object.keys({ ...TRANSFORMATIONS_FORM_DEFAULT_VALUE, ...data }) as Array<keyof TransformationsForm>).map(
-    (key) => {
+  return (Object.keys({ ...TRANSFORMATIONS_FORM_DEFAULT_VALUE, ...data }) as Array<keyof TransformationsForm>)
+    .map((key) => {
       switch (key) {
         case TransformationType.FILTER_ROWS:
           return {
@@ -34,7 +40,22 @@ export const prepareTransformationRequest = (data?: TransformationsForm): Transf
               }
             }),
           };
+        case TransformationType.FILTER_SQL: {
+          const result = {
+            type: TransformationType.FILTER_SQL,
+            filters: data[key] || [],
+          };
+          /** Convert to flat single filter view to match the api */
+          const { type, filters } = result;
+          return filters.length
+            ? {
+                type,
+                ...filters[0],
+                dialect: TransformationFilterSqlDialect.SPARK,
+              }
+            : null;
+        }
       }
-    },
-  );
+    })
+    .filter(Boolean) as Transformations;
 };
diff --git a/src/features/transfer/MutateTransferForm/components/FilterColumnsFormItem/FilterColumnsFormItem.tsx b/src/features/transfer/MutateTransferForm/components/FilterColumnsFormItem/FilterColumnsFormItem.tsx
index bf98cea9..5e04bf0b 100644
--- a/src/features/transfer/MutateTransferForm/components/FilterColumnsFormItem/FilterColumnsFormItem.tsx
+++ b/src/features/transfer/MutateTransferForm/components/FilterColumnsFormItem/FilterColumnsFormItem.tsx
@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import { memo } from 'react';
 import { FilterFormItemProps, TransformationForm, TransformationType } from '@entities/transformation';
 import { useTranslation } from 'react-i18next';
 
@@ -12,6 +12,8 @@ export const FilterColumnsFormItem = memo(
         nestedTypeSelectLabel={t('type', { ns: 'shared' })}
         canHaveEmptyRecordsList={canHaveEmptyRecordsList}
         hasColumnField
+        hasNestedTypeSelectField
+        hasFilterComponent
       />
     );
   },
diff --git a/src/features/transfer/MutateTransferForm/components/FilterColumnsNode/FilterColumnsNode.tsx b/src/features/transfer/MutateTransferForm/components/FilterColumnsNode/FilterColumnsNode.tsx
index 8d90932d..3e7fd386 100644
--- a/src/features/transfer/MutateTransferForm/components/FilterColumnsNode/FilterColumnsNode.tsx
+++ b/src/features/transfer/MutateTransferForm/components/FilterColumnsNode/FilterColumnsNode.tsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import { useMemo } from 'react';
 import { CanvasNode } from '@shared/ui';
 import { Handle, Position } from '@xyflow/react';
 import { FilterOutlined } from '@ant-design/icons';
diff --git a/src/features/transfer/MutateTransferForm/components/FilterFileFormItem/FilterFileFormItem.tsx b/src/features/transfer/MutateTransferForm/components/FilterFileFormItem/FilterFileFormItem.tsx
index 28d650d1..1a608f33 100644
--- a/src/features/transfer/MutateTransferForm/components/FilterFileFormItem/FilterFileFormItem.tsx
+++ b/src/features/transfer/MutateTransferForm/components/FilterFileFormItem/FilterFileFormItem.tsx
@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import { memo } from 'react';
 import { FilterFormItemProps, TransformationForm, TransformationType } from '@entities/transformation';
 import { useTranslation } from 'react-i18next';
 
@@ -11,6 +11,8 @@ export const FilterFileFormItem = memo(
         transformationType={TransformationType.FILTER_FILE}
         nestedTypeSelectLabel={t('type', { ns: 'shared' })}
         canHaveEmptyRecordsList={canHaveEmptyRecordsList}
+        hasNestedTypeSelectField
+        hasFilterComponent
       />
     );
   },
diff --git a/src/features/transfer/MutateTransferForm/components/FilterRowsFormItem/FilterRowsFormItem.tsx b/src/features/transfer/MutateTransferForm/components/FilterRowsFormItem/FilterRowsFormItem.tsx
index affa69ac..b9fbfe55 100644
--- a/src/features/transfer/MutateTransferForm/components/FilterRowsFormItem/FilterRowsFormItem.tsx
+++ b/src/features/transfer/MutateTransferForm/components/FilterRowsFormItem/FilterRowsFormItem.tsx
@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import { memo } from 'react';
 import { FilterFormItemProps, TransformationForm, TransformationType } from '@entities/transformation';
 import { useTranslation } from 'react-i18next';
 
@@ -12,6 +12,8 @@ export const FilterRowsFormItem = memo(
         nestedTypeSelectLabel={t('operator')}
         canHaveEmptyRecordsList={canHaveEmptyRecordsList}
         hasColumnField
+        hasNestedTypeSelectField
+        hasFilterComponent
       />
     );
   },
diff --git a/src/features/transfer/MutateTransferForm/components/FilterSqlFormItem/FilterSqlFormItem.tsx b/src/features/transfer/MutateTransferForm/components/FilterSqlFormItem/FilterSqlFormItem.tsx
new file mode 100644
index 00000000..17298294
--- /dev/null
+++ b/src/features/transfer/MutateTransferForm/components/FilterSqlFormItem/FilterSqlFormItem.tsx
@@ -0,0 +1,14 @@
+import { memo } from 'react';
+import { FilterFormItemProps, TransformationForm, TransformationType } from '@entities/transformation';
+
+export const FilterSqlFormItem = memo(
+  <T extends TransformationType>({ canHaveEmptyRecordsList }: FilterFormItemProps<T>) => {
+    return (
+      <TransformationForm
+        transformationType={TransformationType.FILTER_SQL}
+        canHaveEmptyRecordsList={canHaveEmptyRecordsList}
+        hasSqlField
+      />
+    );
+  },
+);
diff --git a/src/features/transfer/MutateTransferForm/components/FilterSqlFormItem/index.ts b/src/features/transfer/MutateTransferForm/components/FilterSqlFormItem/index.ts
new file mode 100644
index 00000000..f047e1fc
--- /dev/null
+++ b/src/features/transfer/MutateTransferForm/components/FilterSqlFormItem/index.ts
@@ -0,0 +1 @@
+export * from './FilterSqlFormItem';
diff --git a/src/features/transfer/MutateTransferForm/components/FilterSqlNode/FilterSqlNode.tsx b/src/features/transfer/MutateTransferForm/components/FilterSqlNode/FilterSqlNode.tsx
new file mode 100644
index 00000000..f67383d2
--- /dev/null
+++ b/src/features/transfer/MutateTransferForm/components/FilterSqlNode/FilterSqlNode.tsx
@@ -0,0 +1,42 @@
+import { useMemo } from 'react';
+import { CanvasNode } from '@shared/ui';
+import { Handle, Position } from '@xyflow/react';
+import { FilterOutlined } from '@ant-design/icons';
+import { useTranslation } from 'react-i18next';
+
+import {
+  TransferCanvasEdge,
+  TransferCanvasTransformNodeType,
+  TRANSFER_CANVAS_TRANSFORM_NODE_TYPE_NAME_DISPLAY,
+} from '../TransferConnectionsCanvas';
+import { FilterSqlFormItem } from '../FilterSqlFormItem';
+
+import * as classes from './styles.module.less';
+
+export const FilterSqlNode = () => {
+  const { t } = useTranslation('transformation');
+
+  const icon = useMemo(() => {
+    return <FilterOutlined />;
+  }, []);
+
+  const children = useMemo(() => {
+    return (
+      <>
+        <Handle type="target" position={Position.Left} id={TransferCanvasEdge.FILTER_SQL_TARGET} />
+        <FilterSqlFormItem />
+        <Handle type="source" position={Position.Right} id={TransferCanvasEdge.FILTER_SQL_SOURCE} />
+      </>
+    );
+  }, []);
+
+  return (
+    <CanvasNode
+      className={classes.root}
+      title={t(TRANSFER_CANVAS_TRANSFORM_NODE_TYPE_NAME_DISPLAY[TransferCanvasTransformNodeType.FILTER_SQL])}
+      icon={icon}
+    >
+      {children}
+    </CanvasNode>
+  );
+};
diff --git a/src/features/transfer/MutateTransferForm/components/FilterSqlNode/index.ts b/src/features/transfer/MutateTransferForm/components/FilterSqlNode/index.ts
new file mode 100644
index 00000000..498b87cd
--- /dev/null
+++ b/src/features/transfer/MutateTransferForm/components/FilterSqlNode/index.ts
@@ -0,0 +1,2 @@
+export * from './FilterSqlNode';
+export * from './types';
diff --git a/src/features/transfer/MutateTransferForm/components/FilterSqlNode/styles.module.less b/src/features/transfer/MutateTransferForm/components/FilterSqlNode/styles.module.less
new file mode 100644
index 00000000..c844d932
--- /dev/null
+++ b/src/features/transfer/MutateTransferForm/components/FilterSqlNode/styles.module.less
@@ -0,0 +1,3 @@
+.root {
+  width: 800px;
+}
diff --git a/src/features/transfer/MutateTransferForm/components/FilterSqlNode/types.ts b/src/features/transfer/MutateTransferForm/components/FilterSqlNode/types.ts
new file mode 100644
index 00000000..87fbb8fe
--- /dev/null
+++ b/src/features/transfer/MutateTransferForm/components/FilterSqlNode/types.ts
@@ -0,0 +1,5 @@
+import { Node } from '@xyflow/react';
+
+import { TransferCanvasTransformNodeType } from '../TransferConnectionsCanvas';
+
+export interface FilterSqlNodeData extends Node<Record<string, unknown>, TransferCanvasTransformNodeType.FILTER_SQL> {}
diff --git a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/TransferConnectionsCanvas.tsx b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/TransferConnectionsCanvas.tsx
index bcbeb208..6610c1cf 100644
--- a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/TransferConnectionsCanvas.tsx
+++ b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/TransferConnectionsCanvas.tsx
@@ -34,6 +34,9 @@ export const TransferConnectionsCanvas = ({ groupId, isDisplayedButtons = true }
       hasFilterColumns:
         supportedTransformationTypes.includes(TransformationType.FILTER_COLUMNS) &&
         !!initialTransformations[TransformationType.FILTER_COLUMNS]?.length,
+      hasFilterSql:
+        supportedTransformationTypes.includes(TransformationType.FILTER_SQL) &&
+        !!initialTransformations[TransformationType.FILTER_SQL]?.length,
     });
   }, [groupId, supportedTransformationTypes, initialTransformations]);
 
diff --git a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/constants.ts b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/constants.ts
index 489aa904..60bddcc2 100644
--- a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/constants.ts
+++ b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/constants.ts
@@ -4,10 +4,11 @@ import { TransformationType } from '@entities/transformation';
 import { SourceParamsNode } from '../SourceParamsNode';
 import { TargetParamsNode } from '../TargetParamsNode';
 import { FilterRowsNode } from '../FilterRowsNode';
-import { FilterColumnsNode } from '../FilterColumnsNode';
 import { FilterFileNode } from '../FilterFileNode';
+import { FilterColumnsNode } from '../FilterColumnsNode';
+import { FilterSqlNode } from '../FilterSqlNode';
 
-import { TransferCanvasDefaultNodeType, TransferCanvasEdgeType, TransferCanvasTransformNodeType } from './types';
+import { TransferCanvasDefaultNodeType, TransferCanvasTransformNodeType } from './types';
 
 export const NODE_TYPES: NodeTypes = {
   [TransferCanvasDefaultNodeType.SOURCE]: SourceParamsNode,
@@ -15,6 +16,7 @@ export const NODE_TYPES: NodeTypes = {
   [TransferCanvasTransformNodeType.FILTER_FILE]: FilterFileNode,
   [TransferCanvasTransformNodeType.FILTER_ROWS]: FilterRowsNode,
   [TransferCanvasTransformNodeType.FILTER_COLUMNS]: FilterColumnsNode,
+  [TransferCanvasTransformNodeType.FILTER_SQL]: FilterSqlNode,
 };
 
 export const NODE_TYPES_ID = {
@@ -22,15 +24,8 @@ export const NODE_TYPES_ID = {
   [TransferCanvasTransformNodeType.FILTER_FILE]: '2',
   [TransferCanvasTransformNodeType.FILTER_ROWS]: '3',
   [TransferCanvasTransformNodeType.FILTER_COLUMNS]: '4',
-  [TransferCanvasDefaultNodeType.TARGET]: '5',
-};
-
-export const EDGE_TYPES_ID = {
-  [TransferCanvasEdgeType.SOURCE]: '1',
-  [TransferCanvasEdgeType.FILTER_FILE]: '2',
-  [TransferCanvasEdgeType.FILTER_ROWS]: '3',
-  [TransferCanvasEdgeType.FILTER_COLUMNS]: '4',
-  [TransferCanvasEdgeType.TARGET]: '5',
+  [TransferCanvasTransformNodeType.FILTER_SQL]: '5',
+  [TransferCanvasDefaultNodeType.TARGET]: '6',
 };
 
 export const NODE_POSITION_X_GAP_DEFAULT = 500;
@@ -40,6 +35,7 @@ export const TRANSFER_CANVAS_TRANSFORM_NODE_TYPE_NAME_DISPLAY = {
   [TransferCanvasTransformNodeType.FILTER_FILE]: 'filterFile',
   [TransferCanvasTransformNodeType.FILTER_ROWS]: 'filterRows',
   [TransferCanvasTransformNodeType.FILTER_COLUMNS]: 'filterColumns',
+  [TransferCanvasTransformNodeType.FILTER_SQL]: 'filterSql',
 } as const;
 
 export const TRANSFER_CANVAS_NODE_TYPE_TO_TRANSFORM_TYPE_MAP: Record<
@@ -49,6 +45,7 @@ export const TRANSFER_CANVAS_NODE_TYPE_TO_TRANSFORM_TYPE_MAP: Record<
   [TransferCanvasTransformNodeType.FILTER_FILE]: TransformationType.FILTER_FILE,
   [TransferCanvasTransformNodeType.FILTER_ROWS]: TransformationType.FILTER_ROWS,
   [TransferCanvasTransformNodeType.FILTER_COLUMNS]: TransformationType.FILTER_COLUMNS,
+  [TransferCanvasTransformNodeType.FILTER_SQL]: TransformationType.FILTER_SQL,
 } as const;
 
 export const TRANSFER_TRANSFORM_TYPE_TO_CANVAS_NODE_TYPE_MAP: Record<
@@ -58,6 +55,7 @@ export const TRANSFER_TRANSFORM_TYPE_TO_CANVAS_NODE_TYPE_MAP: Record<
   [TransformationType.FILTER_FILE]: TransferCanvasTransformNodeType.FILTER_FILE,
   [TransformationType.FILTER_ROWS]: TransferCanvasTransformNodeType.FILTER_ROWS,
   [TransformationType.FILTER_COLUMNS]: TransferCanvasTransformNodeType.FILTER_COLUMNS,
+  [TransformationType.FILTER_SQL]: TransferCanvasTransformNodeType.FILTER_SQL,
 } as const;
 
 export const TRANSFER_CANVAS_FILTER_NODES = Object.values(
diff --git a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/types.ts b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/types.ts
index 4ddc7a16..c4425248 100644
--- a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/types.ts
+++ b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/types.ts
@@ -1,6 +1,7 @@
 import { FilterColumnsNodeData } from '../FilterColumnsNode';
 import { FilterFileNodeData } from '../FilterFileNode';
 import { FilterRowsNodeData } from '../FilterRowsNode';
+import { FilterSqlNodeData } from '../FilterSqlNode';
 import { SourceParamsNodeData } from '../SourceParamsNode';
 import { TargetParamsNodeData } from '../TargetParamsNode';
 
@@ -15,6 +16,7 @@ export type TransferCanvasNodeData =
   | TargetParamsNodeData
   | FilterRowsNodeData
   | FilterColumnsNodeData
+  | FilterSqlNodeData
   | FilterFileNodeData;
 
 export enum TransferCanvasDefaultNodeType {
@@ -26,6 +28,7 @@ export enum TransferCanvasTransformNodeType {
   FILTER_FILE = 'FILTER_FILE',
   FILTER_ROWS = 'FILTER_ROWS',
   FILTER_COLUMNS = 'FILTER_COLUMNS',
+  FILTER_SQL = 'FILTER_SQL',
 }
 
 export enum TransferCanvasEdgeType {
@@ -33,6 +36,7 @@ export enum TransferCanvasEdgeType {
   FILTER_FILE = 'FILTER_FILE',
   FILTER_ROWS = 'FILTER_ROWS',
   FILTER_COLUMNS = 'FILTER_COLUMNS',
+  FILTER_SQL = 'FILTER_SQL',
   TARGET = 'TARGET',
 }
 
@@ -45,4 +49,6 @@ export enum TransferCanvasEdge {
   FILTER_COLUMNS_TARGET = 'FILTER_COLUMNS_TARGET',
   FILTER_FILE_SOURCE = 'FILTER_FILE_SOURCE',
   FILTER_FILE_TARGET = 'FILTER_FILE_TARGET',
+  FILTER_SQL_SOURCE = 'FILTER_SQL_SOURCE',
+  FILTER_SQL_TARGET = 'FILTER_SQL_TARGET',
 }
diff --git a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialEdges/index.ts b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialEdges/index.ts
index e032dc68..22608dab 100644
--- a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialEdges/index.ts
+++ b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialEdges/index.ts
@@ -1,17 +1,14 @@
 import { Edge } from '@xyflow/react';
 
 import { TransferCanvasNodeData } from '../../types';
-import { EDGE_TYPES_ID } from '../../constants';
 
 export const getInitialEdges = (nodes: TransferCanvasNodeData[]): Edge[] => {
   const edges: Edge[] = [];
 
   /** for instead of Array.prototype.map, because we need to skip first element */
   for (let i = 1; i < nodes.length; i++) {
-    const edgeSource = nodes[i - 1].type!;
-
     edges.push({
-      id: EDGE_TYPES_ID[edgeSource],
+      id: String(i),
       source: nodes[i - 1].id,
       target: nodes[i].id,
       animated: true,
diff --git a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialNodes/getInitialNodes.ts b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialNodes/getInitialNodes.ts
index a6ae11b8..f9c0c496 100644
--- a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialNodes/getInitialNodes.ts
+++ b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialNodes/getInitialNodes.ts
@@ -9,6 +9,7 @@ export const getInitialNodes = ({
   hasFilterRows,
   hasFilterColumns,
   hasFilterFile,
+  hasFilterSql,
 }: GetInitialNodesProps): TransferCanvasNodeData[] => {
   const nodes: TransferCanvasNodeData[] = [
     {
@@ -51,6 +52,16 @@ export const getInitialNodes = ({
     nodeIndex++;
   }
 
+  if (hasFilterSql) {
+    nodes.push({
+      id: NODE_TYPES_ID[TransferCanvasTransformNodeType.FILTER_SQL],
+      type: TransferCanvasTransformNodeType.FILTER_SQL,
+      data: {},
+      position: setNodePosition(nodeIndex),
+    });
+    nodeIndex++;
+  }
+
   nodes.push({
     id: NODE_TYPES_ID[TransferCanvasDefaultNodeType.TARGET],
     type: TransferCanvasDefaultNodeType.TARGET,
diff --git a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialNodes/types.ts b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialNodes/types.ts
index 0ccf09c6..5ebe139a 100644
--- a/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialNodes/types.ts
+++ b/src/features/transfer/MutateTransferForm/components/TransferConnectionsCanvas/utils/getInitialNodes/types.ts
@@ -5,4 +5,5 @@ export interface GetInitialNodesProps extends SourceParamsProps, TargetParamsPro
   hasFilterRows: boolean;
   hasFilterColumns: boolean;
   hasFilterFile: boolean;
+  hasFilterSql: boolean;
 }
diff --git a/src/features/transfer/MutateTransferForm/components/TransferConnectionsDefault/constants.tsx b/src/features/transfer/MutateTransferForm/components/TransferConnectionsDefault/constants.tsx
index a003489c..cd44cc65 100644
--- a/src/features/transfer/MutateTransferForm/components/TransferConnectionsDefault/constants.tsx
+++ b/src/features/transfer/MutateTransferForm/components/TransferConnectionsDefault/constants.tsx
@@ -1,9 +1,9 @@
 import { TransformationType } from '@entities/transformation';
-import React from 'react';
 
 import { FilterColumnsFormItem } from '../FilterColumnsFormItem';
 import { FilterFileFormItem } from '../FilterFileFormItem';
 import { FilterRowsFormItem } from '../FilterRowsFormItem';
+import { FilterSqlFormItem } from '../FilterSqlFormItem';
 
 import { FilterTypeConfig } from './types';
 
@@ -20,4 +20,8 @@ export const FILTER_TYPES_CONFIG: Record<TransformationType, FilterTypeConfig> =
     title: 'filterColumns',
     filter: <FilterColumnsFormItem canHaveEmptyRecordsList />,
   },
+  [TransformationType.FILTER_SQL]: {
+    title: 'filterSql',
+    filter: <FilterSqlFormItem canHaveEmptyRecordsList />,
+  },
 } as const;
diff --git a/src/features/transfer/MutateTransferForm/components/TransferConnectionsDefault/types.ts b/src/features/transfer/MutateTransferForm/components/TransferConnectionsDefault/types.ts
index f0c10ab3..9483f588 100644
--- a/src/features/transfer/MutateTransferForm/components/TransferConnectionsDefault/types.ts
+++ b/src/features/transfer/MutateTransferForm/components/TransferConnectionsDefault/types.ts
@@ -3,7 +3,7 @@ import { TargetParamsProps } from '../TargetParams';
 
 export interface TransferConnectionsDefaultProps extends SourceParamsProps, TargetParamsProps {}
 
-type TitleType = 'filterRows' | 'filterColumns' | 'filterFile';
+type TitleType = 'filterRows' | 'filterColumns' | 'filterFile' | 'filterSql';
 
 export interface FilterTypeConfig {
   title: TitleType;
diff --git a/src/features/transfer/MutateTransferForm/components/TransformButtons/hooks/useHandleNodes/index.ts b/src/features/transfer/MutateTransferForm/components/TransformButtons/hooks/useHandleNodes/index.ts
index 680ea681..ec9ccdc3 100644
--- a/src/features/transfer/MutateTransferForm/components/TransformButtons/hooks/useHandleNodes/index.ts
+++ b/src/features/transfer/MutateTransferForm/components/TransformButtons/hooks/useHandleNodes/index.ts
@@ -8,8 +8,6 @@ import {
   TransferCanvasNodeData,
   TransferCanvasTransformNodeType,
   NODE_TYPES_ID,
-  TransferCanvasDefaultNodeType,
-  EDGE_TYPES_ID,
   TRANSFER_CANVAS_NODE_TYPE_TO_TRANSFORM_TYPE_MAP,
   TRANSFER_CANVAS_FILTER_NODES,
 } from '../../../TransferConnectionsCanvas';
@@ -47,38 +45,28 @@ export const useHandleNodes = () => {
 
   const addNewEdge = (nodeType: TransferCanvasTransformNodeType) => {
     const edges = getEdges();
-    const newEdgeId = EDGE_TYPES_ID[nodeType];
-
-    let indexOfPreviousEdge = 0;
-    let indexOfNextEdge = edges.length;
-
-    edges.forEach((edge, index) => {
-      const currentEdgeId = edge.id;
-      if (currentEdgeId < newEdgeId) {
-        indexOfPreviousEdge = index;
-        return;
-      }
-      if (indexOfNextEdge === edges.length && currentEdgeId > newEdgeId) {
-        indexOfNextEdge = index;
-      }
-    });
 
     const newEdgeSource = NODE_TYPES_ID[nodeType];
-    const newEdgeTarget = edges[indexOfNextEdge]
-      ? edges[indexOfNextEdge].id
-      : NODE_TYPES_ID[TransferCanvasDefaultNodeType.TARGET];
+    const prevEdgeIndex = edges.findIndex((edge) => edge.target > newEdgeSource);
 
     const newEdge: Edge = {
-      id: newEdgeId,
+      id: '',
       source: newEdgeSource,
-      target: newEdgeTarget,
+      target: edges[prevEdgeIndex].target,
       animated: true,
     };
-
-    const firstEdges = edges.slice(0, indexOfPreviousEdge);
-    const previousEdge = { ...edges[indexOfPreviousEdge], target: newEdgeSource };
-    const lastEdges = edges.slice(indexOfNextEdge);
-    const newEdges = firstEdges.concat(previousEdge).concat(newEdge).concat(lastEdges);
+    edges[prevEdgeIndex].target = newEdge.source;
+
+    const newEdges = edges
+      .slice(0, prevEdgeIndex + 1)
+      // Place the new edge in the found position
+      .concat(newEdge)
+      .concat(edges.slice(prevEdgeIndex + 1))
+      // Remap id for new collection
+      .map((edge, index) => {
+        edge.id = String(index + 1);
+        return edge;
+      });
 
     setEdges(newEdges);
   };
@@ -98,33 +86,27 @@ export const useHandleNodes = () => {
 
   const deleteEdge = (nodeType: TransferCanvasTransformNodeType) => {
     const edges = getEdges();
-    const newEdge: Edge = {
-      id: '',
-      source: '',
-      target: '',
-      animated: true,
-    };
 
-    let nodeIndex = 0;
-
-    const restEdges = edges.filter((edge, index) => {
-      if (edge.target === NODE_TYPES_ID[nodeType]) {
-        newEdge.id = edge.id;
-        newEdge.source = edge.source;
-        nodeIndex = index;
-        return false;
-      }
-      if (edge.source === NODE_TYPES_ID[nodeType]) {
-        newEdge.target = edge.target;
-        nodeIndex = index;
-        return false;
-      }
-      return true;
-    });
-
-    const firstEdges = restEdges.slice(0, nodeIndex);
-    const lastEdges = restEdges.slice(nodeIndex + 1);
-    const newEdges = firstEdges.concat(newEdge).concat(lastEdges);
+    let removedIndex = 0;
+    let removedSource = '';
+    const newEdges = edges
+      .filter((edge, index) => {
+        // Remove node and store removed index
+        if (edge.target === NODE_TYPES_ID[nodeType]) {
+          removedIndex = index;
+          removedSource = edge.source;
+          return false;
+        }
+        return true;
+      })
+      // Remap id for new collection
+      .map((edge, index) => {
+        edge.id = String(index + 1);
+        return edge;
+      });
+
+    // Switch source for next node from remote
+    newEdges[removedIndex].source = removedSource;
 
     setEdges(newEdges);
   };
diff --git a/src/features/transfer/MutateTransferForm/components/TransformButtons/styles.module.less b/src/features/transfer/MutateTransferForm/components/TransformButtons/styles.module.less
index d825a71c..25226a7b 100644
--- a/src/features/transfer/MutateTransferForm/components/TransformButtons/styles.module.less
+++ b/src/features/transfer/MutateTransferForm/components/TransformButtons/styles.module.less
@@ -13,8 +13,8 @@
   z-index: 5;
 
   .buttons {
-    display: flex;
-    align-items: center;
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
     gap: 12px;
   }
 }
diff --git a/src/features/transfer/MutateTransferForm/hooks/useSupportedTransformationTypes/index.ts b/src/features/transfer/MutateTransferForm/hooks/useSupportedTransformationTypes/index.ts
index 8904ed00..b1c275ff 100644
--- a/src/features/transfer/MutateTransferForm/hooks/useSupportedTransformationTypes/index.ts
+++ b/src/features/transfer/MutateTransferForm/hooks/useSupportedTransformationTypes/index.ts
@@ -1,4 +1,4 @@
-import { CONNECTION_TYPE_SUPPORT_TRANSFORMATION_TYPES } from '@entities/transformation';
+import { CONNECTION_TYPE_SUPPORT_TRANSFORMATION_TYPES, DEFAULT_TRANSFORMATION_TYPES } from '@entities/transformation';
 
 import { useSelectConnectionType } from '../useSelectConnectionType';
 
@@ -7,7 +7,10 @@ export const useSupportedTransformationTypes = () => {
   const { selectedConnectionType } = useSelectConnectionType({
     connectionParamFieldName: 'source_params',
   });
-  const supportedTransformationTypes = CONNECTION_TYPE_SUPPORT_TRANSFORMATION_TYPES[selectedConnectionType];
+
+  const supportedTransformationTypes = selectedConnectionType
+    ? CONNECTION_TYPE_SUPPORT_TRANSFORMATION_TYPES[selectedConnectionType]
+    : DEFAULT_TRANSFORMATION_TYPES;
 
   return { supportedTransformationTypes };
 };
diff --git a/src/shared/config/i18n/translations/en.json b/src/shared/config/i18n/translations/en.json
index bd47d84f..177d20df 100644
--- a/src/shared/config/i18n/translations/en.json
+++ b/src/shared/config/i18n/translations/en.json
@@ -246,6 +246,7 @@
     "value": "Value",
     "selectUnit": "Select unit",
     "column": "Column",
+    "query": "Query",
     "selectOption": "Select option",
     "isNull": "is NULL",
     "isNotNull": "is not NULL",
@@ -268,6 +269,7 @@
     "filterRows": "Filter rows",
     "filterColumns": "Filter columns",
     "filterFile": "Filter file",
+    "filterSql": "Filter sql",
     "fileSizeUnit": "File size unit",
     "fileSizeMin": "min file size",
     "fileSizeMax": "max file size",
diff --git a/src/shared/config/i18n/translations/ru.json b/src/shared/config/i18n/translations/ru.json
index fc4d645c..4c82516a 100644
--- a/src/shared/config/i18n/translations/ru.json
+++ b/src/shared/config/i18n/translations/ru.json
@@ -244,6 +244,7 @@
     "value": "Значение",
     "selectUnit": "Выберите единицу измерения",
     "column": "Столбец",
+    "query": "Запрос",
     "selectOption": "Выберите опцию",
     "isNull": "cNULL",
     "isNotNull": "не NULL",
@@ -266,6 +267,7 @@
     "filterRows": "Фильтр строк",
     "filterColumns": "Фильтр столбцов",
     "filterFile": "Фильтр файлов",
+    "filterSql": "Фильтр SQL",
     "fileSizeUnit": "Единица измерения",
     "fileSizeMin": "мин. размер файла",
     "fileSizeMax": "макс. размер файла",
diff --git a/src/shared/ui/AceSqlEditor/constants.ts b/src/shared/ui/AceSqlEditor/constants.ts
new file mode 100644
index 00000000..fe3aabd8
--- /dev/null
+++ b/src/shared/ui/AceSqlEditor/constants.ts
@@ -0,0 +1,24 @@
+// Example with settings
+// https://ace.c9.io/build/kitchen-sink.html
+
+const EDITOR_PROPS = {
+  $blockScrolling: false,
+  $blockSelectEnabled: false,
+  $enableBlockSelect: false,
+  $enableMultiselect: false,
+  $highlightPending: false,
+  $highlightTagPending: false,
+};
+
+const SET_OPTIONS = {
+  highlightSelectedWord: false,
+};
+
+export const INITIAL_PROPS = {
+  enableBasicAutocompletion: true,
+  enableLiveAutocompletion: true,
+  showPrintMargin: false,
+  highlightActiveLine: false,
+  editorProps: EDITOR_PROPS,
+  setOptions: SET_OPTIONS,
+};
diff --git a/src/shared/ui/AceSqlEditor/index.tsx b/src/shared/ui/AceSqlEditor/index.tsx
new file mode 100644
index 00000000..e95f053c
--- /dev/null
+++ b/src/shared/ui/AceSqlEditor/index.tsx
@@ -0,0 +1,13 @@
+import AceEditor from 'react-ace';
+
+import 'ace-builds/src-noconflict/mode-sql';
+import 'ace-builds/src-noconflict/theme-github_light_default';
+import 'ace-builds/src-noconflict/ext-language_tools';
+
+import { AceSqlEditorProps } from './types';
+import { INITIAL_PROPS } from './constants';
+
+/** SQL Editing Component */
+export const AceSqlEditor = (props: AceSqlEditorProps) => {
+  return <AceEditor theme="github_light_default" mode="sql" {...INITIAL_PROPS} {...props} />;
+};
diff --git a/src/shared/ui/AceSqlEditor/types.ts b/src/shared/ui/AceSqlEditor/types.ts
new file mode 100644
index 00000000..bd22e9c8
--- /dev/null
+++ b/src/shared/ui/AceSqlEditor/types.ts
@@ -0,0 +1,4 @@
+import { IAceEditorProps } from 'react-ace';
+
+/** Type of SQL editing component props */
+export type AceSqlEditorProps = Omit<IAceEditorProps, 'mode' | 'theme'>;
diff --git a/src/shared/utils/getCountLines/index.ts b/src/shared/utils/getCountLines/index.ts
new file mode 100644
index 00000000..b48e5bdb
--- /dev/null
+++ b/src/shared/utils/getCountLines/index.ts
@@ -0,0 +1,3 @@
+/** Returns the number of translations per new line */
+export const getCountLines = (value: string): number =>
+  typeof value === 'string' ? value.split(/\r\n|\r|\n/).length : 0;
diff --git a/src/shared/utils/index.ts b/src/shared/utils/index.ts
index 27bd6c0e..4c666d03 100644
--- a/src/shared/utils/index.ts
+++ b/src/shared/utils/index.ts
@@ -1,2 +1,3 @@
+export * from './getCountLines';
 export * from './hasAccessByUserRole';
 export * from './isValidRegex';
diff --git a/yarn.lock b/yarn.lock
index 4c2c951a..5fdf9e40 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3276,6 +3276,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ace-builds@npm:1.43.6, ace-builds@npm:^1.36.3":
+  version: 1.43.6
+  resolution: "ace-builds@npm:1.43.6"
+  checksum: 10c0/33d0159a99650602de83b95766643b8f4f6029fc1ab582e47f7678288cae8e1c89b91747d23be42ec153a88d784fb9488935973f7a100b9093f837ac988f5c96
+  languageName: node
+  linkType: hard
+
 "acorn-import-phases@npm:^1.0.3":
   version: 1.0.3
   resolution: "acorn-import-phases@npm:1.0.3"
@@ -5049,6 +5056,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"diff-match-patch@npm:^1.0.5":
+  version: 1.0.5
+  resolution: "diff-match-patch@npm:1.0.5"
+  checksum: 10c0/142b6fad627b9ef309d11bd935e82b84c814165a02500f046e2773f4ea894d10ed3017ac20454900d79d4a0322079f5b713cf0986aaf15fce0ec4a2479980c86
+  languageName: node
+  linkType: hard
+
 "dns-packet@npm:^5.2.2":
   version: 5.6.1
   resolution: "dns-packet@npm:5.6.1"
@@ -7972,6 +7986,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"lodash.get@npm:^4.4.2":
+  version: 4.4.2
+  resolution: "lodash.get@npm:4.4.2"
+  checksum: 10c0/48f40d471a1654397ed41685495acb31498d5ed696185ac8973daef424a749ca0c7871bf7b665d5c14f5cc479394479e0307e781f61d5573831769593411be6e
+  languageName: node
+  linkType: hard
+
+"lodash.isequal@npm:^4.5.0":
+  version: 4.5.0
+  resolution: "lodash.isequal@npm:4.5.0"
+  checksum: 10c0/dfdb2356db19631a4b445d5f37868a095e2402292d59539a987f134a8778c62a2810c2452d11ae9e6dcac71fc9de40a6fedcb20e2952a15b431ad8b29e50e28f
+  languageName: node
+  linkType: hard
+
 "lodash.memoize@npm:^4.1.2":
   version: 4.1.2
   resolution: "lodash.memoize@npm:4.1.2"
@@ -10176,6 +10204,22 @@ __metadata:
   languageName: node
   linkType: hard
 
+"react-ace@npm:14.0.1":
+  version: 14.0.1
+  resolution: "react-ace@npm:14.0.1"
+  dependencies:
+    ace-builds: "npm:^1.36.3"
+    diff-match-patch: "npm:^1.0.5"
+    lodash.get: "npm:^4.4.2"
+    lodash.isequal: "npm:^4.5.0"
+    prop-types: "npm:^15.8.1"
+  peerDependencies:
+    react: ^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+    react-dom: ^0.13.0 || ^0.14.0 || ^15.0.1 || ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
+  checksum: 10c0/dbc77970836f13bad88365903d077edd68cc1955857290475bc067e0b801181c1d60a9ee08cf89b20895fe312dbb169c072c5b23338d7176f9f658db7929732f
+  languageName: node
+  linkType: hard
+
 "react-dom@npm:18.3.1":
   version: 18.3.1
   resolution: "react-dom@npm:18.3.1"
@@ -11512,6 +11556,7 @@ __metadata:
     "@typescript-eslint/eslint-plugin": "npm:8.56.0"
     "@typescript-eslint/parser": "npm:8.56.0"
     "@xyflow/react": "npm:12.10.1"
+    ace-builds: "npm:1.43.6"
     antd: "npm:4.24.16"
     axios: "npm:1.13.5"
     clsx: "npm:2.1.1"
@@ -11541,6 +11586,7 @@ __metadata:
     prettier: "npm:3.8.1"
     rc-picker: "npm:4.11.3"
     react: "npm:18.3.1"
+    react-ace: "npm:14.0.1"
     react-dom: "npm:18.3.1"
     react-error-boundary: "npm:4.1.2"
     react-i18next: "npm:15.7.4"