From 152f6c652f019b4943b397884f575c21532934f0 Mon Sep 17 00:00:00 2001 From: Angelika Kinas Date: Tue, 24 Oct 2023 10:30:05 +0200 Subject: [PATCH 1/3] fix(DH): Make font-sizes and colors same across the expandable panel --- .../src/lib/metadata-info/metadata-info.component.html | 6 +++++- .../src/lib/metadata-info/metadata-info.component.ts | 5 +---- .../lib/expandable-panel/expandable-panel.component.html | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html index f24145348a..e2ccc88517 100644 --- a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html +++ b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html @@ -63,7 +63,11 @@ record.metadata.isOpenData - + {{ usage }} diff --git a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts index ad4c10b951..98bcb397db 100644 --- a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts +++ b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.ts @@ -5,10 +5,7 @@ import { Input, Output, } from '@angular/core' -import { - DatasetDistribution, - DatasetRecord, -} from '@geonetwork-ui/common/domain/record' +import { DatasetRecord } from '@geonetwork-ui/common/domain/record' @Component({ selector: 'gn-ui-metadata-info', diff --git a/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html b/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html index 9968e2c066..9c07e761f8 100644 --- a/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html +++ b/libs/ui/layout/src/lib/expandable-panel/expandable-panel.component.html @@ -15,7 +15,7 @@
Date: Tue, 24 Oct 2023 13:28:48 +0200 Subject: [PATCH 2/3] fix(DH): Add suggested changes --- .../metadata-info.component.html | 20 ++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html index e2ccc88517..4b697dbcaf 100644 --- a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html +++ b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html @@ -4,7 +4,10 @@ > record.metadata.about

-
+

-

+

{{ metadata.lineage }}

record.metadata.updatedOn

-

+

{{ metadata.recordUpdated && metadata.recordUpdated.toLocaleString() }}

record.metadata.updateFrequency

-

+

domain.record.updateFrequency.{{ metadata.updateFrequency }}

record.metadata.updateStatus

-

+

domain.record.status.{{ metadata.status }}

@@ -64,7 +70,7 @@ record.metadata.isOpenData @@ -83,7 +89,7 @@

record.metadata.sheet

open_in_new {{ metadata.landingPage }} From f6c3fe55fec065fdb10d43d1737472792d55658c Mon Sep 17 00:00:00 2001 From: Angelika Kinas Date: Tue, 24 Oct 2023 13:49:06 +0200 Subject: [PATCH 3/3] fix(DH): Make sure that the content ghost for abstract is shown --- .../src/lib/metadata-info/metadata-info.component.html | 6 ++---- .../src/lib/metadata-info/metadata-info.component.spec.ts | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html index 4b697dbcaf..ec4dcd879a 100644 --- a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html +++ b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.html @@ -4,14 +4,12 @@ > record.metadata.about

-
+

diff --git a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.spec.ts b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.spec.ts index 19b3ffbc84..eaba09c8d0 100644 --- a/libs/ui/elements/src/lib/metadata-info/metadata-info.component.spec.ts +++ b/libs/ui/elements/src/lib/metadata-info/metadata-info.component.spec.ts @@ -43,7 +43,7 @@ describe('MetadataInfoComponent', () => { }) it('should not display the abstract section', () => { const displayedElement = - fixture.nativeElement.querySelector('.md-description') + fixture.nativeElement.querySelector('.md-description p') expect(displayedElement).toBeFalsy() }) }) @@ -69,7 +69,7 @@ describe('MetadataInfoComponent', () => { }) it('should display the abstract section', () => { const displayedElement = - fixture.nativeElement.querySelector('.md-description') + fixture.nativeElement.querySelector('.md-description p') expect(displayedElement).toBeTruthy() }) })