mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: Upgrade typeorm to 0.3.x (#5151)

Browse Source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2023-01-13 18:12:22 +01:00
committed by GitHub
parent 6608e69457
commit 0a5ab560b1
85 changed files with 579 additions and 636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/cli/src/databases/entities/Role.ts
View File

@@ -1,10 +1,11 @@
import { Column, Entity, OneToMany, PrimaryGeneratedColumn, Unique } from 'typeorm';
import { Column, Entity, OneToMany, PrimaryColumn, Unique } from 'typeorm';
import { IsString, Length } from 'class-validator';
import type { User } from './User';
import type { SharedWorkflow } from './SharedWorkflow';
import type { SharedCredentials } from './SharedCredentials';
import { AbstractEntity } from './AbstractEntity';
import { idStringifier } from '../utils/transformers';
export type RoleNames = 'owner' | 'member' | 'user' | 'editor';
export type RoleScopes = 'global' | 'workflow' | 'credential';
@@ -12,8 +13,8 @@ export type RoleScopes = 'global' | 'workflow' | 'credential';
@Entity()
@Unique(['scope', 'name'])
export class Role extends AbstractEntity {
@PrimaryGeneratedColumn()
id: number;
@PrimaryColumn({ transformer: idStringifier })
id: string;
@Column({ length: 32 })
@IsString({ message: 'Role name must be of type string.' })

14
packages/cli/src/databases/entities/SharedCredentials.ts
View File

@@ -1,4 +1,4 @@
import { Entity, ManyToOne, PrimaryColumn, RelationId } from 'typeorm';
import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
import type { CredentialsEntity } from './CredentialsEntity';
import type { User } from './User';
import type { Role } from './Role';
@@ -10,20 +10,18 @@ export class SharedCredentials extends AbstractEntity {
@ManyToOne('Role', 'sharedCredentials', { nullable: false })
role: Role;
@ManyToOne('User', 'sharedCredentials', { primary: true })
@Column()
roleId: string;
@ManyToOne('User', 'sharedCredentials')
user: User;
@PrimaryColumn()
@RelationId((sharedCredential: SharedCredentials) => sharedCredential.user)
userId: string;
@ManyToOne('CredentialsEntity', 'shared', {
primary: true,
onDelete: 'CASCADE',
})
@ManyToOne('CredentialsEntity', 'shared')
credentials: CredentialsEntity;
@PrimaryColumn({ transformer: idStringifier })
@RelationId((sharedCredential: SharedCredentials) => sharedCredential.credentials)
credentialsId: string;
}

14
packages/cli/src/databases/entities/SharedWorkflow.ts
View File

@@ -1,4 +1,4 @@
import { Entity, ManyToOne, PrimaryColumn, RelationId } from 'typeorm';
import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
import type { WorkflowEntity } from './WorkflowEntity';
import type { User } from './User';
import type { Role } from './Role';
@@ -10,20 +10,18 @@ export class SharedWorkflow extends AbstractEntity {
@ManyToOne('Role', 'sharedWorkflows', { nullable: false })
role: Role;
@ManyToOne('User', 'sharedWorkflows', { primary: true })
@Column()
roleId: string;
@ManyToOne('User', 'sharedWorkflows')
user: User;
@PrimaryColumn()
@RelationId((sharedWorkflow: SharedWorkflow) => sharedWorkflow.user)
userId: string;
@ManyToOne('WorkflowEntity', 'shared', {
primary: true,
onDelete: 'CASCADE',
})
@ManyToOne('WorkflowEntity', 'shared')
workflow: WorkflowEntity;
@PrimaryColumn({ transformer: idStringifier })
@RelationId((sharedWorkflow: SharedWorkflow) => sharedWorkflow.workflow)
workflowId: string;
}

8
packages/cli/src/databases/entities/User.ts
View File

@@ -74,12 +74,12 @@ export class User extends AbstractEntity implements IUser {
})
settings: IUserSettings | null;
@ManyToOne('Role', 'globalForUsers', {
cascade: true,
nullable: false,
})
@ManyToOne('Role', 'globalForUsers', { nullable: false })
globalRole: Role;
@Column()
globalRoleId: string;
@OneToMany('SharedWorkflow', 'user')
sharedWorkflows: SharedWorkflow[];

8
packages/cli/src/databases/entities/WorkflowStatistics.ts
View File

@@ -1,4 +1,4 @@
import { Column, Entity, RelationId, ManyToOne, PrimaryColumn } from 'typeorm';
import { Column, Entity, ManyToOne, PrimaryColumn } from 'typeorm';
import { idStringifier } from '../utils/transformers';
import { datetimeColumnType } from './AbstractEntity';
import type { WorkflowEntity } from './WorkflowEntity';
@@ -22,13 +22,9 @@ export class WorkflowStatistics {
@PrimaryColumn({ length: 128 })
name: StatisticsNames;
@ManyToOne('WorkflowEntity', 'shared', {
primary: true,
onDelete: 'CASCADE',
})
@ManyToOne('WorkflowEntity', 'shared')
workflow: WorkflowEntity;
@PrimaryColumn({ transformer: idStringifier })
@RelationId((workflowStatistics: WorkflowStatistics) => workflowStatistics.workflow)
workflowId: string;
}