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.

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: show all option controlled in all data views #613

Merged
merged 2 commits into from
Nov 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ describe('DataListGridComponent', () => {
return this
})
global.MutationObserver = mutationObserverMock

let fixture: ComponentFixture<DataListGridComponent>
let component: DataListGridComponent
let translateService: TranslateService
Expand Down Expand Up @@ -306,7 +306,11 @@ describe('DataListGridComponent', () => {
const dataListGrid = await TestbedHarnessEnvironment.harnessForFixture(fixture, DataTableHarness)
const paginator = await dataListGrid.getPaginator()
const rowsPerPageOptions = await paginator.getRowsPerPageOptions()
const rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
let rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
expect(rowsPerPageOptionsText).toEqual('10')

component.showAllOption = true
rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
expect(rowsPerPageOptionsText).toEqual('Alle')
})

Expand All @@ -316,7 +320,11 @@ describe('DataListGridComponent', () => {
const dataListGrid = await TestbedHarnessEnvironment.harnessForFixture(fixture, DataTableHarness)
const paginator = await dataListGrid.getPaginator()
const rowsPerPageOptions = await paginator.getRowsPerPageOptions()
const rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
let rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
expect(rowsPerPageOptionsText).toEqual('10')

component.showAllOption = true
rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
expect(rowsPerPageOptionsText).toEqual('All')
})
})
Expand Down Expand Up @@ -356,7 +364,7 @@ describe('DataListGridComponent', () => {
component.viewPermission = 'VIEW'
component.editPermission = 'EDIT'
component.deletePermission = 'DELETE'

fixture.detectChanges()
await fixture.whenStable()
}
Expand Down Expand Up @@ -502,7 +510,7 @@ describe('DataListGridComponent', () => {
component.viewPermission = 'VIEW'
component.editPermission = 'EDIT'
component.deletePermission = 'DELETE'

fixture.detectChanges()
await fixture.whenStable()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ export const ListWithPageSizes = {
...defaultComponentArgs,
pageSizes: [2, 15, 25],
data: extendedMockData,
showAllOption: false,
},
}

Expand Down Expand Up @@ -409,6 +410,7 @@ export const GridWithPageSizes = {
layout: 'grid',
pageSizes: [2, 15, 25],
data: extendedMockData,
showAllOption: false,
},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ export class DataListGridComponent extends DataSortBase implements OnInit, DoChe
set pageSize(value: number | undefined) {
this._pageSize$.next(value)
}
_showAllOption$ = new BehaviorSubject<boolean>(false)
@Input()
set showAllOption(value: boolean) {
this._showAllOption$.next(value)
}

@Input() emptyResultsMessage: string | undefined
@Input() fallbackImage = 'placeholder.png'
Expand Down Expand Up @@ -333,8 +338,14 @@ export class DataListGridComponent extends DataSortBase implements OnInit, DoChe
this.fallbackImagePath$ = this.appStateService.currentMfe$.pipe(
map((currentMfe) => this.getFallbackImagePath(currentMfe))
)
this.displayedPageSizes$ = combineLatest([this._pageSizes$, this.translateService.get('OCX_DATA_TABLE.ALL')]).pipe(
map(([pageSizes, translation]) => pageSizes.concat({ showAll: translation }))
this.displayedPageSizes$ = combineLatest([
this._pageSizes$,
this.translateService.get('OCX_DATA_TABLE.ALL'),
this._showAllOption$,
]).pipe(
map(([pageSizes, translation, showAllOption]) =>
showAllOption ? pageSizes.concat({ showAll: translation }) : pageSizes
)
)
this.displayedPageSize$ = combineLatest([this._pageSize$, this._pageSizes$]).pipe(
map(([pageSize, pageSizes]) => pageSize ?? pageSizes.find((val): val is number => typeof val === 'number') ?? 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,11 @@ describe('DataTableComponent', () => {
const dataTable = await TestbedHarnessEnvironment.harnessForFixture(fixture, DataTableHarness)
const paginator = await dataTable.getPaginator()
const rowsPerPageOptions = await paginator.getRowsPerPageOptions()
const rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
let rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
expect(rowsPerPageOptionsText).toEqual('10')

component.showAllOption = true
rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
expect(rowsPerPageOptionsText).toEqual('Alle')
})

Expand All @@ -295,7 +299,11 @@ describe('DataTableComponent', () => {
const dataTable = await TestbedHarnessEnvironment.harnessForFixture(fixture, DataTableHarness)
const paginator = await dataTable.getPaginator()
const rowsPerPageOptions = await paginator.getRowsPerPageOptions()
const rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
let rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
expect(rowsPerPageOptionsText).toEqual('10')

component.showAllOption = true
rowsPerPageOptionsText = await rowsPerPageOptions.selectedDropdownItemText(0)
expect(rowsPerPageOptionsText).toEqual('All')
})
})
Expand Down Expand Up @@ -478,8 +486,6 @@ describe('DataTableComponent', () => {
expect(component.editTableRowObserved).toBe(true)
expect(component.deleteTableRowObserved).toBe(true)



const tableActions = await dataTable.getActionButtons()
expect(tableActions.length).toBe(3)
const expectedIcons = ['pi pi-eye', 'pi pi-trash', 'pi pi-pencil']
Expand All @@ -501,8 +507,6 @@ describe('DataTableComponent', () => {
setUpActionButtonMockData()
component.viewActionEnabledField = 'ready'



let tableActions = await dataTable.getActionButtons()
expect(tableActions.length).toBe(3)

Expand All @@ -522,8 +526,6 @@ describe('DataTableComponent', () => {

component.rows = [...tempRows]



tableActions = await dataTable.getActionButtons()

for (const action of tableActions) {
Expand All @@ -544,7 +546,6 @@ describe('DataTableComponent', () => {
expect(component.editTableRowObserved).toBe(true)
expect(component.deleteTableRowObserved).toBe(true)


const tableActions = await dataTable.getActionButtons()
expect(tableActions.length).toBe(3)
const expectedIcons = ['pi pi-eye', 'pi pi-trash', 'pi pi-pencil']
Expand All @@ -565,8 +566,6 @@ describe('DataTableComponent', () => {
setUpActionButtonMockData()
component.viewActionVisibleField = 'ready'



let tableActions = await dataTable.getActionButtons()
expect(tableActions.length).toBe(2)

Expand All @@ -581,8 +580,6 @@ describe('DataTableComponent', () => {

component.rows = [...tempRows]



tableActions = await dataTable.getActionButtons()
expect(tableActions.length).toBe(3)
const expectedIcons = ['pi pi-eye', 'pi pi-trash', 'pi pi-pencil']
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,7 @@ export const WithPageSizes = {
args: {
...defaultComponentArgs,
pageSizes: [2, 15, 25],
showAllOption: false,
},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,11 @@ export class DataTableComponent extends DataSortBase implements OnInit, AfterCon
set pageSize(value: number | undefined) {
this._pageSize$.next(value)
}
_showAllOption$ = new BehaviorSubject<boolean>(false)
@Input()
set showAllOption(value: boolean) {
this._showAllOption$.next(value)
}

@Input() emptyResultsMessage: string | undefined
@Input() name = ''
Expand Down Expand Up @@ -398,8 +403,14 @@ export class DataTableComponent extends DataSortBase implements OnInit, AfterCon
) {
super(locale, translateService)
this.name = this.name || this.router.url.replace(/[^A-Za-z0-9]/, '_')
this.displayedPageSizes$ = combineLatest([this._pageSizes$, this.translateService.get('OCX_DATA_TABLE.ALL')]).pipe(
map(([pageSizes, translation]) => pageSizes.concat({ showAll: translation }))
this.displayedPageSizes$ = combineLatest([
this._pageSizes$,
this.translateService.get('OCX_DATA_TABLE.ALL'),
this._showAllOption$,
]).pipe(
map(([pageSizes, translation, showAllOption]) =>
showAllOption ? pageSizes.concat({ showAll: translation }) : pageSizes
)
)
this.displayedPageSize$ = combineLatest([this._pageSize$, this._pageSizes$]).pipe(
map(([pageSize, pageSizes]) => pageSize ?? pageSizes.find((val): val is number => typeof val === 'number') ?? 50)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
[clientSideSorting]="true"
[pageSizes]="pageSizes"
[pageSize]="pageSize"
[showAllOption]="showAllOption"
[paginator]="listGridPaginator"
[page]="page"
(pageChanged)="onPageChange($event)"
Expand Down Expand Up @@ -142,6 +143,7 @@
[clientSideSorting]="clientSideSorting"
[pageSizes]="pageSizes"
[pageSize]="pageSize"
[showAllOption]="showAllOption"
[paginator]="tablePaginator"
[page]="page"
(pageChanged)="onPageChange($event)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,11 @@ import {
TemplateRef,
ViewChild,
} from '@angular/core'
import { DataListGridComponent, DataListGridComponentState, ListGridData } from '../data-list-grid/data-list-grid.component'
import {
DataListGridComponent,
DataListGridComponentState,
ListGridData,
} from '../data-list-grid/data-list-grid.component'
import { Row, Sort, DataTableComponent, DataTableComponentState } from '../data-table/data-table.component'
import { DataTableColumn } from '../../model/data-table-column.model'
import { DataSortDirection } from '../../model/data-sort-direction'
Expand Down Expand Up @@ -101,6 +105,7 @@ export class DataViewComponent implements DoCheck, OnInit, AfterContentInit {
@Input() sortStates: DataSortDirection[] = [DataSortDirection.ASCENDING, DataSortDirection.DESCENDING]
@Input() pageSizes: number[] = [10, 25, 50]
@Input() pageSize: number | undefined
@Input() showAllOption = false

@Input() stringTableCellTemplate: TemplateRef<any> | undefined
@ContentChild('stringTableCell') stringTableCellChildTemplate: TemplateRef<any> | undefined
Expand Down Expand Up @@ -383,24 +388,25 @@ export class DataViewComponent implements DoCheck, OnInit, AfterContentInit {
ngOnInit(): void {
this.firstColumnId = this.columns[0]?.id

let dataTableComponentState$: Observable<DataTableComponentState | Record<string, never>> = this.dataTableComponentState$
let dataListGridComponentState$: Observable<DataListGridComponentState | Record<string, never>> = this.dataListGridComponentState$
let dataTableComponentState$: Observable<DataTableComponentState | Record<string, never>> =
this.dataTableComponentState$
let dataListGridComponentState$: Observable<DataListGridComponentState | Record<string, never>> =
this.dataListGridComponentState$
if (this.layout === 'table') {
dataListGridComponentState$ = dataListGridComponentState$.pipe(startWith({}))
} else {
dataTableComponentState$ = dataTableComponentState$.pipe(startWith({}))
}

combineLatest([
dataTableComponentState$.pipe(timestamp()),
dataListGridComponentState$.pipe(timestamp()),
])
combineLatest([dataTableComponentState$.pipe(timestamp()), dataListGridComponentState$.pipe(timestamp())])
.pipe(
map((componentStates) => {
return orderAndMergeValuesByTimestamp(componentStates)
})
)
.subscribe((val) => {this.componentStateChanged.emit(val)})
.subscribe((val) => {
this.componentStateChanged.emit(val)
})
}

ngAfterContentInit() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
[clientSideFiltering]="clientSideFiltering"
[pageSizes]="pageSizes"
[pageSize]="pageSize"
[showAllOption]="showAllOption"
[emptyResultsMessage]="emptyResultsMessage"
[layout]="layout"
[name]="name"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ export const WithPageSizes = {
args: {
...defaultComponentArgs,
pageSizes: [2, 15, 25],
showAllOption: false,
},
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ export class InteractiveDataViewComponent implements OnInit, AfterContentInit {
]
@Input() pageSizes: number[] = [10, 25, 50]
@Input() pageSize: number | undefined
@Input() showAllOption = false
@Input() totalRecordsOnServer: number | undefined
@Input() layout: 'grid' | 'list' | 'table' = 'table'
@Input() defaultGroupKey = ''
Expand Down
Loading