This is an automated email from the ASF dual-hosted git repository. arivero pushed a commit to branch table-time-comparison in repository https://gitbox.apache.org/repos/asf/superset.git
commit c2f26f0f4a6c407d6b5d8e48dded5551ce3d0bc1 Author: Kamil Gabryjelski <[email protected]> AuthorDate: Mon Mar 11 14:21:44 2024 +0100 fix --- .../components/controls/ComparisonRangeLabel.tsx | 31 +++++++++++----------- superset/views/api.py | 14 +++++----- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/superset-frontend/src/explore/components/controls/ComparisonRangeLabel.tsx b/superset-frontend/src/explore/components/controls/ComparisonRangeLabel.tsx index 854f17ffb9..b2ec6da3b1 100644 --- a/superset-frontend/src/explore/components/controls/ComparisonRangeLabel.tsx +++ b/superset-frontend/src/explore/components/controls/ComparisonRangeLabel.tsx @@ -83,19 +83,20 @@ export const ComparisonRangeLabel = () => { } }, [currentTimeRangeFilters, shift]); - return labels.length - ? labels.map((label, index) => ( - <Tooltip title={t('Actual time range for comparison')} key={index}> - <div - css={theme => css` - font-size: ${theme.typography.sizes.m}px; - color: ${theme.colors.grayscale.dark1}; - `} - > - {label} - {index < labels.length - 1 ? ',' : ''} - </div> - </Tooltip> - )) - : null; + return labels.length ? ( + <Tooltip title={t('Actual time range for comparison')}> + {labels.map((label, index) => ( + <div + css={theme => css` + font-size: ${theme.typography.sizes.m}px; + color: ${theme.colors.grayscale.dark1}; + `} + key={index} + > + {label} + {index < labels.length - 1 ? ',' : ''} + </div> + ))} + </Tooltip> + ) : null; }; diff --git a/superset/views/api.py b/superset/views/api.py index f7bd58d321..3197ed13ce 100644 --- a/superset/views/api.py +++ b/superset/views/api.py @@ -127,12 +127,14 @@ class Api(BaseSupersetView): since, until = get_since_until( time_range=base_time_range, instant_time_comparison_range=shift ) - result = { - "since": since.isoformat() if since else "", - "until": until.isoformat() if until else "", - "baseTimeRange": base_time_range, - "shift": shift, - } + result = [ + { + "since": since.isoformat() if since else "", + "until": until.isoformat() if until else "", + "baseTimeRange": base_time_range, + "shift": shift, + } + ] return self.json_response({"result": result}) except (ValueError, TimeRangeParseFailError, TimeRangeAmbiguousError) as error: error_msg = {"message": _("Unexpected time range: %(error)s", error=error)}
