-
Notifications
You must be signed in to change notification settings - Fork 22
feat(institution-users): added reusable table and users page #171
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
133 changes: 133 additions & 0 deletions
133
src/app/features/admin-institutions/components/admin-table/admin-table.component.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| <div class="flex justify-content-between align-items-center p-3"> | ||
| <div> | ||
| <ng-content select="[slot=amount]"></ng-content> | ||
| </div> | ||
|
|
||
| <p-menu #downloadMenu [model]="downloadMenuItems()" appendTo="body" popup> | ||
| <ng-template #item let-item> | ||
| <a class="p-menu-item-link ml-1" target="_blank" [href]="item.link"> | ||
| <i [class]="item.icon"></i> | ||
|
|
||
| {{ item.label }} | ||
| </a> | ||
| </ng-template> | ||
| </p-menu> | ||
|
|
||
| <div class="filters-section flex align-items-center gap-2"> | ||
| <ng-content select="[slot=otherFilters]"></ng-content> | ||
|
|
||
| <p-multiselect | ||
| [options]="tableColumns()" | ||
| [(ngModel)]="selectedColumns" | ||
| (onChange)="onColumnSelectionChange($event.value)" | ||
| optionLabel="header" | ||
| [showToggleAll]="false" | ||
| [showClear]="false" | ||
| [dropdownIcon]="'hidden'" | ||
| > | ||
| <ng-template let-values pTemplate="selectedItems"> | ||
| <div class="flex align-items-center gap-2"> | ||
| <i class="fa fa-table-columns text-primary font-bold"></i> | ||
| <span>{{ 'adminInstitutions.institutionUsers.customize' | translate }}</span> | ||
| </div> | ||
| </ng-template> | ||
|
|
||
| <ng-template #item let-item> | ||
| {{ item.header | translate }} | ||
| </ng-template> | ||
| </p-multiselect> | ||
|
|
||
| @if (downloadLink()) { | ||
| <p-button | ||
| icon="fa fa-download text-primary text-xl" | ||
| class="p-button p-button-outlined p-button-sm p-06 font-bold grey-border-color child-button-0-padding" | ||
| severity="info" | ||
| (click)="downloadMenu.toggle($event)" | ||
| /> | ||
| } | ||
|
|
||
| @if (reportsLink()) { | ||
| <a | ||
| pButton | ||
| [href]="reportsLink()" | ||
| class="p-button p-button-outlined p-button-sm p-06 font-bold grey-border-color child-button-0-padding" | ||
| target="_blank" | ||
| > | ||
| <i class="fa fa-chart-pie text-primary border-1 border-transparent text-xl"></i> | ||
| </a> | ||
| } | ||
| </div> | ||
| </div> | ||
|
|
||
| <p-table | ||
| [columns]="selectedColumnsComputed()" | ||
| [value]="tableData()" | ||
| [autoLayout]="true" | ||
| [scrollable]="true" | ||
| [sortMode]="'single'" | ||
| (onSort)="onSort($event)" | ||
| [sortField]="sortColumn()" | ||
| [sortOrder]="currentSortOrder()" | ||
| [customSort]="true" | ||
| [resetPageOnSort]="false" | ||
| [tableStyle]="{ 'min-width': '50rem' }" | ||
| > | ||
| <ng-template #header let-columns> | ||
| <tr> | ||
| @for (col of columns; track col.field) { | ||
| <th [pSortableColumn]="col.sortable ? col.field : null"> | ||
| <div class="flex align-items-center gap-2"> | ||
| <span>{{ col.header | translate }}</span> | ||
| @if (col.sortable) { | ||
| <p-sortIcon [field]="col.field"></p-sortIcon> | ||
| } | ||
| </div> | ||
| </th> | ||
| } | ||
| </tr> | ||
| </ng-template> | ||
|
|
||
| <ng-template #body let-rowData let-columns="columns"> | ||
| <tr> | ||
| @for (col of columns; track col.field) { | ||
| <td class="relative"> | ||
| <div class="flex align-items-center hover-group"> | ||
| @if (col.isLink && isLink(rowData[col.field])) { | ||
| <a | ||
| [href]="getLinkUrl(rowData[col.field])" | ||
| [target]="getLinkTarget(rowData[col.field], col)" | ||
| class="text-primary no-underline hover:underline" | ||
| > | ||
| {{ getCellValueWithFormatting(rowData[col.field], col) }} | ||
| </a> | ||
| } @else { | ||
| {{ getCellValueWithFormatting(rowData[col.field], col) }} | ||
| } | ||
|
|
||
| @if (col.showIcon) { | ||
| <p-button | ||
| [pTooltip]="col.iconTooltip | translate" | ||
| class="icon-button pl-3" | ||
| [icon]="col.iconClass" | ||
volodyayakubovskyy marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| variant="text" | ||
| severity="info" | ||
| (click)="onIconClick(rowData, col)" | ||
| /> | ||
| } | ||
| </div> | ||
| </td> | ||
| } | ||
| </tr> | ||
| </ng-template> | ||
| </p-table> | ||
|
|
||
| @if (enablePagination() && totalCount() > pageSize()) { | ||
| <div class="p-3"> | ||
| <osf-custom-paginator | ||
| [first]="first()" | ||
| [totalCount]="totalCount()" | ||
| [rows]="pageSize()" | ||
| (pageChanged)="onPageChange($event)" | ||
| ></osf-custom-paginator> | ||
| </div> | ||
| } | ||
21 changes: 21 additions & 0 deletions
21
src/app/features/admin-institutions/components/admin-table/admin-table.component.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| .p-06 { | ||
| padding: 0.6rem; | ||
| } | ||
|
|
||
| .hover-group { | ||
| .icon-button { | ||
| opacity: 0; | ||
| transition: opacity; | ||
| } | ||
|
|
||
| &:hover { | ||
| .icon-button { | ||
| opacity: 100; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .child-button-0-padding { | ||
| --p-button-padding-y: 0; | ||
| --p-button-icon-only-width: max-content; | ||
| } |
22 changes: 22 additions & 0 deletions
22
src/app/features/admin-institutions/components/admin-table/admin-table.component.spec.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| import { ComponentFixture, TestBed } from '@angular/core/testing'; | ||
|
|
||
| import { AdminTableComponent } from './admin-table.component'; | ||
|
|
||
| describe('AdminTableComponent', () => { | ||
| let component: AdminTableComponent; | ||
| let fixture: ComponentFixture<AdminTableComponent>; | ||
|
|
||
| beforeEach(async () => { | ||
| await TestBed.configureTestingModule({ | ||
| imports: [AdminTableComponent], | ||
| }).compileComponents(); | ||
|
|
||
| fixture = TestBed.createComponent(AdminTableComponent); | ||
| component = fixture.componentInstance; | ||
| fixture.detectChanges(); | ||
| }); | ||
|
|
||
| it('should create', () => { | ||
| expect(component).toBeTruthy(); | ||
| }); | ||
| }); |
194 changes: 194 additions & 0 deletions
194
src/app/features/admin-institutions/components/admin-table/admin-table.component.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,194 @@ | ||
| import { TranslatePipe, TranslateService } from '@ngx-translate/core'; | ||
|
|
||
| import { SortEvent } from 'primeng/api'; | ||
| import { Button, ButtonDirective } from 'primeng/button'; | ||
| import { Menu } from 'primeng/menu'; | ||
| import { MultiSelect } from 'primeng/multiselect'; | ||
| import { PaginatorState } from 'primeng/paginator'; | ||
| import { TableModule } from 'primeng/table'; | ||
| import { Tooltip } from 'primeng/tooltip'; | ||
|
|
||
| import { ChangeDetectionStrategy, Component, computed, effect, inject, input, output, signal } from '@angular/core'; | ||
| import { FormsModule } from '@angular/forms'; | ||
|
|
||
| import { | ||
| TableCellData, | ||
| TableCellLink, | ||
| TableColumn, | ||
| TableIconClickEvent, | ||
| } from '@osf/features/admin-institutions/models'; | ||
| import { CustomPaginatorComponent } from '@osf/shared/components'; | ||
| import { SortOrder } from '@shared/enums'; | ||
| import { QueryParams } from '@shared/models'; | ||
|
|
||
| @Component({ | ||
| selector: 'osf-admin-table', | ||
| imports: [ | ||
| MultiSelect, | ||
| TableModule, | ||
| FormsModule, | ||
| ButtonDirective, | ||
| CustomPaginatorComponent, | ||
| Tooltip, | ||
| TranslatePipe, | ||
| Button, | ||
| Menu, | ||
| ], | ||
| templateUrl: './admin-table.component.html', | ||
| styleUrl: './admin-table.component.scss', | ||
| changeDetection: ChangeDetectionStrategy.OnPush, | ||
| }) | ||
| export class AdminTableComponent { | ||
| private readonly translateService = inject(TranslateService); | ||
|
|
||
| tableColumns = input.required<TableColumn[]>(); | ||
| tableData = input.required<TableCellData[]>(); | ||
|
|
||
| enablePagination = input<boolean>(false); | ||
| totalCount = input<number>(0); | ||
| currentPage = input<number>(1); | ||
| pageSize = input<number>(10); | ||
| first = input<number>(0); | ||
|
|
||
| sortField = input<string>(''); | ||
| sortOrder = input<number>(1); | ||
|
|
||
| pageChanged = output<PaginatorState>(); | ||
| sortChanged = output<QueryParams>(); | ||
| iconClicked = output<TableIconClickEvent>(); | ||
|
|
||
| downloadLink = input<string>(''); | ||
| reportsLink = input<string>(''); | ||
|
|
||
| selectedColumns = signal<TableColumn[]>([]); | ||
|
|
||
| downloadMenuItems = computed(() => { | ||
| const baseUrl = this.downloadLink(); | ||
| if (!baseUrl) return []; | ||
|
|
||
| return [ | ||
| { | ||
| label: 'CSV', | ||
| icon: 'fa fa-file-csv', | ||
| link: this.createUrl(baseUrl, 'csv'), | ||
| }, | ||
| { | ||
| label: 'TSV', | ||
| icon: 'fa fa-file-alt', | ||
| link: this.createUrl(baseUrl, 'tsv'), | ||
| }, | ||
| { | ||
| label: 'JSON', | ||
| icon: 'fa fa-file-code', | ||
| link: this.createUrl(baseUrl, 'json'), | ||
| }, | ||
| ]; | ||
| }); | ||
|
|
||
| selectedColumnsComputed = computed(() => { | ||
| const selected = this.selectedColumns(); | ||
| const allColumns = this.tableColumns(); | ||
|
|
||
| if (selected.length === 0) { | ||
| return allColumns; | ||
| } | ||
|
|
||
| return selected; | ||
| }); | ||
|
|
||
| sortColumn = computed(() => this.sortField()); | ||
| currentSortOrder = computed(() => this.sortOrder()); | ||
|
|
||
| constructor() { | ||
| effect(() => { | ||
| const columns = this.tableColumns(); | ||
| if (columns.length > 0 && this.selectedColumns().length === 0) { | ||
| this.selectedColumns.set(columns); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| onColumnSelectionChange(selectedCols: TableColumn[]): void { | ||
| this.selectedColumns.set(selectedCols); | ||
| } | ||
|
|
||
| onPageChange(event: PaginatorState): void { | ||
| this.pageChanged.emit(event); | ||
| } | ||
|
|
||
| onSort(event: SortEvent): void { | ||
| if (event.field) { | ||
| this.sortChanged.emit({ | ||
| sortColumn: event.field, | ||
| sortOrder: event.order === -1 ? SortOrder.Desc : SortOrder.Asc, | ||
| } as QueryParams); | ||
| } | ||
| } | ||
|
|
||
| onIconClick(rowData: TableCellData, column: TableColumn): void { | ||
| if (column.iconAction) { | ||
| this.iconClicked.emit({ | ||
| rowData, | ||
| column, | ||
| action: column.iconAction, | ||
| }); | ||
| } | ||
| } | ||
|
|
||
| isLink(value: string | number | TableCellLink | undefined): value is TableCellLink { | ||
| return value !== null && value !== undefined && typeof value === 'object' && 'text' in value && 'url' in value; | ||
| } | ||
|
|
||
| getCellValue(value: string | number | TableCellLink | undefined): string { | ||
| if (this.isLink(value)) { | ||
| return this.translateService.instant(value.text); | ||
| } | ||
| return this.translateService.instant(String(value)) || ''; | ||
| } | ||
|
|
||
| getCellValueWithFormatting(value: string | number | TableCellLink | undefined, column: TableColumn): string { | ||
| if (this.isLink(value)) { | ||
| return this.translateService.instant(value.text); | ||
| } | ||
|
|
||
| const stringValue = String(value); | ||
|
|
||
| if (column.dateFormat && stringValue) { | ||
| return this.formatDate(stringValue, column.dateFormat); | ||
| } | ||
|
|
||
| return this.translateService.instant(stringValue) || ''; | ||
| } | ||
|
|
||
| private formatDate(value: string, format: string): string { | ||
| if (format === 'yyyy-mm-to-mm/yyyy') { | ||
| const yearMonthRegex = /^(\d{4})-(\d{2})$/; | ||
| const match = value.match(yearMonthRegex); | ||
|
|
||
| if (match) { | ||
| const [, year, month] = match; | ||
| return `${month}/${year}`; | ||
| } | ||
| } | ||
|
|
||
| return value; | ||
| } | ||
|
|
||
| private createUrl(baseUrl: string, format: string): string { | ||
| return `${baseUrl}?format=${format}`; | ||
| } | ||
|
|
||
| getLinkUrl(value: string | number | TableCellLink | undefined): string { | ||
| if (this.isLink(value)) { | ||
| return value.url; | ||
| } | ||
| return ''; | ||
| } | ||
|
|
||
| getLinkTarget(value: string | number | TableCellLink | undefined, column: TableColumn): string { | ||
| if (this.isLink(value)) { | ||
| return value.target || column.linkTarget || '_self'; | ||
| } | ||
| return column.linkTarget || '_self'; | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| export { AdminTableComponent } from './admin-table/admin-table.component'; |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.