Убрана ибыточная информация из данных для виджетов

frontend/src/dashboard/dashboard-store.tsx

@@ -1,5 +1,5 @@
 import axios from 'axios';
-import { IAnyModelType, Instance, types } from 'mobx-state-tree';
+import { Instance, types } from 'mobx-state-tree';
 
 type _WidgetParams = Record<string, any> | null;
 
@@ -90,7 +90,7 @@ export const Dashboard = types
       setWidgetsData: (data: any) => {
         for (let i = 0; i < data.length; i++) {
           const widgetData = data[i]?.data;
-          const widgetId = data[i]?.widget?.id;
+          const widgetId = data[i]?.widgetId;
           if (!widgetId || !widgetData) continue;
 
           const widgets = self.data?.widgets;
@@ -147,8 +147,8 @@ export async function WidgetLoadData(widget: IWidget): Promise<void> {
   const resp = await fetch(url);
   if (resp && resp.ok) {
     const data = await resp.json();
-    if (data?.data) {
+    if (data) {
-      widget.setData(data?.data);
+      widget.setData(data);
     }
   }
 }

frontend/src/dashboard/widgets/issues-list.tsx

@@ -12,7 +12,7 @@ export type Props = {
 export const IssuesList = observer((props: Props): JSX.Element => {
   const store = IssuesListBoardsStoreNs.PageStore.create({ loaded: false });
   onSnapshot(props.store, (state) => {
-    if (state?.data?.data) store.setData(state?.data?.data);
+    if (state?.data) store.setData(state?.data);
   });
   return <IssuesListBoardsNs.IssuesListBoards store={store} />;
 });

frontend/src/dashboard/widgets/kanban.tsx

@@ -11,7 +11,7 @@ export type Props = {
 export const Kanban = observer((props: Props): JSX.Element => {
   const store = KanbanBoardsStoreNs.PageStore.create({ loaded: false });
   onSnapshot(props.store, (state) => {
-    if (state?.data?.data) store.setData(state?.data?.data);
+    if (state?.data) store.setData(state?.data);
   });
   return <KanbanBoardsNs.KanbanBoards store={store} />;
 });

frontend/src/issues-list-board/issues-list-board.tsx

@@ -9,9 +9,18 @@ export type Props = {
 };
 
 export const IssuesListBoard = observer((props: Props): JSX.Element => {
-  const list: JSX.Element[] = props.store.data.map((issue) => {
+  const list: JSX.Element[] = [];
-    return <IssuesListCardNs.IssuesListCard store={issue} key={issue.id} />;
+  const data: any = props.store.data;
-  });
+  for (let i = 0; i < data.length; i++) {
+    const column = data[i];
+    const issues: any[] = column.issues;
+    for (let j = 0; j < issues.length; j++) {
+      const issue = issues[j];
+      list.push(
+        <IssuesListCardNs.IssuesListCard store={issue} key={issue.id} />,
+      );
+    }
+  }
   let title: JSX.Element;
   if (props.store.metainfo.url) {
     title = <a href={props.store.metainfo.url}>{props.store.metainfo.title}</a>;

libs/event-emitter/src/dashboards/dashboards-data.service.ts

@@ -5,7 +5,7 @@ import { AppError, Result, createAppError, fail } from '../utils/result';
 import { WidgetsCollectionService } from './widgets-collection.service';
 
 export type WidgetWithData = {
-  widget: DashboardModel.Widget;
+  widgetId: string;
   data: any;
 };
 
@@ -34,17 +34,14 @@ export class DashboardsDataService {
       if (loadRes.result) {
         isSuccess = true;
         loadRes.result.widgetId = widget.id;
-        results.push({ data: loadRes.result, widget: widget });
+        results.push({ data: loadRes.result, widgetId: widget.id });
       }
     }
     if (!isSuccess) throw createAppError('CANNOT_LOAD_DATA');
     return results;
   }
 
-  async loadDataForWidget(
+  async loadDataForWidget(id: string, widgetId: string): Promise<any> {
-    id: string,
-    widgetId: string,
-  ): Promise<WidgetWithData> {
     const cfg = await this.dashboardsService.load(id);
     const widget = cfg.widgets.find((widget) => {
       return widget.id == widgetId;
@@ -56,7 +53,7 @@ export class DashboardsDataService {
       widget.dataLoaderParams,
       cfg,
     );
-    if (loadRes.result) return { widget: widget, data: loadRes.result };
+    if (loadRes.result) return loadRes.result;
     throw createAppError('CANNOT_LOAD_DATA');
   }
 

libs/event-emitter/src/dashboards/interactive-widget-factory.ts

@@ -16,13 +16,7 @@ export class InteractiveWidget
     dashboardParams: any,
   ): Promise<Result<any, AppError>> {
     const data = await this.dataLoader.load(dataLoaderParams, dashboardParams);
-    return data.error
+    return data.error ? fail(data.error) : success(data.result);
-      ? fail(data.error)
-      : success({
-          data: data.result,
-          widgetParams: widgetParams,
-          dashboardParams: dashboardParams,
-        });
   }
 }