bito-code-review[bot] commented on code in PR #42910: URL: https://github.com/apache/superset/pull/42910#discussion_r4153176292
########## superset-frontend/src/explore/components/controls/IntervalColorsControl/legacyColors.ts: ########## @@ -0,0 +1,60 @@ +/** + * 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[] => { + const schemeColors = + getCategoricalSchemeRegistry().get(colorScheme)?.colors ?? []; + const indices = (legacyIntervalColorIndices ?? '') + .split(',') + .map(part => part.trim()) + .map(part => (part === '' ? NaN : Number(part))); + return bounds.map((_, index) => { + const legacyIndex = indices[index]; + if (schemeColors.length === 0) return ''; + if (Number.isFinite(legacyIndex)) { + return schemeColors[ + (((legacyIndex - 1) % schemeColors.length) + schemeColors.length) % + schemeColors.length + ]; + } + return schemeColors[index % schemeColors.length]; Review Comment: <!-- Bito Reply --> The fix correctly addresses the issue by ensuring the fallback logic only counts entries that lack a legacy index, rather than using the absolute position of the bound. This adjustment aligns the resolution logic with the migration test expectations, preventing the color misalignment in legacy Gauge charts. **superset-frontend/src/explore/components/controls/IntervalColorsControl/legacyColors.ts** ``` if (Number.isFinite(legacyIndex)) { return schemeColors[ (((legacyIndex - 1) % schemeColors.length) + schemeColors.length) % schemeColors.length ]; } return schemeColors[index % schemeColors.length]; ``` ########## superset-frontend/src/explore/components/controls/IntervalColorsControl/index.tsx: ########## @@ -0,0 +1,94 @@ +/** + * 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 { t } from '@apache-superset/core/translation'; +import { getCategoricalSchemeRegistry } from '@superset-ui/core'; +import ControlHeader from '../../ControlHeader'; +import ColorPickerControl from '../ColorPickerControl'; +import type { ColorPickerValue } from '../ColorPickerControl'; +import { + RangeRow as IntervalRow, + RangeLabel as BoundLabel, + replaceColorAtIndex, +} from '../shared/RangeColorRow'; +import { IntervalColorsControlProps } from './types'; +import { + parseIntervalBounds as parseBounds, + resolveLegacyIntervalColors as resolveLegacyColors, +} from './legacyColors'; + +/** + * Per-interval color editor for the Gauge chart. Row *count* is driven by + * the sibling `intervals` control (one row per parsed upper bound) so bound + * values keep a single source of truth; this control only owns colors, + * stored as an array of hex strings positionally matched to those bounds. + */ +export default function IntervalColorsControl({ + value, + onChange, + intervals, + legacyIntervalColorIndices, + colorScheme, + ...headerProps +}: IntervalColorsControlProps) { + const bounds = parseBounds(intervals); + const legacyColors = resolveLegacyColors( + bounds, + legacyIntervalColorIndices, + colorScheme, + ); + const schemeColors = + getCategoricalSchemeRegistry().get(colorScheme)?.colors ?? []; + + const colorAt = (index: number): string => + value?.[index] || + legacyColors[index] || + schemeColors[index % (schemeColors.length || 1)] || + ''; + + const handleColorChange = (index: number) => (color: ColorPickerValue) => { + if (typeof color !== 'string') return; + onChange?.(replaceColorAtIndex(bounds.length, index, color, colorAt)); + }; Review Comment: <!-- Bito Reply --> This is a clear and appropriate way to address the reviewer's concern. By adding the `isRangesInputComplete` guard and disabling the picker, you ensure that the color mapping remains consistent and prevents positional misalignment during transient edits. ########## superset-frontend/plugins/plugin-chart-echarts/test/Bullet/utils.test.ts: ########## @@ -0,0 +1,49 @@ +/** + * 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 { + isRangesInputComplete, + tokenizeToNumericArray, +} from '../../src/Bullet/utils'; + +test('tokenizeToNumericArray drops blank tokens, including an embedded one', () => { + expect(tokenizeToNumericArray('20,40,60')).toEqual([20, 40, 60]); + expect(tokenizeToNumericArray('20,,60')).toEqual([20, 60]); + expect(tokenizeToNumericArray('')).toBeNull(); + expect(tokenizeToNumericArray(undefined)).toBeNull(); +}); Review Comment: <!-- Bito Reply --> The suggestion is appropriate as it improves test coverage for the `tokenizeToNumericArray` utility. By explicitly testing the handling of non-numeric tokens, non-finite values, and whitespace trimming, you ensure that the function's filtering and mapping logic remains robust against future regressions. **superset-frontend/plugins/plugin-chart-echarts/test/Bullet/utils.test.ts** ``` test('tokenizeToNumericArray drops blank tokens, including an embedded one', () => { expect(tokenizeToNumericArray('20,40,60')).toEqual([20, 40, 60]); expect(tokenizeToNumericArray('20,,60')).toEqual([20, 60]); expect(tokenizeToNumericArray('')).toBeNull(); expect(tokenizeToNumericArray(undefined)).toBeNull(); }); ``` -- 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]
