From 4e52e4d00ed41a94429d51b1c05ccc59490746bd Mon Sep 17 00:00:00 2001 From: Alisa Ismailati Date: Thu, 4 Jan 2024 11:44:49 +0100 Subject: [PATCH 1/7] [DSC-1066] search-filter query with [ ] --- src/app/core/shared/search/search-configuration.service.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/core/shared/search/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts index 7708523dea6..66c82cf1a31 100644 --- a/src/app/core/shared/search/search-configuration.service.ts +++ b/src/app/core/shared/search/search-configuration.service.ts @@ -164,7 +164,8 @@ export class SearchConfigurationService implements OnDestroy { */ getCurrentQuery(defaultQuery: string) { return this.routeService.getQueryParameterValue('query').pipe(map((query) => { - return query || defaultQuery; + const queryFromURL = query || defaultQuery; + return decodeURIComponent(queryFromURL) ?? ''; })); } From 7348ecaf9febd03abc9fc96c73b5cc57aa7a287a Mon Sep 17 00:00:00 2001 From: Andrea Barbasso <´andrea.barbasso@4science.com´> Date: Tue, 23 Jan 2024 17:19:50 +0100 Subject: [PATCH 2/7] [DURACOM-224] fix infinite scroll --- .../dso-selector/dso-selector/dso-selector.component.html | 4 ++-- .../dso-selector/dso-selector/dso-selector.component.ts | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html index c4f5dbc4cd6..19ce1dea05b 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.html +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.html @@ -6,12 +6,12 @@ [formControl]="input" ngbAutofocus (keyup.enter)="selectSingleResult()">
-
+
diff --git a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts index 71ca19ad47f..b8880320ea5 100644 --- a/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts +++ b/src/app/shared/dso-selector/dso-selector/dso-selector.component.ts @@ -142,6 +142,11 @@ export class DSOSelectorComponent implements OnInit, OnDestroy { */ public subs: Subscription[] = []; + /** + * Random seed of 4 characters to avoid duplicate ids + */ + randomSeed: string = Math.random().toString(36).substring(2, 6); + constructor( protected searchService: SearchService, protected notifcationsService: NotificationsService, From eaca163e3681c084cb80fd3facd6a53eb19fda24 Mon Sep 17 00:00:00 2001 From: Stefano Maffei Date: Mon, 5 Feb 2024 14:33:17 +0100 Subject: [PATCH 3/7] [DSC-1507] fix issue with cached empty files response --- src/app/core/data/processes/process-data.service.ts | 5 +++-- src/app/process-page/detail/process-detail.component.ts | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/core/data/processes/process-data.service.ts b/src/app/core/data/processes/process-data.service.ts index 9cf1bf9470e..79079517db3 100644 --- a/src/app/core/data/processes/process-data.service.ts +++ b/src/app/core/data/processes/process-data.service.ts @@ -68,10 +68,11 @@ export class ProcessDataService extends IdentifiableDataService impleme /** * Get a process' output files * @param processId The ID of the process + * @param useCacheVersionIfAvailable If value needs to be red from cache or not */ - getFiles(processId: string): Observable>> { + getFiles(processId: string, useCacheVersionIfAvailable = true): Observable>> { const href$ = this.getFilesEndpoint(processId); - return this.bitstreamDataService.findListByHref(href$); + return this.bitstreamDataService.findListByHref(href$, {}, useCacheVersionIfAvailable); } /** diff --git a/src/app/process-page/detail/process-detail.component.ts b/src/app/process-page/detail/process-detail.component.ts index be0b6ad0f64..fd8a681b210 100644 --- a/src/app/process-page/detail/process-detail.component.ts +++ b/src/app/process-page/detail/process-detail.component.ts @@ -146,7 +146,7 @@ export class ProcessDetailComponent implements OnInit, OnDestroy { this.filesRD$ = this.processRD$.pipe( getFirstSucceededRemoteDataPayload(), - switchMap((process: Process) => this.processService.getFiles(process.processId)) + switchMap((process: Process) => this.processService.getFiles(process.processId, false)), ); } From 3df3a337026105b63f854568e4e486cee99f5bdd Mon Sep 17 00:00:00 2001 From: FrancescoMolinaro Date: Wed, 24 Jan 2024 09:34:41 +0100 Subject: [PATCH 4/7] DSC-1127 add logo constraints --- .../comcol/comcol-page-logo/comcol-page-logo.component.scss | 4 ++++ src/styles/_custom_variables.scss | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss index e69de29bb2d..db6e7daecfd 100644 --- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss +++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.scss @@ -0,0 +1,4 @@ +img { + max-width: var(--ds-comcol-logo-max-width); + max-height: var(--ds-comcol-logo-max-height); +} diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index 01646233547..fd005d5e7c5 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -140,4 +140,8 @@ --ds-dso-edit-security-width: 136px; --ds-dso-edit-actions-width: 173px; --ds-dso-edit-virtual-tooltip-min-width: 300px; + + + --ds-comcol-logo-max-width: 500px; + --ds-comcol-logo-max-height: 500px; } From 8182a83ee898dc24ed62c6fd9a87e4f07a33cd59 Mon Sep 17 00:00:00 2001 From: FrancescoMolinaro Date: Thu, 25 Jan 2024 09:05:43 +0100 Subject: [PATCH 5/7] DSC-1127 fix issue on mobile --- .../comcol/comcol-page-logo/comcol-page-logo.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html index 057c3582239..cb3feecbe59 100644 --- a/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html +++ b/src/app/shared/comcol/comcol-page-logo/comcol-page-logo.component.html @@ -1,3 +1,3 @@ From 5e6388198f1f7913efe5ac2e260e0757192dda94 Mon Sep 17 00:00:00 2001 From: Vlad Nouski Date: Mon, 15 Jan 2024 13:31:03 +0100 Subject: [PATCH 6/7] [DSC-1387] feature: fixed export menu in person entity --- .../item-export-modal-launcher.component.scss | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/app/shared/search/item-export/item-export-modal-launcher/item-export-modal-launcher.component.scss b/src/app/shared/search/item-export/item-export-modal-launcher/item-export-modal-launcher.component.scss index cc36f78bfa0..c71e20f6333 100644 --- a/src/app/shared/search/item-export/item-export-modal-launcher/item-export-modal-launcher.component.scss +++ b/src/app/shared/search/item-export/item-export-modal-launcher/item-export-modal-launcher.component.scss @@ -1,3 +1,7 @@ :host { display: none; } + +.dropdown-menu { + z-index: 1020; +} \ No newline at end of file From d35a9349cfcdc5c205e4554ed4def9d166603511 Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 2 Feb 2024 16:59:51 +0100 Subject: [PATCH 7/7] [DSC-1387] align dropdown to right --- src/app/shared/search/search.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/shared/search/search.component.html b/src/app/shared/search/search.component.html index d929d6b464f..006f0e2c05b 100644 --- a/src/app/shared/search/search.component.html +++ b/src/app/shared/search/search.component.html @@ -96,7 +96,7 @@ -
+