@solidstarters/solid-core 1.2.46 → 1.2.47

package/src/dtos/update-view-metadata.dto.ts

@@ -1,50 +1,66 @@
-import { IsInt, IsOptional, IsString, Matches, IsNotEmpty, IsJSON } from 'class-validator';
+import { IsInt, IsOptional, IsString, Matches, IsNotEmpty, IsJSON, ValidateNested, IsArray } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+import { Type } from 'class-transformer';
+import { UpdateUserViewMetadataDto } from 'src/dtos/update-user-view-metadata.dto';
+
 export class UpdateViewMetadataDto {
     @IsOptional()
     @IsInt()
     id: number;
-
-    @IsOptional()
     @IsNotEmpty()
+    @IsOptional()
     @Matches(/[a-z]+(-[a-z]+)*/)
     @IsString()
+    @ApiProperty()
     name: string;
-
-    @IsOptional()
     @IsNotEmpty()
+    @IsOptional()
     @IsString()
+    @ApiProperty()
     displayName: string;
-
-    @IsOptional()
     @IsNotEmpty()
+    @IsOptional()
     @IsString()
+    @ApiProperty()
     type: string;
-
-    @IsOptional()
     @IsNotEmpty()
+    @IsOptional()
     @IsJSON()
+    @ApiProperty()
     context: any;
-
-    @IsOptional()
     @IsNotEmpty()
+    @IsOptional()
     @IsJSON()
+    @ApiProperty()
     layout: any;
-
     @IsOptional()
-    @IsNotEmpty()
+    @IsInt()
+    @ApiProperty()
     moduleId: number;
-
-    @IsOptional()
     @IsString()
     @IsOptional()
+    @ApiProperty()
     moduleUserKey: string;
-
     @IsOptional()
-    @IsNotEmpty()
+    @IsInt()
+    @ApiProperty()
     modelId: number;
-
-    @IsOptional()
     @IsString()
     @IsOptional()
+    @ApiProperty()
     modelUserKey: string;
+    @IsOptional()
+    @ApiProperty()
+    @IsArray()
+    @ValidateNested({ each: true })
+    @Type(() => UpdateUserViewMetadataDto)
+    userViewMetadata: UpdateUserViewMetadataDto[];
+    @IsOptional()
+    @IsArray()
+    @ApiProperty()
+    userViewMetadataIds: number[];
+    @IsString()
+    @IsOptional()
+    @ApiProperty()
+    userViewMetadataCommand: string;
 }

package/src/dtos/upsert-user-view-metadata.dto.ts

@@ -0,0 +1,17 @@
+import { IsInt, IsOptional, IsJSON } from 'class-validator';
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UpsertUserViewMetadataDto {
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    userId: number;
+    @IsOptional()
+    @IsInt()
+    @ApiProperty()
+    viewMetadataId: number;
+    @IsOptional()
+    @IsJSON()
+    @ApiProperty()
+    layout: any;
+}

package/src/entities/user-view-metadata.entity.ts

@@ -0,0 +1,18 @@
+import { CommonEntity } from 'src/entities/common.entity'
+import { Entity, JoinColumn, ManyToOne, Index, Column } from 'typeorm';
+import { ViewMetadata } from 'src/entities/view-metadata.entity';
+import { User } from 'src/entities/user.entity'
+
+@Entity("ss_user_view_metadata")
+export class UserViewMetadata extends CommonEntity {
+    @Index()
+    @ManyToOne(() => User, { onDelete: "CASCADE", nullable: false })
+    @JoinColumn()
+    user: User;
+    @Column({ name: "layout", type: "text", nullable: true })
+    layout: any = "{}";
+    @Index()
+    @ManyToOne(() => ViewMetadata, { onDelete: "CASCADE", nullable: false })
+    @JoinColumn()
+    viewMetadata: ViewMetadata;
+}

package/src/entities/user.entity.ts

@@ -1,100 +1,72 @@
 import { CommonEntity } from "src/entities/common.entity"
-import { Entity, Column, Index, JoinTable, ManyToMany } from "typeorm";
-import { RoleMetadata } from 'src/entities/role-metadata.entity'
-@Entity("ss_user")
-@Index(["username", "deletedTracker"], { unique: true })
-@Index(["email", "deletedTracker"], { unique: true })
-@Index(["mobile", "deletedTracker"], { unique: true })
+import { Entity, Column, Index, JoinTable, ManyToMany, OneToMany } from "typeorm";
+import { RoleMetadata } from 'src/entities/role-metadata.entity';
+import { UserViewMetadata } from 'src/entities/user-view-metadata.entity'
 
