move types and interfaces to core

superset-frontend/src/dataMask/types.ts → superset-frontend/packages/superset-ui-core/src/dashboard/index.ts

@@ -16,14 +16,5 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { DataMask } from '@superset-ui/core';
 
-export enum DataMaskType {
-  NativeFilters = 'nativeFilters',
-  CrossFilters = 'crossFilters',
-}
-
-export type DataMaskState = { [id: string]: DataMask };
-
-export type DataMaskWithId = { id: string } & DataMask;
-export type DataMaskStateWithId = { [filterId: string]: DataMaskWithId };
+export * from './types/Base';

superset-frontend/src/dashboard/components/nativeFilters/types.ts → superset-frontend/packages/superset-ui-core/src/dashboard/types/Base.ts

@@ -19,7 +19,7 @@
 
 import { AdhocFilter, DataMask } from '@superset-ui/core';
 
-export interface Column {
+export interface NativeFilterColumn {
   name: string;
   displayName?: string;
 }
@@ -32,7 +32,7 @@ export interface Scope {
 /** The target of a filter is the datasource/column being filtered */
 export interface Target {
   datasetId: number;
-  column: Column;
+  column: NativeFilterColumn;
 
   // maybe someday support this?
   // show values from these columns in the filter options selector
@@ -44,6 +44,27 @@ export enum NativeFilterType {
   DIVIDER = 'DIVIDER',
 }
 
+export enum DataMaskType {
+  NativeFilters = 'nativeFilters',
+  CrossFilters = 'crossFilters',
+}
+
+export type DataMaskState = { [id: string]: DataMask };
+
+export type DataMaskWithId = { id: string } & DataMask;
+export type DataMaskStateWithId = { [filterId: string]: DataMaskWithId };
+
+export type FilterSet = {
+  id: number;
+  name: string;
+  nativeFilters: Filters;
+  dataMask: DataMaskStateWithId;
+};
+
+export type FilterSets = {
+  [filtersSetId: string]: FilterSet;
+};
+
 export interface Filter {
   cascadeParentIds: string[];
   defaultDataMask: DataMask;
@@ -70,6 +91,7 @@ export interface Filter {
   type: typeof NativeFilterType.NATIVE_FILTER;
   description: string;
 }
+
 export interface Divider {
   id: string;
   title: string;
@@ -78,3 +100,18 @@ export interface Divider {
 }
 
 export type FilterConfiguration = Array<Filter | Divider>;
+
+export type Filters = {
+  [filterId: string]: Filter;
+};
+
+export type NativeFiltersState = {
+  filters: Filters;
+  filterSets: FilterSets;
+  focusedFilterId?: string;
+};
+
+export type DashboardComponentMetadata = {
+  nativeFilters: NativeFiltersState;
+  dataMask: DataMaskStateWithId;
+};

superset-frontend/packages/superset-ui-core/src/index.ts

@@ -16,20 +16,22 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-export * from './models';
-export * from './utils';
-export * from './types';
-export * from './translation';
+
+export * from './chart';
+export * from './chart-composition';
+export * from './color';
+export * from './components';
 export * from './connection';
+export * from './dashboard';
+export * from './dimension';
 export * from './dynamic-plugins';
-export * from './query';
+export * from './math-expression';
+export * from './models';
 export * from './number-format';
-export * from './time-format';
-export * from './dimension';
-export * from './color';
+export * from './query';
 export * from './style';
+export * from './time-format';
+export * from './translation';
+export * from './types';
+export * from './utils';
 export * from './validator';
-export * from './chart';
-export * from './chart-composition';
-export * from './components';
-export * from './math-expression';

superset-frontend/spec/fixtures/mockNativeFilters.ts

@@ -16,10 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { ExtraFormData } from '@superset-ui/core';
-import { NativeFilterType } from 'src/dashboard/components/nativeFilters/types';
-import { NativeFiltersState } from 'src/dashboard/reducers/types';
-import { DataMaskStateWithId } from '../../src/dataMask/types';
+import {
+  DataMaskStateWithId,
+  ExtraFormData,
+  NativeFiltersState,
+  NativeFilterType,
+} from '@superset-ui/core';
 
 export const nativeFilters: NativeFiltersState = {
   filterSets: {},

superset-frontend/src/dashboard/actions/nativeFilters.ts

@@ -17,21 +17,21 @@
  * under the License.
  */
 
-import { makeApi } from '@superset-ui/core';
+import {
+  FilterConfiguration,
+  Filters,
+  FilterSet,
+  FilterSets,
+  makeApi,
+} from '@superset-ui/core';
 import { Dispatch } from 'redux';
-import { FilterConfiguration } from 'src/dashboard/components/nativeFilters/types';
 import {
   SET_DATA_MASK_FOR_FILTER_CONFIG_FAIL,
   setDataMaskForFilterConfigComplete,
 } from 'src/dataMask/actions';
 import { HYDRATE_DASHBOARD } from './hydrate';
 import { dashboardInfoChanged } from './dashboardInfo';
-import {
-  Filters,
-  FilterSet,
-  FilterSetFullData,
-  FilterSets,
-} from '../reducers/types';
+import { FilterSetFullData } from '../reducers/types';
 import { DashboardInfo, RootState } from '../types';
 
 export const SET_FILTER_CONFIG_BEGIN = 'SET_FILTER_CONFIG_BEGIN';

superset-frontend/src/dashboard/components/CrossFilterScopingModal/CrossFilterScopingForm/index.tsx

@@ -18,9 +18,9 @@
  */
 import React, { FC } from 'react';
 import { FormInstance } from 'antd/lib/form';
+import { Scope } from '@superset-ui/core';
 import FilterScope from 'src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/FilterScope';
 import { setCrossFilterFieldValues } from 'src/dashboard/components/CrossFilterScopingModal/utils';
-import { Scope } from 'src/dashboard/components/nativeFilters/types';
 import { useForceUpdate } from 'src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigForm/utils';
 import { CrossFilterScopingFormType } from 'src/dashboard/components/CrossFilterScopingModal/types';
 

superset-frontend/src/dashboard/components/CrossFilterScopingModal/types.ts

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-import { Scope } from '../nativeFilters/types';
+import { Scope } from '@superset-ui/core';
 
 export type CrossFilterScopingFormType = {
   scope: Scope;

superset-frontend/src/dashboard/components/DashboardBuilder/DashboardContainer.tsx

@@ -20,7 +20,7 @@
 // when its container size changes, due to e.g., builder side panel opening
 import React, { FC, useEffect, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
-import { FeatureFlag, isFeatureEnabled } from '@superset-ui/core';
+import { FeatureFlag, Filters, isFeatureEnabled } from '@superset-ui/core';
 import { ParentSize } from '@vx/responsive';
 import Tabs from 'src/components/Tabs';
 import DashboardGrid from 'src/dashboard/containers/DashboardGrid';
@@ -31,7 +31,6 @@ import {
   DASHBOARD_ROOT_DEPTH,
 } from 'src/dashboard/util/constants';
 import { getRootLevelTabIndex, getRootLevelTabsComponent } from './utils';
-import { Filters } from '../../reducers/types';
 import { getChartIdsInFilterScope } from '../../util/activeDashboardFilters';
 import findTabIndexByComponentId from '../../util/findTabIndexByComponentId';
 import { findTabsWithChartsInScope } from '../nativeFilters/utils';

superset-frontend/src/dashboard/components/DashboardBuilder/state.ts

@@ -17,6 +17,7 @@
  * under the License.
  */
 import { useSelector } from 'react-redux';
+import { Filter } from '@superset-ui/core';
 import { FeatureFlag, isFeatureEnabled } from 'src/featureFlags';
 import { useCallback, useEffect, useState, useContext } from 'react';
 import { URL_PARAMS } from 'src/constants';
@@ -27,7 +28,6 @@ import {
   useFilters,
   useNativeFiltersDataMask,
 } from '../nativeFilters/FilterBar/state';
-import { Filter } from '../nativeFilters/types';
 
 // eslint-disable-next-line import/prefer-default-export
 export const useNativeFilters = () => {

superset-frontend/src/dashboard/components/FiltersBadge/index.tsx

@@ -20,9 +20,9 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
 import { useDispatch, useSelector } from 'react-redux';
 import { uniqWith } from 'lodash';
 import cx from 'classnames';
+import { DataMaskStateWithId, Filters } from '@superset-ui/core';
 import Icons from 'src/components/Icons';
 import { usePrevious } from 'src/hooks/usePrevious';
-import { DataMaskStateWithId } from 'src/dataMask/types';
 import DetailsPanelPopover from './DetailsPanel';
 import { Pill } from './Styles';
 import {
@@ -38,7 +38,6 @@ import {
   DashboardLayout,
   RootState,
 } from '../../types';
-import { Filters } from '../../reducers/types';
 
 export interface FiltersBadgeProps {
   chartId: number;

superset-frontend/src/dashboard/components/FiltersBadge/selectors.ts

@@ -17,19 +17,21 @@
  * under the License.
  */
 import {
+  DataMaskStateWithId,
+  DataMaskType,
   ensureIsArray,
   FeatureFlag,
+  Filters,
   FilterState,
   isFeatureEnabled,
+  NativeFilterType,
 } from '@superset-ui/core';
 import { NO_TIME_RANGE, TIME_FILTER_MAP } from 'src/explore/constants';
 import { getChartIdsInFilterScope } from 'src/dashboard/util/activeDashboardFilters';
-import { ChartConfiguration, Filters } from 'src/dashboard/reducers/types';
-import { DataMaskStateWithId, DataMaskType } from 'src/dataMask/types';
+import { ChartConfiguration } from 'src/dashboard/reducers/types';
 import { areObjectsEqual } from 'src/reduxUtils';
 import { Layout } from '../../types';
 import { getTreeCheckedItems } from '../nativeFilters/FiltersConfigModal/FiltersConfigForm/FilterScope/utils';
-import { NativeFilterType } from '../nativeFilters/types';
 
 export enum IndicatorStatus {
   Unset = 'UNSET',

superset-frontend/src/dashboard/components/gridComponents/DynamicComponent.tsx

@@ -17,7 +17,7 @@
  * under the License.
  */
 import React, { FC, Suspense } from 'react';
-import { JsonObject, t } from '@superset-ui/core';
+import { DashboardComponentMetadata, JsonObject, t } from '@superset-ui/core';
 import backgroundStyleOptions from 'src/dashboard/util/backgroundStyleOptions';
 import cx from 'classnames';
 import { useSelector } from 'react-redux';
@@ -35,13 +35,6 @@ import DeleteComponentButton from '../DeleteComponentButton';
 import BackgroundStyleDropdown from '../menu/BackgroundStyleDropdown';
 import dashboardComponents from '../../../visualizations/presets/dashboardComponents';
 import { RootState } from '../../types';
-import { NativeFiltersState } from '../../reducers/types';
-import { DataMaskStateWithId } from '../../../dataMask/types';
-
-type DashboardComponentMetadata = {
-  nativeFilters: NativeFiltersState;
-  dataMask: DataMaskStateWithId;
-};
 
 type FilterSummaryType = {
   component: JsonObject;

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl/index.tsx

@@ -17,11 +17,14 @@
  * under the License.
  */
 import React, { RefObject } from 'react';
-import { styled, DataMask } from '@superset-ui/core';
+import {
+  DataMaskStateWithId,
+  Filter,
+  styled,
+  DataMask,
+} from '@superset-ui/core';
 import FilterControl from 'src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl';
 import { CascadeFilter } from 'src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/types';
-import { Filter } from 'src/dashboard/components/nativeFilters/types';
-import { DataMaskStateWithId } from 'src/dataMask/types';
 
 export interface CascadeFilterControlProps {
   dataMaskSelected?: DataMaskStateWithId;

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadePopover/index.tsx

@@ -23,15 +23,21 @@ import React, {
   useState,
   useRef,
 } from 'react';
-import { styled, t, DataMask, css, SupersetTheme } from '@superset-ui/core';
+import {
+  css,
+  DataMask,
+  DataMaskStateWithId,
+  Filter,
+  styled,
+  SupersetTheme,
+  t,
+} from '@superset-ui/core';
 import Popover from 'src/components/Popover';
 import Icons from 'src/components/Icons';
 import { Pill } from 'src/dashboard/components/FiltersBadge/Styles';
-import { DataMaskStateWithId } from 'src/dataMask/types';
 import FilterControl from 'src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControl';
 import CascadeFilterControl from 'src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/CascadeFilterControl';
 import { CascadeFilter } from 'src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/types';
-import { Filter } from 'src/dashboard/components/nativeFilters/types';
 
 interface CascadePopoverProps {
   dataMaskSelected: DataMaskStateWithId;

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/CascadeFilters/types.ts

@@ -17,8 +17,7 @@
  * under the License.
  */
 
-import { DataMask } from '@superset-ui/core';
-import { Filter } from '../../types';
+import { DataMask, Filter } from '@superset-ui/core';
 
 export type CascadeFilter = Filter & { dataMask?: DataMask } & {
   cascadeChildren: CascadeFilter[];

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterConfigurationLink/index.tsx

@@ -20,8 +20,7 @@ import React, { useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { setFilterConfiguration } from 'src/dashboard/actions/nativeFilters';
 import Button from 'src/components/Button';
-import { styled } from '@superset-ui/core';
-import { FilterConfiguration } from 'src/dashboard/components/nativeFilters/types';
+import { FilterConfiguration, styled } from '@superset-ui/core';
 import { FiltersConfigModal } from 'src/dashboard/components/nativeFilters/FiltersConfigModal/FiltersConfigModal';
 import { getFilterBarTestId } from '..';
 

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/FilterControls.tsx

@@ -18,22 +18,24 @@
  */
 import React, { FC, useCallback, useMemo, useState } from 'react';
 import { css } from '@emotion/react';
-import { DataMask, styled, t } from '@superset-ui/core';
+import {
+  DataMask,
+  DataMaskStateWithId,
+  Filter,
+  NativeFilterType,
+  styled,
+  t,
+} from '@superset-ui/core';
 import {
   createHtmlPortalNode,
   InPortal,
   OutPortal,
 } from 'react-reverse-portal';
 import { Collapse } from 'src/common/components';
-import { DataMaskStateWithId } from 'src/dataMask/types';
 import {
   useDashboardHasTabs,
   useSelectFiltersInScope,
 } from 'src/dashboard/components/nativeFilters/state';
-import {
-  Filter,
-  NativeFilterType,
-} from 'src/dashboard/components/nativeFilters/types';
 import CascadePopover from '../CascadeFilters/CascadePopover';
 import { useFilters } from '../state';
 import { buildCascadeFiltersTree } from './utils';

superset-frontend/src/dashboard/components/nativeFilters/FilterBar/FilterControls/state.ts

@@ -18,9 +18,11 @@
  */
 import { useMemo } from 'react';
 import { useSelector } from 'react-redux';
-import { NativeFiltersState } from 'src/dashboard/reducers/types';
-import { DataMaskStateWithId } from 'src/dataMask/types';
-import { ExtraFormData } from '@superset-ui/core';
+import {
+  DataMaskStateWithId,
+  ExtraFormData,
+  NativeFiltersState,
+} from '@superset-ui/core';
 import { mergeExtraFormData } from '../../utils';
 
 // eslint-disable-next-line import/prefer-default-export