EnxDev commented on code in PR #33159:
URL: https://github.com/apache/superset/pull/33159#discussion_r2054309663
##########
superset-frontend/src/components/Datasource/CollectionTable.tsx:
##########
@@ -113,6 +56,32 @@ const StyledButtonWrapper = styled.span`
`}
`;
+type CollectionItem = { id: string | number; [key: string]: any };
Review Comment:
Would it be possible to define a more specific type here if we had better
knowledge of the properties, to avoid `any` type?
I noticed there are quite a few other any types in the code — can we try to
avoid them as well?
##########
superset-frontend/src/components/Datasource/CollectionTable.tsx:
##########
@@ -331,109 +276,114 @@ export default class CRUDCollection extends
PureComponent<
);
}
- getCellProps(record: any, col: any) {
- const cellPropsFn = this.props.itemCellProps?.[col];
- const val = record[col];
- return cellPropsFn ? cellPropsFn(val, this.getLabel(col), record) : {};
- }
-
- renderCell(record: any, col: any) {
+ renderCell(record: any, col: any): ReactNode {
const renderer = this.props.itemRenderers?.[col];
const val = record[col];
const onChange = this.onCellChange.bind(this, record.id, col);
return renderer ? renderer(val, onChange, this.getLabel(col), record) :
val;
}
- renderItem(record: any) {
- const { allowAddItem, allowDeletes, expandFieldset, tableColumns } =
- this.props;
- /* eslint-disable no-underscore-dangle */
- const isExpanded =
- !!this.state.expandedColumns[record.id] || record.__expanded;
- let tds = [];
- if (expandFieldset) {
- tds.push(
- <td key="__expand" className="expand">
- <i
- role="button"
- aria-label="Toggle expand"
- tabIndex={0}
- // TODO: Remove fa-icon
- // eslint-disable-next-line icons/no-fa-icons-usage
- className={`fa fa-caret-${
- isExpanded ? 'down' : 'right'
- } text-primary pointer`}
- onClick={this.toggleExpand.bind(this, record.id)}
- />
- </td>,
- );
- }
- tds = tds.concat(
- tableColumns.map(col => (
- <td {...this.getCellProps(record, col)} key={col}>
- {this.renderCell(record, col)}
- </td>
- )),
- );
- if (allowAddItem) {
- tds.push(<td key="add" aria-label="Add" />);
- }
+ buildTableColumns() {
+ const { tableColumns, allowDeletes, sortColumns = [] } = this.props;
+
+ const antdColumns = tableColumns.map(col => {
+ const label = this.getLabel(col);
+ const tooltip = this.getTooltip(col);
+ const isSortable = sortColumns.includes(col);
+ const currentSortOrder: SortOrder | null | undefined =
+ this.state.sortColumn === col
+ ? this.state.sort === 1
+ ? 'ascend'
+ : this.state.sort === 2
+ ? 'descend'
+ : null
+ : null;
+
+ return {
+ key: col,
+ dataIndex: col,
+ title: (
+ <>
+ {label}
+ {tooltip && (
+ <>
+ {' '}
+ <InfoTooltipWithTrigger
+ label={t('description')}
+ tooltip={tooltip}
+ placement="top"
+ />
+ </>
+ )}
+ </>
+ ),
Review Comment:
here as well
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
