@dhis2/analytics 26.12.2 → 26.13.0

package/build/es/__demo__/data/under-above-100.legendSet.json

@@ -1,113 +1,97 @@
 {
     "code": "UA100",
+    "name": "Under or above 100%",
     "created": "2017-05-19T15:43:40.983",
     "lastUpdated": "2017-05-19T15:43:40.983",
-    "name": "Under or above 100%",
-    "href": "http://localhost:8080/api/32/legendSets/gFJUXah1uRH",
-    "id": "gFJUXah1uRH",
-    "displayName": "Under or above 100%",
-    "publicAccess": "rw------",
-    "externalAccess": false,
-    "favorite": false,
-    "lastUpdatedBy": {
-      "id": "GOLswS44mh8"
+    "translations": [],
+    "createdBy": {
+        "id": "GOLswS44mh8",
+        "code": null,
+        "name": "Tom Wakiki",
+        "displayName": "Tom Wakiki",
+        "username": "system"
     },
-    "access": {
-      "read": true,
-      "update": true,
-      "externalize": false,
-      "delete": true,
-      "write": true,
-      "manage": true
+    "favorites": [],
+    "lastUpdatedBy": {
+        "id": "GOLswS44mh8",
+        "code": null,
+        "name": "Tom Wakiki",
+        "displayName": "Tom Wakiki",
+        "username": "system"
     },
-    "user": {
-      "id": "GOLswS44mh8"
+    "sharing": {
+        "owner": "GOLswS44mh8",
+        "external": false,
+        "users": {},
+        "userGroups": {},
+        "public": "rw------"
     },
-    "favorites": [
-      
-    ],
-    "userGroupAccesses": [
-      
-    ],
-    "attributeValues": [
-      
-    ],
     "legends": [
-      {
-        "lastUpdated": "2017-05-19T15:43:40.983",
-        "id": "I0lBkYHTjPw",
-        "created": "2017-05-19T15:43:40.983",
-        "name": "Above 100%",
-        "endValue": 900.0,
-        "color": "#B4F3BD",
-        "displayName": "Above 100%",
-        "externalAccess": false,
-        "startValue": 100.0,
-        "favorite": false,
-        "access": {
-          "read": true,
-          "update": true,
-          "externalize": false,
-          "delete": true,
-          "write": true,
-          "manage": true
-        },
-        "favorites": [
-          
-        ],
-        "translations": [
-          
-        ],
-        "userGroupAccesses": [
-          
-        ],
-        "attributeValues": [
-          
-        ],
-        "userAccesses": [
-          
-        ]
-      },
-      {
-        "lastUpdated": "2017-05-19T15:43:40.984",
-        "id": "qCU0BSbmwjX",
-        "created": "2017-05-19T15:43:40.984",
-        "name": "Under 100%",
-        "endValue": 100.0,
-        "color": "#FF9C89",
-        "displayName": "Under 100%",
-        "externalAccess": false,
-        "startValue": 0.0,
-        "favorite": false,
-        "access": {
-          "read": true,
-          "update": true,
-          "externalize": false,
-          "delete": true,
-          "write": true,
-          "manage": true
+        {
+            "name": "Above 100%",
+            "created": "2017-05-19T15:43:40.983",
+            "lastUpdated": "2017-05-19T15:43:40.983",
+            "translations": [],
+            "favorites": [],
+            "sharing": { "external": false, "users": {}, "userGroups": {} },
+            "startValue": 100.0,
+            "endValue": 900.0,
+            "color": "#B4F3BD",
+            "access": {
+                "manage": true,
+                "externalize": false,
+                "write": true,
+                "read": true,
+                "update": true,
+                "delete": true
+            },
+            "displayName": "Above 100%",
+            "favorite": false,
+            "id": "I0lBkYHTjPw",
+            "attributeValues": []
         },
-        "favorites": [
-          
-        ],
-        "translations": [
-          
-        ],
-        "userGroupAccesses": [
-          
-        ],
-        "attributeValues": [
-          
-        ],
-        "userAccesses": [
-          
-        ]
-      }
-    ],
-    "translations": [
-      
+        {
+            "name": "Under 100%",
+            "created": "2017-05-19T15:43:40.984",
+            "lastUpdated": "2017-05-19T15:43:40.984",
+            "translations": [],
+            "favorites": [],
+            "sharing": { "external": false, "users": {}, "userGroups": {} },
+            "startValue": 0.0,
+            "endValue": 100.0,
+            "color": "#FF9C89",
+            "access": {
+                "manage": true,
+                "externalize": false,
+                "write": true,
+                "read": true,
+                "update": true,
+                "delete": true
+            },
+            "displayName": "Under 100%",
+            "favorite": false,
+            "id": "qCU0BSbmwjX",
+            "attributeValues": []
+        }
     ],
-    "userAccesses": [
-      
-    ]
-  }
+    "access": {
+        "manage": true,
+        "externalize": false,
+        "write": true,
+        "read": true,
+        "update": true,
+        "delete": true
+    },
+    "displayName": "Under or above 100%",
+    "favorite": false,
+    "user": {
+        "id": "GOLswS44mh8",
+        "code": null,
+        "name": "Tom Wakiki",
+        "displayName": "Tom Wakiki",
+        "username": "system"
+    },
+    "href": "https://debug.dhis2.org/dev/api/legendSets/gFJUXah1uRH",
+    "id": "gFJUXah1uRH",
+    "attributeValues": []
+}

package/build/es/__demo__/data/weeklyColumns.visualization.json

@@ -3,7 +3,6 @@
     "id": "YXZjH1F9ntO",
     "created": "2020-09-07T13:01:07.853",
     "name": "TEST - Empty Columns Error 2",
-    "publicAccess": "--------",
     "legendDisplayStyle": "FILL",
     "type": "PIVOT_TABLE",
     "hideEmptyColumns": false,
@@ -64,14 +63,11 @@
     "user": {
         "name": "Astride Traore",
         "displayName": "Astride Traore",
-        "userCredentials": {
-            "username": "admin"
-        }
+        "username": "admin"
     },
     "translations": [],
     "yearlySeries": [],
     "interpretations": [],
-    "userGroupAccesses": [],
     "subscribers": [],
     "optionalAxes": [],
     "columns": [
@@ -459,7 +455,6 @@
             ]
         }
     ],
-    "userAccesses": [],
     "favorites": [],
     "filters": [
         {
@@ -489,4 +484,4 @@
             ]
         }
     ]
