@sis-cc/dotstatsuite-components 18.1.0 → 19.1.0

package/.gitlab-ci.yml

@@ -5,7 +5,7 @@ stages:
   - publish
 
 variables:
-  NODE_VERSION: node:14-alpine
+  NODE_VERSION: node:18-alpine
 
 setup:
   stage: setup

package/lib/app.js

@@ -6,29 +6,16 @@ var _react2 = _interopRequireDefault(_react);
 
 var _client = require('react-dom/client');
 
-var _app = require('./viewer/src/app');
-
-var _app2 = _interopRequireDefault(_app);
-
-var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
-
-var _styles = require('@mui/material/styles');
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-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(
-    _styles.StyledEngineProvider,
-    { injectFirst: true },
-    _react2.default.createElement(
-      _styles.ThemeProvider,
-      { theme: theme },
-      _react2.default.createElement(_app2.default, null)
-    )
+    _react.StrictMode,
+    null,
+    'I\'m not groot, I\'m component'
   );
 };
 

package/lib/rules2/src/applyHierarchicalCodesToDim.js

@@ -5,10 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.applyHierarchicalCodesToDim = undefined;
 
-var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
-
-var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
-
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -30,8 +26,57 @@ var addParentId = function addParentId(id, ids) {
   return R.append(R.isNil(last) ? id : last + '.' + id, ids);
 };
 
