@sis-cc/dotstatsuite-components 14.4.0 → 15.0.2

package/test/table-prep-duplicate-perf.test.js

@@ -1,21 +1,15 @@
 import { expect } from 'chai';
-import { duplicateObservations } from '../src/rules2/src/duplicateObservations';
+import { values } from 'ramda';
+import { duplicateObs } from '../src/rules2/src/duplicateObservations';
 
-import simpleObservations from './mocks/table-prep-simple-duplicate--observations.json';
-import simpleIndexes from './mocks/table-prep-simple-duplicate--indexes.json';
-import simpleDuplicated from './mocks/table-prep-simple-duplicate--duplicated.json';
-
-import multiObservations from './mocks/table-prep-multi-duplicate--observations.json';
-import multiIndexes from './mocks/table-prep-multi-duplicate--indexes.json';
-import multiDuplicated from './mocks/table-prep-multi-duplicate--duplicated.json';
+import simpleObservations2 from './mocks/table-prep-simple-duplicate--observations2.json';
+import simpleDims2 from './mocks/table-prep-simple-duplicate--dimensions2.json';
+import simpleDuplicated2 from './mocks/table-prep-simple-duplicate--duplicated2.json';
 
 describe('duplicateObservations performance tests', () => {
   it('simple duplication on 2500 observations', function() {
-    this.timeout(3000);
-    expect(duplicateObservations(simpleObservations, simpleIndexes)).to.deep.equal(simpleDuplicated);
-  });
-  it('multi hierarchies duplication on 900 observations', function() {
-    this.timeout(30000);
-    expect(duplicateObservations(multiObservations, multiIndexes)).to.deep.equal(multiDuplicated);
+    this.timeout(150000);
+    const dims = values(simpleDims2);
+    expect(duplicateObs(dims, simpleObservations2)).to.deep.equal(simpleDuplicated2);
   });
 });

package/lib/rules-driver/src/app.js

