From 4a2759a0e18d86f74282c39d56622970cf2fcb21 Mon Sep 17 00:00:00 2001
From: Pavel Gnedov <pavel@gnedov.info>
Date: Thu, 6 Feb 2025 23:21:56 +0700
Subject: [PATCH] =?UTF-8?q?=D0=A1=D0=BA=D0=B2=D0=BE=D0=B7=D0=BD=D0=B0?=
 =?UTF-8?q?=D1=8F=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D1=87=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=BF=D0=BE=D0=BB=D0=BD=D0=B8=D1=82=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D1=85=20=D0=B0=D1=80=D0=B3=D1=83=D0=BC=D0=B5?=
 =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=B2=20dashboardId=20=D0=B8=20widgetId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/dashboards/dashboards-data.service.ts            | 8 ++++++++
 .../src/dashboards/interactive-widget-factory.ts         | 9 ++++++++-
 .../src/dashboards/widget-data-loader-interface.ts       | 2 ++
 libs/event-emitter/src/dashboards/widget-interface.ts    | 2 ++
 4 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/libs/event-emitter/src/dashboards/dashboards-data.service.ts b/libs/event-emitter/src/dashboards/dashboards-data.service.ts
index 0ba0ddb..e9c2067 100644
--- a/libs/event-emitter/src/dashboards/dashboards-data.service.ts
+++ b/libs/event-emitter/src/dashboards/dashboards-data.service.ts
@@ -34,6 +34,8 @@ export class DashboardsDataService {
         widget.widgetParams,
         widget.dataLoaderParams,
         cfg,
+        id,
+        widget.id,
       );
       if (loadRes.result) {
         counter++;
@@ -57,6 +59,8 @@ export class DashboardsDataService {
       widget.widgetParams,
       widget.dataLoaderParams,
       cfg,
+      id,
+      widgetId,
     );
     if (loadRes.result) return loadRes.result;
     throw createAppError('CANNOT_LOAD_DATA');
@@ -67,6 +71,8 @@ export class DashboardsDataService {
     widgetParams: DashboardModel.WidgetParams,
     dataLoaderParams: DashboardModel.DataLoaderParams,
     dashboardParams: DashboardModel.Data,
+    dashboardId: string,
+    widgetId: string,
   ): Promise<Result<any, AppError>> {
     const widgetResult = this.widgetsCollectionService.getWidgetByType(type);
     if (widgetResult.error) return fail(createAppError(widgetResult.error));
@@ -75,6 +81,8 @@ export class DashboardsDataService {
       widgetParams,
       dataLoaderParams,
       dashboardParams,
+      dashboardId,
+      widgetId,
     );
     return renderResult;
   }
diff --git a/libs/event-emitter/src/dashboards/interactive-widget-factory.ts b/libs/event-emitter/src/dashboards/interactive-widget-factory.ts
index 1125f6e..4e71c08 100644
--- a/libs/event-emitter/src/dashboards/interactive-widget-factory.ts
+++ b/libs/event-emitter/src/dashboards/interactive-widget-factory.ts
@@ -14,8 +14,15 @@ export class InteractiveWidget
     widgetParams: any,
     dataLoaderParams: any,
     dashboardParams: any,
+    dashboardId: string,
+    widgetId: string,
   ): Promise<Result<any, AppError>> {
-    const data = await this.dataLoader.load(dataLoaderParams, dashboardParams);
+    const data = await this.dataLoader.load(
+      dataLoaderParams,
+      dashboardParams,
+      dashboardId,
+      widgetId,
+    );
     return data.error ? fail(data.error) : success(data.result);
   }
 }
diff --git a/libs/event-emitter/src/dashboards/widget-data-loader-interface.ts b/libs/event-emitter/src/dashboards/widget-data-loader-interface.ts
index 3608fc7..87096d6 100644
--- a/libs/event-emitter/src/dashboards/widget-data-loader-interface.ts
+++ b/libs/event-emitter/src/dashboards/widget-data-loader-interface.ts
@@ -5,5 +5,7 @@ export interface WidgetDataLoaderInterface<DLP, DBP, R> {
   load(
     dataLoaderParams: DLP,
     dashboardParams: DBP,
+    dashboardId: string,
+    widgetId: string,
   ): Promise<Result<R, AppError>>;
 }
diff --git a/libs/event-emitter/src/dashboards/widget-interface.ts b/libs/event-emitter/src/dashboards/widget-interface.ts
index 4fdd2c1..8564e27 100644
--- a/libs/event-emitter/src/dashboards/widget-interface.ts
+++ b/libs/event-emitter/src/dashboards/widget-interface.ts
@@ -15,5 +15,7 @@ export interface WidgetInterface<WP, DLP, DBP, DLR, R> {
     widgetParams: WP,
     dataLoaderParams: DLP,
     dashboardParams: DBP,
+    dashboardId: string,
+    widgetId: string,
   ): Promise<Result<R, AppError>>;
 }