Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: search button order config #594

Merged
merged 8 commits into from
Nov 13, 2024
Merged

feat: search button order config #594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f880f1e
libs/angular-accelerator/src/lib/components/search-header/search-head…
JordenReuter Nov 12, 2024
0f8cd35
feat: config for search-button-order
JordenReuter Nov 12, 2024
a37ff59
Merge branch 'main' into feature/search-button-order-config
JordenReuter Nov 12, 2024
366201f
fix: remove inferred type
JordenReuter Nov 13, 2024
6da5ada
Update search-header.component.ts
JordenReuter Nov 13, 2024
b878dda
fix: added configuration service provider
JordenReuter Nov 13, 2024
e7cdabc
Merge branch 'feature/search-button-order-config' of github.com:Jorde…
JordenReuter Nov 13, 2024
61f27a1
fix: added http client provider
JordenReuter Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libs/angular-accelerator/src/lib/components/search-header/search-header.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<ng-content></ng-content>
</div>
</div>
<div class="flex flex-wrap gap-2">
<div class="flex flex-wrap gap-2" [ngClass]="searchButtonsReversed ? 'flex-row-reverse' : 'flex-row'">
<p-button
id="resetButton"
*ngIf="resetted.observed"
Expand Down
7 changes: 5 additions & 2 deletions libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { Action } from '../page-header/page-header.component'
import { FormControlName, FormGroup, FormGroupDirective } from '@angular/forms'
import { Observable, combineLatest, debounceTime, map, of, startWith } from 'rxjs'
import { getLocation } from '@onecx/accelerator'
import { CONFIG_KEY, ConfigurationService } from '@onecx/angular-integration-interface'

export interface SearchHeaderComponentState {
activeViewMode?: 'basic' | 'advanced'
Expand Down Expand Up @@ -120,17 +121,19 @@ export class SearchHeaderComponent implements AfterContentInit, AfterViewInit {
show: 'always',
}
headerActions: Action[] = []

searchButtonsReversed = false
fieldValues$: Observable<{ [key: string]: unknown }> | undefined = of({})
searchConfigChangedSlotEmitter: EventEmitter<SearchConfigData | undefined> = new EventEmitter()

constructor() {
constructor(configurationService: ConfigurationService) {
this.searchConfigChangedSlotEmitter.subscribe((config) => {
this.componentStateChanged.emit({
selectedSearchConfig: config?.name ?? null,
})
this.selectedSearchConfigChanged.emit(config)
})
this.searchButtonsReversed =
configurationService.getProperty(CONFIG_KEY.ONECX_PORTAL_SEARCH_BUTTONS_REVERSED) === 'true'
}

ngAfterContentInit(): void {
Expand Down
4 changes: 4 additions & 0 deletions libs/angular-accelerator/src/lib/components/search-header/search-header.stories.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ import { StorybookTranslateModule } from '../../storybook-translate.module'
import { PageHeaderComponent } from '../page-header/page-header.component'
import { StorybookBreadcrumbModule } from './../../storybook-breadcrumb.module'
import { SearchHeaderComponent } from './search-header.component'
import { ConfigurationService } from '@onecx/angular-integration-interface'
import { provideHttpClient } from '@angular/common/http'

export default {
title: 'SearchHeaderComponent',
Expand All @@ -25,6 +27,8 @@ export default {
importProvidersFrom(BrowserModule),
importProvidersFrom(BrowserAnimationsModule),
importProvidersFrom(RouterModule.forRoot([], { useHash: true })),
importProvidersFrom(ConfigurationService),
provideHttpClient(),
],
}),
moduleMetadata({
Expand Down
1 change: 1 addition & 0 deletions libs/angular-integration-interface/src/lib/model/config-key.model.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export enum CONFIG_KEY {
ONECX_PORTAL_SETTINGS_DISABLED = 'ONECX_PORTAL_SETTINGS_DISABLED',
ONECX_PORTAL_MY_ROLES_PERMISSIONS_DISABLED = 'ONECX_PORTAL_MY_ROLES_PERMISSIONS_DISABLED',
ONECX_PORTAL_HELP_DISABLED = 'ONECX_PORTAL_HELP_DISABLED',
ONECX_PORTAL_SEARCH_BUTTONS_REVERSED = 'ONECX_PORTAL_SEARCH_BUTTONS_REVERSED',
APP_VERSION = 'APP_VERSION',
IS_SHELL = 'IS_SHELL',
AUTH_SERVICE = 'AUTH_SERVICE',
Expand Down
Loading