aminghadersohi commented on code in PR #42910: URL: https://github.com/apache/superset/pull/42910#discussion_r4336662101
########## superset-frontend/src/explore/components/controls/IntervalColorsControl/legacyColors.ts: ########## @@ -0,0 +1,64 @@ +/** + * 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 { getCategoricalSchemeRegistry } from '@superset-ui/core'; + +export const parseIntervalBounds = (intervals?: string): number[] => + (intervals ?? '') + .split(',') + .map(part => part.trim()) + .filter(part => part !== '') + .map(Number) + .filter(bound => Number.isFinite(bound)); + +/** + * Resolves the legacy `interval_color_indices` control (comma-separated, + * 1-indexed positions into the chosen categorical color scheme) into real + * hex colors, positionally matched to `bounds`. Shared by the control panel + * (display-only fallback while a legacy chart is being edited) and by + * `handleDeprecatedControls` (which migrates the value into `interval_colors` + * on load, since `interval_color_indices` is no longer a registered control + * and would otherwise be silently dropped on the next save). + */ +export const resolveLegacyIntervalColors = ( + bounds: number[], + legacyIntervalColorIndices: string | undefined, + colorScheme: string | undefined, +): string[] => { + // Non-strict lookup mirrors the Gauge renderer: an unregistered scheme + // falls back to the registry's default scheme. + const schemeColors = + getCategoricalSchemeRegistry().get(colorScheme)?.colors ?? []; Review Comment: With a 3-color scheme, intervals `50,100,150` and legacy indices `2,10`, editing only band 3 to `#123456` saves `["#1f77b4","#ff7f0e","#123456"]`. Untouched band 1 changes from `#ff7f0e` to `#1f77b4`, even without palette expansion. ########## superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/controlPanel.ts: ########## @@ -100,21 +125,24 @@ const config: ControlPanelConfig = { ], [ { - name: 'comparison_color_scheme', + name: 'increase_color', Review Comment: With `comparison_color_scheme: "Red"` and only `increase_color: "#336699"`, the migration leaves `decrease_color` absent. A control-serialization round trip drops the legacy scheme and changes decreases from Green to Red. ########## superset-frontend/plugins/plugin-chart-echarts/src/BigNumber/BigNumberPeriodOverPeriod/utils.ts: ########## @@ -74,3 +76,109 @@ export const getHeaderFontSize = (proportionValue: number) => export const getComparisonFontSize = (proportionValue: number) => comparisonFontSizesMapping[proportionValue] ?? sharedFontSizes[sharedFontSizes.length - 1]; + +export interface ComparisonColorTokens { + /** Color for the arrow indicator and (when the symbol is index 0) text. */ + text: string; + /** Background color for the increase/decrease pill. */ + background: string; + /** Foreground color for the increase/decrease pill's text. */ + strongText: string; +} + +/** + * Resolves the increase/decrease colors to use for rendering, given the + * chart's current `increaseColor` / `decreaseColor` (from the + * `ColorPickerControl`s added after this became customizable) and the + * legacy `comparisonColorScheme` field. + * + * Charts saved before `increaseColor` / `decreaseColor` existed only have + * `comparisonColorScheme`, a 2-choice select ('Green' | 'Red') where 'Green' + * meant "green for increase, red for decrease" and 'Red' meant the reverse. + * Both legacy choices map onto the same 'Green' | 'Red' semantic token names + * used by the new controls' presets, so resolving through it here + * reproduces the exact old behavior (including the reversed case) without a + * data migration. + */ +export const resolveComparisonColorKeys = ( + comparisonColorScheme: string | undefined, + increaseColor: string | undefined, + decreaseColor: string | undefined, +): { increaseColor: string; decreaseColor: string } => { + const legacyReversed = comparisonColorScheme === ColorSchemeEnum.Red; + return { + increaseColor: + increaseColor ?? + (legacyReversed ? ColorSchemeEnum.Red : ColorSchemeEnum.Green), + decreaseColor: + decreaseColor ?? + (legacyReversed ? ColorSchemeEnum.Green : ColorSchemeEnum.Red), + }; +}; + +/** + * Hex alpha suffix appended to a custom comparison color to build the pill + * background tint: 0x1A / 0xFF is roughly 10% opacity. + */ +export const COMPARISON_TINT_ALPHA_HEX = '1A'; + +/** + * Resolves a single color value (semantic token name or literal hex from + * the color picker) to the (arrow/text, background, strong-text) triad used + * across the comparison pills. 'Green' / 'Red' keep using the paired + * success/error theme tokens exactly as before these colors were + * customizable; any other value is either a theme token name (e.g. + * 'colorPrimary', emitted by the picker's `resolveThemeTokens` option) or a + * literal hex -- 6-digit, or 8-digit when the alpha-enabled picker is used + * -- in which case the background is a light (~10% opacity) tint of that + * same color. + */ +export const getComparisonColorTokens = ( + colorValue: string, + theme: SupersetTheme, +): ComparisonColorTokens => { + if (colorValue === ColorSchemeEnum.Green) { + return { + text: theme.colorSuccess, + background: theme.colorSuccessBg, + strongText: theme.colorSuccessText, + }; + } + if (colorValue === ColorSchemeEnum.Red) { + return { + text: theme.colorError, + background: theme.colorErrorBg, + strongText: theme.colorErrorText, + }; + } + const themeColors = theme as unknown as Record<string, string>; + const resolvedColor = Object.prototype.hasOwnProperty.call( + themeColors, + colorValue, + ) + ? themeColors[colorValue] + : colorValue; + // An 8-digit hex (alpha-enabled picker) already carries its own alpha + // channel; strip it before appending the tint suffix below so the + // background stays a valid 8-digit hex instead of stacking a second one. + const isEightDigitHex = /^#[0-9a-f]{8}$/i.test(resolvedColor); + const isSixDigitHex = /^#[0-9a-f]{6}$/i.test(resolvedColor); + // Non-hex theme tokens (e.g. an antd token resolving to an `rgba(...)` + // string) can't take a hex alpha suffix without producing invalid CSS, so + // pass those through unchanged rather than tinting them. + if (!isEightDigitHex && !isSixDigitHex) { + return { + text: resolvedColor, + background: resolvedColor, Review Comment: With `colorPrimary: "#369"`, `getComparisonColorTokens("colorPrimary", theme)` returns `#369` for text, background and strongText. Chromium computes identical foreground/background colors, hiding the comparison symbols. -- 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]
