From de55f0d1dfc54ac3a83646d581977d612ca7e92b Mon Sep 17 00:00:00 2001
From: Xiao Gui <xgui3783@gmail.com>
Date: Thu, 23 Jun 2022 11:41:04 +0200
Subject: [PATCH] feat: add desc to rich region component
---
common/constants.js | 1 +
.../sapiViews/core/region/module.ts | 2 ++
.../region/rich/region.rich.template.html | 19 ++++++++++++++-----
3 files changed, 17 insertions(+), 5 deletions(-)
diff --git a/common/constants.js b/common/constants.js
index cf5610655..94a42b81a 100644
--- a/common/constants.js
+++ b/common/constants.js
@@ -108,6 +108,7 @@ If you do not accept the Terms & Conditions you are not permitted to access or u
CANNOT_DECIPHER_HEMISPHERE: 'Cannot decipher region hemisphere.',
DOES_NOT_SUPPORT_MULTI_REGION_SELECTION: `Please only select a single region.`,
MULTI_REGION_SELECTION: `Multi region selection`,
+ DESCRIPTION: 'Description',
REGIONAL_FEATURES: 'Regional features',
CONNECTIVITY: 'Connectivity',
NO_ADDIONTAL_INFO_AVAIL: `Currently, no additional information is linked to this region.`,
diff --git a/src/atlasComponents/sapiViews/core/region/module.ts b/src/atlasComponents/sapiViews/core/region/module.ts
index f0e19a9bc..6c30611aa 100644
--- a/src/atlasComponents/sapiViews/core/region/module.ts
+++ b/src/atlasComponents/sapiViews/core/region/module.ts
@@ -1,5 +1,6 @@
import { CommonModule } from "@angular/common";
import { NgModule } from "@angular/core";
+import { MarkdownModule } from "src/components/markdown";
import { SpinnerModule } from "src/components/spinner";
import { AngularMaterialModule } from "src/sharedModules";
import { SapiViewsFeaturesModule } from "../../features";
@@ -17,6 +18,7 @@ import { SapiViewsCoreRegionRegionRich } from "./region/rich/region.rich.compone
SapiViewsUtilModule,
SapiViewsFeaturesModule,
SpinnerModule,
+ MarkdownModule,
],
declarations: [
SapiViewsCoreRegionRegionListItem,
diff --git a/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.template.html b/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.template.html
index 8884f0786..675927dfc 100644
--- a/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.template.html
+++ b/src/atlasComponents/sapiViews/core/region/region/rich/region.rich.template.html
@@ -76,10 +76,23 @@
</ng-template>
+ <ng-template #regionDesc>
+ <markdown-dom class="sxplr-muted" [markdown]="region?.versionInnovation || 'No description provided.'">
+ </markdown-dom>
+ </ng-template>
+ <mat-accordion class="d-block mt-2">
+ <ng-container *ngTemplateOutlet="ngMatAccordionTmpl; context: {
+ title: CONST.DESCRIPTION,
+ iconClass: 'fas fa-info',
+ content: regionDesc,
+ desc: '',
+ iconTooltip: 'Description',
+ iavNgIf: !!region?.versionInnovation
+ }">
- <mat-accordion class="d-block mt-2">
+ </ng-container>
<ng-container *ngTemplateOutlet="ngMatAccordionTmpl; context: {
title: CONST.REGIONAL_FEATURES,
@@ -91,10 +104,6 @@
}">
</ng-container>
- </mat-accordion>
-
- <mat-accordion class="d-block mt-2">
-
<!-- connectivity -->
<ng-template #sxplrSapiviewsFeaturesConnectivityBrowser>
<sxplr-sapiviews-features-connectivity-browser
--
GitLab