@dhis2/analytics 29.4.0 → 29.4.2

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

@@ -9,7 +9,7 @@
     "Last updated {{time}}": "最后更新 {{time}}",
     "Created {{time}} by {{author}}": "由 {{author}} 在 {{time}} 创建",
     "Created {{time}}": "已创建 {{time}}",
-    "Viewed {{count}} times": "查看了 {{count}} 条",
+    "Viewed {{count}} times_0": "查看了 {{count}} 条",
     "Notifications": "通知",
     "You're subscribed and getting updates about new interpretations.": "您已订阅并获取有关新解释的更新。",
     "Unsubscribe": "退订",
@@ -186,7 +186,7 @@
     "Error loading interpretations": "",
     "Could not load interpretations": "",
     "Reply": "应答",
-    "{{count}} replies": "{{count}}条回复",
+    "{{count}} replies_0": "{{count}}条回复",
     "View replies": "查看回复",
     "Unlike": "不喜欢",
     "Like": "喜欢",
@@ -236,9 +236,9 @@
     "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "未找到行列表。尝试调整您的搜索或过滤选项以找到您要查找的内容。",
     "New line list": "新行列表",
     "Hide": "隐藏",
-    "{{count}} org units": "{{count}} 个组织单位",
-    "{{count}} levels": "{{count}} 级",
-    "{{count}} groups": "{{count}} 组",
+    "{{count}} org units_0": "{{count}} 个组织单位",
+    "{{count}} levels_0": "{{count}} 级",
+    "{{count}} groups_0": "{{count}} 组",
     "Selected: {{commaSeparatedListOfOrganisationUnits}}": "已选择：{{commaSeparatedListOfOrganisationUnits}}",
     "Nothing selected": "未选择任何内容",
     "User organisation unit": "用户所在机构",
@@ -467,6 +467,6 @@
     "Target": "目标",
     "Base": "基",
     "Axis {{axisId}}": "轴{{axisId}}",
-    "{{count}} items": "{{count}} 个条目",
+    "{{count}} items_0": "{{count}} 个条目",
     "Reset zoom": "重设缩放"
 }

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

@@ -9,7 +9,7 @@
     "Last updated {{time}}": "最近更新的{{time}}",
     "Created {{time}} by {{author}}": "",
     "Created {{time}}": "",
-    "Viewed {{count}} times": "",
+    "Viewed {{count}} times_0": "",
     "Notifications": "通知",
     "You're subscribed and getting updates about new interpretations.": "",
     "Unsubscribe": "",
@@ -186,7 +186,7 @@
     "Error loading interpretations": "",
     "Could not load interpretations": "",
     "Reply": "回复",
-    "{{count}} replies": "",
+    "{{count}} replies_0": "",
     "View replies": "",
     "Unlike": "不喜欢",
     "Like": "Like",
@@ -236,9 +236,9 @@
     "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
     "New line list": "",
     "Hide": "隐藏",
-    "{{count}} org units": "",
-    "{{count}} levels": "",
-    "{{count}} groups": "",
+    "{{count}} org units_0": "",
+    "{{count}} levels_0": "",
+    "{{count}} groups_0": "",
     "Selected: {{commaSeparatedListOfOrganisationUnits}}": "已选择：{{commaSeparatedListOfOrganisationUnits}}",
     "Nothing selected": "未选择任何内容",
     "User organisation unit": "用户所在机构",
@@ -467,6 +467,6 @@
     "Target": "目标",
     "Base": "基",
     "Axis {{axisId}}": "轴{{axisId}}",
-    "{{count}} items": "",
+    "{{count}} items_0": "",
     "Reset zoom": ""
 }

package/build/cjs/modules/legends.js

