Finer selection of fake search bar in individual item pages

OpenBudget · Feb 5, 2024 · 195894d · 195894d
1 parent 306ffe7
commit 195894d
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 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
@@ -5,7 +5,7 @@
       </a>
     </div>
     <div *ngIf="showSearchBar" class="search-div layout-desktop">
-      <app-bk-search-bar [fake]='true'></app-bk-search-bar>
+      <app-bk-search-bar [fake]='fakeSearchBar' (submit)='doSearch($event)'></app-bk-search-bar>
     </div>
     <div class='mobile-separator'></div>
     <div class="menu-links layout-desktop">

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
@@ -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/...cts/budgetkey/src/app/common-components/components/searchbar/bk-search-bar.component.html b/...cts/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
@@ -67,6 +67,7 @@ export class BkSearchBar implements OnChanges, AfterViewInit, OnInit {
 
   @Output() selected = new EventEmitter<any>();
   @Output() search = new EventEmitter<string>();
+  @Output() submit = new EventEmitter<string>();
 
   @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
@@ -1,4 +1,4 @@
-<app-container [showHeader]="true" [showSearchBar]="true" [listSideView]='true' [showShare]="false">
+<app-container [showHeader]="true" [showSearchBar]="true" [listSideView]='true' [showShare]="false" [fakeSearchBar]='fakeSearchBar'>
   <div #container class="budgetkey-item-wrapper container-fluid" [ngClass]="'style-' + style" *ngIf='init'>
     <div class='item-container'>
       <app-item-budget0dig *ngIf='prefix("budget/00/")' [item]='item'></app-item-budget0dig>

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
@@ -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
@@ -3,6 +3,7 @@
         [showSearchBar]="showSearchBar"
         [showLanguages]="showLanguages"
         [showShare]="showShare"
+        [fakeSearchBar]="fakeSearchBar"
     ></app-bk-header>
     <div class='scrollable'>
         <div class='app'>

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
@@ -23,6 +23,7 @@ export class AppContainerComponent implements AfterViewInit, OnChanges {
     @Input() showShare = true;
     @Input() helpWidget = true;
     @Input() listSideView = false;
+    @Input() fakeSearchBar = true;
 
     configured = false;