+@Entity("ss_user")
 export class User extends CommonEntity {
     @Column({ type: "varchar", nullable: true })
     fullName: string;
-
-    @Index()
-    @Column({ type: "varchar", })
+    @Index({ unique: true })
+    @Column({ type: "varchar" })
     username: string;
-
-    @Index()
-    @Column({ type: "varchar",  nullable: true })
+    @Index({ unique: true })
+    @Column({ type: "varchar", nullable: true })
     email: string;
-
-    @Index()
-    @Column({ type: "varchar",  nullable: true })
+    @Index({ unique: true })
+    @Column({ type: "varchar", nullable: true })
     mobile: string;
-
     @Column({ type: "varchar", nullable: true })
     password: string;
-
     @Column({ type: "boolean", nullable: true, default: true })
     forcePasswordChange: boolean = true;
-
     @Column({ type: "varchar", default: "local" })
     lastLoginProvider: string = "local";
-
     @Column({ type: "varchar", nullable: true })
     accessCode: string;
-
     @Column({ type: "varchar", nullable: true })
     googleAccessToken: string;
-
     @Column({ type: "varchar", nullable: true })
     googleId: string;
-
     @Column({ type: "varchar", nullable: true })
     googleProfilePicture: string;
-
     @Column({ type: "boolean", default: true })
     active: boolean = true;
-
     @Column({ type: "timestamp", nullable: true })
     forgotPasswordConfirmedAt: Date;
-
     @Column({ type: "varchar", nullable: true })
     verificationTokenOnForgotPassword: string;
-
     @Column({ type: "timestamp", nullable: true })
     verificationTokenOnForgotPasswordExpiresAt: Date;
-
     @Column({ type: "timestamp", nullable: true })
     emailVerifiedOnRegistrationAt: Date;
-
     @Column({ type: "varchar", nullable: true })
     emailVerificationTokenOnRegistration: string;
-
     @Column({ type: "timestamp", nullable: true })
     emailVerificationTokenOnRegistrationExpiresAt: Date;
-
     @Column({ type: "timestamp", nullable: true })
     mobileVerifiedOnRegistrationAt: Date;
-
     @Column({ type: "varchar", nullable: true })
     mobileVerificationTokenOnRegistration: string;
-
     @Column({ type: "timestamp", nullable: true })
     mobileVerificationTokenOnRegistrationExpiresAt: Date;
-
     @Column({ type: "timestamp", nullable: true })
     emailVerifiedOnLoginAt: Date;
-
     @Column({ type: "varchar", nullable: true })
     emailVerificationTokenOnLogin: string;
-
     @Column({ type: "timestamp", nullable: true })
     emailVerificationTokenOnLoginExpiresAt: Date;
-
     @Column({ type: "timestamp", nullable: true })
     mobileVerifiedOnLoginAt: Date;
-
     @Column({ type: "varchar", nullable: true })
     mobileVerificationTokenOnLogin: string;
-
     @Column({ type: "timestamp", nullable: true })
     mobileVerificationTokenOnLoginExpiresAt: Date;
-
     @Column({ type: "varchar", nullable: true })
     customPayload: string;
-
     @ManyToMany(() => RoleMetadata, roleMetadata => roleMetadata.users, { cascade: true })
     @JoinTable()
     roles: RoleMetadata[];
+    @OneToMany(() => UserViewMetadata, userViewMetadata => userViewMetadata.user, { cascade: true })
+    userViewMetadata: UserViewMetadata[];
 }

package/src/entities/view-metadata.entity.ts

@@ -1,31 +1,30 @@
 import { CommonEntity } from "src/entities/common.entity"
-import { Entity, Column, ManyToOne, Index, JoinColumn } from "typeorm";
+import { Entity, Column, ManyToOne, Index, JoinColumn, OneToMany } from "typeorm";
 import { ModuleMetadata } from 'src/entities/module-metadata.entity';
-import { ModelMetadata } from 'src/entities/model-metadata.entity'
+import { ModelMetadata } from 'src/entities/model-metadata.entity';
+import { UserViewMetadata } from 'src/entities/user-view-metadata.entity'
+
 @Entity("ss_view_metadata")
 export class ViewMetadata extends CommonEntity {
+    @Index({ unique: true })
     @Column({ name: "name", type: "varchar", unique: true })
     name: string;
-
     @Column({ name: "display_name", type: "varchar" })
     displayName: string;
-
     @Column({ name: "type", type: "varchar" })
     type: string;
-
     @Column({ name: "context", type: "text" })
-    context: any;
-
+    context: any = "{}";
     @Column({ name: "layout", type: "text" })
     layout: any;
-
     @Index()
-    @ManyToOne(() => ModuleMetadata, { onDelete: "CASCADE" })
-    @JoinColumn({ name: 'module_id', referencedColumnName: 'id' })
+    @ManyToOne(() => ModuleMetadata, { onDelete: "CASCADE", nullable: false })
+    @JoinColumn({ referencedColumnName: 'id' })
     module: ModuleMetadata;
-
     @Index()
-    @ManyToOne(() => ModelMetadata, { onDelete: "CASCADE" })
-    @JoinColumn({ name: 'model_id', referencedColumnName: 'id' })
+    @ManyToOne(() => ModelMetadata, { onDelete: "CASCADE", nullable: false })
+    @JoinColumn({ referencedColumnName: 'id' })
     model: ModelMetadata;
+    @OneToMany(() => UserViewMetadata, userViewMetadata => userViewMetadata.viewMetadata, { cascade: true })
+    userViewMetadata: UserViewMetadata[];
 }

package/src/index.ts

@@ -100,6 +100,7 @@ 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/user-view-metadata.entity'
 
 export * from './enums/auth-type.enum'
 

package/src/interfaces.ts

@@ -73,7 +73,7 @@ export interface ISelectionProvider<T extends ISelectionProviderContext> {
 
   value(optionValue: string, ctxt: T): Promise<ISelectionProviderValues | any>;
 
-  values(query: string, ctxt: T): Promise<readonly ISelectionProviderValues[]>;
+  values(query: any, ctxt: T): Promise<readonly ISelectionProviderValues[]>;
 }
 
 export interface IComputedFieldProvider<T> {