Skip to content

Commit

Permalink
Revert "ESLint: Re-enable rule default-props-match-prop-types (apache…
Browse files Browse the repository at this point in the history
…#10868)" (apache#11050)

This reverts commit 9f01a7f.
  • Loading branch information
Grace Guo authored and auxten committed Nov 20, 2020
1 parent 18d4ae6 commit 8fc6957
Show file tree
Hide file tree
Showing 21 changed files with 60 additions and 13 deletions.
2 changes: 2 additions & 0 deletions superset-frontend/.eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ module.exports = {
'padded-blocks': 0,
'prefer-arrow-callback': 0,
'prefer-destructuring': ['error', { object: true, array: false }],
'react/default-props-match-prop-types': 0, // disabled temporarily
'react/destructuring-assignment': 0, // re-enable up for discussion
'react/forbid-prop-types': 0,
'react/jsx-filename-extension': [1, { extensions: ['.jsx', '.tsx'] }],
Expand Down Expand Up @@ -232,6 +233,7 @@ module.exports = {
'prefer-arrow-callback': 0,
'prefer-object-spread': 1,
'prefer-destructuring': ['error', { object: true, array: false }],
'react/default-props-match-prop-types': 0, // disabled temporarily
'react/destructuring-assignment': 0, // re-enable up for discussion
'react/forbid-prop-types': 0,
'react/jsx-filename-extension': [1, { extensions: ['.jsx', '.tsx'] }],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,9 @@ describe('DashboardBuilder', () => {
dashboardLayout,
deleteTopLevelTabs() {},
editMode: false,
showBuilderPane() {},
setColorSchemeAndUnsavedChanges() {},
colorScheme: undefined,
handleComponentDrop() {},
setDirectPathToChild: sinon.spy(),
};
Expand Down
3 changes: 2 additions & 1 deletion superset-frontend/src/CRUD/Field.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ const propTypes = {
compact: PropTypes.bool,
};
const defaultProps = {
controlProps: {},
onChange: () => {},
compact: false,
description: null,
desc: null,
};

export default class Field extends React.PureComponent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,10 @@ const propTypes = {
templateParams: PropTypes.string,
};

const defaultProps = {
vizRequest: {},
};

class ExploreCtasResultsButton extends React.PureComponent {
constructor(props) {
super(props);
Expand Down Expand Up @@ -109,6 +113,7 @@ class ExploreCtasResultsButton extends React.PureComponent {
}
}
ExploreCtasResultsButton.propTypes = propTypes;
ExploreCtasResultsButton.defaultProps = defaultProps;

function mapStateToProps({ sqlLab, common }) {
return {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import TableSelector from '../../components/TableSelector';

const propTypes = {
queryEditor: PropTypes.object.isRequired,
height: PropTypes.number,
height: PropTypes.number.isRequired,
tables: PropTypes.array,
actions: PropTypes.object,
database: PropTypes.object,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ const propTypes = {
};

const defaultProps = {
label: null,
description: null,
onChange: () => {},
code: '{}',
};
Expand Down
5 changes: 5 additions & 0 deletions superset-frontend/src/components/Hotkeys.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,10 @@ const propTypes = {
placement: PropTypes.string,
};

const defaultProps = {
hotkeys: [],
};

export default class Hotkeys extends React.PureComponent {
componentDidMount() {
this.props.hotkeys.forEach(keyConfig => {
Expand Down Expand Up @@ -82,3 +86,4 @@ export default class Hotkeys extends React.PureComponent {
}

Hotkeys.propTypes = propTypes;
Hotkeys.defaultProps = defaultProps;
6 changes: 3 additions & 3 deletions superset-frontend/src/components/Select/OnPasteSelect.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,12 +81,12 @@ export default class OnPasteSelect extends React.Component {
}

OnPasteSelect.propTypes = {
separator: PropTypes.array,
separator: PropTypes.array.isRequired,
selectWrap: PropTypes.elementType,
selectRef: PropTypes.func,
onChange: PropTypes.func.isRequired,
valueKey: PropTypes.string,
labelKey: PropTypes.string,
valueKey: PropTypes.string.isRequired,
labelKey: PropTypes.string.isRequired,
options: PropTypes.array,
isMulti: PropTypes.bool,
value: PropTypes.any,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ import { getCategoricalSchemeRegistry, t } from '@superset-ui/core';
import ColorSchemeControl from 'src/explore/components/controls/ColorSchemeControl';

const propTypes = {
onChange: PropTypes.func,
onChange: PropTypes.func.isRequired,
colorScheme: PropTypes.string,
};

const defaultProps = {
onChange: () => {},
colorScheme: undefined,
onChange: () => {},
};

class ColorSchemeControlWrapper extends React.PureComponent {
Expand Down
17 changes: 16 additions & 1 deletion superset-frontend/src/dashboard/components/DashboardBuilder.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,14 +54,19 @@ const propTypes = {
dashboardLayout: PropTypes.object.isRequired,
deleteTopLevelTabs: PropTypes.func.isRequired,
editMode: PropTypes.bool.isRequired,
showBuilderPane: PropTypes.func.isRequired,
colorScheme: PropTypes.string,
setColorSchemeAndUnsavedChanges: PropTypes.func.isRequired,
handleComponentDrop: PropTypes.func.isRequired,
directPathToChild: PropTypes.arrayOf(PropTypes.string),
setDirectPathToChild: PropTypes.func.isRequired,
setMountedTab: PropTypes.func.isRequired,
};

const defaultProps = {
showBuilderPane: false,
directPathToChild: [],
colorScheme: undefined,
};

class DashboardBuilder extends React.Component {
Expand Down Expand Up @@ -150,7 +155,14 @@ class DashboardBuilder extends React.Component {
}

render() {
const { handleComponentDrop, dashboardLayout, editMode } = this.props;
const {
handleComponentDrop,
dashboardLayout,
editMode,
showBuilderPane,
setColorSchemeAndUnsavedChanges,
colorScheme,
} = this.props;
const { tabIndex } = this.state;
const dashboardRoot = dashboardLayout[DASHBOARD_ROOT_ID];
const rootChildId = dashboardRoot.children[0];
Expand Down Expand Up @@ -260,6 +272,9 @@ class DashboardBuilder extends React.Component {
{editMode && (
<BuilderComponentPane
topOffset={HEADER_HEIGHT + (topLevelTabs ? TABS_HEIGHT : 0)}
showBuilderPane={showBuilderPane}
setColorSchemeAndUnsavedChanges={setColorSchemeAndUnsavedChanges}
colorScheme={colorScheme}
/>
)}
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ import '../stylesheets/buttons.less';

const propTypes = {
dashboardId: PropTypes.number.isRequired,
show: PropTypes.bool,
show: PropTypes.bool.isRequired,
onHide: PropTypes.func,
colorScheme: PropTypes.object,
setColorSchemeAndUnsavedChanges: PropTypes.func,
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/src/dashboard/components/SliceAdder.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ const propTypes = {
lastUpdated: PropTypes.number.isRequired,
errorMessage: PropTypes.string,
userId: PropTypes.string.isRequired,
selectedSliceIds: PropTypes.arrayOf(PropTypes.number),
selectedSliceIds: PropTypes.arrayOf(PropTypes.number).isRequired,
editMode: PropTypes.bool,
height: PropTypes.number,
};
Expand Down
1 change: 1 addition & 0 deletions superset-frontend/src/dashboard/components/SliceHeader.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const propTypes = {
const defaultProps = {
innerRef: null,
forceRefresh: () => ({}),
removeSlice: () => ({}),
updateSliceName: () => ({}),
toggleExpandSlice: () => ({}),
exploreChart: () => ({}),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,10 @@ const propTypes = {
updateComponents: PropTypes.func.isRequired,
};

const defaultProps = {
rowHeight: null,
};

class Row extends React.PureComponent {
constructor(props) {
super(props);
Expand Down Expand Up @@ -188,5 +192,6 @@ class Row extends React.PureComponent {
}

Row.propTypes = propTypes;
Row.defaultProps = defaultProps;

export default Row;
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const propTypes = {
};

const defaultProps = {
children: null,
renderTabContent: true,
renderHoverMenu: true,
availableColumnCount: 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ const defaultProps = {
children: null,
disableClick: false,
onChangeFocus: null,
onPressDelete() {},
menuItems: [],
isFocused: false,
shouldFocus: (event, container) =>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import { connect } from 'react-redux';
import DashboardBuilder from '../components/DashboardBuilder';

import {
setColorSchemeAndUnsavedChanges,
showBuilderPane,
setDirectPathToChild,
setMountedTab,
Expand All @@ -34,7 +35,9 @@ function mapStateToProps({ dashboardLayout: undoableLayout, dashboardState }) {
return {
dashboardLayout: undoableLayout.present,
editMode: dashboardState.editMode,
showBuilderPane: dashboardState.showBuilderPane,
directPathToChild: dashboardState.directPathToChild,
colorScheme: dashboardState.colorScheme,
};
}

Expand All @@ -44,6 +47,7 @@ function mapDispatchToProps(dispatch) {
deleteTopLevelTabs,
handleComponentDrop,
showBuilderPane,
setColorSchemeAndUnsavedChanges,
setDirectPathToChild,
setMountedTab,
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const propTypes = {
const defaultProps = {
directPathToChild: [],
directPathLastUpdated: 0,
isComponentVisible: true,
};

function mapStateToProps(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const propTypes = {
const defaultProps = {
onStop: () => {},
onSave: () => {},
disabled: false,
};

// Prolly need to move this to a global context
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ const propTypes = {
choices: PropTypes.oneOfType([
PropTypes.arrayOf(PropTypes.array),
PropTypes.func,
]),
schemes: PropTypes.oneOfType([PropTypes.object, PropTypes.func]),
]).isRequired,
schemes: PropTypes.oneOfType([PropTypes.object, PropTypes.func]).isRequired,
isLinear: PropTypes.bool,
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export const DEFAULT_VIEWPORT = {
const PARAMS = ['longitude', 'latitude', 'zoom', 'bearing', 'pitch'];

const propTypes = {
onChange: PropTypes.func,
onChange: PropTypes.func.isRequired,
value: PropTypes.shape({
longitude: PropTypes.number,
latitude: PropTypes.number,
Expand Down

0 comments on commit 8fc6957

Please sign in to comment.