Skip to content

Commit 07d2510

Browse files
sei-aschlackmansei-aschlackman
committed
fix admin search boxes
1 parent 3b1515d commit 07d2510

File tree

4 files changed

+91
-89
lines changed

4 files changed

+91
-89
lines changed

‎src/app/components/admin-app/admin-app-template-search/admin-app-template-search.component.html‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
</div>
1616
<span class="header-text">Application Templates</span>
1717
</div>
18-
<div class="d-flex align-items-center">
19-
<mat-icon
20-
style="transform: scale(0.85); margin-right: 5px"
21-
svgIcon="ic_magnify_search"
22-
></mat-icon>
23-
<mat-form-field style="width: 250px">
18+
<div class="my-1">
19+
<mat-form-field style="width: 250px" subscriptSizing="dynamic">
20+
<mat-icon
21+
matPrefix
22+
style="transform: scale(0.85); margin-right: 5px"
23+
svgIcon="ic_magnify_search"
24+
></mat-icon>
2425
<input
2526
matInput
2627
[(ngModel)]="filterString"

‎src/app/components/admin-app/admin-user-search/admin-user-search.component.html‎

Lines changed: 56 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,32 @@
55
<div
66
[class.hidden]="userToEdit !== undefined"
77
class="user-list-container mat-elevation-z8"
8-
>
8+
>
99
<div class="d-flex align-items-center gap-4">
1010
<div class="sp-icon">
1111
<img height="35" src="assets/img/SP_Icon_User.png" alt="Users" />
1212
</div>
1313
<span class="header-text">Users</span>
14-
<div class="d-flex align-items-center">
15-
<mat-icon
16-
style="transform: scale(0.85)"
17-
svgIcon="ic_magnify_search"
18-
></mat-icon>
19-
<mat-form-field style="width: 320px">
14+
<div class="my-1">
15+
<mat-form-field style="width: 320px" subscriptSizing="dynamic">
16+
<mat-icon
17+
matPrefix
18+
style="transform: scale(0.85)"
19+
svgIcon="ic_magnify_search"
20+
></mat-icon>
2021
<input
2122
matInput
2223
[(ngModel)]="filterString"
2324
(keyup)="applyFilter($event.target.value)"
2425
placeholder="Search"
25-
/>
26+
/>
2627
@if (filterString !== '') {
2728
<button
2829
mat-icon-button
2930
matSuffix
3031
(click)="clearFilter()"
3132
title="Clear Search"
32-
>
33+
>
3334
<mat-icon
3435
style="transform: scale(0.85)"
3536
svgIcon="ic_cancel_circle"
@@ -52,52 +53,52 @@
5253
<ng-container matColumnDef="name">
5354
<mat-header-cell *matHeaderCellDef mat-sort-header
5455
>User Name</mat-header-cell
56+
>
57+
<mat-cell *matCellDef="let element">
58+
<button
59+
mat-icon-button
60+
ngxClipboard
61+
[cbContent]="element.id"
62+
title="Copy: {{ element.id }}"
5563
>
56-
<mat-cell *matCellDef="let element">
57-
<button
58-
mat-icon-button
59-
ngxClipboard
60-
[cbContent]="element.id"
61-
title="Copy: {{ element.id }}"
62-
>
63-
<mat-icon
64-
style="transform: scale(0.85)"
65-
svgIcon="ic_clipboard_copy"
66-
></mat-icon>
67-
</button>
68-
@if (element.name !== null) {
69-
<div>{{ element.name }}</div>
70-
}
71-
@if (element.name === null) {
72-
<div>{{ element.id }}</div>
73-
}
74-
</mat-cell>
75-
</ng-container>
64+
<mat-icon
65+
style="transform: scale(0.85)"
66+
svgIcon="ic_clipboard_copy"
67+
></mat-icon>
68+
</button>
69+
@if (element.name !== null) {
70+
<div>{{ element.name }}</div>
71+
}
72+
@if (element.name === null) {
73+
<div>{{ element.id }}</div>
74+
}
75+
</mat-cell>
76+
</ng-container>
7677

77-
<ng-container matColumnDef="roleName">
78-
<mat-header-cell *matHeaderCellDef mat-sort-header>
79-
Role
80-
</mat-header-cell>
81-
<mat-cell *matCellDef="let element; let i = index">
82-
<app-roles-permissions-select
83-
[user]="element"
84-
></app-roles-permissions-select>
85-
</mat-cell>
86-
</ng-container>
78+
<ng-container matColumnDef="roleName">
79+
<mat-header-cell *matHeaderCellDef mat-sort-header>
80+
Role
81+
</mat-header-cell>
82+
<mat-cell *matCellDef="let element; let i = index">
83+
<app-roles-permissions-select
84+
[user]="element"
85+
></app-roles-permissions-select>
86+
</mat-cell>
87+
</ng-container>
8788

88-
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
89-
<mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
90-
</mat-table>
91-
</mat-accordion>
92-
@if (userDataSource.filteredData.length === 0) {
93-
<div>No results found</div>
94-
}
95-
<mat-paginator
96-
#paginator
97-
[pageSize]="defaultPageSize"
98-
[pageSizeOptions]="[10, 20, 30]"
99-
[showFirstLastButtons]="true"
100-
(page)="pageEvent = $event"
101-
>
102-
</mat-paginator>
103-
</div>
89+
<mat-header-row *matHeaderRowDef="displayedColumns"></mat-header-row>
90+
<mat-row *matRowDef="let row; columns: displayedColumns"></mat-row>
91+
</mat-table>
92+
</mat-accordion>
93+
@if (userDataSource.filteredData.length === 0) {
94+
<div>No results found</div>
95+
}
96+
<mat-paginator
97+
#paginator
98+
[pageSize]="defaultPageSize"
99+
[pageSizeOptions]="[10, 20, 30]"
100+
[showFirstLastButtons]="true"
101+
(page)="pageEvent = $event"
102+
>
103+
</mat-paginator>
104+
</div>

‎src/app/components/admin-app/admin-view-search/admin-view-search.component.html‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,30 @@
1111
<div
1212
[class.hidden]="showEditScreen"
1313
class="view-list-container mat-elevation-z8"
14-
>
14+
>
1515
<div class="d-flex align-items-center gap-1">
1616
<mat-icon class="player-icon-small" svgIcon="ic_crucible_player"></mat-icon>
1717
<h3 class="header-text ms-2">Views</h3>
18-
<div class="d-flex align-items-center ms-5">
19-
<mat-icon
20-
style="transform: scale(0.85); margin-right: 5px"
21-
svgIcon="ic_magnify_search"
22-
></mat-icon>
23-
<mat-form-field style="width: 320px">
18+
<div class="ms-5">
19+
<mat-form-field style="width: 320px" subscriptSizing="dynamic">
20+
<mat-icon
21+
matPrefix
22+
style="transform: scale(0.85); margin-right: 5px"
23+
svgIcon="ic_magnify_search"
24+
></mat-icon>
2425
<input
2526
matInput
2627
[(ngModel)]="filterString"
2728
(keyup)="applyFilter($event.target.value)"
2829
placeholder="Search"
29-
/>
30+
/>
3031
@if (filterString !== '') {
3132
<button
3233
mat-icon-button
3334
matSuffix
3435
(click)="clearFilter()"
3536
title="Clear Search"
36-
>
37+
>
3738
<mat-icon
3839
style="transform: scale(0.85)"
3940
svgIcon="ic_cancel_circle"
@@ -47,14 +48,14 @@ <h3 class="header-text ms-2">Views</h3>
4748
mat-icon-button
4849
matTooltip="Add a new View"
4950
(click)="addNewView()"
50-
>
51+
>
5152
<mat-icon fontIcon="mdi-plus" class="mdi-24px"></mat-icon>
5253
</button>
5354
<button
5455
mat-icon-button
5556
matTooltip="Import Views"
5657
(click)="openDialog(importDialog)"
57-
>
58+
>
5859
<mat-icon fontIcon="mdi-file-import" class="mdi-24px"></mat-icon>
5960
</button>
6061
<button
@@ -64,16 +65,14 @@ <h3 class="header-text ms-2">Views</h3>
6465
selection.selected.length > 0 ? selection.selected.length : ''
6566
"
6667
(click)="openDialog(exportDialog)"
67-
>
68+
>
6869
<mat-icon fontIcon="mdi-file-export" class="mdi-24px"></mat-icon>
6970
</button>
7071
</div>
7172
</div>
7273

7374
@if (isLoading) {
74-
<mat-card
75-
class="d-flex justify-content-center align-items-center"
76-
>
75+
<mat-card class="d-flex justify-content-center align-items-center">
7776
<mat-progress-spinner color="primary" mode="indeterminate">
7877
</mat-progress-spinner>
7978
</mat-card>
@@ -86,15 +85,15 @@ <h3 class="header-text ms-2">Views</h3>
8685
(change)="$event ? toggleAllRows() : null"
8786
[checked]="selection.hasValue() && isAllSelected()"
8887
[indeterminate]="selection.hasValue() && !isAllSelected()"
89-
>
88+
>
9089
</mat-checkbox>
9190
</mat-header-cell>
9291
<mat-cell *matCellDef="let row">
9392
<mat-checkbox
9493
(click)="$event.stopPropagation()"
9594
(change)="$event ? selection.toggle(row.id) : null"
9695
[checked]="selection.isSelected(row.id)"
97-
>
96+
>
9897
</mat-checkbox>
9998
</mat-cell>
10099
</ng-container>
@@ -110,7 +109,7 @@ <h3 class="header-text ms-2">Views</h3>
110109
ngxClipboard
111110
[cbContent]="element.id"
112111
title="Copy: {{ element.id }}"
113-
>
112+
>
114113
<mat-icon
115114
style="transform: scale(0.85)"
116115
svgIcon="ic_clipboard_copy"
@@ -120,7 +119,7 @@ <h3 class="header-text ms-2">Views</h3>
120119
mat-button
121120
class="px-0"
122121
(click)="executeViewAction('edit', element.id)"
123-
>
122+
>
124123
{{ element.name }}
125124
</button>
126125
</mat-cell>

‎src/app/components/admin-app/app-admin-subscription-search/app-admin-subscription-search.component.html‎

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,29 @@
99
alt="Subscriptions"
1010
width="35"
1111
class="ms-2"
12-
/>
12+
/>
1313
<!-- <mat-icon class="player-icon-small" svgIcon="ic_crucible_player"></mat-icon> -->
1414
<h3 class="header-text ms-2">Subscriptions</h3>
1515
<div class="d-flex align-items-center ms-4">
16-
<mat-icon
17-
style="transform: scale(0.85); margin-right: 5px"
18-
svgIcon="ic_magnify_search"
19-
></mat-icon>
20-
<mat-form-field style="width: 320px">
16+
<mat-form-field style="width: 320px" subscriptSizing="dynamic">
17+
<mat-icon
18+
matPrefix
19+
style="transform: scale(0.85); margin-right: 5px"
20+
svgIcon="ic_magnify_search"
21+
></mat-icon>
2122
<input
2223
matInput
2324
[(ngModel)]="filterStr"
2425
(keyup)="applyFilter($event.target.value)"
2526
placeholder="Search"
26-
/>
27+
/>
2728
@if (filterStr !== '') {
2829
<button
2930
mat-icon-button
3031
matSuffix
3132
(click)="clearFilter()"
3233
title="Clear Search"
33-
>
34+
>
3435
<mat-icon
3536
style="transform: scale(0.85)"
3637
svgIcon="ic_cancel_circle"
@@ -57,7 +58,7 @@ <h3 class="header-text ms-2">Subscriptions</h3>
5758
mat-icon-button
5859
title="Edit Subscription"
5960
(click)="editSubscription(element)"
60-
>
61+
>
6162
<mat-icon style="transform: scale(0.85)" svgIcon="ic_edit"></mat-icon>
6263
</button>
6364
{{ element.name }}

0 commit comments

Comments
 (0)
⚡