Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore: Removes src/modules top folder #25005

Merged
merged 1 commit into from
Aug 16, 2023
Merged

chore: Removes src/modules top folder #25005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions superset-frontend/src/components/Chart/chartAction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@ import {
getQuerySettings,
getChartDataUri,
} from 'src/explore/exploreUtils';
import { requiresQuery } from 'src/modules/AnnotationTypes';

import { addDangerToast } from 'src/components/MessageToasts/actions';
import { logEvent } from 'src/logger/actions';
import { Logger, LOG_ACTIONS_LOAD_CHART } from 'src/logger/LogUtils';
Expand Down Expand Up @@ -268,7 +266,7 @@ export function runAnnotationQuery({
...(formData || getState().charts[sliceKey].latestQueryFormData),
};

if (!requiresQuery(annotation.sourceType)) {
if (!annotation.sourceType) {
return Promise.resolve();
}

Expand Down
11 changes: 5 additions & 6 deletions superset-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,22 +32,21 @@ import {
getColumnLabel,
withTheme,
} from '@superset-ui/core';

import SelectControl from 'src/explore/components/controls/SelectControl';
import TextControl from 'src/explore/components/controls/TextControl';
import CheckboxControl from 'src/explore/components/controls/CheckboxControl';
import PopoverSection from 'src/components/PopoverSection';
import ControlHeader from 'src/explore/components/ControlHeader';
import { EmptyStateSmall } from 'src/components/EmptyState';
import { FILTER_OPTIONS_LIMIT } from 'src/explore/constants';
import {
ANNOTATION_SOURCE_TYPES,
ANNOTATION_TYPES,
ANNOTATION_TYPES_METADATA,
DEFAULT_ANNOTATION_TYPE,
requiresQuery,
ANNOTATION_SOURCE_TYPES_METADATA,
} from 'src/modules/AnnotationTypes';
import PopoverSection from 'src/components/PopoverSection';
import ControlHeader from 'src/explore/components/ControlHeader';
import { EmptyStateSmall } from 'src/components/EmptyState';
import { FILTER_OPTIONS_LIMIT } from 'src/explore/constants';
} from './AnnotationTypes';

const AUTOMATIC_COLOR = '';

Expand Down
2 changes: 1 addition & 1 deletion ...-frontend/src/explore/components/controls/AnnotationLayerControl/AnnotationLayer.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import userEvent from '@testing-library/user-event';
import { getChartMetadataRegistry, ChartMetadata } from '@superset-ui/core';
import fetchMock from 'fetch-mock';
import setupColors from 'src/setup/setupColors';
import { ANNOTATION_TYPES_METADATA } from 'src/modules/AnnotationTypes';
import { ANNOTATION_TYPES_METADATA } from './AnnotationTypes';
import AnnotationLayer from './AnnotationLayer';

const defaultProps = {
Expand Down
0 ...t-frontend/src/modules/AnnotationTypes.js → ...AnnotationLayerControl/AnnotationTypes.js
View file
Open in desktop
File renamed without changes.
Loading