Skip to content

Commit d2d74a3

Browse files
tdonohuetdonohue
authored
Merge pull request DSpace#1878 from yingjin/DA-1767
Add IDs and pagination gear to Bitstream Formats
2 parents 41e6945 + 2d72a22 commit d2d74a3

24 files changed

Lines changed: 76 additions & 36 deletions

‎src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html‎

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -13,32 +13,34 @@ <h2 id="header" class="border-bottom pb-2 ">{{'admin.registries.bitstream-format
1313
[paginationOptions]="pageConfig"
1414
[pageInfoState]="(bitstreamFormats | async)?.payload"
1515
[collectionSize]="(bitstreamFormats | async)?.payload?.totalElements"
16-
[hideGear]="true"
16+
[hideGear]="false"
1717
[hidePagerWhenSinglePage]="true">
1818
<div class="table-responsive">
1919
<table id="formats" class="table table-striped table-hover">
2020
<thead>
21-
<tr>
22-
<th scope="col"></th>
23-
<th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
24-
<th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
25-
<th scope="col">{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}</th>
26-
</tr>
21+
<tr>
22+
<th scope="col"></th>
23+
<th scope="col">{{'admin.registries.bitstream-formats.table.id' | translate}}</th>
24+
<th scope="col">{{'admin.registries.bitstream-formats.table.name' | translate}}</th>
25+
<th scope="col">{{'admin.registries.bitstream-formats.table.mimetype' | translate}}</th>
26+
<th scope="col">{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}</th>
27+
</tr>
2728
</thead>
2829
<tbody>
29-
<tr *ngFor="let bitstreamFormat of (bitstreamFormats | async)?.payload?.page">
30-
<td>
31-
<label>
32-
<input type="checkbox"
33-
[checked]="isSelected(bitstreamFormat) | async"
34-
(change)="selectBitStreamFormat(bitstreamFormat, $event)"
35-
>
36-
</label>
37-
</td>
38-
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.shortDescription}}</a></td>
39-
<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>
40-
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}</a></td>
41-
</tr>
30+
<tr *ngFor="let bitstreamFormat of (bitstreamFormats | async)?.payload?.page">
31+
<td>
32+
<label>
33+
<input type="checkbox"
34+
[checked]="isSelected(bitstreamFormat) | async"
35+
(change)="selectBitStreamFormat(bitstreamFormat, $event)"
36+
>
37+
</label>
38+
</td>
39+
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.id}}</a></td>
40+
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{bitstreamFormat.shortDescription}}</a></td>
41+
<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>
42+
<td><a [routerLink]="['/admin/registries/bitstream-formats', bitstreamFormat.id, 'edit']">{{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}</a></td>
43+
</tr>
4244
</tbody>
4345
</table>
4446
</div>

‎src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,16 +129,19 @@ describe('BitstreamFormatsComponent', () => {
129129
});
130130

131131
it('should contain the correct formats', () => {
132-
const unknownName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(1) td:nth-child(2)')).nativeElement;
132+
const unknownName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(1) td:nth-child(3)')).nativeElement;
133133
expect(unknownName.textContent).toBe('Unknown');
134134

135-
const licenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(2) td:nth-child(2)')).nativeElement;
135+
const UUID: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(1) td:nth-child(2)')).nativeElement;
136+
expect(UUID.textContent).toBe('test-uuid-1');
137+
138+
const licenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(2) td:nth-child(3)')).nativeElement;
136139
expect(licenseName.textContent).toBe('License');
137140

138-
const ccLicenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(3) td:nth-child(2)')).nativeElement;
141+
const ccLicenseName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(3) td:nth-child(3)')).nativeElement;
139142
expect(ccLicenseName.textContent).toBe('CC License');
140143

141-
const adobeName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(4) td:nth-child(2)')).nativeElement;
144+
const adobeName: HTMLElement = fixture.debugElement.query(By.css('#formats tr:nth-child(4) td:nth-child(3)')).nativeElement;
142145
expect(adobeName.textContent).toBe('Adobe PDF');
143146
});
144147
});

‎src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Component, OnDestroy, OnInit } from '@angular/core';
2-
import { combineLatest as observableCombineLatest, Observable, zip } from 'rxjs';
2+
import {combineLatest, combineLatest as observableCombineLatest, Observable, of as observableOf, zip} from 'rxjs';
33
import { RemoteData } from '../../../core/data/remote-data';
44
import { PaginatedList } from '../../../core/data/paginated-list.model';
55
import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
@@ -29,29 +29,22 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
2929
*/
3030
bitstreamFormats: Observable<RemoteData<PaginatedList<BitstreamFormat>>>;
3131

