From 53d8440171551c8c043b8b5a9d390b52d67fbf7a Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Fri, 12 May 2023 14:00:34 +0300 Subject: [PATCH 1/2] fix bug in landing: when navigating from result to result, if they all have "Related Research" tab and selection input, options of the selection are not re-initialized --- landingPages/result/resultLanding.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/landingPages/result/resultLanding.component.ts b/landingPages/result/resultLanding.component.ts index ef4e1e8a..4c3f1c9b 100644 --- a/landingPages/result/resultLanding.component.ts +++ b/landingPages/result/resultLanding.component.ts @@ -548,7 +548,7 @@ export class ResultLandingComponent { this.enermapsId = ParsingFunctions.getEnermapsConceptId(this.resultLandingInfo.contexts); } - + this.relatedClassFilters = [{"label": "All relations", "value": ""}]; if(this.resultLandingInfo.relatedClassFilters.size > 1) { for (let relClass of this.resultLandingInfo.relatedClassFilters) { this.relatedClassFilters.push({"label": HelperFunctions.getVocabularyLabel(relClass, this.relationsVocabulary), "value": relClass}); From 29723188bc93b9c00e2127f78cead0ae9a297dc0 Mon Sep 17 00:00:00 2001 From: Alex Martzios Date: Fri, 12 May 2023 15:55:22 +0300 Subject: [PATCH 2/2] resultLanding: in versions modal, expand authors instead of opening them in a new modal --- .../deletedByInference/deletedByInference.component.ts | 2 +- utils/authors/showAuthors.component.ts | 5 +++-- utils/result-preview/result-preview.component.html | 2 +- utils/result-preview/result-preview.component.ts | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/landingPages/result/deletedByInference/deletedByInference.component.ts b/landingPages/result/deletedByInference/deletedByInference.component.ts index 035cc282..e8aa1413 100644 --- a/landingPages/result/deletedByInference/deletedByInference.component.ts +++ b/landingPages/result/deletedByInference/deletedByInference.component.ts @@ -27,7 +27,7 @@ import {HelperFunctions} from "../../../utils/HelperFunctions.class"; - +
@@ -121,6 +121,7 @@ export class ShowAuthorsComponent { @Input() showAll: boolean = true; @Input() modal: AlertModal; @Input() viewAll: boolean = false; + @Input() showInline: boolean = false; // do not open modal for "view more" when this is true public lessBtn: boolean = false; @ViewChild('authorsModal') authorsModal; @@ -143,7 +144,7 @@ export class ShowAuthorsComponent { } public viewAllClick() { - if(this.authors.length <= this.authorsLimit*2) { + if(this.authors.length <= this.authorsLimit*2 || this.showInline) { this.viewAll = true; this.lessBtn = true; } else { diff --git a/utils/result-preview/result-preview.component.html b/utils/result-preview/result-preview.component.html index 6b222507..0507cf9e 100644 --- a/utils/result-preview/result-preview.component.html +++ b/utils/result-preview/result-preview.component.html @@ -124,7 +124,7 @@
+ [showAll]=true [showInline]="showInline">
diff --git a/utils/result-preview/result-preview.component.ts b/utils/result-preview/result-preview.component.ts index 23e02606..5bba5007 100644 --- a/utils/result-preview/result-preview.component.ts +++ b/utils/result-preview/result-preview.component.ts @@ -37,6 +37,7 @@ export class ResultPreviewComponent implements OnInit, OnChanges { @Input() showEnermaps: boolean = false; @Input() provenanceActionVocabulary = null; @Input() relationsVocabulary = null; + @Input() showInline: boolean = false; // do not open modal for "view more" when this is true /* Metadata */ public type: string;