diff --git a/superset-frontend/src/SqlLab/components/App/index.tsx b/superset-frontend/src/SqlLab/components/App/index.tsx index 337ab1a870b..892a8eadd7a 100644 --- a/superset-frontend/src/SqlLab/components/App/index.tsx +++ b/superset-frontend/src/SqlLab/components/App/index.tsx @@ -21,7 +21,7 @@ import { connect } from 'react-redux'; import { Redirect } from 'react-router-dom'; import Mousetrap from 'mousetrap'; import { t } from '@apache-superset/core'; -import { css, styled } from '@apache-superset/core/ui'; +import { css, styled } from '@apache-superset/core/theme'; import { throttle } from 'lodash'; import { LOCALSTORAGE_MAX_USAGE_KB, diff --git a/superset-frontend/src/components/CopyToClipboard/index.tsx b/superset-frontend/src/components/CopyToClipboard/index.tsx index f139c7b6c37..de4aba5089a 100644 --- a/superset-frontend/src/components/CopyToClipboard/index.tsx +++ b/superset-frontend/src/components/CopyToClipboard/index.tsx @@ -18,7 +18,7 @@ */ import { cloneElement, ReactElement, useCallback } from 'react'; import { t } from '@apache-superset/core'; -import { css, SupersetTheme } from '@apache-superset/core/ui'; +import { css, SupersetTheme } from '@apache-superset/core/theme'; import copyTextToClipboard from 'src/utils/copy'; import { Tooltip } from '@superset-ui/core/components'; import withToasts from '../MessageToasts/withToasts'; diff --git a/superset-frontend/src/components/Datasource/components/CollectionTable/index.tsx b/superset-frontend/src/components/Datasource/components/CollectionTable/index.tsx index bde432a1c9a..64f33f4642e 100644 --- a/superset-frontend/src/components/Datasource/components/CollectionTable/index.tsx +++ b/superset-frontend/src/components/Datasource/components/CollectionTable/index.tsx @@ -19,7 +19,7 @@ import { ReactNode, useState, useCallback, useEffect, useMemo } from 'react'; import { nanoid } from 'nanoid'; import { t } from '@apache-superset/core'; -import { styled, css, SupersetTheme } from '@apache-superset/core/ui'; +import { styled, css, SupersetTheme } from '@apache-superset/core/theme'; import { Icons, Button, InfoTooltip } from '@superset-ui/core/components'; import { FilterValue } from 'react-table'; import Table, { diff --git a/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx b/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx index bcc06e3bc7c..26d63685cc7 100644 --- a/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx +++ b/superset-frontend/src/components/Datasource/components/DatasourceEditor/DatasourceEditor.tsx @@ -38,14 +38,9 @@ import { getExtensionsRegistry, } from '@superset-ui/core'; import { GenericDataType } from '@apache-superset/core/api/core'; -import { - css, - styled, - themeObject, - Alert, - useTheme, - t, -} from '@apache-superset/core/ui'; +import { t } from '@apache-superset/core/translation'; +import { css, styled, themeObject, useTheme } from '@apache-superset/core/theme'; +import { Alert } from '@apache-superset/core/components'; import Tabs from '@superset-ui/core/components/Tabs'; import WarningIconWithTooltip from '@superset-ui/core/components/WarningIconWithTooltip'; import TableSelector from 'src/components/TableSelector'; diff --git a/superset-frontend/src/explore/components/SaveModal.tsx b/superset-frontend/src/explore/components/SaveModal.tsx index cb9ae1bee62..b27f858b56c 100755 --- a/superset-frontend/src/explore/components/SaveModal.tsx +++ b/superset-frontend/src/explore/components/SaveModal.tsx @@ -45,7 +45,8 @@ import { } from '@superset-ui/core/components'; import { t, logging } from '@apache-superset/core'; import { DatasourceType, isDefined, SupersetClient } from '@superset-ui/core'; -import { css, styled, useTheme, Alert } from '@apache-superset/core/ui'; +import { css, styled, useTheme } from '@apache-superset/core/theme'; +import { Alert } from '@apache-superset/core/components'; import { Radio } from '@superset-ui/core/components/Radio'; import { GRID_COLUMN_COUNT } from 'src/dashboard/util/constants'; import { canUserEditDashboard } from 'src/dashboard/util/permissionUtils'; diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx index adc60873a8d..ca75f1bf131 100644 --- a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx +++ b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.tsx @@ -35,7 +35,7 @@ import { type QueryFormColumn, } from '@superset-ui/core'; import { t } from '@apache-superset/core'; -import { styled, useTheme } from '@apache-superset/core/ui'; +import { styled, useTheme } from '@apache-superset/core/theme'; import SelectControl from 'src/explore/components/controls/SelectControl'; import TextControl from 'src/explore/components/controls/TextControl'; import CheckboxControl from 'src/explore/components/controls/CheckboxControl'; diff --git a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx index b47533c744a..9a091d44b5a 100644 --- a/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/AnnotationLayerControl/index.tsx @@ -25,7 +25,7 @@ import { Payload, QueryFormData, } from '@superset-ui/core'; -import { SupersetTheme, useTheme } from '@apache-superset/core/ui'; +import { SupersetTheme, useTheme } from '@apache-superset/core/theme'; import { AsyncEsmComponent, List, diff --git a/superset-frontend/src/explore/components/controls/CheckboxControl.tsx b/superset-frontend/src/explore/components/controls/CheckboxControl.tsx index 76492ecaac6..b37829c57c2 100644 --- a/superset-frontend/src/explore/components/controls/CheckboxControl.tsx +++ b/superset-frontend/src/explore/components/controls/CheckboxControl.tsx @@ -17,7 +17,7 @@ * under the License. */ import { useCallback, type ReactNode } from 'react'; -import { styled, css } from '@apache-superset/core/ui'; +import { styled, css } from '@apache-superset/core/theme'; import { Checkbox } from '@superset-ui/core/components'; import ControlHeader from '../ControlHeader'; diff --git a/superset-frontend/src/explore/components/controls/CollectionControl/index.tsx b/superset-frontend/src/explore/components/controls/CollectionControl/index.tsx index 433cf9a0f09..939664f1d01 100644 --- a/superset-frontend/src/explore/components/controls/CollectionControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/CollectionControl/index.tsx @@ -20,7 +20,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 { useTheme, type SupersetTheme } from '@apache-superset/core/ui'; +import { useTheme, type SupersetTheme } from '@apache-superset/core/theme'; import { SortableContainer, SortableHandle, diff --git a/superset-frontend/src/explore/components/controls/DatasourceControl/index.tsx b/superset-frontend/src/explore/components/controls/DatasourceControl/index.tsx index b6580bc97c4..b2ebd022ab1 100644 --- a/superset-frontend/src/explore/components/controls/DatasourceControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/DatasourceControl/index.tsx @@ -21,7 +21,7 @@ import React, { useState, useCallback } from 'react'; import { DatasourceType, SupersetClient, Datasource } from '@superset-ui/core'; import { t } from '@apache-superset/core'; -import { css, styled, useTheme } from '@apache-superset/core/ui'; +import { css, styled, useTheme } from '@apache-superset/core/theme'; import { getTemporalColumns } from '@superset-ui/chart-controls'; import { getUrlParam } from 'src/utils/urlUtils'; import { 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 3536db3f5ec..68d00c8e75c 100644 --- a/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.tsx +++ b/superset-frontend/src/explore/components/controls/FilterControl/AdhocFilterEditPopover/index.tsx @@ -18,13 +18,12 @@ */ import type React from 'react'; import { useRef, useState, useCallback, useEffect } from 'react'; -import type { SupersetTheme } from '@apache-superset/core/ui'; +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 { styled } from '@apache-superset/core/ui'; - +import { styled } from '@apache-superset/core/theme'; import Tabs from '@superset-ui/core/components/Tabs'; import AdhocFilter from 'src/explore/components/controls/FilterControl/AdhocFilter'; import AdhocFilterEditPopoverSimpleTabContent from 'src/explore/components/controls/FilterControl/AdhocFilterEditPopoverSimpleTabContent'; 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 79b0aed3971..40706235528 100644 --- a/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.tsx +++ b/superset-frontend/src/explore/components/controls/MetricControl/AdhocMetricEditPopover/index.tsx @@ -21,7 +21,7 @@ import { memo, useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { isDefined, ensureIsArray, DatasourceType } from '@superset-ui/core'; import { t } from '@apache-superset/core'; import type { editors } from '@apache-superset/core'; -import { styled } from '@apache-superset/core/ui'; +import { styled } from '@apache-superset/core/theme'; import Tabs from '@superset-ui/core/components/Tabs'; import { Button, diff --git a/superset-frontend/src/explore/components/controls/SelectControl.tsx b/superset-frontend/src/explore/components/controls/SelectControl.tsx index 6d64bc0555f..b6f2e0a3971 100644 --- a/superset-frontend/src/explore/components/controls/SelectControl.tsx +++ b/superset-frontend/src/explore/components/controls/SelectControl.tsx @@ -26,7 +26,7 @@ import { } from 'react'; import { isEqualArray } from '@superset-ui/core'; import { t } from '@apache-superset/core'; -import { css } from '@apache-superset/core/ui'; +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/TextAreaControl.tsx b/superset-frontend/src/explore/components/controls/TextAreaControl.tsx index a50aafcb852..7460fe4109a 100644 --- a/superset-frontend/src/explore/components/controls/TextAreaControl.tsx +++ b/superset-frontend/src/explore/components/controls/TextAreaControl.tsx @@ -26,8 +26,7 @@ import { ModalTrigger, } from '@superset-ui/core/components'; import { t } from '@apache-superset/core'; -import { useTheme } from '@apache-superset/core/ui'; - +import { useTheme } from '@apache-superset/core/theme'; import 'ace-builds/src-min-noconflict/mode-handlebars'; import ControlHeader from 'src/explore/components/ControlHeader'; diff --git a/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.tsx b/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.tsx index 76ed41db25f..a360569f881 100644 --- a/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.tsx +++ b/superset-frontend/src/explore/components/controls/TimeSeriesColumnControl/index.tsx @@ -27,7 +27,7 @@ import { Select, } from '@superset-ui/core/components'; import { t } from '@apache-superset/core'; -import { styled } from '@apache-superset/core/ui'; +import { styled } from '@apache-superset/core/theme'; import { Icons } from '@superset-ui/core/components/Icons'; import BoundsControl from '../BoundsControl'; import CheckboxControl from '../CheckboxControl'; diff --git a/superset-frontend/src/features/home/RightMenu.tsx b/superset-frontend/src/features/home/RightMenu.tsx index a6f04365999..95488086d8a 100644 --- a/superset-frontend/src/features/home/RightMenu.tsx +++ b/superset-frontend/src/features/home/RightMenu.tsx @@ -37,7 +37,7 @@ import { isFeatureEnabled, FeatureFlag, } from '@superset-ui/core'; -import { styled, css, SupersetTheme, useTheme } from '@apache-superset/core/ui'; +import { styled, css, SupersetTheme, useTheme } from '@apache-superset/core/theme'; import { Tag, Tooltip, diff --git a/superset-frontend/src/pages/ChartCreation/index.tsx b/superset-frontend/src/pages/ChartCreation/index.tsx index 3516ba2cc56..1a6a629fcb2 100644 --- a/superset-frontend/src/pages/ChartCreation/index.tsx +++ b/superset-frontend/src/pages/ChartCreation/index.tsx @@ -20,7 +20,7 @@ import { ReactNode, useState, useEffect, useCallback, useMemo } from 'react'; import rison from 'rison'; import { t } from '@apache-superset/core'; import { isDefined, JsonResponse, SupersetClient } from '@superset-ui/core'; -import { styled, useTheme } from '@apache-superset/core/ui'; +import { styled, useTheme } from '@apache-superset/core/theme'; import { getUrlParam } from 'src/utils/urlUtils'; import { FilterPlugins, URL_PARAMS } from 'src/constants'; import { Link, useHistory } from 'react-router-dom';