-}
+}

package/build/es/__fixtures__/json/chartAllFields.json

@@ -3,7 +3,6 @@
     "id": "UlfTKWZWV4u",
     "created": "2018-04-13T14:48:36.803",
     "name": "ANC: 1 and 3 coverage Yearly",
-    "publicAccess": "rw------",
     "type": "BAR",
     "subscribed": false,
     "displayDescription": "This chart allows us to compare the performance of districts and allows peers to measure their performance against each other. This implies we can spot poor performers as we all as top performers.",
@@ -39,9 +38,7 @@
     },
     "user": {
         "displayName": "John Traore",
-        "userCredentials": {
-            "username": "admin"
-        }
+        "username": "admin"
     },
     "dataElementGroupSetDimensions": [],
     "attributeDimensions": [],
@@ -60,7 +57,6 @@
             "created": "2018-06-01T14:25:01.086",
             "name": "DU4EnxBgP3A",
             "displayName": "DU4EnxBgP3A",
-            "publicAccess": "rw------",
             "type": "CHART",
             "externalAccess": false,
             "text": "<p>bla bla&nbsp;<a href=\"http://example.org\">test</a>&nbsp;and some smiles&nbsp;<img title=\"smiley\" alt=\"smiley\" width=\"23\" height=\"23\" src=\"http://localhost:8080/dhis-web-core-resource/ckeditor/4.6.1/plugins/smiley/images/regular_smile.png\" /></p>",
