MayUWish commented on a change in pull request #17944: URL: https://github.com/apache/superset/pull/17944#discussion_r788196733
########## File path: superset-frontend/src/SqlLab/components/QueryTable/index.tsx ########## @@ -29,133 +28,158 @@ import Button from 'src/components/Button'; import { fDuration } from 'src/modules/dates'; import Icons from 'src/components/Icons'; import { Tooltip } from 'src/components/Tooltip'; +import { Query } from 'src/SqlLab/types'; import ResultSet from '../ResultSet'; import ModalTrigger from '../../../components/ModalTrigger'; import HighlightedSql from '../HighlightedSql'; import { StaticPosition, verticalAlign, StyledTooltip } from './styles'; +import rootReducer from '../../reducers/index'; -const propTypes = { - columns: PropTypes.array, - actions: PropTypes.object, - queries: PropTypes.array, - onUserClicked: PropTypes.func, - onDbClicked: PropTypes.func, - displayLimit: PropTypes.number.isRequired, -}; -const defaultProps = { - columns: ['started', 'duration', 'rows'], - queries: [], - onUserClicked: () => {}, - onDbClicked: () => {}, -}; +// Acquire redux rootstate type, to be used in useSelector +type RootState = ReturnType<typeof rootReducer>; + +// query's type is original Query; Shallow-copy of query, q's type is QueryTableQuery. So that prop, sql passed to another component will remain string, the type of original Query +interface QueryTableQueryTemp1 extends Omit<Query, 'sql'> { + sql: string | Record<string, any>; +} + +interface QueryTableQueryTemp2 extends Omit<QueryTableQueryTemp1, 'progress'> { + progress: number | Record<string, any>; +} -const openQuery = id => { +interface QueryTableQuery extends Omit<QueryTableQueryTemp2, 'state'> { + state: string | Record<string, any>; +} + +interface QueryTableProps { + columns: Array<string>; + actions: Record<string, any>; + queries: Query[]; + onUserClicked?: Function; + onDbClicked?: Function; + displayLimit: number; +} + +const openQuery = (id: number) => { const url = `/superset/sqllab?queryId=${id}`; window.open(url); }; -const QueryTable = props => { +const QueryTable = ({ + columns = ['started', 'duration', 'rows'], + actions, Review comment: The error, 'Cannot destructure property 'queryEditorSetSql' of 'actions' as it is undefined' happens when the test is run. Please see the error message that I have in the attached screenshot for the commented out destructure.  . -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: notifications-unsubscr...@superset.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org --------------------------------------------------------------------- To unsubscribe, e-mail: notifications-unsubscr...@superset.apache.org For additional commands, e-mail: notifications-h...@superset.apache.org