@sis-cc/dotstatsuite-visions 10.23.0 → 10.24.1

package/es/AdvancedFilterDialog/AdvancedFilterDialog.js

@@ -188,6 +188,14 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
       height = _useState3[0],
       setHeight = _useState3[1];
 
+  var getTotal = function getTotal(items, spotlightAcc) {
+    var itemsIds = R.pluck('id', items);
+    var total = R.pipe(R.uniq, R.length)(itemsIds);
+    if (R.is(Function, spotlightAcc)) {
+      return spotlightAcc(total);
+    }
+    return total;
+  };
   var measureRef = React.useCallback(function (node) {
     if (node !== null) {
       setHeight(node.getBoundingClientRect().height * 75 / 100);
@@ -258,17 +266,21 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
     setSpotlight({ term: '' });
   };
   var rejectonlyDisabledItems = function rejectonlyDisabledItems(item) {
-    return R.prop('isDisabled')(item) && !R.has('isForced')(item);
+    return _disableAccessor(item);
   };
   var getSelectedItems = function getSelectedItems(item) {
     return R.propOr(false, 'isSelected')(item);
   };
 
   var selectAll = function selectAll() {
+    var imposedIds = R.reduce(function (acc, item) {
+      return R.uniq(R.concat(R.propOr([], 'imposedIds', item), acc));
+    }, [])(items);
     var ids = R.pluck('id', R.reject(getSelectedItems, R.reject(rejectonlyDisabledItems, items)));
+    var allIds = R.concat(imposedIds, ids);
     var nextSelection = R.reduce(function (acc, id) {
       return R.has(id, acc) ? acc : R.assoc(id, id, acc);
-    }, {}, ids);
+    }, {}, allIds);
     setSelectionMode('selectAll');
     setSelection(nextSelection);
   };
@@ -371,7 +383,11 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
                 )
               )
             );
