Merge branch 'main' into nv/4102

cmd/enterprise/Dockerfile.integration

@@ -1,4 +1,4 @@
-FROM golang:1.24-bullseye
+FROM golang:1.25-bookworm
 
 ARG OS="linux"
 ARG TARGETARCH

cmd/enterprise/Dockerfile.with-web.integration

@@ -6,7 +6,7 @@ ENV NODE_OPTIONS=--max-old-space-size=8192
 RUN CI=1 yarn install
 RUN CI=1 yarn build
 
-FROM golang:1.24-bullseye
+FROM golang:1.25-bookworm
 
 ARG OS="linux"
 ARG TARGETARCH

frontend/src/components/CeleryOverview/CeleryOverviewTable/CeleryOverviewTable.tsx

@@ -16,7 +16,7 @@ import {
 	Tooltip,
 	Typography,
 } from 'antd';
-import type { FilterDropdownProps } from 'antd/lib/table/interface';
+import { FilterDropdownProps } from 'antd/lib/table/interface';
 import logEvent from 'api/common/logEvent';
 import {
 	getQueueOverview,

frontend/src/components/CeleryTask/CeleryTaskConfigOptions/useGetCeleryFilters.ts

@@ -1,7 +1,7 @@
 import { useQuery } from 'react-query';
 // eslint-disable-next-line no-restricted-imports
 import { useSelector } from 'react-redux';
-import type { DefaultOptionType } from 'antd/es/select';
+import { DefaultOptionType } from 'antd/es/select';
 import { getAttributesValues } from 'api/queryBuilder/getAttributesValues';
 import { DATA_TYPE_VS_ATTRIBUTE_VALUES_KEY } from 'constants/queryBuilder';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';

frontend/src/components/CeleryTask/useCeleryFilterOptions.ts

@@ -1,5 +1,5 @@
 import { useState } from 'react';
-import type { DefaultOptionType } from 'antd/es/select';
+import { DefaultOptionType } from 'antd/es/select';
 import useDebouncedFn from 'hooks/useDebouncedFunction';
 import { DataTypes } from 'types/api/queryBuilder/queryAutocompleteResponse';
 import { DataSource } from 'types/common/queryBuilder';

frontend/src/components/ExplorerCard/test/MenuItemGenerator.test.tsx

@@ -13,8 +13,7 @@ jest.mock('react-router-dom', () => ({
 	}),
 }));
 
