* initial telemetry setup and adjusted pull return * quicksave before merge * feat: add conflicting workflow list to pull modal * feat: update source control pull modal * fix: fix linting issue * feat: add Enter keydown event for submitting source control push modal (no-changelog) feat: add Enter keydown event for submitting source control push modal * quicksave * user workflow table for export * improve telemetry data * pull api telemetry * fix lint * Copy tweaks. * remove authorName and authorEmail and pick from user * rename owners.json to workflow_owners.json * ignore credential conflicts on pull * feat: several push/pull flow changes and design update * pull and push return same data format * fix: add One last step toast for successful pull * feat: add up to date pull toast * fix: add proper Learn more link for push and pull modals * do not await tracking being sent * fix import * fix await * add more sourcecontrolfile status * Minor copy tweak for "More info". * Minor copy tweak for "More info". * ignore variable_stub conflicts on pull * ignore whitespace differences * do not show remote workflows that are not yet created * fix telemetry * fix toast when pulling deleted wf * lint fix * refactor and make some imports dynamic * fix variable edit validation * fix telemetry response * improve telemetry * fix unintenional delete commit * fix status unknown issue * fix up to date toast * do not export active state and reapply versionid * use update instead of upsert * fix: show all workflows when clicking push to git * feat: update Up to date pull translation * fix: update read only env checks * do not update versionid of only active flag changes * feat: prevent access to new workflow and templates import when read only env * feat: send only active state and version if workflow state is not dirty * fix: Detect when only active state has changed and prevent generation a new version ID * feat: improve readonly env messages * make getPreferences public * fix telemetry issue * fix: add partial workflow update based on dirty state when changing active state * update unit tests * fix: remove unsaved changes check in readOnlyEnv * fix: disable push to git button when read onyl env * fix: update readonly toast duration * fix: fix pinning and title input in protected mode * initial commit (NOT working) * working push * cleanup and implement pull * fix getstatus * update import to new method * var and tag diffs are no conflicts * only show pull conflict for workflows * refactor and ignore faulty credentials * add sanitycheck for missing git folder * prefer fetch over pull and limit depth to 1 * back to pull... * fix setting branch on initial connect * fix test * remove clean workfolder * refactor: Remove some unnecessary code * Fixed links to docs. * fix getstatus query params * lint fix * dialog to show local and remote name on conflict * only show remote name on conflict * fix credential expression export * fix: Broken test * dont show toast on pull with empty var/tags and refactor * apply frontend changes from old branch * fix tag with same name import * fix buttons shown for non instance owners * prepare local storage key for removal * refactor: Change wording on pushing and pulling * refactor: Change menu item * test: Fix broken test * Update packages/cli/src/environments/sourceControl/types/sourceControlPushWorkFolder.ts Co-authored-by: Iván Ovejero <ivov.src@gmail.com> --------- Co-authored-by: Alex Grozav <alex@grozav.com> Co-authored-by: Giulio Andreini <g.andreini@gmail.com> Co-authored-by: Omar Ajoue <krynble@gmail.com> Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
250 lines
9.0 KiB
TypeScript
250 lines
9.0 KiB
TypeScript
import { Authorized, Get, Post, Patch, RestController } from '@/decorators';
|
|
import {
|
|
sourceControlLicensedMiddleware,
|
|
sourceControlLicensedAndEnabledMiddleware,
|
|
} from './middleware/sourceControlEnabledMiddleware.ee';
|
|
import { SourceControlService } from './sourceControl.service.ee';
|
|
import { SourceControlRequest } from './types/requests';
|
|
import { SourceControlPreferencesService } from './sourceControlPreferences.service.ee';
|
|
import type { SourceControlPreferences } from './types/sourceControlPreferences';
|
|
import type { SourceControlledFile } from './types/sourceControlledFile';
|
|
import { SOURCE_CONTROL_API_ROOT, SOURCE_CONTROL_DEFAULT_BRANCH } from './constants';
|
|
import { BadRequestError } from '@/ResponseHelper';
|
|
import type { PullResult } from 'simple-git';
|
|
import express from 'express';
|
|
import type { ImportResult } from './types/importResult';
|
|
import Container, { Service } from 'typedi';
|
|
import { InternalHooks } from '../../InternalHooks';
|
|
import { getRepoType } from './sourceControlHelper.ee';
|
|
import { SourceControlGetStatus } from './types/sourceControlGetStatus';
|
|
|
|
@Service()
|
|
@RestController(`/${SOURCE_CONTROL_API_ROOT}`)
|
|
export class SourceControlController {
|
|
constructor(
|
|
private sourceControlService: SourceControlService,
|
|
private sourceControlPreferencesService: SourceControlPreferencesService,
|
|
) {}
|
|
|
|
@Authorized('none')
|
|
@Get('/preferences', { middlewares: [sourceControlLicensedMiddleware] })
|
|
async getPreferences(): Promise<SourceControlPreferences> {
|
|
// returns the settings with the privateKey property redacted
|
|
return this.sourceControlPreferencesService.getPreferences();
|
|
}
|
|
|
|
@Authorized(['global', 'owner'])
|
|
@Post('/preferences', { middlewares: [sourceControlLicensedMiddleware] })
|
|
async setPreferences(req: SourceControlRequest.UpdatePreferences) {
|
|
if (
|
|
req.body.branchReadOnly === undefined &&
|
|
this.sourceControlPreferencesService.isSourceControlConnected()
|
|
) {
|
|
throw new BadRequestError(
|
|
'Cannot change preferences while connected to a source control provider. Please disconnect first.',
|
|
);
|
|
}
|
|
try {
|
|
const sanitizedPreferences: Partial<SourceControlPreferences> = {
|
|
...req.body,
|
|
initRepo: req.body.initRepo ?? true, // default to true if not specified
|
|
connected: undefined,
|
|
publicKey: undefined,
|
|
};
|
|
await this.sourceControlPreferencesService.validateSourceControlPreferences(
|
|
sanitizedPreferences,
|
|
);
|
|
const updatedPreferences = await this.sourceControlPreferencesService.setPreferences(
|
|
sanitizedPreferences,
|
|
);
|
|
if (sanitizedPreferences.initRepo === true) {
|
|
try {
|
|
await this.sourceControlService.initializeRepository(
|
|
{
|
|
...updatedPreferences,
|
|
branchName:
|
|
updatedPreferences.branchName === ''
|
|
? SOURCE_CONTROL_DEFAULT_BRANCH
|
|
: updatedPreferences.branchName,
|
|
initRepo: true,
|
|
},
|
|
req.user,
|
|
);
|
|
if (this.sourceControlPreferencesService.getPreferences().branchName !== '') {
|
|
await this.sourceControlPreferencesService.setPreferences({
|
|
connected: true,
|
|
});
|
|
}
|
|
} catch (error) {
|
|
// if initialization fails, run cleanup to remove any intermediate state and throw the error
|
|
await this.sourceControlService.disconnect({ keepKeyPair: true });
|
|
throw error;
|
|
}
|
|
}
|
|
await this.sourceControlService.init();
|
|
const resultingPreferences = this.sourceControlPreferencesService.getPreferences();
|
|
// #region Tracking Information
|
|
// located in controller so as to not call this multiple times when updating preferences
|
|
void Container.get(InternalHooks).onSourceControlSettingsUpdated({
|
|
branch_name: resultingPreferences.branchName,
|
|
connected: resultingPreferences.connected,
|
|
read_only_instance: resultingPreferences.branchReadOnly,
|
|
repo_type: getRepoType(resultingPreferences.repositoryUrl),
|
|
});
|
|
// #endregion
|
|
return resultingPreferences;
|
|
} catch (error) {
|
|
throw new BadRequestError((error as { message: string }).message);
|
|
}
|
|
}
|
|
|
|
@Authorized(['global', 'owner'])
|
|
@Patch('/preferences', { middlewares: [sourceControlLicensedMiddleware] })
|
|
async updatePreferences(req: SourceControlRequest.UpdatePreferences) {
|
|
try {
|
|
const sanitizedPreferences: Partial<SourceControlPreferences> = {
|
|
...req.body,
|
|
initRepo: false,
|
|
connected: undefined,
|
|
publicKey: undefined,
|
|
repositoryUrl: undefined,
|
|
};
|
|
const currentPreferences = this.sourceControlPreferencesService.getPreferences();
|
|
await this.sourceControlPreferencesService.validateSourceControlPreferences(
|
|
sanitizedPreferences,
|
|
);
|
|
if (
|
|
sanitizedPreferences.branchName &&
|
|
sanitizedPreferences.branchName !== currentPreferences.branchName
|
|
) {
|
|
await this.sourceControlService.setBranch(sanitizedPreferences.branchName);
|
|
}
|
|
if (sanitizedPreferences.branchColor || sanitizedPreferences.branchReadOnly !== undefined) {
|
|
await this.sourceControlPreferencesService.setPreferences(
|
|
{
|
|
branchColor: sanitizedPreferences.branchColor,
|
|
branchReadOnly: sanitizedPreferences.branchReadOnly,
|
|
},
|
|
true,
|
|
);
|
|
}
|
|
await this.sourceControlService.init();
|
|
const resultingPreferences = this.sourceControlPreferencesService.getPreferences();
|
|
void Container.get(InternalHooks).onSourceControlSettingsUpdated({
|
|
branch_name: resultingPreferences.branchName,
|
|
connected: resultingPreferences.connected,
|
|
read_only_instance: resultingPreferences.branchReadOnly,
|
|
repo_type: getRepoType(resultingPreferences.repositoryUrl),
|
|
});
|
|
return resultingPreferences;
|
|
} catch (error) {
|
|
throw new BadRequestError((error as { message: string }).message);
|
|
}
|
|
}
|
|
|
|
@Authorized(['global', 'owner'])
|
|
@Post('/disconnect', { middlewares: [sourceControlLicensedMiddleware] })
|
|
async disconnect(req: SourceControlRequest.Disconnect) {
|
|
try {
|
|
return await this.sourceControlService.disconnect(req.body);
|
|
} catch (error) {
|
|
throw new BadRequestError((error as { message: string }).message);
|
|
}
|
|
}
|
|
|
|
@Authorized('any')
|
|
@Get('/get-branches', { middlewares: [sourceControlLicensedMiddleware] })
|
|
async getBranches() {
|
|
try {
|
|
return await this.sourceControlService.getBranches();
|
|
} catch (error) {
|
|
throw new BadRequestError((error as { message: string }).message);
|
|
}
|
|
}
|
|
|
|
@Authorized(['global', 'owner'])
|
|
@Post('/push-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
|
|
async pushWorkfolder(
|
|
req: SourceControlRequest.PushWorkFolder,
|
|
res: express.Response,
|
|
): Promise<SourceControlledFile[]> {
|
|
if (this.sourceControlPreferencesService.isBranchReadOnly()) {
|
|
throw new BadRequestError('Cannot push onto read-only branch.');
|
|
}
|
|
try {
|
|
await this.sourceControlService.setGitUserDetails(
|
|
`${req.user.firstName} ${req.user.lastName}`,
|
|
req.user.email,
|
|
);
|
|
const result = await this.sourceControlService.pushWorkfolder(req.body);
|
|
res.statusCode = result.statusCode;
|
|
return result.statusResult;
|
|
} catch (error) {
|
|
throw new BadRequestError((error as { message: string }).message);
|
|
}
|
|
}
|
|
|
|
@Authorized(['global', 'owner'])
|
|
@Post('/pull-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
|
|
async pullWorkfolder(
|
|
req: SourceControlRequest.PullWorkFolder,
|
|
res: express.Response,
|
|
): Promise<SourceControlledFile[] | ImportResult | PullResult | undefined> {
|
|
try {
|
|
const result = await this.sourceControlService.pullWorkfolder({
|
|
force: req.body.force,
|
|
variables: req.body.variables,
|
|
userId: req.user.id,
|
|
});
|
|
res.statusCode = result.statusCode;
|
|
return result.statusResult;
|
|
} catch (error) {
|
|
throw new BadRequestError((error as { message: string }).message);
|
|
}
|
|
}
|
|
|
|
@Authorized(['global', 'owner'])
|
|
@Get('/reset-workfolder', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
|
|
async resetWorkfolder(): Promise<ImportResult | undefined> {
|
|
try {
|
|
return await this.sourceControlService.resetWorkfolder();
|
|
} catch (error) {
|
|
throw new BadRequestError((error as { message: string }).message);
|
|
}
|
|
}
|
|
|
|
@Authorized('any')
|
|
@Get('/get-status', { middlewares: [sourceControlLicensedAndEnabledMiddleware] })
|
|
async getStatus(req: SourceControlRequest.GetStatus) {
|
|
try {
|
|
const result = (await this.sourceControlService.getStatus(
|
|
new SourceControlGetStatus(req.query),
|
|
)) as SourceControlledFile[];
|
|
return result;
|
|
} catch (error) {
|
|
throw new BadRequestError((error as { message: string }).message);
|
|
}
|
|
}
|
|
|
|
@Authorized('any')
|
|
@Get('/status', { middlewares: [sourceControlLicensedMiddleware] })
|
|
async status(req: SourceControlRequest.GetStatus) {
|
|
try {
|
|
return await this.sourceControlService.getStatus(new SourceControlGetStatus(req.query));
|
|
} catch (error) {
|
|
throw new BadRequestError((error as { message: string }).message);
|
|
}
|
|
}
|
|
|
|
@Authorized(['global', 'owner'])
|
|
@Post('/generate-key-pair', { middlewares: [sourceControlLicensedMiddleware] })
|
|
async generateKeyPair(): Promise<SourceControlPreferences> {
|
|
try {
|
|
const result = await this.sourceControlPreferencesService.generateAndSaveKeyPair();
|
|
return result;
|
|
} catch (error) {
|
|
throw new BadRequestError((error as { message: string }).message);
|
|
}
|
|
}
|
|
}
|