hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 01:54:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1878 from yingjin/DA-1767

Browse Source 
Add IDs and pagination gear to Bitstream Formats
This commit is contained in:
Tim Donohue
2022-10-31 10:53:50 -05:00
committed by GitHub
parent 41e694507e 2d72a22810
commit d2d74a3759
24 changed files with 76 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html
View File

@@ -13,32 +13,34 @@
[paginationOptions]="pageConfig"
[pageInfoState]="(bitstreamFormats | async)?.payload"
[collectionSize]="(bitstreamFormats | async)?.payload?.totalElements"
[hideGear]="true"
[hideGear]="false"
[hidePagerWhenSinglePage]="true">
<div class="table-responsive">
<table id="formats" class="table table-striped table-hover">
<thead>
<tr>
<th scope="col"></th>
<th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
<th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
<th scope="col">{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}</th>
</tr>
<tr>
<th scope="col"></th>
<th scope="col">{{'admin.registries.bitstream-formats.table.id' | translate}}</th>
<th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
<th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
<th scope="col">{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let bitstreamFormat of (bitstreamFormats | async)?.payload?.page">
<td>
<label>
<input type="checkbox"
[checked]="isSelected(bitstreamFormat) | async"
(change)="selectBitStreamFormat(bitstreamFormat, $event)"
>
</label>
</td>
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.shortDescription}}</a></td>
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.mimetype}} <span *ngIf="bitstreamFormat.internal">({{'admin.registries.bitstream-formats.table.internal' | translate}})</span></a></td>
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}</a></td>
</tr>
<tr *ngFor="let bitstreamFormat of (bitstreamFormats | async)?.payload?.page">
<td>
<label>
<input type="checkbox"
[checked]="isSelected(bitstreamFormat) | async"
(change)="selectBitStreamFormat(bitstreamFormat, $event)"
>
</label>
</td>
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.shortDescription}}</a></td>
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.mimetype}} <span *ngIf="bitstreamFormat.internal">({{'admin.registries.bitstream-formats.table.internal' | translate}})</span></a></td>
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}</a></td>
</tr>
</tbody>
</table>
</div>

11
src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts
View File

@@ -129,16 +129,19 @@ describe('BitstreamFormatsComponent', () => {
});
it('should contain the correct formats', () => {
const unknownName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(1) td:nth-child(2)')).nativeElement;
const unknownName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(1) td:nth-child(3)')).nativeElement;
expect(unknownName.textContent).toBe('Unknown');
const licenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(2) td:nth-child(2)')).nativeElement;
const UUID: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(1) td:nth-child(2)')).nativeElement;
expect(UUID.textContent).toBe('test-uuid-1');
const licenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(2) td:nth-child(3)')).nativeElement;
expect(licenseName.textContent).toBe('License');
const ccLicenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(3) td:nth-child(2)')).nativeElement;
const ccLicenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(3) td:nth-child(3)')).nativeElement;
expect(ccLicenseName.textContent).toBe('CC License');
const adobeName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(4) td:nth-child(2)')).nativeElement;
const adobeName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(4) td:nth-child(3)')).nativeElement;
expect(adobeName.textContent).toBe('Adobe PDF');
});
});

17
src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts
View File

