@sis-cc/dotstatsuite-components 12.1.1 → 12.1.4
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/lib/rules/src/table/preparators/prepareData.js +1 -1
- package/lib/viewer/src/footer.js +4 -3
- package/lib/viewer/src/index.js +1 -1
- package/package.json +2 -2
- package/src/rules/src/table/preparators/prepareData.js +4 -1
- package/src/viewer/src/footer.js +2 -1
- package/src/viewer/src/index.js +1 -1
|
@@ -150,7 +150,7 @@ var prepareData = exports.prepareData = function prepareData(sdmxJson, customAtt
|
|
|
150
150
|
}, dimensionsAttributesValues);
|
|
151
151
|
|
|
152
152
|
var metadataCoordinates = (0, _getMetadataCoordinates.getMetadataCoordinates)(sdmxJson);
|
|
153
|
-
var headerAttributesIds = R.concat(attributesIdsIndexedByTargets.dataflow || [], attributesIdsIndexedByTargets.oneValueDimensions ||
|
|
153
|
+
var headerAttributesIds = R.concat(attributesIdsIndexedByTargets.dataflow || [], R.pipe(R.values, R.unnest)(attributesIdsIndexedByTargets.oneValueDimensions || {}));
|
|
154
154
|
var headerAttributes = R.pick(headerAttributesIds, attributesIndexedByIds);
|
|
155
155
|
var headerAdvancedAttrIds = R.pipe(R.filter(function (id) {
|
|
156
156
|
return !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.footnotes || []);
|
package/lib/viewer/src/footer.js
CHANGED
|
@@ -35,12 +35,12 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
|
|
|
35
35
|
var Footer = function Footer(_ref) {
|
|
36
36
|
var type = _ref.type,
|
|
37
37
|
chartData = _ref.chartData,
|
|
38
|
-
options = _ref.options,
|
|
39
38
|
source = _ref.source,
|
|
40
39
|
logo = _ref.logo,
|
|
41
40
|
copyright = _ref.copyright,
|
|
42
41
|
onSize = _ref.onSize,
|
|
43
|
-
chartOptions = _ref.chartOptions
|
|
42
|
+
chartOptions = _ref.chartOptions,
|
|
43
|
+
isSticky = _ref.isSticky;
|
|
44
44
|
|
|
45
45
|
var target = _react2.default.useRef(null);
|
|
46
46
|
|
|
@@ -63,7 +63,8 @@ var Footer = function Footer(_ref) {
|
|
|
63
63
|
source: source,
|
|
64
64
|
logo: logo,
|
|
65
65
|
copyright: copyright,
|
|
66
|
-
legend: legend
|
|
66
|
+
legend: legend,
|
|
67
|
+
isSticky: isSticky
|
|
67
68
|
})
|
|
68
69
|
);
|
|
69
70
|
};
|
package/lib/viewer/src/index.js
CHANGED
|
@@ -58,7 +58,7 @@ function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj;
|
|
|
58
58
|
|
|
59
59
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
60
60
|
|
|
61
|
-
var useStyles = (0, _styles.makeStyles)(function (
|
|
61
|
+
var useStyles = (0, _styles.makeStyles)(function () {
|
|
62
62
|
return {
|
|
63
63
|
container: {
|
|
64
64
|
borderColor: '#007bc7',
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sis-cc/dotstatsuite-components",
|
|
3
3
|
"description": "Set components based on React.",
|
|
4
|
-
"version": "12.1.
|
|
4
|
+
"version": "12.1.4",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"author": "OECD",
|
|
7
7
|
"license": "MIT",
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
24
|
"@react-hook/size": "^2.1.1",
|
|
25
|
-
"@sis-cc/dotstatsuite-d3-charts": "^8.0.
|
|
25
|
+
"@sis-cc/dotstatsuite-d3-charts": "^8.0.1",
|
|
26
26
|
"date-fns": "^1.30.1",
|
|
27
27
|
"lodash": "^4.17.2",
|
|
28
28
|
"lodash.compose": "^2.4.1",
|
|
@@ -145,7 +145,10 @@ export const prepareData = (sdmxJson, customAttributes, unitsProps={}) => {
|
|
|
145
145
|
);
|
|
146
146
|
|
|
147
147
|
const metadataCoordinates = getMetadataCoordinates(sdmxJson);
|
|
148
|
-
const headerAttributesIds = R.concat(
|
|
148
|
+
const headerAttributesIds = R.concat(
|
|
149
|
+
attributesIdsIndexedByTargets.dataflow || [],
|
|
150
|
+
R.pipe(R.values, R.unnest)(attributesIdsIndexedByTargets.oneValueDimensions || {})
|
|
151
|
+
);
|
|
149
152
|
const headerAttributes = R.pick(headerAttributesIds, attributesIndexedByIds);
|
|
150
153
|
const headerAdvancedAttrIds = R.pipe(
|
|
151
154
|
R.filter(id => !R.includes(id, customAttributes.flags || []) && !R.includes(id, customAttributes.footnotes || [])),
|
package/src/viewer/src/footer.js
CHANGED
|
@@ -5,7 +5,7 @@ import { DataFooter } from '@sis-cc/dotstatsuite-visions';
|
|
|
5
5
|
import ChartLegends from './legends/ChartLegends';
|
|
6
6
|
import { isChartNoData } from './utils';
|
|
7
7
|
|
|
8
|
-
const Footer = ({ type, chartData,
|
|
8
|
+
const Footer = ({ type, chartData, source, logo, copyright, onSize, chartOptions, isSticky }) => {
|
|
9
9
|
const target = React.useRef(null);
|
|
10
10
|
const [width, height] = useSize(target);
|
|
11
11
|
|
|
@@ -23,6 +23,7 @@ const Footer = ({ type, chartData, options, source, logo, copyright, onSize, cha
|
|
|
23
23
|
logo={logo}
|
|
24
24
|
copyright={copyright}
|
|
25
25
|
legend={legend}
|
|
26
|
+
isSticky={isSticky}
|
|
26
27
|
/>
|
|
27
28
|
</div>
|
|
28
29
|
);
|
package/src/viewer/src/index.js
CHANGED