admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 18:12:04 +00:00
Code Issues 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

12
packages/cli/src/commands/import/workflow.ts
View File

@@ -16,7 +16,7 @@ import { INode, INodeCredentialsDetails, LoggerProxy } from 'n8n-workflow';
import fs from 'fs';
import glob from 'fast-glob';
import { UserSettings } from 'n8n-core';
import { EntityManager, getConnection } from 'typeorm';
import type { EntityManager } from 'typeorm';
import { v4 as uuid } from 'uuid';
import { getLogger } from '@/Logger';
import * as Db from '@/Db';
@@ -123,7 +123,7 @@ export class ImportWorkflowsCommand extends Command {
totalImported = files.length;
await getConnection().transaction(async (transactionManager) => {
await Db.getConnection().transaction(async (transactionManager) => {
this.transactionManager = transactionManager;
for (const file of files) {
@@ -158,7 +158,7 @@ export class ImportWorkflowsCommand extends Command {
totalImported = workflows.length;
await getConnection().transaction(async (transactionManager) => {
await Db.getConnection().transaction(async (transactionManager) => {
this.transactionManager = transactionManager;
for (const workflow of workflows) {
@@ -229,7 +229,9 @@ export class ImportWorkflowsCommand extends Command {
where: { name: 'owner', scope: 'global' },
});
const owner = await Db.collections.User.findOne({ globalRole: ownerGlobalRole });
const owner =
ownerGlobalRole &&
(await Db.collections.User.findOneBy({ globalRoleId: ownerGlobalRole?.id }));
if (!owner) {
throw new Error(`Failed to find owner. ${FIX_INSTRUCTION}`);
@@ -239,7 +241,7 @@ export class ImportWorkflowsCommand extends Command {
}
private async getAssignee(userId: string) {
const user = await Db.collections.User.findOne(userId);
const user = await Db.collections.User.findOneBy({ id: userId });
if (!user) {
throw new Error(`Failed to find user with ID ${userId}`);