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(word cloud): series label format fixed for custom sql queries #23517

Merged
merged 3 commits into from
Mar 30, 2023
Merged

fix(word cloud): series label format fixed for custom sql queries #23517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
73a2761
type for series in legacy word cloud plugin is incorrect
ashgorithm Mar 29, 2023
dea60e3
used getColumnLabel util instead of writing new
ashgorithm Mar 30, 2023
6e02474
build fix for incompatible types
ashgorithm Mar 30, 2023
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
7 changes: 4 additions & 3 deletions superset-frontend/plugins/plugin-chart-word-cloud/src/legacyPlugin/transformProps.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

import { ChartProps } from '@superset-ui/core';
import { ChartProps, getColumnLabel } from '@superset-ui/core';
import { WordCloudProps, WordCloudEncoding } from '../chart/WordCloud';
import { LegacyWordCloudFormData } from './types';

Expand Down Expand Up @@ -47,10 +47,11 @@ export default function transformProps(chartProps: ChartProps): WordCloudProps {
} = formData as LegacyWordCloudFormData;

const metricLabel = getMetricLabel(metric);
const seriesLabel = getColumnLabel(series);

const encoding: Partial<WordCloudEncoding> = {
color: {
field: series,
field: seriesLabel,
scale: {
scheme: colorScheme,
},
Expand All @@ -68,7 +69,7 @@ export default function transformProps(chartProps: ChartProps): WordCloudProps {
type: 'quantitative',
},
text: {
field: series,
field: seriesLabel,
},
};

Expand Down
4 changes: 2 additions & 2 deletions superset-frontend/plugins/plugin-chart-word-cloud/src/legacyPlugin/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
* under the License.
*/

import { QueryFormData } from '@superset-ui/core';
import { QueryFormColumn, QueryFormData } from '@superset-ui/core';
import { RotationType } from '../chart/WordCloud';

export type LegacyWordCloudFormData = QueryFormData & {
colorScheme: string;
rotation?: RotationType;
series: string;
series: QueryFormColumn;
sizeFrom?: number;
sizeTo: number;
};
4 changes: 2 additions & 2 deletions superset-frontend/plugins/plugin-chart-word-cloud/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
* under the License.
*/

import { QueryFormData } from '@superset-ui/core';
import { QueryFormColumn, QueryFormData } from '@superset-ui/core';
import { WordCloudVisualProps } from './chart/WordCloud';

// FormData for wordcloud contains both common properties of all form data
// and properties specific to wordcloud visualization
export type WordCloudFormData = QueryFormData &
WordCloudVisualProps & {
series: string;
series: QueryFormColumn;
};