-
Notifications
You must be signed in to change notification settings - Fork 1
Fix I18nLabel objects rendered as React children causing 11 CI test failures #880
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.
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
Merged
hotlong
merged 3 commits into
main
from
copilot/fix-ci-errors-a2dfe0e6-f121-49c7-b4ed-39b43102d39e
Feb 27, 2026
+42
−25
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -13,6 +13,13 @@ import { forwardRef, useState, useEffect, useCallback, useRef } from 'react'; | |
| import { RefreshCw } from 'lucide-react'; | ||
| import { isObjectProvider } from './utils'; | ||
|
|
||
| /** Resolve an I18nLabel (string or {key, defaultValue}) to a plain string. */ | ||
| function resolveLabel(label: string | { key?: string; defaultValue?: string } | undefined): string | undefined { | ||
| if (label === undefined || label === null) return undefined; | ||
| if (typeof label === 'string') return label; | ||
| return label.defaultValue || label.key; | ||
| } | ||
|
Comment on lines
+16
to
+21
|
||
|
|
||
| // Color palette for charts | ||
| const CHART_COLORS = [ | ||
| 'hsl(var(--chart-1))', | ||
|
|
@@ -248,7 +255,8 @@ export const DashboardRenderer = forwardRef<HTMLDivElement, DashboardRendererPro | |
|
|
||
| const componentSchema = getComponentSchema(); | ||
| const isSelfContained = widget.type === 'metric'; | ||
| const widgetKey = widget.id || widget.title || `widget-${index}`; | ||
| const resolvedTitle = resolveLabel(widget.title); | ||
| const widgetKey = widget.id || resolvedTitle || `widget-${index}`; | ||
| const isSelected = designMode && selectedWidgetId === widget.id; | ||
|
|
||
| const designModeProps = designMode ? { | ||
|
|
@@ -257,7 +265,7 @@ export const DashboardRenderer = forwardRef<HTMLDivElement, DashboardRendererPro | |
| role: 'button' as const, | ||
| tabIndex: 0, | ||
| 'aria-selected': isSelected, | ||
| 'aria-label': `Widget: ${widget.title || `Widget ${index + 1}`}`, | ||
| 'aria-label': `Widget: ${resolvedTitle || `Widget ${index + 1}`}`, | ||
| onClick: (e: React.MouseEvent) => handleWidgetClick(e, widget.id), | ||
| onKeyDown: (e: React.KeyboardEvent) => handleWidgetKeyDown(e, widget.id, index), | ||
| } : {}; | ||
|
|
@@ -305,10 +313,10 @@ export const DashboardRenderer = forwardRef<HTMLDivElement, DashboardRendererPro | |
| }: undefined} | ||
| {...designModeProps} | ||
| > | ||
| {widget.title && ( | ||
| {resolvedTitle && ( | ||
| <CardHeader className="pb-2 border-b border-border/40 bg-muted/20 px-3 sm:px-6"> | ||
| <CardTitle className="text-sm sm:text-base font-medium tracking-tight truncate" title={widget.title}> | ||
| {widget.title} | ||
| <CardTitle className="text-sm sm:text-base font-medium tracking-tight truncate" title={resolvedTitle}> | ||
| {resolvedTitle} | ||
| </CardTitle> | ||
| </CardHeader> | ||
| )} | ||
|
|
@@ -325,10 +333,10 @@ export const DashboardRenderer = forwardRef<HTMLDivElement, DashboardRendererPro | |
| const headerSection = schema.header && ( | ||
| <div className="col-span-full mb-4"> | ||
| {schema.header.showTitle !== false && schema.title && ( | ||
| <h2 className="text-lg font-semibold tracking-tight">{schema.title}</h2> | ||
| <h2 className="text-lg font-semibold tracking-tight">{resolveLabel(schema.title)}</h2> | ||
| )} | ||
| {schema.header.showDescription !== false && schema.description && ( | ||
| <p className="text-sm text-muted-foreground mt-1">{schema.description}</p> | ||
| <p className="text-sm text-muted-foreground mt-1">{resolveLabel(schema.description)}</p> | ||
| )} | ||
| {schema.header.actions && schema.header.actions.length > 0 && ( | ||
| <div className="flex gap-2 mt-3"> | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The updated label type check treats
nullas an object (typeof null === 'object'). SincetoBeDefined()doesn’t exclude null, this test can behave unexpectedly. Consider explicitly assertingapp.label/app.descriptionare not null before the object-shape checks (and optionally thatkeyis a string).