Merge branch 'main' into fix/data-table-header-layout

libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.html

@@ -91,9 +91,7 @@
     <div class="data-list-items p-3">
       <div class="item-name-row flex flex-row justify-content-between">
         <div class="item-name mr-3 text-2xl font-medium align-content-center">
-          <a *ngIf="titleLineId" [routerLink]="" (click)="onViewRow(item)"
-            >{{ resolveFieldData(item, titleLineId) || '' }}</a
-          >
+          <span *ngIf="titleLineId">{{ resolveFieldData(item, titleLineId) || '' }}</span>
         </div>
         <div class="flex flex-row">
           <ng-container

libs/angular-accelerator/src/lib/components/data-list-grid/data-list-grid.component.ts

@@ -83,9 +83,9 @@ export class DataListGridComponent extends DataSortBase implements OnInit, DoChe
   @Input() emptyResultsMessage: string | undefined
   @Input() fallbackImage = 'placeholder.png'
   @Input() layout: 'grid' | 'list' = 'grid'
-  @Input() viewPermission: string | undefined
-  @Input() editPermission: string | undefined
-  @Input() deletePermission: string | undefined
+  @Input() viewPermission: string | string[] | undefined
+  @Input() editPermission: string | string[] | undefined
+  @Input() deletePermission: string | string[] | undefined
   @Input() deleteActionVisibleField: string | undefined
   @Input() deleteActionEnabledField: string | undefined
   @Input() viewActionVisibleField: string | undefined

libs/angular-accelerator/src/lib/components/data-table/data-table.component.ts

@@ -163,9 +163,9 @@ export class DataTableComponent extends DataSortBase implements OnInit, AfterCon
 
   @Input() emptyResultsMessage: string | undefined
   @Input() name = ''
-  @Input() deletePermission: string | undefined
-  @Input() viewPermission: string | undefined
-  @Input() editPermission: string | undefined
+  @Input() deletePermission: string | string[] | undefined
+  @Input() viewPermission: string | string[] | undefined
+  @Input() editPermission: string | string[] | undefined
   @Input() deleteActionVisibleField: string | undefined
   @Input() deleteActionEnabledField: string | undefined
   @Input() viewActionVisibleField: string | undefined

libs/angular-accelerator/src/lib/components/data-view/data-view.component.ts

@@ -55,9 +55,9 @@ export class DataViewComponent implements DoCheck, OnInit, AfterContentInit {
   dataTableComponentState$ = new ReplaySubject<DataTableComponentState>(1)
   dataListGridComponentState$ = new ReplaySubject<DataListGridComponentState>(1)
 
-  @Input() deletePermission: string | undefined
-  @Input() editPermission: string | undefined
-  @Input() viewPermission: string | undefined
+  @Input() deletePermission: string | string[] | undefined
+  @Input() editPermission: string | string[] | undefined
+  @Input() viewPermission: string | string[] | undefined
   @Input() deleteActionVisibleField: string | undefined
   @Input() deleteActionEnabledField: string | undefined
   @Input() viewActionVisibleField: string | undefined

libs/angular-accelerator/src/lib/components/interactive-data-view/interactive-data-view.component.ts

@@ -79,10 +79,10 @@ export class InteractiveDataViewComponent implements OnInit, AfterContentInit {
   dataViewComponentState$ = new ReplaySubject<DataViewComponentState>(1)
   filterViewComponentState$ = new ReplaySubject<FilterViewComponentState>(1)
 
-  @Input() searchConfigPermission: string | undefined
-  @Input() deletePermission: string | undefined
-  @Input() editPermission: string | undefined
-  @Input() viewPermission: string | undefined
+  @Input() searchConfigPermission: string | string[] | undefined
+  @Input() deletePermission: string | string[] | string[] | undefined
+  @Input() editPermission: string | string[] | undefined
+  @Input() viewPermission: string | string[] | undefined
   @Input() deleteActionVisibleField: string | undefined
   @Input() deleteActionEnabledField: string | undefined
   @Input() viewActionVisibleField: string | undefined

libs/angular-accelerator/src/lib/components/page-header/page-header.component.spec.ts

@@ -51,7 +51,7 @@ describe('PageHeaderComponent', () => {
   let component: PageHeaderComponent
   let fixture: ComponentFixture<PageHeaderComponent>
   let pageHeaderHarness: PageHeaderHarness
-  let userServiceSpy: jest.SpyInstance<boolean, [permissionKey: string], any>
+  let userServiceSpy: jest.SpyInstance<boolean, [permissionKey: string | string[]], any>
 
   beforeEach(async () => {
     await TestBed.configureTestingModule({

libs/angular-accelerator/src/lib/components/search-header/search-header.component.html

@@ -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"

libs/angular-accelerator/src/lib/components/search-header/search-header.component.ts

@@ -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'
@@ -80,7 +81,7 @@ export class SearchHeaderComponent implements AfterContentInit, AfterViewInit {
     this._actions = value
     this.updateHeaderActions()
   }
-  @Input() searchConfigPermission: string | undefined
+  @Input() searchConfigPermission: string | string[] | undefined
   @Input() searchButtonDisabled = false
   @Input() resetButtonDisabled = false
   @Input() pageName: string | undefined = getLocation().applicationPath
@@ -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 {

libs/angular-accelerator/src/lib/components/search-header/search-header.stories.ts

@@ -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',
@@ -25,6 +27,8 @@ export default {
         importProvidersFrom(BrowserModule),
         importProvidersFrom(BrowserAnimationsModule),
         importProvidersFrom(RouterModule.forRoot([], { useHash: true })),
+        importProvidersFrom(ConfigurationService),
+        provideHttpClient(),
       ],
     }),
     moduleMetadata({

libs/angular-accelerator/src/lib/model/data-action.ts

@@ -2,7 +2,7 @@ export interface DataAction {
   id?: string
   labelKey?: string
   icon?: string
-  permission: string
+  permission: string | string[]
   classes?: string[]
   disabled?: boolean
   actionVisibleField?: string

libs/angular-integration-interface/mocks/mock-user-service.ts

@@ -3,7 +3,7 @@ import { BehaviorSubject } from 'rxjs'
 export class MockUserService {
   lang$ = new BehaviorSubject<string>('en')
   /* eslint-disable @typescript-eslint/no-unused-vars */
-  hasPermission(permissionKey: string): boolean {
+  hasPermission(permissionKey: string | string[]): boolean {
     return true
   }
 }

libs/angular-integration-interface/src/lib/model/config-key.model.ts

@@ -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',

libs/angular-integration-interface/src/lib/services/user.service.ts

@@ -35,7 +35,10 @@ export class UserService implements OnDestroy {
     this.profile$.destroy()
   }
 
-  hasPermission(permissionKey: string): boolean {
+  hasPermission(permissionKey: string | string[]): boolean {
+    if (Array.isArray(permissionKey)) {
+      return permissionKey.every((key) => this.hasPermission(key))
+    }
     const oldConceptResult = this.permissions$.getValue()
       ? this.permissions$.getValue()?.includes(permissionKey)
       : false