-jest.mock('antd', () => ({
-	...jest.requireActual('antd'),
+jest.mock('antd/es/form/Form', () => ({
 	useForm: jest.fn().mockReturnValue({
 		onFinish: jest.fn(),
 	}),

frontend/src/components/ExplorerCard/types.ts

@@ -1,6 +1,6 @@
 import { UseMutateAsyncFunction } from 'react-query';
 import { FormInstance } from 'antd';
-import type { NotificationInstance } from 'antd/es/notification/interface';
+import { NotificationInstance } from 'antd/es/notification/interface';
 import { AxiosResponse } from 'axios';
 import { PANEL_TYPES } from 'constants/queryBuilder';
 import { OptionsQuery } from 'container/OptionsMenu/types';

frontend/src/components/ExplorerCard/utils.ts

@@ -1,4 +1,4 @@
-import type { NotificationInstance } from 'antd/es/notification/interface';
+import { NotificationInstance } from 'antd/es/notification/interface';
 import axios from 'axios';
 import { SOMETHING_WENT_WRONG } from 'constants/api';
 import { QueryParams } from 'constants/query';

frontend/src/components/HostMetricsDetail/HostMetricTraces/utils.tsx

@@ -1,4 +1,5 @@
-import { TableColumnsType as ColumnsType, Tag, Typography } from 'antd';
+import { Tag, Typography } from 'antd';
+import { ColumnsType } from 'antd/es/table';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { getMs } from 'container/Trace/Filters/Panel/PanelBody/Duration/util';
 import {

frontend/src/components/HostMetricsDetail/HostMetricsDetails.tsx

@@ -12,7 +12,7 @@ import {
 	Tag,
 	Typography,
 } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import { InfraMonitoringEvents } from 'constants/events';
 import { QueryParams } from 'constants/query';

frontend/src/components/LogDetail/index.tsx

@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import { useCopyToClipboard, useLocation } from 'react-use';
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Divider, Drawer, Radio, Tooltip, Typography } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import cx from 'classnames';
 import { LogType } from 'components/Logs/LogStateIndicator/LogStateIndicator';
 import QuerySearch from 'components/QueryBuilderV2/QueryV2/QuerySearch/QuerySearch';

frontend/src/components/Logs/TableView/types.ts

@@ -1,7 +1,4 @@
-import {
-	TableColumnsType as ColumnsType,
-	TableColumnType as ColumnType,
-} from 'antd';
+import { ColumnsType, ColumnType } from 'antd/es/table';
 import { FontSize } from 'container/OptionsMenu/types';
 import { IField } from 'types/api/logs/fields';
 import { ILog } from 'types/api/logs/log';

frontend/src/components/Logs/TableView/useTableView.tsx

@@ -1,5 +1,6 @@
 import { useMemo } from 'react';
-import { TableColumnsType as ColumnsType, Typography } from 'antd';
+import { Typography } from 'antd';
+import { ColumnsType } from 'antd/es/table';
 import cx from 'classnames';
 import { DATE_TIME_FORMATS } from 'constants/dateTimeFormats';
 import { getSanitizedLogBody } from 'container/LogDetailedView/utils';

frontend/src/components/LogsFormatOptionsMenu/LogsFormatOptionsMenu.tsx

@@ -1,6 +1,6 @@
 import { useCallback, useEffect, useRef, useState } from 'react';
 import { Button, Input, InputNumber, Popover, Tooltip, Typography } from 'antd';
-import type { DefaultOptionType } from 'antd/es/select';
+import { DefaultOptionType } from 'antd/es/select';
 import cx from 'classnames';
 import { LogViewMode } from 'container/LogsTable';
 import { FontSize, OptionsMenuConfig } from 'container/OptionsMenu/types';

frontend/src/components/MessagingQueues/MQCommon/MQCommon.tsx

@@ -1,6 +1,6 @@
 import { Color } from '@signozhq/design-tokens';
 import { Tooltip } from 'antd';
-import type { DefaultOptionType } from 'antd/es/select';
+import { DefaultOptionType } from 'antd/es/select';
 import { Info } from 'lucide-react';
 
 import './MQCommon.styles.scss';

frontend/src/components/ResizeTable/DynamicColumnTable.tsx

@@ -1,10 +1,7 @@
 import { memo, useEffect, useState } from 'react';
-import type {
-	TableColumnGroupType as ColumnGroupType,
-	TableColumnsType as ColumnsType,
-	TableColumnType as ColumnType,
-} from 'antd';
 import { Button, Dropdown, Flex, MenuProps, Switch } from 'antd';
+import { ColumnGroupType, ColumnType } from 'antd/es/table';
+import { ColumnsType } from 'antd/lib/table';
 import logEvent from 'api/common/logEvent';
 import LaunchChatSupport from 'components/LaunchChatSupport/LaunchChatSupport';
 import { useSafeNavigate } from 'hooks/useSafeNavigate';

frontend/src/components/ResizeTable/ResizeTable.tsx

@@ -9,7 +9,7 @@ import {
 import ReactDragListView from 'react-drag-listview';
 import { ResizeCallbackData } from 'react-resizable';
 import { Table } from 'antd';
-import type { ColumnsType } from 'antd/lib/table';
+import { ColumnsType } from 'antd/lib/table';
 import cx from 'classnames';
 import { dragColumnParams } from 'hooks/useDragColumns/configs';
 import { getColumnWidth, RowData } from 'lib/query/createTableColumnsFromQuery';

frontend/src/components/ResizeTable/types.ts

@@ -1,7 +1,7 @@
 import { TableProps } from 'antd';
-import type { ColumnsType } from 'antd/es/table';
-import type { PaginationProps } from 'antd/lib';
-import type { ColumnGroupType, ColumnType } from 'antd/lib/table';
+import { ColumnsType } from 'antd/es/table';
+import { PaginationProps } from 'antd/lib';
+import { ColumnGroupType, ColumnType } from 'antd/lib/table';
 import { LaunchChatSupportProps } from 'components/LaunchChatSupport/LaunchChatSupport';
 
 import { TableDataSource } from './contants';

frontend/src/components/SignozRadioGroup/SignozRadioGroup.tsx

@@ -1,4 +1,5 @@
-import { Radio, RadioChangeEvent } from 'antd';
+import { Radio } from 'antd';
+import { RadioChangeEvent } from 'antd/es/radio';
 
 import './SignozRadioGroup.styles.scss';
 

frontend/src/components/Styled/index.ts

@@ -13,8 +13,8 @@ import {
 	TabsProps,
 	Typography,
 } from 'antd';
-import type { TextProps } from 'antd/lib/typography/Text';
-import type { TitleProps } from 'antd/lib/typography/Title';
+import { TextProps } from 'antd/lib/typography/Text';
+import { TitleProps } from 'antd/lib/typography/Title';
 import styled, { FlattenSimpleInterpolation } from 'styled-components';
 
 import { IStyledClass } from './types';

frontend/src/components/TableRenderer/utils.ts

@@ -1,7 +1,5 @@
-import type {
-	TableColumnsType as ColumnsType,
-	TableColumnType as ColumnType,
-} from 'antd';
+import { ColumnType } from 'antd/es/table';
+import { ColumnsType } from 'antd/lib/table';
 
 export const generatorResizeTableColumns = <T>({
 	baseColumnOptions,

frontend/src/components/TabsAndFilters/Tabs/Tabs.tsx

@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { Radio } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import { History, Table } from 'lucide-react';
 
 import { ALERT_TABS } from '../constants';

frontend/src/components/Tags/Tags.tsx

@@ -1,6 +1,7 @@
 import React, { Dispatch, SetStateAction, useState } from 'react';
 import { PlusOutlined } from '@ant-design/icons';
-import { Button, Tag } from 'antd';
+import { Button } from 'antd';
+import { Tag } from 'antd/lib';
 import Input from 'components/Input';
 import { Check, X } from 'lucide-react';
 

frontend/src/components/YAxisUnitSelector/YAxisUnitSelector.tsx

@@ -1,7 +1,7 @@
 import { useMemo } from 'react';
 import { WarningFilled } from '@ant-design/icons';
 import { Select, Tooltip } from 'antd';
-import type { DefaultOptionType } from 'antd/es/select';
+import { DefaultOptionType } from 'antd/es/select';
 import classNames from 'classnames';
 
 import { UniversalYAxisUnitMappings } from './constants';

frontend/src/container/APIKeys/APIKeys.tsx

@@ -8,7 +8,6 @@ import {
 	Button,
 	Col,
 	Collapse,
-	CollapseProps,
 	Flex,
 	Form,
 	Input,
@@ -21,7 +20,8 @@ import {
 	Tooltip,
 	Typography,
 } from 'antd';
-import type { NotificationInstance } from 'antd/es/notification/interface';
+import { NotificationInstance } from 'antd/es/notification/interface';
+import { CollapseProps } from 'antd/lib';
 import createAPIKeyApi from 'api/v1/pats/create';
 import deleteAPIKeyApi from 'api/v1/pats/delete';
 import updateAPIKeyApi from 'api/v1/pats/update';

frontend/src/container/AlertHistory/Statistics/TopContributorsCard/TopContributorsRows.tsx

@@ -1,6 +1,7 @@
 import { HTMLAttributes } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Table, TableColumnsType as ColumnsType } from 'antd';
+import { Progress, Table } from 'antd';
+import { ColumnsType } from 'antd/es/table';
 import logEvent from 'api/common/logEvent';
 import { ConditionalAlertPopover } from 'container/AlertHistory/AlertPopover/AlertPopover';
 import AlertLabels from 'pages/AlertDetails/AlertHeader/AlertLabels/AlertLabels';

frontend/src/container/AlertHistory/Timeline/Table/useTimelineTable.tsx

@@ -1,7 +1,8 @@
 import { useMemo } from 'react';
 import { EllipsisOutlined } from '@ant-design/icons';
 import { Color } from '@signozhq/design-tokens';
-import { Button, TableColumnsType as ColumnsType } from 'antd';
+import { Button } from 'antd';
+import { ColumnsType } from 'antd/es/table';
 import ClientSideQBSearch, {
 	AttributeKey,
 } from 'components/ClientSideQBSearch/ClientSideQBSearch';

frontend/src/container/AllAlertChannels/AlertChannels.tsx

@@ -2,7 +2,7 @@ import { useCallback } from 'react';
 import { useTranslation } from 'react-i18next';
 import { generatePath } from 'react-router-dom';
 import { Button } from 'antd';
-import type { ColumnsType } from 'antd/lib/table';
+import { ColumnsType } from 'antd/lib/table';
 import { ResizeTable } from 'components/ResizeTable';
 import ROUTES from 'constants/routes';
 import useComponentPermission from 'hooks/useComponentPermission';

frontend/src/container/AllAlertChannels/Delete.tsx

@@ -2,7 +2,7 @@ import { useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { useQueryClient } from 'react-query';
 import { Button } from 'antd';
-import type { NotificationInstance } from 'antd/es/notification/interface';
+import { NotificationInstance } from 'antd/es/notification/interface';
 import deleteChannel from 'api/channels/delete';
 import APIError from 'types/api/error';
 

frontend/src/container/AllError/index.tsx

@@ -14,9 +14,9 @@ import {
 	Tooltip,
 	Typography,
 } from 'antd';
-import type { ColumnType, TablePaginationConfig } from 'antd/es/table';
-import type { FilterValue, SorterResult } from 'antd/es/table/interface';
-import type { ColumnsType } from 'antd/lib/table';
+import { ColumnType, TablePaginationConfig } from 'antd/es/table';
+import { FilterValue, SorterResult } from 'antd/es/table/interface';
+import { ColumnsType } from 'antd/lib/table';
 import { FilterConfirmProps } from 'antd/lib/table/interface';
 import logEvent from 'api/common/logEvent';
 import getAll from 'api/errors/getAll';

frontend/src/container/AllError/types.ts

@@ -1,4 +1,4 @@
-import type { FilterDropdownProps } from 'antd/es/table/interface';
+import { FilterDropdownProps } from 'antd/es/table/interface';
 
 export interface FilterDropdownExtendsProps {
 	placeholder: string;

frontend/src/container/AllError/utils.ts

@@ -1,4 +1,4 @@
-import type { FilterValue, SortOrder } from 'antd/lib/table/interface';
+import { FilterValue, SortOrder } from 'antd/lib/table/interface';
 import Timestamp from 'timestamp-nano';
 import { Order, OrderBy } from 'types/api/errors/getAll';
 

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/DomainDetails.tsx

@@ -3,7 +3,7 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useSelector } from 'react-redux';
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Divider, Drawer, Radio, Typography } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import DateTimeSelectionV2 from 'container/TopNav/DateTimeSelectionV2';
 import {
 	CustomTimeType,

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/DependentServices.tsx

@@ -1,6 +1,7 @@
 import { useMemo, useState } from 'react';
 import { UseQueryResult } from 'react-query';
-import { Skeleton, Table, TablePaginationConfig, Typography } from 'antd';
+import { Table, TablePaginationConfig, Typography } from 'antd';
+import Skeleton from 'antd/lib/skeleton';
 import { QueryParams } from 'constants/query';
 import {
 	dependentServicesColumns,

frontend/src/container/ApiMonitoring/Explorer/Domains/DomainDetails/components/ExpandedRow.tsx

@@ -4,7 +4,7 @@ import { useQueries } from 'react-query';
 import { useSelector } from 'react-redux';
 import { LoadingOutlined } from '@ant-design/icons';
 import { Spin, Table } from 'antd';
-import type { ColumnType } from 'antd/lib/table';
+import { ColumnType } from 'antd/lib/table';
 import logEvent from 'api/common/logEvent';
 import { ENTITY_VERSION_V4 } from 'constants/app';
 import { REACT_QUERY_KEY } from 'constants/reactQueryKeys';

frontend/src/container/ApiMonitoring/__tests__/DependentServices.test.tsx

@@ -69,6 +69,9 @@ jest.mock('antd', () => {
 					))}
 				</div>
 			)),
+		Skeleton: jest
+			.fn()
+			.mockImplementation(() => <div data-testid="skeleton-mock" />),
 		Typography: {
 			Text: jest
 				.fn()

frontend/src/container/ApiMonitoring/utils.tsx

@@ -1,6 +1,7 @@
 import { ReactNode } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, TableColumnType as ColumnType, Tag, Tooltip } from 'antd';
+import { Progress, Tag, Tooltip } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import { convertFiltersToExpressionWithExistingQuery } from 'components/QueryBuilderV2/utils';
 import {
 	FiltersType,

frontend/src/container/BillingContainer/BillingContainer.tsx

@@ -12,10 +12,10 @@ import {
 	Row,
 	Skeleton,
 	Table,
-	TableColumnsType as ColumnsType,
 	Tag,
 	Typography,
 } from 'antd';
+import { ColumnsType } from 'antd/es/table';
 import getUsage, { UsageResponsePayloadProps } from 'api/billing/getUsage';
 import logEvent from 'api/common/logEvent';
 import updateCreditCardApi from 'api/v1/checkout/create';

frontend/src/container/CloudIntegrationPage/Header/Header.tsx

@@ -1,5 +1,5 @@
 import { Link } from 'react-router-dom';
-import { Breadcrumb } from 'antd';
+import Breadcrumb from 'antd/es/breadcrumb';
 import ROUTES from 'constants/routes';
 import { Blocks, LifeBuoy } from 'lucide-react';
 

frontend/src/container/CloudIntegrationPage/HeroSection/components/AccountActions.tsx

@@ -2,7 +2,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { useNavigate } from 'react-router-dom-v5-compat';
 import { Color } from '@signozhq/design-tokens';
 import { Button, Select, Skeleton } from 'antd';
-import type { SelectProps } from 'antd/lib';
+import { SelectProps } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import { useAwsAccounts } from 'hooks/integration/aws/useAwsAccounts';
 import useUrlQuery from 'hooks/useUrlQuery';

frontend/src/container/CreateAlertV2/AlertCondition/__tests__/ThresholdItem.test.tsx

@@ -1,5 +1,5 @@
 import { fireEvent, render, screen } from '@testing-library/react';
-import type { DefaultOptionType } from 'antd/es/select';
+import { DefaultOptionType } from 'antd/es/select';
 import { createMockAlertContextState } from 'container/CreateAlertV2/EvaluationSettings/__tests__/testUtils';
 import { getAppContextMockState } from 'container/RoutingPolicies/__tests__/testUtils';
 import * as appHooks from 'providers/App/App';

frontend/src/container/CreateAlertV2/AlertCondition/types.ts

@@ -1,4 +1,4 @@
-import type { DefaultOptionType } from 'antd/es/select';
+import { DefaultOptionType } from 'antd/es/select';
 import { Channels } from 'types/api/channels/getAll';
 
 import {

frontend/src/container/CreateAlertV2/AlertCondition/utils.tsx

@@ -1,5 +1,5 @@
-import { Button, Flex, SelectProps, Switch, Typography } from 'antd';
-import type { BaseOptionType, DefaultOptionType } from 'antd/es/select';
+import { Button, Flex, Switch, Typography } from 'antd';
+import { BaseOptionType, DefaultOptionType, SelectProps } from 'antd/es/select';
 import { getInvolvedQueriesInTraceOperator } from 'components/QueryBuilderV2/QueryV2/TraceOperator/utils/utils';
 import { YAxisSource } from 'components/YAxisUnitSelector/types';
 import { getYAxisCategories } from 'components/YAxisUnitSelector/utils';

frontend/src/container/CreateAlertV2/EvaluationSettings/EvaluationCadence/EvaluationCadenceDetails.tsx

@@ -1,5 +1,6 @@
 import { useEffect, useMemo, useState } from 'react';
-import { Button, DatePicker, Input, Select, Typography } from 'antd';
+import { Button, DatePicker, Select, Typography } from 'antd';
+import TextArea from 'antd/lib/input/TextArea';
 import classNames from 'classnames';
 import { useCreateAlertState } from 'container/CreateAlertV2/context';
 import { AdvancedOptionsState } from 'container/CreateAlertV2/context/types';
@@ -205,7 +206,7 @@ function EvaluationCadenceDetails({
 					}
 				/>
 			</div>
-			<Input.TextArea
+			<TextArea
 				value={evaluationCadence.rrule.rrule}
 				placeholder="Enter RRule"
 				onChange={(value): void =>

frontend/src/container/CreateAlertV2/NotificationSettings/NotificationMessage.tsx

@@ -1,4 +1,5 @@
-import { Input, Tooltip, Typography } from 'antd';
+import { Tooltip, Typography } from 'antd';
+import TextArea from 'antd/lib/input/TextArea';
 import { Info } from 'lucide-react';
 
 import { useCreateAlertState } from '../context';
@@ -75,7 +76,7 @@ function NotificationMessage(): JSX.Element {
 					</Popover> */}
 				</div>
 			</div>
-			<Input.TextArea
+			<TextArea
 				value={notificationSettings.description}
 				onChange={(e): void =>
 					setNotificationSettings({

frontend/src/container/DashboardContainer/DashboardSettings/DashboardVariableSettings/index.tsx

@@ -11,7 +11,8 @@ import {
 import { restrictToVerticalAxis } from '@dnd-kit/modifiers';
 import { arrayMove, SortableContext, useSortable } from '@dnd-kit/sortable';
 import { CSS } from '@dnd-kit/utilities';
-import { Button, Modal, Row, RowProps, Space, Table, Typography } from 'antd';
+import { Button, Modal, Row, Space, Table, Typography } from 'antd';
+import { RowProps } from 'antd/lib';
 import { VariablesSettingsTabHandle } from 'container/DashboardContainer/DashboardDescription/types';
 import { convertVariablesToDbFormat } from 'container/DashboardContainer/DashboardVariablesSelection/util';
 import { useAddDynamicVariableToPanels } from 'hooks/dashboard/useAddDynamicVariableToPanels';

frontend/src/container/DashboardContainer/visualization/components/ChartManager/getChartMangerColumns.tsx

@@ -1,4 +1,4 @@
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import { PrecisionOption, PrecisionOptionsEnum } from 'components/Graph/types';
 import CustomCheckBox from 'container/GridCardLayout/GridCard/FullView/TableRender/CustomCheckBox';
 

frontend/src/container/ExplorerOptions/types.ts

@@ -1,6 +1,6 @@
 import { Dispatch, SetStateAction } from 'react';
 import { UseMutateAsyncFunction } from 'react-query';
-import type { NotificationInstance } from 'antd/es/notification/interface';
+import { NotificationInstance } from 'antd/es/notification/interface';
 import { AxiosResponse } from 'axios';
 import { SaveViewWithNameProps } from 'components/ExplorerCard/types';
 import { PANEL_TYPES } from 'constants/queryBuilder';

frontend/src/container/FormAlertChannels/index.tsx

@@ -1,7 +1,7 @@
 import { Dispatch, ReactElement, SetStateAction } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Form, FormInstance, Input, Select, Switch, Typography } from 'antd';
-import type { Store } from 'antd/lib/form/interface';
+import { Store } from 'antd/lib/form/interface';
 import ROUTES from 'constants/routes';
 import {
 	ChannelType,

frontend/src/container/FormAlertRules/RuleOptions.tsx

@@ -10,7 +10,7 @@ import {
 	Space,
 	Typography,
 } from 'antd';
-import type { DefaultOptionType } from 'antd/es/select';
+import { DefaultOptionType } from 'antd/es/select';
 import {
 	getCategoryByOptionId,
 	getCategorySelectOptionByName,

frontend/src/container/GridCardLayout/GridCard/FullView/GraphManager.tsx

@@ -1,6 +1,6 @@
 import { memo, useCallback, useEffect, useState } from 'react';
 import { Button, Input } from 'antd';
-import type { CheckboxChangeEvent } from 'antd/es/checkbox';
+import { CheckboxChangeEvent } from 'antd/es/checkbox';
 import { ResizeTable } from 'components/ResizeTable';
 import { useNotifications } from 'hooks/useNotifications';
 import { useDashboard } from 'providers/Dashboard/Dashboard';

frontend/src/container/GridCardLayout/GridCard/FullView/TableRender/CustomCheckBox.tsx

@@ -1,6 +1,6 @@
 import { grey } from '@ant-design/colors';
 import { Checkbox, ConfigProvider } from 'antd';
-import type { CheckboxChangeEvent } from 'antd/es/checkbox';
+import { CheckboxChangeEvent } from 'antd/es/checkbox';
 
 import { CheckBoxProps } from '../types';
 

frontend/src/container/GridCardLayout/GridCard/FullView/TableRender/GetLabel.tsx

@@ -1,4 +1,4 @@
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 
 import { DataSetProps } from '../types';
 import Label from './Label';

frontend/src/container/GridCardLayout/GridCard/FullView/TableRender/GraphManagerColumns.tsx

@@ -1,5 +1,5 @@
-import { TableColumnType as ColumnType } from 'antd';
-import type { CheckboxChangeEvent } from 'antd/es/checkbox';
+import { CheckboxChangeEvent } from 'antd/es/checkbox';
+import { ColumnType } from 'antd/es/table';
 
 import { ColumnsKeyAndDataIndex, ColumnsTitle } from '../contants';
 import { DataSetProps, ExtendedChartDataset } from '../types';

frontend/src/container/GridCardLayout/GridCard/FullView/types.ts

@@ -1,5 +1,5 @@
 import { Dispatch, MutableRefObject, RefObject, SetStateAction } from 'react';
-import type { CheckboxChangeEvent } from 'antd/es/checkbox';
+import { CheckboxChangeEvent } from 'antd/es/checkbox';
 import { ToggleGraphProps } from 'components/Graph/types';
 import { UplotProps } from 'components/Uplot/Uplot';
 import { PANEL_TYPES } from 'constants/queryBuilder';

frontend/src/container/GridCardLayout/GridCard/utils.ts

@@ -1,5 +1,5 @@
 /* eslint-disable sonarjs/cognitive-complexity */
-import type { NotificationInstance } from 'antd/es/notification/interface';
+import { NotificationInstance } from 'antd/es/notification/interface';
 import { NavigateToExplorerProps } from 'components/CeleryTask/useNavigateToExplorer';
 import { LOCALSTORAGE } from 'constants/localStorage';
 import { PANEL_TYPES } from 'constants/queryBuilder';

frontend/src/container/GridCardLayout/GridCardLayout.tsx

@@ -7,6 +7,7 @@ import { useLocation } from 'react-router-dom';
 import * as Sentry from '@sentry/react';
 import { Color } from '@signozhq/design-tokens';
 import { Button, Form, Input, Modal, Typography } from 'antd';
+import { useForm } from 'antd/es/form/Form';
 import logEvent from 'api/common/logEvent';
 import cx from 'classnames';
 import { ENTITY_VERSION_V5 } from 'constants/app';
@@ -105,7 +106,7 @@ function GraphLayout(props: GraphLayoutProps): JSX.Element {
 		setCurrentPanelMap(panelMap);
 	}, [panelMap]);
 
-	const [form] = Form.useForm<{
+	const [form] = useForm<{
 		title: string;
 	}>();
 

frontend/src/container/GridCardLayout/WidgetHeader/utils.ts

@@ -1,4 +1,4 @@
-import type { MenuItemType } from 'antd/es/menu/hooks/useItems';
+import { MenuItemType } from 'antd/es/menu/hooks/useItems';
 
 import { MenuItemKeys } from './contants';
 import { MenuItem } from './types';

frontend/src/container/GridTableComponent/index.tsx

@@ -2,7 +2,7 @@ import { memo, ReactNode, useCallback, useEffect, useMemo } from 'react';
 import { useTranslation } from 'react-i18next';
 import { ExclamationCircleFilled } from '@ant-design/icons';
 import { Space, Tooltip } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import { getYAxisFormattedValue } from 'components/Graph/yAxisConfig';
 import { Events } from 'constants/events';
 import { QueryTable } from 'container/QueryTable';

frontend/src/container/GridTableComponent/utils.ts

@@ -1,4 +1,4 @@
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import { convertUnit } from 'container/NewWidget/RightContainer/dataFormatCategories';
 import { ThresholdProps } from 'container/NewWidget/RightContainer/Threshold/types';
 import { QUERY_TABLE_CONFIG } from 'container/QueryTable/config';

frontend/src/container/InfraMonitoringHosts/HostsListTable.tsx

@@ -8,7 +8,7 @@ import {
 	TableProps,
 	Typography,
 } from 'antd';
-import type { SorterResult } from 'antd/es/table/interface';
+import { SorterResult } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
 import { InfraMonitoringEvents } from 'constants/events';
 

frontend/src/container/InfraMonitoringHosts/utils.tsx

@@ -2,7 +2,7 @@ import { Dispatch, SetStateAction } from 'react';
 import { InfoCircleOutlined } from '@ant-design/icons';
 import { Color } from '@signozhq/design-tokens';
 import { Progress, TabsProps, Tag, Tooltip, Typography } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import {
 	HostData,
 	HostListPayload,

frontend/src/container/InfraMonitoringK8s/Clusters/ClusterDetails/ClusterDetails.tsx

@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Divider, Drawer, Radio, Tooltip, Typography } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import { K8sClustersData } from 'api/infraMonitoring/getK8sClustersList';
 import { VIEW_TYPES, VIEWS } from 'components/HostMetricsDetail/constants';

frontend/src/container/InfraMonitoringK8s/Clusters/K8sClustersList.tsx

@@ -7,12 +7,11 @@ import {
 	Button,
 	Spin,
 	Table,
-	TableColumnType as ColumnType,
 	TablePaginationConfig,
 	TableProps,
 	Typography,
 } from 'antd';
-import type { SorterResult } from 'antd/es/table/interface';
+import { ColumnType, SorterResult } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
 import { K8sClustersListPayload } from 'api/infraMonitoring/getK8sClustersList';
 import { InfraMonitoringEvents } from 'constants/events';

frontend/src/container/InfraMonitoringK8s/Clusters/utils.tsx

@@ -1,6 +1,6 @@
 import { Color } from '@signozhq/design-tokens';
 import { Tag, Tooltip } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import {
 	K8sClustersData,
 	K8sClustersListPayload,

frontend/src/container/InfraMonitoringK8s/DaemonSets/DaemonSetDetails/DaemonSetDetails.tsx

@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Divider, Drawer, Radio, Tooltip, Typography } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import { VIEW_TYPES, VIEWS } from 'components/HostMetricsDetail/constants';
 import { InfraMonitoringEvents } from 'constants/events';

frontend/src/container/InfraMonitoringK8s/DaemonSets/K8sDaemonSetsList.tsx

@@ -7,12 +7,11 @@ import {
 	Button,
 	Spin,
 	Table,
-	TableColumnType as ColumnType,
 	TablePaginationConfig,
 	TableProps,
 	Typography,
 } from 'antd';
-import type { SorterResult } from 'antd/es/table/interface';
+import { ColumnType, SorterResult } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
 import { K8sDaemonSetsListPayload } from 'api/infraMonitoring/getK8sDaemonSetsList';
 import classNames from 'classnames';

frontend/src/container/InfraMonitoringK8s/DaemonSets/utils.tsx

@@ -1,6 +1,6 @@
 import { Color } from '@signozhq/design-tokens';
 import { Tag, Tooltip } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import {
 	K8sDaemonSetsData,
 	K8sDaemonSetsListPayload,

frontend/src/container/InfraMonitoringK8s/Deployments/DeploymentDetails/DeploymentDetails.tsx

@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Divider, Drawer, Radio, Tooltip, Typography } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import { K8sDeploymentsData } from 'api/infraMonitoring/getK8sDeploymentsList';
 import { VIEW_TYPES, VIEWS } from 'components/HostMetricsDetail/constants';

frontend/src/container/InfraMonitoringK8s/Deployments/K8sDeploymentsList.tsx

@@ -7,12 +7,11 @@ import {
 	Button,
 	Spin,
 	Table,
-	TableColumnType as ColumnType,
 	TablePaginationConfig,
 	TableProps,
 	Typography,
 } from 'antd';
-import type { SorterResult } from 'antd/es/table/interface';
+import { ColumnType, SorterResult } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
 import { K8sDeploymentsListPayload } from 'api/infraMonitoring/getK8sDeploymentsList';
 import classNames from 'classnames';

frontend/src/container/InfraMonitoringK8s/Deployments/utils.tsx

@@ -1,6 +1,6 @@
 import { Color } from '@signozhq/design-tokens';
 import { Tag, Tooltip } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import {
 	K8sDeploymentsData,
 	K8sDeploymentsListPayload,

frontend/src/container/InfraMonitoringK8s/Jobs/JobDetails/JobDetails.tsx

@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Divider, Drawer, Radio, Tooltip, Typography } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import { VIEW_TYPES, VIEWS } from 'components/HostMetricsDetail/constants';
 import { InfraMonitoringEvents } from 'constants/events';

frontend/src/container/InfraMonitoringK8s/Jobs/K8sJobsList.tsx

@@ -7,12 +7,11 @@ import {
 	Button,
 	Spin,
 	Table,
-	TableColumnType as ColumnType,
 	TablePaginationConfig,
 	TableProps,
 	Typography,
 } from 'antd';
-import type { SorterResult } from 'antd/es/table/interface';
+import { ColumnType, SorterResult } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
 import { K8sJobsListPayload } from 'api/infraMonitoring/getK8sJobsList';
 import classNames from 'classnames';

frontend/src/container/InfraMonitoringK8s/Jobs/utils.tsx

@@ -1,6 +1,6 @@
 import { Color } from '@signozhq/design-tokens';
 import { Tag, Tooltip } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import {
 	K8sJobsData,
 	K8sJobsListPayload,

frontend/src/container/InfraMonitoringK8s/Namespaces/K8sNamespacesList.tsx

@@ -7,12 +7,11 @@ import {
 	Button,
 	Spin,
 	Table,
-	TableColumnType as ColumnType,
 	TablePaginationConfig,
 	TableProps,
 	Typography,
 } from 'antd';
-import type { SorterResult } from 'antd/es/table/interface';
+import { ColumnType, SorterResult } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
 import { K8sNamespacesListPayload } from 'api/infraMonitoring/getK8sNamespacesList';
 import { InfraMonitoringEvents } from 'constants/events';

frontend/src/container/InfraMonitoringK8s/Namespaces/NamespaceDetails/NamespaceDetails.tsx

@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Divider, Drawer, Radio, Tooltip, Typography } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import { K8sNamespacesData } from 'api/infraMonitoring/getK8sNamespacesList';
 import { VIEW_TYPES, VIEWS } from 'components/HostMetricsDetail/constants';

frontend/src/container/InfraMonitoringK8s/Namespaces/utils.tsx

@@ -1,6 +1,6 @@
 import { Color } from '@signozhq/design-tokens';
 import { Tag } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import {
 	K8sNamespacesData,
 	K8sNamespacesListPayload,

frontend/src/container/InfraMonitoringK8s/Nodes/K8sNodesList.tsx

@@ -7,12 +7,11 @@ import {
 	Button,
 	Spin,
 	Table,
-	TableColumnType as ColumnType,
 	TablePaginationConfig,
 	TableProps,
 	Typography,
 } from 'antd';
-import type { SorterResult } from 'antd/es/table/interface';
+import { ColumnType, SorterResult } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
 import { K8sNodesListPayload } from 'api/infraMonitoring/getK8sNodesList';
 import { InfraMonitoringEvents } from 'constants/events';

frontend/src/container/InfraMonitoringK8s/Nodes/NodeDetails/NodeDetails.tsx

@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Divider, Drawer, Radio, Tooltip, Typography } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import { K8sNodesData } from 'api/infraMonitoring/getK8sNodesList';
 import { VIEW_TYPES, VIEWS } from 'components/HostMetricsDetail/constants';

frontend/src/container/InfraMonitoringK8s/Nodes/utils.tsx

@@ -1,6 +1,6 @@
 import { Color } from '@signozhq/design-tokens';
 import { Tag, Tooltip } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import {
 	K8sNodesData,
 	K8sNodesListPayload,

frontend/src/container/InfraMonitoringK8s/Pods/K8sPodLists.tsx

@@ -7,12 +7,11 @@ import {
 	Button,
 	Spin,
 	Table,
-	TableColumnType as ColumnType,
 	TablePaginationConfig,
 	TableProps,
 	Typography,
 } from 'antd';
-import type { SorterResult } from 'antd/es/table/interface';
+import { ColumnType, SorterResult } from 'antd/es/table/interface';
 import get from 'api/browser/localstorage/get';
 import set from 'api/browser/localstorage/set';
 import logEvent from 'api/common/logEvent';

frontend/src/container/InfraMonitoringK8s/Pods/PodDetails/PodDetails.tsx

@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Divider, Drawer, Radio, Tooltip, Typography } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import { K8sPodsData } from 'api/infraMonitoring/getK8sPodsList';
 import { VIEW_TYPES, VIEWS } from 'components/HostMetricsDetail/constants';

frontend/src/container/InfraMonitoringK8s/StatefulSets/K8sStatefulSetsList.tsx

@@ -7,12 +7,11 @@ import {
 	Button,
 	Spin,
 	Table,
-	TableColumnType as ColumnType,
 	TablePaginationConfig,
 	TableProps,
 	Typography,
 } from 'antd';
-import type { SorterResult } from 'antd/es/table/interface';
+import { ColumnType, SorterResult } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
 import { K8sStatefulSetsListPayload } from 'api/infraMonitoring/getsK8sStatefulSetsList';
 import classNames from 'classnames';

frontend/src/container/InfraMonitoringK8s/StatefulSets/StatefulSetDetails/StatefulSetDetails.tsx

@@ -5,7 +5,7 @@ import { useSelector } from 'react-redux';
 import { useSearchParams } from 'react-router-dom-v5-compat';
 import { Color, Spacing } from '@signozhq/design-tokens';
 import { Button, Divider, Drawer, Radio, Tooltip, Typography } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import { VIEW_TYPES, VIEWS } from 'components/HostMetricsDetail/constants';
 import { InfraMonitoringEvents } from 'constants/events';

frontend/src/container/InfraMonitoringK8s/StatefulSets/utils.tsx

@@ -1,6 +1,6 @@
 import { Color } from '@signozhq/design-tokens';
 import { Tag, Tooltip } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import {
 	K8sStatefulSetsData,
 	K8sStatefulSetsListPayload,

frontend/src/container/InfraMonitoringK8s/Volumes/K8sVolumesList.tsx

@@ -7,12 +7,11 @@ import {
 	Button,
 	Spin,
 	Table,
-	TableColumnType as ColumnType,
 	TablePaginationConfig,
 	TableProps,
 	Typography,
 } from 'antd';
-import type { SorterResult } from 'antd/es/table/interface';
+import { ColumnType, SorterResult } from 'antd/es/table/interface';
 import logEvent from 'api/common/logEvent';
 import { K8sVolumesListPayload } from 'api/infraMonitoring/getK8sVolumesList';
 import classNames from 'classnames';

frontend/src/container/InfraMonitoringK8s/Volumes/utils.tsx

@@ -1,6 +1,6 @@
 import { Color } from '@signozhq/design-tokens';
 import { Tag, Tooltip } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import {
 	K8sVolumesData,
 	K8sVolumesListPayload,

frontend/src/container/InfraMonitoringK8s/commonUtils.tsx

@@ -2,8 +2,9 @@
 
 import { useMemo } from 'react';
 import { Color } from '@signozhq/design-tokens';
-import { Progress, Table, Tooltip, Typography } from 'antd';
-import type { ColumnsType } from 'antd/lib/table';
+import { Table, Tooltip, Typography } from 'antd';
+import { Progress } from 'antd/lib';
+import { ColumnsType } from 'antd/lib/table';
 import { ResizeTable } from 'components/ResizeTable';
 import FieldRenderer from 'container/LogDetailedView/FieldRenderer';
 import { DataType } from 'container/LogDetailedView/TableView';

frontend/src/container/InfraMonitoringK8s/utils.tsx

@@ -1,7 +1,7 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { Color } from '@signozhq/design-tokens';
 import { Tag, Tooltip } from 'antd';
-import { TableColumnType as ColumnType } from 'antd';
+import { ColumnType } from 'antd/es/table';
 import get from 'api/browser/localstorage/get';
 import set from 'api/browser/localstorage/set';
 import {

frontend/src/container/IngestionSettings/IngestionSettings.tsx

@@ -1,10 +1,6 @@
 import { useQuery } from 'react-query';
-import {
-	Skeleton,
-	Table,
-	TableColumnsType as ColumnsType,
-	Typography,
-} from 'antd';
+import { Skeleton, Table, Typography } from 'antd';
+import type { ColumnsType } from 'antd/es/table';
 import getIngestionData from 'api/settings/getIngestionData';
 import { useAppContext } from 'providers/App/App';
 import { IngestionDataType } from 'types/api/settings/ingestion';

frontend/src/container/IngestionSettings/MultiIngestionSettings.tsx

@@ -22,8 +22,8 @@ import {
 	Tooltip,
 	Typography,
 } from 'antd';
-import type { NotificationInstance } from 'antd/es/notification/interface';
-import type { CollapseProps } from 'antd/lib';
+import { NotificationInstance } from 'antd/es/notification/interface';
+import { CollapseProps } from 'antd/lib';
 import {
 	useCreateIngestionKey,
 	useCreateIngestionKeyLimit,

frontend/src/container/ListAlertRules/DeleteAlert.tsx

@@ -1,5 +1,5 @@
 import { Dispatch, SetStateAction, useState } from 'react';
-import type { NotificationInstance } from 'antd/es/notification/interface';
+import { NotificationInstance } from 'antd/es/notification/interface';
 import deleteAlerts from 'api/alerts/delete';
 import { State } from 'hooks/useFetch';
 import { PayloadProps as DeleteAlertPayloadProps } from 'types/api/alerts/delete';

frontend/src/container/ListOfDashboard/DashboardsList.tsx

@@ -27,7 +27,7 @@ import {
 	Tooltip,
 	Typography,
 } from 'antd';
-import type { TableProps } from 'antd/lib';
+import { TableProps } from 'antd/lib';
 import logEvent from 'api/common/logEvent';
 import createDashboard from 'api/v1/dashboards/create';
 import { AxiosError } from 'axios';

frontend/src/container/ListOfDashboard/SearchFilter/index.tsx

@@ -8,7 +8,8 @@ import {
 import { CloseCircleFilled } from '@ant-design/icons';
 // eslint-disable-next-line no-restricted-imports
 import { useMachine } from '@xstate/react';
-import { Button, RefSelectProps, Select } from 'antd';
+import { Button, Select } from 'antd';
+import { RefSelectProps } from 'antd/lib/select';
 import history from 'lib/history';
 import { filter, map } from 'lodash-es';
 import { Dashboard } from 'types/api/dashboard/getAll';

frontend/src/container/LogDetailedView/InfraMetrics/InfraMetrics.tsx

@@ -1,6 +1,6 @@
 import { useMemo, useState } from 'react';
 import { Empty } from 'antd';
-import type { RadioChangeEvent } from 'antd/lib';
+import { RadioChangeEvent } from 'antd/lib';
 import SignozRadioGroup from 'components/SignozRadioGroup/SignozRadioGroup';
 import { History, Table } from 'lucide-react';
 import { DataSource } from 'types/common/queryBuilder';

frontend/src/container/LogDetailedView/TableView.tsx

@@ -4,13 +4,8 @@ import { useDispatch } from 'react-redux';
 import { generatePath } from 'react-router-dom';
 import { LinkOutlined } from '@ant-design/icons';
 import { Color } from '@signozhq/design-tokens';
-import {
-	Button,
-	Space,
-	TableColumnsType as ColumnsType,
-	Tooltip,
-	Typography,
-} from 'antd';
+import { Button, Space, Tooltip, Typography } from 'antd';
+import { ColumnsType } from 'antd/es/table';
 import cx from 'classnames';
 import AddToQueryHOC, {
 	AddToQueryHOCProps,

frontend/src/container/LogDetailedView/utils.tsx

@@ -1,5 +1,5 @@
 import Convert from 'ansi-to-html';
-import type { DataNode } from 'antd/es/tree';
+import { DataNode } from 'antd/es/tree';
 import { MetricsType } from 'container/MetricsApplication/constant';
 import dompurify from 'dompurify';
 import { uniqueId } from 'lodash-es';

frontend/src/container/LogsExplorerList/InfinityTableView/TableRow.tsx

@@ -6,7 +6,7 @@ import {
 	useCallback,
 	useMemo,
 } from 'react';
-import type { TableColumnsType as ColumnsType } from 'antd';
+import { ColumnsType } from 'antd/es/table';
 import { VIEW_TYPES } from 'components/LogDetail/constants';
 import LogLinesActionButtons from 'components/Logs/LogLinesActionButtons/LogLinesActionButtons';
 import { ColumnTypeRender } from 'components/Logs/TableView/types';

frontend/src/container/LogsPanelTable/utils.tsx

@@ -1,6 +1,8 @@
 import { ReactNode } from 'react';
-import { TableColumnsType as ColumnsType, Typography } from 'antd';
+import { ColumnsType } from 'antd/es/table';
+import { Typography } from 'antd/lib';
 import { TimestampInput } from 'hooks/useTimezoneFormatter/useTimezoneFormatter';
+// import Typography from 'antd/es/typography/Typography';
 import { RowData } from 'lib/query/createTableColumnsFromQuery';
 import { Widgets } from 'types/api/dashboard/getAll';
 import { IField } from 'types/api/logs/fields';

frontend/src/container/MetricsApplication/TopOperationsTable.tsx

@@ -3,14 +3,8 @@ import { useRef } from 'react';
 import { useSelector } from 'react-redux';
 import { useParams } from 'react-router-dom';
 import { SearchOutlined } from '@ant-design/icons';
-import {
-	InputRef,
-	Switch,
-	TableColumnsType as ColumnsType,
-	TableColumnType as ColumnType,
-	Tooltip,
-	Typography,
-} from 'antd';
+import { InputRef, Switch, Tooltip, Typography } from 'antd';
+import { ColumnsType, ColumnType } from 'antd/lib/table';
 import { ResizeTable } from 'components/ResizeTable';
 import TextToolTip from 'components/TextToolTip';
 import Download from 'container/Download/Download';