-          }, selectionOptions),
+          }, selectionOptions)
+        ),
+        React.createElement(
+          'div',
+          null,
           onClose && React.createElement(
             IconButton,
             {
@@ -398,7 +414,7 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
             { className: isNarrow ? classes.narrowSpotlight : classes.spotlight },
             React.createElement(Spotlight, {
               hasClearAll: true,
-              placeholder: R.prop('placeholder', labels),
+              placeholder: getTotal(items, R.prop('placeholder', labels)),
               term: spotlight.term,
               hasCommit: false,
               spotlight: { fields: {} },

package/es/HierarchicalFilter/HierarchicalFilter.js

@@ -28,7 +28,14 @@ var getCounter = function getCounter(items, disableAccessor, tagAccessor) {
   }
   return count + '/' + total;
 };
-
+var getTotal = function getTotal(items, spotlightAcc) {
+  var itemsIds = R.pluck('id', items);
+  var total = R.pipe(R.uniq, R.length)(itemsIds);
+  if (R.is(Function, spotlightAcc)) {
+    return spotlightAcc(total);
+  }
+  return total;
+};
 var HierarchicalFilter = function HierarchicalFilter(props) {
   var id = props.id,
       items = props.items,
@@ -97,7 +104,7 @@ var HierarchicalFilter = function HierarchicalFilter(props) {
             className: { container: classes.middle },
             fullWidth: true,
             hasClearAll: true,
-            placeholder: R.prop('placeholder', labels),
+            placeholder: getTotal(items, R.prop('placeholder', labels)),
             term: spotlight.term,
             hasCommit: false,
             spotlight: { fields: {} },

package/lib/AdvancedFilterDialog/AdvancedFilterDialog.js

@@ -258,6 +258,14 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
       height = _useState3[0],
       setHeight = _useState3[1];
 
+  var getTotal = function getTotal(items, spotlightAcc) {
+    var itemsIds = R.pluck('id', items);
+    var total = R.pipe(R.uniq, R.length)(itemsIds);
+    if (R.is(Function, spotlightAcc)) {
+      return spotlightAcc(total);
+    }
+    return total;
+  };
   var measureRef = _react2.default.useCallback(function (node) {
     if (node !== null) {
       setHeight(node.getBoundingClientRect().height * 75 / 100);
@@ -328,17 +336,21 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
     setSpotlight({ term: '' });
   };
   var rejectonlyDisabledItems = function rejectonlyDisabledItems(item) {
-    return R.prop('isDisabled')(item) && !R.has('isForced')(item);
+    return _disableAccessor(item);
   };
   var getSelectedItems = function getSelectedItems(item) {
     return R.propOr(false, 'isSelected')(item);
   };
 
   var selectAll = function selectAll() {
+    var imposedIds = R.reduce(function (acc, item) {
+      return R.uniq(R.concat(R.propOr([], 'imposedIds', item), acc));
+    }, [])(items);
     var ids = R.pluck('id', R.reject(getSelectedItems, R.reject(rejectonlyDisabledItems, items)));
+    var allIds = R.concat(imposedIds, ids);
     var nextSelection = R.reduce(function (acc, id) {
       return R.has(id, acc) ? acc : R.assoc(id, id, acc);
-    }, {}, ids);
+    }, {}, allIds);
     setSelectionMode('selectAll');
     setSelection(nextSelection);
   };
@@ -441,7 +453,11 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
                 )
               )
             );
-          }, selectionOptions),
+          }, selectionOptions)
+        ),
+        _react2.default.createElement(
+          'div',
+          null,
           onClose && _react2.default.createElement(
             _Button2.default,
             {
@@ -468,7 +484,7 @@ var AdvancedFilterDialog = function AdvancedFilterDialog(props) {
             { className: isNarrow ? classes.narrowSpotlight : classes.spotlight },
             _react2.default.createElement(_.Spotlight, {
               hasClearAll: true,
-              placeholder: R.prop('placeholder', labels),
+              placeholder: getTotal(items, R.prop('placeholder', labels)),
               term: spotlight.term,
               hasCommit: false,
               spotlight: { fields: {} },

package/lib/HierarchicalFilter/HierarchicalFilter.js

@@ -57,7 +57,14 @@ var getCounter = function getCounter(items, disableAccessor, tagAccessor) {
   }
   return count + '/' + total;
 };
-
+var getTotal = function getTotal(items, spotlightAcc) {
+  var itemsIds = R.pluck('id', items);
+  var total = R.pipe(R.uniq, R.length)(itemsIds);
+  if (R.is(Function, spotlightAcc)) {
+    return spotlightAcc(total);
+  }
+  return total;
+};
 var HierarchicalFilter = function HierarchicalFilter(props) {
   var id = props.id,
       items = props.items,
@@ -126,7 +133,7 @@ var HierarchicalFilter = function HierarchicalFilter(props) {
             className: { container: classes.middle },
             fullWidth: true,
             hasClearAll: true,
-            placeholder: R.prop('placeholder', labels),
+            placeholder: getTotal(items, R.prop('placeholder', labels)),
             term: spotlight.term,
             hasCommit: false,
             spotlight: { fields: {} },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sis-cc/dotstatsuite-visions",
-  "version": "10.23.0",
+  "version": "10.24.1",
   "description": "Library of visual components",
   "author": "OECD",
   "homepage": "https://visions-qa.siscc.org/#o",

package/umd/@sis-cc/dotstatsuite-visions.js

@@ -1,5 +1,5 @@
 /*!
- * @sis-cc/dotstatsuite-visions v10.23.0 - https://visions-qa.siscc.org/#o
+ * @sis-cc/dotstatsuite-visions v10.24.1 - https://visions-qa.siscc.org/#o
  * MIT Licensed
  */
 (function webpackUniversalModuleDefinition(root, factory) {
@@ -6697,7 +6697,7 @@ function removeClassName(el
 /* 119 */
 /***/ (function(module) {
 
-module.exports = {"name":"@sis-cc/dotstatsuite-visions","version":"10.23.0","description":"Library of visual components","author":"OECD","homepage":"https://visions-qa.siscc.org/#o","license":"MIT","repository":"https://gitlab.com/sis-cc/.stat-suite/dotstatsuite-visions","main":"lib/index.js","module":"es/index.js","engines":{"node":">=14"},"files":["css","es","lib","umd"],"scripts":{"build":"nwb build-react-component --copy-files --no-demo && node scripts/doc && nwb build-demo","build:dev":"nwb build-react-component --copy-files --no-demo","clean":"nwb clean-module && nwb clean-demo","prepublishOnly":"npm run build","start":"nwb serve-react-demo","test":"jest","test:watch":"jest --watch --no-cache","lint":"eslint src/ --color","precommit":"lint-staged"},"dependencies":{"@react-hook/size":"^2.1.1","classnames":"^2.2.6","date-fns":"^1.30.1","isemail":"^3.2.0","numeral":"^2.0.6","prop-types":"^15.7.2","ramda":"^0.27.0","react-beautiful-dnd":"^13.0.0","react-draggable":"^4.4.5","react-error-boundary":"^4.0.10","react-virtualized":"^9.21.2"},"peerDependencies":{"@material-ui/core":"^4","@material-ui/icons":"^4","@sis-cc/dotstatsuite-sdmxjs":"^8.x","react":"^18","react-dom":"^18"},"devDependencies":{"@babel/eslint-parser":"^7.5.4","@babel/plugin-syntax-dynamic-import":"^7.2.0","@cfaester/enzyme-adapter-react-18":"^0.7.0","@material-ui/core":"^4","@material-ui/icons":"^4","@sis-cc/dotstatsuite-sdmxjs":"*","@testing-library/jest-dom":"^5.16.5","@testing-library/react":"^14.0.0","babel-jest":"^24.8.0","babel-preset-react-app":"^9.0.0","dox":"^0.9.0","eslint":"^8.39.0","eslint-plugin-import":"^2.27.5","eslint-plugin-jsx-a11y":"^6.7.1","eslint-plugin-prettier":"^4.2.1","eslint-plugin-react":"^7.32.2","eslint-plugin-react-hooks":"^4.6.0","husky":"^2.7.0","identity-obj-proxy":"^3.0.0","jest":"^24.8.0","jss":"^10.10.0","jss-rtl":"^0.2.3","lint-staged":"^8.2.1","mutationobserver-shim":"^0.3.7","nwb":"0.23.0","prettier":"^2.8.8","pretty-quick":"^3.1.3","react":"^18","react-a11y":"^1.1.0","react-dom":"^18","react-helmet":"^5.2.1","react-scrollable-anchor":"^0.6.1","react-syntax-highlighter":"^10.2.1","sanitize-html":"2.7.0","webpack":"^5.68.0","webpack-cli":"^4.9.2","webpack-dev-server":"^4.7.4"},"jest":{"verbose":true,"coverageDirectory":"coverage","collectCoverageFrom":["src/**/*.{js,jsx,ts,tsx}","!src/ScopeList/*.{js,jsx,ts,tsx}","!src/**/*.d.ts"],"setupFilesAfterEnv":["<rootDir>/tests/setup.js"],"testMatch":["**/tests/**/*.{spec,test}.{js,jsx,ts,tsx}","!**/tests/ScopeList.test.js"],"testEnvironment":"jsdom","transform":{"^.+\\.(js|jsx|ts|tsx)$":"<rootDir>/node_modules/babel-jest"},"transformIgnorePatterns":["[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$","^.+\\.module\\.(css|sass|scss)$"],"modulePaths":[],"moduleNameMapper":{"^react-native$":"react-native-web","^.+\\.module\\.(css|sass|scss)$":"identity-obj-proxy","\\.(jpg|jpeg|png)$":"identity-obj-proxy"},"moduleFileExtensions":["web.js","js","web.ts","ts","web.tsx","tsx","json","web.jsx","jsx","node"]},"babel":{"presets":["react-app"],"plugins":["@babel/plugin-syntax-dynamic-import"]},"eslintConfig":{"env":{"browser":true,"jest":true,"node":true,"es6":true},"extends":["eslint:recommended","plugin:react/recommended","plugin:jsx-a11y/recommended"],"parser":"@babel/eslint-parser","parserOptions":{"babelOptions":{"presets":[["babel-preset-react-app",false],"babel-preset-react-app/test"]},"ecmaFeatures":{"experimentalObjectRestSpread":true,"jsx":true},"sourceType":"module"},"plugins":["prettier","react","import","react-hooks","jsx-a11y"],"rules":{"no-console":"warn","no-unused-vars":"error","react/display-name":"off","react-hooks/rules-of-hooks":"error","react-hooks/exhaustive-deps":"warn","no-use-before-define":"error"}},"browserslist":{"production":[">0.2%","not dead","not op_mini all"],"development":["last 1 chrome version","last 1 firefox version","last 1 safari version"]},"husky":{"hooks":{"pre-commit":"lint-staged"}},"lint-staged":{"src/**/*.{js,css}":["prettier --write","git add","yarn lint"]},"prettier":{"endOfLine":"lf","useTabs":false,"printWidth":100,"tabWidth":2,"singleQuote":true,"trailingComma":"all","bracketSameLine":false,"bracketSpacing":true,"parser":"babel","semi":true,"arrowParens":"avoid"}};
+module.exports = {"name":"@sis-cc/dotstatsuite-visions","version":"10.24.1","description":"Library of visual components","author":"OECD","homepage":"https://visions-qa.siscc.org/#o","license":"MIT","repository":"https://gitlab.com/sis-cc/.stat-suite/dotstatsuite-visions","main":"lib/index.js","module":"es/index.js","engines":{"node":">=14"},"files":["css","es","lib","umd"],"scripts":{"build":"nwb build-react-component --copy-files --no-demo && node scripts/doc && nwb build-demo","build:dev":"nwb build-react-component --copy-files --no-demo","clean":"nwb clean-module && nwb clean-demo","prepublishOnly":"npm run build","start":"nwb serve-react-demo","test":"jest","test:watch":"jest --watch --no-cache","lint":"eslint src/ --color","precommit":"lint-staged"},"dependencies":{"@react-hook/size":"^2.1.1","classnames":"^2.2.6","date-fns":"^1.30.1","isemail":"^3.2.0","numeral":"^2.0.6","prop-types":"^15.7.2","ramda":"^0.27.0","react-beautiful-dnd":"^13.0.0","react-draggable":"^4.4.5","react-error-boundary":"^4.0.10","react-virtualized":"^9.21.2"},"peerDependencies":{"@material-ui/core":"^4","@material-ui/icons":"^4","@sis-cc/dotstatsuite-sdmxjs":"^8.x","react":"^18","react-dom":"^18"},"devDependencies":{"@babel/eslint-parser":"^7.5.4","@babel/plugin-syntax-dynamic-import":"^7.2.0","@cfaester/enzyme-adapter-react-18":"^0.7.0","@material-ui/core":"^4","@material-ui/icons":"^4","@sis-cc/dotstatsuite-sdmxjs":"*","@testing-library/jest-dom":"^5.16.5","@testing-library/react":"^14.0.0","babel-jest":"^24.8.0","babel-preset-react-app":"^9.0.0","dox":"^0.9.0","eslint":"^8.39.0","eslint-plugin-import":"^2.27.5","eslint-plugin-jsx-a11y":"^6.7.1","eslint-plugin-prettier":"^4.2.1","eslint-plugin-react":"^7.32.2","eslint-plugin-react-hooks":"^4.6.0","husky":"^2.7.0","identity-obj-proxy":"^3.0.0","jest":"^24.8.0","jss":"^10.10.0","jss-rtl":"^0.2.3","lint-staged":"^8.2.1","mutationobserver-shim":"^0.3.7","nwb":"0.23.0","prettier":"^2.8.8","pretty-quick":"^3.1.3","react":"^18","react-a11y":"^1.1.0","react-dom":"^18","react-helmet":"^5.2.1","react-scrollable-anchor":"^0.6.1","react-syntax-highlighter":"^10.2.1","sanitize-html":"2.7.0","webpack":"^5.68.0","webpack-cli":"^4.9.2","webpack-dev-server":"^4.7.4"},"jest":{"verbose":true,"coverageDirectory":"coverage","collectCoverageFrom":["src/**/*.{js,jsx,ts,tsx}","!src/ScopeList/*.{js,jsx,ts,tsx}","!src/**/*.d.ts"],"setupFilesAfterEnv":["<rootDir>/tests/setup.js"],"testMatch":["**/tests/**/*.{spec,test}.{js,jsx,ts,tsx}","!**/tests/ScopeList.test.js"],"testEnvironment":"jsdom","transform":{"^.+\\.(js|jsx|ts|tsx)$":"<rootDir>/node_modules/babel-jest"},"transformIgnorePatterns":["[/\\\\]node_modules[/\\\\].+\\.(js|jsx|ts|tsx)$","^.+\\.module\\.(css|sass|scss)$"],"modulePaths":[],"moduleNameMapper":{"^react-native$":"react-native-web","^.+\\.module\\.(css|sass|scss)$":"identity-obj-proxy","\\.(jpg|jpeg|png)$":"identity-obj-proxy"},"moduleFileExtensions":["web.js","js","web.ts","ts","web.tsx","tsx","json","web.jsx","jsx","node"]},"babel":{"presets":["react-app"],"plugins":["@babel/plugin-syntax-dynamic-import"]},"eslintConfig":{"env":{"browser":true,"jest":true,"node":true,"es6":true},"extends":["eslint:recommended","plugin:react/recommended","plugin:jsx-a11y/recommended"],"parser":"@babel/eslint-parser","parserOptions":{"babelOptions":{"presets":[["babel-preset-react-app",false],"babel-preset-react-app/test"]},"ecmaFeatures":{"experimentalObjectRestSpread":true,"jsx":true},"sourceType":"module"},"plugins":["prettier","react","import","react-hooks","jsx-a11y"],"rules":{"no-console":"warn","no-unused-vars":"error","react/display-name":"off","react-hooks/rules-of-hooks":"error","react-hooks/exhaustive-deps":"warn","no-use-before-define":"error"}},"browserslist":{"production":[">0.2%","not dead","not op_mini all"],"development":["last 1 chrome version","last 1 firefox version","last 1 safari version"]},"husky":{"hooks":{"pre-commit":"lint-staged"}},"lint-staged":{"src/**/*.{js,css}":["prettier --write","git add","yarn lint"]},"prettier":{"endOfLine":"lf","useTabs":false,"printWidth":100,"tabWidth":2,"singleQuote":true,"trailingComma":"all","bracketSameLine":false,"bracketSpacing":true,"parser":"babel","semi":true,"arrowParens":"avoid"}};
 
 /***/ }),
 /* 120 */
@@ -72105,6 +72105,14 @@ var AdvancedFilterDialog_AdvancedFilterDialog = function AdvancedFilterDialog(pr
       height = _useState3[0],
       setHeight = _useState3[1];
 
+  var getTotal = function getTotal(items, spotlightAcc) {
+    var itemsIds = es_pluck('id', items);
+    var total = pipe(es_uniq, es_length)(itemsIds);
+    if (es_is(Function, spotlightAcc)) {
+      return spotlightAcc(total);
+    }
+    return total;
+  };
   var measureRef = react_default.a.useCallback(function (node) {
     if (node !== null) {
       setHeight(node.getBoundingClientRect().height * 75 / 100);
@@ -72175,17 +72183,21 @@ var AdvancedFilterDialog_AdvancedFilterDialog = function AdvancedFilterDialog(pr
     setSpotlight({ term: '' });
   };
   var rejectonlyDisabledItems = function rejectonlyDisabledItems(item) {
-    return es_prop('isDisabled')(item) && !es_has('isForced')(item);
+    return _disableAccessor(item);
   };
   var getSelectedItems = function getSelectedItems(item) {
     return es_propOr(false, 'isSelected')(item);
   };
 
   var selectAll = function selectAll() {
+    var imposedIds = es_reduce(function (acc, item) {
+      return es_uniq(es_concat(es_propOr([], 'imposedIds', item), acc));
+    }, [])(items);
     var ids = es_pluck('id', es_reject(getSelectedItems, es_reject(rejectonlyDisabledItems, items)));
+    var allIds = es_concat(imposedIds, ids);
     var nextSelection = es_reduce(function (acc, id) {
       return es_has(id, acc) ? acc : es_assoc(id, id, acc);
-    }, {}, ids);
+    }, {}, allIds);
     setSelectionMode('selectAll');
     setSelection(nextSelection);
   };
@@ -72288,7 +72300,11 @@ var AdvancedFilterDialog_AdvancedFilterDialog = function AdvancedFilterDialog(pr
                 )
               )
             );
-          }, selectionOptions),
+          }, selectionOptions)
+        ),
+        react_default.a.createElement(
+          'div',
+          null,
           onClose && react_default.a.createElement(
             esm_Button_Button,
             {
@@ -72315,7 +72331,7 @@ var AdvancedFilterDialog_AdvancedFilterDialog = function AdvancedFilterDialog(pr
             { className: isNarrow ? classes.narrowSpotlight : classes.spotlight },
             react_default.a.createElement(src_Spotlight_Spotlight, {
               hasClearAll: true,
-              placeholder: es_prop('placeholder', labels),
+              placeholder: getTotal(items, es_prop('placeholder', labels)),
               term: spotlight.term,
               hasCommit: false,
               spotlight: { fields: {} },
@@ -72497,7 +72513,14 @@ var HierarchicalFilter_getCounter = function getCounter(items, disableAccessor,
   }
   return count + '/' + total;
 };
-
+var HierarchicalFilter_getTotal = function getTotal(items, spotlightAcc) {
+  var itemsIds = es_pluck('id', items);
+  var total = pipe(es_uniq, es_length)(itemsIds);
+  if (es_is(Function, spotlightAcc)) {
+    return spotlightAcc(total);
+  }
+  return total;
+};
 var HierarchicalFilter_HierarchicalFilter = function HierarchicalFilter(props) {
   var id = props.id,
       items = props.items,
@@ -72566,7 +72589,7 @@ var HierarchicalFilter_HierarchicalFilter = function HierarchicalFilter(props) {
             className: { container: classes.middle },
             fullWidth: true,
             hasClearAll: true,
-            placeholder: es_prop('placeholder', labels),
+            placeholder: HierarchicalFilter_getTotal(items, es_prop('placeholder', labels)),
             term: spotlight.term,
             hasCommit: false,
             spotlight: { fields: {} },