mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-01-11 12:57:29 -08:00
Code Issues Actions 2 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
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
25 changed files with 46 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/cli/.eslintrc.js
View file

@ -71,5 +71,11 @@ module.exports = {
], ],
}, },
}, },
{
files: ['./test/**/*.ts', './src/**/__tests__/**/*.ts'],
rules: {
'n8n-local-rules/no-dynamic-import-template': 'off',
},
},
], ],
}; };

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 { Delete, Get, Patch, Post, RestController, GlobalScope } from '@/decorators';
import { AnnotationTagsRequest } from '@/requests'; import { AnnotationTagsRequest } from '@/requests';
import { AnnotationTagService } from '@/services/annotation-tag.service'; import { AnnotationTagService } from '@/services/annotation-tag.service.ee';
@RestController('/annotation-tags') @RestController('/annotation-tags')
export class AnnotationTagsController { 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 { Column, Entity, Index, ManyToMany, OneToMany } from '@n8n/typeorm';
import { IsString, Length } from 'class-validator'; import { IsString, Length } from 'class-validator';
import type { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping'; import type { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation'; import type { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
import { WithTimestampsAndStringId } from './abstract-entity'; 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 { Entity, JoinColumn, ManyToOne, PrimaryColumn } from '@n8n/typeorm';
import type { AnnotationTagEntity } from './annotation-tag-entity'; import type { AnnotationTagEntity } from './annotation-tag-entity.ee';
import type { ExecutionAnnotation } from './execution-annotation'; import type { ExecutionAnnotation } from './execution-annotation.ee';
/** /**
* This entity represents the junction table between the execution annotations and the tags * 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'; } from '@n8n/typeorm';
import type { AnnotationVote } from 'n8n-workflow'; import type { AnnotationVote } from 'n8n-workflow';
import type { AnnotationTagEntity } from './annotation-tag-entity'; import type { AnnotationTagEntity } from './annotation-tag-entity.ee';
import type { AnnotationTagMapping } from './annotation-tag-mapping'; import type { AnnotationTagMapping } from './annotation-tag-mapping.ee';
import { ExecutionEntity } from './execution-entity'; import { ExecutionEntity } from './execution-entity';
@Entity({ name: 'execution_annotations' }) @Entity({ name: 'execution_annotations' })

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

@ -12,7 +12,7 @@ import {
} from '@n8n/typeorm'; } from '@n8n/typeorm';
import { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow'; 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 { datetimeColumnType } from './abstract-entity';
import type { ExecutionData } from './execution-data'; 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 { AnnotationTagEntity } from './annotation-tag-entity.ee';
import { AnnotationTagMapping } from './annotation-tag-mapping'; import { AnnotationTagMapping } from './annotation-tag-mapping.ee';
import { AuthIdentity } from './auth-identity'; import { AuthIdentity } from './auth-identity';
import { AuthProviderSyncHistory } from './auth-provider-sync-history'; import { AuthProviderSyncHistory } from './auth-provider-sync-history';
import { AuthUser } from './auth-user'; import { AuthUser } from './auth-user';
import { CredentialsEntity } from './credentials-entity'; import { CredentialsEntity } from './credentials-entity';
import { EventDestinations } from './event-destinations'; import { EventDestinations } from './event-destinations';
import { ExecutionAnnotation } from './execution-annotation'; import { ExecutionAnnotation } from './execution-annotation.ee';
import { ExecutionData } from './execution-data'; import { ExecutionData } from './execution-data';
import { ExecutionEntity } from './execution-entity'; import { ExecutionEntity } from './execution-entity';
import { ExecutionMetadata } from './execution-metadata'; 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 { DataSource, Repository } from '@n8n/typeorm';
import { Service } from 'typedi'; import { Service } from 'typedi';
import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping'; import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
@Service() @Service()
export class AnnotationTagMappingRepository extends Repository<AnnotationTagMapping> { 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 { DataSource, Repository } from '@n8n/typeorm';
import { Service } from 'typedi'; import { Service } from 'typedi';
import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity'; import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
@Service() @Service()
export class AnnotationTagRepository extends Repository<AnnotationTagEntity> { 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 { DataSource, Repository } from '@n8n/typeorm';
import { Service } from 'typedi'; import { Service } from 'typedi';
import { ExecutionAnnotation } from '@/databases/entities/execution-annotation'; import { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
@Service() @Service()
export class ExecutionAnnotationRepository extends Repository<ExecutionAnnotation> { 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 { Service } from 'typedi';
import config from '@/config'; import config from '@/config';
import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity'; import { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping'; import { AnnotationTagMapping } from '@/databases/entities/annotation-tag-mapping.ee';
import { ExecutionAnnotation } from '@/databases/entities/execution-annotation'; import { ExecutionAnnotation } from '@/databases/entities/execution-annotation.ee';
import { PostgresLiveRowsRetrievalError } from '@/errors/postgres-live-rows-retrieval.error'; import { PostgresLiveRowsRetrievalError } from '@/errors/postgres-live-rows-retrieval.error';
import type { ExecutionSummaries } from '@/executions/execution.types'; import type { ExecutionSummaries } from '@/executions/execution.types';
import type { 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 { ConcurrencyControlService } from '@/concurrency/concurrency-control.service';
import config from '@/config'; import config from '@/config';
import type { User } from '@/databases/entities/user'; 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 { ExecutionAnnotationRepository } from '@/databases/repositories/execution-annotation.repository';
import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ExecutionRepository } from '@/databases/repositories/execution.repository';
import type { IGetExecutionsQueryFilter } 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 { 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 { CredentialsEntity } from '@/databases/entities/credentials-entity';
import type { TagEntity } from '@/databases/entities/tag-entity'; import type { TagEntity } from '@/databases/entities/tag-entity';
import type { User } from '@/databases/entities/user'; 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 PCancelable from 'p-cancelable';
import type { ActiveWorkflowManager } from '@/active-workflow-manager'; 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 { AuthProviderType } from '@/databases/entities/auth-identity';
import type { SharedCredentials } from '@/databases/entities/shared-credentials'; import type { SharedCredentials } from '@/databases/entities/shared-credentials';
import type { TagEntity } from '@/databases/entities/tag-entity'; 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 { OrchestrationService } from '@/services/orchestration.service';
import '@/controllers/active-workflows.controller'; import '@/controllers/active-workflows.controller';
import '@/controllers/annotation-tags.controller'; import '@/controllers/annotation-tags.controller.ee';
import '@/controllers/auth.controller'; import '@/controllers/auth.controller';
import '@/controllers/binary-data.controller'; import '@/controllers/binary-data.controller';
import '@/controllers/curl.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 { Service } from 'typedi';
import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity'; import type { AnnotationTagEntity } from '@/databases/entities/annotation-tag-entity.ee';
import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository'; import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository.ee';
import { validateEntity } from '@/generic-helpers'; import { validateEntity } from '@/generic-helpers';
import type { IAnnotationTagDb, IAnnotationTagWithCountDb } from '@/interfaces'; import type { IAnnotationTagDb, IAnnotationTagWithCountDb } from '@/interfaces';

2
packages/cli/test/integration/shared/db/executions.ts
View file

@ -4,7 +4,7 @@ import Container from 'typedi';
import type { ExecutionData } from '@/databases/entities/execution-data'; import type { ExecutionData } from '@/databases/entities/execution-data';
import type { ExecutionEntity } from '@/databases/entities/execution-entity'; import type { ExecutionEntity } from '@/databases/entities/execution-entity';
import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository'; import { AnnotationTagRepository } from '@/databases/repositories/annotation-tag.repository.ee';
import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository'; import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository';
import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository'; import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository';
import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ExecutionRepository } from '@/databases/repositories/execution.repository';

15
packages/cli/test/integration/shared/test-db.ts
View file

@ -87,9 +87,18 @@ const repositories = [
*/ */
export async function truncate(names: Array<(typeof repositories)[number]>) { export async function truncate(names: Array<(typeof repositories)[number]>) {
for (const name of names) { for (const name of names) {
const RepositoryClass: Class<Repository<object>> = let RepositoryClass: Class<Repository<object>>;
// eslint-disable-next-line n8n-local-rules/no-dynamic-import-template
(await import(`@/databases/repositories/${kebabCase(name)}.repository`))[`${name}Repository`]; try {
RepositoryClass = (await import(`@/databases/repositories/${kebabCase(name)}.repository`))[
`${name}Repository`
];
} catch (e) {
RepositoryClass = (await import(`@/databases/repositories/${kebabCase(name)}.repository.ee`))[
`${name}Repository`
];
}
await Container.get(RepositoryClass).delete({}); await Container.get(RepositoryClass).delete({});
} }
} }

2
packages/cli/test/integration/shared/utils/test-server.ts
View file

@ -140,7 +140,7 @@ export const setupTestServer = ({
for (const group of endpointGroups) { for (const group of endpointGroups) {
switch (group) { switch (group) {
case 'annotationTags': case 'annotationTags':
await import('@/controllers/annotation-tags.controller'); await import('@/controllers/annotation-tags.controller.ee');
break; break;
case 'credentials': case 'credentials':

0
packages/editor-ui/src/components/AnnotationTagsContainer.vue → packages/editor-ui/src/components/AnnotationTagsContainer.ee.vue
View file

0
packages/editor-ui/src/components/AnnotationTagsDropdown.vue → packages/editor-ui/src/components/AnnotationTagsDropdown.ee.vue
View file

2
packages/editor-ui/src/components/Modals.vue
View file

@ -48,7 +48,7 @@ import DuplicateWorkflowDialog from '@/components/DuplicateWorkflowDialog.vue';
import ModalRoot from '@/components/ModalRoot.vue'; import ModalRoot from '@/components/ModalRoot.vue';
import PersonalizationModal from '@/components/PersonalizationModal.vue'; import PersonalizationModal from '@/components/PersonalizationModal.vue';
import WorkflowTagsManager from '@/components/TagsManager/WorkflowTagsManager.vue'; import WorkflowTagsManager from '@/components/TagsManager/WorkflowTagsManager.vue';
import AnnotationTagsManager from '@/components/TagsManager/AnnotationTagsManager.vue'; import AnnotationTagsManager from '@/components/TagsManager/AnnotationTagsManager.ee.vue';
import UpdatesPanel from '@/components/UpdatesPanel.vue'; import UpdatesPanel from '@/components/UpdatesPanel.vue';
import NpsSurvey from '@/components/NpsSurvey.vue'; import NpsSurvey from '@/components/NpsSurvey.vue';
import WorkflowLMChat from '@/components/WorkflowLMChat/WorkflowLMChat.vue'; import WorkflowLMChat from '@/components/WorkflowLMChat/WorkflowLMChat.vue';

0
packages/editor-ui/src/components/TagsManager/AnnotationTagsManager.vue → packages/editor-ui/src/components/TagsManager/AnnotationTagsManager.ee.vue
View file

2
packages/editor-ui/src/components/executions/ExecutionsFilter.vue
View file

@ -15,7 +15,7 @@ import { usePostHog } from '@/stores/posthog.store';
import { useTelemetry } from '@/composables/useTelemetry'; import { useTelemetry } from '@/composables/useTelemetry';
import type { Placement } from '@floating-ui/core'; import type { Placement } from '@floating-ui/core';
import { useDebounce } from '@/composables/useDebounce'; import { useDebounce } from '@/composables/useDebounce';
import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.vue'; import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.ee.vue';
export type ExecutionFilterProps = { export type ExecutionFilterProps = {
workflows?: Array<IWorkflowDb | IWorkflowShortResponse>; workflows?: Array<IWorkflowDb | IWorkflowShortResponse>;

2
packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.vue → packages/editor-ui/src/components/executions/workflow/WorkflowExecutionAnnotationPanel.ee.vue
View file

@ -2,7 +2,7 @@
import { ref, computed } from 'vue'; import { ref, computed } from 'vue';
import type { AnnotationVote, ExecutionSummary } from 'n8n-workflow'; import type { AnnotationVote, ExecutionSummary } from 'n8n-workflow';
import { useExecutionsStore } from '@/stores/executions.store'; import { useExecutionsStore } from '@/stores/executions.store';
import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.vue'; import AnnotationTagsDropdown from '@/components/AnnotationTagsDropdown.ee.vue';
import { createEventBus } from 'n8n-design-system'; import { createEventBus } from 'n8n-design-system';
import VoteButtons from '@/components/executions/workflow/VoteButtons.vue'; import VoteButtons from '@/components/executions/workflow/VoteButtons.vue';
import { useToast } from '@/composables/useToast'; import { useToast } from '@/composables/useToast';