Skip to content

Commit e90d8c0

Browse files
authored
Merge pull request #3777 from karyanayandi/fix/stable-composite-keys-in-mapped-lists
fix: replace index-only keys with stable composite keys in mapped lists
2 parents 98d09f1 + 69d3286 commit e90d8c0

8 files changed

Lines changed: 22 additions & 10 deletions

File tree

apps/dokploy/components/dashboard/application/deployments/show-deployment.tsx

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,21 @@ export const ShowDeployment = ({
194194
{" "}
195195
{filteredLogs.length > 0 ? (
196196
filteredLogs.map((log: LogLine, index: number) => (
197-
<TerminalLine key={index} log={log} noTimestamp />
197+
<TerminalLine
198+
key={`${log.rawTimestamp ?? ""}-${index}`}
199+
log={log}
200+
noTimestamp
201+
/>
198202
))
199203
) : (
200204
<>
201205
{optionalErrors.length > 0 ? (
202206
optionalErrors.map((log: LogLine, index: number) => (
203-
<TerminalLine key={`extra-${index}`} log={log} noTimestamp />
207+
<TerminalLine
208+
key={`extra-${log.rawTimestamp ?? ""}-${index}`}
209+
log={log}
210+
noTimestamp
211+
/>
204212
))
205213
) : (
206214
<div className="flex justify-center items-center h-full text-muted-foreground">

apps/dokploy/components/dashboard/application/general/generic/save-github-provider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -459,7 +459,7 @@ export const SaveGithubProvider = ({ applicationId }: Props) => {
459459
<div className="flex flex-wrap gap-2 mb-2">
460460
{field.value?.map((path, index) => (
461461
<Badge
462-
key={index}
462+
key={`${path}-${index}`}
463463
variant="secondary"
464464
className="flex items-center gap-1"
465465
>

apps/dokploy/components/dashboard/application/general/generic/save-gitlab-provider.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ export const SaveGitlabProvider = ({ applicationId }: Props) => {
448448
<div className="flex flex-wrap gap-2 mb-2">
449449
{field.value?.map((path, index) => (
450450
<Badge
451-
key={index}
451+
key={`${path}-${index}`}
452452
variant="secondary"
453453
className="flex items-center gap-1"
454454
>

apps/dokploy/components/dashboard/docker/logs/docker-logs-id.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -402,7 +402,7 @@ export const DockerLogsId: React.FC<Props> = ({
402402
{filteredLogs.length > 0 ? (
403403
filteredLogs.map((filteredLog: LogLine, index: number) => (
404404
<TerminalLine
405-
key={index}
405+
key={`${filteredLog.rawTimestamp ?? ""}-${index}`}
406406
log={filteredLog}
407407
searchTerm={search}
408408
noTimestamp={!showTimestamp}

apps/dokploy/components/dashboard/settings/profile/configure-2fa.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ export const Configure2FA = () => {
356356
<div className="grid grid-cols-2 gap-2">
357357
{backupCodes.map((code, index) => (
358358
<code
359-
key={index}
359+
key={`${code}-${index}`}
360360
className="bg-background p-2 rounded text-sm font-mono text-center"
361361
>
362362
{code}

apps/dokploy/components/dashboard/settings/profile/enable-2fa.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,7 @@ export const Enable2FA = () => {
401401
<div className="grid grid-cols-2 gap-2">
402402
{backupCodes.map((code, index) => (
403403
<code
404-
key={index}
404+
key={`${code}-${index}`}
405405
className="bg-muted p-2 rounded text-sm font-mono"
406406
>
407407
{code}

apps/dokploy/components/dashboard/settings/servers/welcome-stripe/welcome-suscription.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,9 @@ export const WelcomeSuscription = () => {
307307
</div>
308308

309309
<div className="grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-6">
310-
{features.map((feature, index) => (
310+
{features.map((feature) => (
311311
<div
312-
key={index}
312+
key={feature.title}
313313
className="flex flex-col items-start p-4 bg-card rounded-lg shadow-md hover:shadow-lg transition-shadow"
314314
>
315315
<div className="text-3xl mb-2">{feature.icon}</div>

apps/dokploy/components/shared/drawer-logs.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,11 @@ export const DrawerLogs = ({ isOpen, onClose, filteredLogs }: Props) => {
6060
{" "}
6161
{filteredLogs.length > 0 ? (
6262
filteredLogs.map((log: LogLine, index: number) => (
63-
<TerminalLine key={index} log={log} noTimestamp />
63+
<TerminalLine
64+
key={`${log.rawTimestamp ?? ""}-${index}`}
65+
log={log}
66+
noTimestamp
67+
/>
6468
))
6569
) : (
6670
<div className="flex justify-center items-center h-full text-muted-foreground">

0 commit comments

Comments
 (0)