-var applyHierarchicalCodesToDim = function applyHierarchicalCodesToDim(hCodes, dim) {
+var refineUnconfirmedPaths = function refineUnconfirmedPaths(paths) {
+  var confirmedPaths = R.filter(function (p) {
+    return p.length === 1;
+  }, paths);
+  if (!R.isEmpty(confirmedPaths)) {
+    confirmedPaths = R.reduce(function (acc, k) {
+      if (R.has(k, acc)) {
+        return acc;
+      }
+      var ps = R.prop(k, paths);
+      var flatConfirmed = R.unnest(R.values(acc));
+      var filtered = R.filter(function (p) {
+        return !!R.find(function (cP) {
+          return R.includes(p, cP) || R.includes(cP, p);
+        }, flatConfirmed);
+      }, ps);
+      if (!R.isEmpty(filtered)) {
+        return R.assoc(k, [R.head(filtered)], acc);
+      }
+      return acc;
+    }, confirmedPaths, R.keys(paths));
+  }
+  var remainingIds = R.reject(function (id) {
+    return R.has(id, confirmedPaths);
+  }, R.keys(paths));
+  var getCommonPaths = function getCommonPaths(ids) {
+    var _R$reduce = R.reduce(function (acc, id) {
+      var ps = R.prop(id, paths);
+      if (R.isEmpty(acc.commonPaths)) {
+        return R.assoc('commonPaths', ps, acc);
+      }
+      var common = R.intersection(acc.commonPaths, ps);
+      return R.isEmpty(common) ? R.assoc('rejectedChildrenIds', id, acc) : R.assoc('commonPaths', common, acc);
+    }, { commonPaths: [], rejectedIds: [] })(ids),
+        commonPaths = _R$reduce.commonPaths,
+        rejectedIds = _R$reduce.rejectedIds;
+
+    if (!R.isEmpty(rejectedIds)) {
+      return R.append(R.head(commonPaths), getCommonPaths(rejectedIds));
+    }
+    return [R.head(commonPaths)];
+  };
+  var commons = getCommonPaths(remainingIds);
+  return R.reduce(function (acc, id) {
+    return R.assoc(id, R.intersection(commons, R.prop(id, paths)), acc);
+  }, confirmedPaths, remainingIds);
+};
+
+var applyHierarchicalCodesToDim = exports.applyHierarchicalCodesToDim = function applyHierarchicalCodesToDim(hCodes, dim) {
   var confirmedHierarchisedChilds = new _set2.default([]);
+  var unconfirmedPaths = {};
 
   var indexedValues = R.reduce(function (acc, val) {
     if (!val.isSelected) {
@@ -52,13 +97,18 @@ var applyHierarchicalCodesToDim = function applyHierarchicalCodesToDim(hCodes, d
       if (!hasInDim) {
         return R.concat(acc, children);
       }
+      var path = R.join('.', parentsDef);
       var val = (0, _extends3.default)({}, R.prop(codeID, indexedValues), {
+        path: path,
         parents: parentsInDim,
         parent: R.last(parentsInDim),
         children: children
       });
 
       if (isUnconfirmed) {
+        unconfirmedPaths = R.over(R.lensProp(val.id), function (paths) {
+          return R.append(path, paths || []);
+        }, unconfirmedPaths);
         val = R.assoc('unconfirmed', true, val);
         return R.append(val, acc);
       }
@@ -69,34 +119,33 @@ var applyHierarchicalCodesToDim = function applyHierarchicalCodesToDim(hCodes, d
 
   var parsed = parseHCodes([], [])(hCodes);
 
+  var _unconfirmedPaths = R.pipe(R.reject(function (id) {
+    return confirmedHierarchisedChilds.has(id);
+  }), function (ids) {
+    return R.pick(ids, unconfirmedPaths);
+  })(R.keys(unconfirmedPaths));
+
+  var refinedUnconfirmedPaths = refineUnconfirmedPaths(_unconfirmedPaths);
+
   var flattenDescendants = R.reduce(function (acc, val) {
     var children = flattenDescendants(val.children || []);
     return R.concat(acc, R.prepend(val, children));
   }, []);
 
   var isValid = function isValid(val) {
-    return !val.unconfirmed || !confirmedHierarchisedChilds.has(val.id);
+    return !val.unconfirmed || R.includes(val.path, R.propOr([], val.id, refinedUnconfirmedPaths));
   };
 
   var refineCodes = R.reduce(function (acc, hC) {
-    var children = hC.children,
-        _hC$unconfirmed = hC.unconfirmed,
-        unconfirmed = _hC$unconfirmed === undefined ? false : _hC$unconfirmed,
-        val = (0, _objectWithoutProperties3.default)(hC, ['children', 'unconfirmed']);
-
-    if (isValid(hC)) {
-      var _children = refineCodes(children || []);
-      confirmedHierarchisedChilds.add(val.id);
-      return R.concat(acc, R.prepend(val, _children));
-    }
-    var flatDescendants = flattenDescendants(children);
+    var _flatDescendants = flattenDescendants(hC.children);
+    var flatDescendants = R.prepend(hC, _flatDescendants);
     var validDescendant = R.find(isValid, flatDescendants);
     if (!validDescendant) {
       return acc;
     }
-    var refined = R.pipe(R.prepend(hC), R.map(function (v) {
+    var refined = R.pipe(R.map(function (v) {
       confirmedHierarchisedChilds.add(v.id);
-      return R.omit(['unconfirmed', 'children'], v);
+      return R.omit(['unconfirmed', 'children', 'path'], v);
     }))(flatDescendants);
     return R.concat(acc, refined);
   }, []);
@@ -112,7 +161,6 @@ var applyHierarchicalCodesToDim = function applyHierarchicalCodesToDim(hCodes, d
   }), R.sortBy(R.propOr(-1, '__indexPosition')))(indexedValues);
 
   var hierarchicalIndexes = {};
-
   return R.pipe(R.concat, R.addIndex(R.map)(function (v, ind) {
     var parents = R.props(v.parents, hierarchicalIndexes);
     var hierId = R.last(v.parents) ? R.last(v.parents) + '.' + v.id : v.id;
@@ -124,5 +172,4 @@ var applyHierarchicalCodesToDim = function applyHierarchicalCodesToDim(hCodes, d
   }), function (values) {
     return (0, _extends3.default)({}, dim, { values: values });
   })(missingValues, refined);
-};
-exports.applyHierarchicalCodesToDim = applyHierarchicalCodesToDim;
+};

package/lib/viewer/src/app/use-case-1.js

@@ -26,29 +26,11 @@ var _oecdHEALTH_PROT = require('../../../rules/test/oecd-HEALTH_PROT.json');
 
 var _oecdHEALTH_PROT2 = _interopRequireDefault(_oecdHEALTH_PROT);
 
-var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
-
 function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) newObj[key] = obj[key]; } } newObj.default = obj; return newObj; } }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-/*return (
-    <div style={{display: 'flex', flexWrap: 'wrap'}}>
-      {R.map(([key, value]) => (
-        <React.Fragment key={key}>
-          <div style={{width: value - 1, margin: 10}}>
-            <h5>{key}: {value}px</h5>
-            <Viewer {...rowData()} chartOptions={options} type="RowChart" />
-          </div>
-          <div style={{width: value - 1, margin: 10}}>
-            <h5>{key}: {value}px</h5>
-            <Viewer {...stackData()} chartOptions={options} type="StackedBarChart" />
-          </div>
-        </React.Fragment>
-      ), R.toPairs(T4_BREAKPOINTS))}
-    </div>
-  );*/
-
+//import stackData from '../../mocks/stack';
 exports.default = function (_ref) {
   var config = _ref.config,
       style = _ref.style,
@@ -75,5 +57,4 @@ exports.default = function (_ref) {
     },
     type: type
   });
-};
-//import stackData from '../../mocks/stack';
+};

