@hedhog/admin 0.51.4 → 0.51.6

package/frontend/dashboard-user/react-query/handlers.ts.ejs

@@ -1,28 +1,28 @@
-import { useDefaultMutation } from "@/hooks/use-default-mutation";
-import { useQuery } from "@tanstack/react-query";
-import { requests } from "./requests";
-
-const scope = "dashboard-user";
-
-export function useDashboardUserCreate() {
-  const { dashboardUserCreate } = requests();
-  return useDefaultMutation(scope, "create", dashboardUserCreate);
-}
-
-export function useDashboardUserDelete() {
-  const { dashboardUserDelete } = requests();
-  return useDefaultMutation(scope, "delete", dashboardUserDelete);
-}
-
-export function useDashboardUserUpdate() {
-  const { dashboardUserUpdate } = requests();
-  return useDefaultMutation(scope, "update", dashboardUserUpdate);
-}
-
-export function useDashboardUserGet(id: number) {
-  const { dashboardUserGet } = requests();
-  return useQuery({
-    queryKey: [scope, "get"],
-    queryFn: () => dashboardUserGet(id),
-  });
-}
+import { useDefaultMutation } from "@/hooks/use-default-mutation";
+import { useQuery } from "@tanstack/react-query";
+import { requests } from "./requests";
+
+const scope = "dashboard-user";
+
+export function useDashboardUserCreate() {
+  const { dashboardUserCreate } = requests();
+  return useDefaultMutation(scope, "create", dashboardUserCreate);
+}
+
+export function useDashboardUserDelete() {
+  const { dashboardUserDelete } = requests();
+  return useDefaultMutation(scope, "delete", dashboardUserDelete);
+}
+
+export function useDashboardUserUpdate() {
+  const { dashboardUserUpdate } = requests();
+  return useDefaultMutation(scope, "update", dashboardUserUpdate);
+}
+
+export function useDashboardUserGet(id: number) {
+  const { dashboardUserGet } = requests();
+  return useQuery({
+    queryKey: [scope, "get"],
+    queryFn: () => dashboardUserGet(id),
+  });
+}

package/frontend/dashboard-user/react-query/requests.ts.ejs

@@ -1,58 +1,58 @@
-import { useApp } from "@/hooks/use-app";
-import { Delete, PaginationParams, PaginationResult } from "@/types";
-import { DashboardUser } from "@/types/models";
-import { HttpMethod } from "@/types/http-method";
-
-export function requests() {
-  const { request } = useApp();
-
-  const dashboardUserList = async (params: PaginationParams) => {
-    return request<PaginationResult<DashboardUser>>({
-      url: "/dashboard-user",
-      params,
-    }).then((res) => res.data);
-  };
-
-  const dashboardUserGet = async (id: number) => {
-    return request<DashboardUser>({
-      url: `/dashboard-user/${id}`,
-    }).then((res) => res.data);
-  };
-
-  const dashboardUserCreate = async (params: { data: DashboardUser }) => {
-    const { data } = params;
-    return request<DashboardUser>({
-      url: "/dashboard-user",
-      method: HttpMethod.POST,
-      data: data,
-    }).then((res) => res.data);
-  };
-
-  const dashboardUserDelete = async (ids: number[]) => {
-    return request<Delete>({
-      url: "/dashboard-user",
-      data: { ids },
-      method: HttpMethod.DELETE,
-    }).then((res) => res.data);
-  };
-
-  const dashboardUserUpdate = async (params: {
-    id: number;
-    data: DashboardUser;
-  }) => {
-    const { id, data } = params;
-    return request<DashboardUser>({
-      url: `/dashboard-user/${id}`,
-      method: HttpMethod.PATCH,
-      data: data,
-    }).then((res) => res.data);
-  };
-
-  return {
-    dashboardUserCreate,
-    dashboardUserUpdate,
-    dashboardUserDelete,
-    dashboardUserList,
-    dashboardUserGet,
-  };
-}
+import { useApp } from "@/hooks/use-app";
+import { Delete, PaginationParams, PaginationResult } from "@/types";
+import { DashboardUser } from "@/types/models";
+import { HttpMethod } from "@/types/http-method";
+
+export function requests() {
+  const { request } = useApp();
+
+  const dashboardUserList = async (params: PaginationParams) => {
+    return request<PaginationResult<DashboardUser>>({
+      url: "/dashboard-user",
+      params,
+    }).then((res) => res.data);
+  };
+
+  const dashboardUserGet = async (id: number) => {
+    return request<DashboardUser>({
+      url: `/dashboard-user/${id}`,
+    }).then((res) => res.data);
+  };
+
+  const dashboardUserCreate = async (params: { data: DashboardUser }) => {
+    const { data } = params;
+    return request<DashboardUser>({
+      url: "/dashboard-user",
+      method: HttpMethod.POST,
+      data: data,
+    }).then((res) => res.data);
+  };
+
+  const dashboardUserDelete = async (ids: number[]) => {
+    return request<Delete>({
+      url: "/dashboard-user",
+      data: { ids },
+      method: HttpMethod.DELETE,
+    }).then((res) => res.data);
+  };
+
+  const dashboardUserUpdate = async (params: {
+    id: number;
+    data: DashboardUser;
+  }) => {
+    const { id, data } = params;
+    return request<DashboardUser>({
+      url: `/dashboard-user/${id}`,
+      method: HttpMethod.PATCH,
+      data: data,
+    }).then((res) => res.data);
+  };
+
+  return {
+    dashboardUserCreate,
+    dashboardUserUpdate,
+    dashboardUserDelete,
+    dashboardUserList,
+    dashboardUserGet,
+  };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedhog/admin",
-  "version": "0.51.4",
+  "version": "0.51.6",
   "private": false,
   "main": "dist/index.js",
   "scripts": {

package/src/core/core.service.ts

@@ -220,7 +220,8 @@ export class CoreService {
           os.platform() === 'win32'
             ? this.parseWindowsDiskInfo(stdout)
             : this.parseUnixDiskInfo(stdout);
-        resolve(diskInfo);
+
+        resolve(diskInfo.filter((disk) => disk.filesystem !== undefined));
       });
     });
   }