@@ -1,152 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _extends2 = require('babel-runtime/helpers/extends');
-
-var _extends3 = _interopRequireDefault(_extends2);
-
-var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
-
-var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
-
-var _slicedToArray2 = require('babel-runtime/helpers/slicedToArray');
-
-var _slicedToArray3 = _interopRequireDefault(_slicedToArray2);
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _ramda = require('ramda');
-
-var R = _interopRequireWildcard(_ramda);
-
-var _dotstatsuiteVisions = require('@sis-cc/dotstatsuite-visions');
-
-var _ = require('./');
-
-var _2 = _interopRequireDefault(_);
-
-var _data = require('./mocks/data1.json');
-
-var _data2 = _interopRequireDefault(_data);
-
-var _data3 = require('./mocks/data2.json');
-
-var _data4 = _interopRequireDefault(_data3);
-
-var _3 = require('../../');
-
-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 }; }
-
-var labels = {
-  focus: 'Chart Focus',
-  highlight: 'Highlights',
-  baseline: 'Baseline',
-  select: 'Select',
-  size: 'Chart Size',
-  width: 'Width',
-  height: 'Height',
-  series: 'Chart Series',
-  scatterDimension: 'Scatter Dimension',
-  scatterX: 'Scatter X',
-  scatterY: 'Scatter Y',
-  symbolDimension: 'Symbol Dimension',
-  stackedDimension: 'Stacked Dimension',
-  stackedMode: 'Stacked Mode',
-  stackedModeOptions: {
-    values: 'Values',
-    percent: 'Percent'
-  },
-  axisX: 'Chart X Axis',
-  axisY: 'Chart Y Axis',
-  max: 'Max',
-  min: 'Min',
-  pivot: 'Pivot',
-  step: 'Step',
-  frequency: 'Frequency',
-  freqStep: 'Frequency Step',
-  logo: 'Remove logo',
-  copyright: 'Remove copyright',
-  title: 'Title',
-  subtitle: 'Subtitle',
-  source: 'Source',
-  information: 'Information',
-  reset: 'reset label',
-  uniqFocusOption: 'serie',
-  display: 'Display',
-  displayOptions: {
-    name: 'Name',
-    code: 'Code',
-    both: 'Both'
-  }
-};
-
-var renameKey = R.curry(function (oldKey, newKey, obj) {
-  return R.assoc(newKey, R.prop(oldKey, obj), R.dissoc(oldKey, obj));
-});
-
-var renameProperties = function renameProperties() {
-  var keys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
-  return R.map(R.ifElse(R.pipe(R.prop('id'), R.flip(R.includes)(keys)), renameKey('onChange', 'onSubmit'), R.identity));
-};
-
-var propertiesKeys = ['width', 'height', 'freqStep', 'maxX', 'minX', 'pivotX', 'stepX', 'maxY', 'minY', 'pivotY', 'stepY', 'title', 'subtitle', 'source'];
-
-var App = function App() {
-  var _useState = (0, _react.useState)(true),
-      _useState2 = (0, _slicedToArray3.default)(_useState, 2),
-      toggle = _useState2[0],
-      setToggle = _useState2[1];
-
-  var dataflow = { id: "DF_KEI_21760", name: "Harmonised Unemployment Rate" };
-  var display = 'label';
-  var type = 'BarChart';
-  var props = { dataflow: dataflow, display: display, type: type };
-
-  return _react2.default.createElement(
-    'div',
-    null,
-    _react2.default.createElement(
-      'button',
-      { onClick: function onClick() {
-          return setToggle(function (prev) {
-            return !prev;
-          });
-        }, style: { marginBottom: '10px' } },
-      'Toggle Selection'
-    ),
-    _react2.default.createElement(_2.default, (0, _extends3.default)({
-      data: toggle ? _data2.default : _data4.default
-    }, props, {
-      display: display,
-      type: type,
-      render: function render(_ref) {
-        var properties = _ref.properties,
-            parsedProps = (0, _objectWithoutProperties3.default)(_ref, ['properties']);
-
-        return _react2.default.createElement(
-          'div',
-          null,
-          _react2.default.createElement(_dotstatsuiteVisions.ChartsConfig, {
-            properties: R.pipe(renameProperties(propertiesKeys))(properties),
-            labels: labels
-          }),
-          _react2.default.createElement(_3.Viewer, (0, _extends3.default)({}, parsedProps, {
-            chartData: R.pick(['series', 'frequency'])(parsedProps.chartData),
-            properties: R.tap(console.log)(R.over(R.lensProp('baseline'), R.omit(['onChange']), properties)),
-            type: 'BarChart',
-            locale: 'en'
-          }))
-        );
-      }
-    }))
-  );
-};
-
-exports.default = App;

package/lib/rules-driver/src/index.js

