Skip to content

Commit be65926

Browse files
sguiheuxsguiheux
authored
refactor(ui): remove semantic from workflow/notification/workflowAdm (#6232)
1 parent 8a3c3d8 commit be65926

31 files changed

+1028
-993
lines changed

‎ui/src/app/shared/ascode/events/ascode.event.html

+5-2
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
</ul>
2121
</li>
2222
</ul>
23-
<button class="ui right floated mini green button" [disabled]="loadingPopupButton"
24-
[class.loading]="loadingPopupButton" (click)="resyncEvents()">{{'btn_resync_ascode_event' | translate }}</button>
23+
<div class="footer">
24+
<button nz-button nzType="primary" nzSize="small" [disabled]="loadingPopupButton"
25+
[nzLoading]="loadingPopupButton" (click)="resyncEvents()">{{'btn_resync_ascode_event' | translate }}</button>
26+
</div>
27+
2528
</div>

‎ui/src/app/shared/ascode/events/ascode.event.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
.asCodeEvents {
2-
32
ul {
43
li {
54
ul {
65
list-style: none;
76
}
87
}
98
}
9+
.footer {
10+
text-align: right;
11+
}
1012
}
1113

1214

‎ui/src/app/shared/shared.module.ts

+6-2
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,9 @@ import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
124124
import { en_US, NZ_I18N } from 'ng-zorro-antd/i18n';
125125
import { NzIconModule } from 'ng-zorro-antd/icon';
126126
import { IconDefinition } from '@ant-design/icons-angular';
127-
import { BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CopyOutline, DeleteOutline, DragOutline, EyeInvisibleOutline, EyeOutline, KeyOutline, HistoryOutline, InfoCircleOutline, PhoneFill, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline, RestOutline, SaveOutline, SettingFill, ShareAltOutline, StarOutline, TableOutline, TagsOutline, ToolFill, UnlockFill, UnorderedListOutline, UploadOutline, WarningOutline } from '@ant-design/icons-angular/icons'
127+
import { ArrowDownOutline, ArrowRightOutline, BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CodeOutline, CopyOutline, DeleteOutline, DragOutline, EyeInvisibleOutline, EyeOutline, KeyOutline,
128+
HistoryOutline, InfoCircleOutline, PhoneFill, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline, RestOutline, SaveOutline, SettingFill, ShareAltOutline, StarOutline, StarFill, SyncOutline,
129+
TableOutline, TagsOutline, ToolFill, UnlockFill, UnorderedListOutline, UploadOutline, UserOutline, WarningOutline } from '@ant-design/icons-angular/icons'
128130
import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
129131
import { NzTagModule } from 'ng-zorro-antd/tag';
130132
import { NzPopoverModule } from 'ng-zorro-antd/popover';
@@ -154,7 +156,9 @@ const ngZorroConfig: NzConfig = {
154156
icon: {nzTheme: "outline"}
155157
};
156158

157-
const icons: IconDefinition[] = [ BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CopyOutline, DeleteOutline, DragOutline, EyeInvisibleOutline, EyeOutline, KeyOutline, HistoryOutline, InfoCircleOutline, PhoneFill, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline, RestOutline, SaveOutline, SettingFill, ShareAltOutline, StarOutline, TableOutline, TagsOutline, ToolFill, UnlockFill, UnorderedListOutline, UploadOutline, WarningOutline ];
159+
const icons: IconDefinition[] = [ ArrowDownOutline, ArrowRightOutline, BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CodeOutline, CopyOutline, DeleteOutline, DragOutline,
160+
EyeInvisibleOutline, EyeOutline, KeyOutline, HistoryOutline, InfoCircleOutline, PhoneFill, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline,
161+
RestOutline, SaveOutline, SettingFill, ShareAltOutline, StarOutline, StarFill, SyncOutline, TableOutline, TagsOutline, ToolFill, UnlockFill, UnorderedListOutline, UploadOutline, UserOutline, WarningOutline ];
158162

159163
@NgModule({
160164
imports: [

‎ui/src/app/shared/workflow/sidebar/run-list/workflow.sidebar.run.component.html

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<ng-container *ngIf="ready">
2-
<sui-multi-select class="selection" [(ngModel)]="selectedTags" [options]="tagsSelectable" [isSearchable]="true"
3-
(ngModelChange)="filterRuns()" [optionsFilter]="filterTags" #multiSelect>
4-
<sui-select-option *ngFor="let option of multiSelect.filteredOptions" [value]="option">
5-
</sui-select-option>
6-
</sui-multi-select>
2+
<nz-select nzShowSearch nzMode="multiple" [(ngModel)]="selectedTags" (ngModelChange)="filterRuns()" nzPlaceHolder="Filter...">
3+
<nz-option *ngFor="let o of tagsSelectable" [nzLabel]="o" [nzValue]="o"></nz-option>
4+
</nz-select>
75
<div class="runs" #tagsList infiniteScroll [infiniteScrollDistance]="2" [infiniteScrollThrottle]="50"
86
[scrollWindow]="false" (scrolled)="scroll()">
97
<ng-container *ngIf="workflowRuns.length > 0">

‎ui/src/app/shared/workflow/sidebar/run-list/workflow.sidebar.run.component.scss

+3
Original file line numberDiff line numberDiff line change
@@ -213,4 +213,7 @@
213213
}
214214
}
215215
}
216+
nz-select {
217+
padding: 5px 10px 5px 5px;
218+
}
216219
}

‎ui/src/app/shared/workflow/sidebar/run-list/workflow.sidebar.run.component.ts

-11
Original file line numberDiff line numberDiff line change
@@ -252,17 +252,6 @@ export class WorkflowSidebarRunListComponent implements OnDestroy {
252252
}
253253
}
254254