@@ -257,18 +258,36 @@ export class CoreService {
     return result;
   }
 
+  private parsedSizeFormated(size: string): number {
+    const unit = size.slice(-1).toUpperCase();
+    const value = parseFloat(size.slice(0, -1));
+
+    switch (unit) {
+      case 'T':
+        return value * 1024 ** 4;
+      case 'G':
+        return value * 1024 ** 3;
+      case 'M':
+        return value * 1024 ** 2;
+      case 'K':
+        return value * 1024;
+      default:
+        return value; // Assume bytes if no unit is provided
+    }
+  }
+
   private parseUnixDiskInfo(output: string) {
     const lines = output.trim().split('\n');
     const result = [];
     for (let i = 1; i < lines.length; i++) {
       const parts = lines[i].split(/\s+/);
       if (parts.length >= 6) {
+        const size = this.parsedSizeFormated(parts[1]);
+        const free = this.parsedSizeFormated(parts[3]);
         result.push({
           filesystem: parts[0],
-          size: parts[1],
-          used: parts[2],
-          available: parts[3],
-          capacity: parts[4],
+          free,
+          size,
           mountpoint: parts[5],
         });
       }

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

@@ -1,55 +1,55 @@
-import { Pagination } from '@hedhog/pagination';
-import { Locale } from '@hedhog/locale';
-import {
-  Body,
-  Controller,
-  Delete,
-  Get,
-  Inject,
-  Param,
-  ParseIntPipe,
-  Patch,
-  Post,
-  forwardRef
-} from '@nestjs/common';
-import { CreateDTO } from './dto/create.dto';
-import { UpdateDTO } from './dto/update.dto';
-import { DashboardComponentService } from './dashboard-component.service';
-import { Role, DeleteDTO } from '@hedhog/core';
-
-@Role()
-@Controller('dashboard-component')
-export class DashboardComponentController {
-  constructor(
-    @Inject(forwardRef(() => DashboardComponentService))
-    private readonly dashboardComponentService: DashboardComponentService
-  ) {}
-
-  @Get()
-  async list(@Locale() locale, @Pagination() paginationParams) {
-    return this.dashboardComponentService.list(locale, paginationParams);
-  }
-
-  @Get(':id')
-  async get(@Param('id', ParseIntPipe) id: number) {
-    return this.dashboardComponentService.get(id);
-  }
-
-  @Post()
-  async create(@Body() data: CreateDTO) {
-    return this.dashboardComponentService.create(data);
-  }
-
-  @Patch(':id')
-  async update(@Param('id', ParseIntPipe) id: number, @Body() data: UpdateDTO) {
-    return this.dashboardComponentService.update({
-      id,
-      data
-    });
-  }
-
-  @Delete()
-  async delete(@Body() data: DeleteDTO) {
-    return this.dashboardComponentService.delete(data);
-  }
-}
+import { Pagination } from '@hedhog/pagination';
+import { Locale } from '@hedhog/locale';
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  Inject,
+  Param,
+  ParseIntPipe,
+  Patch,
+  Post,
+  forwardRef
+} from '@nestjs/common';
+import { CreateDTO } from './dto/create.dto';
+import { UpdateDTO } from './dto/update.dto';
+import { DashboardComponentService } from './dashboard-component.service';
+import { Role, DeleteDTO } from '@hedhog/core';
+
+@Role()
+@Controller('dashboard-component')
+export class DashboardComponentController {
+  constructor(
+    @Inject(forwardRef(() => DashboardComponentService))
+    private readonly dashboardComponentService: DashboardComponentService
+  ) {}
+
+  @Get()
+  async list(@Locale() locale, @Pagination() paginationParams) {
+    return this.dashboardComponentService.list(locale, paginationParams);
+  }
+
+  @Get(':id')
+  async get(@Param('id', ParseIntPipe) id: number) {
+    return this.dashboardComponentService.get(id);
+  }
+
+  @Post()
+  async create(@Body() data: CreateDTO) {
+    return this.dashboardComponentService.create(data);
+  }
+
+  @Patch(':id')
+  async update(@Param('id', ParseIntPipe) id: number, @Body() data: UpdateDTO) {
+    return this.dashboardComponentService.update({
+      id,
+      data
+    });
+  }
+
+  @Delete()
+  async delete(@Body() data: DeleteDTO) {
+    return this.dashboardComponentService.delete(data);
+  }
+}

package/src/dashboard/dashboard-component/dto/create.dto.ts

@@ -1,36 +1,36 @@
-import { IsString, IsNumber, IsBoolean, IsOptional } from 'class-validator';
-import { WithLocaleDTO } from '@hedhog/locale';
-
-export class CreateDTO extends WithLocaleDTO {
-  @IsString()
-  slug: string;
-
-  @IsString()
-  path: string;
-
-  @IsOptional()
-  @IsNumber()
-  min_width?: number;
-
-  @IsOptional()
-  @IsNumber()
-  max_width?: number;
-
-  @IsOptional()
-  @IsNumber()
-  min_height?: number;
-
-  @IsOptional()
-  @IsNumber()
-  max_height?: number;
-
-  @IsNumber()
-  width: number;
-
-  @IsNumber()
-  height: number;
-
-  @IsOptional()
-  @IsBoolean()
-  is_resizable?: boolean;
-}
+import { IsString, IsNumber, IsBoolean, IsOptional } from 'class-validator';
+import { WithLocaleDTO } from '@hedhog/locale';
+
+export class CreateDTO extends WithLocaleDTO {
+  @IsString()
+  slug: string;
+
+  @IsString()
+  path: string;
+
+  @IsOptional()
+  @IsNumber()
+  min_width?: number;
+
+  @IsOptional()
+  @IsNumber()
+  max_width?: number;
+
+  @IsOptional()
+  @IsNumber()
+  min_height?: number;
+
+  @IsOptional()
+  @IsNumber()
+  max_height?: number;
+
+  @IsNumber()
+  width: number;
+
+  @IsNumber()
+  height: number;
+
+  @IsOptional()
+  @IsBoolean()
+  is_resizable?: boolean;
+}

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

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateDTO } from './create.dto';
-
-export class UpdateDTO extends PartialType(CreateDTO) {}
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateDTO } from './create.dto';
+
+export class UpdateDTO extends PartialType(CreateDTO) {}

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

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateDTO } from './create.dto';
-
-export class UpdateDTO extends PartialType(CreateDTO) {}
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateDTO } from './create.dto';
+
+export class UpdateDTO extends PartialType(CreateDTO) {}

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

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateDTO } from './create.dto';
-
-export class UpdateDTO extends PartialType(CreateDTO) {}
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateDTO } from './create.dto';
+
+export class UpdateDTO extends PartialType(CreateDTO) {}

package/src/dashboard/index.ts

@@ -1 +1 @@
-export * from './dashboard.module';
+export * from './dashboard.module';

package/src/user/user.controller.ts

@@ -52,11 +52,6 @@ export class UserController {
     return this.userService.get(userId);
   }
 
-  @Get('email/:email')
-  async getByEmail(@Param('email') email: string) {
-    return this.userService.getByEmail(email);
-  }
-
   @Post()
   create(@Body() data: CreateDTO) {
     return this.userService.create(data);

package/src/user/user.service.ts

@@ -20,7 +20,7 @@ export class UserService {
     private readonly prismaService: PrismaService,
     @Inject(forwardRef(() => PaginationService))
     private readonly paginationService: PaginationService,
-  ) {}
+  ) { }
 
   async listRoles(userId: number, paginationParams: PaginationDTO) {
     return this.paginationService.paginate(
@@ -99,14 +99,6 @@ export class UserService {
     });
   }
 
-  async getByEmail(email: string) {
-    return this.prismaService.user.findFirst({
-      where: {
-        email,
-      },
-    });
-  }
-
   async update({ id, data }: { id: number; data: UpdateDTO }) {
     return this.prismaService.user.update({
       where: { id },