@@ -1,97 +0,0 @@
-'use strict';
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-
-var _getPrototypeOf = require('babel-runtime/core-js/object/get-prototype-of');
-
-var _getPrototypeOf2 = _interopRequireDefault(_getPrototypeOf);
-
-var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
-
-var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
-
-var _possibleConstructorReturn2 = require('babel-runtime/helpers/possibleConstructorReturn');
-
-var _possibleConstructorReturn3 = _interopRequireDefault(_possibleConstructorReturn2);
-
-var _inherits2 = require('babel-runtime/helpers/inherits');
-
-var _inherits3 = _interopRequireDefault(_inherits2);
-
-var _class, _temp, _initialiseProps;
-
-var _react = require('react');
-
-var _react2 = _interopRequireDefault(_react);
-
-var _propTypes = require('prop-types');
-
-var _propTypes2 = _interopRequireDefault(_propTypes);
-
-var _src = require('../../rules/src');
-
-var _getHeaderProps = require('../../rules/src/properties/getHeaderProps');
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-var RulesDriver = (_temp = _class = function (_Component) {
-  (0, _inherits3.default)(RulesDriver, _Component);
-
-  function RulesDriver(props) {
-    (0, _classCallCheck3.default)(this, RulesDriver);
-
-    var _this = (0, _possibleConstructorReturn3.default)(this, (RulesDriver.__proto__ || (0, _getPrototypeOf2.default)(RulesDriver)).call(this, props));
-
-    _initialiseProps.call(_this);
-
-    _this.state = _src.initialState;
-    return _this;
-  }
-
-  return RulesDriver;
-}(_react.Component), _initialiseProps = function _initialiseProps() {
-  var _this2 = this;
-
-  this.componentWillPrepare = function (props, state) {
-    _this2.setState((0, _src.stateFromNewProps)(props, state));
-  };
-
-  this.componentWillMount = function () {
-    _this2.componentWillPrepare(_this2.props, _this2.state);
-  };
-
-  this.componentWillReceiveProps = function (props) {
-    _this2.componentWillPrepare(props, _this2.state);
-  };
-
-  this.onChange = function (newState) {
-    _this2.setState(newState);
-  };
-
-  this.render = function () {
-    return _this2.props.render({
-      chartData: (0, _src.toChartData)(_this2.props, _this2.state),
-      chartOptions: (0, _src.toChartOptions)(_this2.props, _this2.state),
-      errors: (0, _src.getErrors)(_this2.props, _this2.state),
-      headerProps: (0, _getHeaderProps.getHeaderProps)(_this2.props, _this2.state),
-      footerProps: (0, _getHeaderProps.getFooterProps)(_this2.props, _this2.state),
-      isNonIdealState: (0, _src.isNonIdealState)(_this2.props.data, _this2.props.type),
-      onChange: (0, _src.onChangeProperties)(_this2.props, _this2.state, _this2.onChange),
-      properties: (0, _src.toProperties)(_this2.props, _this2.state, _this2.onChange)
-    });
-  };
-}, _temp);
-;
-
-RulesDriver.propTypes = {
-  data: _propTypes2.default.object,
-  dataflow: _propTypes2.default.object,
-  display: _propTypes2.default.string,
-  formaterIds: _propTypes2.default.object,
-  options: _propTypes2.default.object,
-  type: _propTypes2.default.string.isRequired
-};
-
-exports.default = RulesDriver;

package/src/rules-driver/README.md

@@ -1,131 +0,0 @@
-# rules-driver
-
-A component that take business logic regarding sdmx from 'rules' library, and exposes
-it into props for view components.
-(For now only charts from `charts` are supported).
-
-## usage
-
-```javascript
-import { RulesDriver } from '@sis-cc/dotstatsuite-components';
-
-<RulesDriver
-  data={data}
-  dataflowCode={dataflowCode}
-  display={display}
-  options={options}
-  type={type}
-  render={
-    ({ chartData, chartOptions, onChange, properties }) => (
-      <MyViewer
-        chartData={chartData}
-        chartOptions={chartOptions}
-        onChange={onChange}
-        properties={properties}
-        type={type}
-      />
-    )
-  }
-/>
-```
-
-## props
-
-### data
-`[Object]`
-sdmx json data
-
-### dataflowCode
-`[String]`
-Sdmx code of the dataflow (not defined in sdmx data), used for `code` and `both` displays
-of the default title.
-
-### display
-`[String]`
-Way to display sdmx dimension and atribute values in Chart series and configs views, one of
-- `label`
-- `code`
-- `both`
-
-### options
-`[Object]`
-Chart engine default options. See `rcw-charts` props definition.
-
-### type
-`[String]`
-Chart type, one of:
-- `BarChart`
-- `RowChart`
-- `ScatterChart`
-- `TimelineChart`
-- `HorizontalSymbolChart`
-- `VerticalSymbolChart`
-- `StackedBarChart`
-
-## render props
-
-### chartData
-`[Object]`
-Chart derivated data. See `charts` data prop definition.
-
-### chartOptions
-`[Object]`
-Chart engine derivated options.
-
-### properties
-`[Object]`
-All property props required in order to render configs views allowing to
-configure the current chart data and options.
-
-```javascript
-{
-  baseline: Object,
-  highlight: Object,
-  width: Object,
-  height: Object,
-  title: Object,
-  subtitle: Object,
-  freqStep: Object,
-  scatterDimension: Object,
-  scatterX: Object,
-  scatterY: Object,
-  symbolDimension: Object,
-  stackedDimension: Object,
-  stackedMode: Object*,
-  maxX: Object,
-  maxY: Object,
-  minX: Object,
-  minY: Object,
-  pivotX: Object,
-  pivotY: Object,
-  stepX: Object,
-  stepY: Object,
-}
-```
-Each of these properties follows the same definition:
-
-```javascript
-property: {
-  id: String, // id of the property
-  isActive: Boolean, // if the property is Active, regarding the chart type
-  onChange: Function, // setter function in order to change the current value of the property
-  options: // The complete set of acceptable alternative value if relevant,
-    [{ label: String, value: String }] // for baseline, highlight, scatterDimension, scatterX, scatterY, symbolDimension, stackedDimension
-    || undefined, // for width, height, title, subtitle, freqStep, maxX, maxY, minX, minY, pivotX, pivotY, stepX, stepY
-  value: // the current value of the property
-    String
-    || { label: String, value: String } // for scatterDimension, scatterX, scatterY, symbolDimension, stackedDimension
-    || [{ label: String, value: String }] // for baseline, highlight
-}
-```
-
-`*` For `stackedMode` the property is not derivated from sdmx data, so options are fixed and always `[{ value: 'values' }, { value: 'percent' }]`,
-without labels, as for value `{ value: 'values' || 'percent' }`, `values` being the default one.
-
-### onChange
-`[Function]`
-Alternative to individual `properties` `onChange` setters. Can be used
-to submit several `properties` at once. Useful for a submit form.
-```javascript
-onChange({ width: 500, height: 500, minY: 0, maxY: 5000, stepY: 500 });
-```

package/src/rules-driver/src/app.js

