@dhis2/analytics 21.0.5 → 21.0.9

package/CHANGELOG.md

@@ -1,3 +1,31 @@
+## [21.0.9](https://github.com/dhis2/analytics/compare/v21.0.8...v21.0.9) (2021-12-03)
+
+
+### Bug Fixes
+
+* include legendset in the analytics request ([#1102](https://github.com/dhis2/analytics/issues/1102)) ([14d5261](https://github.com/dhis2/analytics/commit/14d52618c714cca1a2d7b3441a7aba5ea209efc2))
+
+## [21.0.8](https://github.com/dhis2/analytics/compare/v21.0.7...v21.0.8) (2021-12-02)
+
+
+### Bug Fixes
+
+* disable org unit filters and groups when user org units are used ([#1100](https://github.com/dhis2/analytics/issues/1100)) ([ce63e14](https://github.com/dhis2/analytics/commit/ce63e14517abfe5f7edc6f42b46c6e1dc07a3555))
+
+## [21.0.7](https://github.com/dhis2/analytics/compare/v21.0.6...v21.0.7) (2021-12-01)
+
+
+### Bug Fixes
+
+* dimension without items + filter (TECH-788) ([#1097](https://github.com/dhis2/analytics/issues/1097)) ([37369ce](https://github.com/dhis2/analytics/commit/37369ce74eb189724d0943d35492d377f0ff44f8))
+
+## [21.0.6](https://github.com/dhis2/analytics/compare/v21.0.5...v21.0.6) (2021-11-28)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([8c10c19](https://github.com/dhis2/analytics/commit/8c10c1909a77e4ae9c729e99bc41bc84b9a51860))
+
 ## [21.0.5](https://github.com/dhis2/analytics/compare/v21.0.4...v21.0.5) (2021-11-26)
 
 

package/build/cjs/api/analytics/AnalyticsRequest.js

@@ -56,20 +56,28 @@ class AnalyticsRequest extends (0, _AnalyticsRequestDimensionsMixin.default)((0,
     const columns = visualization.columns || [];
     const rows = visualization.rows || [];
     columns.concat(rows).forEach(d => {
+      var _d$legendSet, _d$items;
+
       let dimension = d.dimension;
 
+      if ((_d$legendSet = d.legendSet) !== null && _d$legendSet !== void 0 && _d$legendSet.id) {
+        dimension += "-".concat(d.legendSet.id);
+      }
+
       if (d.filter) {
         dimension += ":".concat(d.filter);
       }
 
-      request = request.addDimension(dimension, d.items.map(item => item.id));
+      request = request.addDimension(dimension, (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
     }); // extract filters from visualization
 
     const filters = visualization.filters || []; // only pass dx/pe/ou as dimension
 
     const fixedIds = Object.keys((0, _predefinedDimensions.getFixedDimensions)());
     filters.forEach(f => {
-      request = passFilterAsDimension && fixedIds.includes(f.dimension) ? request.addDimension(f.dimension, f.items.map(item => item.id)) : request.addFilter(f.dimension, f.items.map(item => item.id));
+      var _f$items, _f$items2;
+
+      request = passFilterAsDimension && fixedIds.includes(f.dimension) ? request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id)) : request.addFilter(f.dimension, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
     });
     return request;
   }

package/build/cjs/api/analytics/AnalyticsRequestDimensionsMixin.js

@@ -125,12 +125,16 @@ class extends base {
     if (existingDimension) {
       this.dimensions.splice(dimensionIndex, 1, {
         dimension,
-        items: updatedItems
+        ...(items && {
+          items: updatedItems
+        })
       });
     } else {
       this.dimensions.push({
         dimension,
-        items: updatedItems
+        ...(items && {
+          items: updatedItems
+        })
       });
     }
 

package/build/cjs/api/analytics/__tests__/AnalyticsRequest.spec.js

@@ -122,8 +122,7 @@ describe('AnalyticsRequest', () => {
       it('should add the given dimension without any associated value', () => {
         request.addDimension('Jtf34kNZhzP');
         expect(request.dimensions).toEqual([{
-          dimension: 'Jtf34kNZhzP',
-          items: []
+          dimension: 'Jtf34kNZhzP'
         }]);
       });
       it('should add the given dimension with the associated value (passed as string)', () => {

package/build/cjs/components/OrgUnitDimension/OrgUnitDimension.js

@@ -56,7 +56,7 @@ const OrgUnitDimension = ({
     let result = [...selected];
 
     if (checked && DYNAMIC_ORG_UNITS.includes(id)) {
-      result = [...result.filter(item => DYNAMIC_ORG_UNITS.includes(item.id) || _ouIdHelper.ouIdHelper.hasLevelPrefix(item.id) || _ouIdHelper.ouIdHelper.hasGroupPrefix(item.id)), {
+      result = [...result.filter(item => DYNAMIC_ORG_UNITS.includes(item.id)), {
         id,
         displayName
       }];
@@ -216,7 +216,9 @@ const OrgUnitDimension = ({
     onChange: onSelectItems,
     dataTest: 'org-unit-tree'
   })), /*#__PURE__*/_react.default.createElement("div", {
-    className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + "selectsWrapper"
+    className: "jsx-".concat(_OrgUnitDimension.default.__hash) + " " + ((0, _classnames.default)('selectsWrapper', {
+      disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id))
+    }) || "")
   }, /*#__PURE__*/_react.default.createElement(_ui.MultiSelect, {
     selected: ouLevels.length ? selected.filter(item => _ouIdHelper.ouIdHelper.hasLevelPrefix(item.id)).map(item => _ouIdHelper.ouIdHelper.removePrefix(item.id)) : [],
     onChange: ({

package/build/cjs/locales/cs/translations.json

@@ -1,23 +1,23 @@
 {
-    "view only": "",
-    "view and edit": "",
-    "all users ({{accessLevel}})": "",
-    "{{userOrGroup}} ({{accessLevel}})": "",
-    "Shared with {{commaSeparatedListOfUsersAndGroups}}": "",
-    "Not shared with any users or groups": "",
-    "About this visualization": "",
+    "view only": "pouze zobrazit",
+    "view and edit": "zobrazit a upravit",
+    "all users ({{accessLevel}})": "všichni uživatelé ({{accessLevel}})",
+    "{{userOrGroup}} ({{accessLevel}})": "{{userOrGroup}} ({{accessLevel}})",
+    "Shared with {{commaSeparatedListOfUsersAndGroups}}": "Sdíleno s {{commaSeparatedListOfUsersAndGroups}}",
+    "Not shared with any users or groups": "Nesdíleno s žádnými uživateli ani skupinami",
+    "About this visualization": "O této vizualizaci",
     "No description": "Bez popisu",
-    "Last updated {{time}}": "",
-    "Created {{time}} by {{author}}": "",
-    "Viewed {{count}} times_0": "",
-    "Viewed {{count}} times_1": "",
-    "Viewed {{count}} times_2": "",
-    "Viewed {{count}} times_3": "",
+    "Last updated {{time}}": "Poslední aktualizace {{time}}",
+    "Created {{time}} by {{author}}": "Vytvořeno {{time}} uživatelem {{author}}",
+    "Viewed {{count}} times_0": "Zobrazeno 1 krát",
+    "Viewed {{count}} times_1": "Zobrazeno {{count}}krát",
+    "Viewed {{count}} times_2": "Zobrazeno {{count}}krát",
+    "Viewed {{count}} times_3": "Zobrazeno {{count}}krát",
     "Notifications": "Oznámení",
-    "You're subscribed and getting updates about new interpretations.": "",
-    "Unsubscribe": "",
-    "Subscribe to get updates about new interpretations.": "",
-    "Subscribe": "",
+    "You're subscribed and getting updates about new interpretations.": "Jste přihlášeni k odběru a dostáváte aktualizace o nových interpretacích.",
+    "Unsubscribe": "Odhlásit odběr",
+    "Subscribe to get updates about new interpretations.": "Přihlaste se k odběru novinek o nových interpretacích.",
+    "Subscribe": "Odebírat",
     "Data Type": "Typ dat",
     "All types": "Všechny typy",
     "Totals only": "Pouze součty",
@@ -120,20 +120,20 @@
     "Options": "Možnosti",
     "Hide": "Skrýt",
     "Update": "Aktualizovat",
-    "{{count}} org units_0": "",
-    "{{count}} org units_1": "",
-    "{{count}} org units_2": "",
-    "{{count}} org units_3": "",
-    "{{count}} levels_0": "",
-    "{{count}} levels_1": "",
-    "{{count}} levels_2": "",
-    "{{count}} levels_3": "",
-    "{{count}} groups_0": "",
-    "{{count}} groups_1": "",
-    "{{count}} groups_2": "",
-    "{{count}} groups_3": "",
-    "Selected: {{commaSeparatedListOfOrganisationUnits}}": "",
-    "Nothing selected": "",
+    "{{count}} org units_0": "{{count}} organizační jednotka",
+    "{{count}} org units_1": "{{count}} organizační jednotky",
+    "{{count}} org units_2": "{{count}} organizačních jednotek",
+    "{{count}} org units_3": "{{count}} organizačních jednotek",
+    "{{count}} levels_0": "{{count}} úroveň",
+    "{{count}} levels_1": "{{count}} úrovně",
+    "{{count}} levels_2": "{{count}} úrovní",
+    "{{count}} levels_3": "{{count}} úrovní",
+    "{{count}} groups_0": "{{count}} skupina",
+    "{{count}} groups_1": "{{count}} skupiny",
+    "{{count}} groups_2": "{{count}} skupin",
+    "{{count}} groups_3": "{{count}} skupin",
+    "Selected: {{commaSeparatedListOfOrganisationUnits}}": "Vybráno: {{commaSeparatedListOfOfOrganisationUnits}}",
+    "Nothing selected": "Není vybráno nic",
     "User organisation unit": "Organizační jednotka uživatele",
     "User sub-units": "Podjednotky uživatele",
     "User sub-x2-units": "Jednotky 2. řádu uživatele",

package/build/cjs/locales/zh/translations.json

@@ -1,20 +1,20 @@
 {
-    "view only": "",
-    "view and edit": "",
-    "all users ({{accessLevel}})": "",
-    "{{userOrGroup}} ({{accessLevel}})": "",
-    "Shared with {{commaSeparatedListOfUsersAndGroups}}": "",
-    "Not shared with any users or groups": "",
-    "About this visualization": "",
+    "view only": "只读",
+    "view and edit": "查看和编辑",
+    "all users ({{accessLevel}})": "所有用户 ({{accessLevel}})",
+    "{{userOrGroup}} ({{accessLevel}})": "{{userOrGroup}} ({{accessLevel}})",
+    "Shared with {{commaSeparatedListOfUsersAndGroups}}": "与 {{commaSeparatedListOfUsersAndGroups}} 共享",
+    "Not shared with any users or groups": "不与任何用户或组共享",
+    "About this visualization": "关于此可视化",
     "No description": "无描述",
-    "Last updated {{time}}": "",
-    "Created {{time}} by {{author}}": "",
-    "Viewed {{count}} times": "",
+    "Last updated {{time}}": "最后更新 {{time}}",
+    "Created {{time}} by {{author}}": "由 {{author}} 在 {{time}} 创建",
+    "Viewed {{count}} times": "查看了 {{count}} 次",
     "Notifications": "通知",
-    "You're subscribed and getting updates about new interpretations.": "",
-    "Unsubscribe": "",
-    "Subscribe to get updates about new interpretations.": "",
-    "Subscribe": "",
+    "You're subscribed and getting updates about new interpretations.": "您已订阅并获取有关新解释的更新。",
+    "Unsubscribe": "退订",
+    "Subscribe to get updates about new interpretations.": "订阅以获取有关新解释的更新。",
+    "Subscribe": "订阅",
     "Data Type": "数据类型",
     "All types": "所有类型",
     "Totals only": "总计",
@@ -117,11 +117,11 @@
     "Options": "选项",
     "Hide": "隐藏",
     "Update": "更新",
-    "{{count}} org units": "",
-    "{{count}} levels": "",
-    "{{count}} groups": "",
-    "Selected: {{commaSeparatedListOfOrganisationUnits}}": "",
-    "Nothing selected": "",
+    "{{count}} org units": "{{count}} 个组织单位",
+    "{{count}} levels": "{{count}} 级",
+    "{{count}} groups": "{{count}} 组",
+    "Selected: {{commaSeparatedListOfOrganisationUnits}}": "已选择：{{commaSeparatedListOfOrganisationUnits}}",
+    "Nothing selected": "未选择任何内容",
     "User organisation unit": "用户所在机构",
     "User sub-units": "我的下属机构",
     "User sub-x2-units": "该用户2级下属机构",

package/build/cjs/modules/layout/dimension.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.DIMENSION_PROPS = exports.DIMENSION_PROP_ITEMS = exports.DIMENSION_PROP_ID = exports.DIMENSION = void 0;
+exports.DIMENSION_PROPS = exports.DIMENSION_PROP_FILTER = exports.DIMENSION_PROP_ITEMS = exports.DIMENSION_PROP_ID = exports.DIMENSION = void 0;
 
 var _isObject = _interopRequireDefault(require("lodash/isObject"));
 
@@ -31,5 +31,12 @@ const DIMENSION_PROP_ITEMS = {
   isValid: prop => Array.isArray(prop)
 };
 exports.DIMENSION_PROP_ITEMS = DIMENSION_PROP_ITEMS;
-const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS];
+const DIMENSION_PROP_FILTER = {
+  name: 'filter',
+  defaultValue: [],
+  required: false,
+  isValid: prop => (0, _isString.default)(prop)
+};
+exports.DIMENSION_PROP_FILTER = DIMENSION_PROP_FILTER;
+const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER];
 exports.DIMENSION_PROPS = DIMENSION_PROPS;

package/build/cjs/modules/layout/dimensionCreate.js

@@ -7,11 +7,19 @@ exports.dimensionCreate = void 0;
 
 var _dimension = require("./dimension");
 
-const dimensionCreate = (dimensionId, itemIds = []) => ({
-  [_dimension.DIMENSION_PROP_ID.name]: dimensionId,
-  [_dimension.DIMENSION_PROP_ITEMS.name]: itemIds.map(id => ({
-    id
-  }))
-});
+const dimensionCreate = (dimensionId, itemIds = [], args = {}) => {
+  const dimension = {
+    [_dimension.DIMENSION_PROP_ID.name]: dimensionId,
+    ...(itemIds.length && {
+      [_dimension.DIMENSION_PROP_ITEMS.name]: itemIds.map(id => ({
+        id
+      }))
+    }),
+    ...(args.filter && {
+      [_dimension.DIMENSION_PROP_FILTER.name]: args.filter
+    })
+  };
+  return dimension;
+};
 
 exports.dimensionCreate = dimensionCreate;

package/build/es/api/analytics/AnalyticsRequest.js

@@ -43,20 +43,28 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
     const columns = visualization.columns || [];
     const rows = visualization.rows || [];
     columns.concat(rows).forEach(d => {
+      var _d$legendSet, _d$items;
+
       let dimension = d.dimension;
 
+      if ((_d$legendSet = d.legendSet) !== null && _d$legendSet !== void 0 && _d$legendSet.id) {
+        dimension += "-".concat(d.legendSet.id);
+      }
+
       if (d.filter) {
         dimension += ":".concat(d.filter);
       }
 
-      request = request.addDimension(dimension, d.items.map(item => item.id));
+      request = request.addDimension(dimension, (_d$items = d.items) === null || _d$items === void 0 ? void 0 : _d$items.map(item => item.id));
     }); // extract filters from visualization
 
     const filters = visualization.filters || []; // only pass dx/pe/ou as dimension
 
     const fixedIds = Object.keys(getFixedDimensions());
     filters.forEach(f => {
-      request = passFilterAsDimension && fixedIds.includes(f.dimension) ? request.addDimension(f.dimension, f.items.map(item => item.id)) : request.addFilter(f.dimension, f.items.map(item => item.id));
+      var _f$items, _f$items2;
+
+      request = passFilterAsDimension && fixedIds.includes(f.dimension) ? request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id)) : request.addFilter(f.dimension, (_f$items2 = f.items) === null || _f$items2 === void 0 ? void 0 : _f$items2.map(item => item.id));
     });
     return request;
   }

package/build/es/api/analytics/AnalyticsRequestDimensionsMixin.js

@@ -116,12 +116,16 @@ class extends base {
     if (existingDimension) {
       this.dimensions.splice(dimensionIndex, 1, {
         dimension,
-        items: updatedItems
+        ...(items && {
+          items: updatedItems
+        })
       });
     } else {
       this.dimensions.push({
         dimension,
-        items: updatedItems
+        ...(items && {
+          items: updatedItems
+        })
       });
     }
 

package/build/es/api/analytics/__tests__/AnalyticsRequest.spec.js

@@ -115,8 +115,7 @@ describe('AnalyticsRequest', () => {
       it('should add the given dimension without any associated value', () => {
         request.addDimension('Jtf34kNZhzP');
         expect(request.dimensions).toEqual([{
-          dimension: 'Jtf34kNZhzP',
-          items: []
+          dimension: 'Jtf34kNZhzP'
         }]);
       });
       it('should add the given dimension with the associated value (passed as string)', () => {

package/build/es/components/OrgUnitDimension/OrgUnitDimension.js

@@ -31,7 +31,7 @@ const OrgUnitDimension = ({
     let result = [...selected];
 
     if (checked && DYNAMIC_ORG_UNITS.includes(id)) {
-      result = [...result.filter(item => DYNAMIC_ORG_UNITS.includes(item.id) || ouIdHelper.hasLevelPrefix(item.id) || ouIdHelper.hasGroupPrefix(item.id)), {
+      result = [...result.filter(item => DYNAMIC_ORG_UNITS.includes(item.id)), {
         id,
         displayName
       }];
@@ -191,7 +191,9 @@ const OrgUnitDimension = ({
     onChange: onSelectItems,
     dataTest: 'org-unit-tree'
   })), /*#__PURE__*/React.createElement("div", {
-    className: "jsx-".concat(styles.__hash) + " " + "selectsWrapper"
+    className: "jsx-".concat(styles.__hash) + " " + (cx('selectsWrapper', {
+      disabled: selected.some(item => DYNAMIC_ORG_UNITS.includes(item.id))
+    }) || "")
   }, /*#__PURE__*/React.createElement(MultiSelect, {
     selected: ouLevels.length ? selected.filter(item => ouIdHelper.hasLevelPrefix(item.id)).map(item => ouIdHelper.removePrefix(item.id)) : [],
     onChange: ({

package/build/es/locales/cs/translations.json

@@ -1,23 +1,23 @@
 {
-    "view only": "",
-    "view and edit": "",
-    "all users ({{accessLevel}})": "",
-    "{{userOrGroup}} ({{accessLevel}})": "",
-    "Shared with {{commaSeparatedListOfUsersAndGroups}}": "",
-    "Not shared with any users or groups": "",
-    "About this visualization": "",
+    "view only": "pouze zobrazit",
+    "view and edit": "zobrazit a upravit",
+    "all users ({{accessLevel}})": "všichni uživatelé ({{accessLevel}})",
+    "{{userOrGroup}} ({{accessLevel}})": "{{userOrGroup}} ({{accessLevel}})",
+    "Shared with {{commaSeparatedListOfUsersAndGroups}}": "Sdíleno s {{commaSeparatedListOfUsersAndGroups}}",
+    "Not shared with any users or groups": "Nesdíleno s žádnými uživateli ani skupinami",
+    "About this visualization": "O této vizualizaci",
     "No description": "Bez popisu",
-    "Last updated {{time}}": "",
-    "Created {{time}} by {{author}}": "",
-    "Viewed {{count}} times_0": "",
-    "Viewed {{count}} times_1": "",
-    "Viewed {{count}} times_2": "",
-    "Viewed {{count}} times_3": "",
+    "Last updated {{time}}": "Poslední aktualizace {{time}}",
+    "Created {{time}} by {{author}}": "Vytvořeno {{time}} uživatelem {{author}}",
+    "Viewed {{count}} times_0": "Zobrazeno 1 krát",
+    "Viewed {{count}} times_1": "Zobrazeno {{count}}krát",
+    "Viewed {{count}} times_2": "Zobrazeno {{count}}krát",
+    "Viewed {{count}} times_3": "Zobrazeno {{count}}krát",
     "Notifications": "Oznámení",
-    "You're subscribed and getting updates about new interpretations.": "",
-    "Unsubscribe": "",
-    "Subscribe to get updates about new interpretations.": "",
-    "Subscribe": "",
+    "You're subscribed and getting updates about new interpretations.": "Jste přihlášeni k odběru a dostáváte aktualizace o nových interpretacích.",
+    "Unsubscribe": "Odhlásit odběr",
+    "Subscribe to get updates about new interpretations.": "Přihlaste se k odběru novinek o nových interpretacích.",
+    "Subscribe": "Odebírat",
     "Data Type": "Typ dat",
     "All types": "Všechny typy",
     "Totals only": "Pouze součty",
@@ -120,20 +120,20 @@
     "Options": "Možnosti",
     "Hide": "Skrýt",
     "Update": "Aktualizovat",
-    "{{count}} org units_0": "",
-    "{{count}} org units_1": "",
-    "{{count}} org units_2": "",
-    "{{count}} org units_3": "",
-    "{{count}} levels_0": "",
-    "{{count}} levels_1": "",
-    "{{count}} levels_2": "",
-    "{{count}} levels_3": "",
-    "{{count}} groups_0": "",
-    "{{count}} groups_1": "",
-    "{{count}} groups_2": "",
-    "{{count}} groups_3": "",
-    "Selected: {{commaSeparatedListOfOrganisationUnits}}": "",
-    "Nothing selected": "",
+    "{{count}} org units_0": "{{count}} organizační jednotka",
+    "{{count}} org units_1": "{{count}} organizační jednotky",
+    "{{count}} org units_2": "{{count}} organizačních jednotek",
+    "{{count}} org units_3": "{{count}} organizačních jednotek",
+    "{{count}} levels_0": "{{count}} úroveň",
+    "{{count}} levels_1": "{{count}} úrovně",
+    "{{count}} levels_2": "{{count}} úrovní",
+    "{{count}} levels_3": "{{count}} úrovní",
+    "{{count}} groups_0": "{{count}} skupina",
+    "{{count}} groups_1": "{{count}} skupiny",
+    "{{count}} groups_2": "{{count}} skupin",
+    "{{count}} groups_3": "{{count}} skupin",
+    "Selected: {{commaSeparatedListOfOrganisationUnits}}": "Vybráno: {{commaSeparatedListOfOfOrganisationUnits}}",
+    "Nothing selected": "Není vybráno nic",
     "User organisation unit": "Organizační jednotka uživatele",
     "User sub-units": "Podjednotky uživatele",
     "User sub-x2-units": "Jednotky 2. řádu uživatele",

package/build/es/locales/zh/translations.json

@@ -1,20 +1,20 @@
 {
-    "view only": "",
-    "view and edit": "",
-    "all users ({{accessLevel}})": "",
-    "{{userOrGroup}} ({{accessLevel}})": "",
-    "Shared with {{commaSeparatedListOfUsersAndGroups}}": "",
-    "Not shared with any users or groups": "",
-    "About this visualization": "",
+    "view only": "只读",
+    "view and edit": "查看和编辑",
+    "all users ({{accessLevel}})": "所有用户 ({{accessLevel}})",
+    "{{userOrGroup}} ({{accessLevel}})": "{{userOrGroup}} ({{accessLevel}})",
+    "Shared with {{commaSeparatedListOfUsersAndGroups}}": "与 {{commaSeparatedListOfUsersAndGroups}} 共享",
+    "Not shared with any users or groups": "不与任何用户或组共享",
+    "About this visualization": "关于此可视化",
     "No description": "无描述",
-    "Last updated {{time}}": "",
-    "Created {{time}} by {{author}}": "",
-    "Viewed {{count}} times": "",
+    "Last updated {{time}}": "最后更新 {{time}}",
+    "Created {{time}} by {{author}}": "由 {{author}} 在 {{time}} 创建",
+    "Viewed {{count}} times": "查看了 {{count}} 次",
     "Notifications": "通知",
-    "You're subscribed and getting updates about new interpretations.": "",
-    "Unsubscribe": "",
-    "Subscribe to get updates about new interpretations.": "",
-    "Subscribe": "",
+    "You're subscribed and getting updates about new interpretations.": "您已订阅并获取有关新解释的更新。",
+    "Unsubscribe": "退订",
+    "Subscribe to get updates about new interpretations.": "订阅以获取有关新解释的更新。",
+    "Subscribe": "订阅",
     "Data Type": "数据类型",
     "All types": "所有类型",
     "Totals only": "总计",
@@ -117,11 +117,11 @@
     "Options": "选项",
     "Hide": "隐藏",
     "Update": "更新",
-    "{{count}} org units": "",
-    "{{count}} levels": "",
-    "{{count}} groups": "",
-    "Selected: {{commaSeparatedListOfOrganisationUnits}}": "",
-    "Nothing selected": "",
+    "{{count}} org units": "{{count}} 个组织单位",
+    "{{count}} levels": "{{count}} 级",
+    "{{count}} groups": "{{count}} 组",
+    "Selected: {{commaSeparatedListOfOrganisationUnits}}": "已选择：{{commaSeparatedListOfOrganisationUnits}}",
+    "Nothing selected": "未选择任何内容",
     "User organisation unit": "用户所在机构",
     "User sub-units": "我的下属机构",
     "User sub-x2-units": "该用户2级下属机构",

package/build/es/modules/layout/dimension.js

@@ -17,4 +17,10 @@ export const DIMENSION_PROP_ITEMS = {
   required: false,
   isValid: prop => Array.isArray(prop)
 };
-export const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS];
+export const DIMENSION_PROP_FILTER = {
+  name: 'filter',
+  defaultValue: [],
+  required: false,
+  isValid: prop => isString(prop)
+};
+export const DIMENSION_PROPS = [DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER];

package/build/es/modules/layout/dimensionCreate.js

@@ -1,7 +1,15 @@
-import { DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS } from './dimension';
-export const dimensionCreate = (dimensionId, itemIds = []) => ({
-  [DIMENSION_PROP_ID.name]: dimensionId,
-  [DIMENSION_PROP_ITEMS.name]: itemIds.map(id => ({
-    id
-  }))
-});
+import { DIMENSION_PROP_ID, DIMENSION_PROP_ITEMS, DIMENSION_PROP_FILTER } from './dimension';
+export const dimensionCreate = (dimensionId, itemIds = [], args = {}) => {
+  const dimension = {
+    [DIMENSION_PROP_ID.name]: dimensionId,
+    ...(itemIds.length && {
+      [DIMENSION_PROP_ITEMS.name]: itemIds.map(id => ({
+        id
+      }))
+    }),
+    ...(args.filter && {
+      [DIMENSION_PROP_FILTER.name]: args.filter
+    })
+  };
+  return dimension;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/analytics",
-    "version": "21.0.5",
+    "version": "21.0.9",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {