From 195894de624529fab9565770932741ea960e2621 Mon Sep 17 00:00:00 2001 From: Adam Kariv Date: Mon, 5 Feb 2024 19:32:33 +0200 Subject: [PATCH] Finer selection of fake search bar in individual item pages --- .../components/header/bk-header.component.html | 2 +- .../components/header/bk-header.component.ts | 1 + .../components/searchbar/bk-search-bar.component.html | 1 + .../components/searchbar/bk-search-bar.component.ts | 6 ++++++ .../src/app/item/item-page/item-page.component.html | 2 +- .../budgetkey/src/app/item/item-page/item-page.component.ts | 3 +++ .../app-container/app-container.component.html | 1 + .../app-container/app-container.component.ts | 1 + 8 files changed, 15 insertions(+), 2 deletions(-) diff --git a/projects/budgetkey/src/app/common-components/components/header/bk-header.component.html b/projects/budgetkey/src/app/common-components/components/header/bk-header.component.html index 5627b91..6866752 100644 --- a/projects/budgetkey/src/app/common-components/components/header/bk-header.component.html +++ b/projects/budgetkey/src/app/common-components/components/header/bk-header.component.html @@ -5,7 +5,7 @@
- +
diff --git a/projects/budgetkey/src/app/common-components/components/header/bk-header.component.ts b/projects/budgetkey/src/app/common-components/components/header/bk-header.component.ts index f0b608c..02aac53 100644 --- a/projects/budgetkey/src/app/common-components/components/header/bk-header.component.ts +++ b/projects/budgetkey/src/app/common-components/components/header/bk-header.component.ts @@ -17,6 +17,7 @@ export class BkHeaderComponent { @Input() showSearchBar = false; @Input() showLanguages = false; @Input() showShare = true; + @Input() fakeSearchBar = true; public showAuth = false; public showCollapsedMenu = signal(false); collapseMenuSub: Subscription | null = null; diff --git a/projects/budgetkey/src/app/common-components/components/searchbar/bk-search-bar.component.html b/projects/budgetkey/src/app/common-components/components/searchbar/bk-search-bar.component.html index 42ddcd5..f231416 100644 --- a/projects/budgetkey/src/app/common-components/components/searchbar/bk-search-bar.component.html +++ b/projects/budgetkey/src/app/common-components/components/searchbar/bk-search-bar.component.html @@ -49,6 +49,7 @@ [autofocus]='!disableAutofocus' (keyup)="doSearch(searchBox.value)" (keyup.backspace)="doSearch(searchBox.value)" + (keydown.enter)="doSubmit()" [value]="searchTerm" (focus)="isSearchBarHasFocus = true" (focusout)="isSearchBarHasFocus = false" diff --git a/projects/budgetkey/src/app/common-components/components/searchbar/bk-search-bar.component.ts b/projects/budgetkey/src/app/common-components/components/searchbar/bk-search-bar.component.ts index b30dff8..8d01866 100644 --- a/projects/budgetkey/src/app/common-components/components/searchbar/bk-search-bar.component.ts +++ b/projects/budgetkey/src/app/common-components/components/searchbar/bk-search-bar.component.ts @@ -67,6 +67,7 @@ export class BkSearchBar implements OnChanges, AfterViewInit, OnInit { @Output() selected = new EventEmitter(); @Output() search = new EventEmitter(); + @Output() submit = new EventEmitter(); @ViewChild('searchBox') searchBox: ElementRef; @ViewChild('btnSearchMenu') btnSearchMenu: ElementRef; @@ -158,6 +159,11 @@ export class BkSearchBar implements OnChanges, AfterViewInit, OnInit { this.search.emit(term); } + + doSubmit() { + this.calcExternalUrl(); + this.submit.emit(this.externalUrl); + } openCloseSearchTypeDropDown(event?: Event) { event?.stopPropagation(); diff --git a/projects/budgetkey/src/app/item/item-page/item-page.component.html b/projects/budgetkey/src/app/item/item-page/item-page.component.html index 9e1e683..cfbe55b 100644 --- a/projects/budgetkey/src/app/item/item-page/item-page.component.html +++ b/projects/budgetkey/src/app/item/item-page/item-page.component.html @@ -1,4 +1,4 @@ - +
diff --git a/projects/budgetkey/src/app/item/item-page/item-page.component.ts b/projects/budgetkey/src/app/item/item-page/item-page.component.ts index 5a9df38..70f88ca 100644 --- a/projects/budgetkey/src/app/item/item-page/item-page.component.ts +++ b/projects/budgetkey/src/app/item/item-page/item-page.component.ts @@ -104,4 +104,7 @@ export class ItemPageComponent implements AfterViewInit, OnInit { return searchPattern.test(this.itemId); } + get fakeSearchBar() { + return this.itemId?.indexOf('units/') !== 0 && this.itemId?.indexOf('activities/gov_social_service') !== 0; + } } diff --git a/projects/budgetkey/src/app/list-components/app-container/app-container.component.html b/projects/budgetkey/src/app/list-components/app-container/app-container.component.html index 3f9bb1c..af47d11 100644 --- a/projects/budgetkey/src/app/list-components/app-container/app-container.component.html +++ b/projects/budgetkey/src/app/list-components/app-container/app-container.component.html @@ -3,6 +3,7 @@ [showSearchBar]="showSearchBar" [showLanguages]="showLanguages" [showShare]="showShare" + [fakeSearchBar]="fakeSearchBar" >
diff --git a/projects/budgetkey/src/app/list-components/app-container/app-container.component.ts b/projects/budgetkey/src/app/list-components/app-container/app-container.component.ts index 29d1097..2f22662 100644 --- a/projects/budgetkey/src/app/list-components/app-container/app-container.component.ts +++ b/projects/budgetkey/src/app/list-components/app-container/app-container.component.ts @@ -23,6 +23,7 @@ export class AppContainerComponent implements AfterViewInit, OnChanges { @Input() showShare = true; @Input() helpWidget = true; @Input() listSideView = false; + @Input() fakeSearchBar = true; configured = false;