Skip to content

Kepler.gl is a powerful open source geospatial analysis tool for large-scale data sets.

Chore: Fix lint script and issues (#1862)

Nick Rabinowitz7d3283152e4b
diff --git a/.eslintrc b/.eslintrc
index 82ab8999d..9d494cd28 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -27,6 +27,7 @@
"max-len": 0,
"react/no-did-mount-set-state": 0,
"react/no-multi-comp": 0,
+ "react/sort-comp": 0,
"no-use-before-define": "off",
"prefer-spread": 1,
"prefer-template": 1,
@@ -44,6 +45,15 @@
"consistent-return": 0,
"comma-dangle": 1
},
+ "overrides": [
+ {
+ "files": ["*.ts", "*.tsx"],
+ "rules": {
+ "no-undef": 0,
+ "no-unused-vars": 0,
+ },
+ },
+ ],
"settings": {
"react": {
"version": "detect"
diff --git a/package.json b/package.json
index 3da82b589..71c626bce 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
"typedoc": "typedoc --theme markdown --out typedoc --inputFiles ./src/reducers --inputFiles ./src/actions --excludeExternals --excludeNotExported --excludePrivate",
"example-version": "babel-node ./scripts/edit-version.js",
"prettier-all": "prettier --write '{src,examples,test}/**/*.{js,tsx,ts}'",
- "lint": "yarn typescript && eslint src/*/src/*.{js,tsx,ts} test webpack examples/*.js examples/**/src/*.{js,tsx,ts} website/*.js website/src --fix",
+ "lint": "yarn typescript && eslint src test webpack examples website --fix --ignore-path .gitignore --ext .js,.ts,.tsx",
"lint:css": "stylelint './src/**/*.js'",
"typescript": "tsc --noEmit",
"web": "(yarn && yarn install:web && yarn start:web)",
@@ -347,7 +347,7 @@
"Giuseppe Macri <[email protected]>"
],
"volta": {
- "node": "12.19.0",
- "yarn": "1.22.17"
+ "node": "12.22.12",
+ "yarn": "1.22.19"
}
}
diff --git a/src/actions/action-types.ts b/src/actions/action-types.ts
index 818746de9..7edef9050 100644
--- a/src/actions/action-types.ts
+++ b/src/actions/action-types.ts
@@ -183,7 +183,7 @@ const ActionTypes = {
START_SAVE_STORAGE: `${ACTION_PREFIX}START_SAVE_STORAGE`
};
-// eslint-disable-line
+// eslint-disable-next-line prettier/prettier
const assignType = <T>(obj: T): { [K in keyof T]: `${typeof ACTION_PREFIX}${string & K}`; } => obj as any
export default assignType(ActionTypes);
diff --git a/src/actions/provider-actions.ts b/src/actions/provider-actions.ts
index bc4393e68..b6691c0b6 100644
--- a/src/actions/provider-actions.ts
+++ b/src/actions/provider-actions.ts
@@ -23,6 +23,7 @@ import {ACTION_PREFIX} from './action-types';
import {SavedMap} from 'schemas';
import {MapListItem, Provider} from 'cloud-providers';
+// eslint-disable-next-line prettier/prettier
const assignType = <T>(obj: T): { [K in keyof T]: `${typeof ACTION_PREFIX}${string & K}`; } => obj as any
export const ActionTypes = assignType({
EXPORT_FILE_TO_CLOUD: `${ACTION_PREFIX}EXPORT_FILE_TO_CLOUD`,
@@ -147,7 +148,7 @@ export const loadCloudMap: (
) => {
type: typeof ActionTypes.LOAD_CLOUD_MAP;
payload: LoadCloudMapPayload;
-} = createAction(ActionTypes.LOAD_CLOUD_MAP, payload => ({payload : payload}));
+} = createAction(ActionTypes.LOAD_CLOUD_MAP, payload => ({payload}));
/** LOAD_CLOUD_MAP_SUCCESS */
type LoadCloudMapSuccessCallback = (p: {response: any; loadParams: any; provider: Provider}) => any;
@@ -165,7 +166,7 @@ export const loadCloudMapSuccess: (
payload: LoadCloudMapSuccessPayload;
} = createAction(
ActionTypes.LOAD_CLOUD_MAP_SUCCESS,
- (payload: LoadCloudMapSuccessPayload) => ({payload : payload})
+ (payload: LoadCloudMapSuccessPayload) => ({payload})
);
/** LOAD_CLOUD_MAP_ERROR */
@@ -179,7 +180,7 @@ export const loadCloudMapError: (
) => {
type: typeof ActionTypes.LOAD_CLOUD_MAP_ERROR;
payload: LoadCloudMapErrorPayload;
-} = createAction(ActionTypes.LOAD_CLOUD_MAP_ERROR, (payload: LoadCloudMapErrorPayload) => ({payload : payload}));
+} = createAction(ActionTypes.LOAD_CLOUD_MAP_ERROR, (payload: LoadCloudMapErrorPayload) => ({payload}));
/** GET_SAVED_MAPS */
export type GetSavedMapsPayload = string;
@@ -202,7 +203,7 @@ export const getSavedMapsSuccess: (
payload: GetSavedMapsSuccessPayload;
} = createAction(
ActionTypes.GET_SAVED_MAPS_SUCCESS,
- (payload: GetSavedMapsSuccessPayload) => ({payload : payload})
+ (payload: GetSavedMapsSuccessPayload) => ({payload})
);
/** GET_SAVED_MAPS_ERROR */
@@ -215,4 +216,4 @@ export const getSavedMapsError: (
) => {
type: typeof ActionTypes.GET_SAVED_MAPS_ERROR;
payload: GetSavedMapsErrorPayload;
-} = createAction(ActionTypes.GET_SAVED_MAPS_ERROR, payload => ({payload : payload}));
+} = createAction(ActionTypes.GET_SAVED_MAPS_ERROR, payload => ({payload}));
diff --git a/src/cloud-providers/index.ts b/src/cloud-providers/index.ts
index 58f928378..5fc4f8147 100644
--- a/src/cloud-providers/index.ts
+++ b/src/cloud-providers/index.ts
@@ -19,4 +19,5 @@
// THE SOFTWARE.
export {default as Provider, FILE_CONFLICT_MSG} from './provider';
+// eslint-disable-next-line prettier/prettier
export type {MapListItem, Millisecond, Thumbnail, ProviderProps} from './provider';
diff --git a/src/components/common/animation-control/playback-controls.tsx b/src/components/common/animation-control/playback-controls.tsx
index dd7402c47..50d4289f6 100644
--- a/src/components/common/animation-control/playback-controls.tsx
+++ b/src/components/common/animation-control/playback-controls.tsx
@@ -116,14 +116,14 @@ interface AnimationWindowControlProps {
btnStyle;
}
-export const AnimationWindowControl = ({
+export const AnimationWindowControl: React.FC<AnimationWindowControlProps> = ({
onClick,
selected,
onHide,
height,
animationItems,
btnStyle = {}
-}: AnimationWindowControlProps) => (
+}) => (
<div>
{Object.values(animationItems)
.filter(item => item.id !== selected)
@@ -150,7 +150,7 @@ export const AnimationWindowControl = ({
</div>
);
-interface PlaybackControls {
+interface PlaybackControlsProps {
isAnimatable?: boolean;
isAnimating?: boolean;
width?: number | string;
@@ -172,7 +172,7 @@ function PlaybackControlsFactory(
AnimationSpeedSlider: ReturnType<typeof AnimationSpeedSliderFactory>
) {
// eslint-disable-next-line complexity
- const PlaybackControls = ({
+ const PlaybackControls: React.FC<PlaybackControlsProps> = ({
isAnimatable = true,
isAnimating,
width,
@@ -187,7 +187,7 @@ function PlaybackControlsFactory(
animationItems = DEFAULT_ANIMATE_ITEMS,
buttonStyle = 'secondary',
buttonHeight = DEFAULT_BUTTON_HEIGHT
- }: PlaybackControls) => {
+ }) => {
const [isSpeedControlVisible, toggleSpeedControl] = useState(false);
const [showAnimationWindowControl, setShowAnimationWindowControl] = useState(false);
diff --git a/src/components/common/data-table/option-dropdown.tsx b/src/components/common/data-table/option-dropdown.tsx
index 4f8ee4381..3a0ec6558 100644
--- a/src/components/common/data-table/option-dropdown.tsx
+++ b/src/components/common/data-table/option-dropdown.tsx
@@ -104,11 +104,11 @@ const OptionDropdown = (props: OptionDropdownProps) => {
);
const TABLE_OPTION_LIST_ICONS = {
- Pin: Pin,
- ArrowDown: ArrowDown,
- ArrowUp: ArrowUp,
- Clipboard: Clipboard,
- Cancel: Cancel
+ Pin,
+ ArrowDown,
+ ArrowUp,
+ Clipboard,
+ Cancel
};
const options = TABLE_OPTION_LIST.filter(op => !op.condition || op.condition(props)).map(op => ({
diff --git a/src/components/common/item-selector/chickleted-input.tsx b/src/components/common/item-selector/chickleted-input.tsx
index baab88a29..f024c9504 100644
--- a/src/components/common/item-selector/chickleted-input.tsx
+++ b/src/components/common/item-selector/chickleted-input.tsx
@@ -24,7 +24,7 @@ import styled from 'styled-components';
import Delete from '../icons/delete';
import {FormattedMessage} from '@kepler.gl/localization';
-interface ChickletedInput {
+interface ChickletedInputProps {
// required properties
onClick: MouseEventHandler<HTMLDivElement>;
removeItem: Function;
@@ -108,7 +108,7 @@ const ChickletedInputContainer = styled.div<ChickletedInputContainerProps>`
overflow: hidden;
`;
-const ChickletedInput = ({
+const ChickletedInput: React.FC<ChickletedInputProps> = ({
disabled,
onClick,
className,
@@ -118,7 +118,7 @@ const ChickletedInput = ({
displayOption = d => d,
inputTheme,
CustomChickletComponent
-}: ChickletedInput) => (
+}) => (
<ChickletedInputContainer
className={`${className} chickleted-input`}
onClick={onClick}
diff --git a/src/components/common/item-selector/item-selector.tsx b/src/components/common/item-selector/item-selector.tsx
index b67f8e552..68ba4be30 100644
--- a/src/components/common/item-selector/item-selector.tsx
+++ b/src/components/common/item-selector/item-selector.tsx
@@ -34,14 +34,14 @@ import {toArray} from 'utils/utils';
import {injectIntl, IntlShape} from 'react-intl';
import {FormattedMessage} from '@kepler.gl/localization';
-interface StyledDropdownSelect {
+interface StyledDropdownSelectProps {
inputTheme?: string;
size?: string;
}
export const StyledDropdownSelect = styled.div.attrs({
className: 'item-selector__dropdown'
-})<StyledDropdownSelect>`
+})<StyledDropdownSelectProps>`
${props =>
props.inputTheme === 'secondary'
? props.theme.secondaryInput
@@ -293,7 +293,7 @@ class ItemSelector extends Component<ItemSelectorProps> {
disabled: this.props.disabled,
onClick: this._showTypeahead,
error: this.props.isError,
- inputTheme: inputTheme,
+ inputTheme,
size: this.props.size
};
const intl = this.props.intl;
diff --git a/src/components/common/line-chart.tsx b/src/components/common/line-chart.tsx
index 0e8abad68..3ab3ccc18 100644
--- a/src/components/common/line-chart.tsx
+++ b/src/components/common/line-chart.tsx
@@ -107,7 +107,7 @@ interface LineChartProps {
const MARGIN = {top: 0, bottom: 0, left: 0, right: 0};
function LineChartFactory() {
- const LineChart = ({
+ const LineChartComponent = ({
brushComponent,
brushing,
color,
@@ -164,7 +164,7 @@ function LineChartFactory() {
</LineChartWrapper>
);
};
- return LineChart;
+ return LineChartComponent;
}
export default LineChartFactory;
diff --git a/src/components/common/loading-spinner.tsx b/src/components/common/loading-spinner.tsx
index 162832829..f1cad80a3 100644
--- a/src/components/common/loading-spinner.tsx
+++ b/src/components/common/loading-spinner.tsx
@@ -43,11 +43,11 @@ const Loader = styled.span`
animation-name: ${animationName};
}`;
-interface LoadingWrapper {
+interface LoadingWrapperProps {
borderColor?: string;
}
-const LoadingWrapper = styled.div<LoadingWrapper>`
+const LoadingWrapper = styled.div<LoadingWrapperProps>`
border-radius: 50%;
border: 3px solid ${props => props.borderColor || props.theme.borderColorLT};
padding: 2px;
@@ -60,7 +60,12 @@ interface LoadingSpinnerProps {
gap?: number;
}
-const LoadingSpinner = ({size = 32, color = '', strokeWidth = 3, gap = 2}: LoadingSpinnerProps) => (
+const LoadingSpinner: React.FC<LoadingSpinnerProps> = ({
+ size = 32,
+ color = '',
+ strokeWidth = 3,
+ gap = 2
+}) => (
<LoadingWrapper style={{width: `${size}px`, height: `${size}px`, padding: `${gap}px`}}>
<Loader
color={color}
diff --git a/src/components/common/range-plot.tsx b/src/components/common/range-plot.tsx
index bbd1c4762..7b916341f 100644
--- a/src/components/common/range-plot.tsx
+++ b/src/components/common/range-plot.tsx
@@ -53,7 +53,7 @@ RangePlotFactory.deps = [RangeBrushFactory, HistogramPlotFactory, LineChartFacto
export default function RangePlotFactory(
RangeBrush: ReturnType<typeof RangeBrushFactory>,
HistogramPlot: ReturnType<typeof HistogramPlotFactory>,
- LineChart: ReturnType<typeof LineChartFactory>
+ LineChartPlot: ReturnType<typeof LineChartFactory>
) {
const RangePlot = ({
onBrush,
@@ -133,7 +133,7 @@ export default function RangePlotFactory(
className="kg-range-slider__plot"
>
{plotType === 'lineChart' && lineChart ? (
- <LineChart lineChart={lineChart} {...commonProps} />
+ <LineChartPlot lineChart={lineChart} {...commonProps} />
) : (
<HistogramPlot histogram={histogram} {...commonProps} />
)}
diff --git a/src/components/common/range-slider.tsx b/src/components/common/range-slider.tsx
index 8ecc0c2eb..3030a6cc2 100644
--- a/src/components/common/range-slider.tsx
+++ b/src/components/common/range-slider.tsx
@@ -63,7 +63,7 @@ interface RangeSliderProps {
range?: number[];
value0: number;
value1: number;
- onChange?: (val: number[]) => void; //TODO
+ onChange?: (val: number[]) => void; // TODO
histogram?: any[];
isRanged?: boolean;
isEnlarged?: boolean;
diff --git a/src/components/filters/filter-panels/multi-select-filter-panel.tsx b/src/components/filters/filter-panels/multi-select-filter-panel.tsx
index be443938c..2028f2be3 100644
--- a/src/components/filters/filter-panels/multi-select-filter-panel.tsx
+++ b/src/components/filters/filter-panels/multi-select-filter-panel.tsx
@@ -28,7 +28,7 @@ MultiSelectFilterPanelFactory.deps = [FieldPanelWithFieldSelectFactory, MultiSel
function MultiSelectFilterPanelFactory(
FieldPanelWithFieldSelect: ReturnType<typeof FieldPanelWithFieldSelectFactory>,
- MultiSelectFilter: ReturnType<typeof MultiSelectFilterFactory>
+ MultiSelectFilterComponent: ReturnType<typeof MultiSelectFilterFactory>
) {
const MultiSelectFilterPanel: FilterPanelComponent<MultiSelectFilter> = React.memo(
({idx, datasets, allAvailableFields, filter, setFilter, removeFilter}) => {
@@ -46,7 +46,7 @@ function MultiSelectFilterPanelFactory(
>
{filter.type && !filter.enlarged && (
<div className="filter-panel__filter">
- <MultiSelectFilter filter={filter} setFilter={onSetFilter} />
+ <MultiSelectFilterComponent filter={filter} setFilter={onSetFilter} />
</div>
)}
</FieldPanelWithFieldSelect>
diff --git a/src/components/filters/filter-panels/range-filter-panel.tsx b/src/components/filters/filter-panels/range-filter-panel.tsx
index efc981ead..27b96e41b 100644
--- a/src/components/filters/filter-panels/range-filter-panel.tsx
+++ b/src/components/filters/filter-panels/range-filter-panel.tsx
@@ -28,7 +28,7 @@ RangeFilterPanelFactory.deps = [FieldPanelWithFieldSelectFactory, RangeFilterFac
function RangeFilterPanelFactory(
FieldPanelWithFieldSelect: ReturnType<typeof FieldPanelWithFieldSelectFactory>,
- RangeFilter: ReturnType<typeof RangeFilterFactory>
+ RangeFilterComponent: ReturnType<typeof RangeFilterFactory>
) {
const RangeFilterPanel: FilterPanelComponent<RangeFilter> = React.memo(
({idx, datasets, allAvailableFields, filter, removeFilter, setFilter}) => {
@@ -46,7 +46,7 @@ function RangeFilterPanelFactory(
>
{filter.type && !filter.enlarged && (
<div className="filter-panel__filter">
- <RangeFilter filter={filter} setFilter={onSetFilter} />
+ <RangeFilterComponent filter={filter} setFilter={onSetFilter} />
</div>
)}
</FieldPanelWithFieldSelect>
diff --git a/src/components/filters/time-range-filter.tsx b/src/components/filters/time-range-filter.tsx
index d6f7a02ff..cbdad623d 100644
--- a/src/components/filters/time-range-filter.tsx
+++ b/src/components/filters/time-range-filter.tsx
@@ -53,7 +53,7 @@ export function timeRangeSliderFieldsSelector(filter: TimeRangeFilter) {
TimeRangeFilterFactory.deps = [TimeRangeSliderFactory];
function TimeRangeFilterFactory(TimeRangeSlider: ReturnType<typeof TimeRangeSliderFactory>) {
- const TimeRangeFilter: React.FC<TimeRangeFilterProps> = ({
+ const TimeRangeFilterComponent: React.FC<TimeRangeFilterProps> = ({
filter,
setFilter,
isAnimatable,
@@ -69,7 +69,7 @@ function TimeRangeFilterFactory(TimeRangeSlider: ReturnType<typeof TimeRangeSlid
/>
);
- return TimeRangeFilter;
+ return TimeRangeFilterComponent;
}
export default TimeRangeFilterFactory;
diff --git a/src/components/geocoder/geocoder.tsx b/src/components/geocoder/geocoder.tsx
index 95cd53d7b..67203d7a1 100644
--- a/src/components/geocoder/geocoder.tsx
+++ b/src/components/geocoder/geocoder.tsx
@@ -205,7 +205,7 @@ const GeoCoder: React.FC<GeocoderProps & IntlProps> = ({
const onItemSelected = useCallback(
item => {
- let newViewport = new WebMercatorViewport(viewport);
+ const newViewport = new WebMercatorViewport(viewport);
const {bbox, center} = item;
const resultViewport = bbox
diff --git a/src/components/map-container.tsx b/src/components/map-container.tsx
index 90b262f4e..f1ca90ee3 100644
--- a/src/components/map-container.tsx
+++ b/src/components/map-container.tsx
@@ -24,6 +24,8 @@ import MapboxGLMap, {MapRef} from 'react-map-gl';
import DeckGL from '@deck.gl/react';
import {createSelector} from 'reselect';
import WebMercatorViewport from 'viewport-mercator-project';
+import mapboxgl from 'mapbox-gl';
+
import {errorNotification} from 'utils/notifications-utils';
import * as VisStateActions from 'actions/vis-state-actions';
diff --git a/src/components/modal-container.tsx b/src/components/modal-container.tsx
index 08a4837b5..c88b687b2 100644
--- a/src/components/modal-container.tsx
+++ b/src/components/modal-container.tsx
@@ -342,7 +342,7 @@ export default function ModalContainerFactory(
template = (
<LoadDataModal
{...providerState}
- //@ts-expect-error //TODO Remove it once LoadDataModal is translated
+ // @ts-expect-error //TODO Remove it once LoadDataModal is translated
onClose={this._closeModal}
onFileUpload={this._onFileUpload}
onLoadCloudMap={this._onLoadCloudMap}
@@ -464,7 +464,7 @@ export default function ModalContainerFactory(
break;
case SAVE_MAP_ID:
template = (
- //@ts-expect-error //TODO Remove it once SaveMapModal is translated
+ // @ts-expect-error //TODO Remove it once SaveMapModal is translated
<SaveMapModal
{...providerState}
exportImage={uiState.exportImage}
diff --git a/src/components/modals/load-storage-map.tsx b/src/components/modals/load-storage-map.tsx
index 3a524f2d0..f220b3d39 100644
--- a/src/components/modals/load-storage-map.tsx
+++ b/src/components/modals/load-storage-map.tsx
@@ -271,7 +271,7 @@ interface LoadStorageMapProps {
onSetCloudProvider;
currentProvider?: string;
getSavedMaps: (provider?: Provider) => void;
- onLoadCloudMap: ({loadParams: any, provider: Provider}) => void;
+ onLoadCloudMap: (opts: {loadParams: any; provider?: Provider}) => void;
visualizations: Visualization[];
isProviderLoading?: boolean;
}
diff --git a/src/components/modals/overwrite-map-modal.tsx b/src/components/modals/overwrite-map-modal.tsx
index 3cade812b..e7559f4b0 100644
--- a/src/components/modals/overwrite-map-modal.tsx
+++ b/src/components/modals/overwrite-map-modal.tsx
@@ -27,7 +27,7 @@ import {FormattedMessage} from '@kepler.gl/localization';
import {Provider} from 'cloud-providers';
import {ImageModalContainerProps} from './image-modal-container';
-import {cleanupExportImage} from 'actions';
+import {cleanupExportImage as cleanupExportImageAction} from 'actions';
/** @typedef {import('./overwrite-map-modal').OverwriteMapModalProps} OverwriteMapModalProps */
@@ -59,7 +59,7 @@ type OverwriteMapModalProps = {
// callbacks
onUpdateImageSetting: ImageModalContainerProps['onUpdateImageSetting'];
- cleanupExportImage: typeof cleanupExportImage;
+ cleanupExportImage: typeof cleanupExportImageAction;
};
const OverwriteMapModalFactory = () => {
diff --git a/src/components/modals/save-map-modal.tsx b/src/components/modals/save-map-modal.tsx
index 4fb8dd429..ebce68e10 100644
--- a/src/components/modals/save-map-modal.tsx
+++ b/src/components/modals/save-map-modal.tsx
@@ -39,7 +39,7 @@ import ImagePreview from 'components/common/image-preview';
import {FormattedMessage} from '@kepler.gl/localization';
import {ExportImage, MapInfo} from 'reducers';
import {Provider} from 'cloud-providers';
-import {setMapInfo, cleanupExportImage} from 'actions';
+import {setMapInfo, cleanupExportImage as cleanupExportImageAction} from 'actions';
/** @typedef {import('./save-map-modal').SaveMapModalProps} SaveMapModalProps */
@@ -93,7 +93,7 @@ type SaveMapModalProps = {
// callbacks
onSetCloudProvider: ProviderModalContainerProps['onSetCloudProvider'];
onUpdateImageSetting: ImageModalContainerProps['onUpdateImageSetting'];
- cleanupExportImage: typeof cleanupExportImage;
+ cleanupExportImage: typeof cleanupExportImageAction;
onSetMapInfo: typeof setMapInfo;
};
diff --git a/src/components/modals/share-map-modal.tsx b/src/components/modals/share-map-modal.tsx
index c132fc788..d63f07161 100644
--- a/src/components/modals/share-map-modal.tsx
+++ b/src/components/modals/share-map-modal.tsx
@@ -35,7 +35,7 @@ import CloudTile from './cloud-tile';
import StatusPanel from './status-panel';
import {FormattedMessage} from '@kepler.gl/localization';
import {Provider} from 'cloud-providers';
-import {cleanupExportImage, SetCloudProviderPayload} from 'actions';
+import {cleanupExportImage as cleanupExportImageAction, SetCloudProviderPayload} from 'actions';
export const StyledInputLabel = styled.label`
font-size: 12px;
@@ -101,7 +101,7 @@ interface ShareMapUrlModalFactoryProps {
successInfo?: {shareUrl?: string; folderLink?: string};
onSetCloudProvider?: (provider: SetCloudProviderPayload) => void;
onUpdateImageSetting: ImageModalContainerProps['onUpdateImageSetting'];
- cleanupExportImage: typeof cleanupExportImage;
+ cleanupExportImage: typeof cleanupExportImageAction;
}
export default function ShareMapUrlModalFactory() {
diff --git a/src/components/side-panel.tsx b/src/components/side-panel.tsx
index f70953eae..aca568814 100644
--- a/src/components/side-panel.tsx
+++ b/src/components/side-panel.tsx
@@ -113,6 +113,7 @@ export default function SidePanelFactory(
const getCustomPanelProps = get(CustomPanels, ['defaultProps', 'getProps']) || (() => ({}));
+ // eslint-disable-next-line max-statements
const SidePanel = (props: SidePanelProps) => {
const {
appName,
diff --git a/src/components/side-panel/interaction-panel/tooltip-config.tsx b/src/components/side-panel/interaction-panel/tooltip-config.tsx
index 8fa048b61..d6ab22209 100644
--- a/src/components/side-panel/interaction-panel/tooltip-config.tsx
+++ b/src/components/side-panel/interaction-panel/tooltip-config.tsx
@@ -147,7 +147,7 @@ function TooltipConfigFactory(
...config,
fieldsToShow: {
...config.fieldsToShow,
- //@ts-expect-error
+ // @ts-expect-error
[dataId]: selected.map(
f =>
config.fieldsToShow[dataId].find(
@@ -165,7 +165,7 @@ function TooltipConfigFactory(
closeOnSelect={false}
multiSelect
inputTheme="secondary"
- //@ts-expect-error
+ // @ts-expect-error
CustomChickletComponent={TooltipChickletFactory(dataId, config, onChange, dataset.fields)}
/>
</SidePanelSection>
@@ -220,7 +220,7 @@ function TooltipConfigFactory(
onChange={option => {
const newConfig: TooltipConfigProps['config'] = {
...config,
- //@ts-expect-error
+ // @ts-expect-error
compareType: option
};
onChange(newConfig);
diff --git a/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx b/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx
index 6e0380034..69dfda696 100644
--- a/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx
+++ b/src/components/side-panel/interaction-panel/tooltip-config/tooltip-chicklet.tsx
@@ -130,7 +130,7 @@ function getFormatTooltip(formatLabels: TimeLabelFormat[], format: string | null
function TooltipChickletFactory(
dataId: string,
config: TooltipConfig,
- onChange: (config: TooltipConfig) => void,
+ onChange: (cfg: TooltipConfig) => void,
fields: TooltipFields[]
): ComponentType<TooltipChickletProps> {
class TooltipChicklet extends Component<TooltipChickletProps> {
diff --git a/src/components/side-panel/layer-panel/dataset-layer-group.tsx b/src/components/side-panel/layer-panel/dataset-layer-group.tsx
index 6f8e703dd..be5efdd4b 100644
--- a/src/components/side-panel/layer-panel/dataset-layer-group.tsx
+++ b/src/components/side-panel/layer-panel/dataset-layer-group.tsx
@@ -66,7 +66,7 @@ function DatasetLayerGroupFactory(
// where the layer doesn't belong to a dataset and set it to null
const datasetLayers = layers
.map(layer => (layer.config.dataId === dataset.id ? layer : null))
- .filter(layer => !!layer);
+ .filter(layer => Boolean(layer));
return {dataset, datasetLayers};
});
diff --git a/src/components/side-panel/layer-panel/text-label-panel.tsx b/src/components/side-panel/layer-panel/text-label-panel.tsx
index 887f4addf..2f5c51ea2 100644
--- a/src/components/side-panel/layer-panel/text-label-panel.tsx
+++ b/src/components/side-panel/layer-panel/text-label-panel.tsx
@@ -58,7 +58,7 @@ function TextLabelPanelFactory(
class TextLabelPanel extends Component<TextLabelPanelProps> {
render() {
const {updateLayerTextLabel, textLabel, fields} = this.props;
- const currentFields = textLabel.map(tl => tl.field && tl.field.name).filter(d => !!d);
+ const currentFields = textLabel.map(tl => tl.field && tl.field.name).filter(d => Boolean(d));
return (
<LayerConfigGroup label={'panel.text.label'} collapsible>
diff --git a/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts b/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts
index d6a048d3a..0d4998f2d 100644
--- a/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts
+++ b/src/deckgl-layers/src/layer-utils/cpu-aggregator.ts
@@ -527,15 +527,15 @@ export default class CPUAggregator {
props,
dimension: UpdaterObjectType
) {
- type UpdaterType = UpdaterObjectType extends DimensionType
+ type LocalUpdaterType = UpdaterObjectType extends DimensionType
? BindedUpdaterType
: BindedAggregatedUpdaterType;
- const updaters: UpdaterType[] = [];
+ const updaters: LocalUpdaterType[] = [];
for (let i = step; i < dimension.updateSteps.length; i++) {
const updater = dimension.updateSteps[i].updater;
if (typeof updater === 'function') {
updaters.push(
- updater.bind(this, dimension.updateSteps[i], props, dimension) as UpdaterType
+ updater.bind(this, dimension.updateSteps[i], props, dimension) as LocalUpdaterType
);
}
}
@@ -549,10 +549,10 @@ export default class CPUAggregator {
props,
changeFlags
) {
- type UpdaterType = UpdaterObjectType extends DimensionType
+ type LocalUpdaterType = UpdaterObjectType extends DimensionType
? BindedUpdaterType
: BindedAggregatedUpdaterType;
- let updaters: UpdaterType[] = [];
+ let updaters: LocalUpdaterType[] = [];
const needUpdateStep = dimension.updateSteps.findIndex(step =>
this._needUpdateStep(step, oldProps, props, changeFlags)
);
diff --git a/src/deckgl-layers/src/typedefs/deckgl.d.ts b/src/deckgl-layers/src/typedefs/deckgl.d.ts
index bdfd40579..ffb220f45 100644
--- a/src/deckgl-layers/src/typedefs/deckgl.d.ts
+++ b/src/deckgl-layers/src/typedefs/deckgl.d.ts
@@ -18,6 +18,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
+// Eslint does not seem to be able to understand the namespace re-export here
+/* eslint-disable */
+
import * as DeckTypings from '@danmarshall/deckgl-typings';
declare module 'deck.gl' {
diff --git a/src/layers/src/geojson-layer/geojson-utils.ts b/src/layers/src/geojson-layer/geojson-utils.ts
index 2a972ed7b..bb442f990 100644
--- a/src/layers/src/geojson-layer/geojson-utils.ts
+++ b/src/layers/src/geojson-layer/geojson-utils.ts
@@ -28,6 +28,8 @@ import {Feature, BBox} from 'geojson';
export type GetFeature = (d: any) => Feature;
export type GeojsonDataMaps = Array<Feature | null>;
+/* eslint-disable */
+// TODO: Re-enable eslint when we upgrade to handle enums and type maps
export enum FeatureTypes {
Point = 'Point',
MultiPoint = 'MultiPoint',
@@ -40,6 +42,7 @@ export enum FeatureTypes {
type FeatureTypeMap = {
[key in FeatureTypes]: boolean;
};
+/* eslint-enable */
export function parseGeoJsonRawFeature(rawFeature: unknown): Feature | null {
if (typeof rawFeature === 'object') {
diff --git a/src/layers/src/heatmap-layer/heatmap-layer.ts b/src/layers/src/heatmap-layer/heatmap-layer.ts
index 79f6fc7d6..86b32fca1 100644
--- a/src/layers/src/heatmap-layer/heatmap-layer.ts
+++ b/src/layers/src/heatmap-layer/heatmap-layer.ts
@@ -155,6 +155,7 @@ class HeatmapLayer extends MapboxGLLayer {
getDefaultLayerConfig(props = {}): HeatmapLayerConfig {
// mapbox heatmap layer color is always based on density
// no need to set colorField, colorDomain and colorScale
+ // eslint-disable-next-line no-unused-vars
const {colorField, colorDomain, colorScale, ...layerConfig} = {
...super.getDefaultLayerConfig(props),
diff --git a/src/layers/src/index.ts b/src/layers/src/index.ts
index 0e279c7e1..68a2664da 100644
--- a/src/layers/src/index.ts
+++ b/src/layers/src/index.ts
@@ -55,7 +55,7 @@ export {
colorMaker,
layerColors
} from './base-layer';
-/* eslint-disable prettier/prettier */
+// eslint-disable-next-line prettier/prettier
export type {
LayerBaseConfig,
LayerColumns,
diff --git a/src/layers/src/typedefs/deckgl.d.ts b/src/layers/src/typedefs/deckgl.d.ts
index bdfd40579..ffb220f45 100644
--- a/src/layers/src/typedefs/deckgl.d.ts
+++ b/src/layers/src/typedefs/deckgl.d.ts
@@ -18,6 +18,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
+// Eslint does not seem to be able to understand the namespace re-export here
+/* eslint-disable */
+
import * as DeckTypings from '@danmarshall/deckgl-typings';
declare module 'deck.gl' {
diff --git a/src/processors/src/typedefs/deckgl.d.ts b/src/processors/src/typedefs/deckgl.d.ts
index bdfd40579..ffb220f45 100644
--- a/src/processors/src/typedefs/deckgl.d.ts
+++ b/src/processors/src/typedefs/deckgl.d.ts
@@ -18,6 +18,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
+// Eslint does not seem to be able to understand the namespace re-export here
+/* eslint-disable */
+
import * as DeckTypings from '@danmarshall/deckgl-typings';
declare module 'deck.gl' {
diff --git a/src/reducers/composer-helpers.ts b/src/reducers/composer-helpers.ts
index 8ff08d4d8..d79e28959 100644
--- a/src/reducers/composer-helpers.ts
+++ b/src/reducers/composer-helpers.ts
@@ -32,14 +32,14 @@ export function payload_<P>(payload: P) {
}
/** Wraps a value in an object and stores it the `payload` field */
export function apply_<State, P>(
- updater: (state: State, payload: P) => State,
+ updater: (state: State, nextPayload: P) => State,
payload: P
): (state: State) => State {
return state => updater(state, payload);
}
export function with_<State>(
- fn: (state: State) => (state: State) => State
+ fn: (state: State) => (nextState: State) => State
): (state: State) => State {
return state => fn(state)(state);
}
diff --git a/src/reducers/index.ts b/src/reducers/index.ts
index 37f0637f0..60138a2a2 100644
--- a/src/reducers/index.ts
+++ b/src/reducers/index.ts
@@ -18,6 +18,9 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
+// TODO: Unnecessary when eslint-plugin-prettier is upgraded
+/* eslint-disable prettier/prettier */
+
// Root Reducer, used to register, and remove core reducers of each instance
export {default} from './root';
export {default as keplerGlReducer} from './root';
@@ -37,6 +40,7 @@ export {default as mapStateReducer} from './map-state';
export {default as mapStyleReducer} from './map-style';
// reducer updaters
+
export * as visStateUpdaters from './vis-state-updaters';
export * as mapStateUpdaters from './map-state-updaters';
export * as mapStyleUpdaters from './map-style-updaters';
diff --git a/src/reducers/provider-state-updaters.ts b/src/reducers/provider-state-updaters.ts
index 328bdaf8f..01dc77944 100644
--- a/src/reducers/provider-state-updaters.ts
+++ b/src/reducers/provider-state-updaters.ts
@@ -79,8 +79,6 @@ export const INITIAL_PROVIDER_STATE: ProviderState = {
visualizations: []
};
-declare function withTask<T>(s: T, any: any): T;
-
function createActionTask(action, payload) {
if (typeof action === 'function') {
return ACTION_TASK().map(_ => action(payload));
diff --git a/src/schemas/index.ts b/src/schemas/index.ts
index 63aba6c81..c699bb389 100644
--- a/src/schemas/index.ts
+++ b/src/schemas/index.ts
@@ -26,6 +26,7 @@ export {
KeplerGLSchema as KeplerGLSchemaClass
} from './schema-manager';
+// eslint-disable-next-line prettier/prettier
export type {
ParsedConfig,
ParsedDataset,
diff --git a/src/types/layers.d.ts b/src/types/layers.d.ts
index baf240f23..5e2728aef 100644
--- a/src/types/layers.d.ts
+++ b/src/types/layers.d.ts
@@ -69,13 +69,6 @@ export type Field = {
filterProps?: any;
metadata?: any;
};
-import {
- LayerBaseConfig,
- LayerColorConfig,
- LayerHeightConfig,
- LayerSizeConfig,
- LayerWeightConfig
-} from '@kepler.gl/types';
export type LayerTextLabel = {
field: Field | null;
diff --git a/src/utils/filter-utils.ts b/src/utils/filter-utils.ts
index c9f18edb2..3708d97b4 100644
--- a/src/utils/filter-utils.ts
+++ b/src/utils/filter-utils.ts
@@ -60,6 +60,7 @@ export type FilterResult = {
};
export type FilterChanged = {
+ // eslint-disable-next-line no-unused-vars
[key in keyof FilterRecord]: {
[key: string]: 'added' | 'deleted' | 'name_changed' | 'value_changed' | 'dataId_changed';
} | null;
@@ -448,6 +449,7 @@ type filterFunction = (data: {index: number}) => boolean;
* @param dataContainer Data container
* @return filterFunction
*/
+// eslint-disable-next-line complexity
export function getFilterFunction(
field: Field | null,
dataId: string,
diff --git a/src/utils/table-utils/kepler-table.ts b/src/utils/table-utils/kepler-table.ts
index 6932f06f7..1c1ccd2c2 100644
--- a/src/utils/table-utils/kepler-table.ts
+++ b/src/utils/table-utils/kepler-table.ts
@@ -71,7 +71,7 @@ export type GpuFilter = {
dc: DataContainerInterface
) => (
getIndex?: (any) => number,
- getData?: (dc: DataContainerInterface, d: any, fieldIndex: number) => any
+ getData?: (dc_: DataContainerInterface, d: any, fieldIndex: number) => any
) => (d: any) => number;
};
diff --git a/test/fixtures/test-csv-data.js b/test/fixtures/test-csv-data.js
index 7bf9c8943..b708ad4de 100644
--- a/test/fixtures/test-csv-data.js
+++ b/test/fixtures/test-csv-data.js
@@ -18,7 +18,7 @@
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
-/* eslint-disable max-lens */
+/* eslint-disable max-len */
const data = `gps_data.utc_timestamp,gps_data.lat,gps_data.lng,gps_data.types,epoch,has_result,id,time,begintrip_ts_utc,begintrip_ts_local,date
2016-09-17 00:09:55,29.9900937,31.2590542,driver_analytics_0,1472688000000,False,1,2016-09-23T00:00:00.000Z,2016-10-01 09:41:39+00:00,2016-10-01 09:41:39+00:00,2016-09-23
2016-09-17 00:10:56,29.9927699,31.2461142,driver_analytics,1472688000000,False,2,2016-09-23T00:00:00.000Z,2016-10-01 09:46:37+00:00,2016-10-01 16:46:37+00:00,2016-09-23
@@ -1478,7 +1478,7 @@ export const updatedLayerV2 = {
fixedRadius: false
}
};
-/* eslint-enable max-lens */
+/* eslint-enable max-len */
export const numericRangesCsv = `smallest,small,negative,medium,large
0.00000,0,-10,10,0