package/lib/viewer/src/app.js

@@ -12,10 +12,6 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _reactHelmet = require('react-helmet');
-
-var _core = require('@blueprintjs/core');
-
 var _styles = require('@mui/material/styles');
 
 var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
@@ -62,9 +58,9 @@ var AppTab = function AppTab(_ref) {
   var label = _ref.label,
       iconName = _ref.iconName;
   return _react2.default.createElement(
-    _core.Tooltip,
-    { content: label, position: _core.Position.RIGHT },
-    _react2.default.createElement(_core.Icon, { iconName: iconName })
+    Tooltip,
+    { content: label, position: Position.RIGHT },
+    _react2.default.createElement(Icon, { iconName: iconName })
   );
 };
 
@@ -149,25 +145,18 @@ exports.default = function () {
   
   */
 
-  return _react2.default.createElement(
-    'div',
-    { style: { padding: 10 } },
-    _react2.default.createElement(_reactHelmet.Helmet, { htmlAttributes: { dir: isRtl ? 'rtl' : 'ltr' } }),
-    _react2.default.createElement(
-      'button',
-      { onClick: function onClick() {
-          return setRtl(!isRtl);
-        } },
-      isRtl ? 'left to right' : 'right to left'
-    ),
-    _react2.default.createElement(
-      _core.Tabs2,
-      { renderActiveTabPanelOnly: false },
-      _react2.default.createElement(_core.Tab2, {
-        id: 'uc1',
-        title: _react2.default.createElement(AppTab, { label: 'full screen resizable chart', iconName: 'fullscreen' }),
-        panel: _react2.default.createElement(_useCase2.default, { isRtl: isRtl, config: config, style: style, options: options })
-      })
-    )
-  );
+  return {/* <div style={{ padding: 10 }}>
+           <StyledEngineProvider injectFirst>
+             <ThemeProvider theme={theme}>
+           <button onClick={() => setRtl(!isRtl)}>{isRtl ? 'left to right' : 'right to left'}</button>
+           <Tabs2 renderActiveTabPanelOnly={false}>
+             <Tab2
+               id="uc1"
+               title={<AppTab label="full screen resizable chart" iconName="fullscreen" />}
+               panel={<UseCase1 isRtl={isRtl} config={config} style={style} options={options} />}
+             />
+           </Tabs2>
+           </ThemeProvider>
+           </StyledEngineProvider>
+          </div> */};
 };

package/package.json

@@ -1,36 +1,24 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "18.1.0",
+  "version": "19.1.0",
   "main": "lib/index.js",
