admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-20 11:22:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

ci: Break most of the circular dependencies in code (no-changelog) (#4990)

Browse Source
This commit is contained in:
कारतोफ्फेलस्क्रिप्ट™
2022-12-21 10:46:26 +01:00
committed by GitHub
parent 82f763589b
commit 5db9c46043
36 changed files with 105 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
View File

@@ -10,7 +10,7 @@ import type { ICredentialsDb } from '@/Interfaces';
import { CredentialsEntity } from '@db/entities/CredentialsEntity';
import { SharedCredentials } from '@db/entities/SharedCredentials';
import { User } from '@db/entities/User';
import { externalHooks } from '@/Server';
import { ExternalHooks } from '@/ExternalHooks';
import { IDependency, IJsonSchema } from '../../../types';
import { CredentialRequest } from '@/requests';
@@ -74,7 +74,7 @@ export async function saveCredential(
scope: 'credential',
});
await externalHooks.run('credentials.create', [encryptedData]);
await ExternalHooks().run('credentials.create', [encryptedData]);
return Db.transaction(async (transactionManager) => {
const savedCredential = await transactionManager.save<CredentialsEntity>(credential);
@@ -96,7 +96,7 @@ export async function saveCredential(
}
export async function removeCredential(credentials: CredentialsEntity): Promise<ICredentialsDb> {
await externalHooks.run('credentials.delete', [credentials.id]);
await ExternalHooks().run('credentials.delete', [credentials.id]);
return Db.collections.Credentials.remove(credentials);
}

8
packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
View File

@@ -7,7 +7,7 @@ import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner';
import config from '@/config';
import { WorkflowEntity } from '@db/entities/WorkflowEntity';
import { InternalHooksManager } from '@/InternalHooksManager';
import { externalHooks } from '@/Server';
import { ExternalHooks } from '@/ExternalHooks';
import { addNodeIds, replaceInvalidCredentials } from '@/WorkflowHelpers';
import { WorkflowRequest } from '../../../types';
import { authorize, validCursor } from '../../shared/middlewares/global.middleware';
@@ -49,7 +49,7 @@ export = {
const createdWorkflow = await createWorkflow(workflow, req.user, role);
await externalHooks.run('workflow.afterCreate', [createdWorkflow]);
await ExternalHooks().run('workflow.afterCreate', [createdWorkflow]);
void InternalHooksManager.getInstance().onWorkflowCreated(req.user.id, createdWorkflow, true);
return res.json(createdWorkflow);
@@ -76,7 +76,7 @@ export = {
await Db.collections.Workflow.delete(id);
void InternalHooksManager.getInstance().onWorkflowDeleted(req.user.id, id.toString(), true);
await externalHooks.run('workflow.afterDelete', [id.toString()]);
await ExternalHooks().run('workflow.afterDelete', [id.toString()]);
return res.json(sharedWorkflow.workflow);
},
@@ -219,7 +219,7 @@ export = {
const updatedWorkflow = await getWorkflowById(sharedWorkflow.workflowId);
await externalHooks.run('workflow.afterUpdate', [updateData]);
await ExternalHooks().run('workflow.afterUpdate', [updateData]);
void InternalHooksManager.getInstance().onWorkflowSaved(req.user.id, updateData, true);
return res.json(updatedWorkflow);

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

@@ -165,7 +165,7 @@ require('body-parser-xml')(bodyParser);
const exec = promisify(callbackExec);
export const externalHooks: IExternalHooksClass = ExternalHooks();
const externalHooks: IExternalHooksClass = ExternalHooks();
class App {
app: express.Application;

8
packages/cli/src/api/workflowStats.api.ts
View File

@@ -2,13 +2,13 @@ import { User } from '@/databases/entities/User';
import { whereClause } from '@/UserManagement/UserManagementHelper';
import express from 'express';
import { LoggerProxy } from 'n8n-workflow';
import {
Db,
import * as Db from '@/Db';
import * as ResponseHelper from '@/ResponseHelper';
import type {
IWorkflowStatisticsCounts,
IWorkflowStatisticsDataLoaded,
IWorkflowStatisticsTimestamps,
ResponseHelper,
} from '..';
} from '@/Interfaces';
import { StatisticsNames } from '../databases/entities/WorkflowStatistics';
import { getLogger } from '../Logger';
import { ExecutionRequest } from '../requests';

8
packages/cli/src/credentials/credentials.service.ts
View File

@@ -20,7 +20,7 @@ import { CREDENTIAL_BLANKING_VALUE, RESPONSE_ERROR_MESSAGES } from '@/constants'
import { CredentialsEntity } from '@db/entities/CredentialsEntity';
import { SharedCredentials } from '@db/entities/SharedCredentials';
import { validateEntity } from '@/GenericHelpers';
import { externalHooks } from '../Server';
import { ExternalHooks } from '@/ExternalHooks';
import type { User } from '@db/entities/User';
import type { CredentialRequest } from '@/requests';
@@ -234,7 +234,7 @@ export class CredentialsService {
credentialId: string,
newCredentialData: ICredentialsDb,
): Promise<ICredentialsDb | undefined> {
await externalHooks.run('credentials.update', [newCredentialData]);
await ExternalHooks().run('credentials.update', [newCredentialData]);
// Update the credentials in DB
await Db.collections.Credentials.update(credentialId, newCredentialData);
@@ -253,7 +253,7 @@ export class CredentialsService {
const newCredential = new CredentialsEntity();
Object.assign(newCredential, credential, encryptedData);
await externalHooks.run('credentials.create', [encryptedData]);
await ExternalHooks().run('credentials.create', [encryptedData]);
const role = await Db.collections.Role.findOneOrFail({
name: 'owner',
@@ -285,7 +285,7 @@ export class CredentialsService {
}
static async delete(credentials: CredentialsEntity): Promise<void> {
await externalHooks.run('credentials.delete', [credentials.id]);
await ExternalHooks().run('credentials.delete', [credentials.id]);
await Db.collections.Credentials.remove(credentials);
}

6
packages/cli/src/credentials/oauth2Credential.api.ts
View File

@@ -27,7 +27,7 @@ import {
} from '@/CredentialsHelper';
import { getLogger } from '@/Logger';
import { OAuthRequest } from '@/requests';
import { externalHooks } from '@/Server';
import { ExternalHooks } from '@/ExternalHooks';
import config from '@/config';
import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
@@ -129,7 +129,7 @@ oauth2CredentialController.get(
state: stateEncodedStr,
};
await externalHooks.run('oauth2.authenticate', [oAuthOptions]);
await ExternalHooks().run('oauth2.authenticate', [oAuthOptions]);
const oAuthObj = new ClientOAuth2(oAuthOptions);
@@ -281,7 +281,7 @@ oauth2CredentialController.get(
delete oAuth2Parameters.clientSecret;
}
await externalHooks.run('oauth2.callback', [oAuth2Parameters]);
await ExternalHooks().run('oauth2.callback', [oAuth2Parameters]);
const oAuthObj = new ClientOAuth2(oAuth2Parameters);

4
packages/cli/src/databases/entities/CredentialsEntity.ts
View File

@@ -1,7 +1,7 @@
import type { ICredentialNodeAccess } from 'n8n-workflow';
import { Column, Entity, Index, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
import { IsArray, IsObject, IsString, Length } from 'class-validator';
import { SharedCredentials } from './SharedCredentials';
import type { SharedCredentials } from './SharedCredentials';
import { AbstractEntity, jsonColumnType } from './AbstractEntity';
import type { ICredentialsDb } from '@/Interfaces';
@@ -28,7 +28,7 @@ export class CredentialsEntity extends AbstractEntity implements ICredentialsDb
})
type: string;
@OneToMany(() => SharedCredentials, (sharedCredentials) => sharedCredentials.credentials)
@OneToMany('SharedCredentials', 'credentials')
shared: SharedCredentials[];
@Column(jsonColumnType)

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

@@ -1,5 +1,5 @@
import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn } from 'typeorm';
import { InstalledPackages } from './InstalledPackages';
import type { InstalledPackages } from './InstalledPackages';
@Entity()
export class InstalledNodes {
@@ -12,10 +12,7 @@ export class InstalledNodes {
@Column()
latestVersion: string;
@ManyToOne(
() => InstalledPackages,
(installedPackages: InstalledPackages) => installedPackages.installedNodes,
)
@ManyToOne('InstalledPackages', 'installedNodes')
@JoinColumn({ name: 'package', referencedColumnName: 'packageName' })
package: InstalledPackages;
}

4
packages/cli/src/databases/entities/InstalledPackages.ts
View File

@@ -1,5 +1,5 @@
import { Column, Entity, JoinColumn, OneToMany, PrimaryColumn } from 'typeorm';
import { InstalledNodes } from './InstalledNodes';
import type { InstalledNodes } from './InstalledNodes';
import { AbstractEntity } from './AbstractEntity';
@Entity()
@@ -16,7 +16,7 @@ export class InstalledPackages extends AbstractEntity {
@Column()
authorEmail?: string;
@OneToMany(() => InstalledNodes, (installedNode) => installedNode.package)
@OneToMany('InstalledNodes', 'package')
@JoinColumn({ referencedColumnName: 'package' })
installedNodes: InstalledNodes[];
}

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

@@ -1,9 +1,9 @@
import { Column, Entity, OneToMany, PrimaryGeneratedColumn, Unique } from 'typeorm';
import { IsString, Length } from 'class-validator';
import { User } from './User';
import { SharedWorkflow } from './SharedWorkflow';
import { SharedCredentials } from './SharedCredentials';
import type { User } from './User';
import type { SharedWorkflow } from './SharedWorkflow';
import type { SharedCredentials } from './SharedCredentials';
import { AbstractEntity } from './AbstractEntity';
export type RoleNames = 'owner' | 'member' | 'user' | 'editor';
@@ -23,12 +23,12 @@ export class Role extends AbstractEntity {
@Column()
scope: RoleScopes;
@OneToMany(() => User, (user) => user.globalRole)
@OneToMany('User', 'globalRole')
globalForUsers: User[];
@OneToMany(() => SharedWorkflow, (sharedWorkflow) => sharedWorkflow.role)
@OneToMany('SharedWorkflow', 'role')
sharedWorkflows: SharedWorkflow[];
@OneToMany(() => SharedCredentials, (sharedCredentials) => sharedCredentials.role)
@OneToMany('SharedCredentials', 'role')
sharedCredentials: SharedCredentials[];
}

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

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

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

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

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

@@ -1,9 +1,9 @@
import { Column, Entity, Generated, Index, ManyToMany, PrimaryColumn } from 'typeorm';
import { IsString, Length } from 'class-validator';
import { ITagDb } from '@/Interfaces';
import type { ITagDb } from '@/Interfaces';
import { idStringifier } from '../utils/transformers';
import { WorkflowEntity } from './WorkflowEntity';
import type { WorkflowEntity } from './WorkflowEntity';
import { AbstractEntity } from './AbstractEntity';
@Entity()
@@ -20,6 +20,6 @@ export class TagEntity extends AbstractEntity implements ITagDb {
@Length(1, 24, { message: 'Tag name must be $constraint1 to $constraint2 characters long.' })
name: string;
@ManyToMany(() => WorkflowEntity, (workflow) => workflow.tags)
@ManyToMany('WorkflowEntity', 'tags')
workflows: WorkflowEntity[];
}

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

@@ -12,9 +12,9 @@ import {
} from 'typeorm';
import { IsEmail, IsString, Length } from 'class-validator';
import type { IUser } from 'n8n-workflow';
import { Role } from './Role';
import { SharedWorkflow } from './SharedWorkflow';
import { SharedCredentials } from './SharedCredentials';
import type { Role } from './Role';
import type { SharedWorkflow } from './SharedWorkflow';
import type { SharedCredentials } from './SharedCredentials';
import { NoXss } from '../utils/customValidators';
import { objectRetriever, lowerCaser } from '../utils/transformers';
import { AbstractEntity, jsonColumnType } from './AbstractEntity';
@@ -74,16 +74,16 @@ export class User extends AbstractEntity implements IUser {
})
settings: IUserSettings | null;
@ManyToOne(() => Role, (role) => role.globalForUsers, {
@ManyToOne('Role', 'globalForUsers', {
cascade: true,
nullable: false,
})
globalRole: Role;
@OneToMany(() => SharedWorkflow, (sharedWorkflow) => sharedWorkflow.user)
@OneToMany('SharedWorkflow', 'user')
sharedWorkflows: SharedWorkflow[];
@OneToMany(() => SharedCredentials, (sharedCredentials) => sharedCredentials.user)
@OneToMany('SharedCredentials', 'user')
sharedCredentials: SharedCredentials[];
@BeforeInsert()

15
packages/cli/src/databases/entities/WorkflowEntity.ts
View File

@@ -21,11 +21,11 @@ import {
} from 'typeorm';
import config from '@/config';
import { TagEntity } from './TagEntity';
import { SharedWorkflow } from './SharedWorkflow';
import type { TagEntity } from './TagEntity';
import type { SharedWorkflow } from './SharedWorkflow';
import type { WorkflowStatistics } from './WorkflowStatistics';
import { objectRetriever, sqlite } from '../utils/transformers';
import { AbstractEntity, jsonColumnType } from './AbstractEntity';
import { WorkflowStatistics } from './WorkflowStatistics';
import type { IWorkflowDb } from '@/Interfaces';
@Entity()
@@ -63,7 +63,7 @@ export class WorkflowEntity extends AbstractEntity implements IWorkflowDb {
})
staticData?: IDataObject;
@ManyToMany(() => TagEntity, (tag) => tag.workflows)
@ManyToMany('TagEntity', 'workflows')
@JoinTable({
name: 'workflows_tags', // table name for the junction table of this relation
joinColumn: {
@@ -77,13 +77,10 @@ export class WorkflowEntity extends AbstractEntity implements IWorkflowDb {
})
tags?: TagEntity[];
@OneToMany(() => SharedWorkflow, (sharedWorkflow) => sharedWorkflow.workflow)
@OneToMany('SharedWorkflow', 'workflow')
shared: SharedWorkflow[];
@OneToMany(
() => WorkflowStatistics,
(workflowStatistics: WorkflowStatistics) => workflowStatistics.workflow,
)
@OneToMany('WorkflowStatistics', 'workflow')
@JoinColumn({ referencedColumnName: 'workflow' })
statistics: WorkflowStatistics[];

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

@@ -1,6 +1,6 @@
import { Column, Entity, RelationId, ManyToOne, PrimaryColumn } from 'typeorm';
import { datetimeColumnType } from './AbstractEntity';
import { WorkflowEntity } from './WorkflowEntity';
import type { WorkflowEntity } from './WorkflowEntity';
export enum StatisticsNames {
productionSuccess = 'production_success',
@@ -20,7 +20,7 @@ export class WorkflowStatistics {
@PrimaryColumn({ length: 128 })
name: StatisticsNames;
@ManyToOne(() => WorkflowEntity, (workflow) => workflow.shared, {
@ManyToOne('WorkflowEntity', 'shared', {
primary: true,
onDelete: 'CASCADE',
})

7
packages/cli/src/events/WorkflowStatistics.ts
View File

@@ -1,7 +1,8 @@
import { INode, IRun, IWorkflowBase, LoggerProxy } from 'n8n-workflow';
import { Db, InternalHooksManager } from '..';
import { StatisticsNames } from '../databases/entities/WorkflowStatistics';
import { getWorkflowOwner } from '../UserManagement/UserManagementHelper';
import * as Db from '@/Db';
import { InternalHooksManager } from '@/InternalHooksManager';
import { StatisticsNames } from '@/databases/entities/WorkflowStatistics';
import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
export async function workflowExecutionCompleted(
workflowData: IWorkflowBase,

7
packages/cli/src/executions/executions.service.ts
View File

@@ -8,7 +8,6 @@ import { FindOperator, In, IsNull, LessThanOrEqual, Not, Raw } from 'typeorm';
import * as ActiveExecutions from '@/ActiveExecutions';
import config from '@/config';
import { User } from '@/databases/entities/User';
import { DEFAULT_EXECUTIONS_GET_ALL_LIMIT } from '@/GenericHelpers';
import {
IExecutionFlattedResponse,
IExecutionResponse,
@@ -22,7 +21,9 @@ import type { ExecutionRequest } from '@/requests';
import * as ResponseHelper from '@/ResponseHelper';
import { getSharedWorkflowIds } from '@/WorkflowHelpers';
import { WorkflowRunner } from '@/WorkflowRunner';
import { DatabaseType, Db, GenericHelpers } from '..';
import type { DatabaseType } from '@/Interfaces';
import * as Db from '@/Db';
import * as GenericHelpers from '@/GenericHelpers';
interface IGetExecutionsQueryFilter {
id?: FindOperator<string>;
@@ -174,7 +175,7 @@ export class ExecutionsService {
const limit = req.query.limit
? parseInt(req.query.limit, 10)
: DEFAULT_EXECUTIONS_GET_ALL_LIMIT;
: GenericHelpers.DEFAULT_EXECUTIONS_GET_ALL_LIMIT;
const executingWorkflowIds: string[] = [];

3
packages/cli/src/license/License.service.ts
View File

@@ -1,5 +1,6 @@
import { getLicense } from '@/License';
import { Db, ILicenseReadResponse } from '..';
import type { ILicenseReadResponse } from '@/Interfaces';
import * as Db from '@/Db';
export class LicenseService {
static async getActiveTriggerCount(): Promise<number> {

9
packages/cli/src/license/license.controller.ts
View File

@@ -4,12 +4,9 @@ import express from 'express';
import { LoggerProxy } from 'n8n-workflow';
import { getLogger } from '@/Logger';
import {
ILicensePostResponse,
ILicenseReadResponse,
InternalHooksManager,
ResponseHelper,
} from '..';
import * as ResponseHelper from '@/ResponseHelper';
import { InternalHooksManager } from '@/InternalHooksManager';
import type { ILicensePostResponse, ILicenseReadResponse } from '@/Interfaces';
import { LicenseService } from './License.service';
import { getLicense } from '@/License';
import { AuthenticatedRequest, LicenseRequest } from '@/requests';

6
packages/cli/src/workflows/workflows.controller.ee.ts
View File

@@ -10,7 +10,7 @@ import { validateEntity } from '@/GenericHelpers';
import type { WorkflowRequest } from '@/requests';
import { isSharingEnabled, rightDiff } from '@/UserManagement/UserManagementHelper';
import { EEWorkflowsService as EEWorkflows } from './workflows.services.ee';
import { externalHooks } from '../Server';
import { ExternalHooks } from '@/ExternalHooks';
import { SharedWorkflow } from '@db/entities/SharedWorkflow';
import { LoggerProxy } from 'n8n-workflow';
import * as TagHelpers from '@/TagHelpers';
@@ -117,7 +117,7 @@ EEWorkflowController.post(
await validateEntity(newWorkflow);
await externalHooks.run('workflow.create', [newWorkflow]);
await ExternalHooks().run('workflow.create', [newWorkflow]);
const { tags: tagIds } = req.body;
@@ -178,7 +178,7 @@ EEWorkflowController.post(
});
}
await externalHooks.run('workflow.afterCreate', [savedWorkflow]);
await ExternalHooks().run('workflow.afterCreate', [savedWorkflow]);
void InternalHooksManager.getInstance().onWorkflowCreated(req.user.id, newWorkflow, false);
const { id, ...rest } = savedWorkflow;

10
packages/cli/src/workflows/workflows.controller.ts
View File

@@ -17,7 +17,7 @@ import { SharedWorkflow } from '@db/entities/SharedWorkflow';
import { WorkflowEntity } from '@db/entities/WorkflowEntity';
import { validateEntity } from '@/GenericHelpers';
import { InternalHooksManager } from '@/InternalHooksManager';
import { externalHooks } from '@/Server';
import { ExternalHooks } from '@/ExternalHooks';
import { getLogger } from '@/Logger';
import type { WorkflowRequest } from '@/requests';
import { isBelowOnboardingThreshold } from '@/WorkflowHelpers';
@@ -57,7 +57,7 @@ workflowsController.post(
await validateEntity(newWorkflow);
await externalHooks.run('workflow.create', [newWorkflow]);
await ExternalHooks().run('workflow.create', [newWorkflow]);
const { tags: tagIds } = req.body;
@@ -103,7 +103,7 @@ workflowsController.post(
});
}
await externalHooks.run('workflow.afterCreate', [savedWorkflow]);
await ExternalHooks().run('workflow.afterCreate', [savedWorkflow]);
void InternalHooksManager.getInstance().onWorkflowCreated(req.user.id, newWorkflow, false);
const { id, ...rest } = savedWorkflow;
@@ -273,7 +273,7 @@ workflowsController.delete(
ResponseHelper.send(async (req: WorkflowRequest.Delete) => {
const { id: workflowId } = req.params;
await externalHooks.run('workflow.delete', [workflowId]);
await ExternalHooks().run('workflow.delete', [workflowId]);
const shared = await Db.collections.SharedWorkflow.findOne({
relations: ['workflow', 'role'],
@@ -303,7 +303,7 @@ workflowsController.delete(
await Db.collections.Workflow.delete(workflowId);
void InternalHooksManager.getInstance().onWorkflowDeleted(req.user.id, workflowId, false);
await externalHooks.run('workflow.afterDelete', [workflowId]);
await ExternalHooks().run('workflow.afterDelete', [workflowId]);
return true;
}),

8
packages/cli/src/workflows/workflows.services.ts
View File

@@ -13,7 +13,7 @@ import { SharedWorkflow } from '@db/entities/SharedWorkflow';
import { User } from '@db/entities/User';
import { WorkflowEntity } from '@db/entities/WorkflowEntity';
import { validateEntity } from '@/GenericHelpers';
import { externalHooks } from '@/Server';
import { ExternalHooks } from '@/ExternalHooks';
import * as TagHelpers from '@/TagHelpers';
import { WorkflowRequest } from '@/requests';
import { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
@@ -246,7 +246,7 @@ export class WorkflowsService {
WorkflowHelpers.addNodeIds(workflow);
await externalHooks.run('workflow.update', [workflow]);
await ExternalHooks().run('workflow.update', [workflow]);
if (shared.workflow.active) {
// When workflow gets saved always remove it as the triggers could have been
@@ -332,13 +332,13 @@ export class WorkflowsService {
});
}
await externalHooks.run('workflow.afterUpdate', [updatedWorkflow]);
await ExternalHooks().run('workflow.afterUpdate', [updatedWorkflow]);
void InternalHooksManager.getInstance().onWorkflowSaved(user.id, updatedWorkflow, false);
if (updatedWorkflow.active) {
// When the workflow is supposed to be active add it again
try {
await externalHooks.run('workflow.activate', [updatedWorkflow]);
await ExternalHooks().run('workflow.activate', [updatedWorkflow]);
await ActiveWorkflowRunner.getInstance().add(
workflowId,
shared.workflow.active ? 'update' : 'activate',