@sis-cc/dotstatsuite-components 16.8.2 → 17.1.0

package/lib/app.js

@@ -4,7 +4,7 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _reactDom = require('react-dom');
+var _client = require('react-dom/client');
 
 var _app = require('./viewer/src/app');
 
@@ -16,7 +16,9 @@ var _styles = require('@material-ui/core/styles');
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var theme = (0, _styles.createMuiTheme)((0, _dotstatsuiteVisions.sisccTheme)({ rtl: 'ltr' }));
+var theme = (0, _styles.createTheme)((0, _dotstatsuiteVisions.sisccTheme)({ rtl: 'ltr' }));
+var container = document.getElementById('root');
+var root = (0, _client.createRoot)(container);
 
 var App = function App() {
   return _react2.default.createElement(
@@ -26,4 +28,4 @@ var App = function App() {
   );
 };
 
-(0, _reactDom.render)(_react2.default.createElement(App, null), document.getElementById('root'));
+root.render(_react2.default.createElement(App, null));

package/lib/rules2/src/getCombinationDefinitions.js

@@ -20,22 +20,25 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 var parseCombinationDefinition = exports.parseCombinationDefinition = function parseCombinationDefinition(locale) {
   return function (title, texts) {
     return R.useWith(function (titles, texts) {
-      return R.addIndex(R.map)(function (title, index) {
+      return R.addIndex(R.reduce)(function (acc, title, index) {
         var split = R.split(':', title);
-        if (R.length(split !== 2)) {
-          return null;
+        if (R.length(split) !== 2) {
+          return acc;
         }
 
         var _split = (0, _slicedToArray3.default)(split, 2),
             id = _split[0],
             codes = _split[1];
 
-        return {
+        if (R.isEmpty(codes)) {
+          return acc;
+        }
+        return R.append({
           id: id,
           concepts: R.split(',', codes),
           name: R.has(locale, texts) ? R.pipe(R.prop(locale), R.nth(index), R.split(':'), R.last)(texts) : '[' + id + ']'
-        };
-      }, titles);
+        }, acc);
+      }, [], titles);
     }, [R.split(';'), R.map(R.split(';'))])(title, texts);
   };
 };

package/lib/viewer/src/app.js

@@ -74,7 +74,7 @@ exports.default = function () {
       isRtl = _useState2[0],
       setRtl = _useState2[1];
 
-  var theme = (0, _styles.createMuiTheme)((0, _dotstatsuiteVisions.sisccTheme)({ rtl: isRtl ? 'rtl' : 'ltr' }));
+  var theme = (0, _styles.createTheme)((0, _dotstatsuiteVisions.sisccTheme)({ rtl: isRtl ? 'rtl' : 'ltr' }));
 
   var config = {
     logo: 'https://upload.wikimedia.org/wikipedia/en/thumb/0/0d/OECD_logo_new.svg/200px-OECD_logo_new.svg.png',

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "16.8.2",
+  "version": "17.1.0",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",
@@ -13,10 +13,11 @@
   },
   "devDependencies": {
     "@blueprintjs/core": "^1.22.0",
-    "@material-ui/core": "^4.12.3",
+    "@material-ui/core": "^4",
     "@sis-cc/dotstatsuite-sdmxjs": "*",
     "@sis-cc/dotstatsuite-visions": "*",
-    "react": "^16.11.0",
+    "react": "^18",
+    "react-dom": "^18",
     "react-addons-css-transition-group": "^15.6.2",
     "react-helmet": "^5.2.1",
     "web-component-env": "^2.0.0"
@@ -31,13 +32,13 @@
     "numeral": "^2.0.6",
     "prop-types": "^15.6.2",
     "ramda": "^0.26.1",
-    "react-dom": "^16.5.2",
     "react-sizeme": "^2.3.6"
   },
   "peerDependencies": {
-    "@material-ui/core": "^4.x",
-    "@sis-cc/dotstatsuite-sdmxjs": "^8.x",
-    "@sis-cc/dotstatsuite-visions": "^7.x",
-    "react": "16.x"
+    "@material-ui/core": "^4",
+    "@sis-cc/dotstatsuite-sdmxjs": "^8",
+    "@sis-cc/dotstatsuite-visions": "^9",
+    "react": "^18",
+    "react-dom": "^18"
   }
 }

package/src/app.js

@@ -1,11 +1,13 @@
 import React from 'react';
-import { render } from 'react-dom';
+import { createRoot } from 'react-dom/client';
 import ViewerApp from './viewer/src/app';
 import { sisccTheme } from '@sis-cc/dotstatsuite-visions';
 import { ThemeProvider } from '@material-ui/core/styles';
-import { createMuiTheme } from '@material-ui/core/styles';
+import { createTheme } from '@material-ui/core/styles';
 
-const theme = createMuiTheme(sisccTheme({ rtl: 'ltr' }));
+const theme = createTheme(sisccTheme({ rtl: 'ltr' }));
+const container = document.getElementById('root');
+const root = createRoot(container);
 
 const App = () => (
   <ThemeProvider theme={theme}>
@@ -13,4 +15,4 @@ const App = () => (
   </ThemeProvider>
 );
 
-render(<App />, document.getElementById('root'));
+root.render(<App />);

package/src/rules2/src/getCombinationDefinitions.js

@@ -2,20 +2,23 @@ import * as R from 'ramda';
 
 export const parseCombinationDefinition = (locale) => (title, texts) => R.useWith(
   (titles, texts) =>
-    R.addIndex(R.map)((title, index) => {
+    R.addIndex(R.reduce)((acc, title, index) => {
       const split = R.split(':', title);
-      if (R.length(split !== 2)) {
-        return null;
+      if (R.length(split) !== 2) {
+        return acc;
       }
       const [id, codes] = split;
-      return {
+      if (R.isEmpty(codes)) {
+        return acc;
+      }
+      return R.append({
         id,
         concepts: R.split(',', codes),
         name: R.has(locale, texts)
           ? R.pipe(R.prop(locale), R.nth(index), R.split(':'), R.last)(texts)
           : `[${id}]`,
-      };
-    }, titles),
+      }, acc);
+    }, [], titles),
   [R.split(';'), R.map(R.split(';'))],
 )(title, texts);
 

package/src/viewer/src/app.js

@@ -2,7 +2,7 @@ import React, { useState } from 'react';
 import { Helmet } from 'react-helmet';
 import { Tab2, Tabs2, Intent, Icon, Tooltip, Position } from '@blueprintjs/core';
 import { ThemeProvider } from '@material-ui/core/styles';
-import { createMuiTheme } from '@material-ui/core/styles';
+import { createTheme } from '@material-ui/core/styles';
 import { sisccTheme } from '@sis-cc/dotstatsuite-visions';
 import UseCase1 from './app/use-case-1';
 import TableCase from './app/table';
@@ -23,7 +23,7 @@ const AppTab = ({ label, iconName }) => (
 export default () => {
   const [isRtl, setRtl] = useState(false);
 
-  const theme = createMuiTheme(sisccTheme({ rtl: isRtl ? 'rtl' : 'ltr' }));
+  const theme = createTheme(sisccTheme({ rtl: isRtl ? 'rtl' : 'ltr' }));
 
   const config = {
     logo: 'https://upload.wikimedia.org/wikipedia/en/thumb/0/0d/OECD_logo_new.svg/200px-OECD_logo_new.svg.png',

package/test/getCombinationDefinitions.test.js

@@ -0,0 +1,88 @@
+import { expect } from 'chai';
+import { getCombinationDefinitions } from '../src/rules2/src';
+
+describe('getCombinationDefinitions tests', () => {
+  it('no annotations', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'en')).to.deep.equal([]);
+  });
+  it('basic case', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'COMB_1:First Combination;COMB_2:Second Combination' },
+        title: 'COMB_1:D1,D2,A1;COMB_2:D3,D4,A2,A3'
+      }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'en')).to.deep.equal([
+      { id: 'COMB_1', name: 'First Combination', concepts: ['D1', 'D2', 'A1'] },
+      { id: 'COMB_2', name: 'Second Combination', concepts: ['D3', 'D4', 'A2', 'A3'] },
+    ]);
+  });
+  it('bad formatted test 1', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'COMB_1:First Combination;COMB_2:Second Combination' },
+        title: 'COMB_1:D1,D2,A1;D3,D4,A2,A3'
+      }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'en')).to.deep.equal([
+      { id: 'COMB_1', name: 'First Combination', concepts: ['D1', 'D2', 'A1'] },
+    ]);
+  });
+  it('bad formatted test 2', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'COMB_1:First Combination;COMB_2:Second Combination' },
+        title: 'COMB_1:D1,D2,A1;COMB_2:'
+      }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'en')).to.deep.equal([
+      { id: 'COMB_1', name: 'First Combination', concepts: ['D1', 'D2', 'A1'] },
+    ]);
+  });
+  it('bad formatted test 3', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'First Combination;Second Combination' },
+        title: 'D1,D2,A1;D3,D4,A2,A3'
+      }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'en')).to.deep.equal([]);
+  });
+  it('missing localised text', () => {
+    const annotations = [
+      { type: 'random', title: 'test' },
+      { type: 'NOT_DISPLAYED', title: 'FREQ=A'  },
+      {
+        type: 'COMBINED_CONCEPTS',
+        texts: { en: 'COMB_1:First Combination;COMB_2:Second Combination' },
+        title: 'COMB_1:D1,D2,A1;COMB_2:D3,D4,A2,A3'
+      }
+    ];
+
+    expect(getCombinationDefinitions(annotations, 'fr')).to.deep.equal([
+      { id: 'COMB_1', name: '[COMB_1]', concepts: ['D1', 'D2', 'A1'] },
+      { id: 'COMB_2', name: '[COMB_2]', concepts: ['D3', 'D4', 'A2', 'A3'] },
+    ]);
+  });
+});