@eeacms/volto-datahub 1.0.15 → 1.0.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -2
- package/package.json +1 -1
- package/src/components/ItemView/ItemView.jsx +5 -1
- package/src/components/ItemView/MetadataSection.jsx +50 -44
- package/src/components/ItemView/utils.js +19 -0
- package/src/components/Result/DatahubCardItem.jsx +10 -3
- package/src/config/facets.js +57 -0
package/CHANGELOG.md
CHANGED
|
@@ -4,11 +4,23 @@ All notable changes to this project will be documented in this file. Dates are d
|
|
|
4
4
|
|
|
5
5
|
Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
|
|
6
6
|
|
|
7
|
-
### [1.0.
|
|
7
|
+
### [1.0.17](https://github.com/eea/volto-datahub/compare/1.0.16...1.0.17) - 10 March 2023
|
|
8
|
+
|
|
9
|
+
#### :hammer_and_wrench: Others
|
|
10
|
+
|
|
11
|
+
- test(Jenkinsfile): Use latest stable volto for testing [Zoltan Szabo - [`7aed7a1`](https://github.com/eea/volto-datahub/commit/7aed7a124289f3b39b479fda1bbedd72de88d95b)]
|
|
12
|
+
- Move labels inside <a> [kreafox - [`4273ece`](https://github.com/eea/volto-datahub/commit/4273ece5870b6661b1a66da91f6678923649a3cb)]
|
|
13
|
+
- updates on archived items [Zoltan Szabo - [`627225d`](https://github.com/eea/volto-datahub/commit/627225d726ef48cfbcebddbf574abbe46c2c844d)]
|
|
14
|
+
### [1.0.16](https://github.com/eea/volto-datahub/compare/1.0.15...1.0.16) - 6 March 2023
|
|
8
15
|
|
|
9
16
|
#### :hammer_and_wrench: Others
|
|
10
17
|
|
|
11
|
-
-
|
|
18
|
+
- added utils.js [Zoltan Szabo - [`fdb33c3`](https://github.com/eea/volto-datahub/commit/fdb33c37e1af2fe071dbe8f4f5dcd2b82932edc8)]
|
|
19
|
+
- Show 'Obsolete' info in the metadata section in the banner [Zoltan Szabo - [`fddfd2a`](https://github.com/eea/volto-datahub/commit/fddfd2aea63d1a1d1567c163ab29dd7119781117)]
|
|
20
|
+
- Show 'More information' section only if it's not empty [Zoltan Szabo - [`612f035`](https://github.com/eea/volto-datahub/commit/612f03509c6adf143631ae6dee5ca2bd48a501c3)]
|
|
21
|
+
- Add Sonarqube tag using eea-website-frontend addons list [EEA Jenkins - [`b9100f6`](https://github.com/eea/volto-datahub/commit/b9100f6b2b2e9e9a26b9c11708c8fda94137cecc)]
|
|
22
|
+
### [1.0.15](https://github.com/eea/volto-datahub/compare/1.0.14...1.0.15) - 1 March 2023
|
|
23
|
+
|
|
12
24
|
### [1.0.14](https://github.com/eea/volto-datahub/compare/1.0.13...1.0.14) - 1 March 2023
|
|
13
25
|
|
|
14
26
|
#### :hammer_and_wrench: Others
|
package/package.json
CHANGED
|
@@ -18,6 +18,8 @@ import { asyncConnect, Helmet } from '@plone/volto/helpers';
|
|
|
18
18
|
import { fetchResult } from '@eeacms/search/lib/hocs/useResult';
|
|
19
19
|
import { setDatahubResult } from '@eeacms/volto-datahub/store';
|
|
20
20
|
|
|
21
|
+
import { isObsolete } from './utils.js';
|
|
22
|
+
|
|
21
23
|
const appName = 'datahub';
|
|
22
24
|
|
|
23
25
|
function IsomorphicPortal({ children }) {
|
|
@@ -64,7 +66,8 @@ function ItemView(props) {
|
|
|
64
66
|
|
|
65
67
|
const item = result ? result._result : null;
|
|
66
68
|
const { title, description, raw_value } = item || {}; // readingTime
|
|
67
|
-
const { changeDate, resourceIdentifier } = raw_value?.raw || {};
|
|
69
|
+
const { changeDate, resourceIdentifier, cl_status } = raw_value?.raw || {};
|
|
70
|
+
const obsolete = isObsolete(cl_status);
|
|
68
71
|
|
|
69
72
|
const prodID = (resourceIdentifier || []).filter((p) => {
|
|
70
73
|
return p.code.includes('DAT');
|
|
@@ -113,6 +116,7 @@ function ItemView(props) {
|
|
|
113
116
|
</Banner.Subtitle>
|
|
114
117
|
<Banner.Title>{title?.raw}</Banner.Title>
|
|
115
118
|
<Banner.Metadata>
|
|
119
|
+
{obsolete && <div class="ui label archived-item">Obsolete</div>}
|
|
116
120
|
<Banner.MetadataField label="Prod-ID" value={prodID} />
|
|
117
121
|
<Banner.MetadataField
|
|
118
122
|
label="Published"
|
|
@@ -16,59 +16,65 @@ const MetadataSection = (props) => {
|
|
|
16
16
|
|
|
17
17
|
return (
|
|
18
18
|
<>
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
{(!!rod ||
|
|
20
|
+
(!!organisations && organisations.length > 0) ||
|
|
21
|
+
(merged_time_coverage_range &&
|
|
22
|
+
merged_time_coverage_range?.length > 0)) && (
|
|
23
|
+
<div className="dataset-container metadata-wrapper">
|
|
24
|
+
<h2>More information</h2>
|
|
21
25
|
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
{Array.isArray(rod?.raw) ? (
|
|
28
|
-
<>
|
|
29
|
-
{rod?.raw.map((item, i) => {
|
|
30
|
-
return <div key={i}>{item}</div>;
|
|
31
|
-
})}
|
|
32
|
-
</>
|
|
33
|
-
) : (
|
|
34
|
-
<div>{rod?.raw}</div>
|
|
35
|
-
)}
|
|
36
|
-
</div>
|
|
37
|
-
)}
|
|
38
|
-
|
|
39
|
-
{!!organisations && organisations.length > 0 && (
|
|
40
|
-
<div className="metadata-section">
|
|
41
|
-
<h5>Organisation:</h5>
|
|
26
|
+
<div className="metadata-list">
|
|
27
|
+
{!!rod && (
|
|
28
|
+
<div className="metadata-section">
|
|
29
|
+
<h5>Reporting obligations (ROD)</h5>
|
|
42
30
|
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
31
|
+
{Array.isArray(rod?.raw) ? (
|
|
32
|
+
<>
|
|
33
|
+
{rod?.raw.map((item, i) => {
|
|
34
|
+
return <div key={i}>{item}</div>;
|
|
35
|
+
})}
|
|
36
|
+
</>
|
|
37
|
+
) : (
|
|
38
|
+
<div>{rod?.raw}</div>
|
|
39
|
+
)}
|
|
40
|
+
</div>
|
|
41
|
+
)}
|
|
48
42
|
|
|
49
|
-
|
|
50
|
-
merged_time_coverage_range?.length > 0 && (
|
|
43
|
+
{!!organisations && organisations.length > 0 && (
|
|
51
44
|
<div className="metadata-section">
|
|
52
|
-
<h5>
|
|
45
|
+
<h5>Organisation:</h5>
|
|
53
46
|
|
|
54
|
-
{
|
|
55
|
-
|
|
56
|
-
const tc_end = tc.end || '';
|
|
57
|
-
return (
|
|
58
|
-
<React.Fragment key={i}>
|
|
59
|
-
<span>
|
|
60
|
-
{tc_start === tc_end && tc_start}
|
|
61
|
-
{tc_start !== tc_end && tc_start + ' - ' + tc_end}
|
|
62
|
-
</span>
|
|
63
|
-
{i !== merged_time_coverage_range.length - 1 ? ', ' : ' '}
|
|
64
|
-
</React.Fragment>
|
|
65
|
-
);
|
|
47
|
+
{organisations.map((item, i) => {
|
|
48
|
+
return <div key={i}>{item}</div>;
|
|
66
49
|
})}
|
|
67
50
|
</div>
|
|
68
51
|
)}
|
|
69
|
-
</div>
|
|
70
|
-
</div>
|
|
71
52
|
|
|
53
|
+
{merged_time_coverage_range &&
|
|
54
|
+
merged_time_coverage_range?.length > 0 && (
|
|
55
|
+
<div className="metadata-section">
|
|
56
|
+
<h5>Temporal coverage:</h5>
|
|
57
|
+
|
|
58
|
+
{merged_time_coverage_range.map((tc, i) => {
|
|
59
|
+
const tc_start = tc.start || '';
|
|
60
|
+
const tc_end = tc.end || '';
|
|
61
|
+
return (
|
|
62
|
+
<React.Fragment key={i}>
|
|
63
|
+
<span>
|
|
64
|
+
{tc_start === tc_end && tc_start}
|
|
65
|
+
{tc_start !== tc_end && tc_start + ' - ' + tc_end}
|
|
66
|
+
</span>
|
|
67
|
+
{i !== merged_time_coverage_range.length - 1
|
|
68
|
+
? ', '
|
|
69
|
+
: ' '}
|
|
70
|
+
</React.Fragment>
|
|
71
|
+
);
|
|
72
|
+
})}
|
|
73
|
+
</div>
|
|
74
|
+
)}
|
|
75
|
+
</div>
|
|
76
|
+
</div>
|
|
77
|
+
)}
|
|
72
78
|
<div className="dataset-container">
|
|
73
79
|
<div className="d-link">
|
|
74
80
|
<Icon className="file pdf" />
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
const OBSOLETE_KEYS = ['obsolete', 'superseded'];
|
|
2
|
+
|
|
3
|
+
export const isObsolete = (status) => {
|
|
4
|
+
let obsolete = false;
|
|
5
|
+
if (status) {
|
|
6
|
+
if (Array.isArray(status)) {
|
|
7
|
+
if (
|
|
8
|
+
status.filter((stat) => OBSOLETE_KEYS.includes(stat?.key)).length > 0
|
|
9
|
+
) {
|
|
10
|
+
obsolete = true;
|
|
11
|
+
}
|
|
12
|
+
} else {
|
|
13
|
+
if (OBSOLETE_KEYS.includes(status?.key)) {
|
|
14
|
+
obsolete = true;
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
}
|
|
18
|
+
return obsolete;
|
|
19
|
+
};
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
|
|
3
|
+
import { Label } from 'semantic-ui-react';
|
|
3
4
|
import { DateTime, StringList } from '@eeacms/search';
|
|
4
5
|
import { ResultContext } from '@eeacms/search';
|
|
5
6
|
import { Link } from 'react-router-dom';
|
|
@@ -16,9 +17,15 @@ const DatahubCardItem = (props) => {
|
|
|
16
17
|
|
|
17
18
|
const item = {
|
|
18
19
|
title: (
|
|
19
|
-
|
|
20
|
-
{result.title}
|
|
21
|
-
|
|
20
|
+
<>
|
|
21
|
+
<Link to={result.href} title={result.title}>
|
|
22
|
+
{result.title}
|
|
23
|
+
{result.isNew && <Label className="new-item">New</Label>}
|
|
24
|
+
{result.isExpired && (
|
|
25
|
+
<Label className="archived-item">Archived</Label>
|
|
26
|
+
)}
|
|
27
|
+
</Link>
|
|
28
|
+
</>
|
|
22
29
|
),
|
|
23
30
|
description: <ResultContext {...props} />,
|
|
24
31
|
preview_image_url: result.hasImage ? result.thumbUrl : undefined,
|
package/src/config/facets.js
CHANGED
|
@@ -3,10 +3,67 @@ import {
|
|
|
3
3
|
fixedRangeFacet,
|
|
4
4
|
histogramFacet,
|
|
5
5
|
makeRange,
|
|
6
|
+
booleanFacet,
|
|
6
7
|
} from '@eeacms/search';
|
|
7
8
|
import { dateRangeFacet } from '@eeacms/search';
|
|
8
9
|
|
|
10
|
+
export function getTodayWithTime() {
|
|
11
|
+
const d = new Date();
|
|
12
|
+
const month = d.getMonth() + 1;
|
|
13
|
+
const day = d.getDate();
|
|
14
|
+
const hour = d.getHours();
|
|
15
|
+
const minute = d.getMinutes();
|
|
16
|
+
const second = d.getSeconds();
|
|
17
|
+
|
|
18
|
+
const output = [
|
|
19
|
+
d.getFullYear(),
|
|
20
|
+
'-',
|
|
21
|
+
month < 10 ? '0' : '',
|
|
22
|
+
month,
|
|
23
|
+
'-',
|
|
24
|
+
day < 10 ? '0' : '',
|
|
25
|
+
day,
|
|
26
|
+
'T',
|
|
27
|
+
hour < 10 ? '0' : '',
|
|
28
|
+
hour,
|
|
29
|
+
':',
|
|
30
|
+
minute < 10 ? '0' : '',
|
|
31
|
+
minute,
|
|
32
|
+
':',
|
|
33
|
+
second < 10 ? '0' : '',
|
|
34
|
+
second,
|
|
35
|
+
'Z',
|
|
36
|
+
].join('');
|
|
37
|
+
return output;
|
|
38
|
+
}
|
|
39
|
+
|
|
9
40
|
const facets = [
|
|
41
|
+
booleanFacet(() => ({
|
|
42
|
+
field: 'IncludeArchived',
|
|
43
|
+
label: 'Include archived content',
|
|
44
|
+
id: 'archived-facet',
|
|
45
|
+
showInFacetsList: false,
|
|
46
|
+
showInSecondaryFacetsList: true,
|
|
47
|
+
isFilter: true, // filters don't need facet options to show up
|
|
48
|
+
|
|
49
|
+
// we want this to be applied by default
|
|
50
|
+
// when the facet is checked, then apply the `on` key:
|
|
51
|
+
off: {
|
|
52
|
+
constant_score: {
|
|
53
|
+
filter: {
|
|
54
|
+
bool: {
|
|
55
|
+
should: [
|
|
56
|
+
{ bool: { must_not: { exists: { field: 'expires' } } } },
|
|
57
|
+
// Functions should be supported in the buildFilters
|
|
58
|
+
{ range: { expires: { gte: getTodayWithTime() } } },
|
|
59
|
+
],
|
|
60
|
+
},
|
|
61
|
+
},
|
|
62
|
+
},
|
|
63
|
+
},
|
|
64
|
+
on: null,
|
|
65
|
+
})),
|
|
66
|
+
|
|
10
67
|
multiTermFacet({
|
|
11
68
|
field: 'instrument',
|
|
12
69
|
isFilterable: true,
|