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

chore: Correct naming of annotation-related files (#10946)

Browse Source
This commit is contained in:
Eugene
2024-09-26 13:15:08 +02:00
committed by GitHub
parent 262693be65
commit efc5d859eb
25 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/cli/src/controllers/annotation-tags.controller.ts → packages/cli/src/controllers/annotation-tags.controller.ee.ts
View File

@@ -1,6 +1,6 @@
import { Delete, Get, Patch, Post, RestController, GlobalScope } from '@/decorators';
import { AnnotationTagsRequest } from '@/requests';
import { AnnotationTagService } from '@/services/annotation-tag.service';
import { AnnotationTagService } from '@/services/annotation-tag.service.ee';
@RestController('/annotation-tags')
export class AnnotationTagsController {

4
packages/cli/src/databases/entities/annotation-tag-entity.ts → packages/cli/src/databases/entities/annotation-tag-entity.ee.ts
View File

@@ -1,8 +1,8 @@
import { Column, Entity, Index, ManyToMany, OneToMany } from '@n8n/typeorm';
import { IsString, Length } from 'class-validator';
import type { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping';
import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation';
import type { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
import { WithTimestampsAndStringId } from './abstract-entity';

4
packages/cli/src/databases/entities/annotation-tag-mapping.ts → packages/cli/src/databases/entities/annotation-tag-mapping.ee.ts
View File

@@ -1,7 +1,7 @@
import { Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
import type { AnnotationTagEntity } from './annotation-tag-entity';
import type { ExecutionAnnotation } from './execution-annotation';
import type { AnnotationTagEntity } from './annotation-tag-entity.ee';
import type { ExecutionAnnotation } from './execution-annotation.ee';
/**
* This entity represents the junction table between the execution annotations and the tags

4
packages/cli/src/databases/entities/execution-annotation.ts → packages/cli/src/databases/entities/execution-annotation.ee.ts
View File

@@ -12,8 +12,8 @@ import {
} from '@n8n/typeorm';
import type { AnnotationVote } from 'n8n-workflow';
import type { AnnotationTagEntity } from './annotation-tag-entity';
import type { AnnotationTagMapping } from './annotation-tag-mapping';
import type { AnnotationTagEntity } from './annotation-tag-entity.ee';
import type { AnnotationTagMapping } from './annotation-tag-mapping.ee';
import { ExecutionEntity } from './execution-entity';
@Entity({ name: 'execution_annotations' })

2
packages/cli/src/databases/entities/execution-entity.ts
View File

@@ -12,7 +12,7 @@ import {
} from '@n8n/typeorm';
import { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow';
import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation';
import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
import { datetimeColumnType } from './abstract-entity';
import type { ExecutionData } from './execution-data';

6
packages/cli/src/databases/entities/index.ts
View File

@@ -1,11 +1,11 @@
import { AnnotationTagEntity } from './annotation-tag-entity';
import { AnnotationTagMapping } from './annotation-tag-mapping';
import { AnnotationTagEntity } from './annotation-tag-entity.ee';
import { AnnotationTagMapping } from './annotation-tag-mapping.ee';
import { AuthIdentity } from './auth-identity';
import { AuthProviderSyncHistory } from './auth-provider-sync-history';
import { AuthUser } from './auth-user';
import { CredentialsEntity } from './credentials-entity';
import { EventDestinations } from './event-destinations';
import { ExecutionAnnotation } from './execution-annotation';
import { ExecutionAnnotation } from './execution-annotation.ee';
import { ExecutionData } from './execution-data';
import { ExecutionEntity } from './execution-entity';
import { ExecutionMetadata } from './execution-metadata';

2
packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ts → packages/cli/src/databases/repositories/annotation-tag-mapping.repository.ee.ts
View File

@@ -1,7 +1,7 @@
import { DataSource, Repository } from '@n8n/typeorm';
import { Service } from 'typedi';
import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping';
import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
@Service()
export class AnnotationTagMappingRepository extends Repository<AnnotationTagMapping> {

2
packages/cli/src/databases/repositories/annotation-tag.repository.ts → packages/cli/src/databases/repositories/annotation-tag.repository.ee.ts
View File

@@ -1,7 +1,7 @@
import { DataSource, Repository } from '@n8n/typeorm';
import { Service } from 'typedi';
import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity';
import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
@Service()
export class AnnotationTagRepository extends Repository<AnnotationTagEntity> {

2
packages/cli/src/databases/repositories/execution-annotation.repository.ts
View File

@@ -1,7 +1,7 @@
import { DataSource, Repository } from '@n8n/typeorm';
import { Service } from 'typedi';
import { ExecutionAnnotation } from '@/databases/entities/execution-annotation';
import { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
@Service()
export class ExecutionAnnotationRepository extends Repository<ExecutionAnnotation> {

6
packages/cli/src/databases/repositories/execution.repository.ts
View File

@@ -36,9 +36,9 @@ import type {
import { Service } from 'typedi';
import config from '@/config';
import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity';
import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping';
import { ExecutionAnnotation } from '@/databases/entities/execution-annotation';
import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
import { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
import { PostgresLiveRowsRetrievalError } from '@/errors/postgres-live-rows-retrieval.error';
import type { ExecutionSummaries } from '@/executions/execution.types';
import type {

2
packages/cli/src/executions/execution.service.ts
View File

@@ -21,7 +21,7 @@ import { ActiveExecutions } from '@/active-executions';
import { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
import config from '@/config';
import type { User } from '@/databases/entities/user';
import { AnnotationTagMappingRepository } from '@/databases/repositories/annotation-tag-mapping.repository';
import { AnnotationTagMappingRepository } from '@/databases/repositories/annotation-tag-mapping.repository.ee';
import { ExecutionAnnotationRepository } from '@/databases/repositories/execution-annotation.repository';
import { ExecutionRepository } from '@/databases/repositories/execution.repository';
import type { IGetExecutionsQueryFilter } from '@/databases/repositories/execution.repository';

2
packages/cli/src/generic-helpers.ts
View File

@@ -1,6 +1,6 @@
import { validate } from 'class-validator';
import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity';
import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
import type { TagEntity } from '@/databases/entities/tag-entity';
import type { User } from '@/databases/entities/user';

2
packages/cli/src/interfaces.ts
View File

@@ -26,7 +26,7 @@ import type {
import type PCancelable from 'p-cancelable';
import type { ActiveWorkflowManager } from '@/active-workflow-manager';
import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity';
import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
import type { AuthProviderType } from '@/databases/entities/auth-identity';
import type { SharedCredentials } from '@/databases/entities/shared-credentials';
import type { TagEntity } from '@/databases/entities/tag-entity';

2
packages/cli/src/server.ts
View File

@@ -35,7 +35,7 @@ import type { FrontendService } from '@/services/frontend.service';
import { OrchestrationService } from '@/services/orchestration.service';
import '@/controllers/active-workflows.controller';
import '@/controllers/annotation-tags.controller';
import '@/controllers/annotation-tags.controller.ee';
import '@/controllers/auth.controller';
import '@/controllers/binary-data.controller';
import '@/controllers/curl.controller';

4
packages/cli/src/services/annotation-tag.service.ts → packages/cli/src/services/annotation-tag.service.ee.ts
View File

@@ -1,7 +1,7 @@
import { Service } from 'typedi';
import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity';
import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository';
import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository.ee';
import { validateEntity } from '@/generic-helpers';
import type { IAnnotationTagDb, IAnnotationTagWithCountDb } from '@/interfaces';