Skip to content
Snippets Groups Projects
Commit 50e51112 authored by Matthieu BENOIST's avatar Matthieu BENOIST
Browse files

Merge branch 'DOS0194116' into 'master'

Dos0194116

See merge request !167
parents 9d9432a1 4e1c601f
Branches
Tags
1 merge request!167Dos0194116
Pipeline #31257 passed
{
"name": "webapp",
"version": "2.8.0",
"version": "2.8.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "webapp",
"version": "2.8.0",
"version": "2.8.1",
"hasInstallScript": true,
"license": "GNU Affero General Public License v3.0",
"dependencies": {
......@@ -34,6 +34,7 @@
"core-js": "^2.5.7",
"font-awesome": "^4.7.0",
"hamburgers": "^1.1.3",
"ibs-format": "^1.4.10",
"jwt-decode": "^2.2.0",
"lodash.clonedeep": "^4.5.0",
"mapbox-gl": "^1.11.1",
......@@ -9945,6 +9946,11 @@
"ms": "^2.0.0"
}
},
"node_modules/ibs-format": {
"version": "1.4.10",
"resolved": "https://registry.npmjs.org/ibs-format/-/ibs-format-1.4.10.tgz",
"integrity": "sha512-MXjOPMgg0bkOUrT3juG6kAomhpbBAtS9V41Fnf0MF9hygxi/cXQ8BK4P5dfPOIyQawtHtUBxuQFYQJS5zrZRLg=="
},
"node_modules/iconv-lite": {
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
......@@ -28768,6 +28774,11 @@
"ms": "^2.0.0"
}
},
"ibs-format": {
"version": "1.4.10",
"resolved": "https://registry.npmjs.org/ibs-format/-/ibs-format-1.4.10.tgz",
"integrity": "sha512-MXjOPMgg0bkOUrT3juG6kAomhpbBAtS9V41Fnf0MF9hygxi/cXQ8BK4P5dfPOIyQawtHtUBxuQFYQJS5zrZRLg=="
},
"iconv-lite": {
"version": "0.4.24",
"resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
......@@ -45,6 +45,7 @@
"core-js": "^2.5.7",
"font-awesome": "^4.7.0",
"hamburgers": "^1.1.3",
"ibs-format": "^1.4.10",
"jwt-decode": "^2.2.0",
"lodash.clonedeep": "^4.5.0",
"mapbox-gl": "^1.11.1",
......
......@@ -4,7 +4,7 @@
<span class="info-title">
Description
</span>
<p class="abstract">{{ abstract }}</p>
<p class="abstract" [innerHTML]="abstract"></p>
</div>
<app-info-summary class="mobile-section"></app-info-summary>
......@@ -84,7 +84,7 @@
<span class="info-title" i18n="@@dataset.info.origin">
Origin
</span>
<p>{{ metadata.lineage }}</p>
<p [innerHTML]="lineage"></p>
</div>
<div class="info-section" *ngIf="geographicalInfo">
......
......@@ -7,6 +7,7 @@ import { environment } from '../../../../environments/environment';
import { License, Metadata, typesMetadata } from '../../../shared/models';
import { DatasetDetailService } from '../../services';
import { UsageStatisticsService } from '../../services/usage-statistics.service';
import { ibsFormat } from 'ibs-format';
@Component({
selector: 'app-dataset-info',
......@@ -86,7 +87,11 @@ export class DatasetInfoComponent implements OnInit, OnDestroy {
}
get abstract() {
return this.metadata.abstract;
return ibsFormat(this.metadata.abstract,[],{detectLinks: true, target: '_blank'});
}
get lineage() {
return ibsFormat(this.metadata.lineage,[], {detectLinks: true, target: '_blank'} )
}
getDatasetDataRepresentationType(): string {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment