admin/n8n-enterprise-unlocked
1
0
Fork 0
mirror of https://github.com/Abdulazizzn/n8n-enterprise-unlocked.git synced 2025-12-17 01:56:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(API): Add user id information on push tracking when available (#14519)

Browse Source
This commit is contained in:
Guillaume Jacquart
2025-04-10 17:04:48 +02:00
committed by GitHub
parent faecb47f15
commit 61957899e1
10 changed files with 171 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
packages/cli/src/environments.ee/source-control/source-control.service.ee.ts
View File

@@ -213,7 +213,10 @@ export class SourceControlService {
return;
}
async pushWorkfolder(options: PushWorkFolderRequestDto): Promise<{
async pushWorkfolder(
user: User,
options: PushWorkFolderRequestDto,
): Promise<{
statusCode: number;
pushResult: PushResult | undefined;
statusResult: SourceControlledFile[];
@@ -239,7 +242,7 @@ export class SourceControlService {
// only determine file status if not provided by the frontend
let statusResult: SourceControlledFile[] = filesToPush;
if (statusResult.length === 0) {
statusResult = (await this.getStatus({
statusResult = (await this.getStatus(user, {
direction: 'push',
verbose: false,
preferLocalVersion: true,
@@ -332,7 +335,7 @@ export class SourceControlService {
// #region Tracking Information
this.eventService.emit(
'source-control-user-finished-push-ui',
getTrackingInformationFromPostPushResult(statusResult),
getTrackingInformationFromPostPushResult(user.id, statusResult),
);
// #endregion
@@ -393,7 +396,7 @@ export class SourceControlService {
): Promise<{ statusCode: number; statusResult: SourceControlledFile[] }> {
await this.sanityCheck();
const statusResult = (await this.getStatus({
const statusResult = (await this.getStatus(user, {
direction: 'pull',
verbose: false,
preferLocalVersion: false,
@@ -457,7 +460,7 @@ export class SourceControlService {
// #region Tracking Information
this.eventService.emit(
'source-control-user-finished-pull-ui',
getTrackingInformationFromPullResult(statusResult),
getTrackingInformationFromPullResult(user.id, statusResult),
);
// #endregion
@@ -477,7 +480,7 @@ export class SourceControlService {
* @returns either SourceControlledFile[] if verbose is false,
* or multiple SourceControlledFile[] with all determined differences for debugging purposes
*/
async getStatus(options: SourceControlGetStatus) {
async getStatus(user: User, options: SourceControlGetStatus) {
await this.sanityCheck();
const sourceControlledFiles: SourceControlledFile[] = [];
@@ -514,12 +517,12 @@ export class SourceControlService {
if (options.direction === 'push') {
this.eventService.emit(
'source-control-user-started-push-ui',
getTrackingInformationFromPrePushResult(sourceControlledFiles),
getTrackingInformationFromPrePushResult(user.id, sourceControlledFiles),
);
} else if (options.direction === 'pull') {
this.eventService.emit(
'source-control-user-started-pull-ui',
getTrackingInformationFromPullResult(sourceControlledFiles),
getTrackingInformationFromPullResult(user.id, sourceControlledFiles),
);
}
// #endregion