@sis-cc/dotstatsuite-components 15.0.5 → 15.0.6

package/lib/rules2/src/getDataflowTooltipAttributesIds.js

@@ -18,8 +18,16 @@ var getDataflowTooltipAttributesIds = exports.getDataflowTooltipAttributesIds =
   var flagsAttrAnnotation = R.find(R.propEq('type', 'LAYOUT_FLAG'), dataflowAnnotations);
   var footnotesAttrAnnotation = R.find(R.propEq('type', 'LAYOUT_NOTE'), dataflowAnnotations);
 
+  var customFlags = R.pipe(R.propOr('', 'title'), function (title) {
+    return R.isNil(title) || R.isEmpty(title) ? [] : R.split(',', title);
+  })(flagsAttrAnnotation || {});
+
+  var customNotes = R.pipe(R.propOr('', 'title'), function (title) {
+    return R.isNil(title) || R.isEmpty(title) ? [] : R.split(',', title);
+  })(footnotesAttrAnnotation || {});
+
   return {
-    flags: R.isNil(flagsAttrAnnotation) ? defaults.flags : R.split(',', flagsAttrAnnotation.title),
-    notes: R.isNil(footnotesAttrAnnotation) ? defaults.notes : R.split(',', footnotesAttrAnnotation.title)
+    flags: R.isNil(flagsAttrAnnotation) ? defaults.flags : customFlags,
+    notes: R.isNil(footnotesAttrAnnotation) ? defaults.notes : customNotes
   };
 };

package/package.json

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

package/src/rules2/src/getDataflowTooltipAttributesIds.js

@@ -7,9 +7,19 @@ export const getDataflowTooltipAttributesIds = (sdmxJson, defaults) => {
   const flagsAttrAnnotation = R.find(R.propEq('type', 'LAYOUT_FLAG'), dataflowAnnotations);
   const footnotesAttrAnnotation = R.find(R.propEq('type', 'LAYOUT_NOTE'), dataflowAnnotations);
 
+  const customFlags = R.pipe(
+    R.propOr('', 'title'),
+    title => R.isNil(title) || R.isEmpty(title) ? [] : R.split(',', title)
+  )(flagsAttrAnnotation || {});
+
+  const customNotes = R.pipe(
+    R.propOr('', 'title'),
+    title => R.isNil(title) || R.isEmpty(title) ? [] : R.split(',', title)
+  )(footnotesAttrAnnotation || {});
+
   return ({
-    flags: R.isNil(flagsAttrAnnotation) ? defaults.flags : R.split(',', flagsAttrAnnotation.title),
-    notes: R.isNil(footnotesAttrAnnotation) ? defaults.notes : R.split(',', footnotesAttrAnnotation.title),
+    flags: R.isNil(flagsAttrAnnotation) ? defaults.flags : customFlags,
+    notes: R.isNil(footnotesAttrAnnotation) ? defaults.notes : customNotes,
   });
 };
 

package/test/getAttachmentSeriesIndexes.test.js

@@ -2,12 +2,12 @@ import { expect } from 'chai';
 import { getAttachmentSeriesIndexes } from '../src/rules/src/table/units/getAttachmentSeriesIndexes';
 
 const dimensions = {
-  D0: { id: 'D0', index: 0 },
-  D1: { id: 'D1', index: 1 },
-  D2: { id: 'D2', index: 2 },
-  D3: { id: 'D3', index: 3 },
-  D4: { id: 'D4', index: 4 },
-  D5: { id: 'D5', index: 5 }, 
+  D0: { id: 'D0', __index: 0 },
+  D1: { id: 'D1', __index: 1 },
+  D2: { id: 'D2', __index: 2 },
+  D3: { id: 'D3', __index: 3 },
+  D4: { id: 'D4', __index: 4 },
+  D5: { id: 'D5', __index: 5 }, 
 };
 
 const unitsArtefacts = {

package/test/{getDataflowTooltipAttributesIds.js → getDataflowTooltipAttributesIds.test.js}

@@ -71,4 +71,20 @@ describe('getDataflowTooltipAttributesIds tests', () => {
 
     expect(getDataflowTooltipAttributesIds({ data }, def)).to.deep.equal({ flags: ['f2', 'f3'], notes: ['foot2', 'foot3'] });
   });
+  it('annotation without content erase defaults', () => {
+    const data = {
+      dataSets: [{
+        annotations: [0, 1]
+      }],
+      structure: {
+        annotations: [
+          { id: 'annot0', type: 'LAYOUT_FLAG', title: 'f2,f3' },
+          { id: 'annot1', type: 'LAYOUT_NOTE' },
+          { id: 'annot2', title: 'test' },
+        ]
+      }
+    };
+
+    expect(getDataflowTooltipAttributesIds({ data }, def)).to.deep.equal({ flags: ['f2', 'f3'], notes: [] });
+  });
 });