@@ -1,123 +0,0 @@
-import React, { useState } from 'react';
-import * as R from 'ramda';
-import { ChartsConfig } from '@sis-cc/dotstatsuite-visions'; 
-import RulesDriver from './';
-import data1 from './mocks/data1.json';
-import data2 from './mocks/data2.json';
-import { Viewer } from '../../';
-
-const labels = {
-  focus: 'Chart Focus',
-  highlight: 'Highlights',
-  baseline: 'Baseline',
-  select: 'Select',
-  size: 'Chart Size',
-  width: 'Width',
-  height: 'Height',
-  series: 'Chart Series',
-  scatterDimension: 'Scatter Dimension',
-  scatterX: 'Scatter X',
-  scatterY: 'Scatter Y',
-  symbolDimension: 'Symbol Dimension',
-  stackedDimension: 'Stacked Dimension',
-  stackedMode: 'Stacked Mode',
-  stackedModeOptions: {
-    values: 'Values',
-    percent: 'Percent',
-  },
-  axisX: 'Chart X Axis',
-  axisY: 'Chart Y Axis',
-  max: 'Max',
-  min: 'Min',
-  pivot: 'Pivot',
-  step: 'Step',
-  frequency: 'Frequency',
-  freqStep: 'Frequency Step',
-  logo: 'Remove logo',
-  copyright: 'Remove copyright',
-  title: 'Title',
-  subtitle: 'Subtitle',
-  source: 'Source',
-  information: 'Information',
-  reset: 'reset label',
-  uniqFocusOption: 'serie',
-  display: 'Display',
-  displayOptions: {
-    name: 'Name',
-    code: 'Code',
-    both: 'Both'
-  }
-};
-
-const renameKey = R.curry((oldKey, newKey, obj) =>
-  R.assoc(newKey, R.prop(oldKey, obj), R.dissoc(oldKey, obj)),
-);
-
-const renameProperties = (keys = []) =>
-  R.map(
-    R.ifElse(
-      R.pipe(R.prop('id'), R.flip(R.includes)(keys)),
-      renameKey('onChange', 'onSubmit'),
-      R.identity,
-    ),
-  );
-
-const propertiesKeys = [
-  'width',
-  'height',
-  'freqStep',
-  'maxX',
-  'minX',
-  'pivotX',
-  'stepX',
-  'maxY',
-  'minY',
-  'pivotY',
-  'stepY',
-  'title',
-  'subtitle',
-  'source',
-];
-  
-const App = () => {
-  const [toggle, setToggle] = useState(true);
-  const dataflow = { id: "DF_KEI_21760", name: "Harmonised Unemployment Rate" };
-  const display = 'label';
-  const type = 'BarChart';
-  const props = { dataflow, display, type }
-
-  return (
-    <div>
-      <button onClick={() => setToggle(prev => !prev)} style={{ marginBottom: '10px' }}>Toggle Selection</button>
-      <RulesDriver
-        data={toggle ? data1 : data2}
-        {...props}
-        display={display}
-        type={type}
-        render={
-          ({ properties, ...parsedProps }) => {
-            return (
-              <div>
-                <ChartsConfig
-                  properties={R.pipe(
-                    renameProperties(propertiesKeys),
-                  )(properties)}
-                  labels={labels}
-                />
-                <Viewer
-                  {...parsedProps}
-                  chartData={R.pick(['series', 'frequency'])(parsedProps.chartData)}
-                  properties={R.tap(console.log)(R.over(R.lensProp('baseline'), R.omit(['onChange']), properties))}
-                  type='BarChart'
-                  locale='en'
-                />
-              </div>
-            );
-          }
-        }
-      />
-    </div>
-  )
-}
-
-export default App;

package/src/rules-driver/src/index.js

@@ -1,60 +0,0 @@
-import React, { Component } from 'react';
-import PropTypes from 'prop-types';
-import {
-  getErrors,
-  initialState,
-  isNonIdealState,
-  stateFromNewProps,
-  onChangeProperties,
-  toProperties,
-  toChartData,
-  toChartOptions,
-} from '../../rules/src';
-import { getHeaderProps, getFooterProps } from '../../rules/src/properties/getHeaderProps';
-
-class RulesDriver extends Component {
-  constructor(props) {
-    super(props);
-    this.state = initialState;
-  };
-
-  componentWillPrepare = (props, state) => {
-    this.setState(stateFromNewProps(props, state));
-  };
-
-  componentWillMount = () => {
-    this.componentWillPrepare(this.props, this.state);
-  };
-
-  componentWillReceiveProps = (props) => {
-    this.componentWillPrepare(props, this.state);
-  };
-
-  onChange = (newState) => {
-    this.setState(newState);
-  }
-
-  render = () => {
-    return this.props.render({
-      chartData: toChartData(this.props, this.state),
-      chartOptions: toChartOptions(this.props, this.state),
-      errors: getErrors(this.props, this.state),
-      headerProps: getHeaderProps(this.props, this.state),
-      footerProps: getFooterProps(this.props, this.state),
-      isNonIdealState: isNonIdealState(this.props.data, this.props.type),
-      onChange: onChangeProperties(this.props, this.state, this.onChange),
-      properties: toProperties(this.props, this.state, this.onChange),
-    }); 
-  }; 
-};
-
-RulesDriver.propTypes = {
-  data: PropTypes.object,
-  dataflow: PropTypes.object,
-  display: PropTypes.string,
-  formaterIds: PropTypes.object,
-  options: PropTypes.object,
-  type: PropTypes.string.isRequired,
-};
-
-export default RulesDriver;