From 1fdf793a7bf65fef596fe88001e275a2ee120214 Mon Sep 17 00:00:00 2001 From: Sofie Hofmann <29145005+sofie29@users.noreply.github.com> Date: Tue, 7 Jul 2020 09:48:11 +0200 Subject: [PATCH] TSK-1324: Rename selectors in shared component --- .../access-items-management.component.html | 12 ++--- .../classification-details.component.html | 22 ++++----- .../classification-list.component.html | 6 +-- .../workbasket-access-items.component.html | 6 +-- .../workbasket-details.component.html | 2 +- .../workbasket-dual-list.component.html | 6 +-- .../workbasket-information.component.html | 26 +++++------ .../workbasket-list-toolbar.component.html | 4 +- .../workbasket-list.component.html | 6 +-- .../workbasket-list.component.spec.ts | 2 +- web/src/app/app.component.html | 8 ++-- .../task-query/task-query.component.html | 14 +++--- .../date-picker/date-picker.component.ts | 2 +- .../components/dropdown/dropdown.component.ts | 2 +- .../field-error-display.component.ts | 2 +- .../components/filter/filter.component.html | 2 +- .../components/filter/filter.component.ts | 2 +- .../master-and-detail.component.ts | 2 +- .../components/nav-bar/nav-bar.component.html | 2 +- .../components/nav-bar/nav-bar.component.ts | 2 +- .../no-access/no-access.component.ts | 2 +- .../number-picker/number-picker.component.ts | 2 +- .../pagination/pagination.component.ts | 2 +- .../popup/dialog-pop-up.component.ts | 2 +- .../progress-bar/progress-bar.component.ts | 2 +- .../shared/components/sort/sort.component.ts | 8 +--- .../components/spinner/spinner.component.ts | 2 +- .../components/toast/toast.component.ts | 2 +- .../shared/components/tree/tree.component.ts | 2 +- .../type-ahead/type-ahead.component.html | 4 +- .../type-ahead/type-ahead.component.ts | 2 +- .../type-ahead/type-ahead.mock.component.ts | 2 +- .../user-information.component.ts | 2 +- .../task-list-toolbar.component.html | 6 +-- .../task-master/task-master.component.html | 4 +- .../components/task/task.component.html | 2 +- .../general-fields.component.html | 46 +++++++++---------- .../taskdetails/taskdetails.component.html | 2 +- web/src/theme/_site.scss | 4 +- 39 files changed, 112 insertions(+), 116 deletions(-) diff --git a/web/src/app/administration/components/access-items-management/access-items-management.component.html b/web/src/app/administration/components/access-items-management/access-items-management.component.html index 5ff4c2cf7..591e36773 100644 --- a/web/src/app/administration/components/access-items-management/access-items-management.component.html +++ b/web/src/app/administration/components/access-items-management/access-items-management.component.html @@ -4,8 +4,8 @@
- +

Select an access id

@@ -17,7 +17,7 @@ - + Workbasket Key Access Id @@ -69,9 +69,9 @@
- +
diff --git a/web/src/app/administration/components/classification-details/classification-details.component.html b/web/src/app/administration/components/classification-details/classification-details.component.html index c8ecf9a95..77d416be9 100644 --- a/web/src/app/administration/components/classification-details/classification-details.component.html +++ b/web/src/app/administration/components/classification-details/classification-details.component.html @@ -1,5 +1,5 @@
- +
@@ -35,9 +35,9 @@ - - + +
@@ -45,9 +45,9 @@ - - + +
@@ -68,10 +68,10 @@
- - - + + +
diff --git a/web/src/app/administration/components/classification-list/classification-list.component.html b/web/src/app/administration/components/classification-list/classification-list.component.html index 8271957b2..afdf6674c 100644 --- a/web/src/app/administration/components/classification-list/classification-list.component.html +++ b/web/src/app/administration/components/classification-list/classification-list.component.html @@ -51,9 +51,9 @@
- - + +

There are no classifications

diff --git a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.html b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.html index 183fd50f4..243b3fc09 100644 --- a/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.html +++ b/web/src/app/administration/components/workbasket-access-items/workbasket-access-items.component.html @@ -41,8 +41,8 @@ [ngClass]="{ 'has-warning': (accessItemsClone[index].accessId !== accessItem.value.accessId), 'has-error': !accessItem.value.accessId }"> - + @@ -92,6 +92,6 @@ add Add new access - +
diff --git a/web/src/app/administration/components/workbasket-details/workbasket-details.component.html b/web/src/app/administration/components/workbasket-details/workbasket-details.component.html index 65ec82c03..878a8ebd1 100644 --- a/web/src/app/administration/components/workbasket-details/workbasket-details.component.html +++ b/web/src/app/administration/components/workbasket-details/workbasket-details.component.html @@ -1,5 +1,5 @@
- +
- +
- +
  • - +
