@sis-cc/dotstatsuite-components 17.4.0 → 17.6.0

package/lib/rules/src/v8-transformer.js

@@ -80,7 +80,6 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
         end = reported.end;
         var reportTimeNote = (0, _date.getReportedTimePeriodNote)(reportYearStart, start, end, options.frequency, options.isRtl);
         notes = R.isNil(reportTimeNote) ? notes : R.append(reportTimeNote, notes);
-        //__indexPosition = dateFns.getTime(new Date(R.prop('start', value)));
       }
       if (isNaN(__indexPosition)) {
         __indexPosition = (0, _dotstatsuiteSdmxjs.getCodeOrder)({ annotations: valueAnnotations });
@@ -95,7 +94,7 @@ var dataTransformer = exports.dataTransformer = function dataTransformer(dataNew
         __indexPosition: __indexPosition,
         __index: __index
       });
-      return isTimeDimension ? (0, _refineTimePeriod.refineTimePeriod)(res, { locale: locale }) : res;
+      return isTimeDimension ? (0, _refineTimePeriod.refineTimePeriod)(res, { locale: locale, monthlyFormat: timeFormat }) : res;
     }), R.ifElse(R.always(isTimeDimension), R.pipe(R.sortWith([R.ascend(function (val) {
       return _dateFns2.default.getTime(new Date(R.prop('start', val)));
     }), R.descend(function (val) {

package/lib/rules2/src/combinedValuesDisplay.js

@@ -0,0 +1,68 @@
+'use strict';
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.combinedValuesDisplay = exports.singleValueDisplay = undefined;
+
+var _ramda = require('ramda');
+
+var R = _interopRequireWildcard(_ramda);
+
+var _src = require('../../rules/src');
+
+var _constants = require('./constants');
+
+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; } }
+
+var getRefinedMissinParentsLabels = R.pipe(R.propOr([], 'missingParents'), R.reduce(function (acc, par) {
+  if (!R.propOr(true, 'display', par) || R.includes(par.id, _constants.REJECTED_VALUE_IDS)) {
+    return acc;
+  }
+  return R.append((0, _src.dimensionValueDisplay)('label')(par), acc);
+}, []));
+
+var singleValueDisplay = exports.singleValueDisplay = function singleValueDisplay(display, value) {
+  if (display === 'label') {
+    return R.converge(function (missingParents, label) {
+      return R.isEmpty(missingParents) ? label : R.join(' > ', R.append(label, missingParents));
+    }, [getRefinedMissinParentsLabels, (0, _src.dimensionValueDisplay)(display)])(value);
+  } else if (display === 'both') {
+    return '(' + singleValueDisplay('code', value) + ') ' + singleValueDisplay('label', value);
+  }
+  return (0, _src.dimensionValueDisplay)(display)(value);
+};
+
+var _combinedValuesDisplay = function _combinedValuesDisplay(_display) {
+  return function (values) {
+    return R.pipe(R.reduce(function (acc, val) {
+      if ((!R.propOr(true, 'display', val) || R.includes(val.id, _constants.REJECTED_VALUE_IDS)) && _display === 'label') {
+        return acc;
+      }
+      return R.append(singleValueDisplay(_display, val), acc);
+    }, []), function (labels) {
+      if (!R.isEmpty(labels) || _display !== 'label') {
+        return R.join(', ', labels);
+      }
+      var totalValue = R.find(R.propEq('id', '_T'), values);
+      if (!R.isNil(totalValue)) {
+        return (0, _src.dimensionValueDisplay)('label')(totalValue);
+      }
+      if (R.isEmpty(values)) {
+        return '';
+      }
+      var firstValue = R.head(values);
+      return (0, _src.dimensionValueDisplay)('label')(firstValue);
+    })(values);
+  };
+};
+
+var combinedValuesDisplay = exports.combinedValuesDisplay = function combinedValuesDisplay(display, values) {
+  if (display === 'both') {
+    return R.converge(function (_ids, labels) {
+      var ids = R.isEmpty(_ids) ? _ids : '(' + _ids + ')';
+      return R.isEmpty(ids) ? labels : ids + ' ' + labels;
+    }, [_combinedValuesDisplay('code'), _combinedValuesDisplay('label')])(values);
+  }
+  return _combinedValuesDisplay(display)(values);
+};

package/lib/rules2/src/getHeaderCombinations.js

@@ -11,6 +11,8 @@ var R = _interopRequireWildcard(_ramda);
 
 var _src = require('../../rules/src');
 
+var _combinedValuesDisplay = require('./combinedValuesDisplay');
+
 var _constants = require('./constants');
 
 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; } }
@@ -25,30 +27,21 @@ var getHeaderCombinations = exports.getHeaderCombinations = function getHeaderCo
 
     var header = (0, _src.dimensionValueDisplay)(display)(comb) + ':';
 
-    var combinedDisplay = function combinedDisplay(_display, values) {
-      if (_display === 'label') {
-        return R.pipe(R.filter(function (val) {
-          return R.propOr(true, 'display', val) && !R.includes(val.id, _constants.REJECTED_VALUE_IDS);
-        }), R.map((0, _src.dimensionValueDisplay)(_display)), R.join(', '))(values);
-      }
-      return R.pipe(R.map((0, _src.dimensionValueDisplay)(_display)), R.join(', '))(values);
-    };
-
     var label = R.pipe(R.reduce(function (_acc, concept) {
       var artefact = R.has(concept, indexedDimensions) ? R.prop(concept, indexedDimensions) : R.prop(concept, indexedAttributes);
-      if (R.isNil(artefact) || !R.propOr(true, 'display', artefact || {})) {
+      if (R.isNil(artefact)) {
         return _acc;
       }
       var value = R.path(['values', 0], artefact);
       if (R.isNil(value)) {
         return _acc;
       }
+      if (R.has(concept, indexedAttributes) && (!R.propOr(true, 'display', value) || !R.propOr(true, 'artefact', value) || R.includes(value.id, _constants.REJECTED_VALUE_IDS))) {
+        return _acc;
+      }
       return R.append(value, _acc);
     }, []), function (values) {
-      if (display === 'both') {
-        return '(' + combinedDisplay('code', values) + ') ' + combinedDisplay('label', values);
-      }
-      return combinedDisplay(display, values);
+      return (0, _combinedValuesDisplay.combinedValuesDisplay)(display, values);
     })(comb.concepts || []);
     if (R.isEmpty(label)) {
       return acc;

package/lib/rules2/src/refineTimePeriod.js

@@ -61,7 +61,7 @@ var getFormat = function getFormat(freqDisplay) {
   if (freqDisplay === 'S') {
     return 'HH:mm:ss';
   }
-  return 'MMM';
+  return 'YYYY-MMM';
 };
 
 var getEndDate = function getEndDate(start, mult, duration) {
@@ -75,26 +75,32 @@ var getEndDate = function getEndDate(start, mult, duration) {
   return dateFns.subSeconds(endDate, 1);
 };
 
-var computeName = function computeName(start, end, freqDisplay, locale) {
+var computeName = function computeName(start, end, freqDisplay, locale, format) {
   var opts = { locale: (0, _date.getLocale)(locale) };
   var isSameDay = dateFns.isSameDay(start, end);
   var isSameYear = dateFns.isSameYear(start, end);
   if (freqDisplay === 'H' || freqDisplay === 'm' || freqDisplay === 'S') {
     var dayFormat = getFormat('D');
-    var timeFormat = getFormat(freqDisplay);
-    if (isSameDay) return dateFns.format(start, dayFormat, opts) + ' ' + dateFns.format(start, timeFormat, opts) + ' - ' + dateFns.format(end, timeFormat, opts);
-    return dateFns.format(start, dayFormat + ' ' + timeFormat, opts) + ' - ' + dateFns.format(end, dayFormat + ' ' + timeFormat, opts);
+    if (isSameDay) return dateFns.format(start, dayFormat, opts) + ' ' + dateFns.format(start, format, opts) + ' - ' + dateFns.format(end, format, opts);
+    return dateFns.format(start, dayFormat + ' ' + format, opts) + ' - ' + dateFns.format(end, dayFormat + ' ' + format, opts);
   }
-  if (freqDisplay === 'D' || freqDisplay === 'Y') {
-    var _format = getFormat(freqDisplay);
-    return dateFns.format(start, _format, opts) + ' - ' + dateFns.format(end, _format, opts);
+  if (freqDisplay !== 'M') {
+    return dateFns.format(start, format, opts) + ' - ' + dateFns.format(end, format, opts);
   }
-  var yearFormat = getFormat('Y');
-  var monthFormat = getFormat('M');
-  if (isSameYear && locale === 'fr') {
-    return dateFns.format(start, monthFormat, opts) + ' - ' + dateFns.format(end, monthFormat, opts) + ' ' + dateFns.format(start, yearFormat, opts);
+
+  if (isSameYear && !R.includes('-', format)) {
+    var yearFormatMatch = R.match(/([Y]+)/, format);
+    var monthFormatMatch = R.match(/([M]+|Mo)/, format);
+    var yearFormat = R.length(yearFormatMatch) >= 2 ? R.nth(1, yearFormatMatch) : null;
+    var monthFormat = R.length(monthFormatMatch) >= 2 ? R.nth(1, monthFormatMatch) : null;
+    var formattedYear = yearFormat ? dateFns.format(start, yearFormat, opts) : null;
+    var formattedMonths = monthFormat ? dateFns.format(start, monthFormat, opts) + ' - ' + dateFns.format(end, monthFormat, opts) : null;
+    if (monthFormat) {
+      return R.pipe(function (format) {
+        return yearFormat ? R.replace(yearFormat, formattedYear, format) : format;
+      }, R.replace(monthFormat, formattedMonths))(format);
+    }
   }
-  var format = locale === 'fr' ? monthFormat + ' ' + yearFormat : yearFormat + '-' + monthFormat;
   return dateFns.format(start, format, opts) + ' - ' + dateFns.format(end, format, opts);
 };
 
@@ -107,7 +113,9 @@ var getStartDate = exports.getStartDate = function getStartDate(start) {
 };
 
 var refineTimePeriod = exports.refineTimePeriod = function refineTimePeriod(timePeriod, _ref) {
-  var locale = _ref.locale;
+  var locale = _ref.locale,
+      _ref$monthlyFormat = _ref.monthlyFormat,
+      monthlyFormat = _ref$monthlyFormat === undefined ? 'YYYY-MMM' : _ref$monthlyFormat;
   var id = timePeriod.id;
 
   var split = R.split('/', id);
@@ -136,7 +144,8 @@ var refineTimePeriod = exports.refineTimePeriod = function refineTimePeriod(time
   var duration = !R.isEmpty(timeIndicator) && _duration === 'M' ? 'm' : _duration;
   var endDate = getEndDate(startDate, mult, duration);
   var freqDisplay = computeDisplayFreq(start, duration);
-  var name = computeName((0, _date.dateWithoutTZ)(startDate), (0, _date.dateWithoutTZ)(endDate), freqDisplay, locale);
+  var format = freqDisplay === 'M' ? monthlyFormat : getFormat(freqDisplay);
+  var name = computeName((0, _date.dateWithoutTZ)(startDate), (0, _date.dateWithoutTZ)(endDate), freqDisplay, locale, format);
   return (0, _extends3.default)({}, timePeriod, {
     id: id,
     name: name,

package/lib/rules2/src/table/getTableLabelAccessor.js

@@ -9,49 +9,12 @@ var _ramda = require('ramda');
 
 var R = _interopRequireWildcard(_ramda);
 
-var _src = require('../../../rules/src');
-
-var _constants = require('../constants');
+var _combinedValuesDisplay = require('../combinedValuesDisplay');
 
 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; } }
 
-var getRefinedMissinParentsLabels = R.pipe(R.propOr([], 'missingParents'), R.reduce(function (acc, par) {
-  if (!R.propOr(true, 'display', par) || R.includes(par.id, _constants.REJECTED_VALUE_IDS)) {
-    return acc;
-  }
-  return R.append((0, _src.dimensionValueDisplay)('label')(par), acc);
-}, []));
-
-var granularDisplay = function granularDisplay(display, value) {
-  if (display === 'label') {
-    return R.converge(function (missingParents, label) {
-      return R.isEmpty(missingParents) ? label : R.join(' > ', R.append(label, missingParents));
-    }, [getRefinedMissinParentsLabels, (0, _src.dimensionValueDisplay)(display)])(value);
-  } else if (display === 'both') {
-    return '(' + granularDisplay('code', value) + ') ' + granularDisplay('label', value);
-  }
-  return (0, _src.dimensionValueDisplay)(display)(value);
-};
-
-var combinedDisplay = function combinedDisplay(_display) {
-  return R.pipe(R.reduce(function (acc, val) {
-    if ((!R.propOr(true, 'display', val) || R.includes(val.id, _constants.REJECTED_VALUE_IDS)) && _display === 'label') {
-      return acc;
-    }
-    return R.append(granularDisplay(_display, val), acc);
-  }, []), R.join(', '));
-};
-
 var getTableLabelAccessor = exports.getTableLabelAccessor = function getTableLabelAccessor(display) {
-  return function (item) {
-    if (!R.is(Array, item)) {
-      return granularDisplay(display, item);
-    }
-    if (display === 'both') {
-      return R.converge(function (ids, labels) {
-        return '(' + ids + ') ' + labels;
-      }, [combinedDisplay('code'), combinedDisplay('label')])(item);
-    }
-    return combinedDisplay(display)(item);
+  return function (content) {
+    return R.is(Array, content) ? (0, _combinedValuesDisplay.combinedValuesDisplay)(display, content) : (0, _combinedValuesDisplay.singleValueDisplay)(display, content);
   };
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@sis-cc/dotstatsuite-components",
   "description": "Set components based on React.",
-  "version": "17.4.0",
+  "version": "17.6.0",
   "main": "lib/index.js",
   "author": "OECD",
   "license": "MIT",

package/src/rules/src/v8-transformer.js

@@ -56,7 +56,6 @@ export const dataTransformer = (dataNew, options = {}) => {
           end = reported.end;
           const reportTimeNote = getReportedTimePeriodNote(reportYearStart, start, end, options.frequency, options.isRtl);
           notes = R.isNil(reportTimeNote) ? notes : R.append(reportTimeNote, notes);
-          //__indexPosition = dateFns.getTime(new Date(R.prop('start', value)));
         }
         if (isNaN(__indexPosition)) {
           __indexPosition = getCodeOrder({ annotations: valueAnnotations });
@@ -78,7 +77,7 @@ export const dataTransformer = (dataNew, options = {}) => {
           __indexPosition,
           __index,
         });
-        return isTimeDimension ? refineTimePeriod(res, { locale }) : res;
+        return isTimeDimension ? refineTimePeriod(res, { locale, monthlyFormat: timeFormat }) : res;
       }),
       R.ifElse(
         R.always(isTimeDimension),

package/src/rules2/src/combinedValuesDisplay.js

@@ -0,0 +1,66 @@
+import * as R from 'ramda';
+import { dimensionValueDisplay } from '../../rules/src';
+import { REJECTED_VALUE_IDS } from './constants';
+
+const getRefinedMissinParentsLabels = R.pipe(
+  R.propOr([], 'missingParents'),
+  R.reduce((acc, par) => {
+    if (!R.propOr(true, 'display', par) || R.includes(par.id, REJECTED_VALUE_IDS)) {
+      return acc;
+    }
+    return R.append(dimensionValueDisplay('label')(par), acc);
+  }, []),
+);
+
+export const singleValueDisplay = (display, value) => {
+    if (display === 'label') {
+      return R.converge(
+        (missingParents, label) =>
+          R.isEmpty(missingParents) ? label : R.join(' > ', R.append(label, missingParents)),
+        [
+          getRefinedMissinParentsLabels,
+          dimensionValueDisplay(display),
+        ],
+      )(value);
+    } else if (display === 'both') {
+      return `(${singleValueDisplay('code', value)}) ${singleValueDisplay('label', value)}`;
+    }
+    return dimensionValueDisplay(display)(value);
+  };
+
+const _combinedValuesDisplay = _display => values => R.pipe(
+  R.reduce((acc, val) => {
+    if ((!R.propOr(true, 'display', val) || R.includes(val.id, REJECTED_VALUE_IDS))
+      && _display === 'label') {
+      return acc;
+    }
+    return R.append(singleValueDisplay(_display, val), acc);
+  }, []),
+  labels => {
+    if (!R.isEmpty(labels) || _display !== 'label') {
+      return R.join(', ', labels);
+    }
+    const totalValue = R.find(R.propEq('id', '_T'), values);
+    if (!R.isNil(totalValue)) {
+      return dimensionValueDisplay('label')(totalValue);
+    }
+    if (R.isEmpty(values)) {
+      return '';
+    }
+    const firstValue = R.head(values);
+    return dimensionValueDisplay('label')(firstValue);
+  },
+)(values);
+
+export const combinedValuesDisplay = (display, values) => {
+  if (display === 'both') {
+    return R.converge((_ids, labels) => {
+        const ids = R.isEmpty(_ids) ? _ids : `(${_ids})`;
+        return R.isEmpty(ids) ? labels : `${ids} ${labels}`;
+      }, [
+      _combinedValuesDisplay('code'),
+      _combinedValuesDisplay('label'),
+    ])(values);
+  }
+  return _combinedValuesDisplay(display)(values);
+};

package/src/rules2/src/getHeaderCombinations.js

@@ -1,5 +1,6 @@
 import * as R from 'ramda';
 import { dimensionValueDisplay } from '../../rules/src';
+import { combinedValuesDisplay } from './combinedValuesDisplay';
 import { REJECTED_VALUE_IDS } from './constants';
 
 export const getHeaderCombinations = (combinations, dimensions, attributes, display) => {
@@ -13,40 +14,28 @@ export const getHeaderCombinations = (combinations, dimensions, attributes, disp
 
       const header = `${dimensionValueDisplay(display)(comb)}:`;
 
-      const combinedDisplay = (_display, values) => {
-        if (_display === 'label') {
-          return R.pipe(
-            R.filter(val => R.propOr(true, 'display', val) && !R.includes(val.id, REJECTED_VALUE_IDS)),
-            R.map(dimensionValueDisplay(_display)),
-            R.join(', ')
-          )(values);
-        }
-        return R.pipe(R.map(dimensionValueDisplay(_display)), R.join(', '))(values);
-      };
-
       const label = R.pipe(
         R.reduce(
           (_acc, concept) => {
             const artefact = R.has(concept, indexedDimensions)
               ? R.prop(concept, indexedDimensions)
               : R.prop(concept, indexedAttributes);
-            if (R.isNil(artefact) || !R.propOr(true, 'display', artefact || {})) {
+            if (R.isNil(artefact)) {
               return _acc;
             }
             const value = R.path(['values', 0], artefact);
             if (R.isNil(value)) {
               return _acc;
             }
+            if (R.has(concept, indexedAttributes) && (!R.propOr(true, 'display', value)
+              || !R.propOr(true, 'artefact', value) || R.includes(value.id, REJECTED_VALUE_IDS))) {
+              return _acc;
+            }
             return R.append(value, _acc);
           },
           []
         ),
-        values => {
-          if (display === 'both') {
-            return `(${combinedDisplay('code', values)}) ${combinedDisplay('label', values)}`
-          }
-          return combinedDisplay(display, values);
-        }
+        values => combinedValuesDisplay(display, values)
       )(comb.concepts || []);
       if (R.isEmpty(label)) {
         return acc;

package/src/rules2/src/refineTimePeriod.js

@@ -47,7 +47,7 @@ const getFormat = (freqDisplay) => {
   if (freqDisplay === 'S') {
     return 'HH:mm:ss';
   }
-  return 'MMM';
+  return 'YYYY-MMM';
 }
 
 const getEndDate = (start, mult, duration) => {
@@ -61,27 +61,34 @@ const getEndDate = (start, mult, duration) => {
   return dateFns.subSeconds(endDate, 1);
 };
 
-const computeName = (start, end, freqDisplay, locale) => {
+const computeName = (start, end, freqDisplay, locale, format) => {
   const opts = { locale: getLocale(locale) };
   const isSameDay = dateFns.isSameDay(start, end);
   const isSameYear = dateFns.isSameYear(start, end);
   if (freqDisplay === 'H' || freqDisplay === 'm' || freqDisplay === 'S') {
     const dayFormat = getFormat('D');
-    const timeFormat = getFormat(freqDisplay);
     if (isSameDay)
-      return `${dateFns.format(start, dayFormat, opts)} ${dateFns.format(start, timeFormat, opts)} - ${dateFns.format(end, timeFormat, opts)}`;
-    return `${dateFns.format(start, `${dayFormat} ${timeFormat}`, opts)} - ${dateFns.format(end, `${dayFormat} ${timeFormat}`, opts)}`;
+      return `${dateFns.format(start, dayFormat, opts)} ${dateFns.format(start, format, opts)} - ${dateFns.format(end, format, opts)}`;
+    return `${dateFns.format(start, `${dayFormat} ${format}`, opts)} - ${dateFns.format(end, `${dayFormat} ${format}`, opts)}`;
   }
-  if (freqDisplay === 'D' || freqDisplay === 'Y') {
-    const format = getFormat(freqDisplay);
+  if (freqDisplay !== 'M') {
     return `${dateFns.format(start, format, opts)} - ${dateFns.format(end, format, opts)}`;
   }
-  const yearFormat = getFormat('Y');
-  const monthFormat = getFormat('M');
-  if (isSameYear && locale === 'fr') {
-    return `${dateFns.format(start, monthFormat, opts)} - ${dateFns.format(end, monthFormat, opts)} ${dateFns.format(start, yearFormat, opts)}`;
+
+  if (isSameYear && !R.includes('-', format)) {
+    const yearFormatMatch = R.match(/([Y]+)/, format);
+    const monthFormatMatch = R.match(/([M]+|Mo)/, format);
+    const yearFormat = R.length(yearFormatMatch) >= 2 ? R.nth(1, yearFormatMatch) : null;
+    const monthFormat = R.length(monthFormatMatch) >= 2 ? R.nth(1, monthFormatMatch) : null;
+    const formattedYear = yearFormat ? dateFns.format(start, yearFormat, opts) : null;
+    const formattedMonths = monthFormat ? `${dateFns.format(start, monthFormat, opts)} - ${dateFns.format(end, monthFormat, opts)}` : null;
+    if (monthFormat) {
+      return R.pipe(
+        format => yearFormat ? R.replace(yearFormat, formattedYear, format) : format,
+        R.replace(monthFormat, formattedMonths)
+      )(format);
+    }
   }
-  const format = locale === 'fr' ? `${monthFormat} ${yearFormat}` : `${yearFormat}-${monthFormat}`;
   return `${dateFns.format(start, format, opts)} - ${dateFns.format(end, format, opts)}`;
 };
 
@@ -93,7 +100,7 @@ export const getStartDate = (start) => {
   return dateFns.addMinutes(date, -date.getTimezoneOffset());
 };
 
-export const refineTimePeriod = (timePeriod, { locale }) => {
+export const refineTimePeriod = (timePeriod, { locale, monthlyFormat='YYYY-MMM' }) => {
   const { id } = timePeriod;
   const split = R.split('/', id);
   if (R.length(split) !== 2) {
@@ -111,7 +118,8 @@ export const refineTimePeriod = (timePeriod, { locale }) => {
   const duration = !R.isEmpty(timeIndicator) && _duration === 'M' ? 'm' : _duration;
   const endDate = getEndDate(startDate, mult, duration);
   const freqDisplay = computeDisplayFreq(start, duration);
-  const name = computeName(dateWithoutTZ(startDate), dateWithoutTZ(endDate), freqDisplay, locale);
+  const format = freqDisplay === 'M' ? monthlyFormat : getFormat(freqDisplay);
+  const name = computeName(dateWithoutTZ(startDate), dateWithoutTZ(endDate), freqDisplay, locale, format);
   return ({
     ...timePeriod,
     id,

package/src/rules2/src/table/getTableLabelAccessor.js

@@ -1,53 +1,9 @@
 import * as R from 'ramda';
-import { dimensionValueDisplay } from '../../../rules/src';
-import { REJECTED_VALUE_IDS } from '../constants';
+import { combinedValuesDisplay, singleValueDisplay } from '../combinedValuesDisplay'
 
-const getRefinedMissinParentsLabels = R.pipe(
-  R.propOr([], 'missingParents'),
-  R.reduce((acc, par) => {
-    if (!R.propOr(true, 'display', par) || R.includes(par.id, REJECTED_VALUE_IDS)) {
-      return acc;
-    }
-    return R.append(dimensionValueDisplay('label')(par), acc);
-  }, []),
-);
 
-const granularDisplay = (display, value) => {
-    if (display === 'label') {
-      return R.converge(
-        (missingParents, label) =>
-          R.isEmpty(missingParents) ? label : R.join(' > ', R.append(label, missingParents)),
-        [
-          getRefinedMissinParentsLabels,
-          dimensionValueDisplay(display),
-        ],
-      )(value);
-    } else if (display === 'both') {
-      return `(${granularDisplay('code', value)}) ${granularDisplay('label', value)}`;
-    }
-    return dimensionValueDisplay(display)(value);
-  };
-
-const combinedDisplay = _display => R.pipe(
-  R.reduce((acc, val) => {
-    if ((!R.propOr(true, 'display', val) || R.includes(val.id, REJECTED_VALUE_IDS))
-      && _display === 'label') {
-      return acc;
-    }
-    return R.append(granularDisplay(_display, val), acc);
-  }, []),
-  R.join(', '),
-);
-
-export const getTableLabelAccessor = display => item => {
-  if (!R.is(Array, item)) {
-    return granularDisplay(display, item);
-  }
-  if (display === 'both') {
-    return R.converge((ids, labels) => `(${ids}) ${labels}`, [
-      combinedDisplay('code'),
-      combinedDisplay('label'),
-    ])(item);
-  }
-  return combinedDisplay(display)(item);
+export const getTableLabelAccessor = display => content => {
+  return R.is(Array, content)
+    ? combinedValuesDisplay(display, content)
+    : singleValueDisplay(display, content);
 }; 

package/test/getHeaderCombinations.test.js

@@ -24,4 +24,39 @@ describe('getHeaderCombinations tests', () => {
       { header: 'comb 1:', label: 'dim 1 value' }
     ]);
   });
+  it('not display usecases', () => {
+    const dimensions = [
+      { id: 'd0', values: [{ id: 'd0v', name: 'd0 value', display: false }] },
+      { id: 'd1', values: [{ id: '_T', name: 'Total' }] },
+      { id: 'd2', values: [{ id: 'd2v', name: 'd2 value', display: false }] },
+    ];
+
+    const attributes = [
+      { id: 'a0', values: [{ id: 'a0v', name: 'a0 value', display: false }] },
+      { id: 'a1', values: [{ id: 'a1v', name: 'a1 value', display: false }] },
+      { id: 'a2', values: [{ id: '_T', name: 'Total' }] },
+    ];
+
+    const combinations = [
+      { id: 'comb0', name: 'combination 0', header: true, concepts: ['a0', 'a1', 'd0'] },
+      { id: 'comb1', name: 'combination 1', header: true, concepts: ['d0', 'd2', 'a3'] },
+      { id: 'comb2', name: 'combination 2', header: true, concepts: ['d0', 'd1', 'd2'] },
+      { id: 'comb3', name: 'combination 3', header: true, concepts: ['a0', 'a1', 'a2'] },
+    ];
+    expect(getHeaderCombinations(combinations, dimensions, attributes, 'label')).to.deep.equal([
+      { header: 'combination 0:', label: 'd0 value' },
+      { header: 'combination 1:', label: 'd0 value' },
+      { header: 'combination 2:', label: 'Total' },
+    ]);
+    expect(getHeaderCombinations(combinations, dimensions, attributes, 'code')).to.deep.equal([
+      { header: 'comb0:', label: 'd0v' },
+      { header: 'comb1:', label: 'd0v, d2v' },
+      { header: 'comb2:', label: 'd0v, _T, d2v' },
+    ]);
+    expect(getHeaderCombinations(combinations, dimensions, attributes, 'both')).to.deep.equal([
+      { header: '(comb0) combination 0:', label: '(d0v) d0 value' },
+      { header: '(comb1) combination 1:', label: '(d0v, d2v) d0 value' },
+      { header: '(comb2) combination 2:', label: '(d0v, _T, d2v) Total' },
+    ]);
+  })
 });

package/test/getTableLabelAccessor.test.js

@@ -22,4 +22,29 @@ describe('getTableLabelAccessor tests', () => {
   it('not displayed single value', () => {
     expect(getTableLabelAccessor('both')(values[0])).to.deep.equal('(V0) Value 0');
   });
+  it('display _T label if all hidden', () => {
+    const _values = [
+        { id: 'v0', name: 'value 0', display: false },
+        { id: 'v1', name: 'value 1', display: false },
+        { id: '_T', name: 'Total' },
+        { id: 'v3', name: 'value 3', display: false },
+    ];
+    expect(getTableLabelAccessor('label')(_values)).to.deep.equal('Total');
+    expect(getTableLabelAccessor('both')(_values)).to.deep.equal('(v0, v1, _T, v3) Total');
+  });
+  it('display label first value if all hidden and no _T', () => {
+    const _values = [
+        { id: 'v0', name: 'value 0', display: false },
+        { id: 'v1', name: 'value 1', display: false },
+        { id: 'v2', name: 'value 2', display: false },
+        { id: 'v3', name: 'value 3', display: false },
+    ];
+    expect(getTableLabelAccessor('label')(_values)).to.deep.equal('value 0');
+    expect(getTableLabelAccessor('both')(_values)).to.deep.equal('(v0, v1, v2, v3) value 0');
+  });
+  it('empty case', () => {
+    expect(getTableLabelAccessor('label')([])).to.deep.equal('');
+    expect(getTableLabelAccessor('code')([])).to.deep.equal('');
+    expect(getTableLabelAccessor('both')([])).to.deep.equal('');
+  });
 });

package/test/refineTimePeriod.test.js

@@ -26,7 +26,7 @@ describe('refineTimePeriod tests', () => {
     });
   });
   it('2 years range on March, fr', () => {
-    expect(refineTimePeriod({ id: '2015-03/P2Y' }, { locale: 'fr' })).to.deep.equal({
+    expect(refineTimePeriod({ id: '2015-03/P2Y' }, { locale: 'fr', monthlyFormat: 'MMM YYYY' })).to.deep.equal({
       id: '2015-03/P2Y',
       name: 'mars 2015 - févr. 2017',
       start: '2015-03-01T00:00:00.000Z',
@@ -74,13 +74,29 @@ describe('refineTimePeriod tests', () => {
     });
   });
   it('3 months range, fr', () => {
-    expect(refineTimePeriod({ id: '2015/P3M' }, { locale: 'fr' })).to.deep.equal({
+    expect(refineTimePeriod({ id: '2015/P3M' }, { locale: 'fr', monthlyFormat: 'MMM YYYY' })).to.deep.equal({
       id: '2015/P3M',
       name: 'janv. - mars 2015',
       start: '2015-01-01T00:00:00.000Z',
       end: '2015-03-31T23:59:59.000Z'
     });
   });
+  it('3 months range, fr, format = "YY Mo"', () => {
+    expect(refineTimePeriod({ id: '2015/P3M' }, { locale: 'fr', monthlyFormat: 'YY Mo' })).to.deep.equal({
+      id: '2015/P3M',
+      name: '15 1 - 3o',
+      start: '2015-01-01T00:00:00.000Z',
+      end: '2015-03-31T23:59:59.000Z'
+    });
+  });
+  it('3 months range, fr, format = "MMMM"', () => {
+    expect(refineTimePeriod({ id: '2015/P3M' }, { locale: 'fr', monthlyFormat: 'MMMM' })).to.deep.equal({
+      id: '2015/P3M',
+      name: 'janvier - mars',
+      start: '2015-01-01T00:00:00.000Z',
+      end: '2015-03-31T23:59:59.000Z'
+    });
+  });
   it('19 months range, en', () => {
     expect(refineTimePeriod({ id: '2015/P19M' }, { locale: 'en' })).to.deep.equal({
       id: '2015/P19M',
@@ -90,7 +106,7 @@ describe('refineTimePeriod tests', () => {
     });
   });
   it('19 months range, fr', () => {
-    expect(refineTimePeriod({ id: '2015/P19M' }, { locale: 'fr' })).to.deep.equal({
+    expect(refineTimePeriod({ id: '2015/P19M' }, { locale: 'fr', monthlyFormat: 'MMM YYYY' })).to.deep.equal({
       id: '2015/P19M',
       name: 'janv. 2015 - juill. 2016',
       start: '2015-01-01T00:00:00.000Z',
@@ -106,7 +122,7 @@ describe('refineTimePeriod tests', () => {
     });
   });
   it('4 months range from April, fr', () => {
-    expect(refineTimePeriod({ id: '2015-04/P4M' }, { locale: 'fr' })).to.deep.equal({
+    expect(refineTimePeriod({ id: '2015-04/P4M' }, { locale: 'fr', monthlyFormat: 'MMM YYYY' })).to.deep.equal({
       id: '2015-04/P4M',
       name: 'avr. - juill. 2015',
       start: '2015-04-01T00:00:00.000Z',
@@ -122,7 +138,7 @@ describe('refineTimePeriod tests', () => {
     });
   });
   it('2 months range from December, fr', () => {
-    expect(refineTimePeriod({ id: '2015-12/P2M' }, { locale: 'fr' })).to.deep.equal({
+    expect(refineTimePeriod({ id: '2015-12/P2M' }, { locale: 'fr', monthlyFormat: 'MMM YYYY' })).to.deep.equal({
       id: '2015-12/P2M',
       name: 'déc. 2015 - janv. 2016',
       start: '2015-12-01T00:00:00.000Z',