From 6a8e20c2b96fc40b656a830a5c3fc2491699dd13 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Wed, 22 Nov 2023 11:17:22 +0100 Subject: [PATCH 1/5] [DSC-1352] Move breadcrumb char limit property inside layout configuration properties --- ...runcate-breadcrumb-item-characters.pipe.ts | 2 +- src/config/app-config.interface.ts | 1 - src/config/default-app-config.ts | 38 ++++++++++--------- src/config/layout-config.interfaces.ts | 5 +++ src/environments/environment.test.ts | 6 ++- 5 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/app/breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe.ts b/src/app/breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe.ts index edd6bcdb4d5..ebfade6f89f 100644 --- a/src/app/breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe.ts +++ b/src/app/breadcrumbs/breadcrumb/truncate-breadcrumb-item-characters.pipe.ts @@ -10,7 +10,7 @@ export class TruncateBreadcrumbItemCharactersPipe implements PipeTransform { * The maximum number of characters to display in a breadcrumb item * @type {number} */ - readonly charLimit: number = environment.breadcrumbCharLimit; + readonly charLimit: number = environment.layout.breadcrumbs.charLimit; /** * Truncates the text based on the configured char number allowed per breadcrumb element. diff --git a/src/config/app-config.interface.ts b/src/config/app-config.interface.ts index 8d03ef86426..f95a82dd399 100644 --- a/src/config/app-config.interface.ts +++ b/src/config/app-config.interface.ts @@ -68,7 +68,6 @@ interface AppConfig extends Config { attachmentRendering: AttachmentRenderingConfig; advancedAttachmentRendering: AdvancedAttachmentRenderingConfig; searchResult: SearchResultConfig; - breadcrumbCharLimit: number; } /** diff --git a/src/config/default-app-config.ts b/src/config/default-app-config.ts index 2b4a24e1043..bb4f5740a74 100644 --- a/src/config/default-app-config.ts +++ b/src/config/default-app-config.ts @@ -511,23 +511,23 @@ export class DefaultAppConfig implements AppConfig { urn: [ { name: 'doi', - baseUrl: 'https://doi.org/' + baseUrl: 'https://doi.org/', }, { name: 'hdl', - baseUrl: 'https://hdl.handle.net/' + baseUrl: 'https://hdl.handle.net/', }, { name: 'scopus', - baseUrl: 'https://www.scopus.com/authid/detail.uri?authorId=' + baseUrl: 'https://www.scopus.com/authid/detail.uri?authorId=', }, { name: 'researcherid', - baseUrl: 'http://www.researcherid.com/rid/' + baseUrl: 'http://www.researcherid.com/rid/', }, { name: 'mailto', - baseUrl: 'mailto:' + baseUrl: 'mailto:', } ], crisRef: [ @@ -536,7 +536,7 @@ export class DefaultAppConfig implements AppConfig { entityStyle: { default: { icon: 'fa fa-info', - style: 'text-info' + style: 'text-info', } } }, @@ -545,7 +545,7 @@ export class DefaultAppConfig implements AppConfig { entityStyle: { default: { icon: 'fa fa-user', - style: 'text-info' + style: 'text-info', } } }, @@ -554,7 +554,7 @@ export class DefaultAppConfig implements AppConfig { entityStyle: { default: { icon: 'fa fa-university', - style: 'text-info' + style: 'text-info', } } }, @@ -563,7 +563,7 @@ export class DefaultAppConfig implements AppConfig { entityStyle: { default: { icon: 'fas fa-project-diagram', - style: 'text-info' + style: 'text-info', } } } @@ -573,18 +573,18 @@ export class DefaultAppConfig implements AppConfig { }, itemPage: { OrgUnit: { - orientation: 'vertical' + orientation: 'vertical', }, Project: { - orientation: 'vertical' + orientation: 'vertical', }, default: { - orientation: 'horizontal' + orientation: 'horizontal', }, }, metadataBox: { defaultMetadataLabelColStyle: 'col-3', - defaultMetadataValueColStyle: 'col-9' + defaultMetadataValueColStyle: 'col-9', }, collectionsBox: { defaultCollectionsLabelColStyle: 'col-3 font-weight-bold', @@ -597,6 +597,9 @@ export class DefaultAppConfig implements AppConfig { navbar: { // If true, show the "Community and Collections" link in the navbar; otherwise, show it in the admin sidebar showCommunityCollection: true, + }, + breadcrumbs: { + charLimit: 10, } }; @@ -605,17 +608,17 @@ export class DefaultAppConfig implements AppConfig { { value: 0, icon: 'fa fa-globe', - color: 'green' + color: 'green', }, { value: 1, icon: 'fa fa-key', - color: 'orange' + color: 'orange', }, { value: 2, icon: 'fa fa-lock', - color: 'red' + color: 'red', } ] }; @@ -730,7 +733,7 @@ export class DefaultAppConfig implements AppConfig { name: 'checksum', type: AdvancedAttachmentElementType.Attribute, } - ] + ], }; searchResult: SearchResultConfig = { @@ -738,5 +741,4 @@ export class DefaultAppConfig implements AppConfig { authorMetadata: ['dc.contributor.author', 'dc.creator', 'dc.contributor.*'], }; - breadcrumbCharLimit = 10; } diff --git a/src/config/layout-config.interfaces.ts b/src/config/layout-config.interfaces.ts index b5f293800c1..88e52ac54fd 100644 --- a/src/config/layout-config.interfaces.ts +++ b/src/config/layout-config.interfaces.ts @@ -38,6 +38,10 @@ export interface NavbarConfig extends Config { showCommunityCollection: boolean; } +export interface BreadcrumbsConfig extends Config { + charLimit: number; +} + export interface CrisItemPageConfig extends Config { [entity: string]: CrisLayoutTypeConfig; default: CrisLayoutTypeConfig; @@ -59,6 +63,7 @@ export interface CrisLayoutConfig extends Config { export interface LayoutConfig extends Config { navbar: NavbarConfig; + breadcrumbs: BreadcrumbsConfig; } export interface SuggestionConfig extends Config { diff --git a/src/environments/environment.test.ts b/src/environments/environment.test.ts index 6956db23dcb..ee4912c49a0 100644 --- a/src/environments/environment.test.ts +++ b/src/environments/environment.test.ts @@ -421,7 +421,10 @@ export const environment: BuildConfig = { navbar: { // If true, show the "Community and Collections" link in the navbar; otherwise, show it in the admin sidebar showCommunityCollection: true, - } + }, + breadcrumbs: { + charLimit: 10, + }, }, security: { levels: [ @@ -554,5 +557,4 @@ export const environment: BuildConfig = { authorMetadata: ['dc.contributor.author', 'dc.contributor.editor', 'dc.contributor.contributor', 'dc.creator'], }, - breadcrumbCharLimit: 10, }; From b513c5566e525dc47dac7ba6c188496d96565c2b Mon Sep 17 00:00:00 2001 From: Nikita Krivonosov Date: Thu, 30 Nov 2023 08:49:58 +0100 Subject: [PATCH 2/5] [DSC-1408] - Fix dropdown readonly field --- src/app/shared/form/form.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html index fa1fda949d9..6e50faebfa9 100644 --- a/src/app/shared/form/form.component.html +++ b/src/app/shared/form/form.component.html @@ -20,7 +20,7 @@ title="{{'form.remove' | translate}}" attr.aria-label="{{'form.remove' | translate}}" (click)="clearScrollableDropdown($event, model)" - [disabled]="!model.value"> + [disabled]="!model.value || model.readOnly"> From 4724dfcb1a11cdfd1af4c8228060b3c34be5109b Mon Sep 17 00:00:00 2001 From: Giuseppe Digilio Date: Thu, 30 Nov 2023 17:53:15 +0100 Subject: [PATCH 3/5] Prepare next development iteration --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 7bd0d51961b..7a3f9dff512 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "dspace-angular", - "version": "2023.02.00", + "version": "2023.02.01-SNAPSHOT", "scripts": { "ng": "ng", "config:watch": "nodemon", From fb31da728bcc4fa940b191051002fd98e3df0924 Mon Sep 17 00:00:00 2001 From: Vincenzo Mecca Date: Thu, 7 Dec 2023 17:57:38 +0100 Subject: [PATCH 4/5] [DSC-1037] Adds semicolon to author-list --- .../item-list-preview/item-list-preview.component.html | 4 +++- .../relationships-items-list-preview.component.html | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html index 25bed065bb7..64ea279ed01 100644 --- a/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html +++ b/src/app/shared/object-list/my-dspace-result-list-element/item-list-preview/item-list-preview.component.html @@ -19,7 +19,9 @@

{{'mydspace.results.no-authors' | translate}} - + ; diff --git a/src/app/shared/object-list/relationships-list/relationships-items-list-preview/relationships-items-list-preview.component.html b/src/app/shared/object-list/relationships-list/relationships-items-list-preview/relationships-items-list-preview.component.html index 03f5ea0f99e..594793cd50b 100644 --- a/src/app/shared/object-list/relationships-list/relationships-items-list-preview/relationships-items-list-preview.component.html +++ b/src/app/shared/object-list/relationships-list/relationships-items-list-preview/relationships-items-list-preview.component.html @@ -24,7 +24,9 @@

{{'mydspace.results.no-authors' | translate}} - + ; From 329328ce2a8f8527f93239e7677031a8990d1a53 Mon Sep 17 00:00:00 2001 From: "Gantner, Florian Klaus" Date: Wed, 13 Dec 2023 13:15:53 +0100 Subject: [PATCH 5/5] fix pagination not working on exernal sources --- .../import-external/submission-import-external.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/submission/import-external/submission-import-external.component.ts b/src/app/submission/import-external/submission-import-external.component.ts index e391d2b9b35..e5a05d713ec 100644 --- a/src/app/submission/import-external/submission-import-external.component.ts +++ b/src/app/submission/import-external/submission-import-external.component.ts @@ -117,6 +117,7 @@ export class SubmissionImportExternalComponent implements OnInit, OnDestroy { ngOnInit(): void { this.listId = 'list-submission-external-sources'; this.context = Context.EntitySearchModalWithNameVariants; + this.searchConfigService.setPaginationId(this.initialPagination.id); this.repeatable = false; this.routeData = {entity: '', sourceId: '', query: ''}; this.importConfig = {