@@ -10,7 +10,7 @@ const LEGEND_DISPLAY_STYLE_FILL = exports.LEGEND_DISPLAY_STYLE_FILL = 'FILL';
 const LEGEND_DISPLAY_STYLE_TEXT = exports.LEGEND_DISPLAY_STYLE_TEXT = 'TEXT';
 const getLegendByValueFromLegendSet = (legendSet, value) => {
   var _legendSet$legends;
-  return Number.isInteger(parseInt(value)) ? legendSet === null || legendSet === void 0 ? void 0 : (_legendSet$legends = legendSet.legends) === null || _legendSet$legends === void 0 ? void 0 : _legendSet$legends.find(legend => value >= legend.startValue && value < legend.endValue // TODO: Confirm inclusive/exclusive bounds
+  return Number.isInteger(parseInt(value)) ? legendSet === null || legendSet === void 0 || (_legendSet$legends = legendSet.legends) === null || _legendSet$legends === void 0 ? void 0 : _legendSet$legends.find(legend => value >= legend.startValue && value < legend.endValue // TODO: Confirm inclusive/exclusive bounds
   ) : null;
 };
 exports.getLegendByValueFromLegendSet = getLegendByValueFromLegendSet;

package/build/cjs/modules/pivotTable/applyLegendSet.js

@@ -8,7 +8,7 @@ var _ui = require("@dhis2/ui");
 var _legends = require("../legends.js");
 var _isColorBright = require("./isColorBright.js");
 const getLegendSet = (engine, dxDimension) => {
-  var _engine$visualization, _engine$visualization2, _engine$visualization3;
+  var _engine$visualization, _engine$visualization2;
   let legendSetId;
   switch ((_engine$visualization = engine.visualization.legend) === null || _engine$visualization === void 0 ? void 0 : _engine$visualization.strategy) {
     case _legends.LEGEND_DISPLAY_STRATEGY_BY_DATA_ITEM:
@@ -18,15 +18,15 @@ const getLegendSet = (engine, dxDimension) => {
       break;
     case _legends.LEGEND_DISPLAY_STRATEGY_FIXED:
     default:
-      legendSetId = (_engine$visualization2 = engine.visualization.legend) === null || _engine$visualization2 === void 0 ? void 0 : (_engine$visualization3 = _engine$visualization2.set) === null || _engine$visualization3 === void 0 ? void 0 : _engine$visualization3.id;
+      legendSetId = (_engine$visualization2 = engine.visualization.legend) === null || _engine$visualization2 === void 0 || (_engine$visualization2 = _engine$visualization2.set) === null || _engine$visualization2 === void 0 ? void 0 : _engine$visualization2.id;
       break;
   }
   return engine.legendSets[legendSetId];
 };
 const buildStyleObject = (legendColor, engine) => {
-  var _engine$visualization4;
+  var _engine$visualization3;
   const style = {};
-  switch ((_engine$visualization4 = engine.visualization.legend) === null || _engine$visualization4 === void 0 ? void 0 : _engine$visualization4.style) {
+  switch ((_engine$visualization3 = engine.visualization.legend) === null || _engine$visualization3 === void 0 ? void 0 : _engine$visualization3.style) {
     case _legends.LEGEND_DISPLAY_STYLE_TEXT:
       style.color = legendColor;
       break;

package/build/cjs/modules/pivotTable/useScrollPosition.js

@@ -12,13 +12,13 @@ const useScrollPosition = (containerRef, debounceWait = 10) => {
     x: 0,
     y: 0
   });
-  const onScroll = (0, _react.useCallback)((0, _debounce.default)(() => {
+  const onScroll = (0, _react.useMemo)(() => (0, _debounce.default)(() => {
     const scroll = {
       x: containerRef.current.scrollLeft,
       y: containerRef.current.scrollTop
     };
     setScrollPosition(scroll);
-  }, debounceWait));
+  }, debounceWait), [containerRef, debounceWait]);
   (0, _react.useEffect)(() => {
     const currentRef = containerRef.current;
     if (!currentRef) {

package/build/cjs/modules/utils.js

@@ -26,6 +26,7 @@ const useDidUpdateEffect = (fn, inputs) => {
     } else {
       didMountRef.current = true;
     }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, inputs);
 };
 

package/build/cjs/visualizations/config/adapters/dhis_highcharts/events/loadCustomSVG/singleValue/index.js

@@ -34,11 +34,11 @@ function loadSingleValueSVG() {
   while (!fitsWithinContainer && dynamicStyles.hasNext()) {
     styles = dynamicStyles.next();
     valueElement.attr(styles.value);
-    subTextElement === null || subTextElement === void 0 ? void 0 : subTextElement.attr(styles.subText);
+    subTextElement === null || subTextElement === void 0 || subTextElement.attr(styles.subText);
     fitsWithinContainer = (0, _checkIfFitsWithinContainer.checkIfFitsWithinContainer)(_getAvailableSpace.getAvailableSpace.call(this, styles.spacing.valueTop), valueElement, subTextElement, icon, subText, styles.spacing);
   }
   _positionElements.positionElements.call(this, valueElement, subTextElement, iconElement, styles.spacing);
   valueElement.attr('visibility', 'visible');
-  iconElement === null || iconElement === void 0 ? void 0 : iconElement.attr('visibility', 'visible');
-  subTextElement === null || subTextElement === void 0 ? void 0 : subTextElement.attr('visibility', 'visible');
+  iconElement === null || iconElement === void 0 || iconElement.attr('visibility', 'visible');
+  subTextElement === null || subTextElement === void 0 || subTextElement.attr('visibility', 'visible');
 }

package/build/cjs/visualizations/config/adapters/dhis_highcharts/index.js

@@ -48,7 +48,7 @@ function _default({
   extraConfig,
   extraOptions
 }) {
-  var _layout$legend, _layout$seriesKey, _layout$seriesKey2, _layout$seriesKey2$la, _config$xAxis;
+  var _layout$legend, _layout$seriesKey, _layout$seriesKey2, _config$xAxis;
   const _layout = getTransformedLayout(layout);
   const _extraOptions = getTransformedExtraOptions(extraOptions);
   const stacked = (0, _visTypes.isStacked)(_layout.type);
@@ -91,7 +91,7 @@ function _default({
     // legend
     legend: (0, _legend.default)({
       isHidden: (_layout$seriesKey = _layout.seriesKey) === null || _layout$seriesKey === void 0 ? void 0 : _layout$seriesKey.hidden,
-      fontStyle: (_layout$seriesKey2 = _layout.seriesKey) === null || _layout$seriesKey2 === void 0 ? void 0 : (_layout$seriesKey2$la = _layout$seriesKey2.label) === null || _layout$seriesKey2$la === void 0 ? void 0 : _layout$seriesKey2$la.fontStyle,
+      fontStyle: (_layout$seriesKey2 = _layout.seriesKey) === null || _layout$seriesKey2 === void 0 || (_layout$seriesKey2 = _layout$seriesKey2.label) === null || _layout$seriesKey2 === void 0 ? void 0 : _layout$seriesKey2.fontStyle,
       visType: _layout.type,
       dashboard: _extraOptions.dashboard
     }),

package/build/cjs/visualizations/config/adapters/dhis_highcharts/series/index.js

@@ -192,7 +192,7 @@ function _default({
         displayStrategy
       });
   }
-  (_series = series) === null || _series === void 0 ? void 0 : _series.forEach(seriesObj => {
+  (_series = series) === null || _series === void 0 || _series.forEach(seriesObj => {
     // animation
     seriesObj.animation = extraOptions.dashboard ? false : {
       duration: getAnimation(extraOptions.animation, DEFAULT_ANIMATION_DURATION)

package/build/cjs/visualizations/config/adapters/dhis_highcharts/subtitle/index.js

@@ -77,9 +77,9 @@ function subtitle(series, layout, metaData, extraOptions) {
   switch (layout.type) {
     case _visTypes.VIS_TYPE_SINGLE_VALUE:
       {
-        var _defaultFontStyle$FON, _layout$fontStyle, _layout$fontStyle$FON;
-        const defaultColor = _fontStyle.defaultFontStyle === null || _fontStyle.defaultFontStyle === void 0 ? void 0 : (_defaultFontStyle$FON = _fontStyle.defaultFontStyle[_fontStyle.FONT_STYLE_VISUALIZATION_SUBTITLE]) === null || _defaultFontStyle$FON === void 0 ? void 0 : _defaultFontStyle$FON[_fontStyle.FONT_STYLE_OPTION_TEXT_COLOR];
-        const customColor = layout === null || layout === void 0 ? void 0 : (_layout$fontStyle = layout.fontStyle) === null || _layout$fontStyle === void 0 ? void 0 : (_layout$fontStyle$FON = _layout$fontStyle[_fontStyle.FONT_STYLE_VISUALIZATION_SUBTITLE]) === null || _layout$fontStyle$FON === void 0 ? void 0 : _layout$fontStyle$FON[_fontStyle.FONT_STYLE_OPTION_TEXT_COLOR];
+        var _defaultFontStyle$FON, _layout$fontStyle;
+        const defaultColor = _fontStyle.defaultFontStyle === null || _fontStyle.defaultFontStyle === void 0 || (_defaultFontStyle$FON = _fontStyle.defaultFontStyle[_fontStyle.FONT_STYLE_VISUALIZATION_SUBTITLE]) === null || _defaultFontStyle$FON === void 0 ? void 0 : _defaultFontStyle$FON[_fontStyle.FONT_STYLE_OPTION_TEXT_COLOR];
+        const customColor = layout === null || layout === void 0 || (_layout$fontStyle = layout.fontStyle) === null || _layout$fontStyle === void 0 || (_layout$fontStyle = _layout$fontStyle[_fontStyle.FONT_STYLE_VISUALIZATION_SUBTITLE]) === null || _layout$fontStyle === void 0 ? void 0 : _layout$fontStyle[_fontStyle.FONT_STYLE_OPTION_TEXT_COLOR];
         subtitle.style.color = (0, _singleValue.getSingleValueSubtitleColor)(customColor, defaultColor, series[0], legendOptions, legendSets);
         if (dashboard) {
           // Single value subtitle text should be multiline

package/build/cjs/visualizations/config/adapters/dhis_highcharts/title/index.js

@@ -83,9 +83,9 @@ function _default(layout, metaData, extraOptions, series) {
   switch (layout.type) {
     case _visTypes.VIS_TYPE_SINGLE_VALUE:
       {
-        var _defaultFontStyle$FON, _layout$fontStyle, _layout$fontStyle$FON;
-        const defaultColor = _fontStyle.defaultFontStyle === null || _fontStyle.defaultFontStyle === void 0 ? void 0 : (_defaultFontStyle$FON = _fontStyle.defaultFontStyle[_fontStyle.FONT_STYLE_VISUALIZATION_TITLE]) === null || _defaultFontStyle$FON === void 0 ? void 0 : _defaultFontStyle$FON[_fontStyle.FONT_STYLE_OPTION_TEXT_COLOR];
-        const customColor = layout === null || layout === void 0 ? void 0 : (_layout$fontStyle = layout.fontStyle) === null || _layout$fontStyle === void 0 ? void 0 : (_layout$fontStyle$FON = _layout$fontStyle[_fontStyle.FONT_STYLE_VISUALIZATION_TITLE]) === null || _layout$fontStyle$FON === void 0 ? void 0 : _layout$fontStyle$FON[_fontStyle.FONT_STYLE_OPTION_TEXT_COLOR];
+        var _defaultFontStyle$FON, _layout$fontStyle;
+        const defaultColor = _fontStyle.defaultFontStyle === null || _fontStyle.defaultFontStyle === void 0 || (_defaultFontStyle$FON = _fontStyle.defaultFontStyle[_fontStyle.FONT_STYLE_VISUALIZATION_TITLE]) === null || _defaultFontStyle$FON === void 0 ? void 0 : _defaultFontStyle$FON[_fontStyle.FONT_STYLE_OPTION_TEXT_COLOR];
+        const customColor = layout === null || layout === void 0 || (_layout$fontStyle = layout.fontStyle) === null || _layout$fontStyle === void 0 || (_layout$fontStyle = _layout$fontStyle[_fontStyle.FONT_STYLE_VISUALIZATION_TITLE]) === null || _layout$fontStyle === void 0 ? void 0 : _layout$fontStyle[_fontStyle.FONT_STYLE_OPTION_TEXT_COLOR];
         title.style.color = (0, _singleValue.getSingleValueTitleColor)(customColor, defaultColor, series[0], legendOptions, legendSets);
         if (dashboard) {
           // TODO: is this always what we want?

package/build/cjs/visualizations/config/generators/highcharts/index.js

@@ -40,9 +40,9 @@ _highcharts.default.patterns.forEach((pattern, i) => {
 function drawLegendSymbolWrap() {
   const pick = _highcharts.default.pick;
   _highcharts.default.wrap(_highcharts.default.seriesTypes.column.prototype, 'drawLegendSymbol', function (proceed, legend, item) {
-    var _this$options$legendS, _this$options$legendS2;
+    var _this$options$legendS;
     const legendItem = item.legendItem;
-    if ((_this$options$legendS = this.options.legendSet) !== null && _this$options$legendS !== void 0 && (_this$options$legendS2 = _this$options$legendS.legends) !== null && _this$options$legendS2 !== void 0 && _this$options$legendS2.length) {
+    if ((_this$options$legendS = this.options.legendSet) !== null && _this$options$legendS !== void 0 && (_this$options$legendS = _this$options$legendS.legends) !== null && _this$options$legendS !== void 0 && _this$options$legendS.length) {
       const ys = legend.baseline - legend.symbolHeight + 1,
         // y start
         x = legend.symbolWidth / 2 > 8 ? legend.symbolWidth / 2 : 8,

package/build/cjs/visualizations/store/adapters/dhis_highcharts/yearOnYear.js

@@ -7,7 +7,7 @@ exports.default = _default;
 function _default(acc, series, categories, idValueMap, metaData, extraOptions) {
   var _extraOptions$xAxisLa;
   const seriesData = Array.from({
-    length: (extraOptions === null || extraOptions === void 0 ? void 0 : (_extraOptions$xAxisLa = extraOptions.xAxisLabels) === null || _extraOptions$xAxisLa === void 0 ? void 0 : _extraOptions$xAxisLa.length) || 0
+    length: (extraOptions === null || extraOptions === void 0 || (_extraOptions$xAxisLa = extraOptions.xAxisLabels) === null || _extraOptions$xAxisLa === void 0 ? void 0 : _extraOptions$xAxisLa.length) || 0
   }, () => null);
   categories[0].forEach(categoryItemId => {
     const position = extraOptions.periodKeyAxisIndexMap[categoryItemId];

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

@@ -47,7 +47,7 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
     const columns = visualization.columns || [];
     const rows = visualization.rows || [];
     columns.concat(rows).forEach(d => {
-      var _d$legendSet, _d$programStage, _d$repetition, _d$repetition$indexes;
+      var _d$legendSet, _d$programStage, _d$repetition;
       let dimension = d.dimension;
       if ((_d$legendSet = d.legendSet) !== null && _d$legendSet !== void 0 && _d$legendSet.id) {
         dimension += `-${d.legendSet.id}`;
@@ -56,7 +56,7 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
         dimension += `:${d.filter}`;
       }
       const programStageId = (_d$programStage = d.programStage) === null || _d$programStage === void 0 ? void 0 : _d$programStage.id;
-      if ((_d$repetition = d.repetition) !== null && _d$repetition !== void 0 && (_d$repetition$indexes = _d$repetition.indexes) !== null && _d$repetition$indexes !== void 0 && _d$repetition$indexes.length) {
+      if ((_d$repetition = d.repetition) !== null && _d$repetition !== void 0 && (_d$repetition = _d$repetition.indexes) !== null && _d$repetition !== void 0 && _d$repetition.length) {
         d.repetition.indexes.forEach(index => {
           var _d$program;
           request = request.addDimension(formatDimension({
@@ -87,13 +87,13 @@ class AnalyticsRequest extends AnalyticsRequestDimensionsMixin(AnalyticsRequestF
         var _f$items;
         request = request.addDimension(f.dimension, (_f$items = f.items) === null || _f$items === void 0 ? void 0 : _f$items.map(item => item.id));
       } else {
-        var _f$programStage, _f$repetition, _f$repetition$indexes;
+        var _f$programStage, _f$repetition;
         let filterString = f.dimension;
         if (f.filter) {
           filterString += `:${f.filter}`;
         }
         const programStageId = (_f$programStage = f.programStage) === null || _f$programStage === void 0 ? void 0 : _f$programStage.id;
-        if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition$indexes = _f$repetition.indexes) !== null && _f$repetition$indexes !== void 0 && _f$repetition$indexes.length) {
+        if ((_f$repetition = f.repetition) !== null && _f$repetition !== void 0 && (_f$repetition = _f$repetition.indexes) !== null && _f$repetition !== void 0 && _f$repetition.length) {
           f.repetition.indexes.forEach(index => {
             var _f$program;
             request = request.addFilter(formatDimension({

package/build/es/components/DataDimension/Calculation/DndContext.js

@@ -119,8 +119,8 @@ const OuterDndContext = ({
     active,
     over
   }) => {
-    var _over$data, _over$data$current, _over$data$current$so, _over$data$current2, _over$data$current3;
-    if (!(over !== null && over !== void 0 && over.id) || (over === null || over === void 0 ? void 0 : (_over$data = over.data) === null || _over$data === void 0 ? void 0 : (_over$data$current = _over$data.current) === null || _over$data$current === void 0 ? void 0 : (_over$data$current$so = _over$data$current.sortable) === null || _over$data$current$so === void 0 ? void 0 : _over$data$current$so.containerId) === OPTIONS_PANEL || !active.data.current) {
+    var _over$data, _over$data$current, _over$data$current2;
+    if (!(over !== null && over !== void 0 && over.id) || (over === null || over === void 0 || (_over$data = over.data) === null || _over$data === void 0 || (_over$data = _over$data.current) === null || _over$data === void 0 || (_over$data = _over$data.sortable) === null || _over$data === void 0 ? void 0 : _over$data.containerId) === OPTIONS_PANEL || !active.data.current) {
       // dropped over non-droppable or over options panel
       handleDragCancel();
       return;
@@ -136,8 +136,8 @@ const OuterDndContext = ({
       }
     };
     const destination = {
-      containerId: ((_over$data$current2 = over.data.current) === null || _over$data$current2 === void 0 ? void 0 : _over$data$current2.sortable.containerId) || over.id,
-      index: (_over$data$current3 = over.data.current) === null || _over$data$current3 === void 0 ? void 0 : _over$data$current3.sortable.index
+      containerId: ((_over$data$current = over.data.current) === null || _over$data$current === void 0 ? void 0 : _over$data$current.sortable.containerId) || over.id,
+      index: (_over$data$current2 = over.data.current) === null || _over$data$current2 === void 0 ? void 0 : _over$data$current2.sortable.index
     };
     onDragEnd({
       item,

package/build/es/components/DataDimension/Info/DataElementOperandInfo.js

@@ -44,7 +44,7 @@ export const DataElementOperandInfo = ({
     const dataElementOperand = dataElementOperands.dataElementOperands[0]
 
     // copy some common fields from dataElement
-    ;
+;
     ['code', 'created', 'createdBy', 'displayDescription', 'lastUpdated'].forEach(key => dataElementOperand[key] = dataElementOperand.dataElement[key]);
 
     // inject href as it is not returned from the API

package/build/es/components/DataDimension/ItemOptionsSelector/ItemOptionsSelector.js

@@ -72,7 +72,7 @@ export const ItemOptionsSelector = ({
       searchTerm: state.searchTerm
     });
     const newOptions = [];
-    (_result$dimensionItem = result.dimensionItems) === null || _result$dimensionItem === void 0 ? void 0 : _result$dimensionItem.forEach(item => {
+    (_result$dimensionItem = result.dimensionItems) === null || _result$dimensionItem === void 0 || _result$dimensionItem.forEach(item => {
       newOptions.push({
         label: item.name,
         value: item.id,

package/build/es/components/DataDimension/ItemSelector/ItemSelector.js

@@ -144,7 +144,7 @@ const ItemSelector = ({
       searchTerm: state.searchTerm
     });
     const newOptions = [];
-    (_result$dimensionItem = result.dimensionItems) === null || _result$dimensionItem === void 0 ? void 0 : _result$dimensionItem.forEach(item => {
+    (_result$dimensionItem = result.dimensionItems) === null || _result$dimensionItem === void 0 || _result$dimensionItem.forEach(item => {
       if (item.dimensionItemType === REPORTING_RATE) {
         if (state.filter.subGroup && state.filter.subGroup !== DIMENSION_TYPE_ALL) {
           const metric = DATA_SETS_CONSTANTS.find(item => item.id === state.filter.subGroup);

package/build/es/components/FileMenu/DeleteDialog.js

@@ -18,7 +18,7 @@ export const DeleteDialog = ({
   onDelete,
   onError
 }) => {
-  const mutation = useMemo(() => getMutation(type), []);
+  const mutation = useMemo(() => getMutation(type), [type]);
   const [mutate] = useDataMutation(mutation, {
     variables: {
       id

package/build/es/components/RichText/Editor/Editor.js

@@ -181,13 +181,13 @@ export const Editor = /*#__PURE__*/forwardRef(({
   useEffect(() => {
     if (initialFocus) {
       var _textareaRef$current;
-      (_textareaRef$current = textareaRef.current) === null || _textareaRef$current === void 0 ? void 0 : _textareaRef$current.focus();
+      (_textareaRef$current = textareaRef.current) === null || _textareaRef$current === void 0 || _textareaRef$current.focus();
     }
   }, [initialFocus, textareaRef]);
   useEffect(() => {
     if (caretPosRef.current) {
       var _textareaRef$current2;
-      (_textareaRef$current2 = textareaRef.current) === null || _textareaRef$current2 === void 0 ? void 0 : _textareaRef$current2.setSelectionRange(caretPosRef.current, caretPosRef.current);
+      (_textareaRef$current2 = textareaRef.current) === null || _textareaRef$current2 === void 0 || _textareaRef$current2.setSelectionRange(caretPosRef.current, caretPosRef.current);
       caretPosRef.current = undefined;
     }
   }, [value, textareaRef]);

package/build/es/components/TranslationDialog/TranslationModal/TranslationForm.js

@@ -92,6 +92,7 @@ export const TranslationForm = ({
   useEffect(() => {
     const fetchTranslations = () => fetchFieldsTranslations(fieldsToTranslate);
     fetchTranslations();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [fieldsToTranslate]);
   useEffect(() => setNewTranslations(translations), [translations]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ModalContent, null, /*#__PURE__*/React.createElement(DataTable, {

package/build/es/components/UserMention/useUserSearchResults.js

@@ -1,6 +1,6 @@
 import { useDataQuery } from '@dhis2/app-runtime';
 import debounce from 'lodash/debounce';
-import { useCallback, useEffect, useState } from 'react';
+import { useEffect, useMemo, useState } from 'react';
 const usersQuery = {
   users: {
     resource: 'users/gist',
@@ -32,7 +32,7 @@ export const useUserSearchResults = ({
   } = useDataQuery(usersQuery, {
     lazy: true
   });
-  const debouncedRefetch = useCallback(debounce(refetch, 250), [refetch]);
+  const debouncedRefetch = useMemo(() => debounce(refetch, 250), [refetch]);
   useEffect(() => {
     if (searchText.length) {
       debouncedRefetch({

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

@@ -9,8 +9,6 @@
     "Last updated {{time}}": "Last updated {{time}}",
     "Created {{time}} by {{author}}": "Created {{time}} by {{author}}",
     "Created {{time}}": "Created {{time}}",
-    "Viewed {{count}} times": "Viewed 1 time",
-    "Viewed {{count}} times_plural": "Viewed {{count}} times",
     "Notifications": "Notifications",
     "You're subscribed and getting updates about new interpretations.": "You're subscribed and getting updates about new interpretations.",
     "Unsubscribe": "Unsubscribe",
@@ -187,8 +185,6 @@
     "Error loading interpretations": "Error loading interpretations",
     "Could not load interpretations": "Could not load interpretations",
     "Reply": "Reply",
-    "{{count}} replies": "{{count}} reply",
-    "{{count}} replies_plural": "{{count}} replies",
     "View replies": "View replies",
     "Unlike": "Unlike",
     "Like": "Like",
@@ -238,12 +234,6 @@
     "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "No line lists found. Try adjusting your search or filter options to find what you're looking for.",
     "New line list": "New line list",
     "Hide": "Hide",
-    "{{count}} org units": "{{count}} org unit",
-    "{{count}} org units_plural": "{{count}} org units",
-    "{{count}} levels": "{{count}} level",
-    "{{count}} levels_plural": "{{count}} levels",
-    "{{count}} groups": "{{count}} group",
-    "{{count}} groups_plural": "{{count}} groups",
     "Selected: {{commaSeparatedListOfOrganisationUnits}}": "Selected: {{commaSeparatedListOfOrganisationUnits}}",
     "Nothing selected": "Nothing selected",
     "User organisation unit": "User organisation unit",
@@ -478,7 +468,5 @@
     "Target": "Target",
     "Base": "Base",
     "Axis {{axisId}}": "Axis {{axisId}}",
-    "{{count}} items": "{{count}} item",
-    "{{count}} items_plural": "{{count}} items",
     "Reset zoom": "Reset zoom"
 }

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

@@ -9,7 +9,7 @@
     "Last updated {{time}}": "Terakhir diperbarui {{time}}",
     "Created {{time}} by {{author}}": "",
     "Created {{time}}": "",
-    "Viewed {{count}} times": "",
+    "Viewed {{count}} times_0": "",
     "Notifications": "",
     "You're subscribed and getting updates about new interpretations.": "",
     "Unsubscribe": "",
@@ -186,7 +186,7 @@
     "Error loading interpretations": "",
     "Could not load interpretations": "",
     "Reply": "Balas",
-    "{{count}} replies": "balasan {{count}} ",
+    "{{count}} replies_0": "balasan {{count}} ",
     "View replies": "",
     "Unlike": "Batalkan Suka",
     "Like": "Suka",
@@ -236,9 +236,9 @@
     "No line lists found. Try adjusting your search or filter options to find what you're looking for.": "",
     "New line list": "",
     "Hide": "Sembunyikan",
-    "{{count}} org units": "",
-    "{{count}} levels": "",
-    "{{count}} groups": "",
+    "{{count}} org units_0": "",
+    "{{count}} levels_0": "",
+    "{{count}} groups_0": "",
     "Selected: {{commaSeparatedListOfOrganisationUnits}}": "",
     "Nothing selected": "",
     "User organisation unit": "",
@@ -467,6 +467,6 @@
     "Target": "Target",
     "Base": "Dasar",
     "Axis {{axisId}}": "Sumbu {{axisId}}",
-    "{{count}} items": "",
+    "{{count}} items_0": "",
     "Reset zoom": "Setel ulang zoom"
 }

package/build/es/locales/index.js

@@ -49,45 +49,90 @@ import viTranslations from './vi/translations.json';
 import zhTranslations from './zh/translations.json';
 import zh_CNTranslations from './zh_CN/translations.json';
 const namespace = 'default';
-i18n.addResources('ar', namespace, arTranslations);
-i18n.addResources('ar_EG', namespace, ar_EGTranslations);
-i18n.addResources('ar_IQ', namespace, ar_IQTranslations);
-i18n.addResources('bn', namespace, bnTranslations);
-i18n.addResources('ckb', namespace, ckbTranslations);
-i18n.addResources('cs', namespace, csTranslations);
-i18n.addResources('da', namespace, daTranslations);
-i18n.addResources('en', namespace, enTranslations);
-i18n.addResources('en_US', namespace, en_USTranslations);
-i18n.addResources('es', namespace, esTranslations);
-i18n.addResources('es_419', namespace, es_419Translations);
-i18n.addResources('fr', namespace, frTranslations);
-i18n.addResources('hi_IN', namespace, hi_INTranslations);
-i18n.addResources('id', namespace, idTranslations);
-i18n.addResources('km', namespace, kmTranslations);
-i18n.addResources('lo', namespace, loTranslations);
-i18n.addResources('my', namespace, myTranslations);
-i18n.addResources('nb', namespace, nbTranslations);
-i18n.addResources('ne', namespace, neTranslations);
-i18n.addResources('nl', namespace, nlTranslations);
-i18n.addResources('or', namespace, orTranslations);
-i18n.addResources('prs', namespace, prsTranslations);
-i18n.addResources('ps', namespace, psTranslations);
-i18n.addResources('pt', namespace, ptTranslations);
-i18n.addResources('pt_BR', namespace, pt_BRTranslations);
-i18n.addResources('ro', namespace, roTranslations);
-i18n.addResources('ru', namespace, ruTranslations);
-i18n.addResources('si', namespace, siTranslations);
-i18n.addResources('sv', namespace, svTranslations);
-i18n.addResources('tet', namespace, tetTranslations);
-i18n.addResources('tg', namespace, tgTranslations);
-i18n.addResources('th', namespace, thTranslations);
-i18n.addResources('uk', namespace, ukTranslations);
-i18n.addResources('ur', namespace, urTranslations);
-i18n.addResources('uz_Cyrl', namespace, uz_CyrlTranslations);
-i18n.addResources('uz_Latn', namespace, uz_LatnTranslations);
-i18n.addResources('uz_UZ_Cyrl', namespace, uz_UZ_CyrlTranslations);
-i18n.addResources('uz_UZ_Latn', namespace, uz_UZ_LatnTranslations);
-i18n.addResources('vi', namespace, viTranslations);
-i18n.addResources('zh', namespace, zhTranslations);
-i18n.addResources('zh_CN', namespace, zh_CNTranslations);
+
+// Use 'deep' = true and 'overwrite' = false to add to, but not overwrite,
+// custom translations from the datastore (added by the app adapter)
+
+i18n.addResourceBundle('ar', namespace, arTranslations, true, false);
+i18n.addResourceBundle('ar', namespace, arTranslations, true, false);
+i18n.addResourceBundle('ar_EG', namespace, ar_EGTranslations, true, false);
+i18n.addResourceBundle('ar-EG', namespace, ar_EGTranslations, true, false);
+i18n.addResourceBundle('ar_IQ', namespace, ar_IQTranslations, true, false);
+i18n.addResourceBundle('ar-IQ', namespace, ar_IQTranslations, true, false);
+i18n.addResourceBundle('bn', namespace, bnTranslations, true, false);
+i18n.addResourceBundle('bn', namespace, bnTranslations, true, false);
+i18n.addResourceBundle('ckb', namespace, ckbTranslations, true, false);
+i18n.addResourceBundle('ckb', namespace, ckbTranslations, true, false);
+i18n.addResourceBundle('cs', namespace, csTranslations, true, false);
+i18n.addResourceBundle('cs', namespace, csTranslations, true, false);
+i18n.addResourceBundle('da', namespace, daTranslations, true, false);
+i18n.addResourceBundle('da', namespace, daTranslations, true, false);
+i18n.addResourceBundle('en', namespace, enTranslations, true, false);
+i18n.addResourceBundle('en', namespace, enTranslations, true, false);
+i18n.addResourceBundle('en_US', namespace, en_USTranslations, true, false);
+i18n.addResourceBundle('en-US', namespace, en_USTranslations, true, false);
+i18n.addResourceBundle('es', namespace, esTranslations, true, false);
+i18n.addResourceBundle('es', namespace, esTranslations, true, false);
+i18n.addResourceBundle('es_419', namespace, es_419Translations, true, false);
+i18n.addResourceBundle('es-419', namespace, es_419Translations, true, false);
+i18n.addResourceBundle('fr', namespace, frTranslations, true, false);
+i18n.addResourceBundle('fr', namespace, frTranslations, true, false);
+i18n.addResourceBundle('hi_IN', namespace, hi_INTranslations, true, false);
+i18n.addResourceBundle('hi-IN', namespace, hi_INTranslations, true, false);
+i18n.addResourceBundle('id', namespace, idTranslations, true, false);
+i18n.addResourceBundle('id', namespace, idTranslations, true, false);
+i18n.addResourceBundle('km', namespace, kmTranslations, true, false);
+i18n.addResourceBundle('km', namespace, kmTranslations, true, false);
+i18n.addResourceBundle('lo', namespace, loTranslations, true, false);
+i18n.addResourceBundle('lo', namespace, loTranslations, true, false);
+i18n.addResourceBundle('my', namespace, myTranslations, true, false);
+i18n.addResourceBundle('my', namespace, myTranslations, true, false);
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false);
+i18n.addResourceBundle('nb', namespace, nbTranslations, true, false);
+i18n.addResourceBundle('ne', namespace, neTranslations, true, false);
+i18n.addResourceBundle('ne', namespace, neTranslations, true, false);
+i18n.addResourceBundle('nl', namespace, nlTranslations, true, false);
+i18n.addResourceBundle('nl', namespace, nlTranslations, true, false);
+i18n.addResourceBundle('or', namespace, orTranslations, true, false);
+i18n.addResourceBundle('or', namespace, orTranslations, true, false);
+i18n.addResourceBundle('prs', namespace, prsTranslations, true, false);
+i18n.addResourceBundle('prs', namespace, prsTranslations, true, false);
+i18n.addResourceBundle('ps', namespace, psTranslations, true, false);
+i18n.addResourceBundle('ps', namespace, psTranslations, true, false);
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false);
+i18n.addResourceBundle('pt', namespace, ptTranslations, true, false);
+i18n.addResourceBundle('pt_BR', namespace, pt_BRTranslations, true, false);
+i18n.addResourceBundle('pt-BR', namespace, pt_BRTranslations, true, false);
+i18n.addResourceBundle('ro', namespace, roTranslations, true, false);
+i18n.addResourceBundle('ro', namespace, roTranslations, true, false);
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false);
+i18n.addResourceBundle('ru', namespace, ruTranslations, true, false);
+i18n.addResourceBundle('si', namespace, siTranslations, true, false);
+i18n.addResourceBundle('si', namespace, siTranslations, true, false);
+i18n.addResourceBundle('sv', namespace, svTranslations, true, false);
+i18n.addResourceBundle('sv', namespace, svTranslations, true, false);
+i18n.addResourceBundle('tet', namespace, tetTranslations, true, false);
+i18n.addResourceBundle('tet', namespace, tetTranslations, true, false);
+i18n.addResourceBundle('tg', namespace, tgTranslations, true, false);
+i18n.addResourceBundle('tg', namespace, tgTranslations, true, false);
+i18n.addResourceBundle('th', namespace, thTranslations, true, false);
+i18n.addResourceBundle('th', namespace, thTranslations, true, false);
+i18n.addResourceBundle('uk', namespace, ukTranslations, true, false);
+i18n.addResourceBundle('uk', namespace, ukTranslations, true, false);
+i18n.addResourceBundle('ur', namespace, urTranslations, true, false);
+i18n.addResourceBundle('ur', namespace, urTranslations, true, false);
+i18n.addResourceBundle('uz_Cyrl', namespace, uz_CyrlTranslations, true, false);
+i18n.addResourceBundle('uz-Cyrl', namespace, uz_CyrlTranslations, true, false);
+i18n.addResourceBundle('uz_Latn', namespace, uz_LatnTranslations, true, false);
+i18n.addResourceBundle('uz-Latn', namespace, uz_LatnTranslations, true, false);
+i18n.addResourceBundle('uz_UZ_Cyrl', namespace, uz_UZ_CyrlTranslations, true, false);
+i18n.addResourceBundle('uz-Cyrl-UZ', namespace, uz_UZ_CyrlTranslations, true, false);
+i18n.addResourceBundle('uz_UZ_Latn', namespace, uz_UZ_LatnTranslations, true, false);
+i18n.addResourceBundle('uz-Latn-UZ', namespace, uz_UZ_LatnTranslations, true, false);
+i18n.addResourceBundle('vi', namespace, viTranslations, true, false);
+i18n.addResourceBundle('vi', namespace, viTranslations, true, false);
+i18n.addResourceBundle('zh', namespace, zhTranslations, true, false);
+i18n.addResourceBundle('zh', namespace, zhTranslations, true, false);
+i18n.addResourceBundle('zh_CN', namespace, zh_CNTranslations, true, false);
+i18n.addResourceBundle('zh-CN', namespace, zh_CNTranslations, true, false);
 export default i18n;