+  "type": "module",
   "author": "OECD",
   "license": "MIT",
   "scripts": {
     "build": "wce build",
     "start": "wce start",
-    "test": "wce test",
-    "demo": "wce bundle --app --relative && mv dist public"
+    "test": "wce test"
   },
   "devDependencies": {
-    "@blueprintjs/core": "^1.22.0",
-    "@mui/material": "^5.16.5",
-    "@mui/styles": "^5.16.5",
-    "@sis-cc/dotstatsuite-sdmxjs": "*",
-    "@sis-cc/dotstatsuite-visions": "*",
-    "react": "^18",
-    "react-dom": "^18",
-    "react-addons-css-transition-group": "^15.6.2",
-    "react-helmet": "^5.2.1",
     "web-component-env": "^2.0.0"
   },
   "dependencies": {
-    "@emotion/react": "^11.13.3",
-    "@emotion/styled": "^11.13.0",
-    "@mui/icons-material": "^5.16.5",
-    "@mui/material": "^5.16.5",
-    "@mui/styles": "^5.16.5",
     "@react-hook/size": "^2.1.1",
-    "@sis-cc/dotstatsuite-d3-charts": "^8.3.0",
+    "@sis-cc/dotstatsuite-d3-charts": "~8.3.0",
+    "@sis-cc/dotstatsuite-sdmxjs": "~10.1.0",
+    "@sis-cc/dotstatsuite-visions": "~12.2.0",
     "date-fns": "^1.30.1",
     "lodash": "^4.17.2",
     "lodash.compose": "^2.4.1",
@@ -40,10 +28,11 @@
     "ramda": "^0.26.1"
   },
   "peerDependencies": {
-    "@mui/icons-material": "^5.16.5",
-    "@mui/material": "^5.16.5",
-    "@sis-cc/dotstatsuite-sdmxjs": "^8",
-    "@sis-cc/dotstatsuite-visions": "^9",
+    "@emotion/react": "^11",
+    "@emotion/styled": "^11",
+    "@mui/icons-material": "^5",
+    "@mui/material": "^5",
+    "@mui/styles": "^5",
     "react": "^18",
     "react-dom": "^18"
   }

package/src/app.js

@@ -1,20 +1,13 @@
-import React from 'react';
+import React, { StrictMode } from 'react';
 import { createRoot } from 'react-dom/client';
-import ViewerApp from './viewer/src/app';
-import { sisccTheme } from '@sis-cc/dotstatsuite-visions';
-import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles';
-import { createTheme } from '@mui/material/styles';
 
-const theme = createTheme(sisccTheme({ rtl: 'ltr' }));
 const container = document.getElementById('root');
 const root = createRoot(container);
 
 const App = () => (
-  <StyledEngineProvider injectFirst>
-    <ThemeProvider theme={theme}>
-      <ViewerApp />
-    </ThemeProvider>
-  </StyledEngineProvider>
+  <StrictMode>
+    I'm not groot, I'm component
+  </StrictMode>
 );
 
 root.render(<App />);

package/src/rules2/src/applyHierarchicalCodesToDim.js

@@ -5,8 +5,53 @@ const addParentId = (id, ids) => {
   return R.append(R.isNil(last) ? id : `${last}.${id}`, ids); 
 }
 