255-
filterTags(options: Array<string>, query: string): Array<string> | false {
256-
if (!options) {
257-
return false;
258-
}
259-
if (!query || query.length < 3) {
260-
return options.slice(0, 100);
261-
}
262-
let queryLowerCase = query.toLowerCase();
263-
return options.filter(o => o.toLowerCase().indexOf(queryLowerCase) !== -1);
264-
}
265-
266255
confirmCopy() {
267256
this._toast.success('', 'Workflow run version copied!');
268257
}

‎ui/src/app/store/workflow.state.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -356,6 +356,7 @@ export class WorkflowState {
356356
return;
357357
}
358358

359+
359360
// Update Non as code workflow
360361
return this._http.put<Workflow>(
361362
`/project/${action.payload.projectKey}/workflows/${action.payload.workflowName}`,
@@ -389,7 +390,6 @@ export class WorkflowState {
389390
ctx.dispatch(new UpdateModal({ workflow: wf }));
390391
} else {
391392
let wfUpdated: Workflow = {
392-
...state.workflow,
393393
...wf,
394394
preview: null
395395
};

‎ui/src/app/views/application/show/admin/application.admin.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div id="ApplicationAdmin">
2-
<nz-card nzTitle="Settings">
2+
<nz-card nzTitle="Settings" class="coloredTitle">
33
<form nz-form #applicationUpdateFrom="ngForm">
44
<nz-form-item>
55
<nz-form-label [nzSpan]="3">Name</nz-form-label>
@@ -36,11 +36,11 @@
3636
</form>
3737
</nz-card>
3838

39-
<nz-card nzTitle="Repository">
39+
<nz-card nzTitle="Repository" class="coloredTitle">
4040
<app-application-repo [project]="project" [application]="application" [editMode]="editMode"></app-application-repo>
4141
</nz-card>
4242

43-
<nz-card nzTitle="Integrations">
43+
<nz-card nzTitle="Integrations" class="coloredTitle">
4444
<ng-container *ngIf="project.integrations && project.integrations.length > 0">
4545
<app-application-deployment [project]="project" [application]="application" [editMode]="editMode"></app-application-deployment>
4646
</ng-container>
@@ -49,7 +49,7 @@
4949
</ng-container>
5050
</nz-card>
5151

52-
<nz-card nzTitle="Danger zone">
52+
<nz-card nzTitle="Danger zone" class="redTitle">
5353
<nz-row>
5454
<nz-col [nzSpan]="12">
5555
<div class="title">Delete application</div>

‎ui/src/app/views/environment/show/advanced/environment.advanced.html

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div id="EnvironmentAdmin">
2-
<nz-card nzTitle="Configuration">
2+
<nz-card nzTitle="Settings" class="coloredTitle">
33
<form nz-form #environmentUpdateFrom="ngForm">
44
<nz-form-item>
55
<nz-form-label>Name</nz-form-label>
@@ -23,7 +23,7 @@
2323
</nz-form-item>
2424
</form>
2525
</nz-card>
26-
<nz-card nzTitle="Danger zone">
26+
<nz-card nzTitle="Danger zone" class="redTitle">
2727
<nz-row>
2828
<nz-col [nzSpan]="12">
2929
<div class="title">{{ 'environment_delete_label' | translate}}</div>

‎ui/src/app/views/pipeline/show/admin/pipeline.admin.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="pipelineAdmin">
2-
<app-zone header="{{ 'pipeline_administration' | translate }}">
2+
<app-zone header="{{ 'pipeline_administration' | translate }}" >
33
<app-zone-content>
44
<form class="ui form" (ngSubmit)="updatePipeline()" #projectUpdateFrom="ngForm">
55
<div class="eight wide field">

‎ui/src/app/views/project/show/admin/project.admin.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div id="projectAdmin">
2-
<nz-card nzTitle="Project configuration" >
2+
<nz-card nzTitle="Settings" class="coloredTitle">
33
<form nz-form (ngSubmit)="onSubmitProjectUpdate()" #projectUpdateFrom="ngForm">
44
<nz-form-item>
55
<nz-form-label [nzSpan]="3">Project name</nz-form-label>
@@ -40,13 +40,13 @@
4040
</nz-form-item>
4141
</form>
4242
</nz-card>
43-
<nz-card nzTitle="Link to a repository manager">
43+
<nz-card nzTitle="Link to a repository manager" class="coloredTitle">
4444
<app-repomanager-form [project]="project"></app-repomanager-form>
4545
<app-project-repomanager-list *ngIf="project.vcs_servers && project.vcs_servers.length > 0"
4646
[project]="project" [reposmanagers]="project.vcs_servers"
4747
></app-project-repomanager-list>
4848
</nz-card>
49-
<nz-card nzTitle="Danger zone">
49+
<nz-card nzTitle="Danger zone" class="redTitle">
5050
<nz-row>
5151
<nz-col [nzSpan]="12">
5252
<div class="title">Delete project</div>

‎ui/src/app/views/workflow/graph/workflow.graph.component.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ export class WorkflowGraphComponent implements AfterViewInit, OnDestroy {
9999
// https://github.com/cpettitt/dagre/wiki#configuring-the-layout
100100
this.g = new dagreD3.graphlib.Graph().setGraph({ rankdir: this.direction, nodesep: 10, ranksep: 15, edgesep: 5 });
101101
// Create all nodes
102-
if (this.workflow.workflow_data && this.workflow.workflow_data.node && this.workflow.workflow_data.node.id > 0) {
102+
if (this.workflow.workflow_data && this.workflow.workflow_data.node) {
103103
this.createNode(this.workflow.workflow_data.node);
104104
}
105105
if (this.workflow.workflow_data && this.workflow.workflow_data.joins) {

0 commit comments

Comments
 (0)