pavel/pinkmine
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Исправлены адреса ендпоинтов и формат возвращаемых данных из виджетов

Browse source
This commit is contained in:
Pavel Gnedov 2023-10-03 07:04:15 +07:00
parent 10b04bdb0f
commit 14e0108f02
3 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libs/event-emitter/src/dashboards/dashboard.controller.ts
View file

@ -3,7 +3,7 @@ import { DashboardsService } from './dashboards.service';
import { BadRequestErrorHandler, getOrAppErrorOrThrow } from '../utils/result'; import { BadRequestErrorHandler, getOrAppErrorOrThrow } from '../utils/result';
import { DashboardsDataService } from './dashboards-data.service'; import { DashboardsDataService } from './dashboards-data.service';
@Controller('dashboard') @Controller('api/dashboard')
export class DashboardController { export class DashboardController {
constructor( constructor(
private dashboardsService: DashboardsService, private dashboardsService: DashboardsService,

14
libs/event-emitter/src/dashboards/dashboards-data.service.ts
View file

@ -1,13 +1,7 @@
import { Injectable, Logger } from '@nestjs/common'; import { Injectable, Logger } from '@nestjs/common';
import { DashboardsService } from './dashboards.service'; import { DashboardsService } from './dashboards.service';
import * as DashboardModel from '../models/dashboard'; import * as DashboardModel from '../models/dashboard';
import { import { AppError, Result, createAppError, fail } from '../utils/result';
AppError,
Result,
createAppError,
fail,
success,
} from '../utils/result';
import { WidgetsCollectionService } from './widgets-collection.service'; import { WidgetsCollectionService } from './widgets-collection.service';
export type WidgetWithData = { export type WidgetWithData = {
@ -38,10 +32,8 @@ export class DashboardsDataService {
); );
if (loadRes.result) { if (loadRes.result) {
isSuccess = true; isSuccess = true;
results.push({ loadRes.result.widgetId = widget.id;
widget: widget, results.push(loadRes.result);
data: loadRes.result,
});
} }
} }
if (!isSuccess) throw createAppError('CANNOT_LOAD_DATA'); if (!isSuccess) throw createAppError('CANNOT_LOAD_DATA');

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

@ -1,4 +1,4 @@
import { Result, AppError } from '../utils/result'; import { Result, AppError, fail, success } from '../utils/result';
import { WidgetDataLoaderInterface } from './widget-data-loader-interface'; import { WidgetDataLoaderInterface } from './widget-data-loader-interface';
import { WidgetInterface } from './widget-interface'; import { WidgetInterface } from './widget-interface';
@ -16,7 +16,13 @@ export class InteractiveWidget
dashboardParams: any, dashboardParams: any,
): Promise<Result<any, AppError>> { ): Promise<Result<any, AppError>> {
const data = await this.dataLoader.load(dataLoaderParams, dashboardParams); const data = await this.dataLoader.load(dataLoaderParams, dashboardParams);
return data; return data.error
? fail(data.error)
: success({
data: data.result,
widgetParams: widgetParams,
dashboardParams: dashboardParams,
});
} }
} }