Skip to content

Commit 34aea39

Browse files
authored
refactor(ui): remove ng2-semantic-ui (#6261)
1 parent 4edc99e commit 34aea39

33 files changed

+354
-559
lines changed

ui/package-lock.json

-106
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ui/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@
4343
"@ngxs/devtools-plugin": "3.7.3",
4444
"@ngxs/logger-plugin": "3.7.3",
4545
"@ngxs/store": "3.7.3",
46-
"@richardlt/ng2-semantic-ui": "0.10.0-alpha.6-fork-6",
4746
"@sgu/auto-complete": "13.0.0-rc",
4847
"@swimlane/ngx-charts": "16.0.0",
4948
"@types/dagre-d3": "0.6.2",

ui/src/app/model/workflow-template.model.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -103,9 +103,9 @@ export class InstanceStatusUtil {
103103
public static color(status: InstanceStatus): string {
104104
switch (status) {
105105
case InstanceStatus.UP_TO_DATE:
106-
return 'green';
106+
return 'success';
107107
case InstanceStatus.NOT_UP_TO_DATE:
108-
return 'red';
108+
return 'error';
109109
case InstanceStatus.NOT_IMPORTED:
110110
return 'orange';
111111
}

ui/src/app/shared/audit/list/audit.list.component.ts

+6-3
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,12 @@ export class AuditListComponent implements OnInit {
4343
name: '',
4444
disabled: !this.canRollback,
4545
selector: (audit: AuditWorkflow) => ({
46-
title: 'common_rollback',
47-
click: () => this.rollback.emit(audit.id)
48-
}),
46+
buttonType: 'primary',
47+
buttonDanger: false,
48+
buttonConfirmationMessage: 'Are you sure you want to rollback this workflow ?',
49+
title: 'Rollback',
50+
click: () => this.rollback.emit(audit.id)
51+
}),
4952
},
5053
];
5154
}

ui/src/app/shared/button/confirm/confirm.button.html

-10
This file was deleted.

ui/src/app/shared/button/confirm/confirm.button.scss

-1
This file was deleted.

ui/src/app/shared/button/confirm/confirm.button.ts

-30
This file was deleted.

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

