diff --git a/frontend/src/dashboard/dashboard-store.tsx b/frontend/src/dashboard/dashboard-store.tsx index 594b55b..6342a05 100644 --- a/frontend/src/dashboard/dashboard-store.tsx +++ b/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 | 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 { const resp = await fetch(url); if (resp && resp.ok) { const data = await resp.json(); - if (data?.data) { - widget.setData(data?.data); + if (data) { + widget.setData(data); } } } diff --git a/frontend/src/dashboard/widgets/issues-list.tsx b/frontend/src/dashboard/widgets/issues-list.tsx index 3cbdcd4..d825576 100644 --- a/frontend/src/dashboard/widgets/issues-list.tsx +++ b/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 ; }); diff --git a/frontend/src/dashboard/widgets/kanban.tsx b/frontend/src/dashboard/widgets/kanban.tsx index d86f8ec..473fbfc 100644 --- a/frontend/src/dashboard/widgets/kanban.tsx +++ b/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 ; }); diff --git a/frontend/src/issues-list-board/issues-list-board.tsx b/frontend/src/issues-list-board/issues-list-board.tsx index 01ba1c5..f589bc5 100644 --- a/frontend/src/issues-list-board/issues-list-board.tsx +++ b/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) => { - return ; - }); + const list: JSX.Element[] = []; + 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( + , + ); + } + } let title: JSX.Element; if (props.store.metainfo.url) { title = {props.store.metainfo.title}; diff --git a/libs/event-emitter/src/dashboards/dashboards-data.service.ts b/libs/event-emitter/src/dashboards/dashboards-data.service.ts index 9f68d94..9518305 100644 --- a/libs/event-emitter/src/dashboards/dashboards-data.service.ts +++ b/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( - id: string, - widgetId: string, - ): Promise { + async loadDataForWidget(id: string, widgetId: string): Promise { 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'); } diff --git a/libs/event-emitter/src/dashboards/interactive-widget-factory.ts b/libs/event-emitter/src/dashboards/interactive-widget-factory.ts index 7e8876e..1125f6e 100644 --- a/libs/event-emitter/src/dashboards/interactive-widget-factory.ts +++ b/libs/event-emitter/src/dashboards/interactive-widget-factory.ts @@ -16,13 +16,7 @@ export class InteractiveWidget dashboardParams: any, ): Promise> { const data = await this.dataLoader.load(dataLoaderParams, dashboardParams); - return data.error - ? fail(data.error) - : success({ - data: data.result, - widgetParams: widgetParams, - dashboardParams: dashboardParams, - }); + return data.error ? fail(data.error) : success(data.result); } }