@solidstarters/solid-core 1.2.51 → 1.2.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidstarters/solid-core",
-  "version": "1.2.51",
+  "version": "1.2.52",
   "description": "This module is a NestJS module containing all the required core providers required by a Solid application",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/controllers/list-of-values.controller.ts

@@ -0,0 +1,93 @@
+import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';
+import { AnyFilesInterceptor } from "@nestjs/platform-express";
+import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
+import { ListOfValuesService } from '../services/list-of-values.service';
+import { CreateListOfValuesDto } from '../dtos/create-list-of-values.dto';
+import { UpdateListOfValuesDto } from '../dtos/update-list-of-values.dto';
+
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
+@ApiTags('Solid Core')
+@Controller('list-of-values')
+export class ListOfValuesController {
+  constructor(private readonly service: ListOfValuesService) {}
+
+  @ApiBearerAuth("jwt")
+  @Post()
+  @UseInterceptors(AnyFilesInterceptor())
+  create(@Body() createDto: CreateListOfValuesDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.create(createDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  insertMany(@Body() createDtos: CreateListOfValuesDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+    return this.service.insertMany(createDtos, filesArray);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Put(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  update(@Param('id') id: number, @Body() updateDto: UpdateListOfValuesDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Patch(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateListOfValuesDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files, true);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk-recover')
+  async recoverMany(@Body() ids: number[]) {
+    return this.service.recoverMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get('/recover/:id')
+  async recover(@Param('id') id: number) {
+    return this.service.recover(id);
+  }
+    
+  @ApiBearerAuth("jwt")
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
+  @ApiQuery({ name: 'limit', required: false, type: Number })
+  @ApiQuery({ name: 'offset', required: false, type: Number })
+  @ApiQuery({ name: 'fields', required: false, type: Array })
+  @ApiQuery({ name: 'sort', required: false, type: Array }) 
+  @ApiQuery({ name: 'groupBy', required: false, type: Array })
+  @ApiQuery({ name: 'populate', required: false, type: Array })
+  @ApiQuery({ name: 'populateMedia', required: false, type: Array })
+  @ApiQuery({ name: 'filters', required: false, type: Array })
+  @Get()
+  async findMany(@Query() query: any) { 
+    return this.service.find(query);  
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get(':id')
+  async findOne(@Param('id') id: string, @Query() query: any) {
+    return this.service.findOne(+id, query);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete('/bulk')
+  async deleteMany(@Body() ids: number[]) {
+    return this.service.deleteMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete(':id')
+  async delete(@Param('id') id: number) {
+    return this.service.delete(id);
+  }
+
+
+}

package/src/controllers/saved-filters.controller.ts

@@ -0,0 +1,93 @@
+import { Controller, Post, Body, Param, UploadedFiles, UseInterceptors, Put, Get, Query, Delete, Patch } from '@nestjs/common';
+import { AnyFilesInterceptor } from "@nestjs/platform-express";
+import { ApiBearerAuth, ApiQuery, ApiTags } from '@nestjs/swagger';
+import { SavedFiltersService } from '../services/saved-filters.service';
+import { CreateSavedFiltersDto } from '../dtos/create-saved-filters.dto';
+import { UpdateSavedFiltersDto } from '../dtos/update-saved-filters.dto';
+
+enum ShowSoftDeleted {
+  INCLUSIVE = "inclusive",
+  EXCLUSIVE = "exclusive",
+}
+
+@ApiTags('Solid Core')
+@Controller('saved-filters')
+export class SavedFiltersController {
+  constructor(private readonly service: SavedFiltersService) {}
+
+  @ApiBearerAuth("jwt")
+  @Post()
+  @UseInterceptors(AnyFilesInterceptor())
+  create(@Body() createDto: CreateSavedFiltersDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.create(createDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk')
+  @UseInterceptors(AnyFilesInterceptor())
+  insertMany(@Body() createDtos: CreateSavedFiltersDto[], @UploadedFiles() filesArray: Express.Multer.File[][] = []) {
+    return this.service.insertMany(createDtos, filesArray);
+  }
+
+
+  @ApiBearerAuth("jwt")
+  @Put(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  update(@Param('id') id: number, @Body() updateDto: UpdateSavedFiltersDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Patch(':id')
+  @UseInterceptors(AnyFilesInterceptor())
+  partialUpdate(@Param('id') id: number, @Body() updateDto: UpdateSavedFiltersDto, @UploadedFiles() files: Array<Express.Multer.File>) {
+    return this.service.update(id, updateDto, files, true);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Post('/bulk-recover')
+  async recoverMany(@Body() ids: number[]) {
+    return this.service.recoverMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get('/recover/:id')
+  async recover(@Param('id') id: number) {
+    return this.service.recover(id);
+  }
+    
+  @ApiBearerAuth("jwt")
+  @ApiQuery({ name: 'showSoftDeleted', required: false, enum: ShowSoftDeleted })
+  @ApiQuery({ name: 'limit', required: false, type: Number })
+  @ApiQuery({ name: 'offset', required: false, type: Number })
+  @ApiQuery({ name: 'fields', required: false, type: Array })
+  @ApiQuery({ name: 'sort', required: false, type: Array }) 
+  @ApiQuery({ name: 'groupBy', required: false, type: Array })
+  @ApiQuery({ name: 'populate', required: false, type: Array })
+  @ApiQuery({ name: 'populateMedia', required: false, type: Array })
+  @ApiQuery({ name: 'filters', required: false, type: Array })
+  @Get()
+  async findMany(@Query() query: any) { 
+    return this.service.find(query);  
+  }
+
+  @ApiBearerAuth("jwt")
+  @Get(':id')
+  async findOne(@Param('id') id: string, @Query() query: any) {
+    return this.service.findOne(+id, query);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete('/bulk')
+  async deleteMany(@Body() ids: number[]) {
+    return this.service.deleteMany(ids);
+  }
+
+  @ApiBearerAuth("jwt")
+  @Delete(':id')
+  async delete(@Param('id') id: number) {
+    return this.service.delete(id);
+  }
+
+
+}

package/src/dtos/create-list-of-values.dto.ts

@@ -1,22 +1,30 @@
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString } from 'class-validator';
+import { IsNotEmpty, IsBoolean, IsOptional, IsInt } from 'class-validator';
 
 export class CreateListOfValuesDto {
-
-    @ApiProperty({ description: "Type of the LOV" })
-    readonly type : string;
-
-    @ApiProperty({ description: "Value of the LOV" })
-    readonly value: string;
-
-    @ApiProperty({ description: "Display of the LOV" })
-    readonly display: string;
-
-    @ApiProperty({ description: "Description of the LOV" })
-    readonly description: string;
-
-    @ApiProperty({ description: "Default value of the LOV type" })
-    readonly default : boolean;
-
-    @ApiProperty({ description: "Sequence of the LOV" })
-    readonly sequence: number;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    type: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    value: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    display: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    description: string;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    default: boolean = false;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    sequence: number;
 }

package/src/dtos/create-saved-filters.dto.ts

@@ -0,0 +1,42 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsString } from 'class-validator';
+import { IsOptional, IsNotEmpty, IsBoolean, IsInt } from 'class-validator';
+
+export class CreateSavedFiltersDto {
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    filterQueryJson: string;
+    @IsNotEmpty()
+    @IsString()
+    @ApiProperty()
+    name: string;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    isPrivate: boolean = false;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "This is the user id field" })
+    userId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "This is the user id field" })
+    userUserKey: string;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "This is the model related to saved filter." })
+    modelId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "This is the model related to saved filter." })
+    modelUserKey: string;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "This is the view related to saved filter." })
+    viewId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "This is the view related to saved filter." })
+    viewUserKey: string;
+}

package/src/dtos/update-list-of-values.dto.ts

@@ -0,0 +1,36 @@
+import { IsInt,IsOptional, IsString, IsNotEmpty, IsBoolean } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UpdateListOfValuesDto {
+    @IsOptional()
+    @IsInt()
+    id: number;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    type: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    value: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    display: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    description: string;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    default: boolean;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    sequence: number;
+}

package/src/dtos/update-saved-filters.dto.ts

@@ -0,0 +1,45 @@
+import { IsInt,IsOptional, IsString, IsNotEmpty, IsBoolean } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UpdateSavedFiltersDto {
+    @IsOptional()
+    @IsInt()
+    id: number;
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    filterQueryJson: string;
+    @IsNotEmpty()
+    @IsOptional()
+    @IsString()
+    @ApiProperty()
+    name: string;
+    @IsOptional()
+    @IsBoolean()
+    @ApiProperty()
+    isPrivate: boolean;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "This is the user id field" })
+    userId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "This is the user id field" })
+    userUserKey: string;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "This is the model related to saved filter." })
+    modelId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "This is the model related to saved filter." })
+    modelUserKey: string;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty({ description: "This is the view related to saved filter." })
+    viewId: number;
+    @IsString()
+    @IsOptional()
+    @ApiProperty({ description: "This is the view related to saved filter." })
+    viewUserKey: string;
+}

