lyndsiWilliams commented on code in PR #21186:
URL: https://github.com/apache/superset/pull/21186#discussion_r956431410
##########
superset-frontend/src/SqlLab/components/ResultSet/index.tsx:
##########
@@ -414,193 +384,191 @@ export default class ResultSet extends
React.PureComponent<
)}
</ReturnedRows>
);
+ };
+
+ const limitReached = query?.results?.displayLimitReached;
+ let sql;
+ let exploreDBId = query.dbId;
+ if (database?.explore_database_id) {
+ exploreDBId = database.explore_database_id;
}
- render() {
- const { query } = this.props;
- const limitReached = query?.results?.displayLimitReached;
- let sql;
- let exploreDBId = query.dbId;
- if (this.props.database && this.props.database.explore_database_id) {
- exploreDBId = this.props.database.explore_database_id;
- }
- let trackingUrl;
- if (
- query.trackingUrl &&
- query.state !== 'success' &&
- query.state !== 'fetching'
- ) {
- trackingUrl = (
- <Button
- className="sql-result-track-job"
- buttonSize="small"
- href={query.trackingUrl}
- target="_blank"
- >
- {query.state === 'running' ? t('Track job') : t('See query details')}
- </Button>
- );
- }
+ let trackingUrl;
+ if (
+ query.trackingUrl &&
+ query.state !== 'success' &&
+ query.state !== 'fetching'
+ ) {
+ trackingUrl = (
+ <Button
+ className="sql-result-track-job"
+ buttonSize="small"
+ href={query.trackingUrl}
+ target="_blank"
+ >
+ {query.state === 'running' ? t('Track job') : t('See query details')}
+ </Button>
+ );
+ }
- if (this.props.showSql) sql = <HighlightedSql sql={query.sql} />;
+ if (showSql) {
+ sql = <HighlightedSql sql={query.sql} />;
+ }
+
+ if (query.state === 'stopped') {
+ return <Alert type="warning" message={t('Query was stopped')} />;
+ }
- if (query.state === 'stopped') {
- return <Alert type="warning" message={t('Query was stopped')} />;
+ if (query.state === 'failed') {
+ return (
+ <ResultlessStyles>
+ <ErrorMessageWithStackTrace
+ title={t('Database error')}
+ error={query?.errors?.[0]}
+ subtitle={<MonospaceDiv>{query.errorMessage}</MonospaceDiv>}
+ copyText={query.errorMessage || undefined}
+ link={query.link}
+ source="sqllab"
+ />
+ {trackingUrl}
+ </ResultlessStyles>
+ );
+ }
+
+ if (query.state === 'success' && query.ctas) {
+ const { tempSchema, tempTable } = query;
+ let object = 'Table';
+ if (query.ctas_method === CtasEnum.VIEW) {
+ object = 'View';
}
- if (query.state === 'failed') {
- return (
- <ResultlessStyles>
- <ErrorMessageWithStackTrace
- title={t('Database error')}
- error={query?.errors?.[0]}
- subtitle={<MonospaceDiv>{query.errorMessage}</MonospaceDiv>}
- copyText={query.errorMessage || undefined}
- link={query.link}
- source="sqllab"
- />
- {trackingUrl}
- </ResultlessStyles>
- );
+ return (
+ <div>
+ <Alert
+ type="info"
+ message={
+ <>
+ {t(object)} [
+ <strong>
+ {tempSchema ? `${tempSchema}.` : ''}
+ {tempTable}
+ </strong>
+ ] {t('was created')}
+ <ButtonGroup>
+ <Button
+ buttonSize="small"
+ className="m-r-5"
+ onClick={() => popSelectStar(tempSchema, tempTable)}
+ >
+ {t('Query in a new tab')}
+ </Button>
+ <ExploreCtasResultsButton
+ // @ts-ignore Redux types are difficult to work with,
ignoring for now
+ actions={actions}
+ table={tempTable}
+ schema={tempSchema}
+ dbId={exploreDBId}
+ />
+ </ButtonGroup>
+ </>
+ }
+ />
+ </div>
+ );
+ }
+
+ if (query.state === 'success' && query.results) {
+ const { results } = query;
+ // Accounts for offset needed for height of ResultSetRowsReturned
component if !limitReached
+ const rowMessageHeight = !limitReached ? 32 : 0;
+ // Accounts for offset needed for height of Alert if this.state.alertIsOpen
+ const alertContainerHeight = 70;
+ // We need to calculate the height of this.renderRowsReturned()
+ // if we want results panel to be proper height because the
+ // FilterTable component needs an explicit height to render
+ // react-virtualized Table component
+ const rowsHeight = alertIsOpen
+ ? height - alertContainerHeight
+ : height - rowMessageHeight;
+ let data;
+ if (cache && query.cached) {
+ data = cachedData;
+ } else if (results && results.data) {
+ ({ data } = results);
}
- if (query.state === 'success' && query.ctas) {
- const { tempSchema, tempTable } = query;
- let object = 'Table';
- if (query.ctas_method === CtasEnum.VIEW) {
- object = 'View';
- }
+ if (data && data.length > 0) {
+ const expandedColumns = results.expanded_columns
+ ? results.expanded_columns.map(col => col.name)
+ : [];
return (
- <div>
- <Alert
- type="info"
- message={
- <>
- {t(object)} [
- <strong>
- {tempSchema ? `${tempSchema}.` : ''}
- {tempTable}
- </strong>
- ] {t('was created')}
- <ButtonGroup>
- <Button
- buttonSize="small"
- className="m-r-5"
- onClick={() => this.popSelectStar(tempSchema, tempTable)}
- >
- {t('Query in a new tab')}
- </Button>
- <ExploreCtasResultsButton
- // @ts-ignore Redux types are difficult to work with,
ignoring for now
- actions={this.props.actions}
- table={tempTable}
- schema={tempSchema}
- dbId={exploreDBId}
- />
- </ButtonGroup>
- </>
- }
+ <>
+ {renderControls()}
+ {renderRowsReturned()}
+ {sql}
+ <FilterableTable
+ data={data}
+ orderedColumnKeys={results.columns.map(col => col.name)}
+ height={rowsHeight}
+ filterText={searchText}
+ expandedColumns={expandedColumns}
/>
- </div>
+ </>
);
}
- if (query.state === 'success' && query.results) {
- const { results } = query;
- // Accounts for offset needed for height of ResultSetRowsReturned
component if !limitReached
- const rowMessageHeight = !limitReached ? 32 : 0;
- // Accounts for offset needed for height of Alert if
this.state.alertIsOpen
- const alertContainerHeight = 70;
- // We need to calculate the height of this.renderRowsReturned()
- // if we want results panel to be propper height because the
- // FilterTable component nedds an explcit height to render
- // react-virtualized Table component
- const height = this.state.alertIsOpen
- ? this.props.height - alertContainerHeight
- : this.props.height - rowMessageHeight;
- let data;
- if (this.props.cache && query.cached) {
- ({ data } = this.state);
- } else if (results && results.data) {
- ({ data } = results);
- }
- if (data && data.length > 0) {
- const expandedColumns = results.expanded_columns
- ? results.expanded_columns.map(col => col.name)
- : [];
- return (
- <>
- {this.renderControls()}
- {this.renderRowsReturned()}
- {sql}
- <FilterableTable
- data={data}
- orderedColumnKeys={results.columns.map(col => col.name)}
- height={height}
- filterText={this.state.searchText}
- expandedColumns={expandedColumns}
- />
- </>
- );
- }
- if (data && data.length === 0) {
- return (
- <Alert type="warning" message={t('The query returned no data')} />
- );
- }
+ if (data && data.length === 0) {
Review Comment:
This is also fine as is
--
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]