@@ -1,5 +1,5 @@
import { Component, OnDestroy, OnInit } from '@angular/core';
import { combineLatest as observableCombineLatest, Observable, zip } from 'rxjs';
import {combineLatest, combineLatest as observableCombineLatest, Observable, of as observableOf, zip} from 'rxjs';
import { RemoteData } from '../../../core/data/remote-data';
import { PaginatedList } from '../../../core/data/paginated-list.model';
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
@@ -29,21 +29,14 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
*/
bitstreamFormats: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
/**
* The current pagination configuration for the page used by the FindAll method
* Currently simply renders all bitstream formats
*/
config: FindListOptions = Object.assign(new FindListOptions(), {
elementsPerPage: 20
});
/**
* The current pagination configuration for the page
* Currently simply renders all bitstream formats
*/
pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
id: 'rbp',
pageSize: 20
pageSize: 20,
pageSizeOptions: [20, 40, 60, 80, 100]
});
constructor(private notificationsService: NotificationsService,
@@ -51,7 +44,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
private translateService: TranslateService,
private bitstreamFormatService: BitstreamFormatDataService,
private paginationService: PaginationService,
) {
) {
}
@@ -149,7 +142,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
ngOnInit(): void {
this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe(
switchMap((findListOptions: FindListOptions) => {
return this.bitstreamFormatService.findAll(findListOptions);
})

2
src/assets/i18n/ar.json5
View File

@@ -207,6 +207,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
// TODO New key - Add a translation

2
src/assets/i18n/bn.json5
View File

@@ -165,6 +165,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "নাম",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Back",
"admin.registries.bitstream-formats.table.return": "পেছনে",

2
src/assets/i18n/cs.json5
View File

@@ -202,6 +202,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
// TODO New key - Add a translation

2
src/assets/i18n/de.json5
View File

@@ -177,6 +177,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
"admin.registries.bitstream-formats.table.return": "Zurück",

2
src/assets/i18n/el.json5
View File

@@ -202,6 +202,8 @@
"admin.registries.bitstream-formats.table.internal": "εσωτερικός",
"admin.registries.bitstream-formats.table.mimetype": "mimetype",
"admin.registries.bitstream-formats.table.name": "Ονομα",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
"admin.registries.bitstream-formats.table.return": "Επιστροφή",
"admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Γνωστός",
"admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Υποστηρίζεται",

1
src/assets/i18n/en.json5
View File

@@ -130,6 +130,7 @@
"admin.registries.bitstream-formats.table.mimetype": "MIME Type",
"admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.id" : "ID",
"admin.registries.bitstream-formats.table.return": "Back",

2
src/assets/i18n/es.json5
View File

@@ -193,6 +193,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Nombre",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Back",
"admin.registries.bitstream-formats.table.return": "Atrás",

2
src/assets/i18n/fi.json5
View File

@@ -156,6 +156,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Nimi",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
"admin.registries.bitstream-formats.table.return": "Palaa",

2
src/assets/i18n/fr.json5
View File

@@ -176,6 +176,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Nom",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Back",
"admin.registries.bitstream-formats.table.return": "Retour",

2
src/assets/i18n/gd.json5
View File

@@ -156,6 +156,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Ainm",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Back",
"admin.registries.bitstream-formats.table.return": "Air ais",

2
src/assets/i18n/hu.json5
View File

@@ -157,6 +157,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Név",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
"admin.registries.bitstream-formats.table.return": "Vissza",

2
src/assets/i18n/ja.json5
View File

@@ -207,6 +207,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
// TODO New key - Add a translation

2
src/assets/i18n/kk.json5
View File

@@ -194,6 +194,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Аты",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Back",
"admin.registries.bitstream-formats.table.return": "Қайтару",

2
src/assets/i18n/lv.json5
View File

@@ -168,6 +168,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Nosaukums",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
"admin.registries.bitstream-formats.table.return": "Atgriezties",

2
src/assets/i18n/nl.json5
View File

@@ -169,6 +169,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Naam",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
"admin.registries.bitstream-formats.table.return": "Terug",

2
src/assets/i18n/pl.json5
View File

@@ -207,6 +207,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
// TODO New key - Add a translation

3
src/assets/i18n/pt-BR.json5
View File

@@ -205,6 +205,9 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Nome",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Back",
"admin.registries.bitstream-formats.table.return": "Voltar",

2
src/assets/i18n/pt-PT.json5
View File

@@ -368,6 +368,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Nome",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
"admin.registries.bitstream-formats.table.return": "Voltar",

2
src/assets/i18n/sv.json5
View File

@@ -168,6 +168,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "Namn",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Back",
"admin.registries.bitstream-formats.table.return": "Tillbaka",

2
src/assets/i18n/sw.json5
View File

@@ -207,6 +207,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.name": "Name",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
// TODO New key - Add a translation

2
src/assets/i18n/tr.json5
View File

@@ -156,6 +156,8 @@
// "admin.registries.bitstream-formats.table.name": "Name",
"admin.registries.bitstream-formats.table.name": "İsim",
// TODO New key - Add a translation
"admin.registries.bitstream-formats.table.id" : "ID",
// "admin.registries.bitstream-formats.table.return": "Return",
"admin.registries.bitstream-formats.table.return": "Geri Dön",