package/src/entities/list-of-values.entity.ts

@@ -1,23 +1,18 @@
-import { CommonEntity } from "src/entities/common.entity";
-import { Column, Entity } from "typeorm";
+import { CommonEntity } from 'src/entities/common.entity'
+import {Entity, Column} from 'typeorm'
 
 @Entity("ss_list_of_values")
 export class ListOfValues extends CommonEntity {
-    @Column({ name: "type" })
+    @Column({ type: "varchar" })
     type: string;
-
-    @Column({ name: "value" })
+    @Column({ type: "varchar" })
     value: string;
-
-    @Column({ name: "display" })
+    @Column({ type: "varchar" })
     display: string;
-
-    @Column({ name: "description" })
+    @Column({ type: "varchar" })
     description: string;
-
-    @Column({ name: "default" })
-    default: boolean;
-
-    @Column({ name: "sequence" })
+    @Column({ type: "boolean", nullable: true, default: false })
+    default: boolean = false;
+    @Column({ type: "int", nullable: true })
     sequence: number;
 }

package/src/entities/saved-filters.entity.ts

@@ -0,0 +1,24 @@
+import { CommonEntity } from 'src/entities/common.entity'
+import {Entity, Column, JoinColumn, ManyToOne} from 'typeorm';
+import { User } from 'src/entities/user.entity';
+import { ModelMetadata } from 'src/entities/model-metadata.entity';
+import { ViewMetadata } from 'src/entities/view-metadata.entity'
+
+@Entity("ss_saved_fitlers")
+export class SavedFilters extends CommonEntity {
+    @Column({ type: "text", nullable: true })
+    filterQueryJson: string;
+    @Column({ type: "varchar" })
+    name: string;
+    @Column({ type: "boolean", nullable: true, default: false })
+    isPrivate: boolean = false;
+    @ManyToOne(() => User, { onDelete: "RESTRICT", nullable: false })
+    @JoinColumn()
+    user: User;
+    @ManyToOne(() => ModelMetadata, { onDelete: "RESTRICT", nullable: false })
+    @JoinColumn()
+    model: ModelMetadata;
+    @ManyToOne(() => ViewMetadata, { onDelete: "RESTRICT", nullable: false })
+    @JoinColumn()
+    view: ViewMetadata;
+}