@@ -80,9 +76,7 @@
             "user": {
                 "id": "xE7jOejl9FI",
                 "displayName": "John Traore",
-                "userCredentials": {
-                    "username": "admin"
-                }
+                "username": "admin"
             },
             "chart": {
                 "id": "UlfTKWZWV4u"
@@ -91,9 +85,7 @@
             "likedBy": [],
             "translations": [],
             "comments": [],
-            "userGroupAccesses": [],
             "attributeValues": [],
-            "userAccesses": [],
             "mentions": []
         },
         {
@@ -103,7 +95,6 @@
             "created": "2018-03-16T11:01:15.076",
             "name": "HBeV5W36cOx",
             "displayName": "HBeV5W36cOx",
-            "publicAccess": "rw------",
             "type": "CHART",
             "externalAccess": false,
             "text": "test interpretation",
@@ -123,9 +114,7 @@
             "user": {
                 "id": "xE7jOejl9FI",
                 "displayName": "John Traore",
-                "userCredentials": {
-                    "username": "admin"
-                }
+                "username": "admin"
             },
             "chart": {
                 "id": "UlfTKWZWV4u"
@@ -134,9 +123,7 @@
             "likedBy": [],
             "translations": [],
             "comments": [],
-            "userGroupAccesses": [],
-            "attributeValues": [],
-            "userAccesses": []
+            "attributeValues": []
         },
         {
             "lastUpdated": "2018-10-10T18:20:04.272",
@@ -145,7 +132,6 @@
             "created": "2018-10-10T18:20:04.272",
             "name": "Db1s6CsNsca",
             "displayName": "Db1s6CsNsca",
-            "publicAccess": "rw------",
             "type": "CHART",
             "externalAccess": false,
             "text": "Bo, Tonkolili and Western Area are the best performers.",
@@ -165,9 +151,7 @@
             "user": {
                 "id": "GOLswS44mh8",
                 "displayName": "Tom Wakiki",
-                "userCredentials": {
-                    "username": "system"
-                }
+                "username": "system"
             },
             "chart": {
                 "id": "UlfTKWZWV4u"
@@ -176,9 +160,7 @@
             "likedBy": [],
             "translations": [],
             "comments": [],
-            "userGroupAccesses": [],
-            "attributeValues": [],
-            "userAccesses": []
+            "attributeValues": []
         },
         {
             "lastUpdated": "2018-11-03T11:02:30.780",
@@ -187,7 +169,6 @@
             "created": "2018-11-03T11:02:30.780",
             "name": "c5sjWWhIPDE",
             "displayName": "c5sjWWhIPDE",
-            "publicAccess": "--------",
             "type": "CHART",
             "externalAccess": false,
             "text": "ANC 1 looks low in Kono! What could be the reason?",
@@ -207,9 +188,7 @@
             "user": {
                 "id": "GOLswS44mh8",
                 "displayName": "Tom Wakiki",
-                "userCredentials": {
-                    "username": "system"
-                }
+                "username": "system"
             },
             "chart": {
                 "id": "UlfTKWZWV4u"
@@ -218,12 +197,9 @@
             "likedBy": [],
             "translations": [],
             "comments": [],
-            "userGroupAccesses": [],
-            "attributeValues": [],
-            "userAccesses": []
+            "attributeValues": []
         }
     ],
-    "userGroupAccesses": [],
     "columns": [
         {
             "dimension": "dx",
@@ -245,7 +221,6 @@
     "categoryDimensions": [],
     "programIndicatorDimensions": [],
     "attributeValues": [],
-    "userAccesses": [],
     "favorites": [],
     "dataDimensionItems": [
         {

package/build/es/api/dimensions.js

@@ -1,5 +1,5 @@
 import objectClean from 'd2-utilizr/lib/objectClean';
-import { DIMENSION_TYPE_ALL, DIMENSION_TYPE_INDICATOR, DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, DIMENSION_TYPE_PROGRAM_ATTRIBUTE, TOTALS } from '../modules/dataTypes.js';
+import { DIMENSION_TYPE_ALL, DIMENSION_TYPE_INDICATOR, DIMENSION_TYPE_DATA_ELEMENT, DIMENSION_TYPE_DATA_SET, DIMENSION_TYPE_PROGRAM_INDICATOR, DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT, DIMENSION_TYPE_PROGRAM_DATA_ELEMENT_OPTION, DIMENSION_TYPE_PROGRAM_ATTRIBUTE, DIMENSION_TYPE_PROGRAM_ATTRIBUTE_OPTION, TOTALS } from '../modules/dataTypes.js';
 import { onError } from './index.js';
 
 // Query definitions
@@ -45,6 +45,7 @@ export const dataItemsQuery = {
       searchTerm,
       page
     } = _ref3;
+    let fields = `id,${nameProp}~rename(name),dimensionItemType,expression,optionSetId`;
     const filters = [];
 
     // TODO: Extract all of this logic out of the query?
@@ -56,11 +57,20 @@ export const dataItemsQuery = {
     if (filter !== null && filter !== void 0 && filter.group && filter.group !== DIMENSION_TYPE_ALL && [DIMENSION_TYPE_EVENT_DATA_ITEM, DIMENSION_TYPE_PROGRAM_INDICATOR].includes(filter.dataType)) {
       filters.push(`programId:eq:${filter.group}`);
     }
+    if (filter !== null && filter !== void 0 && filter.dataItemId) {
+      // remove unnecessary fields
+      fields = `id,${nameProp}~rename(name),dimensionItemType`;
+      if (filter.dataType === DIMENSION_TYPE_PROGRAM_DATA_ELEMENT_OPTION) {
+        filters.push(`programDataElementId:eq:${filter.dataItemId}`);
+      } else if (filter.dataType === DIMENSION_TYPE_PROGRAM_ATTRIBUTE_OPTION) {
+        filters.push(`programAttributeId:eq:${filter.dataItemId}`);
+      }
+    }
     if (searchTerm) {
       filters.push(`${nameProp}:ilike:${searchTerm}`);
     }
     return objectClean({
-      fields: `id,${nameProp}~rename(name),dimensionItemType,expression`,
+      fields,
       order: `${nameProp}:asc`,
       filter: filters,
       paging: true,

package/build/es/api/expression.js

@@ -18,14 +18,24 @@ export const validateProgramIndicatorExpressionMutation = {
     return expression;
   }
 };
+export const validateProgramIndicatorFilterMutation = {
+  type: 'create',
+  resource: 'programIndicators/filter/description',
+  data: _ref3 => {
+    let {
+      filter
+    } = _ref3;
+    return filter;
+  }
+};
 export const createCalculationMutation = {
   type: 'create',
   resource: 'expressionDimensionItems',
-  data: _ref3 => {
+  data: _ref4 => {
     let {
       name,
       expression
-    } = _ref3;
+    } = _ref4;
     return {
       name,
       shortName: name,
@@ -36,17 +46,17 @@ export const createCalculationMutation = {
 export const updateCalculationMutation = {
   type: 'json-patch',
   resource: 'expressionDimensionItems',
-  id: _ref4 => {
+  id: _ref5 => {
     let {
       id
-    } = _ref4;
+    } = _ref5;
     return id;
   },
-  data: _ref5 => {
+  data: _ref6 => {
     let {
       name,
       expression
-    } = _ref5;
+    } = _ref6;
     return [{
       op: 'add',
       path: '/name',
@@ -65,10 +75,10 @@ export const updateCalculationMutation = {
 export const deleteCalculationMutation = {
   type: 'delete',
   resource: 'expressionDimensionItems',
-  id: _ref6 => {
+  id: _ref7 => {
     let {
       id
-    } = _ref6;
+    } = _ref7;
     return id;
   }
 };

package/build/es/assets/DimensionItemIcons/CalculationIcon.js

@@ -9,5 +9,5 @@ export default /*#__PURE__*/React.createElement("svg", {
   fillRule: "evenodd",
   clipRule: "evenodd",
   d: "M7 4H5V2H4V4H2V5H4V7H5V5H7V4ZM7 9.5H2V10.5H7V9.5ZM2 12H7V13H2V12ZM14 4H9V5H14V4ZM14 9.205L12.205 11L14 12.795L13.295 13.5L11.5 11.705L9.705 13.5L9 12.795L10.795 11L9 9.205L9.705 8.5L11.5 10.295L13.295 8.5L14 9.205Z",
-  fill: "#404B5A"
+  fill: "currentColor"
 }));

package/build/es/assets/DimensionItemIcons/DataElementIcon.js

@@ -6,5 +6,5 @@ export default /*#__PURE__*/React.createElement("svg", {
   xmlns: "http://www.w3.org/2000/svg"
 }, /*#__PURE__*/React.createElement("path", {
   d: "m8 5c1.65685425 0 3 1.34314575 3 3s-1.34314575 3-3 3-3-1.34314575-3-3 1.34314575-3 3-3zm0 1c-1.1045695 0-2 .8954305-2 2s.8954305 2 2 2 2-.8954305 2-2-.8954305-2-2-2z",
-  fill: "#010101"
+  fill: "currentColor"
 }));

package/build/es/assets/DimensionItemIcons/GenericIcon.js

@@ -5,6 +5,6 @@ export default /*#__PURE__*/React.createElement("svg", {
   height: "16",
   viewBox: "0 0 16 16"
 }, /*#__PURE__*/React.createElement("path", {
-  fill: "#6E7A8A",
+  fill: "currentColor",
   d: "M11,5 L11,11 L5,11 L5,5 L11,5 Z M10,6 L6,6 L6,10 L10,10 L10,6 Z"
 }));

package/build/es/assets/DimensionItemIcons/PeriodIcon.js

@@ -5,6 +5,6 @@ export default /*#__PURE__*/React.createElement("svg", {
   height: "16",
   viewBox: "0 0 16 16"
 }, /*#__PURE__*/React.createElement("path", {
-  fill: "#6E7A8A",
+  fill: "currentColor",
   d: "M8,4 C10.209139,4 12,5.790861 12,8 C12,10.209139 10.209139,12 8,12 C5.790861,12 4,10.209139 4,8 C4,5.790861 5.790861,4 8,4 Z M8,5 C6.34314575,5 5,6.34314575 5,8 C5,9.65685425 6.34314575,11 8,11 C9.65685425,11 11,9.65685425 11,8 C11,6.34314575 9.65685425,5 8,5 Z M8.5,6 L8.5,7.5 L9.5,7.5 L9.5,8.5 L7.5,8.5 L7.5,6 L8.5,6 Z"
 }));

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

@@ -1,9 +1,12 @@
+function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 import { useConfig } from '@dhis2/app-runtime';
 import PropTypes from 'prop-types';
-import React, { createContext, useContext, useCallback, useEffect, useState } from 'react';
+import React, { createContext, useContext, useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { dataTypeMap, DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM } from '../../modules/dataTypes.js';
 import { DIMENSION_ID_DATA } from '../../modules/predefinedDimensions.js';
-import ItemSelector from './ItemSelector.js';
+import { InfoPopover } from './Info/InfoPopover.js';
+import { ItemOptionsSelector } from './ItemOptionsSelector/ItemOptionsSelector.js';
+import ItemSelector from './ItemSelector/ItemSelector.js';
 const DataDimensionCtx = /*#__PURE__*/createContext({});
 const DataDimension = _ref => {
   let {
@@ -19,6 +22,7 @@ const DataDimension = _ref => {
   const {
     serverVersion
   } = useConfig();
+  const itemsRef = useRef(new Map());
   const filterDataTypesByVersion = useCallback(dataTypes => dataTypes.filter(_ref2 => {
     let {
       id
@@ -29,36 +33,90 @@ const DataDimension = _ref => {
     );
   }), [serverVersion.minor]);
   const [dataTypes, setDataTypes] = useState(filterDataTypesByVersion(enabledDataTypes || Object.values(dataTypeMap)));
+  const supportsEDI = dataTypes.map(_ref3 => {
+    let {
+      id
+    } = _ref3;
+    return id;
+  }).includes(DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM);
+  const [currentCalculation, setCurrentCalculation] = useState();
+  const [currentDataItem, setCurrentDataItem] = useState();
+  const [infoDataItem, setInfoDataItem] = useState();
+  const selectedItems = useMemo(() => selectedDimensions.map(item => ({
+    value: item.id,
+    label: item.name,
+    isActive: item.isActive,
+    type: item.type,
+    optionSetId: item.optionSetId,
+    expression: item.expression,
+    access: item.access
+  })), [selectedDimensions]);
   const onSelectItems = selectedItem => onSelect({
     dimensionId: DIMENSION_ID_DATA,
     items: selectedItem.map(item => ({
       id: item.value,
       name: item.label,
       type: item.type,
+      optionSetId: item.optionSetId,
       expression: item.expression
     }))
   });
   useEffect(() => enabledDataTypes && setDataTypes(filterDataTypesByVersion(enabledDataTypes)), [enabledDataTypes, filterDataTypesByVersion]);
+  const onEditClick = dataItem => {
+    var _dataItem$access;
+    if (dataItem.type === DIMENSION_TYPE_EXPRESSION_DIMENSION_ITEM && !(((_dataItem$access = dataItem.access) === null || _dataItem$access === void 0 ? void 0 : _dataItem$access.write) === false) && supportsEDI) {
+      // calculation
+      setCurrentCalculation({
+        id: dataItem.value,
+        name: dataItem.label,
+        expression: dataItem.expression
+      });
+    } else if (dataItem.optionSetId) {
+      setCurrentDataItem({
+        id: dataItem.value,
+        name: dataItem.label,
+        type: dataItem.type,
+        optionSetId: dataItem.optionSetId
+      });
+    }
+  };
   return /*#__PURE__*/React.createElement(DataDimensionCtx.Provider, {
     value: {
       visType,
       currentUser
     }
   }, /*#__PURE__*/React.createElement(ItemSelector, {
-    selectedItems: selectedDimensions.map(item => ({
-      value: item.id,
-      label: item.name,
-      isActive: item.isActive,
-      type: item.type,
-      expression: item.expression,
-      access: item.access
-    })),
+    selectedItems: selectedItems,
     onSelect: onSelectItems,
     displayNameProp: displayNameProp,
     infoBoxMessage: infoBoxMessage,
     dataTest: 'data-dimension',
     dataTypes: dataTypes,
-    onEDISave: onCalculationSave
+    itemsRef: itemsRef,
+    supportsEDI: supportsEDI,
+    onEDISave: onCalculationSave,
+    isOptionViewMode: Boolean(currentDataItem),
+    currentCalculation: currentCalculation,
+    setCurrentCalculation: setCurrentCalculation,
+    infoDataItem: infoDataItem,
+    setInfoDataItem: setInfoDataItem,
+    onEditClick: onEditClick
+  }), currentDataItem && /*#__PURE__*/React.createElement(ItemOptionsSelector, _extends({}, currentDataItem, {
+    selectedItems: selectedItems,
+    onSelect: onSelectItems,
+    displayNameProp: displayNameProp,
+    dataTest: 'data-dimension',
+    itemsRef: itemsRef,
+    infoDataItem: infoDataItem,
+    setInfoDataItem: setInfoDataItem,
+    onClose: () => setCurrentDataItem(),
+    onEditClick: onEditClick
+  })), infoDataItem && /*#__PURE__*/React.createElement(InfoPopover, {
+    dataTest: 'data-dimension-info',
+    item: infoDataItem,
+    reference: itemsRef.current.get(infoDataItem.id),
+    onClose: () => setInfoDataItem(),
+    displayNameProp: displayNameProp
   }));
 };
 DataDimension.propTypes = {

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

@@ -90,7 +90,7 @@ export const CalculationInfo = _ref3 => {
   }, styles));
 };
 CalculationInfo.propTypes = {
-  displayNameProp: PropTypes.string,
-  id: PropTypes.string,
-  type: PropTypes.string
+  displayNameProp: PropTypes.string.isRequired,
+  id: PropTypes.string.isRequired,
+  type: PropTypes.string.isRequired
 };

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

@@ -100,7 +100,7 @@ export const DataElementInfo = _ref3 => {
     }, displayName);
   }))))), (data === null || data === void 0 ? void 0 : data.dataElement.optionSet) && /*#__PURE__*/React.createElement("tr", {
     className: `jsx-${styles.__hash}`
-  }, /*#__PURE__*/React.createElement("td", {
+  }, /*#__PURE__*/React.createElement("th", {
     className: `jsx-${styles.__hash}`
   }, i18n.t('Option set')), /*#__PURE__*/React.createElement("td", {
     className: `jsx-${styles.__hash}`
@@ -121,7 +121,7 @@ export const DataElementInfo = _ref3 => {
   }, styles));
 };
 DataElementInfo.propTypes = {
-  displayNameProp: PropTypes.string,
-  id: PropTypes.string,
-  type: PropTypes.string
+  displayNameProp: PropTypes.string.isRequired,
+  id: PropTypes.string.isRequired,
+  type: PropTypes.string.isRequired
 };