Skip to content

Commit

Permalink
chore(build): address linting rule violations (#9396)
Browse files Browse the repository at this point in the history
* WIP ESlint errors

fix styling

test errors

disable rule

enable rule

try moving export

update class component exports

fix table export

fix test

fix linting errors

PR feedback from Eric

* revert remove displayName and fix lint issues

* fix lint error in test
  • Loading branch information
jenny-s51 authored Aug 9, 2023
1 parent 77275f0 commit ad33120
Show file tree
Hide file tree
Showing 266 changed files with 989 additions and 803 deletions.
4 changes: 2 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@
"never"
],
"patternfly-react/import-tokens-icons": "error",
"patternfly-react/no-anonymous-functions": "off",
"patternfly-react/no-anonymous-functions": "error",
"prefer-const": "error",
"prettier/prettier": "off",
"prettier/prettier": "error",
"radix": [
"error",
"as-needed"
Expand Down
14 changes: 7 additions & 7 deletions packages/react-charts/src/components/Chart/Chart.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import { ChartContainer } from '../ChartContainer/ChartContainer';
import { ChartLegend } from '../ChartLegend/ChartLegend';
import { ChartCommonStyles } from '../ChartTheme/ChartStyles';
import { ChartThemeDefinition } from '../ChartTheme/ChartTheme';
import { getClassName } from "../ChartUtils/chart-helpers";
import { getLabelTextSize } from "../ChartUtils/chart-label";
import { getComputedLegend, getLegendItemsExtraHeight } from "../ChartUtils/chart-legend";
import { getPaddingForSide } from "../ChartUtils/chart-padding";
import { getPatternDefs, mergePatternData, useDefaultPatternProps } from "../ChartUtils/chart-patterns";
import { getChartTheme } from "../ChartUtils/chart-theme-types";
import { useEffect } from "react";
import { getClassName } from '../ChartUtils/chart-helpers';
import { getLabelTextSize } from '../ChartUtils/chart-label';
import { getComputedLegend, getLegendItemsExtraHeight } from '../ChartUtils/chart-legend';
import { getPaddingForSide } from '../ChartUtils/chart-padding';
import { getPatternDefs, mergePatternData, useDefaultPatternProps } from '../ChartUtils/chart-patterns';
import { getChartTheme } from '../ChartUtils/chart-theme-types';
import { useEffect } from 'react';

/**
* Chart is a wrapper component that reconciles the domain for all its children, controls the layout of the chart,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ import {
SortOrderPropType,
StringOrNumberOrCallback,
StringOrNumberOrList,
VictoryStyleInterface, OrientationTypes
VictoryStyleInterface,
OrientationTypes
} from 'victory-core';
import {
VictoryBoxPlot,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { ChartLegend } from '../ChartLegend/ChartLegend';
import { ChartThemeDefinition } from '../ChartTheme/ChartTheme';
import { ChartTooltip } from '../ChartTooltip/ChartTooltip';
import { ChartBulletStyles } from '../ChartTheme/ChartStyles';
import { getComputedLegend, getLegendItemsExtraHeight } from "../ChartUtils/chart-legend";
import { getComputedLegend, getLegendItemsExtraHeight } from '../ChartUtils/chart-legend';
import { ChartBulletComparativeErrorMeasure } from './ChartBulletComparativeErrorMeasure';
import { ChartBulletComparativeMeasure } from './ChartBulletComparativeMeasure';
import { ChartBulletComparativeWarningMeasure } from './ChartBulletComparativeWarningMeasure';
Expand All @@ -27,8 +27,8 @@ import { ChartBulletPrimarySegmentedMeasure } from './ChartBulletPrimarySegmente
import { ChartBulletQualitativeRange } from './ChartBulletQualitativeRange';
import { getBulletDomain } from './utils/chart-bullet-domain';
import { getBulletThemeWithLegendColorScale } from './utils/chart-bullet-theme';
import { getPaddingForSide } from "../ChartUtils/chart-padding";
import { useEffect } from "react";
import { getPaddingForSide } from '../ChartUtils/chart-padding';
import { useEffect } from 'react';

/**
* ChartBullet renders a dataset as a bullet chart.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,9 @@ export interface ChartBulletComparativeWarningMeasureProps {
y?: DataGetterPropType;
}

export const ChartBulletComparativeWarningMeasure: React.FunctionComponent<ChartBulletComparativeWarningMeasureProps> = ({
export const ChartBulletComparativeWarningMeasure: React.FunctionComponent<
ChartBulletComparativeWarningMeasureProps
> = ({
allowTooltip = true,
ariaDesc,
ariaTitle,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,7 @@ import { ChartContainer } from '../ChartContainer/ChartContainer';
import { ChartLabel } from '../ChartLabel/ChartLabel';
import { ChartThemeDefinition } from '../ChartTheme/ChartTheme';
import { ChartBulletStyles } from '../ChartTheme/ChartStyles';
import {
getLabelTextSize,
getBulletLabelX,
getBulletLabelY
} from '../ChartUtils/chart-label';
import { getLabelTextSize, getBulletLabelX, getBulletLabelY } from '../ChartUtils/chart-label';
import { getPaddingForSide } from '../ChartUtils/chart-padding';
import { getBulletGroupTitleTheme } from '../ChartUtils/chart-theme-types';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import { ChartContainer } from '../ChartContainer/ChartContainer';
import { ChartBulletStyles } from '../ChartTheme/ChartStyles';
import { ChartThemeDefinition } from '../ChartTheme/ChartTheme';
import { ChartTooltip } from '../ChartTooltip/ChartTooltip';
import { getBulletPrimaryNegativeMeasureTheme, getBulletPrimarySegmentedMeasureTheme } from '../ChartUtils/chart-theme-types';
import {
getBulletPrimaryNegativeMeasureTheme,
getBulletPrimarySegmentedMeasureTheme
} from '../ChartUtils/chart-theme-types';

/**
* ChartBulletPrimarySegmentedMeasure renders a dataset as the primary segmented measure.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ interface ChartBulletSizeInterface {
width: number; // The chart width -- not SVG width
}


/**
* Scale size per the given size properties
* @private
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,7 @@ import { VictoryGroup, VictoryGroupProps, VictoryGroupTTargetType } from 'victor
import { ChartContainer } from '../ChartContainer/ChartContainer';
import { ChartThemeDefinition } from '../ChartTheme/ChartTheme';
import { getClassName } from '../ChartUtils/chart-helpers';
import {
useDefaultPatternProps,
getPatternDefs,
renderChildrenWithPatterns
} from '../ChartUtils/chart-patterns';
import { useDefaultPatternProps, getPatternDefs, renderChildrenWithPatterns } from '../ChartUtils/chart-patterns';
import { getTheme } from '../ChartUtils/chart-theme';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import {
getLegendTooltipDataProps,
getLegendTooltipSize,
getLegendTooltipVisibleData,
getLegendTooltipVisibleText,
getLegendTooltipVisibleText
} from '../ChartUtils/chart-tooltip';
import { getTheme } from '../ChartUtils/chart-theme';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
getLegendTooltipDataProps,
getLegendTooltipSize,
getLegendTooltipVisibleData,
getLegendTooltipVisibleText,
getLegendTooltipVisibleText
} from '../ChartUtils/chart-tooltip';
import { getTheme } from '../ChartUtils/chart-theme';

Expand Down
12 changes: 5 additions & 7 deletions packages/react-charts/src/components/ChartPie/ChartPie.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ import { ChartLegend } from '../ChartLegend/ChartLegend';
import { ChartCommonStyles } from '../ChartTheme/ChartStyles';
import { ChartThemeDefinition } from '../ChartTheme/ChartTheme';
import { ChartTooltip } from '../ChartTooltip/ChartTooltip';
import { getComputedLegend, getLegendItemsExtraHeight } from "../ChartUtils/chart-legend";
import { getPaddingForSide } from "../ChartUtils/chart-padding";
import { getPatternDefs, useDefaultPatternProps, } from "../ChartUtils/chart-patterns";
import { getTheme } from "../ChartUtils/chart-theme";
import { getComputedLegend, getLegendItemsExtraHeight } from '../ChartUtils/chart-legend';
import { getPaddingForSide } from '../ChartUtils/chart-padding';
import { getPatternDefs, useDefaultPatternProps } from '../ChartUtils/chart-patterns';
import { getTheme } from '../ChartUtils/chart-theme';
import { useEffect } from 'react';

/**
Expand Down Expand Up @@ -512,9 +512,7 @@ export const ChartPie: React.FunctionComponent<ChartPieProps> = ({
theme = getTheme(themeColor),
labelComponent = allowTooltip ? (
<ChartTooltip constrainToVisibleArea={constrainToVisibleArea} theme={theme} />
) : (
undefined
),
) : undefined,
legendOrientation = theme.legend.orientation as any,
height = theme.pie.height,
width = theme.pie.width,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ export const PathHelpers: PathHelpersInterface = {
star: (x: number, y: number, size: number) => {
const baseSize = 1.35 * size;
const angle = Math.PI / 5;
const starCoords = [...Array(10).keys()].map(index => {
const starCoords = [...Array(10).keys()].map((index) => {
const length = index % 2 === 0 ? baseSize : baseSize / 2;
return `${length * Math.sin(angle * (index + 1)) + x},
${length * Math.cos(angle * (index + 1)) + y}`;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ export const ColorTheme = (props: ColorThemeInterface) => {
colorScale: COLOR_SCALE,
style: {
q1: {
fill: COLOR_SCALE[0],
fill: COLOR_SCALE[0]
},
q3: {
fill: COLOR_SCALE[0],
},
},
fill: COLOR_SCALE[0]
}
}
},
candlestick: {
colorScale: COLOR_SCALE
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ export const getDomain = ({ data, maxDomain, minDomain, x, y }: DomainInterface)
*/
export const getDomains = ({ maxDomain, minDomain, sources }: SourcesInterface): ChartDomain => {
const domains: ChartDomain[] = [];
sources.forEach(source => {
sources.forEach((source) => {
const { data: compData = source.data } = source.component ? source.component.props : undefined;
const domain = getDomain({
data: compData,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const getChildNames = ({ chartNames, omitIndex }: ChartInteractiveLegendExtInter
chartNames.forEach((chartName: any, index: number) => {
if (index !== omitIndex) {
if (Array.isArray(chartName)) {
chartName.forEach(name => result.push(name));
chartName.forEach((name) => result.push(name));
} else {
result.push(chartName);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ const getMaxLegendTextSize = ({ legendData, theme }: ChartLegendTextMaxSizeInter
}

let result = '';
legendData.forEach(data => {
legendData.forEach((data) => {
if (data.name && data.name.length > result.length) {
result = data.name;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -250,9 +250,13 @@ export const getPatternDefs = ({
<React.Fragment key={`defs`}>
<defs>
{colorScale.map((color: string, index: number) => {
const { d, fill, stroke = color, strokeWidth, ...rest } = defaultPatterns[
(index + offset) % defaultPatterns.length
];
const {
d,
fill,
stroke = color,
strokeWidth,
...rest
} = defaultPatterns[(index + offset) % defaultPatterns.length];
const id = getPatternDefsId(patternId, index);
return (
<pattern id={id} key={id} {...rest}>
Expand Down Expand Up @@ -281,7 +285,7 @@ const getDefaultColorScale = (colorScale: string[], themeColorScale: string[]) =
const result: string[] = [];
const colors = colorScale ? colorScale : themeColorScale;

colors.forEach(val => result.push(val));
colors.forEach((val) => result.push(val));
return result;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import {
ChartDonutUtilizationStaticTheme,
ChartDonutThresholdDynamicTheme,
ChartDonutThresholdStaticTheme,
ChartThresholdTheme,
ChartThresholdTheme
} from '../ChartTheme/ChartThemeTypes';
import { getTheme, getCustomTheme } from './chart-theme';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ export const getLegendTooltipSize = ({
});

// Replace whitespace with spacer char for consistency in width
const formattedData = data.map(val => ({
const formattedData = data.map((val) => ({
name: val.name.replace(/ /g, spacer)
}));

Expand Down Expand Up @@ -231,7 +231,7 @@ export const getLegendTooltipVisibleData = ({
let index = -1;
for (let i = 0; i < legendData.length; i++) {
const data = legendData[i];
const activePoint = activePoints ? activePoints.find(item => item.childName === data.childName) : '';
const activePoint = activePoints ? activePoints.find((item) => item.childName === data.childName) : '';
if (
!activePoint ||
(data.symbol && data.symbol.type === 'eyeSlash' && data.symbol.fill === chart_color_black_500.var)
Expand Down Expand Up @@ -273,7 +273,7 @@ export const getLegendTooltipVisibleText = ({
if (legendData) {
let index = -1;
for (const data of legendData) {
const activePoint = activePoints ? activePoints.find(item => item.childName === data.childName) : '';
const activePoint = activePoints ? activePoints.find((item) => item.childName === data.childName) : '';
if (
!activePoint ||
(data.symbol && data.symbol.type === 'eyeSlash' && data.symbol.fill === chart_color_black_500.var)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ interface CodeEditorState {
copied: boolean;
}

export class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState> {
static displayName = 'CodeEditor';
private editor: editor.IStandaloneCodeEditor | null = null;
private wrapperRef = React.createRef<HTMLDivElement>();
Expand Down Expand Up @@ -668,3 +668,5 @@ export class CodeEditor extends React.Component<CodeEditorProps, CodeEditorState
);
}
}

export { CodeEditor };
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,21 @@ import { CodeEditor, Language } from '../CodeEditor';

Object.defineProperty(window, 'matchMedia', {
writable: true,
value: jest.fn().mockImplementation(query => ({
value: jest.fn().mockImplementation((query) => ({
matches: false,
media: query,
onchange: null,
addListener: jest.fn(), // Deprecated
removeListener: jest.fn(), // Deprecated
addEventListener: jest.fn(),
removeEventListener: jest.fn(),
dispatchEvent: jest.fn(),
})),
dispatchEvent: jest.fn()
}))
});

describe('CodeEditor', () => {
beforeAll(() => {
window.HTMLCanvasElement.prototype.getContext = () => ({} as any);
window.HTMLCanvasElement.prototype.getContext = () => ({}) as any;
});

test('matches snapshot without props', () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@ export const CodeEditorBasic: React.FunctionComponent = () => {
const [isReadOnly, setIsReadOnly] = React.useState(false);
const [isMinimapVisible, setIsMinimapVisible] = React.useState(false);

const toggleDarkTheme = checked => {
const toggleDarkTheme = (checked) => {
setIsDarkTheme(checked);
};

const toggleLineNumbers = checked => {
const toggleLineNumbers = (checked) => {
setIsLineNumbersVisible(checked);
};
const toggleReadOnly = checked => {
const toggleReadOnly = (checked) => {
setIsReadOnly(checked);
};
const toggleMinimap = checked => {
const toggleMinimap = (checked) => {
setIsMinimapVisible(checked);
};

Expand All @@ -30,7 +30,7 @@ export const CodeEditorBasic: React.FunctionComponent = () => {
monaco.editor.getModels()[0].updateOptions({ tabSize: 5 });
};

const onChange = value => {
const onChange = (value) => {
// eslint-disable-next-line no-console
console.log(value);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import PlayIcon from '@patternfly/react-icons/dist/esm/icons/play-icon';
export const CodeEditorCustomControl: React.FunctionComponent = () => {
const [code, setCode] = React.useState('');

const onChange = code => {
const onChange = (code) => {
setCode(code);
};

const onExecuteCode = code => {
const onExecuteCode = (code) => {
// eslint-disable-next-line no-console
console.log(code);
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const CodeEditorShortcutMainHeader: React.FunctionComponent = () => {
monaco.editor.getModels()[0].updateOptions({ tabSize: 5 });
};

const onChange = value => {
const onChange = (value) => {
// eslint-disable-next-line no-console
console.log(value);
};
Expand Down Expand Up @@ -41,7 +41,7 @@ export const CodeEditorShortcutMainHeader: React.FunctionComponent = () => {
<React.Fragment key={index}>
<GridItem style={{ textAlign: 'right', marginRight: '1em' }}>
{shortcut.keys
.map(key => (
.map((key) => (
<Chip key={key} isReadOnly>
{key}
</Chip>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const CodeEditorSizeToFit: React.FunctionComponent = () => {
monaco.editor.getModels()[0].updateOptions({ tabSize: 5 });
};

const onChange = value => {
const onChange = (value) => {
// eslint-disable-next-line no-console
console.log(value);
};
Expand Down
Loading

0 comments on commit ad33120

Please sign in to comment.