diff --git a/web/src/app/administration/components/workbasket-information/workbasket-information.component.html b/web/src/app/administration/components/workbasket-information/workbasket-information.component.html index 4e19da86f..cb7e7aa6e 100644 --- a/web/src/app/administration/components/workbasket-information/workbasket-information.component.html +++ b/web/src/app/administration/components/workbasket-information/workbasket-information.component.html @@ -1,4 +1,4 @@ - +
@@ -30,29 +30,29 @@ - - + +
- - + +
- + - - + +
diff --git a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.html b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.html index 0c246ca05..72910e701 100644 --- a/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.html +++ b/web/src/app/administration/components/workbasket-list-toolbar/workbasket-list-toolbar.component.html @@ -7,7 +7,7 @@
- +
- +
diff --git a/web/src/app/administration/components/workbasket-list/workbasket-list.component.html b/web/src/app/administration/components/workbasket-list/workbasket-list.component.html index 9798bb2a3..08c7d2f40 100644 --- a/web/src/app/administration/components/workbasket-list/workbasket-list.component.html +++ b/web/src/app/administration/components/workbasket-list/workbasket-list.component.html @@ -28,7 +28,7 @@
- +

There are no workbaskets

@@ -36,5 +36,5 @@
- + diff --git a/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts b/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts index ee8cf25bd..355ee4a08 100644 --- a/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts +++ b/web/src/app/administration/components/workbasket-list/workbasket-list.component.spec.ts @@ -31,7 +31,7 @@ class DummyDetailComponent { } @Component({ - selector: 'taskana-pagination', + selector: 'taskana-shared-pagination', template: 'dummydetail' }) class PaginationComponent { diff --git a/web/src/app/app.component.html b/web/src/app/app.component.html index 4d6d167f4..843f58c9b 100644 --- a/web/src/app/app.component.html +++ b/web/src/app/app.component.html @@ -1,9 +1,9 @@ - +
- - + +
- +
diff --git a/web/src/app/history/task-query/task-query.component.html b/web/src/app/history/task-query/task-query.component.html index fb6ff92dc..d11bb6783 100644 --- a/web/src/app/history/task-query/task-query.component.html +++ b/web/src/app/history/task-query/task-query.component.html @@ -49,10 +49,10 @@
- +
- +
diff --git a/web/src/app/shared/components/date-picker/date-picker.component.ts b/web/src/app/shared/components/date-picker/date-picker.component.ts index c61a691be..c50f00568 100644 --- a/web/src/app/shared/components/date-picker/date-picker.component.ts +++ b/web/src/app/shared/components/date-picker/date-picker.component.ts @@ -1,7 +1,7 @@ import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core'; @Component({ - selector: 'taskana-date-picker', + selector: 'taskana-shared-date-picker', templateUrl: './date-picker.component.html', styleUrls: ['./date-picker.component.scss'] }) diff --git a/web/src/app/shared/components/dropdown/dropdown.component.ts b/web/src/app/shared/components/dropdown/dropdown.component.ts index b3042761d..ebd0d3d53 100644 --- a/web/src/app/shared/components/dropdown/dropdown.component.ts +++ b/web/src/app/shared/components/dropdown/dropdown.component.ts @@ -1,7 +1,7 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; @Component({ - selector: 'taskana-dropdown', + selector: 'taskana-shared-dropdown', templateUrl: './dropdown.component.html', styleUrls: ['./dropdown.component.scss'] }) diff --git a/web/src/app/shared/components/field-error-display/field-error-display.component.ts b/web/src/app/shared/components/field-error-display/field-error-display.component.ts index ca204e154..3e01f443b 100644 --- a/web/src/app/shared/components/field-error-display/field-error-display.component.ts +++ b/web/src/app/shared/components/field-error-display/field-error-display.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit, Input } from '@angular/core'; import { highlight } from 'theme/animations/validation.animation'; @Component({ - selector: 'taskana-field-error-display', + selector: 'taskana-shared-field-error-display', templateUrl: './field-error-display.component.html', animations: [highlight], styleUrls: ['./field-error-display.component.scss'] diff --git a/web/src/app/shared/components/filter/filter.component.html b/web/src/app/shared/components/filter/filter.component.html index 7dfadeb85..6d120f13d 100644 --- a/web/src/app/shared/components/filter/filter.component.html +++ b/web/src/app/shared/components/filter/filter.component.html @@ -48,7 +48,7 @@
- +
-
\ No newline at end of file +
diff --git a/web/src/app/shared/components/type-ahead/type-ahead.component.ts b/web/src/app/shared/components/type-ahead/type-ahead.component.ts index 95e977ff1..20d89714d 100644 --- a/web/src/app/shared/components/type-ahead/type-ahead.component.ts +++ b/web/src/app/shared/components/type-ahead/type-ahead.component.ts @@ -16,7 +16,7 @@ import { mergeMap } from 'rxjs/operators'; import { AccessIdDefinition } from 'app/shared/models/access-id'; @Component({ - selector: 'taskana-type-ahead', + selector: 'taskana-shared-type-ahead', templateUrl: './type-ahead.component.html', styleUrls: ['./type-ahead.component.scss'], animations: [highlight], diff --git a/web/src/app/shared/components/type-ahead/type-ahead.mock.component.ts b/web/src/app/shared/components/type-ahead/type-ahead.mock.component.ts index 8e14757c0..aae4aee95 100644 --- a/web/src/app/shared/components/type-ahead/type-ahead.mock.component.ts +++ b/web/src/app/shared/components/type-ahead/type-ahead.mock.component.ts @@ -2,7 +2,7 @@ import { Component, forwardRef, Input } from '@angular/core'; import { NG_VALUE_ACCESSOR, ControlValueAccessor } from '@angular/forms'; @Component({ - selector: 'taskana-type-ahead', + selector: 'taskana-shared-type-ahead', template: 'dummydetail', providers: [ { diff --git a/web/src/app/shared/components/user-information/user-information.component.ts b/web/src/app/shared/components/user-information/user-information.component.ts index 94647bde2..e14fd198d 100644 --- a/web/src/app/shared/components/user-information/user-information.component.ts +++ b/web/src/app/shared/components/user-information/user-information.component.ts @@ -4,7 +4,7 @@ import { UserInfo } from 'app/shared/models/user-info'; import { expandDown } from '../../../../theme/animations/expand.animation'; @Component({ - selector: 'taskana-user-information', + selector: 'taskana-shared-user-information', templateUrl: './user-information.component.html', styleUrls: ['./user-information.component.scss'], animations: [expandDown], diff --git a/web/src/app/workplace/components/task-list-toolbar/task-list-toolbar.component.html b/web/src/app/workplace/components/task-list-toolbar/task-list-toolbar.component.html index bd48ab226..21ec0d7f5 100644 --- a/web/src/app/workplace/components/task-list-toolbar/task-list-toolbar.component.html +++ b/web/src/app/workplace/components/task-list-toolbar/task-list-toolbar.component.html @@ -21,7 +21,7 @@ placeholder="Search by value ..." />
- + @@ -61,7 +61,7 @@
- - + +
diff --git a/web/src/app/workplace/components/task-master/task-master.component.html b/web/src/app/workplace/components/task-master/task-master.component.html index c85c9ac47..890b0557a 100644 --- a/web/src/app/workplace/components/task-master/task-master.component.html +++ b/web/src/app/workplace/components/task-master/task-master.component.html @@ -6,5 +6,5 @@ - + diff --git a/web/src/app/workplace/components/task/task.component.html b/web/src/app/workplace/components/task/task.component.html index 62b215afe..ad07202f9 100644 --- a/web/src/app/workplace/components/task/task.component.html +++ b/web/src/app/workplace/components/task/task.component.html @@ -1,4 +1,4 @@ - +
diff --git a/web/src/app/workplace/components/taskdetails-general/general-fields.component.html b/web/src/app/workplace/components/taskdetails-general/general-fields.component.html index d400c36eb..953c919f0 100644 --- a/web/src/app/workplace/components/taskdetails-general/general-fields.component.html +++ b/web/src/app/workplace/components/taskdetails-general/general-fields.component.html @@ -5,17 +5,17 @@
- - + +
- - + +
@@ -24,17 +24,17 @@ - - + +
- - + +
@@ -42,31 +42,31 @@ - - + +
- - + +
- +
- +
- +
@@ -83,8 +83,8 @@
- + diff --git a/web/src/app/workplace/components/taskdetails/taskdetails.component.html b/web/src/app/workplace/components/taskdetails/taskdetails.component.html index a122dddb6..34a480b99 100644 --- a/web/src/app/workplace/components/taskdetails/taskdetails.component.html +++ b/web/src/app/workplace/components/taskdetails/taskdetails.component.html @@ -1,4 +1,4 @@ - +
diff --git a/web/src/theme/_site.scss b/web/src/theme/_site.scss index ec0788192..598fd453d 100644 --- a/web/src/theme/_site.scss +++ b/web/src/theme/_site.scss @@ -161,7 +161,7 @@ svg-icon { /* *Remove bootstrap cols padding for master and detail component */ -.no-gutter > taskana-master-and-detail > [class*='col-'] { +.no-gutter > taskana-shared-master-and-detail > [class*='col-'] { padding-right: 0; padding-left: 0; } @@ -303,7 +303,7 @@ span.flip { padding: 5px 15px; } -.dual-list > taskana-filter > .list-group-search { +.dual-list > taskana-shared-filter > .list-group-search { margin-top: 4px; }