Skip to content

Enhanced ChatGPT Clone: Features Agents, MCP, Skills, DeepSeek, Anthropic, AWS, OpenAI, Responses API, Azure, Groq, o1, GPT-5, Mistral, OpenRouter, Vertex AI, Gemini, Artifacts, AI model switching, message search, Code Interpreter, langchain, DALL-E-3, OpenAPI Actions, Functions, Secure Multi-User Auth, Presets, open-source for self-hosting. Active

🏷️ refactor: Drop Redundant Label Ink Overrides in Panels- #16830 (#16830)

Marco Beretta2eb35fb1502e
diff --git a/client/src/components/Prompts/lists/ListCard.tsx b/client/src/components/Prompts/lists/ListCard.tsx
index 101809aa3c..9dbc05f2c8 100644
--- a/client/src/components/Prompts/lists/ListCard.tsx
+++ b/client/src/components/Prompts/lists/ListCard.tsx
@@ -43,7 +43,7 @@ export default function ListCard({
<CategoryIcon category={category} className="icon-md shrink-0" aria-hidden="true" />
<Label
id={titleId}
- className="text-text-primary min-w-0 truncate text-sm font-medium select-none"
+ className="min-w-0 truncate text-sm font-medium select-none"
title={name}
>
{name}
diff --git a/client/src/components/SidePanel/Agents/Version/VersionItem.tsx b/client/src/components/SidePanel/Agents/Version/VersionItem.tsx
index e2035da4ba..42a8603818 100644
--- a/client/src/components/SidePanel/Agents/Version/VersionItem.tsx
+++ b/client/src/components/SidePanel/Agents/Version/VersionItem.tsx
@@ -180,7 +180,7 @@ export default function VersionItem({
className="max-w-[28.125rem]"
main={
<div className="flex w-full flex-col gap-3 text-sm">
- <Label className="text-text-primary text-left font-medium">
+ <Label className="text-left font-medium">
{localize('com_ui_agent_version_restore_description')}
</Label>
<div className="border-border-light bg-surface-secondary rounded-lg border px-3 py-2">
diff --git a/client/src/components/SidePanel/Builder/ActionCallback.tsx b/client/src/components/SidePanel/Builder/ActionCallback.tsx
index bf676acdb2..3e03405124 100644
--- a/client/src/components/SidePanel/Builder/ActionCallback.tsx
+++ b/client/src/components/SidePanel/Builder/ActionCallback.tsx
@@ -19,7 +19,7 @@ export default function ActionCallback({ action_id }: { action_id?: string }) {
return (
<div className="flex flex-col gap-1.5">
- <Label htmlFor="oauth-callback-url" className="text-sm font-medium text-text-primary">
+ <Label htmlFor="oauth-callback-url" className="text-sm font-medium">
{localize('com_ui_callback_url')}
</Label>
<div className="relative">
@@ -31,14 +31,14 @@ export default function ActionCallback({ action_id }: { action_id?: string }) {
value={callbackURL}
aria-label={localize('com_ui_callback_url')}
onFocus={(event) => event.currentTarget.select()}
- className="pr-10 text-text-secondary"
+ className="text-text-secondary pr-10"
/>
<CopyButton
iconOnly
isCopied={isCopied}
onClick={() => copyCallbackURL(setIsCopied)}
label={localize('com_ui_copy_link')}
- className="absolute right-1 top-1/2 -translate-y-1/2"
+ className="absolute top-1/2 right-1 -translate-y-1/2"
/>
</div>
</div>
diff --git a/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx b/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx
index 06a078c917..07741fcbe7 100644
--- a/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx
+++ b/client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx
@@ -113,7 +113,7 @@ export default function MemoryCreateDialog({
main={
<div className="space-y-4">
<div className="space-y-2">
- <Label htmlFor="memory-key" className="text-text-primary text-sm font-medium">
+ <Label htmlFor="memory-key" className="text-sm font-medium">
{localize('com_ui_key')}
</Label>
<Input
@@ -135,7 +135,7 @@ export default function MemoryCreateDialog({
/>
</div>
<div className="space-y-2">
- <Label htmlFor="memory-value" className="text-text-primary text-sm font-medium">
+ <Label htmlFor="memory-value" className="text-sm font-medium">
{localize('com_ui_value')}
</Label>
<Textarea
diff --git a/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx b/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
index 62fc40b1cc..c72e9b2d2e 100644
--- a/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
+++ b/client/src/components/SidePanel/Memories/MemoryEditDialog.tsx
@@ -183,7 +183,7 @@ export default function MemoryEditDialog({
{/* Key input */}
<div className="space-y-2">
- <Label htmlFor="memory-key" className="text-text-primary text-sm font-medium">
+ <Label htmlFor="memory-key" className="text-sm font-medium">
{localize('com_ui_key')}
</Label>
<Input
@@ -208,7 +208,7 @@ export default function MemoryEditDialog({
{/* Value textarea */}
<div className="space-y-2">
- <Label htmlFor="memory-value" className="text-text-primary text-sm font-medium">
+ <Label htmlFor="memory-value" className="text-sm font-medium">
{localize('com_ui_value')}
</Label>
<Textarea
diff --git a/client/src/components/SidePanel/Schedules/ScheduleDialog.tsx b/client/src/components/SidePanel/Schedules/ScheduleDialog.tsx
index bbeeb6b2f0..308aa7973f 100644
--- a/client/src/components/SidePanel/Schedules/ScheduleDialog.tsx
+++ b/client/src/components/SidePanel/Schedules/ScheduleDialog.tsx
@@ -269,7 +269,7 @@ export default function ScheduleDialog({
{
label: localize('com_ui_schedule_project_none'),
value: '',
- icon: <Folder className="h-4 w-4 text-text-secondary" aria-hidden="true" />,
+ icon: <Folder className="text-text-secondary h-4 w-4" aria-hidden="true" />,
},
...loadedProjectItems,
],
@@ -551,7 +551,7 @@ export default function ScheduleDialog({
const timezoneField = (
<fieldset className="space-y-2">
<legend>
- <Label id="schedule-timezone-label" className="text-sm font-medium text-text-primary">
+ <Label id="schedule-timezone-label" className="text-sm font-medium">
{localize('com_ui_schedule_timezone')}
</Label>
</legend>
@@ -605,7 +605,7 @@ export default function ScheduleDialog({
<div className="space-y-1.5">
<div className="grid gap-4 md:grid-cols-3">
<div className="space-y-2">
- <Label htmlFor="schedule-name" className="text-sm font-medium text-text-primary">
+ <Label htmlFor="schedule-name" className="text-sm font-medium">
{localize('com_ui_name')}
</Label>
<Input
@@ -619,7 +619,7 @@ export default function ScheduleDialog({
<FieldMessage id="schedule-name-message" message={errors.name?.message} />
</div>
<div className="space-y-2">
- <Label htmlFor="schedule-agent" className="text-sm font-medium text-text-primary">
+ <Label htmlFor="schedule-agent" className="text-sm font-medium">
{localize('com_ui_agent')}
</Label>
<Controller
@@ -656,10 +656,7 @@ export default function ScheduleDialog({
<FieldMessage id="schedule-agent-message" message={errors.agent_id?.message} />
</div>
<div className="space-y-2">
- <Label
- htmlFor="schedule-project"
- className="text-sm font-medium text-text-primary"
- >
+ <Label htmlFor="schedule-project" className="text-sm font-medium">
{localize('com_ui_project')}
</Label>
{pinnedProjectId != null ? (
@@ -669,7 +666,7 @@ export default function ScheduleDialog({
<div
id="schedule-project"
data-testid="schedule-project-pinned"
- className="flex h-10 w-full items-center gap-2 rounded-xl border border-border-light bg-surface-secondary px-3 text-sm text-text-secondary"
+ className="border-border-light bg-surface-secondary text-text-secondary flex h-10 w-full items-center gap-2 rounded-xl border px-3 text-sm"
>
<Folder className="h-4 w-4 shrink-0" aria-hidden="true" />
<span className="truncate">{projectDisplayName(pinnedProjectId)}</span>
@@ -704,7 +701,7 @@ export default function ScheduleDialog({
onBlur={field.onBlur}
items={projectItems}
SelectIcon={
- <Folder className="h-4 w-4 text-text-secondary" aria-hidden="true" />
+ <Folder className="text-text-secondary h-4 w-4" aria-hidden="true" />
}
ariaLabel={localize('com_ui_project')}
ariaInvalid={errors.chatProjectId != null}
@@ -740,7 +737,7 @@ export default function ScheduleDialog({
</div>
{/* Full width, not inside the agent cell: at a third of the dialog this
sentence wraps an extra line and makes the identity row needlessly tall. */}
- <p className="text-xs text-text-secondary">
+ <p className="text-text-secondary text-xs">
{localize('com_ui_schedule_target_new_chat')}
</p>
</div>
@@ -775,10 +772,7 @@ export default function ScheduleDialog({
<fieldset className="space-y-2">
<legend>
- <Label
- id="schedule-frequency-label"
- className="text-sm font-medium text-text-primary"
- >
+ <Label id="schedule-frequency-label" className="text-sm font-medium">
{localize('com_ui_schedule_frequency')}
</Label>
</legend>
@@ -803,7 +797,7 @@ export default function ScheduleDialog({
{frequency === 'cron' ? (
<div className="grid gap-4 md:grid-cols-2">
<div className="space-y-2">
- <Label htmlFor="schedule-cron" className="text-sm font-medium text-text-primary">
+ <Label htmlFor="schedule-cron" className="text-sm font-medium">
{localize('com_ui_schedule_cron_expression')}
</Label>
<Input
@@ -826,7 +820,7 @@ export default function ScheduleDialog({
data-testid="schedule-cron-input"
{...register('expression')}
/>
- <p id="schedule-cron-hint" className="text-xs text-text-secondary">
+ <p id="schedule-cron-hint" className="text-text-secondary text-xs">
{localize('com_ui_schedule_cron_hint')}
</p>
<FieldMessage
@@ -847,10 +841,7 @@ export default function ScheduleDialog({
{frequency === 'weekly' && (
<fieldset className="space-y-2">
<legend>
- <Label
- id="schedule-days-label"
- className="text-sm font-medium text-text-primary"
- >
+ <Label id="schedule-days-label" className="text-sm font-medium">
{localize('com_ui_schedule_days')}
</Label>
</legend>
@@ -905,10 +896,7 @@ export default function ScheduleDialog({
)}
<fieldset className="space-y-2">
<legend>
- <Label
- id="schedule-time-label"
- className="text-sm font-medium text-text-primary"
- >
+ <Label id="schedule-time-label" className="text-sm font-medium">
{localize(
frequency === 'hourly'
? 'com_ui_schedule_minutes_past_hour'
@@ -959,7 +947,7 @@ export default function ScheduleDialog({
contradict the "pick at least one day" message right below it. */}
{daysAreValid && (
<p
- className="break-words rounded-lg bg-surface-secondary px-3 py-2 text-sm text-text-secondary"
+ className="bg-surface-secondary text-text-secondary rounded-lg px-3 py-2 text-sm break-words"
data-testid="schedule-summary"
>
{summary}
@@ -968,10 +956,10 @@ export default function ScheduleDialog({
<FieldMessage id="schedule-cadence-message" message={cadenceError ?? undefined} />
{previewRuns.length > 0 && (
<div className="space-y-1" data-testid="schedule-preview">
- <p className="text-xs font-medium text-text-primary">
+ <p className="text-text-primary text-xs font-medium">
{localize('com_ui_schedule_next_runs')}
</p>
- <ul className="space-y-0.5 text-xs text-text-secondary">
+ <ul className="text-text-secondary space-y-0.5 text-xs">
{previewRuns.map((run) => (
<li key={run.getTime()}>
{formatRunInstant(run, timezone, locale, prefersMeridiem)}
diff --git a/eslint-suppressions.json b/eslint-suppressions.json
index e14077038c..31e3059d3b 100644
--- a/eslint-suppressions.json
+++ b/eslint-suppressions.json
@@ -1333,9 +1333,6 @@
"client/src/components/Prompts/lists/ListCard.tsx": {
"shadcn/no-arbitrary-values": {
"count": 1
- },
- "shadcn/no-restyle": {
- "count": 1
}
},
"client/src/components/Prompts/sidebar/FilterPrompts.tsx": {
@@ -1647,7 +1644,7 @@
"count": 2
},
"shadcn/no-restyle": {
- "count": 10
+ "count": 9
}
},
"client/src/components/SidePanel/Agents/Version/VersionPanel.tsx": {
@@ -1672,7 +1669,7 @@
},
"client/src/components/SidePanel/Builder/ActionCallback.tsx": {
"shadcn/no-restyle": {
- "count": 3
+ "count": 2
}
},
"client/src/components/SidePanel/Builder/ActionsAuth.tsx": {
@@ -1758,12 +1755,12 @@
},
"client/src/components/SidePanel/Memories/MemoryCreateDialog.tsx": {
"shadcn/no-restyle": {
- "count": 12
+ "count": 10
}
},
"client/src/components/SidePanel/Memories/MemoryEditDialog.tsx": {
"shadcn/no-restyle": {
- "count": 13
+ "count": 11
}
},
"client/src/components/SidePanel/Memories/MemoryPanel.tsx": {
@@ -1816,7 +1813,7 @@
},
"client/src/components/SidePanel/Schedules/ScheduleDialog.tsx": {
"shadcn/no-restyle": {
- "count": 22
+ "count": 14
}
},
"client/src/components/SidePanel/Schedules/SchedulePanel.tsx": {