From 802b0e720490ff265ce065da2e5fd9555b8b8719 Mon Sep 17 00:00:00 2001 From: Ying Jin Date: Thu, 29 Sep 2022 20:21:21 -0500 Subject: [PATCH 1/4] fix DSpace#1767 Display all bitstream formats on one page and include IDs --- .../bitstream-formats.component.html | 42 ++++++++++--------- .../bitstream-formats.component.ts | 13 +++--- src/assets/i18n/ar.json5 | 4 +- src/assets/i18n/bn.json5 | 4 +- src/assets/i18n/cs.json5 | 4 +- src/assets/i18n/de.json5 | 2 + src/assets/i18n/el.json5 | 2 + src/assets/i18n/en.json5 | 1 + src/assets/i18n/es.json5 | 4 +- src/assets/i18n/fi.json5 | 2 + src/assets/i18n/fr.json5 | 2 + src/assets/i18n/gd.json5 | 2 + src/assets/i18n/hu.json5 | 4 +- src/assets/i18n/ja.json5 | 4 +- src/assets/i18n/kk.json5 | 2 + src/assets/i18n/lv.json5 | 2 + src/assets/i18n/nl.json5 | 4 +- src/assets/i18n/pl.json5 | 4 +- src/assets/i18n/pt-BR.json5 | 4 +- src/assets/i18n/pt-PT.json5 | 2 + src/assets/i18n/sv.json5 | 2 + src/assets/i18n/sw.json5 | 4 +- src/assets/i18n/tr.json5 | 2 + 23 files changed, 80 insertions(+), 36 deletions(-) diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html index 6569b2d4c8..c4304806ce 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.html @@ -13,32 +13,34 @@ [paginationOptions]="pageConfig" [pageInfoState]="(bitstreamFormats | async)?.payload" [collectionSize]="(bitstreamFormats | async)?.payload?.totalElements" - [hideGear]="true" + [hideGear]="false" [hidePagerWhenSinglePage]="true">
- - - - - - + + + + + + + - - - - - - + + + + + + +
{{'admin.registries.bitstream-formats.table.name' | translate}}{{'admin.registries.bitstream-formats.table.mimetype' | translate}}{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}
{{'admin.registries.bitstream-formats.table.id' | translate}}{{'admin.registries.bitstream-formats.table.name' | translate}}{{'admin.registries.bitstream-formats.table.mimetype' | translate}}{{'admin.registries.bitstream-formats.table.supportLevel.head' | translate}}
- - {{bitstreamFormat.shortDescription}}{{bitstreamFormat.mimetype}} ({{'admin.registries.bitstream-formats.table.internal' | translate}}){{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
+ + {{bitstreamFormat.id}}{{bitstreamFormat.shortDescription}}{{bitstreamFormat.mimetype}} ({{'admin.registries.bitstream-formats.table.internal' | translate}}){{'admin.registries.bitstream-formats.table.supportLevel.'+bitstreamFormat.supportLevel | translate}}
diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index 89d8ac29f3..add7ef8618 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -32,9 +32,9 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { * 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 - }); + // config: FindListOptions = Object.assign(new FindListOptions(), { + // elementsPerPage: 20 + // }); /** * The current pagination configuration for the page @@ -42,7 +42,8 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { */ pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { id: 'rbp', - pageSize: 20 + pageSize: 25, + pageSizeOptions: [25, 50, 100, 200] }); constructor(private notificationsService: NotificationsService, @@ -50,7 +51,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { private translateService: TranslateService, private bitstreamFormatService: BitstreamFormatDataService, private paginationService: PaginationService, - ) { + ) { } @@ -140,7 +141,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); }) diff --git a/src/assets/i18n/ar.json5 b/src/assets/i18n/ar.json5 index 0d036ff7d3..a4a8cb8b2e 100644 --- a/src/assets/i18n/ar.json5 +++ b/src/assets/i18n/ar.json5 @@ -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 @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/bn.json5 b/src/assets/i18n/bn.json5 index 1bc26d2da4..209e2c5925 100644 --- a/src/assets/i18n/bn.json5 +++ b/src/assets/i18n/bn.json5 @@ -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": "পেছনে", @@ -6126,4 +6128,4 @@ "idle-modal.extend-session": "সেশন প্রসারিত করুন" -} \ No newline at end of file +} diff --git a/src/assets/i18n/cs.json5 b/src/assets/i18n/cs.json5 index 0be4403ec9..2746d7d3df 100644 --- a/src/assets/i18n/cs.json5 +++ b/src/assets/i18n/cs.json5 @@ -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 @@ -6612,4 +6614,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/de.json5 b/src/assets/i18n/de.json5 index c699ee2575..1ebcf444ad 100644 --- a/src/assets/i18n/de.json5 +++ b/src/assets/i18n/de.json5 @@ -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", diff --git a/src/assets/i18n/el.json5 b/src/assets/i18n/el.json5 index 4d3b57897a..4781f3ee34 100644 --- a/src/assets/i18n/el.json5 +++ b/src/assets/i18n/el.json5 @@ -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": "Υποστηρίζεται", diff --git a/src/assets/i18n/en.json5 b/src/assets/i18n/en.json5 index 1bdfbedfdc..ef3a4ea8ef 100644 --- a/src/assets/i18n/en.json5 +++ b/src/assets/i18n/en.json5 @@ -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", diff --git a/src/assets/i18n/es.json5 b/src/assets/i18n/es.json5 index b738578fc6..dbd4ebad6d 100644 --- a/src/assets/i18n/es.json5 +++ b/src/assets/i18n/es.json5 @@ -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", @@ -6988,4 +6990,4 @@ -} \ No newline at end of file +} diff --git a/src/assets/i18n/fi.json5 b/src/assets/i18n/fi.json5 index 5c5f3b6168..fdd2f19cd7 100644 --- a/src/assets/i18n/fi.json5 +++ b/src/assets/i18n/fi.json5 @@ -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", diff --git a/src/assets/i18n/fr.json5 b/src/assets/i18n/fr.json5 index 5cfb7ff099..d2d8acc1f1 100644 --- a/src/assets/i18n/fr.json5 +++ b/src/assets/i18n/fr.json5 @@ -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", diff --git a/src/assets/i18n/gd.json5 b/src/assets/i18n/gd.json5 index f72c3aa1c8..a86565434a 100644 --- a/src/assets/i18n/gd.json5 +++ b/src/assets/i18n/gd.json5 @@ -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", diff --git a/src/assets/i18n/hu.json5 b/src/assets/i18n/hu.json5 index a42c36f263..b2a87e038c 100644 --- a/src/assets/i18n/hu.json5 +++ b/src/assets/i18n/hu.json5 @@ -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", @@ -5145,4 +5147,4 @@ "workflow-item.send-back.button.confirm": "Visszaküld", -} \ No newline at end of file +} diff --git a/src/assets/i18n/ja.json5 b/src/assets/i18n/ja.json5 index 0d036ff7d3..a4a8cb8b2e 100644 --- a/src/assets/i18n/ja.json5 +++ b/src/assets/i18n/ja.json5 @@ -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 @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/kk.json5 b/src/assets/i18n/kk.json5 index 56651ceaae..365ee5b392 100644 --- a/src/assets/i18n/kk.json5 +++ b/src/assets/i18n/kk.json5 @@ -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": "Қайтару", diff --git a/src/assets/i18n/lv.json5 b/src/assets/i18n/lv.json5 index d6c409b783..c00a72213a 100644 --- a/src/assets/i18n/lv.json5 +++ b/src/assets/i18n/lv.json5 @@ -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", diff --git a/src/assets/i18n/nl.json5 b/src/assets/i18n/nl.json5 index bb0b3b121c..a0c4bd69f6 100644 --- a/src/assets/i18n/nl.json5 +++ b/src/assets/i18n/nl.json5 @@ -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", @@ -5999,4 +6001,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/pl.json5 b/src/assets/i18n/pl.json5 index 0d036ff7d3..a4a8cb8b2e 100644 --- a/src/assets/i18n/pl.json5 +++ b/src/assets/i18n/pl.json5 @@ -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 @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/pt-BR.json5 b/src/assets/i18n/pt-BR.json5 index fbe06877fb..d2c2761742 100644 --- a/src/assets/i18n/pt-BR.json5 +++ b/src/assets/i18n/pt-BR.json5 @@ -169,6 +169,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", @@ -5945,4 +5947,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/pt-PT.json5 b/src/assets/i18n/pt-PT.json5 index d6bbbd4196..a618bf6e44 100644 --- a/src/assets/i18n/pt-PT.json5 +++ b/src/assets/i18n/pt-PT.json5 @@ -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", diff --git a/src/assets/i18n/sv.json5 b/src/assets/i18n/sv.json5 index c81482d110..8f77a3d0cc 100644 --- a/src/assets/i18n/sv.json5 +++ b/src/assets/i18n/sv.json5 @@ -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", diff --git a/src/assets/i18n/sw.json5 b/src/assets/i18n/sw.json5 index 0d036ff7d3..a4a8cb8b2e 100644 --- a/src/assets/i18n/sw.json5 +++ b/src/assets/i18n/sw.json5 @@ -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 @@ -6745,4 +6747,4 @@ "workflow-item.send-back.button.confirm": "Send back" -} \ No newline at end of file +} diff --git a/src/assets/i18n/tr.json5 b/src/assets/i18n/tr.json5 index d04a6eda2a..1649123add 100644 --- a/src/assets/i18n/tr.json5 +++ b/src/assets/i18n/tr.json5 @@ -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", From d117cdae074e29542294d54555dee0dd55780242 Mon Sep 17 00:00:00 2001 From: Ying Jin Date: Tue, 25 Oct 2022 21:17:57 -0500 Subject: [PATCH 2/4] change pagination to default and update test --- .../bitstream-formats.component.spec.ts | 11 +++++++---- .../bitstream-formats/bitstream-formats.component.ts | 6 ++++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts index 222804ca28..8a44240b7e 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.spec.ts @@ -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'); }); }); diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index 170e6af25b..58756fbdab 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -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'; @@ -14,6 +14,8 @@ import { NoContent } from '../../../core/shared/NoContent.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { FindListOptions } from '../../../core/data/find-list-options.model'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; +import {MetadataSchema} from "../../../core/metadata/metadata-schema.model"; +import {toFindListOptions} from "../../../shared/pagination/pagination.utils"; /** * This component renders a list of bitstream formats @@ -44,7 +46,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { id: 'rbp', pageSize: 25, - pageSizeOptions: [25, 50, 100, 200] + pageSizeOptions: [20, 40, 60, 80, 100] }); constructor(private notificationsService: NotificationsService, From ec99d2dca82ba36de59ef684f867bf5844fda6d4 Mon Sep 17 00:00:00 2001 From: Ying Jin Date: Wed, 26 Oct 2022 13:58:16 -0500 Subject: [PATCH 3/4] fix lint issue --- .../bitstream-formats/bitstream-formats.component.ts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index 58756fbdab..70eaf6a21c 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -14,8 +14,6 @@ import { NoContent } from '../../../core/shared/NoContent.model'; import { PaginationService } from '../../../core/pagination/pagination.service'; import { FindListOptions } from '../../../core/data/find-list-options.model'; import { getFirstCompletedRemoteData } from '../../../core/shared/operators'; -import {MetadataSchema} from "../../../core/metadata/metadata-schema.model"; -import {toFindListOptions} from "../../../shared/pagination/pagination.utils"; /** * This component renders a list of bitstream formats @@ -45,7 +43,7 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { */ pageConfig: PaginationComponentOptions = Object.assign(new PaginationComponentOptions(), { id: 'rbp', - pageSize: 25, + pageSize: 20, pageSizeOptions: [20, 40, 60, 80, 100] }); From 2d72a2281080dde111501570c29bd0ba9fe54e4c Mon Sep 17 00:00:00 2001 From: Ying Jin Date: Sun, 30 Oct 2022 23:30:51 -0500 Subject: [PATCH 4/4] remove unused code --- .../bitstream-formats/bitstream-formats.component.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts index 70eaf6a21c..7fcc86e25d 100644 --- a/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts +++ b/src/app/admin/admin-registries/bitstream-formats/bitstream-formats.component.ts @@ -29,14 +29,6 @@ export class BitstreamFormatsComponent implements OnInit, OnDestroy { */ bitstreamFormats: Observable>>; - /** - * 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