Skip to content

fix(ui): template apply form with repo param #6770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
richardlt merged 1 commit into from
Jan 5, 2024
Merged

fix(ui): template apply form with repo param #6770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 13 additions & 15 deletions ui/src/app/shared/workflow-template/param-form/workflow-template.param-form.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ export class WorkflowTemplateParamFormComponent implements OnInit, OnDestroy {
result: WorkflowTemplateApplyResult;
codeMirrorConfig: any;
themeSubscription: Subscription;
focusParam: string;
filteredRepo: any[] = [];

constructor(
private _repoManagerService: RepoManagerService,
Expand Down Expand Up @@ -111,24 +109,26 @@ export class WorkflowTemplateParamFormComponent implements OnInit, OnDestroy {
}

fetchRepos(parameterKey: string, repoMan: string): void {
this._repoManagerService.getRepositories(this.project.key, repoMan, false).subscribe(rs => {
let repoNames = rs.map(r => r.fullname);
this.parameterValues[parameterKey] = repoMan;
this.emitParam();

this.parameterValues[parameterKey + '-repositories'] = repoNames;
this._repoManagerService.getRepositories(this.project.key, repoMan, false).subscribe(rs => {
this.parameterValues[parameterKey + '-repositories'] = rs.map(r => r.fullname);
this.parameterValues[parameterKey + '-repositories-filtered'] = rs.map(r => r.fullname).splice(0, 100);
this._cd.markForCheck()

if (this.workflowTemplateInstance && this.workflowTemplateInstance.request.parameters[parameterKey]) {
let v = this.workflowTemplateInstance.request.parameters[parameterKey];
let s = v.split('/');
if (s.length > 1) {
let selectedRepo = s.splice(1, s.length - 1).join('/');
let existingRepo = repoNames.find(n => n === selectedRepo);
let existingRepo = rs.map(r => r.fullname).find(n => n === selectedRepo);
if (existingRepo) {
this.parameterValues[parameterKey + '-repository'] = existingRepo;
this.emitParam();
}
}
}
this._cd.markForCheck();
});
}

Expand All @@ -142,6 +142,8 @@ export class WorkflowTemplateParamFormComponent implements OnInit, OnDestroy {
}))
.subscribe(rs => {
this.parameterValues[parameterKey + '-repositories'] = rs.map(r => r.fullname);
this.parameterValues[parameterKey + '-repositories-filtered'] = rs.map(r => r.fullname).splice(0, 100);
this._cd.markForCheck()
});
}
}
Expand Down Expand Up @@ -179,18 +181,14 @@ export class WorkflowTemplateParamFormComponent implements OnInit, OnDestroy {
}
}

focusRepo(key: string) {
this.focusParam = key;
this.filteredRepo = this.parameterValues[this.focusParam + '-repositories'].splice(0, 100);
this._cd.markForCheck();
}

filterRepo(query: string): void {
filterRepo(parameterKey: string, query: string): void {
if (!query || query.length < 3) {
this.parameterValues[parameterKey + '-repositories-filtered'] = [].concat(this.parameterValues[parameterKey + '-repositories']);
this._cd.markForCheck()
return;
}
let queryLowerCase = query.toLowerCase();
this.filteredRepo = this.parameterValues[this.focusParam + '-repositories'].filter(name => name.toLowerCase().indexOf(queryLowerCase) !== -1)
this.parameterValues[parameterKey + '-repositories-filtered'] = this.parameterValues[parameterKey + '-repositories'].filter(name => name.toLowerCase().indexOf(queryLowerCase) !== -1);
this._cd.markForCheck()
}

Expand Down
8 changes: 4 additions & 4 deletions ui/src/app/shared/workflow-template/param-form/workflow-template.param-form.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ <h3>Parameters</h3>
<nz-row *ngIf="parameter.type === 'repository'">
<nz-col [nzSpan]="18">
<nz-select name="parameter-{{parameter.key}}-repo" nzShowSearch
[ngModel]="parameterValues[parameter.key + '-repository']" (nzFocus)="focusRepo(parameter.key)"
(nzOnSearch)="filterRepo($event)"
[ngModel]="parameterValues[parameter.key + '-repository']"
(nzOnSearch)="filterRepo(parameter.key, $event)"
(ngModelChange)="changeParam(parameter.key + '-repository', $event)">
<nz-option *ngFor="let repository of filteredRepo" [nzValue]="repository"
[nzLabel]="repository">
<nz-option *ngFor="let repository of parameterValues[parameter.key + '-repositories-filtered']"
[nzValue]="repository" [nzLabel]="repository">
</nz-option>
</nz-select>
</nz-col>
Expand Down