@hed-hog/core 0.0.151 → 0.0.153

package/src/dashboard/dashboard-item/dashboard-item.controller.ts

@@ -1,5 +1,6 @@
-import { Pagination } from '@hed-hog/api-pagination';
+import { Role } from '@hed-hog/api';
 import { Locale } from '@hed-hog/api-locale';
+import { Pagination } from '@hed-hog/api-pagination';
 import {
   Body,
   Controller,
@@ -8,14 +9,12 @@ import {
   Inject,
   Param,
   ParseIntPipe,
-  Patch,
   Post,
-  forwardRef,
+  Query,
+  forwardRef
 } from '@nestjs/common';
-import { CreateDTO } from './dto/create.dto';
-import { UpdateDTO } from './dto/update.dto';
 import { DashboardItemService } from './dashboard-item.service';
-import { Role, DeleteDTO } from '@hed-hog/api';
+import { CreateDashboardItemDTO } from './dto';
 
 @Role()
 @Controller('dashboard-item')
@@ -26,30 +25,22 @@ export class DashboardItemController {
   ) {}
 
   @Get()
-  async list(@Pagination() paginationParams) {
-    return this.dashboardItemService.list(paginationParams);
-  }
-
-  @Get(':id')
-  async get(@Param('id', ParseIntPipe) id: number) {
-    return this.dashboardItemService.get(id);
+  getAllDashboardItems(
+    @Pagination() paginationParams,
+    @Locale() locale: string,
+    @Query('dashboardId') dashboardId?: string,
+  ) {
+    const id = dashboardId ? parseInt(dashboardId) : undefined;
+    return this.dashboardItemService.getAllDashboardItems(paginationParams, locale, id);
   }
 
   @Post()
-  async create(@Body() data: CreateDTO) {
-    return this.dashboardItemService.create(data);
-  }
-
-  @Patch(':id')
-  async update(@Param('id', ParseIntPipe) id: number, @Body() data: UpdateDTO) {
-    return this.dashboardItemService.update({
-      id,
-      data,
-    });
+  createDashboardItem(@Body() data: CreateDashboardItemDTO, @Locale() locale: string) {
+    return this.dashboardItemService.createDashboardItem(data, locale);
   }
 
-  @Delete()
-  async delete(@Body() data: DeleteDTO) {
-    return this.dashboardItemService.delete(data);
+  @Delete(':id')
+  deleteDashboardItem(@Param('id', ParseIntPipe) id: number, @Locale() locale: string) {
+    return this.dashboardItemService.deleteDashboardItem(id, locale);
   }
 }

package/src/dashboard/dashboard-item/dashboard-item.service.ts

@@ -1,14 +1,13 @@
-import { DeleteDTO } from '@hed-hog/api';
-import { PaginationDTO, PaginationService } from '@hed-hog/api-pagination';
+import { getLocaleText, LocaleService } from '@hed-hog/api-locale';
+import { PaginationService } from '@hed-hog/api-pagination';
 import { PrismaService } from '@hed-hog/api-prisma';
 import {
-  BadRequestException,
-  Inject,
-  Injectable,
-  forwardRef,
+    forwardRef,
+    Inject,
+    Injectable,
+    NotFoundException
 } from '@nestjs/common';
-import { CreateDTO } from './dto/create.dto';
-import { UpdateDTO } from './dto/update.dto';
+import { CreateDashboardItemDTO } from './dto';
 
 @Injectable()
 export class DashboardItemService {
@@ -17,66 +16,75 @@ export class DashboardItemService {
     private readonly prismaService: PrismaService,
     @Inject(forwardRef(() => PaginationService))
     private readonly paginationService: PaginationService,
+    @Inject(forwardRef(() => LocaleService))
+    private readonly localeService: LocaleService,
   ) {}
 
-  async list(paginationParams: PaginationDTO) {
-    const fields = [];
-    const OR: any[] = this.prismaService.createInsensitiveSearch(
-      fields,
-      paginationParams,
-    );
-
-    if (paginationParams.search && !isNaN(+paginationParams.search)) {
-      OR.push({ id: { equals: +paginationParams.search } });
-    }
-
+  async getAllDashboardItems(paginationParams, locale: string, dashboardId?: number) {
     return this.paginationService.paginate(
       this.prismaService.dashboard_item,
       paginationParams,
       {
-        where: {
-          OR,
-        },
+        where: dashboardId ? { dashboard_id: dashboardId } : undefined,
         include: {
-          dashboard_component: true,
-          dashboard: true,
+          dashboard: {
+            include: {
+              dashboard_locale: {
+                include: {
+                  locale: true,
+                },
+              },
+            },
+          },
+          dashboard_component: {
+            include: {
+              dashboard_component_locale: {
+                include: {
+                  locale: true,
+                },
+              },
+            },
+          },
+        },
+        orderBy: {
+          id: 'desc',
         },
       },
+      'dashboardItem',
     );
   }
 
-  async get(id: number) {
-    return this.prismaService.dashboard_item.findUnique({
-      where: { id: id },
-    });
-  }
-
-  async create(data: CreateDTO) {
+  async createDashboardItem(data: CreateDashboardItemDTO, locale: string) {
     return this.prismaService.dashboard_item.create({
-      data,
+      data: {
+        dashboard_id: data.dashboard_id,
+        component_id: data.component_id,
+        width: data.width,
+        height: data.height,
+        x_axis: data.x_axis,
+        y_axis: data.y_axis,
+      },
+      include: {
+        dashboard: true,
+        dashboard_component: true,
+      },
     });
   }
 
-  async update({ id, data }: { id: number; data: UpdateDTO }) {
-    return this.prismaService.dashboard_item.update({
-      where: { id: id },
-      data,
+  async deleteDashboardItem(id: number, locale: string) {
+    const item = await this.prismaService.dashboard_item.findUnique({
+      where: { id },
     });
-  }
 
-  async delete({ ids }: DeleteDTO): Promise<{count:number}> {
-    if (ids == undefined || ids == null) {
-      throw new BadRequestException(
-        'You must select at least one item to delete.',
+    if (!item) {
+      throw new NotFoundException(
+        getLocaleText('dashboardItemNotFound', locale, 'Dashboard item not found'),
       );
     }
 
-    return this.prismaService.dashboard_item.deleteMany({
-      where: {
-        id: {
-          in: ids,
-        },
-      },
+    await this.prismaService.dashboard_item.delete({
+      where: { id },
     });
+    return { success: true };
   }
 }

package/src/dashboard/dashboard-item/dto/index.ts

@@ -0,0 +1,7 @@
+export * from './create.dto';
+export * from './update.dto';
+
+// Aliases para compatibilidade
+export { CreateDTO as CreateDashboardItemDTO } from './create.dto';
+export { UpdateDTO as UpdateDashboardItemDTO } from './update.dto';
+

package/src/dashboard/dashboard-item/dto/update.dto.ts

@@ -1,4 +1,28 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateDTO } from './create.dto';
+import { getLocaleText } from '@hed-hog/api-locale';
+import { IsNumber, IsOptional } from 'class-validator';
 
-export class UpdateDTO extends PartialType(CreateDTO) {}
+export class UpdateDTO {
+  @IsOptional()
+  @IsNumber({}, { message: (args) => getLocaleText('validation.numberRequired', args.value) })
+  component_id?: number;
+
+  @IsOptional()
+  @IsNumber({}, { message: (args) => getLocaleText('validation.numberRequired', args.value) })
+  dashboard_id?: number;
+
+  @IsOptional()
+  @IsNumber({}, { message: (args) => getLocaleText('validation.numberRequired', args.value) })
+  width?: number;
+
+  @IsOptional()
+  @IsNumber({}, { message: (args) => getLocaleText('validation.numberRequired', args.value) })
+  height?: number;
+
+  @IsOptional()
+  @IsNumber({}, { message: (args) => getLocaleText('validation.numberRequired', args.value) })
+  x_axis?: number;
+
+  @IsOptional()
+  @IsNumber({}, { message: (args) => getLocaleText('validation.numberRequired', args.value) })
+  y_axis?: number;
+}

package/src/dashboard/dashboard.module.ts

@@ -5,13 +5,13 @@ import { DashboardComponentModule } from './dashboard-component/dashboard-compon
 import { DashboardCoreModule } from './dashboard-core/dashboard-core.module';
 import { DashboardItemModule } from './dashboard-item/dashboard-item.module';
 import { DashboardUserModule } from './dashboard-user/dashboard-user.module';
-import { DashboardModule2 } from './dashboard/dashboard.module';
+import { DashboardCrudModule } from './dashboard/dashboard.module';
 
 @Module({
   imports: [
     forwardRef(() => LocaleModule),
     forwardRef(() => PrismaModule),
-    forwardRef(() => DashboardModule2),
+    forwardRef(() => DashboardCrudModule),
     forwardRef(() => DashboardComponentModule),
     forwardRef(() => DashboardItemModule),
     forwardRef(() => DashboardUserModule),

package/src/language/en.json

@@ -167,5 +167,8 @@
   },
   "mail_sent_not_found": "Mail sent record not found.",
   "validationSslugMustBeString": "Slug must be a string.",
-  "sessionRevoked": "Session has been revoked or expired."
+  "sessionRevoked": "Session has been revoked or expired.",
+  "dashboardNotFound": "Dashboard not found.",
+  "dashboardComponentNotFound": "Dashboard component not found.",
+  "dashboardItemNotFound": "Dashboard item not found."
 }

package/src/language/pt.json

@@ -167,5 +167,8 @@
   },
   "mail_sent_not_found": "Registro de e-mail enviado não encontrado.",
   "validationSslugMustBeString": "O slug deve ser uma string.",
-  "sessionRevoked": "Sessão foi revogada ou expirada."
+  "sessionRevoked": "Sessão foi revogada ou expirou.",
+  "dashboardNotFound": "Dashboard não encontrado.",
+  "dashboardComponentNotFound": "Componente de dashboard não encontrado.",
+  "dashboardItemNotFound": "Item de dashboard não encontrado."
 }

package/src/oauth/oauth.controller.ts

@@ -20,7 +20,7 @@ import { OAuthService } from './oauth.service';
 export class OAuthController {
   constructor(private readonly service: OAuthService, private readonly settingService: SettingService) {}
 
-    @Public()
+  @Public()
   @Get('github/callback')
   async githubCallback(
     @Query('code') code: string,
@@ -33,7 +33,6 @@ export class OAuthController {
     return res.redirect(redirectURL);
   }
 
-
   @Public()
   @Get(':provider/login')
   async login(@Param('provider') provider: string, @Res() res) {

package/src/oauth/providers/microsoft-entra-id.provider.ts

@@ -19,12 +19,17 @@ export class MicrosoftEntraIdProvider extends BaseOAuthProvider {
 
   async getAuthUrl(callbackPath: string) {
     const settings = await this.setting.getSettingValues([
-      'microsoft_client_id',
-      'microsoft_client_secret',
-      'microsoft_scopes',
-      'microsoft_tenant_id',
+      'microsoft_entra_id_client_id',
+      'microsoft_entra_id_client_secret',
+      'microsoft_entra_id_scopes',
+      'microsoft_entra_id_tenant_id',
       'url',
     ]);
+
+    console.log({
+      settings
+    })
+
     const tenantId = settings['microsoft_tenant_id'];
     const redirectURI = new URL(callbackPath, settings['url']).toString();
     const scopes = settings['microsoft_scopes'];

package/src/setting/setting.service.ts

@@ -182,6 +182,7 @@ export class SettingService {
       'time-format',
       'timezone',
       'menu-width',
+      'providers'
     ];
     const setting = await this.getSettingValues(slugs);
     return { locales, setting };