diff --git a/src/app/datasets/datafiles-actions/datafiles-action.component.ts b/src/app/datasets/datafiles-actions/datafiles-action.component.ts index e710dc544b..c9f5c9a21c 100644 --- a/src/app/datasets/datafiles-actions/datafiles-action.component.ts +++ b/src/app/datasets/datafiles-actions/datafiles-action.component.ts @@ -101,6 +101,8 @@ export class DatafilesActionComponent implements OnInit, OnChanges { this.prepare_disabled_condition(); const expr = this.disabled_condition; + // Note: 'with' has been deprecated and is considered harmful. + // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/with const fn = new Function("ctx", `with (ctx) { return (${expr}); }`); return fn({ diff --git a/src/app/datasets/dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component.ts b/src/app/datasets/dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component.ts index 8e8ac7f112..7e1a0948cb 100644 --- a/src/app/datasets/dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component.ts +++ b/src/app/datasets/dataset-detail/dataset-detail-dynamic/dataset-detail-dynamic.component.ts @@ -7,6 +7,7 @@ import { Subscription } from "rxjs"; import { showMessageAction } from "state-management/actions/user.actions"; import { selectCurrentAttachments, + selectCurrentDatasetExternalLinks, selectCurrentDataset, selectCurrentDatasetWithoutFileInfo, } from "state-management/selectors/datasets.selectors"; @@ -58,6 +59,7 @@ export class DatasetDetailDynamicComponent implements OnInit, OnDestroy { dataset$ = this.store.select(selectCurrentDataset); datasetWithout$ = this.store.select(selectCurrentDatasetWithoutFileInfo); attachments$ = this.store.select(selectCurrentAttachments); + externalLinks$ = this.store.select(selectCurrentDatasetExternalLinks); loading$ = this.store.select(selectIsLoading); show = false; diff --git a/src/app/datasets/dataset-detail/dataset-detail/_dataset-detail-theme.scss b/src/app/datasets/dataset-detail/dataset-detail/_dataset-detail-theme.scss index c38b8e686a..2f9a595639 100644 --- a/src/app/datasets/dataset-detail/dataset-detail/_dataset-detail-theme.scss +++ b/src/app/datasets/dataset-detail/dataset-detail/_dataset-detail-theme.scss @@ -10,29 +10,33 @@ $header-3: map.get($color-config, "header-3"); $header-4: map.get($color-config, "header-4"); mat-card { - .general-header { + .dataset-general-header { background-color: mat.m2-get-color-from-palette($primary, "lighter"); } - .creator-header { + .dataset-creator-header { background-color: mat.m2-get-color-from-palette($header-1, "lighter"); } - .file-header { - background-color: mat.m2-get-color-from-palette($accent, "lighter"); + .dataset-file-header { + background-color: mat.m2-get-color-from-palette($header-2, "lighter"); } - .related-header { - background-color: mat.m2-get-color-from-palette($header-2, "lighter"); + .dataset-related-header { + background-color: mat.m2-get-color-from-palette($accent, "lighter"); } - .derived-header { + .dataset-derived-header { background-color: mat.m2-get-color-from-palette($header-3, "lighter"); } - .scientific-header { + .dataset-links-header { background-color: mat.m2-get-color-from-palette($header-4, "lighter"); } + + .dataset-scientific-header { + background-color: mat.m2-get-color-from-palette($header-1, "lighter"); + } } } diff --git a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html index 1c2e207579..ecf097619a 100644 --- a/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html +++ b/src/app/datasets/dataset-detail/dataset-detail/dataset-detail.component.html @@ -26,7 +26,7 @@
| {{ externalLink.title }} | ++ {{ externalLink.description }} + | +
|---|