Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(sql lab): NULL styling in grid cell #17385

Merged
merged 5 commits into from
Nov 15, 2021
Merged

fix(sql lab): NULL styling in grid cell #17385

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e2d90e1
Fix NULL styling in gridCell
lyndsiWilliams Nov 9, 2021
6531f00
removed unnecessary imports
lyndsiWilliams Nov 9, 2021
2f15204
Added null styling back to renderGridCell
lyndsiWilliams Nov 10, 2021
c4186f4
Cleaned up a little code as per Elizabeth
lyndsiWilliams Nov 10, 2021
4d5f1ec
Found another little cleanup spot
lyndsiWilliams Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions superset-frontend/src/components/FilterableTable/FilterableTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,14 +426,7 @@ export default class FilterableTable extends PureComponent<
}) {
const columnKey = this.props.orderedColumnKeys[columnIndex];
const cellData = this.list[rowIndex][columnKey];
const content =
cellData === null ? (
<i className="text-muted">
{this.getCellContent({ cellData, columnKey })}
</i>
) : (
this.getCellContent({ cellData, columnKey })
);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we still need this if the table has more than 50 columns? (i.e., renders a grid?)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe we could just move the logic to getCellContent?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops, good catch! Added it back in this commit.

My initial attempt was to add this logic to getCellContent, but that function needs to get just the text content of each cell, it doesn't like components. It uses the text to get the width of the columns. I tried working around the function to get it to accept elements too but I couldn't find a way, since it needs to output just a string of what's inside the cell for sizing purposes.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you confirm that it also works with more than 50 columns?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've updated the description with screenshots for table and grid

const content = this.getCellContent({ cellData, columnKey });
const cellNode = (
<div
key={key}
Expand Down Expand Up @@ -530,12 +523,19 @@ export default class FilterableTable extends PureComponent<
cellData: CellDataType;
columnKey: string;
}) {
const cellNode = this.getCellContent({ cellData, columnKey });
const content =
cellData === null ? (
<i className="text-muted">
{this.getCellContent({ cellData, columnKey })}
</i>
) : (
this.getCellContent({ cellData, columnKey })
);
const jsonObject = safeJsonObjectParse(cellData);
if (jsonObject) {
return this.addJsonModal(cellNode, jsonObject, cellData);
return this.addJsonModal(content, jsonObject, cellData);
}
return cellNode;
return content;
}

renderTable() {
Expand Down