-
Notifications
You must be signed in to change notification settings - Fork 13.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: Adds the ECharts Heatmap chart (#25353)
- Loading branch information
1 parent
d69a187
commit 546d48a
Showing
23 changed files
with
929 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
30 changes: 30 additions & 0 deletions
30
superset-frontend/packages/superset-ui-chart-controls/src/operators/rankOperator.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitationsxw | ||
| * under the License. | ||
| */ | ||
| import { PostProcessingRank } from '@superset-ui/core'; | ||
| import { PostProcessingFactory } from './types'; | ||
|
|
||
| /* eslint-disable @typescript-eslint/no-unused-vars */ | ||
| export const rankOperator: PostProcessingFactory<PostProcessingRank> = ( | ||
| formData, | ||
| queryObject, | ||
| options, | ||
| ) => ({ | ||
| operation: 'rank', | ||
| options, | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 47 additions & 0 deletions
47
superset-frontend/packages/superset-ui-chart-controls/test/operators/rankOperator.test.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import { QueryObject, SqlaFormData } from '@superset-ui/core'; | ||
| import { rankOperator } from '@superset-ui/chart-controls'; | ||
|
|
||
| const formData: SqlaFormData = { | ||
| x_axis: 'dttm', | ||
| metrics: ['sales'], | ||
| groupby: ['department'], | ||
| time_range: '2015 : 2016', | ||
| granularity: 'month', | ||
| datasource: 'foo', | ||
| viz_type: 'table', | ||
| truncate_metric: true, | ||
| }; | ||
| const queryObject: QueryObject = { | ||
| is_timeseries: true, | ||
| metrics: ['sales'], | ||
| columns: ['department'], | ||
| time_range: '2015 : 2016', | ||
| granularity: 'month', | ||
| post_processing: [], | ||
| }; | ||
|
|
||
| test('should add rankOperator', () => { | ||
| const options = { metric: 'sales', group_by: 'department' }; | ||
| expect(rankOperator(formData, queryObject, options)).toEqual({ | ||
| operation: 'rank', | ||
| options, | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
33 changes: 33 additions & 0 deletions
33
superset-frontend/plugins/plugin-chart-echarts/src/Heatmap/Heatmap.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import React from 'react'; | ||
| import { HeatmapTransformedProps } from './types'; | ||
| import Echart from '../components/Echart'; | ||
|
|
||
| export default function Heatmap(props: HeatmapTransformedProps) { | ||
| const { height, width, echartOptions, refs } = props; | ||
| return ( | ||
| <Echart | ||
| refs={refs} | ||
| height={height} | ||
| width={width} | ||
| echartOptions={echartOptions} | ||
| /> | ||
| ); | ||
| } |
68 changes: 68 additions & 0 deletions
68
superset-frontend/plugins/plugin-chart-echarts/src/Heatmap/buildQuery.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /** | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import { | ||
| QueryFormColumn, | ||
| QueryFormOrderBy, | ||
| buildQueryContext, | ||
| ensureIsArray, | ||
| getColumnLabel, | ||
| getMetricLabel, | ||
| getXAxisColumn, | ||
| } from '@superset-ui/core'; | ||
| import { rankOperator } from '@superset-ui/chart-controls'; | ||
| import { HeatmapFormData } from './types'; | ||
|
|
||
| export default function buildQuery(formData: HeatmapFormData) { | ||
| const { groupby, normalize_across, sort_x_axis, sort_y_axis, x_axis } = | ||
| formData; | ||
| const metric = getMetricLabel(formData.metric); | ||
| const columns = [ | ||
| ...ensureIsArray(getXAxisColumn(formData)), | ||
| ...ensureIsArray(groupby), | ||
| ]; | ||
| const orderby: QueryFormOrderBy[] = [ | ||
| [ | ||
| sort_x_axis.includes('value') ? metric : columns[0], | ||
| sort_x_axis.includes('asc'), | ||
| ], | ||
| [ | ||
| sort_y_axis.includes('value') ? metric : columns[1], | ||
| sort_y_axis.includes('asc'), | ||
| ], | ||
| ]; | ||
| const group_by = | ||
| normalize_across === 'x' | ||
| ? getColumnLabel(x_axis) | ||
| : normalize_across === 'y' | ||
| ? getColumnLabel(groupby as unknown as QueryFormColumn) | ||
| : undefined; | ||
| return buildQueryContext(formData, baseQueryObject => [ | ||
| { | ||
| ...baseQueryObject, | ||
| columns, | ||
| orderby, | ||
| post_processing: [ | ||
| rankOperator(formData, baseQueryObject, { | ||
| metric, | ||
| group_by, | ||
| }), | ||
| ], | ||
| }, | ||
| ]); | ||
| } |
Oops, something went wrong.