32-
/**
33-
* The current pagination configuration for the page used by the FindAll method
34-
* Currently simply renders all bitstream formats
35-
*/
36-
config: FindListOptions = Object.assign(new FindListOptions(), {
37-
elementsPerPage: 20
38-
});
39-
4032
/**
4133
* The current pagination configuration for the page
4234
* Currently simply renders all bitstream formats
4335
*/
4436
pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), {
4537
id: 'rbp',
46-
pageSize: 20
38+
pageSize: 20,
39+
pageSizeOptions: [20, 40, 60, 80, 100]
4740
});
4841

4942
constructor(private notificationsService: NotificationsService,
5043
private router: Router,
5144
private translateService: TranslateService,
5245
private bitstreamFormatService: BitstreamFormatDataService,
5346
private paginationService: PaginationService,
54-
) {
47+
) {
5548
}
5649

5750

@@ -149,7 +142,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy {
149142

150143
ngOnInit(): void {
151144

152-
this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.config).pipe(
145+
this.bitstreamFormats = this.paginationService.getFindListOptions(this.pageConfig.id, this.pageConfig).pipe(
153146
switchMap((findListOptions: FindListOptions) => {
154147
return this.bitstreamFormatService.findAll(findListOptions);
155148
})

‎src/assets/i18n/ar.json5‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,8 @@
207207
// "admin.registries.bitstream-formats.table.name": "Name",
208208
// TODO New key - Add a translation
209209
"admin.registries.bitstream-formats.table.name": "Name",
210+
// TODO New key - Add a translation
211+
"admin.registries.bitstream-formats.table.id" : "ID",
210212

211213
// "admin.registries.bitstream-formats.table.return": "Return",
212214
// TODO New key - Add a translation

‎src/assets/i18n/bn.json5‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@
165165

166166
// "admin.registries.bitstream-formats.table.name": "Name",
167167
"admin.registries.bitstream-formats.table.name": "নাম",
168+
// TODO New key - Add a translation
169+
"admin.registries.bitstream-formats.table.id" : "ID",
168170

169171
// "admin.registries.bitstream-formats.table.return": "Back",
170172
"admin.registries.bitstream-formats.table.return": "পেছনে",

‎src/assets/i18n/cs.json5‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@
202202
// "admin.registries.bitstream-formats.table.name": "Name",
203203
// TODO New key - Add a translation
204204
"admin.registries.bitstream-formats.table.name": "Name",
205+
// TODO New key - Add a translation
206+
"admin.registries.bitstream-formats.table.id" : "ID",
205207

206208
// "admin.registries.bitstream-formats.table.return": "Return",
207209
// TODO New key - Add a translation

‎src/assets/i18n/de.json5‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -177,6 +177,8 @@
177177

178178
// "admin.registries.bitstream-formats.table.name": "Name",
179179
"admin.registries.bitstream-formats.table.name": "Name",
180+
// TODO New key - Add a translation
181+
"admin.registries.bitstream-formats.table.id" : "ID",
180182

181183
// "admin.registries.bitstream-formats.table.return": "Return",
182184
"admin.registries.bitstream-formats.table.return": "Zurück",

‎src/assets/i18n/el.json5‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,8 @@
202202
"admin.registries.bitstream-formats.table.internal": "εσωτερικός",
203203
"admin.registries.bitstream-formats.table.mimetype": "mimetype",
204204
"admin.registries.bitstream-formats.table.name": "Ονομα",
205+
// TODO New key - Add a translation
206+
"admin.registries.bitstream-formats.table.id" : "ID",
205207
"admin.registries.bitstream-formats.table.return": "Επιστροφή",
206208
"admin.registries.bitstream-formats.table.supportLevel.KNOWN": "Γνωστός",
207209
"admin.registries.bitstream-formats.table.supportLevel.SUPPORTED": "Υποστηρίζεται",

‎src/assets/i18n/en.json5‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@
130130
"admin.registries.bitstream-formats.table.mimetype": "MIME Type",
131131

132132
"admin.registries.bitstream-formats.table.name": "Name",
133+
"admin.registries.bitstream-formats.table.id" : "ID",
133134

134135
"admin.registries.bitstream-formats.table.return": "Back",
135136

‎src/assets/i18n/es.json5‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -193,6 +193,8 @@
193193

194194
// "admin.registries.bitstream-formats.table.name": "Name",
195195
"admin.registries.bitstream-formats.table.name": "Nombre",
196+
// TODO New key - Add a translation
197+
"admin.registries.bitstream-formats.table.id" : "ID",
196198

197199
// "admin.registries.bitstream-formats.table.return": "Back",
198200
"admin.registries.bitstream-formats.table.return": "Atrás",

0 commit comments

Comments
 (0)