mirror of
https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git
synced 2025-12-17 01:56:46 +00:00
chore(core): Expose owner information for environment changes (#16466)
Co-authored-by: Guillaume Jacquart <jacquart.guillaume@gmail.com>
This commit is contained in:
@@ -42,7 +42,7 @@ import {
|
||||
} from './source-control-helper.ee';
|
||||
import { SourceControlImportService } from './source-control-import.service.ee';
|
||||
import { SourceControlPreferencesService } from './source-control-preferences.service.ee';
|
||||
import type { ExportableCredential } from './types/exportable-credential';
|
||||
import type { StatusExportableCredential } from './types/exportable-credential';
|
||||
import type { ExportableFolder } from './types/exportable-folders';
|
||||
import type { ImportResult } from './types/import-result';
|
||||
import { SourceControlContext } from './types/source-control-context';
|
||||
@@ -663,6 +663,7 @@ export class SourceControlService {
|
||||
conflict: false,
|
||||
file: item.filename,
|
||||
updatedAt: item.updatedAt ?? new Date().toISOString(),
|
||||
owner: item.owner,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -676,6 +677,7 @@ export class SourceControlService {
|
||||
conflict: options.direction === 'push' ? false : true,
|
||||
file: item.filename,
|
||||
updatedAt: item.updatedAt ?? new Date().toISOString(),
|
||||
owner: item.owner,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -689,6 +691,7 @@ export class SourceControlService {
|
||||
conflict: true,
|
||||
file: item.filename,
|
||||
updatedAt: item.updatedAt ?? new Date().toISOString(),
|
||||
owner: item.owner,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -719,11 +722,7 @@ export class SourceControlService {
|
||||
);
|
||||
|
||||
// only compares the name, since that is the only change synced for credentials
|
||||
const credModifiedInEither: Array<
|
||||
ExportableCredential & {
|
||||
filename: string;
|
||||
}
|
||||
> = [];
|
||||
const credModifiedInEither: StatusExportableCredential[] = [];
|
||||
credLocalIds.forEach((local) => {
|
||||
const mismatchingCreds = credRemoteIds.find((remote) => {
|
||||
return remote.id === local.id && (remote.name !== local.name || remote.type !== local.type);
|
||||
@@ -746,6 +745,7 @@ export class SourceControlService {
|
||||
conflict: false,
|
||||
file: item.filename,
|
||||
updatedAt: new Date().toISOString(),
|
||||
owner: item.ownedBy,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -759,6 +759,7 @@ export class SourceControlService {
|
||||
conflict: options.direction === 'push' ? false : true,
|
||||
file: item.filename,
|
||||
updatedAt: new Date().toISOString(),
|
||||
owner: item.ownedBy,
|
||||
});
|
||||
});
|
||||
|
||||
@@ -772,6 +773,7 @@ export class SourceControlService {
|
||||
conflict: true,
|
||||
file: item.filename,
|
||||
updatedAt: new Date().toISOString(),
|
||||
owner: item.ownedBy,
|
||||
});
|
||||
});
|
||||
return {
|
||||
|
||||
Reference in New Issue
Block a user