package/src/index.ts

@@ -102,8 +102,10 @@ export * from './entities/user-password-history.entity'
 export * from './entities/user.entity'
 export * from './entities/view-metadata.entity'
 export * from './entities/setting.entity'
+export * from './entities/saved-filters.entity'
 export * from './entities/user-view-metadata.entity'
 export * from './entities/security-rule.entity'
+export * from './entities/saved-filters.entity'
 
 export * from './enums/auth-type.enum'
 

package/src/providers/list-of-values-selection-providers.service.ts

@@ -32,8 +32,8 @@ export class ListOfValuesSelectionProvider implements ISelectionProvider<ListOfV
 
     async values(query: string, ctxt: ListOfValuesProviderContext): Promise<readonly ISelectionProviderValues[]> {
         const paginatedQuery = new PaginationQueryDto(DEFAULT_LIMIT, 0);
-        const lovs = await this.listOfValuesService.findAll(paginatedQuery);
-        const selectionValues = lovs.map(lov => {
+        const lovs = await this.listOfValuesService.find(paginatedQuery);
+        const selectionValues = lovs.records.map(lov => {
             return {
                 label: lov.display,
                 value: lov.value

package/src/seeders/module-metadata-seeder.service.ts

@@ -34,6 +34,8 @@ import { SettingService } from 'src/services/setting.service';
 import { Setting } from 'src/entities/setting.entity';
 import { CreateSecurityRuleDto } from 'src/dtos/create-security-rule.dto';
 import { SecurityRuleRepository } from 'src/repository/security-rule.repository';
+import { ListOfValuesService } from 'src/services/list-of-values.service';
+import { CreateListOfValuesDto } from 'src/dtos/create-list-of-values.dto';
 
 @Injectable()
 export class ModuleMetadataSeederService {
@@ -53,6 +55,7 @@ export class ModuleMetadataSeederService {
         private readonly mediaStorageProviderSeederService: MediaStorageProviderMetadataSeederService,
         private readonly emailTemplateService: EmailTemplateService,
         private readonly smsTemplateService: SmsTemplateService,
+        private readonly listOfValuesService: ListOfValuesService,
         @InjectRepository(PermissionMetadata)
         private readonly permissionRepo: Repository<PermissionMetadata>,
         private readonly solidRegistry: SolidRegistry,
@@ -61,7 +64,7 @@ export class ModuleMetadataSeederService {
         @Inject(iamConfig.KEY) private readonly iamConfiguration: ConfigType<typeof iamConfig>,
         @Inject(commonConfig.KEY)
         private readonly commonConfiguration: ConfigType<typeof commonConfig>,
-        private readonly service: SettingService,
+        private readonly seetingService: SettingService,
         @InjectRepository(Setting, 'default')
         readonly settingsRepo: Repository<Setting>,
         readonly securityRuleRepo: SecurityRuleRepository,
@@ -204,6 +207,12 @@ export class ModuleMetadataSeederService {
             await this.seedSecurityRules(securityRules);
             this.logger.debug(`[End] Processing security rules for ${moduleMetadata.name}`);
 
+            // List Of Values
+            this.logger.debug(`[Start] Processing security rules for ${moduleMetadata.name}`);
+            const listOfValues: CreateListOfValuesDto[] = overallMetadata.listOfValues;
+            await this.seedListOfValues(listOfValues);
+            this.logger.debug(`[End] Processing List Of Values for ${moduleMetadata.name}`);
+
             this.logger.debug(`[End] module seed data: ${overallMetadata}`);
 
         }
@@ -499,7 +508,7 @@ export class ModuleMetadataSeederService {
     async seedSettings(createDto: CreateSettingDto) {
         const settingsArray: any[] = await this.settingsRepo.find();
         if (!settingsArray || settingsArray.length === 0) {
-            this.service.create(createDto);
+            this.seetingService.create(createDto);
         }
     }
 
@@ -509,7 +518,17 @@ export class ModuleMetadataSeederService {
             return;
         }
         for (const dto of rulesDto) {
-            await this.securityRuleRepo.upsertWithDto({...dto, securityRuleConfig: JSON.stringify(dto.securityRuleConfig)});
+            await this.securityRuleRepo.upsertWithDto({ ...dto, securityRuleConfig: JSON.stringify(dto.securityRuleConfig) });
+        }
+    }
+
+    async seedListOfValues(listOfValuesDto: CreateListOfValuesDto[]) {
+        if (!listOfValuesDto || listOfValuesDto.length === 0) {
+            this.logger.debug(`No List Of Values found to seed`);
+            return;
+        }
+        for (let j = 0; j < listOfValuesDto.length; j++) {
+            await this.listOfValuesService.upsert(listOfValuesDto);
         }
     }