mirror of
https://github.com/apache/superset.git
synced 2026-06-01 21:59:26 +00:00
refactor(monorepo): stage 1 (#17427)
* skip geojson in pre-commit update prettier * update package.json update package.json u package pkg pkg2 * lint main repo 2 lint main repo lint * lintrc lintrc 2 lintrc2 lintrc 3 lintrc * fix import * refresh lock file * fix break line make @ts-ignore invalid * update rat-excludes rat-excludes update rat-excludes * update eslintrc.js * lint lint lint
This commit is contained in:
@@ -88,11 +88,8 @@ const ColumnSelectPopover = ({
|
||||
isAdhocColumnsEnabled,
|
||||
}: ColumnSelectPopoverProps) => {
|
||||
const [initialLabel] = useState(label);
|
||||
const [
|
||||
initialAdhocColumn,
|
||||
initialCalculatedColumn,
|
||||
initialSimpleColumn,
|
||||
] = getInitialColumnValues(editedColumn);
|
||||
const [initialAdhocColumn, initialCalculatedColumn, initialSimpleColumn] =
|
||||
getInitialColumnValues(editedColumn);
|
||||
|
||||
const [adhocColumn, setAdhocColumn] = useState<AdhocColumn | undefined>(
|
||||
initialAdhocColumn,
|
||||
|
||||
@@ -81,21 +81,18 @@ const ColumnSelectPopoverTrigger = ({
|
||||
setPopoverVisible(false);
|
||||
}, []);
|
||||
|
||||
const {
|
||||
visible,
|
||||
handleTogglePopover,
|
||||
handleClosePopover,
|
||||
} = isControlledComponent
|
||||
? {
|
||||
visible: props.visible,
|
||||
handleTogglePopover: props.togglePopover!,
|
||||
handleClosePopover: props.closePopover!,
|
||||
}
|
||||
: {
|
||||
visible: popoverVisible,
|
||||
handleTogglePopover: togglePopover,
|
||||
handleClosePopover: closePopover,
|
||||
};
|
||||
const { visible, handleTogglePopover, handleClosePopover } =
|
||||
isControlledComponent
|
||||
? {
|
||||
visible: props.visible,
|
||||
handleTogglePopover: props.togglePopover!,
|
||||
handleClosePopover: props.closePopover!,
|
||||
}
|
||||
: {
|
||||
visible: popoverVisible,
|
||||
handleTogglePopover: togglePopover,
|
||||
handleClosePopover: closePopover,
|
||||
};
|
||||
|
||||
const getCurrentTab = useCallback((tab: string) => {
|
||||
setIsTitleEditDisabled(tab !== editableTitleTab);
|
||||
|
||||
@@ -28,7 +28,7 @@ import {
|
||||
DndFilterSelectProps,
|
||||
} from 'src/explore/components/controls/DndColumnSelectControl/DndFilterSelect';
|
||||
import { PLACEHOLDER_DATASOURCE } from 'src/dashboard/constants';
|
||||
import { DEFAULT_FORM_DATA } from '@superset-ui/plugin-chart-echarts/lib/Timeseries/types';
|
||||
import { TimeseriesDefaultFormData } from '@superset-ui/plugin-chart-echarts';
|
||||
|
||||
const defaultProps: DndFilterSelectProps = {
|
||||
type: 'DndFilterSelect',
|
||||
@@ -70,7 +70,7 @@ test('renders options with saved metric', () => {
|
||||
{...defaultProps}
|
||||
formData={{
|
||||
...baseFormData,
|
||||
...DEFAULT_FORM_DATA,
|
||||
...TimeseriesDefaultFormData,
|
||||
metrics: ['saved_metric'],
|
||||
}}
|
||||
/>,
|
||||
@@ -111,7 +111,7 @@ test('renders options with adhoc metric', () => {
|
||||
{...defaultProps}
|
||||
formData={{
|
||||
...baseFormData,
|
||||
...DEFAULT_FORM_DATA,
|
||||
...TimeseriesDefaultFormData,
|
||||
metrics: [adhocMetric],
|
||||
}}
|
||||
/>,
|
||||
|
||||
@@ -41,13 +41,12 @@ export interface OptionItemInterface {
|
||||
/**
|
||||
* Shared control props for all DnD control.
|
||||
*/
|
||||
export type DndControlProps<
|
||||
ValueType extends JsonValue
|
||||
> = ControlComponentProps<ValueType | ValueType[] | null> & {
|
||||
multi?: boolean;
|
||||
canDelete?: boolean;
|
||||
ghostButtonText?: string;
|
||||
onChange: (value: ValueType | ValueType[] | null | undefined) => void;
|
||||
};
|
||||
export type DndControlProps<ValueType extends JsonValue> =
|
||||
ControlComponentProps<ValueType | ValueType[] | null> & {
|
||||
multi?: boolean;
|
||||
canDelete?: boolean;
|
||||
ghostButtonText?: string;
|
||||
onChange: (value: ValueType | ValueType[] | null | undefined) => void;
|
||||
};
|
||||
|
||||
export type OptionValueType = Record<string, any>;
|
||||
|
||||
Reference in New Issue
Block a user