From 27a6dc7f848706b8b37eacde2af75439a4ba2d96 Mon Sep 17 00:00:00 2001
From: Aleksandar Toplek <aleksandar.toplek@gmail.com>
Date: Sat, 23 Dec 2023 23:09:33 +0100
Subject: [PATCH] fix(app): Changing dashboard resulting in some card shown as
 needs configuration

---
 web/apps/app/components/dashboards/DashboardView.tsx | 2 +-
 web/apps/app/components/widgets/parts/WidgetCard.tsx | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/web/apps/app/components/dashboards/DashboardView.tsx b/web/apps/app/components/dashboards/DashboardView.tsx
index 1bcef4ff11..cf66bcde11 100644
--- a/web/apps/app/components/dashboards/DashboardView.tsx
+++ b/web/apps/app/components/dashboards/DashboardView.tsx
@@ -82,7 +82,7 @@ function DashboardView(props: { dashboard: IDashboardModel, isEditing: boolean,
                 <GridWrapper isEditing={isEditing} order={widgetsOrder} orderChanged={handleOrderChanged}>
                     {widgets.map((widget) => (
                         <WidgetComponent
-                            key={`widget-${widget.id.toString()}`}
+                            key={`widget-${dashboard.id}-${widget.id.toString()}`}
                             id={widget.id}
                             onRemove={() => handleRemoveWidget(widget.id)}
                             isEditMode={isEditing}
diff --git a/web/apps/app/components/widgets/parts/WidgetCard.tsx b/web/apps/app/components/widgets/parts/WidgetCard.tsx
index 94c35e2758..f015f712cd 100644
--- a/web/apps/app/components/widgets/parts/WidgetCard.tsx
+++ b/web/apps/app/components/widgets/parts/WidgetCard.tsx
@@ -25,7 +25,7 @@ type CardConfig = {
     rows?: number;
 }
 
-function WidgetCard(props: IWidgetCardProps) {
+export default function WidgetCard(props: IWidgetCardProps) {
     const {
         children,
         isEditMode,
@@ -113,5 +113,3 @@ function WidgetCard(props: IWidgetCardProps) {
         </>
     );
 }
-
-export default WidgetCard;