diff --git a/superset-frontend/src/SqlLab/components/App/index.tsx b/superset-frontend/src/SqlLab/components/App/index.tsx index 892a8eadd7a..eb5645b9aca 100644 --- a/superset-frontend/src/SqlLab/components/App/index.tsx +++ b/superset-frontend/src/SqlLab/components/App/index.tsx @@ -20,7 +20,7 @@ import { useState, useEffect, useCallback, useRef, useMemo } from 'react'; import { connect } from 'react-redux'; import { Redirect } from 'react-router-dom'; import Mousetrap from 'mousetrap'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { css, styled } from '@apache-superset/core/theme'; import { throttle } from 'lodash'; import { diff --git a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx index e06be180e40..21e930aef62 100644 --- a/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx +++ b/superset-frontend/src/SqlLab/components/TabbedSqlEditors/index.tsx @@ -20,7 +20,7 @@ import { useEffect, useCallback, useMemo, useRef } from 'react'; import { EditableTabs } from '@superset-ui/core/components/Tabs'; import { connect } from 'react-redux'; import type { QueryEditor, SqlLabRootState } from 'src/SqlLab/types'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { FeatureFlag, isFeatureEnabled } from '@superset-ui/core'; import { styled, css } from '@apache-superset/core/theme'; import { Logger } from 'src/logger/LogUtils'; diff --git a/superset-frontend/src/components/CopyToClipboard/index.tsx b/superset-frontend/src/components/CopyToClipboard/index.tsx index de4aba5089a..b62298dfd94 100644 --- a/superset-frontend/src/components/CopyToClipboard/index.tsx +++ b/superset-frontend/src/components/CopyToClipboard/index.tsx @@ -17,7 +17,7 @@ * under the License. */ import { cloneElement, ReactElement, useCallback } from 'react'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { css, SupersetTheme } from '@apache-superset/core/theme'; import copyTextToClipboard from 'src/utils/copy'; import { Tooltip } from '@superset-ui/core/components'; diff --git a/superset-frontend/src/components/Datasource/components/CollectionTable/index.tsx b/superset-frontend/src/components/Datasource/components/CollectionTable/index.tsx index 64f33f4642e..abf9916c32e 100644 --- a/superset-frontend/src/components/Datasource/components/CollectionTable/index.tsx +++ b/superset-frontend/src/components/Datasource/components/CollectionTable/index.tsx @@ -18,7 +18,7 @@ */ import { ReactNode, useState, useCallback, useEffect, useMemo } from 'react'; import { nanoid } from 'nanoid'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { styled, css, SupersetTheme } from '@apache-superset/core/theme'; import { Icons, Button, InfoTooltip } from '@superset-ui/core/components'; import { FilterValue } from 'react-table'; diff --git a/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx b/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx index b72186e277a..156d2afd1ad 100644 --- a/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx +++ b/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx @@ -37,7 +37,7 @@ import { getClientErrorObject, getExtensionsRegistry, } from '@superset-ui/core'; -import { GenericDataType } from '@apache-superset/core/api/core'; +import { GenericDataType } from '@apache-superset/core/common'; import { t } from '@apache-superset/core/translation'; import { css, diff --git a/superset-frontend/src/components/Datasource/components/DatasourceEditor/tests/DatasourceEditorCurrency.test.tsx b/superset-frontend/src/components/Datasource/components/DatasourceEditor/tests/DatasourceEditorCurrency.test.tsx index 8406298ceb8..2c888e7612a 100644 --- a/superset-frontend/src/components/Datasource/components/DatasourceEditor/tests/DatasourceEditorCurrency.test.tsx +++ b/superset-frontend/src/components/Datasource/components/DatasourceEditor/tests/DatasourceEditorCurrency.test.tsx @@ -23,7 +23,7 @@ import { userEvent, selectOption, } from 'spec/helpers/testing-library'; -import { GenericDataType } from '@apache-superset/core/api/core'; +import { GenericDataType } from '@apache-superset/core/common'; import type { DatasetObject } from 'src/features/datasets/types'; import { createProps, diff --git a/superset-frontend/src/components/ErrorBoundary/index.tsx b/superset-frontend/src/components/ErrorBoundary/index.tsx index cf24d5f6268..44ee9225877 100644 --- a/superset-frontend/src/components/ErrorBoundary/index.tsx +++ b/superset-frontend/src/components/ErrorBoundary/index.tsx @@ -17,7 +17,7 @@ * under the License. */ import { Component, ErrorInfo } from 'react'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { ErrorAlert } from '../ErrorMessage'; import type { ErrorBoundaryProps, ErrorBoundaryState } from './types'; diff --git a/superset-frontend/src/explore/components/SaveModal.tsx b/superset-frontend/src/explore/components/SaveModal.tsx index b27f858b56c..b73a87a943c 100755 --- a/superset-frontend/src/explore/components/SaveModal.tsx +++ b/superset-frontend/src/explore/components/SaveModal.tsx @@ -43,7 +43,8 @@ import { Flex, TreeSelect, } from '@superset-ui/core/components'; -import { t, logging } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; +import { logging } from '@apache-superset/core/utils'; import { DatasourceType, isDefined, SupersetClient } from '@superset-ui/core'; import { css, styled, useTheme } from '@apache-superset/core/theme'; import { Alert } from '@apache-superset/core/components'; diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx index ca75f1bf131..29e2f234c80 100644 --- a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx +++ b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx @@ -34,7 +34,7 @@ import { VizType, type QueryFormColumn, } from '@superset-ui/core'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { styled, useTheme } from '@apache-superset/core/theme'; import SelectControl from 'src/explore/components/controls/SelectControl'; import TextControl from 'src/explore/components/controls/TextControl'; diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx index 9a091d44b5a..501fa173052 100644 --- a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx @@ -18,7 +18,7 @@ */ import { connect } from 'react-redux'; import { useCallback, useEffect, useMemo, useState } from 'react'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { HandlerFunction, JsonObject, diff --git a/superset-frontend/src/explore/components/controls/CollectionControl/index.tsx b/superset-frontend/src/explore/components/controls/CollectionControl/index.tsx index 939664f1d01..6b480525849 100644 --- a/superset-frontend/src/explore/components/controls/CollectionControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/CollectionControl/index.tsx @@ -19,7 +19,7 @@ import React, { useCallback } from 'react'; import { IconTooltip, List } from '@superset-ui/core/components'; import { nanoid } from 'nanoid'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { useTheme, type SupersetTheme } from '@apache-superset/core/theme'; import { SortableContainer, diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl/index.tsx b/superset-frontend/src/explore/components/controls/DatasourceControl/index.tsx index b2ebd022ab1..2709554c399 100644 --- a/superset-frontend/src/explore/components/controls/DatasourceControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/DatasourceControl/index.tsx @@ -20,7 +20,7 @@ import React, { useState, useCallback } from 'react'; import { DatasourceType, SupersetClient, Datasource } from '@superset-ui/core'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { css, styled, useTheme } from '@apache-superset/core/theme'; import { getTemporalColumns } from '@superset-ui/chart-controls'; import { getUrlParam } from 'src/utils/urlUtils'; diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.tsx index 64cf4963c96..1ff46f6bd2a 100644 --- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterControl/index.tsx @@ -24,9 +24,8 @@ import { type ReactNode, } from 'react'; import { SupersetClient, ensureIsArray } from '@superset-ui/core'; -import { logging } from '@apache-superset/core'; -import { t } from '@apache-superset/core'; - +import { logging } from '@apache-superset/core/utils'; +import { t } from '@apache-superset/core/translation'; import ControlHeader from 'src/explore/components/ControlHeader'; import AdhocMetric, { isDictionaryForAdhocMetric, diff --git a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.tsx b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.tsx index 68d00c8e75c..502fff99bac 100644 --- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.tsx +++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.tsx @@ -22,7 +22,7 @@ import type { SupersetTheme } from '@apache-superset/core/theme'; import { Button, Icons, Select } from '@superset-ui/core/components'; import { ErrorBoundary } from 'src/components'; import { SupersetClient } from '@superset-ui/core'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { styled } from '@apache-superset/core/theme'; import Tabs from '@superset-ui/core/components/Tabs'; import AdhocFilter from 'src/explore/components/controls/FilterControl/AdhocFilter'; diff --git a/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.tsx b/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.tsx index c8a4bd6b3c2..db8d0dd254c 100644 --- a/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/FixedOrMetricControl/index.tsx @@ -17,7 +17,7 @@ * under the License. */ import { useState, useCallback } from 'react'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { Collapse, Label } from '@superset-ui/core/components'; import TextControl from 'src/explore/components/controls/TextControl'; import MetricsControl from 'src/explore/components/controls/MetricControl/MetricsControl'; diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.tsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.tsx index 40706235528..43f17458b8f 100644 --- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.tsx +++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.tsx @@ -19,7 +19,7 @@ /* eslint-disable camelcase */ import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { isDefined, ensureIsArray, DatasourceType } from '@superset-ui/core'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import type { editors } from '@apache-superset/core'; import { styled } from '@apache-superset/core/theme'; import Tabs from '@superset-ui/core/components/Tabs'; diff --git a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricPopoverTrigger.tsx b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricPopoverTrigger.tsx index f869af992df..6ece2f74dc3 100644 --- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricPopoverTrigger.tsx +++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricPopoverTrigger.tsx @@ -25,7 +25,7 @@ import { useRef, useState, } from 'react'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { Metric } from '@superset-ui/core'; import AdhocMetricEditPopoverTitle from 'src/explore/components/controls/MetricControl/AdhocMetricEditPopoverTitle'; import { ExplorePopoverContent } from 'src/explore/components/ExploreContentPopover'; diff --git a/superset-frontend/src/explore/components/controls/SelectControl.tsx b/superset-frontend/src/explore/components/controls/SelectControl.tsx index b6f2e0a3971..a0dfecb2ba8 100644 --- a/superset-frontend/src/explore/components/controls/SelectControl.tsx +++ b/superset-frontend/src/explore/components/controls/SelectControl.tsx @@ -25,7 +25,7 @@ import { type ReactNode, } from 'react'; import { isEqualArray } from '@superset-ui/core'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { css } from '@apache-superset/core/theme'; import { Select } from '@superset-ui/core/components'; import ControlHeader from 'src/explore/components/ControlHeader'; diff --git a/superset-frontend/src/explore/components/controls/SpatialControl.tsx b/superset-frontend/src/explore/components/controls/SpatialControl.tsx index 8ed76e60b67..9a0c4aee709 100644 --- a/superset-frontend/src/explore/components/controls/SpatialControl.tsx +++ b/superset-frontend/src/explore/components/controls/SpatialControl.tsx @@ -24,8 +24,7 @@ import { Label, Popover, } from '@superset-ui/core/components'; -import { t } from '@apache-superset/core'; - +import { t } from '@apache-superset/core/translation'; import PopoverSection from '@superset-ui/core/components/PopoverSection'; import ControlHeader from '../ControlHeader'; import SelectControl from './SelectControl'; diff --git a/superset-frontend/src/explore/components/controls/TextAreaControl.tsx b/superset-frontend/src/explore/components/controls/TextAreaControl.tsx index 7460fe4109a..86e0ab0b172 100644 --- a/superset-frontend/src/explore/components/controls/TextAreaControl.tsx +++ b/superset-frontend/src/explore/components/controls/TextAreaControl.tsx @@ -25,7 +25,7 @@ import { TextAreaEditor, ModalTrigger, } from '@superset-ui/core/components'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { useTheme } from '@apache-superset/core/theme'; import 'ace-builds/src-min-noconflict/mode-handlebars'; diff --git a/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.tsx b/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.tsx index a360569f881..b7125a68a2c 100644 --- a/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.tsx @@ -26,7 +26,7 @@ import { Row, Select, } from '@superset-ui/core/components'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { styled } from '@apache-superset/core/theme'; import { Icons } from '@superset-ui/core/components/Icons'; import BoundsControl from '../BoundsControl'; diff --git a/superset-frontend/src/explore/components/controls/ViewportControl.tsx b/superset-frontend/src/explore/components/controls/ViewportControl.tsx index fb8d78b44a0..43255829e40 100644 --- a/superset-frontend/src/explore/components/controls/ViewportControl.tsx +++ b/superset-frontend/src/explore/components/controls/ViewportControl.tsx @@ -17,7 +17,7 @@ * under the License. */ import { useCallback, type ReactNode } from 'react'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { Popover, FormLabel, Label } from '@superset-ui/core/components'; import { decimalToSexagesimal } from 'geolib'; diff --git a/superset-frontend/src/features/home/RightMenu.tsx b/superset-frontend/src/features/home/RightMenu.tsx index 859fa8c15ce..bb6c5e8c4e5 100644 --- a/superset-frontend/src/features/home/RightMenu.tsx +++ b/superset-frontend/src/features/home/RightMenu.tsx @@ -30,7 +30,7 @@ import { useSelector } from 'react-redux'; import { Link } from 'react-router-dom'; import { useQueryParams, BooleanParam } from 'use-query-params'; import { isEmpty } from 'lodash'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { SupersetClient, getExtensionsRegistry, diff --git a/superset-frontend/src/pages/ChartCreation/index.tsx b/superset-frontend/src/pages/ChartCreation/index.tsx index 1a6a629fcb2..440d0f99871 100644 --- a/superset-frontend/src/pages/ChartCreation/index.tsx +++ b/superset-frontend/src/pages/ChartCreation/index.tsx @@ -18,7 +18,7 @@ */ import { ReactNode, useState, useEffect, useCallback, useMemo } from 'react'; import rison from 'rison'; -import { t } from '@apache-superset/core'; +import { t } from '@apache-superset/core/translation'; import { isDefined, JsonResponse, SupersetClient } from '@superset-ui/core'; import { styled, useTheme } from '@apache-superset/core/theme'; import { getUrlParam } from 'src/utils/urlUtils';