@dhis2/analytics 26.9.6 → 26.10.1

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

@@ -3,19 +3,20 @@ function _extends() { return _extends = Object.assign ? Object.assign.bind() : f
 import { useDataEngine } from '@dhis2/app-runtime';
 import { Transfer, InputField, IconInfo16, Button, IconAdd24 } from '@dhis2/ui';
 import PropTypes from 'prop-types';
-import React, { useState } from 'react';
+import React, { useRef, useState } from 'react';
 import { apiFetchOptions } from '../../api/dimensions.js';
 import i18n from '../../locales/index.js';
 import { DATA_SETS_CONSTANTS, REPORTING_RATE } from '../../modules/dataSets.js';
 import { DIMENSION_TYPE_ALL, DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_INDICATOR, TOTALS, DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM } from '../../modules/dataTypes.js';
-import { getIcon, getTooltipText } from '../../modules/dimensionListItem.js';
+import { getIcon, getDimensionType } from '../../modules/dimensionListItem.js';
 import { TRANSFER_HEIGHT, TRANSFER_OPTIONS_WIDTH, TRANSFER_SELECTED_WIDTH } from '../../modules/dimensionSelectorHelper.js';
 import { useDebounce, useDidUpdateEffect } from '../../modules/utils.js';
 import styles from '../styles/DimensionSelector.style.js';
-import { TransferOption } from '../TransferOption.js';
 import CalculationModal from './Calculation/CalculationModal.js';
 import DataTypeSelector from './DataTypeSelector.js';
 import GroupSelector from './GroupSelector.js';
+import { InfoPopover } from './Info/InfoPopover.js';
+import { TransferOption } from './TransferOption.js';
 const LeftHeader = _ref => {
   let {
     searchTerm,
@@ -203,6 +204,7 @@ const ItemSelector = _ref5 => {
     dataTest,
     onEDISave
   } = _ref5;
+  const itemsRef = useRef(new Map());
   const [state, setState] = useState({
     searchTerm: '',
     dataTypes,
@@ -222,12 +224,13 @@ const ItemSelector = _ref5 => {
     }).includes(DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM)
   });
   const [currentCalculation, setCurrentCalculation] = useState();
+  const [currentDataItem, setCurrentDataItem] = useState();
+  const debouncedSearchTerm = useDebounce(state.searchTerm, 500);
   const dataEngine = useDataEngine();
   const setSearchTerm = searchTerm => setState(state => ({
     ...state,
     searchTerm
   }));
-  const debouncedSearchTerm = useDebounce(state.searchTerm, 500);
   const fetchItems = async page => {
     var _result$dimensionItem;
     setState(state => ({
@@ -391,7 +394,9 @@ const ItemSelector = _ref5 => {
       subGroup: dataType === DIMENSION_TYPE_DATA_ELEMENT ? TOTALS : null
     }
   }));
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Transfer, {
+  return /*#__PURE__*/React.createElement("div", {
+    className: `jsx-${styles.__hash}` + " " + "transfer-container"
+  }, /*#__PURE__*/React.createElement(Transfer, {
     onChange: _ref9 => {
       let {
         selected
@@ -445,17 +450,23 @@ const ItemSelector = _ref5 => {
       return /*#__PURE__*/React.createElement(TransferOption
       /* eslint-disable react/prop-types */, _extends({}, props, {
         active: isActive(props.value),
+        showingInfo: (currentDataItem === null || currentDataItem === void 0 ? void 0 : currentDataItem.id) === props.value,
         icon: getIcon(getItemType(props.value)),
-        tooltipText: getTooltipText({
+        dimensionType: getDimensionType({
           type: getItemType(props.value),
           expression: props.expression
         }),
         dataTest: `${dataTest}-transfer-option`,
+        itemsRef: itemsRef,
         onEditClick: getItemType(props.value) === DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM && !(((_props$access = props.access) === null || _props$access === void 0 ? void 0 : _props$access.write) === false) && state.supportsEDI ? () => setCurrentCalculation({
           id: props.value,
           name: props.label,
           expression: props.expression
-        }) : undefined
+        }) : undefined,
+        onInfoClick: () => setCurrentDataItem({
+          id: props.value,
+          type: getItemType(props.value)
+        })
         /* eslint-enable react/prop-types */
       }));
     },
@@ -466,6 +477,12 @@ const ItemSelector = _ref5 => {
     onClose: () => setCurrentCalculation(),
     onDelete: onDeleteCalculation,
     displayNameProp: displayNameProp
+  }), currentDataItem && /*#__PURE__*/React.createElement(InfoPopover, {
+    dataTest: `${dataTest}-info`,
+    item: currentDataItem,
+    reference: itemsRef.current.get(currentDataItem.id),
+    onClose: () => setCurrentDataItem(),
+    displayNameProp: displayNameProp
   }), /*#__PURE__*/React.createElement(_JSXStyle, {
     id: styles.__hash
   }, styles));

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

@@ -0,0 +1,109 @@
+import _JSXStyle from "styled-jsx/style";
+import { IconEdit16, IconInfo16 } from '@dhis2/ui';
+import cx from 'classnames';
+import PropTypes from 'prop-types';
+import React from 'react';
+import styles from './styles/TransferOption.style.js';
+export const TransferOption = _ref => {
+  let {
+    disabled,
+    label,
+    highlighted,
+    selected,
+    onClick,
+    onDoubleClick,
+    value,
+    icon,
+    active,
+    dimensionType,
+    dataTest,
+    itemsRef,
+    showingInfo,
+    onEditClick,
+    onInfoClick
+  } = _ref;
+  const renderContent = () => /*#__PURE__*/React.createElement("div", {
+    "data-test": `${dataTest}-content`,
+    onClick: event => {
+      if (disabled) {
+        return;
+      }
+      onClick({
+        label,
+        value
+      }, event);
+    },
+    onDoubleClick: event => {
+      if (disabled) {
+        return;
+      }
+      onDoubleClick({
+        label,
+        value
+      }, event);
+    },
+    className: `jsx-${styles.__hash}` + " " + (cx('item', {
+      highlighted,
+      disabled,
+      selected,
+      inactive: active !== undefined && !active
+    }) || "")
+  }, /*#__PURE__*/React.createElement("div", {
+    className: `jsx-${styles.__hash}` + " " + "labelGroup"
+  }, /*#__PURE__*/React.createElement("span", {
+    className: `jsx-${styles.__hash}` + " " + "icon"
+  }, icon), /*#__PURE__*/React.createElement("span", {
+    className: `jsx-${styles.__hash}` + " " + "label"
+  }, label), onEditClick && /*#__PURE__*/React.createElement("span", {
+    onClick: e => {
+      e.stopPropagation();
+      onEditClick();
+    },
+    "data-test": `${dataTest}-edit-button`,
+    className: `jsx-${styles.__hash}` + " " + "edit"
+  }, /*#__PURE__*/React.createElement(IconEdit16, null))), /*#__PURE__*/React.createElement("div", {
+    className: `jsx-${styles.__hash}` + " " + (cx('group', 'nowrap', 'typeGroup') || "")
+  }, /*#__PURE__*/React.createElement("span", {
+    className: `jsx-${styles.__hash}` + " " + "type"
+  }, dimensionType), /*#__PURE__*/React.createElement("span", {
+    ref: node => {
+      node ? itemsRef.current.set(value, node) : itemsRef.current.delete(value);
+    }
+    // avoid moving items when toggling the info popover
+    // sometimes a double click event is fired
+    ,
+    onDoubleClick: e => e.stopPropagation(),
+    onClick: e => {
+      e.stopPropagation();
+      onInfoClick();
+    },
+    "data-test": `${dataTest}-info-button`,
+    className: `jsx-${styles.__hash}` + " " + (cx('info', {
+      active: showingInfo
+    }) || "")
+  }, /*#__PURE__*/React.createElement(IconInfo16, null))), /*#__PURE__*/React.createElement(_JSXStyle, {
+    id: styles.__hash
+  }, styles));
+  return /*#__PURE__*/React.createElement("div", {
+    "data-value": value,
+    "data-test": dataTest,
+    className: "wrapper"
+  }, renderContent());
+};
+TransferOption.propTypes = {
+  label: PropTypes.string.isRequired,
+  value: PropTypes.string.isRequired,
+  active: PropTypes.bool,
+  dataTest: PropTypes.string,
+  dimensionType: PropTypes.string,
+  disabled: PropTypes.bool,
+  highlighted: PropTypes.bool,
+  icon: PropTypes.node,
+  itemsRef: PropTypes.object,
+  selected: PropTypes.bool,
+  showingInfo: PropTypes.bool,
+  onClick: PropTypes.func,
+  onDoubleClick: PropTypes.func,
+  onEditClick: PropTypes.func,
+  onInfoClick: PropTypes.func
+};

package/build/es/components/DataDimension/styles/TransferOption.style.js

@@ -0,0 +1,4 @@
+import { colors, spacers, theme } from '@dhis2/ui';
+const _defaultExport = [`.wrapper.jsx-2953719875:last-child{margin-bottom:${spacers.dp4};}`, `.item.jsx-2953719875{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;background:${colors.white};font-size:14px;line-height:16px;border-bottom:1px solid ${colors.grey300};-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;}`, `.item.jsx-2953719875:hover{background:${colors.grey100};}`, ".disabled.jsx-2953719875{opacity:0.3;cursor:not-allowed;}", ".inactive.jsx-2953719875{opacity:0.3;}", ".labelGroup.jsx-2953719875{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;margin:6px 4px;}", ".typeGroup.jsx-2953719875{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;margin:0;-webkit-align-self:stretch;-ms-flex-item-align:stretch;align-self:stretch;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}", ".nowrap.jsx-2953719875{-webkit-flex-shrink:0;-ms-flex-negative:0;flex-shrink:0;}", ".icon.jsx-2953719875,.label.jsx-2953719875{line-height:18px;}", `.icon.jsx-2953719875{margin-right:${spacers.dp4};display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;vertical-align:text-bottom;}`, `.label.jsx-2953719875{font-size:14px;color:${colors.grey900};}`, `.type.jsx-2953719875{font-size:10px;-webkit-letter-spacing:-0.2px;-moz-letter-spacing:-0.2px;-ms-letter-spacing:-0.2px;letter-spacing:-0.2px;color:${colors.grey600};font-family:ui-monospace,'Cascadia Code','Source Code Pro',Menlo, Consolas,'DejaVu Sans Mono',monospace;font-weight:normal;}`, `.edit.jsx-2953719875,.info.jsx-2953719875{height:16px;margin-top:1px;margin-left:${spacers.dp8};cursor:pointer;color:${colors.grey600};}`, `.info.jsx-2953719875{margin:0 0 0 ${spacers.dp4};height:100%;padding:0 6px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-align-items:center;-webkit-box-align:center;-ms-flex-align:center;align-items:center;}`, `.info.active.jsx-2953719875{background-color:${colors.grey300};color:${colors.grey900};}`, `.highlighted.jsx-2953719875{background:${theme.secondary700};}`, `.highlighted.jsx-2953719875:hover{background:${theme.secondary800};}`, `.highlighted.jsx-2953719875 .label.jsx-2953719875{color:${colors.white};}`, `.highlighted.jsx-2953719875 .type.jsx-2953719875{color:${theme.secondary050};}`, `.highlighted.jsx-2953719875 .info.jsx-2953719875{color:${theme.secondary050};}`, `.highlighted.jsx-2953719875 .icon path{fill:${colors.teal050};}`, `.highlighted.jsx-2953719875 .type.jsx-2953719875{color:${colors.teal050};}`, `.edit.jsx-2953719875:hover,.info.jsx-2953719875:hover{background-color:${colors.grey200};border-radius:0px;}`, `.highlighted.jsx-2953719875 .info.active.jsx-2953719875{background-color:${theme.secondary900};}`, `.highlighted.jsx-2953719875 .edit.jsx-2953719875:hover,.highlighted.jsx-2953719875 .info.jsx-2953719875:hover{background-color:${theme.secondary900};}`];
+_defaultExport.__hash = "2953719875";
+export default _defaultExport;

package/build/es/components/DimensionsPanel/List/__tests__/__snapshots__/DimensionItem.spec.js.snap

@@ -4,10 +4,6 @@ exports[`DimensionItem matches the snapshot 1`] = `
 <Fragment>
   <CssVariables
     colors={true}
-    elevations={false}
-    layers={false}
-    spacers={false}
-    theme={false}
   />
   <li
     className="item"
@@ -56,10 +52,6 @@ exports[`DimensionItem matches the snapshot with locked 1`] = `
 <Fragment>
   <CssVariables
     colors={true}
-    elevations={false}
-    layers={false}
-    spacers={false}
-    theme={false}
   />
   <li
     className="item"
@@ -126,10 +118,6 @@ exports[`DimensionItem matches the snapshot with onOptionsClick 1`] = `
 <Fragment>
   <CssVariables
     colors={true}
-    elevations={false}
-    layers={false}
-    spacers={false}
-    theme={false}
   />
   <li
     className="item"
@@ -182,10 +170,6 @@ exports[`DimensionItem matches the snapshot with recommended 1`] = `
 <Fragment>
   <CssVariables
     colors={true}
-    elevations={false}
-    layers={false}
-    spacers={false}
-    theme={false}
   />
   <li
     className="item"
@@ -234,10 +218,6 @@ exports[`DimensionItem matches the snapshot with selected 1`] = `
 <Fragment>
   <CssVariables
     colors={true}
-    elevations={false}
-    layers={false}
-    spacers={false}
-    theme={false}
   />
   <li
     className="item selected"

package/build/es/components/OrgUnitDimension/__tests__/__snapshots__/OrgUnitDimension.spec.js.snap

@@ -37,11 +37,8 @@ exports[`The OrgUnitDimension component matches the snapshot 1`] = `
   >
     <OrganisationUnitTree
       dataTest="org-unit-tree"
-      filter={Array []}
-      highlighted={Array []}
       initiallyExpanded={Array []}
       onChange={[Function]}
-      renderNodeLabel={[Function]}
       roots={Array []}
       selected={Array []}
     />
@@ -78,12 +75,10 @@ exports[`The OrgUnitDimension component matches the snapshot 1`] = `
       className="deselectButton"
     >
       <Button
-        dataTest="dhis2-uicore-button"
         disabled={true}
         onClick={[Function]}
         secondary={true}
         small={true}
-        type="button"
       >
         Deselect all
       </Button>

package/build/es/components/PeriodDimension/__tests__/__snapshots__/FixedPeriodSingleSelect.spec.js.snap

@@ -28,73 +28,61 @@ exports[`The Fixed Period Single Select component matches the snapshot 1`] = `
     selected="201405"
   >
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201401"
       label="January 2014"
       value="201401"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201402"
       label="February 2014"
       value="201402"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201403"
       label="March 2014"
       value="201403"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201404"
       label="April 2014"
       value="201404"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201405"
       label="May 2014"
       value="201405"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201406"
       label="June 2014"
       value="201406"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201407"
       label="July 2014"
       value="201407"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201408"
       label="August 2014"
       value="201408"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201409"
       label="September 2014"
       value="201409"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201410"
       label="October 2014"
       value="201410"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201411"
       label="November 2014"
       value="201411"
     />
     <SingleSelectOption
-      dataTest="dhis2-uicore-singleselectoption"
       key="201412"
       label="December 2014"
       value="201412"

package/build/es/components/PeriodDimension/__tests__/__snapshots__/PeriodSelector.spec.js.snap

@@ -4,16 +4,10 @@ exports[`The Period Selector component matches the snapshot 1`] = `
 <Transfer
   dataTest="period-dimension-transfer"
   enableOrderChange={true}
-  filterCallback={[Function]}
-  filterCallbackPicked={[Function]}
   height="512px"
-  initialSearchTerm=""
-  initialSearchTermPicked=""
   leftHeader={
     <React.Fragment>
-      <TabBar
-        dataTest="dhis2-uicore-tabbar"
-      >
+      <TabBar>
         <Tab
           dataTest="period-dimension-relative-periods-button"
           onClick={[Function]}
@@ -44,7 +38,6 @@ exports[`The Period Selector component matches the snapshot 1`] = `
       </style>
     </React.Fragment>
   }
-  maxSelections={Infinity}
   onChange={[Function]}
   options={
     Array [
@@ -74,7 +67,7 @@ exports[`The Period Selector component matches the snapshot 1`] = `
       },
     ]
   }
-  optionsWidth="420px"
+  optionsWidth="520px"
   renderOption={[Function]}
   rightFooter={<React.Fragment />}
   rightHeader={<RightHeader />}
@@ -91,6 +84,6 @@ exports[`The Period Selector component matches the snapshot 1`] = `
       </style>
     </React.Fragment>
   }
-  selectedWidth="298px"
+  selectedWidth="520px"
 />
 `;

package/build/es/components/styles/DimensionSelector.style.js

@@ -1,4 +1,4 @@
 import { spacers, colors } from '@dhis2/ui';
-const _defaultExport = [`.filterContainer.jsx-336728173{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:${spacers.dp12};margin-top:${spacers.dp8};}`, `.emptyList.jsx-336728173{text-align:center;font-size:14px;line-height:16px;margin:${spacers.dp24} 0 0;color:${colors.grey700};}`, ".rightHeader.jsx-336728173{font-size:14px;font-weight:400;}", `.leftHeader.jsx-336728173{padding:${spacers.dp12} ${spacers.dp4};}`, `.info-container.jsx-336728173{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:${spacers.dp8};padding:${spacers.dp8};background-color:${colors.grey200};border-radius:3px;}`, `.info-text.jsx-336728173{padding-left:${spacers.dp8};color:${colors.grey900};font-size:12px;line-height:16px;}`, `.calculation-button.jsx-336728173{margin:${spacers.dp8} 0;}`];
-_defaultExport.__hash = "336728173";
+const _defaultExport = [".transfer-container.jsx-1438110436{min-width:800px;}", `.filterContainer.jsx-1438110436{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:${spacers.dp12};margin-top:${spacers.dp8};}`, `.emptyList.jsx-1438110436{text-align:center;font-size:14px;line-height:16px;margin:${spacers.dp24} 0 0;color:${colors.grey700};}`, ".rightHeader.jsx-1438110436{font-size:14px;font-weight:400;}", `.leftHeader.jsx-1438110436{padding:${spacers.dp12} ${spacers.dp4};}`, `.info-container.jsx-1438110436{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:${spacers.dp8};padding:${spacers.dp8};background-color:${colors.grey200};border-radius:3px;}`, `.info-text.jsx-1438110436{padding-left:${spacers.dp8};color:${colors.grey900};font-size:12px;line-height:16px;}`, `.calculation-button.jsx-1438110436{margin:${spacers.dp8} 0;}`];
+_defaultExport.__hash = "1438110436";
 export default _defaultExport;

package/build/es/index.js

@@ -70,7 +70,7 @@ export { layoutHasDynamicDimension } from './modules/layout/layoutHasDynamicDime
 export { layoutHasPeriodDimension } from './modules/layout/layoutHasPeriodDimension.js';
 
 // Modules: valueTypes
-export { VALUE_TYPE_NUMBER, VALUE_TYPE_UNIT_INTERVAL, VALUE_TYPE_PERCENTAGE, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE, VALUE_TYPE_TEXT, VALUE_TYPE_LONG_TEXT, VALUE_TYPE_LETTER, VALUE_TYPE_PHONE_NUMBER, VALUE_TYPE_EMAIL, VALUE_TYPE_USERNAME, VALUE_TYPE_URL, VALUE_TYPE_BOOLEAN, VALUE_TYPE_TRUE_ONLY, VALUE_TYPE_DATE, VALUE_TYPE_TIME, VALUE_TYPE_DATETIME, VALUE_TYPE_ORGANISATION_UNIT, VALUE_TYPE_AGE } from './modules/valueTypes.js';
+export { VALUE_TYPE_TEXT, VALUE_TYPE_LONG_TEXT, VALUE_TYPE_MULTI_TEXT, VALUE_TYPE_LETTER, VALUE_TYPE_PHONE_NUMBER, VALUE_TYPE_EMAIL, VALUE_TYPE_BOOLEAN, VALUE_TYPE_TRUE_ONLY, VALUE_TYPE_DATE, VALUE_TYPE_DATETIME, VALUE_TYPE_TIME, VALUE_TYPE_NUMBER, VALUE_TYPE_UNIT_INTERVAL, VALUE_TYPE_PERCENTAGE, VALUE_TYPE_INTEGER, VALUE_TYPE_INTEGER_POSITIVE, VALUE_TYPE_INTEGER_NEGATIVE, VALUE_TYPE_INTEGER_ZERO_OR_POSITIVE, VALUE_TYPE_TRACKER_ASSOCIATE, VALUE_TYPE_USERNAME, VALUE_TYPE_COORDINATE, VALUE_TYPE_ORGANISATION_UNIT, VALUE_TYPE_REFERENCE, VALUE_TYPE_AGE, VALUE_TYPE_URL, VALUE_TYPE_FILE_RESOURCE, VALUE_TYPE_IMAGE, VALUE_TYPE_GEOJSON, valueTypeDisplayNames } from './modules/valueTypes.js';
 export { AXIS, AXIS_ID_COLUMNS, AXIS_ID_ROWS, AXIS_ID_FILTERS, DEFAULT_AXIS_IDS } from './modules/layout/axis.js';
 export { axisGetAllItems } from './modules/layout/axisGetAllItems.js';
 export { axisGetDimension } from './modules/layout/axisGetDimension.js';

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

@@ -23,6 +23,8 @@
     "About this map": "",
     "About this line list": "",
     "About this visualization": "",
+    "About this event chart": "",
+    "About this event report": "",
     "This app could not retrieve required data.": "",
     "Network error": "",
     "Data / Edit calculation": "",
@@ -48,9 +50,58 @@
     "Drag items here, or double click in the list, to start building a calculation formula": "",
     "Math operators": "",
     "Data Type": "نوع البيانات",
+    "Only {{dataType}} can be used in {{visType}}": "",
     "All types": "جميع الأنواع",
     "Disaggregation": "تصنيف",
     "No data": "لا توجد بيانات",
+    "Expression description": "وصف التعبير",
+    "Error loading value": "",
+    "None": "لا شيء",
+    "Data set(s)": "",
+    "Zero is significant": "",
+    "True": "صح",
+    "False": "خطأ",
+    "Value type": "نوع القيمة",
+    "Aggregation type": "نوع التجميع",
+    "Category combo": "Category combo",
+    "Option set": "حزمة الخيارات",
+    "Group membership": "",
+    "Legend set(s)": "",
+    "Category option name": "",
+    "Category combo name": "",
+    "Categories name": "",
+    "Period type": "نوع الفترة الزمنية",
+    "Indicators": "المؤشرات",
+    "Expiry days": "أيام انتهاء الصلاحية",
+    "Type": "النوع",
+    "Data element": "عنصر البيانات",
+    "Tracked entity attribute": "سمة الكيان المتعقب",
+    "Numerator description": "وصف البسط",
+    "Numerator expression": "",
+    "Denominator description": "وصف المقام",
+    "Denominator expression": "",
+    "Annualized": "بشكل سنوي",
+    "Yes": "نعم",
+    "No": "لا",
+    "Indicator type": "نوع المؤشر",
+    "Decimals in output": "",
+    "There was a problem loading information for this data item.": "",
+    "Name": "الإسم",
+    "Description": "الوصف",
+    "Code": "الكود",
+    "ID": "ID",
+    "Last updated date": "",
+    "Created date": "",
+    "Created by": "تم الإنشاء بواسطة",
+    "Custom": "مخصص",
+    "Program": "البرنامج",
+    "Analytics type": "Analytics type",
+    "Enrollment": "التسجيل",
+    "Event": "حدث",
+    "Analytics period boundaries": "",
+    "{{ offsetPeriodType }} × {{ offsetPeriods }}": "",
+    "Expression": "‏‏التعبير",
+    "Filter": "عامل التصفية",
     "Search by data item name": "",
     "No items selected": "لم يتم تحديد عناصر",
     "Selected Items": "العناصر المحددة",
@@ -58,10 +109,12 @@
     "No data sets found": "",
     "No event data items found": "",
     "No program indicators found": "",
+    "No calculations found": "",
     "No indicators found for \"{{- searchTerm}}\"": "",
     "No data sets found for \"{{- searchTerm}}\"": "",
     "No event data items found for \"{{- searchTerm}}\"": "",
     "No program indicators found for \"{{- searchTerm}}\"": "",
+    "No calculations found for \"{{- searchTerm}}\"": "",
     "Nothing found for \"{{- searchTerm}}\"": "",
     "Calculation": "",
     "Metric type": "",
@@ -99,8 +152,6 @@
     "Open in this app": "فتح في هذا التطبيق",
     "Close": "إغلاق",
     "Rename {{fileType}}": "",
-    "Name": "الإسم",
-    "Description": "الوصف",
     "Rename": "إعادة التسمية",
     "{{- objectName}} (copy)": "",
     "Save {{fileType}} as": "",
@@ -120,6 +171,7 @@
     "The interpretation couldn’t be displayed. Try again or contact your system administrator.": "",
     "Hide interpretation": "",
     "Write an interpretation": "كتابة تفسير",
+    "Other people viewing this interpretation in the future may see more data.": "",
     "Post interpretation": "",
     "Interpretations": "التفسيرات",
     "Reply": "رد",
@@ -132,24 +184,13 @@
     "View replies": "",
     "Unlike": "إلغاء الإعجاب",
     "Like": "إعجاب",
-    "Share": "مشاركة",
     "See interpretation": "",
+    "Open in app": "",
+    "Share": "مشاركة",
     "Manage sharing": "إدارة المشاركة",
     "Could not update interpretation": "",
     "Enter interpretation text": "",
-    "Bold text": "",
-    "Italic text": "",
-    "Link to a URL": "",
-    "Mention a user": "",
-    "Add emoji": "",
-    "Preview": "معاينة",
-    "Back to write mode": "",
-    "Too many results. Try refining the search.": "",
-    "Search for a user": "",
-    "Searching for \"{{- searchText}}\"": "",
-    "No results found": "لم يتم العثور على أي نتائج",
     "Not available offline": "غير متوفر في وضع عدم الإتصال",
-    "Created by": "تم الإنشاء بواسطة",
     "Anyone": "أي شخص",
     "Only you": "",
     "Others": "أخرى",
@@ -157,7 +198,6 @@
     "Filter by name": "تصفية بواسطة الاسم",
     "Created": "تم الإنشاء",
     "Last updated": "آخر تحديث",
-    "Type": "النوع",
     "Clear filters": "إلغاء عوامل التصفية",
     "{{firstItemIndex}}-{{lastItemIndex}} of {{totalNumberOfItems}}": "",
     "Open": "مفتوح",
@@ -215,13 +255,12 @@
     "Select a level": "حدد مستوى",
     "Select a group": "حدد مجموعة",
     "Deselect all": "إلغاء تحديد الكل",
-    "Period type": "نوع الفترة الزمنية",
     "Year": "سنة",
     "Select year": "اختر السنة",
     "Period": "الفترة الزمنية",
+    "Selected Periods": "الفترات المحددة",
     "Relative periods": "الفترات الزمنية النسبية",
     "Fixed periods": "فترات زمنية ثابتة",
-    "Selected Periods": "الفترات المحددة",
     "No periods selected": "لم يتم تحديد أية فترات زمنية",
     "Daily": "يومي",
     "Weekly": "أسبوعي",
@@ -291,6 +330,14 @@
     "Six-months": "ستة-أشهر",
     "Financial Years": "السنوات المالية",
     "Years": "السنوات",
+    "Value: {{value}}": "",
+    "Bold text": "",
+    "Italic text": "",
+    "Link to a URL": "",
+    "Mention a user": "",
+    "Add emoji": "",
+    "Preview": "معاينة",
+    "Back to write mode": "",
     "Interpretations and details": "",
     "Translating to": "",
     "Choose a locale": "",
@@ -301,9 +348,12 @@
     "Cannot save while offline": "",
     "Could not load translations": "",
     "Retry": "",
+    "Too many results. Try refining the search.": "",
+    "Search for a user": "",
+    "Searching for \"{{- searchText}}\"": "",
+    "No results found": "لم يتم العثور على أي نتائج",
     "Series": "سلسلة",
     "Category": "الفئة",
-    "Filter": "عامل التصفية",
     "Columns": "الأعمدة",
     "Rows": "الصفوف",
     "Points": "",
@@ -312,16 +362,13 @@
     "Actual reports": "الإبلاغات الفعلية",
     "Actual reports on time": "الإبلاغات الفعلية في الوقت المحدد",
     "Expected reports": "الإبلاغات المتوقعة",
-    "Program": "البرنامج",
     "Select a program": "حدد برنامجاً",
-    "Indicators": "المؤشرات",
     "Indicator group": "مجموعة المؤشرات",
     "All groups": "",
     "Indicator": "المؤشر",
     "No indicator groups found": "",
     "Loading indicator groups": "",
     "Data element group": "مجموعة عناصر البيانات",
-    "Data element": "عنصر البيانات",
     "No data element groups found": "",
     "Loading data element groups": "",
     "Data sets": "حزم البيانات",
@@ -370,9 +417,35 @@
     "{{thresholdFactor}} × Modified Z-score high": "",
     "{{thresholdFactor}} × Z-score low": "",
     "{{thresholdFactor}} × Z-score high": "",
+    "Not applicable": "",
     "Data": "بيانات",
     "Organisation unit": "الوحدة التنظيمية",
     "Assigned Categories": "الفئات المعينة",
+    "Text": "نص",
+    "Long text": "نص طويل",
+    "Multi text": "",
+    "Letter": "حرف",
+    "Phone number": "رقم الهاتف",
+    "Email": "بريد إلكتروني",
+    "Yes/No": "نعم/لا",
+    "Yes Only": "نعم فقط",
+    "Date": "التاريخ",
+    "Date & Time": "تاريخ ووقت",
+    "Time": "الوقت",
+    "Unit interval": "الفاصل الزمني للوحدة",
+    "Percentage": "النسبة المئوية",
+    "Integer": "عدد صحيح",
+    "Positive Integer": "عدد صحيح موجب",
+    "Negative Integer": "عدد صحيح سالب",
+    "Positive or Zero Integer": "عدد صحيح موجب أو صفري",
+    "Tracker Associate": "ارتباط التتبع",
+    "Username": "اسم المستخدم",
+    "Coordinate": "الإحداثية",
+    "Reference": "المرجع",
+    "Age": "عُمر",
+    "URL": "عنوان URL",
+    "Image": "الصورة",
+    "GeoJSON": "",
     "Pivot table": "الجدول المحوري",
     "Area": "مساحة",
     "Stacked area": "منطقة تراكمية",
@@ -389,6 +462,7 @@
     "Radar": "مخطط رادار",
     "Scatter": "",
     "Single value": "قيمة مفردة",
+    "Outlier table": "",
     "All charts": "",
     "{{seriesName}} (trend)": "",
     "Trend": "الاتجاه",