+const refineUnconfirmedPaths = (paths) => {
+  let confirmedPaths = R.filter(p => p.length === 1, paths);
+  if (!R.isEmpty(confirmedPaths)) {
+    confirmedPaths = R.reduce((acc, k) => {
+      if (R.has(k, acc)) {
+        return acc;
+      }
+      const ps = R.prop(k, paths);
+      const flatConfirmed = R.unnest(R.values(acc));
+      const filtered = R.filter(p => !!R.find(cP => R.includes(p, cP) || R.includes(cP, p), flatConfirmed), ps);
+      if (!R.isEmpty(filtered)) {
+        return R.assoc(k, [R.head(filtered)], acc);
+      }
+      return acc;
+    }, confirmedPaths, R.keys(paths));
+  }
+  const remainingIds = R.reject(id => R.has(id, confirmedPaths), R.keys(paths));
+  const getCommonPaths = ids => {
+    const { commonPaths, rejectedIds } = R.reduce(
+      (acc, id) => {
+        const ps = R.prop(id, paths);
+        if (R.isEmpty(acc.commonPaths)) {
+          return R.assoc('commonPaths', ps, acc);
+        }
+        const common = R.intersection(acc.commonPaths, ps);
+        return R.isEmpty(common)
+          ? R.assoc('rejectedChildrenIds', id, acc)
+          : R.assoc('commonPaths', common, acc);
+      },
+      { commonPaths: [], rejectedIds: [] }
+    )(ids);
+    if (!R.isEmpty(rejectedIds)) {
+      return R.append(R.head(commonPaths), getCommonPaths(rejectedIds));
+    }
+    return [R.head(commonPaths)];
+  };
+  const commons = getCommonPaths(remainingIds);
+  return R.reduce(
+    (acc, id) => R.assoc(id, R.intersection(commons, R.prop(id, paths)), acc),
+    confirmedPaths,
+    remainingIds
+  );
+};
+
 export const applyHierarchicalCodesToDim = (hCodes, dim) => {
-  let confirmedHierarchisedChilds = new Set([]);
+  const confirmedHierarchisedChilds = new Set([]);
+  let unconfirmedPaths = {};
 
   const indexedValues = R.reduce((acc, val) => {
     if (!val.isSelected) {
@@ -26,14 +71,17 @@ export const applyHierarchicalCodesToDim = (hCodes, dim) => {
     if (!hasInDim) {
       return R.concat(acc, children);
     }
+    const path = R.join('.', parentsDef);
     let val = {
       ...R.prop(codeID, indexedValues),
+      path,
       parents: parentsInDim,
       parent: R.last(parentsInDim),
       children
     };
 
     if (isUnconfirmed) {
+      unconfirmedPaths = R.over(R.lensProp(val.id), paths => R.append(path, paths || []), unconfirmedPaths);
       val = R.assoc('unconfirmed', true, val);
       return R.append(val, acc);
     }
@@ -43,30 +91,31 @@ export const applyHierarchicalCodesToDim = (hCodes, dim) => {
 
   const parsed = parseHCodes([], [])(hCodes);
 
+  const _unconfirmedPaths = R.pipe(
+    R.reject(id => confirmedHierarchisedChilds.has(id)),
+    ids => R.pick(ids, unconfirmedPaths)
+  )(R.keys(unconfirmedPaths));
+
+  const refinedUnconfirmedPaths = refineUnconfirmedPaths(_unconfirmedPaths);
+
   const flattenDescendants = R.reduce((acc, val ) => {
     const children = flattenDescendants(val.children || []);
     return R.concat(acc, R.prepend(val, children));
   }, []);
 
-  const isValid = val => !val.unconfirmed || !confirmedHierarchisedChilds.has(val.id);
+  const isValid = val => !val.unconfirmed || R.includes(val.path, R.propOr([], val.id, refinedUnconfirmedPaths));
 
   const refineCodes = R.reduce((acc, hC) => {
-    const { children, unconfirmed = false, ...val } = hC;
-    if (isValid(hC)) {
-      const _children = refineCodes(children || []);
-      confirmedHierarchisedChilds.add(val.id);
-      return R.concat(acc, R.prepend(val, _children));
-    }
-    const flatDescendants = flattenDescendants(children);
+    const _flatDescendants = flattenDescendants(hC.children);
+    const flatDescendants = R.prepend(hC, _flatDescendants);
     const validDescendant = R.find(isValid, flatDescendants);
     if (!validDescendant) {
       return acc;
     }
     const refined = R.pipe(
-      R.prepend(hC),
       R.map(v => {
         confirmedHierarchisedChilds.add(v.id);
-        return R.omit(['unconfirmed', 'children'], v);
+        return R.omit(['unconfirmed', 'children', 'path'], v);
       })
     )(flatDescendants);
     return R.concat(acc, refined);
@@ -83,7 +132,6 @@ export const applyHierarchicalCodesToDim = (hCodes, dim) => {
   )(indexedValues);
 
   let hierarchicalIndexes = {};
-
   return R.pipe(
     R.concat,
     R.addIndex(R.map)((v, ind) => {

package/src/viewer/src/app/use-case-1.js

@@ -5,24 +5,6 @@ import rowData from '../../mocks/row';
 //import stackData from '../../mocks/stack';
 import { series } from '../../../rules/src';
 import data from '../../../rules/test/oecd-HEALTH_PROT.json';
-import { T4_BREAKPOINTS } from '@sis-cc/dotstatsuite-visions';
-
-/*return (
-    <div style={{display: 'flex', flexWrap: 'wrap'}}>
-      {R.map(([key, value]) => (
-        <React.Fragment key={key}>
-          <div style={{width: value - 1, margin: 10}}>
-            <h5>{key}: {value}px</h5>
-            <Viewer {...rowData()} chartOptions={options} type="RowChart" />
-          </div>
-          <div style={{width: value - 1, margin: 10}}>
-            <h5>{key}: {value}px</h5>
-            <Viewer {...stackData()} chartOptions={options} type="StackedBarChart" />
-          </div>
-        </React.Fragment>
-      ), R.toPairs(T4_BREAKPOINTS))}
-    </div>
-  );*/
 
 export default ({ config, style, options }) => {
   const type = 'StackedRowChart';

package/src/viewer/src/app.js

@@ -1,6 +1,4 @@
 import React, { useState } from 'react';
-import { Helmet } from 'react-helmet';
-import { Tab2, Tabs2, Intent, Icon, Tooltip, Position } from '@blueprintjs/core';
 import { ThemeProvider, StyledEngineProvider } from '@mui/material/styles';
 import { createTheme } from '@mui/material/styles';
 import { sisccTheme } from '@sis-cc/dotstatsuite-visions';
@@ -100,10 +98,9 @@ export default () => {
 */
 
   return (
-    <div style={{ padding: 10 }}>
-      {/* <StyledEngineProvider injectFirst>
-        <ThemeProvider theme={theme}> */}
-      <Helmet htmlAttributes={{ dir: isRtl ? 'rtl' : 'ltr' }} />
+    {/* <div style={{ padding: 10 }}>
+      <StyledEngineProvider injectFirst>
+        <ThemeProvider theme={theme}>
       <button onClick={() => setRtl(!isRtl)}>{isRtl ? 'left to right' : 'right to left'}</button>
       <Tabs2 renderActiveTabPanelOnly={false}>
         <Tab2
@@ -112,8 +109,8 @@ export default () => {
           panel={<UseCase1 isRtl={isRtl} config={config} style={style} options={options} />}
         />
       </Tabs2>
-      {/* </ThemeProvider>
-      </StyledEngineProvider> */}
-    </div>
+      </ThemeProvider>
+      </StyledEngineProvider>
+    </div> */}
   );
 };

package/test/applyHierarchicalCodesToDim.test.js

@@ -144,4 +144,17 @@ describe('refineHierarchicalCodelist tests', () => {
     };
     expect(applyHierarchicalCodesToDim(hCodes, partialDim)).to.deep.equal(expected);
   });
+  it('partial test 6', () => {
+    const partialDim = deselectedDim([0, 1, 3, 4, 6]);
+
+    const expected = {
+      id: 'DIM',
+      values: [
+        { id: 'ITEM', parents: [], parent: undefined, isSelected: true, __indexPosition: 0 },
+        { id: 'CHILD_A', parents: [0], parent: 'ITEM', isSelected: true, __indexPosition: 1 },
+        { id: 'CHILD_C', parents: [0], parent: 'ITEM', isSelected: true, __indexPosition: 2 },
+      ]
+    };
+    expect(applyHierarchicalCodesToDim(hCodes, partialDim)).to.deep.equal(expected);
+  });
 });