refactor(core): Enable import/order eslint rule (#10794)
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
import type { INode } from 'n8n-workflow';
|
||||
import { mock } from 'jest-mock-extended';
|
||||
import type { INode } from 'n8n-workflow';
|
||||
|
||||
import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
|
||||
import type { IWorkflowDb } from '@/interfaces';
|
||||
import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
|
||||
import type { WorkflowRunner } from '@/workflow-runner';
|
||||
import { WorkflowExecutionService } from '@/workflows/workflow-execution.service';
|
||||
|
||||
const webhookNode: INode = {
|
||||
name: 'Webhook',
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { Service } from 'typedi';
|
||||
import { GlobalConfig } from '@n8n/config';
|
||||
import type {
|
||||
IDeferredPromise,
|
||||
IExecuteData,
|
||||
@@ -16,21 +16,21 @@ import {
|
||||
Workflow,
|
||||
ErrorReporterProxy as ErrorReporter,
|
||||
} from 'n8n-workflow';
|
||||
import { Service } from 'typedi';
|
||||
|
||||
import type { Project } from '@/databases/entities/project';
|
||||
import type { User } from '@/databases/entities/user';
|
||||
import { ExecutionRepository } from '@/databases/repositories/execution.repository';
|
||||
import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
|
||||
import * as WorkflowHelpers from '@/workflow-helpers';
|
||||
import type { WorkflowRequest } from '@/workflows/workflow.request';
|
||||
import type { ExecutionPayload, IWorkflowDb, IWorkflowErrorData } from '@/interfaces';
|
||||
import { NodeTypes } from '@/node-types';
|
||||
import { WorkflowRunner } from '@/workflow-runner';
|
||||
import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
|
||||
import { TestWebhooks } from '@/webhooks/test-webhooks';
|
||||
import { Logger } from '@/logger';
|
||||
import type { Project } from '@/databases/entities/project';
|
||||
import { GlobalConfig } from '@n8n/config';
|
||||
import { NodeTypes } from '@/node-types';
|
||||
import { SubworkflowPolicyChecker } from '@/subworkflows/subworkflow-policy-checker.service';
|
||||
import { TestWebhooks } from '@/webhooks/test-webhooks';
|
||||
import * as WorkflowExecuteAdditionalData from '@/workflow-execute-additional-data';
|
||||
import * as WorkflowHelpers from '@/workflow-helpers';
|
||||
import { WorkflowRunner } from '@/workflow-runner';
|
||||
import type { WorkflowRequest } from '@/workflows/workflow.request';
|
||||
|
||||
@Service()
|
||||
export class WorkflowExecutionService {
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
import { License } from '@/license';
|
||||
import config from '@/config';
|
||||
import { License } from '@/license';
|
||||
import { getWorkflowHistoryPruneTime } from '@/workflows/workflow-history/workflow-history-helper.ee';
|
||||
import { mockInstance } from '@test/mocking';
|
||||
|
||||
|
||||
@@ -1,9 +1,10 @@
|
||||
import { mockClear } from 'jest-mock-extended';
|
||||
|
||||
import { User } from '@/databases/entities/user';
|
||||
import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
|
||||
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
|
||||
import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service.ee';
|
||||
import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
|
||||
import { Logger } from '@/logger';
|
||||
import { WorkflowHistoryService } from '@/workflows/workflow-history/workflow-history.service.ee';
|
||||
import { mockInstance } from '@test/mocking';
|
||||
import { getWorkflow } from '@test-integration/workflow';
|
||||
|
||||
|
||||
@@ -1,7 +1,8 @@
|
||||
import { License } from '@/license';
|
||||
import config from '@/config';
|
||||
import Container from 'typedi';
|
||||
|
||||
import config from '@/config';
|
||||
import { License } from '@/license';
|
||||
|
||||
export function isWorkflowHistoryLicensed() {
|
||||
const license = Container.get(License);
|
||||
return license.isWorkflowHistoryLicensed();
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { Service } from 'typedi';
|
||||
import { DateTime } from 'luxon';
|
||||
import { Service } from 'typedi';
|
||||
|
||||
import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
|
||||
|
||||
import { WORKFLOW_HISTORY_PRUNE_INTERVAL } from './constants';
|
||||
import {
|
||||
getWorkflowHistoryPruneTime,
|
||||
|
||||
@@ -1,13 +1,14 @@
|
||||
import { RestController, Get, Middleware } from '@/decorators';
|
||||
import { WorkflowHistoryRequest } from '@/requests';
|
||||
import { WorkflowHistoryService } from './workflow-history.service.ee';
|
||||
import { Request, Response, NextFunction } from 'express';
|
||||
import { isWorkflowHistoryEnabled, isWorkflowHistoryLicensed } from './workflow-history-helper.ee';
|
||||
|
||||
import { paginationListQueryMiddleware } from '@/middlewares/list-query/pagination';
|
||||
import { RestController, Get, Middleware } from '@/decorators';
|
||||
import { NotFoundError } from '@/errors/response-errors/not-found.error';
|
||||
import { SharedWorkflowNotFoundError } from '@/errors/shared-workflow-not-found.error';
|
||||
import { WorkflowHistoryVersionNotFoundError } from '@/errors/workflow-history-version-not-found.error';
|
||||
import { paginationListQueryMiddleware } from '@/middlewares/list-query/pagination';
|
||||
import { WorkflowHistoryRequest } from '@/requests';
|
||||
|
||||
import { isWorkflowHistoryEnabled, isWorkflowHistoryLicensed } from './workflow-history-helper.ee';
|
||||
import { WorkflowHistoryService } from './workflow-history.service.ee';
|
||||
|
||||
const DEFAULT_TAKE = 20;
|
||||
|
||||
|
||||
@@ -1,13 +1,15 @@
|
||||
import { Service } from 'typedi';
|
||||
|
||||
import type { User } from '@/databases/entities/user';
|
||||
import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
|
||||
import type { WorkflowHistory } from '@/databases/entities/workflow-history';
|
||||
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
|
||||
import { WorkflowHistoryRepository } from '@/databases/repositories/workflow-history.repository';
|
||||
import { Service } from 'typedi';
|
||||
import { isWorkflowHistoryEnabled } from './workflow-history-helper.ee';
|
||||
import { Logger } from '@/logger';
|
||||
import { SharedWorkflowNotFoundError } from '@/errors/shared-workflow-not-found.error';
|
||||
import { WorkflowHistoryVersionNotFoundError } from '@/errors/workflow-history-version-not-found.error';
|
||||
import { Logger } from '@/logger';
|
||||
|
||||
import { isWorkflowHistoryEnabled } from './workflow-history-helper.ee';
|
||||
|
||||
@Service()
|
||||
export class WorkflowHistoryService {
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
import { Service } from 'typedi';
|
||||
import type { Scope } from '@n8n/permissions';
|
||||
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
|
||||
import { In } from '@n8n/typeorm';
|
||||
import { Service } from 'typedi';
|
||||
|
||||
import type { User } from '@/databases/entities/user';
|
||||
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
|
||||
import { RoleService } from '@/services/role.service';
|
||||
import type { Scope } from '@n8n/permissions';
|
||||
import type { ProjectRole } from '@/databases/entities/project-relation';
|
||||
import type { WorkflowSharingRole } from '@/databases/entities/shared-workflow';
|
||||
import type { User } from '@/databases/entities/user';
|
||||
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
|
||||
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
|
||||
import { RoleService } from '@/services/role.service';
|
||||
|
||||
@Service()
|
||||
export class WorkflowSharingService {
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
import { Service } from 'typedi';
|
||||
import { GlobalConfig } from '@n8n/config';
|
||||
import { type IDataObject, type Workflow, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
|
||||
import { Logger } from '@/logger';
|
||||
import { Service } from 'typedi';
|
||||
|
||||
import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
|
||||
import { Logger } from '@/logger';
|
||||
import { isWorkflowIdValid } from '@/utils';
|
||||
|
||||
@Service()
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import type { INode, IConnections, IWorkflowSettings, IRunData, StartNodeData } from 'n8n-workflow';
|
||||
|
||||
import type { IWorkflowDb } from '@/interfaces';
|
||||
import type { AuthenticatedRequest, ListQuery } from '@/requests';
|
||||
import type { INode, IConnections, IWorkflowSettings, IRunData, StartNodeData } from 'n8n-workflow';
|
||||
|
||||
export declare namespace WorkflowRequest {
|
||||
type CreateUpdatePayload = Partial<{
|
||||
|
||||
@@ -1,29 +1,30 @@
|
||||
import { Service } from 'typedi';
|
||||
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
|
||||
import { In, type EntityManager } from '@n8n/typeorm';
|
||||
import omit from 'lodash/omit';
|
||||
import { ApplicationError, NodeOperationError, WorkflowActivationError } from 'n8n-workflow';
|
||||
import { Service } from 'typedi';
|
||||
|
||||
import { ActiveWorkflowManager } from '@/active-workflow-manager';
|
||||
import { CredentialsService } from '@/credentials/credentials.service';
|
||||
import type { CredentialsEntity } from '@/databases/entities/credentials-entity';
|
||||
import { Project } from '@/databases/entities/project';
|
||||
import { SharedWorkflow } from '@/databases/entities/shared-workflow';
|
||||
import type { User } from '@/databases/entities/user';
|
||||
import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
|
||||
import { CredentialsRepository } from '@/databases/repositories/credentials.repository';
|
||||
import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
|
||||
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
|
||||
import { CredentialsService } from '@/credentials/credentials.service';
|
||||
import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
|
||||
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
|
||||
import { NotFoundError } from '@/errors/response-errors/not-found.error';
|
||||
import { TransferWorkflowError } from '@/errors/response-errors/transfer-workflow.error';
|
||||
import { Logger } from '@/logger';
|
||||
import { OwnershipService } from '@/services/ownership.service';
|
||||
import { ProjectService } from '@/services/project.service';
|
||||
|
||||
import type {
|
||||
WorkflowWithSharingsAndCredentials,
|
||||
WorkflowWithSharingsMetaDataAndCredentials,
|
||||
} from './workflows.types';
|
||||
import { OwnershipService } from '@/services/ownership.service';
|
||||
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
|
||||
import { In, type EntityManager } from '@n8n/typeorm';
|
||||
import { Project } from '@/databases/entities/project';
|
||||
import { ProjectService } from '@/services/project.service';
|
||||
import { ActiveWorkflowManager } from '@/active-workflow-manager';
|
||||
import { TransferWorkflowError } from '@/errors/response-errors/transfer-workflow.error';
|
||||
import { SharedWorkflow } from '@/databases/entities/shared-workflow';
|
||||
|
||||
@Service()
|
||||
export class EnterpriseWorkflowService {
|
||||
|
||||
@@ -1,39 +1,40 @@
|
||||
import { Service } from 'typedi';
|
||||
import { NodeApiError } from 'n8n-workflow';
|
||||
import pick from 'lodash/pick';
|
||||
import omit from 'lodash/omit';
|
||||
import { v4 as uuid } from 'uuid';
|
||||
import { BinaryDataService } from 'n8n-core';
|
||||
|
||||
import config from '@/config';
|
||||
import type { User } from '@/databases/entities/user';
|
||||
import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
|
||||
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
|
||||
import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
|
||||
import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
|
||||
import { ActiveWorkflowManager } from '@/active-workflow-manager';
|
||||
import * as WorkflowHelpers from '@/workflow-helpers';
|
||||
import { validateEntity } from '@/generic-helpers';
|
||||
import { ExternalHooks } from '@/external-hooks';
|
||||
import { hasSharing, type ListQuery } from '@/requests';
|
||||
import { TagService } from '@/services/tag.service';
|
||||
import { OwnershipService } from '@/services/ownership.service';
|
||||
import { WorkflowHistoryService } from './workflow-history/workflow-history.service.ee';
|
||||
import { Logger } from '@/logger';
|
||||
import { OrchestrationService } from '@/services/orchestration.service';
|
||||
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
|
||||
import { NotFoundError } from '@/errors/response-errors/not-found.error';
|
||||
import { RoleService } from '@/services/role.service';
|
||||
import { WorkflowSharingService } from './workflow-sharing.service';
|
||||
import { ProjectService } from '@/services/project.service';
|
||||
import { ExecutionRepository } from '@/databases/repositories/execution.repository';
|
||||
import type { Scope } from '@n8n/permissions';
|
||||
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
|
||||
import type { EntityManager } from '@n8n/typeorm';
|
||||
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
|
||||
import { In } from '@n8n/typeorm';
|
||||
import omit from 'lodash/omit';
|
||||
import pick from 'lodash/pick';
|
||||
import { BinaryDataService } from 'n8n-core';
|
||||
import { NodeApiError } from 'n8n-workflow';
|
||||
import { Service } from 'typedi';
|
||||
import { v4 as uuid } from 'uuid';
|
||||
|
||||
import { ActiveWorkflowManager } from '@/active-workflow-manager';
|
||||
import config from '@/config';
|
||||
import { SharedWorkflow } from '@/databases/entities/shared-workflow';
|
||||
import type { User } from '@/databases/entities/user';
|
||||
import type { WorkflowEntity } from '@/databases/entities/workflow-entity';
|
||||
import { ExecutionRepository } from '@/databases/repositories/execution.repository';
|
||||
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
|
||||
import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository';
|
||||
import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
|
||||
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
|
||||
import { NotFoundError } from '@/errors/response-errors/not-found.error';
|
||||
import { EventService } from '@/events/event.service';
|
||||
import { ExternalHooks } from '@/external-hooks';
|
||||
import { validateEntity } from '@/generic-helpers';
|
||||
import { Logger } from '@/logger';
|
||||
import { hasSharing, type ListQuery } from '@/requests';
|
||||
import { OrchestrationService } from '@/services/orchestration.service';
|
||||
import { OwnershipService } from '@/services/ownership.service';
|
||||
import { ProjectService } from '@/services/project.service';
|
||||
import { RoleService } from '@/services/role.service';
|
||||
import { TagService } from '@/services/tag.service';
|
||||
import * as WorkflowHelpers from '@/workflow-helpers';
|
||||
|
||||
import { WorkflowHistoryService } from './workflow-history/workflow-history.service.ee';
|
||||
import { WorkflowSharingService } from './workflow-sharing.service';
|
||||
|
||||
@Service()
|
||||
export class WorkflowService {
|
||||
|
||||
@@ -1,48 +1,49 @@
|
||||
import express from 'express';
|
||||
import { v4 as uuid } from 'uuid';
|
||||
import { GlobalConfig } from '@n8n/config';
|
||||
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
|
||||
import { In, type FindOptionsRelations } from '@n8n/typeorm';
|
||||
import axios from 'axios';
|
||||
import express from 'express';
|
||||
import { ApplicationError } from 'n8n-workflow';
|
||||
import { v4 as uuid } from 'uuid';
|
||||
import { z } from 'zod';
|
||||
|
||||
import * as Db from '@/db';
|
||||
import * as ResponseHelper from '@/response-helper';
|
||||
import * as WorkflowHelpers from '@/workflow-helpers';
|
||||
import type { IWorkflowResponse } from '@/interfaces';
|
||||
import config from '@/config';
|
||||
import { Delete, Get, Patch, Post, ProjectScope, Put, RestController } from '@/decorators';
|
||||
import type { Project } from '@/databases/entities/project';
|
||||
import { SharedWorkflow } from '@/databases/entities/shared-workflow';
|
||||
import { WorkflowEntity } from '@/databases/entities/workflow-entity';
|
||||
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
|
||||
import { ProjectRepository } from '@/databases/repositories/project.repository';
|
||||
import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository';
|
||||
import { TagRepository } from '@/databases/repositories/tag.repository';
|
||||
import { WorkflowRepository } from '@/databases/repositories/workflow.repository';
|
||||
import { validateEntity } from '@/generic-helpers';
|
||||
import { ExternalHooks } from '@/external-hooks';
|
||||
import { WorkflowService } from './workflow.service';
|
||||
import { License } from '@/license';
|
||||
import * as utils from '@/utils';
|
||||
import { listQueryMiddleware } from '@/middlewares';
|
||||
import { TagService } from '@/services/tag.service';
|
||||
import { WorkflowHistoryService } from './workflow-history/workflow-history.service.ee';
|
||||
import { Logger } from '@/logger';
|
||||
import * as Db from '@/db';
|
||||
import { Delete, Get, Patch, Post, ProjectScope, Put, RestController } from '@/decorators';
|
||||
import { BadRequestError } from '@/errors/response-errors/bad-request.error';
|
||||
import { NotFoundError } from '@/errors/response-errors/not-found.error';
|
||||
import { InternalServerError } from '@/errors/response-errors/internal-server.error';
|
||||
import { ForbiddenError } from '@/errors/response-errors/forbidden.error';
|
||||
import { NamingService } from '@/services/naming.service';
|
||||
import { UserOnboardingService } from '@/services/user-onboarding.service';
|
||||
import { CredentialsService } from '../credentials/credentials.service';
|
||||
import { WorkflowRequest } from './workflow.request';
|
||||
import { EnterpriseWorkflowService } from './workflow.service.ee';
|
||||
import { WorkflowExecutionService } from './workflow-execution.service';
|
||||
import { UserManagementMailer } from '@/user-management/email';
|
||||
import { ProjectRepository } from '@/databases/repositories/project.repository';
|
||||
import { ProjectService } from '@/services/project.service';
|
||||
import { ApplicationError } from 'n8n-workflow';
|
||||
// eslint-disable-next-line n8n-local-rules/misplaced-n8n-typeorm-import
|
||||
import { In, type FindOptionsRelations } from '@n8n/typeorm';
|
||||
import type { Project } from '@/databases/entities/project';
|
||||
import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository';
|
||||
import { z } from 'zod';
|
||||
import { InternalServerError } from '@/errors/response-errors/internal-server.error';
|
||||
import { NotFoundError } from '@/errors/response-errors/not-found.error';
|
||||
import { EventService } from '@/events/event.service';
|
||||
import { GlobalConfig } from '@n8n/config';
|
||||
import { ExternalHooks } from '@/external-hooks';
|
||||
import { validateEntity } from '@/generic-helpers';
|
||||
import type { IWorkflowResponse } from '@/interfaces';
|
||||
import { License } from '@/license';
|
||||
import { Logger } from '@/logger';
|
||||
import { listQueryMiddleware } from '@/middlewares';
|
||||
import * as ResponseHelper from '@/response-helper';
|
||||
import { NamingService } from '@/services/naming.service';
|
||||
import { ProjectService } from '@/services/project.service';
|
||||
import { TagService } from '@/services/tag.service';
|
||||
import { UserOnboardingService } from '@/services/user-onboarding.service';
|
||||
import { UserManagementMailer } from '@/user-management/email';
|
||||
import * as utils from '@/utils';
|
||||
import * as WorkflowHelpers from '@/workflow-helpers';
|
||||
|
||||
import { WorkflowExecutionService } from './workflow-execution.service';
|
||||
import { WorkflowHistoryService } from './workflow-history/workflow-history.service.ee';
|
||||
import { WorkflowRequest } from './workflow.request';
|
||||
import { WorkflowService } from './workflow.service';
|
||||
import { EnterpriseWorkflowService } from './workflow.service.ee';
|
||||
import { CredentialsService } from '../credentials/credentials.service';
|
||||
|
||||
@RestController('/workflows')
|
||||
export class WorkflowsController {
|
||||
|
||||
Reference in New Issue
Block a user