From c4ef411c916a22a55fe5afd66f4a3c9bd6efbf58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adina=20=C8=9Aeudan?= Date: Fri, 19 Mar 2021 00:19:42 +0200 Subject: [PATCH] Reset search field --- apps/red-ui/src/app/app.module.ts | 4 ++- .../search-input/search-input.component.html | 7 ++++++ .../search-input/search-input.component.scss | 3 +++ .../search-input/search-input.component.ts | 25 +++++++++++++++++++ .../assign-owner-dialog.component.html | 19 ++++++-------- .../assign-owner-dialog.component.scss | 6 ----- .../dictionary-listing-screen.component.html | 14 +---------- .../rule-sets-listing-screen.component.html | 13 +--------- .../user-listing-screen.component.html | 7 +----- .../project-listing-screen.component.html | 7 +----- .../project-overview-screen.component.html | 9 +++---- 11 files changed, 52 insertions(+), 62 deletions(-) create mode 100644 apps/red-ui/src/app/components/search-input/search-input.component.html create mode 100644 apps/red-ui/src/app/components/search-input/search-input.component.scss create mode 100644 apps/red-ui/src/app/components/search-input/search-input.component.ts diff --git a/apps/red-ui/src/app/app.module.ts b/apps/red-ui/src/app/app.module.ts index 12327ce3e..ac4295fd6 100644 --- a/apps/red-ui/src/app/app.module.ts +++ b/apps/red-ui/src/app/app.module.ts @@ -118,6 +118,7 @@ import { MatProgressBarModule } from '@angular/material/progress-bar'; import { ForceRedactionDialogComponent } from './dialogs/force-redaction-dialog/force-redaction-dialog.component'; import { AuditScreenComponent } from './screens/admin/audit-screen/audit-screen.component'; import { PaginationComponent } from './components/pagination/pagination.component'; +import { SearchInputComponent } from './components/search-input/search-input.component'; export function HttpLoaderFactory(httpClient: HttpClient) { return new TranslateHttpLoader(httpClient, '/assets/i18n/', '.json'); @@ -390,7 +391,8 @@ const matImports = [ ComboChartComponent, ComboSeriesVerticalComponent, AuditScreenComponent, - PaginationComponent + PaginationComponent, + SearchInputComponent ], imports: [ BrowserModule, diff --git a/apps/red-ui/src/app/components/search-input/search-input.component.html b/apps/red-ui/src/app/components/search-input/search-input.component.html new file mode 100644 index 000000000..aff28b9a6 --- /dev/null +++ b/apps/red-ui/src/app/components/search-input/search-input.component.html @@ -0,0 +1,7 @@ +
+
+ + + +
+
diff --git a/apps/red-ui/src/app/components/search-input/search-input.component.scss b/apps/red-ui/src/app/components/search-input/search-input.component.scss new file mode 100644 index 000000000..7f26ddcb5 --- /dev/null +++ b/apps/red-ui/src/app/components/search-input/search-input.component.scss @@ -0,0 +1,3 @@ +:host { + display: block; +} diff --git a/apps/red-ui/src/app/components/search-input/search-input.component.ts b/apps/red-ui/src/app/components/search-input/search-input.component.ts new file mode 100644 index 000000000..4b79e8da3 --- /dev/null +++ b/apps/red-ui/src/app/components/search-input/search-input.component.ts @@ -0,0 +1,25 @@ +import { Component, Input, OnInit } from '@angular/core'; +import { FormGroup } from '@angular/forms'; + +@Component({ + selector: 'redaction-search-input', + templateUrl: './search-input.component.html', + styleUrls: ['./search-input.component.scss'] +}) +export class SearchInputComponent implements OnInit { + @Input() form: FormGroup; + @Input() placeholder: string; + @Input() width = 250; + + constructor() {} + + ngOnInit(): void {} + + public get hasContent() { + return !!this.form.get('query').value.length; + } + + public clearContent() { + this.form.patchValue({ query: '' }); + } +} diff --git a/apps/red-ui/src/app/dialogs/assign-owner-dialog/assign-owner-dialog.component.html b/apps/red-ui/src/app/dialogs/assign-owner-dialog/assign-owner-dialog.component.html index 9631d7918..2d3ee5428 100644 --- a/apps/red-ui/src/app/dialogs/assign-owner-dialog/assign-owner-dialog.component.html +++ b/apps/red-ui/src/app/dialogs/assign-owner-dialog/assign-owner-dialog.component.html @@ -26,18 +26,13 @@

 
-                
-
- - -
-
+ +
diff --git a/apps/red-ui/src/app/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss b/apps/red-ui/src/app/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss index ca9aa7cb3..2d19c30e2 100644 --- a/apps/red-ui/src/app/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss +++ b/apps/red-ui/src/app/dialogs/assign-owner-dialog/assign-owner-dialog.component.scss @@ -5,13 +5,7 @@ } .search-container { - width: 560px; margin-top: 16px; - - input { - width: 100%; - max-width: 100%; - } } .members-list { diff --git a/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html b/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html index d56e2703f..558ca32e0 100644 --- a/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html +++ b/apps/red-ui/src/app/screens/admin/dictionary-listing-screen/dictionary-listing-screen.component.html @@ -43,19 +43,7 @@
-
-
- - -
-
- +
-
-
- - -
-
+ -
-
- - -
-
+
-
-
- - -
-
+
-
-
- - -
-
+ + +