sartography/cr-connect-bpmn
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-bpmn.git synced 2025-02-04 21:03:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplifying git buttons

Browse Source
This commit is contained in:
alicia pritchett 2022-03-02 12:45:47 -05:00
parent a4b50d43f0
commit 6496e14e5f
2 changed files with 33 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/app/workflow-spec-list/workflow-spec-list.component.html
View File

@ -8,20 +8,13 @@
<label><input matInput type="search" placeholder="Search Workflows" fxLayoutAlign="start" style="margin-top: 0;" class="form-control" [formControl]="searchField"></label>
</mat-form-field>
</div>
<div fxLayoutAlign="end center" fxLayoutGap="5px" *ngIf="branch === 'testing'">
<button mat-raised-button color="accent" (click)="gitPush()" >Publish</button>
</div>
<div fxLayoutAlign="end center" fxLayoutGap="5px" *ngIf="branch === 'staging'">
<button mat-raised-button color="accent" (click)="gitPush()" >Publish</button>
<button mat-raised-button color="primary" (click)="gitMerge(true)"> Pull Testing State</button>
</div>
<div fxLayoutAlign="end center" fxLayoutGap="5px" *ngIf="branch === 'production'">
<button mat-raised-button color="accent" (click)="gitMerge(true)"> Pull Staging State</button>
</div>
<div fxLayoutAlign="end center" fxLayoutGap="5px" *ngIf="branch !=='production' && branch !=='staging' && branch !=='testing'">
<button mat-raised-button color="accent" (click)="gitPush()" >Push</button>
<button mat-raised-button color="accent" (click)="gitPull()"> Pull</button>
<button mat-raised-button color="primary" (click)="gitMerge(false)"> Merge </button>
<div fxLayoutAlign="end center" fxLayoutGap="5px">
<div *ngIf="gitRepo && gitRepo.display_push">
<button mat-raised-button color="accent" (click)="gitPush()" >Publish</button>
</div>
<div *ngIf="gitRepo && gitRepo.display_merge && gitRepo.merge_branch!=='none'">
<button mat-raised-button color="primary" (click)="gitMerge()"> Pull State</button>
</div>
</div>
</div>
<mat-drawer-container class="example-container" autosize>

53
src/app/workflow-spec-list/workflow-spec-list.component.ts
View File

@ -58,8 +58,7 @@ export class WorkflowSpecListComponent implements OnInit {
categories: WorkflowSpecCategory[];
searchField: FormControl;
library_toggle: boolean;
merge_branch: string = 'branch'
branch: string = 'branch'
gitRepo: GitRepo;
constructor(
private api: ApiService,
@ -82,12 +81,7 @@ export class WorkflowSpecListComponent implements OnInit {
});
this.api.gitRepo().subscribe(gitRepo => {
if (gitRepo.merge_branch) {
this.merge_branch = gitRepo.merge_branch;
}
if (gitRepo.branch) {
this.branch = gitRepo.branch;
}
this.gitRepo = gitRepo;
})
this.searchField = new FormControl();
@ -400,7 +394,7 @@ export class WorkflowSpecListComponent implements OnInit {
dialogRef.afterClosed().subscribe((data) => {
if (data) {
let comment = data.comment || '';
this.api.gitRepoPush(comment).subscribe(data => {
this.api.gitRepoPush(comment).subscribe(_ => {
this._displayMessage(`Successfully pushed the Git state`);
});
}
@ -408,28 +402,33 @@ export class WorkflowSpecListComponent implements OnInit {
}
gitPull() {
this.api.gitRepoPull().subscribe(data => {
this.api.gitRepoPull().subscribe(_ => {
this.api.gitRepoPush('').subscribe(_ => {
this._displayMessage(`Successfully pulled the Git state`);
})
});
this._displayMessage(`Successfully pulled the Git state`);
}
gitMerge(pull?: boolean) {
const dialogRef = this.dialog.open(GitMergeDialogComponent, {
height: '75vh',
width: '40vw',
});
gitMerge() {
// If the merge branch is 'all', open the repo popup.
if (this.gitRepo.merge_branch == 'all') {
const dialogRef = this.dialog.open(GitMergeDialogComponent, {
height: '75vh',
width: '40vw',
});
dialogRef.afterClosed().subscribe((data) => {
if (data) {
this.api.gitRepoMerge(data.merge_branch).subscribe(res => {
this._displayMessage('Merged in new branch.');
});
}
if (pull) {
this.gitPull();
}
});
}
dialogRef.afterClosed().subscribe((data) => {
if (data) {
this.api.gitRepoMerge(data.merge_branch).subscribe(_ => {
this.gitPull();
});
}
});
} else {
this.api.gitRepoMerge(this.gitRepo.merge_branch).subscribe(_ => {
this.gitPull();
});}
};
private _updateWorkflowSpec(specId: string, newSpec: WorkflowSpec) {
this.api.updateWorkflowSpecification(specId, newSpec).subscribe(_ => {