+5-14
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
44
import { RouterModule } from '@angular/router';
55
import { NguiAutoCompleteModule } from '@sgu/auto-complete';
66
import { TranslateModule } from '@ngx-translate/core';
7-
import { SuiModule } from '@richardlt/ng2-semantic-ui';
87
import { NgxChartsModule } from '@swimlane/ngx-charts';
98
import { AuthenticationGuard } from 'app/guard/authentication.guard';
109
import { FeatureGuard } from 'app/guard/feature.guard';
@@ -31,7 +30,6 @@ import { ActionStepFormComponent } from './action/step/form/step.form.component'
3130
import { ActionStepComponent } from './action/step/step.component';
3231
import { AuditListComponent } from './audit/list/audit.list.component';
3332
import { BreadcrumbComponent } from './breadcrumb/breadcrumb.component';
34-
import { ConfirmButtonComponent } from './button/confirm/confirm.button';
3533
import { DeleteButtonComponent } from './button/delete/delete.button';
3634
import { UploadButtonComponent } from './button/upload/upload.button.component';
3735
import { ChartComponentComponent } from './chart/chart.component';
@@ -66,7 +64,6 @@ import { ScrollviewComponent } from './scrollview/scrollview.component';
6664
import { SharedService } from './shared.service';
6765
import { StatusIconComponent } from './status/status.component';
6866
import { DataTableComponent, SelectorPipe, SelectPipe } from './table/data-table.component';
69-
import { PaginationComponent } from './table/pagination.component';
7067
import { TabComponent } from './tabs/tab.component';
7168
import { TabsComponent } from './tabs/tabs.component';
7269
import { ToastService } from './toast/ToastService';
@@ -121,8 +118,8 @@ import { NzPopconfirmModule } from 'ng-zorro-antd/popconfirm';
121118
import { en_US, NZ_I18N } from 'ng-zorro-antd/i18n';
122119
import { NzIconModule } from 'ng-zorro-antd/icon';
123120
import { IconDefinition } from '@ant-design/icons-angular';
124-
import { ArrowDownOutline, ArrowRightOutline, AudioOutline, AudioMutedOutline, BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CodeOutline, CopyOutline, DeleteOutline, DragOutline, EyeInvisibleOutline, EyeOutline, KeyOutline,
125-
HighlightFill, HistoryOutline, InfoCircleOutline, PhoneFill, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline, RestOutline, SaveOutline, SettingFill, ShareAltOutline, StarOutline, StarFill, StopOutline, SyncOutline,
121+
import { ArrowDownOutline, ArrowRightOutline, AudioOutline, AudioMutedOutline, BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CodeOutline, CopyOutline, CrownOutline, DeleteOutline, DragOutline, EyeInvisibleOutline, EyeOutline, FieldTimeOutline, KeyOutline,
122+
HighlightFill, HistoryOutline, InfoCircleOutline, LockOutline, PhoneFill, PlayCircleOutline, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline, RestOutline, SafetyCertificateOutline, SaveOutline, SettingFill, ShareAltOutline, StarOutline, StarFill, StopOutline, SyncOutline,
126123
TableOutline, TagsOutline, ToolFill, UnlockFill, UnorderedListOutline, UploadOutline, UserOutline, WarningOutline, WarningFill } from '@ant-design/icons-angular/icons'
127124
import { NzDropDownModule } from 'ng-zorro-antd/dropdown';
128125
import { NzTagModule } from 'ng-zorro-antd/tag';
@@ -153,9 +150,9 @@ const ngZorroConfig: NzConfig = {
153150
icon: {nzTheme: "outline"}
154151
};
155152

156-
const icons: IconDefinition[] = [ ArrowDownOutline, ArrowRightOutline, AudioOutline, AudioMutedOutline, BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CodeOutline, CopyOutline, DeleteOutline, DragOutline,
157-
EyeInvisibleOutline, EyeOutline, KeyOutline, HighlightFill, HistoryOutline, InfoCircleOutline, PhoneFill, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline,
158-
RestOutline, SaveOutline, SettingFill, ShareAltOutline, StarOutline, StarFill, StopOutline, SyncOutline, TableOutline, TagsOutline, ToolFill, UnlockFill, UnorderedListOutline, UploadOutline, UserOutline, WarningOutline, WarningFill ];
153+
const icons: IconDefinition[] = [ ArrowDownOutline, ArrowRightOutline, AudioOutline, AudioMutedOutline, BellFill, BookOutline, CalendarOutline, CaretDownFill, CaretRightFill, CaretUpFill, CheckOutline, CodeOutline, CopyOutline, CrownOutline, DeleteOutline, DragOutline,
154+
EyeInvisibleOutline, EyeOutline, FieldTimeOutline, KeyOutline, HighlightFill, HistoryOutline, InfoCircleOutline, LockOutline, PhoneFill, PlayCircleOutline, PlusOutline, PlusSquareOutline, QuestionOutline, QuestionCircleOutline,
155+
RestOutline, SafetyCertificateOutline, SaveOutline, SettingFill, ShareAltOutline, StarOutline, StarFill, StopOutline, SyncOutline, TableOutline, TagsOutline, ToolFill, UnlockFill, UnorderedListOutline, UploadOutline, UserOutline, WarningOutline, WarningFill ];
159156

160157
@NgModule({
161158
imports: [
@@ -201,7 +198,6 @@ const icons: IconDefinition[] = [ ArrowDownOutline, ArrowRightOutline, AudioOutl
201198
MarkdownModule.forRoot(),
202199
NguiAutoCompleteModule,
203200
RouterModule,
204-
SuiModule,
205201
InfiniteScrollModule,
206202
NgxChartsModule
207203
],
@@ -221,7 +217,6 @@ const icons: IconDefinition[] = [ ArrowDownOutline, ArrowRightOutline, AudioOutl
221217
ChartComponentComponent,
222218
CommitListComponent,
223219
ConditionsComponent,
224-
ConfirmButtonComponent,
225220
CutPipe,
226221
DataTableComponent,
227222
DeleteButtonComponent,
@@ -237,7 +232,6 @@ const icons: IconDefinition[] = [ ArrowDownOutline, ArrowRightOutline, AudioOutl
237232
MenuComponent,
238233
NgForNumber,
239234
NgxAutoScrollDirective,
240-
PaginationComponent,
241235
ParameterFormComponent,
242236
ParameterListComponent,
243237
ParameterValueComponent,
@@ -333,7 +327,6 @@ const icons: IconDefinition[] = [ ArrowDownOutline, ArrowRightOutline, AudioOutl
333327
CommitListComponent,
334328
CommonModule,
335329
ConditionsComponent,
336-
ConfirmButtonComponent,
337330
CutPipe,
338331
DataTableComponent,
339332
DeleteButtonComponent,
@@ -385,7 +378,6 @@ const icons: IconDefinition[] = [ ArrowDownOutline, ArrowRightOutline, AudioOutl
385378
NzTableModule,
386379
NzToolTipModule,
387380
NzUploadModule,
388-
PaginationComponent,
389381
ParameterFormComponent,
390382
ParameterListComponent,
391383
ParameterValueComponent,
@@ -403,7 +395,6 @@ const icons: IconDefinition[] = [ ArrowDownOutline, ArrowRightOutline, AudioOutl
403395
SelectorPipe,
404396
SelectPipe,
405397
StatusIconComponent,
406-
SuiModule,
407398
TabsComponent,
408399
TranslateModule,
409400
TruncatePipe,

0 commit comments

Comments
 (0)