Merge branch 'master' into devrel-18-prepare

dhis2 · Oct 21, 2024 · 9c05588 · 9c05588
2 parents 35db944 + 3b5c73c
commit 9c05588
Show file tree

Hide file tree

Showing 197 changed files with 2,290 additions and 4,236 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,31 @@
+## [9.11.8](https://github.com/dhis2/ui/compare/v9.11.7...v9.11.8) (2024-10-15)
+
+
+### Bug Fixes
+
+* **sharing-dialog:** add 'route' to SharingType type ([#1617](https://github.com/dhis2/ui/issues/1617)) ([1d9664a](https://github.com/dhis2/ui/commit/1d9664a80410f8ea6a8a4a4a7c3f6acc36a74587))
+
+## [9.11.7](https://github.com/dhis2/ui/compare/v9.11.6...v9.11.7) (2024-10-01)
+
+
+### Bug Fixes
+
+* revert "fix: select-field not showing in correct place" ([#1614](https://github.com/dhis2/ui/issues/1614)) ([c83de6b](https://github.com/dhis2/ui/commit/c83de6b0a8993ac16a87a3351ec96ff1aa43151b))
+
+## [9.11.6](https://github.com/dhis2/ui/compare/v9.11.5...v9.11.6) (2024-09-29)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([491bf04](https://github.com/dhis2/ui/commit/491bf0477e8990e591b32ebfb32e6837f5e563b3))
+
+## [9.11.5](https://github.com/dhis2/ui/compare/v9.11.4...v9.11.5) (2024-09-26)
+
+
+### Bug Fixes
+
+* update default props to JS default params ([#1598](https://github.com/dhis2/ui/issues/1598)) ([20e343f](https://github.com/dhis2/ui/commit/20e343fc9e34570dcd8678ddb449d48c5b62a140))
+
 ## [9.11.4](https://github.com/dhis2/ui/compare/v9.11.3...v9.11.4) (2024-09-10)
 
 

diff --git a/collections/forms/package.json b/collections/forms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui-forms",
-    "version": "9.11.4",
+    "version": "9.11.8",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "sideEffects": [
@@ -35,15 +35,15 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/button": "9.11.4",
-        "@dhis2-ui/checkbox": "9.11.4",
-        "@dhis2-ui/field": "9.11.4",
-        "@dhis2-ui/file-input": "9.11.4",
-        "@dhis2-ui/input": "9.11.4",
-        "@dhis2-ui/radio": "9.11.4",
-        "@dhis2-ui/select": "9.11.4",
-        "@dhis2-ui/switch": "9.11.4",
-        "@dhis2-ui/text-area": "9.11.4",
+        "@dhis2-ui/button": "9.11.8",
+        "@dhis2-ui/checkbox": "9.11.8",
+        "@dhis2-ui/field": "9.11.8",
+        "@dhis2-ui/file-input": "9.11.8",
+        "@dhis2-ui/input": "9.11.8",
+        "@dhis2-ui/radio": "9.11.8",
+        "@dhis2-ui/select": "9.11.8",
+        "@dhis2-ui/switch": "9.11.8",
+        "@dhis2-ui/text-area": "9.11.8",
         "classnames": "^2.3.1",
         "final-form": "^4.20.2",
         "prop-types": "^15.7.2",

diff --git a/collections/ui/API.md b/collections/ui/API.md
@@ -243,11 +243,6 @@ import { CalendarInput } from '@dhis2/ui'
 ```
 
 
-#### Props
-
-|Name|Type|Default|Required|Description|
-|---|---|---|---|---|
-|dataTest|undefined|``'dhis2-uiwidgets-calendar-inputfield'``|||
 
 ### Card
 
@@ -1447,7 +1442,7 @@ import { Pagination } from '@dhis2/ui'
 |pageSelectText|string │ function|``() => i18n.t('Page')``|||
 |pageSizeSelectText|string │ function|``() => i18n.t('Items per page')``|||
 |pageSizes|`arrayOf(string)`|``['5', '10', '20', '30', '40', '50', '75', '100']``|||
-|pageSummaryText|string │ function|``getDefaultPageSummaryText``|||
+|pageSummaryText|string │ function||||
 |previousPageText|string │ function|``() => i18n.t('Previous')``|||
 |total|number||||
 |onPageChange|function||||
@@ -2692,7 +2687,7 @@ import { TableHead } from '@dhis2/ui'
 |---|---|---|---|---|
 |children|node|||Should be `<TableRowHead>` components|
 |className|string||||
-|dataTest|string|``'dhis2-uicore-tablehead'``|||
+|dataTest|string||||
 |role|string||||
 
 ### TableRow

diff --git a/collections/ui/package.json b/collections/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui",
-    "version": "9.11.4",
+    "version": "9.11.8",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "exports": {
@@ -21,54 +21,54 @@
         "build": "d2-app-scripts build"
     },
     "dependencies": {
-        "@dhis2-ui/alert": "9.11.4",
-        "@dhis2-ui/box": "9.11.4",
-        "@dhis2-ui/button": "9.11.4",
-        "@dhis2-ui/calendar": "9.11.4",
-        "@dhis2-ui/card": "9.11.4",
-        "@dhis2-ui/center": "9.11.4",
-        "@dhis2-ui/checkbox": "9.11.4",
-        "@dhis2-ui/chip": "9.11.4",
-        "@dhis2-ui/cover": "9.11.4",
-        "@dhis2-ui/css": "9.11.4",
-        "@dhis2-ui/divider": "9.11.4",
-        "@dhis2-ui/field": "9.11.4",
-        "@dhis2-ui/file-input": "9.11.4",
-        "@dhis2-ui/header-bar": "9.11.4",
-        "@dhis2-ui/help": "9.11.4",
-        "@dhis2-ui/input": "9.11.4",
-        "@dhis2-ui/intersection-detector": "9.11.4",
-        "@dhis2-ui/label": "9.11.4",
-        "@dhis2-ui/layer": "9.11.4",
-        "@dhis2-ui/legend": "9.11.4",
-        "@dhis2-ui/loader": "9.11.4",
-        "@dhis2-ui/logo": "9.11.4",
-        "@dhis2-ui/menu": "9.11.4",
-        "@dhis2-ui/modal": "9.11.4",
-        "@dhis2-ui/node": "9.11.4",
-        "@dhis2-ui/notice-box": "9.11.4",
-        "@dhis2-ui/organisation-unit-tree": "9.11.4",
-        "@dhis2-ui/pagination": "9.11.4",
-        "@dhis2-ui/popover": "9.11.4",
-        "@dhis2-ui/popper": "9.11.4",
-        "@dhis2-ui/portal": "9.11.4",
-        "@dhis2-ui/radio": "9.11.4",
-        "@dhis2-ui/required": "9.11.4",
-        "@dhis2-ui/segmented-control": "9.11.4",
-        "@dhis2-ui/select": "9.11.4",
-        "@dhis2-ui/selector-bar": "9.11.4",
-        "@dhis2-ui/sharing-dialog": "9.11.4",
-        "@dhis2-ui/switch": "9.11.4",
-        "@dhis2-ui/tab": "9.11.4",
-        "@dhis2-ui/table": "9.11.4",
-        "@dhis2-ui/tag": "9.11.4",
-        "@dhis2-ui/text-area": "9.11.4",
-        "@dhis2-ui/tooltip": "9.11.4",
-        "@dhis2-ui/transfer": "9.11.4",
-        "@dhis2-ui/user-avatar": "9.11.4",
-        "@dhis2/ui-constants": "9.11.4",
-        "@dhis2/ui-forms": "9.11.4",
-        "@dhis2/ui-icons": "9.11.4",
+        "@dhis2-ui/alert": "9.11.8",
+        "@dhis2-ui/box": "9.11.8",
+        "@dhis2-ui/button": "9.11.8",
+        "@dhis2-ui/calendar": "9.11.8",
+        "@dhis2-ui/card": "9.11.8",
+        "@dhis2-ui/center": "9.11.8",
+        "@dhis2-ui/checkbox": "9.11.8",
+        "@dhis2-ui/chip": "9.11.8",
+        "@dhis2-ui/cover": "9.11.8",
+        "@dhis2-ui/css": "9.11.8",
+        "@dhis2-ui/divider": "9.11.8",
+        "@dhis2-ui/field": "9.11.8",
+        "@dhis2-ui/file-input": "9.11.8",
+        "@dhis2-ui/header-bar": "9.11.8",
+        "@dhis2-ui/help": "9.11.8",
+        "@dhis2-ui/input": "9.11.8",
+        "@dhis2-ui/intersection-detector": "9.11.8",
+        "@dhis2-ui/label": "9.11.8",
+        "@dhis2-ui/layer": "9.11.8",
+        "@dhis2-ui/legend": "9.11.8",
+        "@dhis2-ui/loader": "9.11.8",
+        "@dhis2-ui/logo": "9.11.8",
+        "@dhis2-ui/menu": "9.11.8",
+        "@dhis2-ui/modal": "9.11.8",
+        "@dhis2-ui/node": "9.11.8",
+        "@dhis2-ui/notice-box": "9.11.8",
+        "@dhis2-ui/organisation-unit-tree": "9.11.8",
+        "@dhis2-ui/pagination": "9.11.8",
+        "@dhis2-ui/popover": "9.11.8",
+        "@dhis2-ui/popper": "9.11.8",
+        "@dhis2-ui/portal": "9.11.8",
+        "@dhis2-ui/radio": "9.11.8",
+        "@dhis2-ui/required": "9.11.8",
+        "@dhis2-ui/segmented-control": "9.11.8",
+        "@dhis2-ui/select": "9.11.8",
+        "@dhis2-ui/selector-bar": "9.11.8",
+        "@dhis2-ui/sharing-dialog": "9.11.8",
+        "@dhis2-ui/switch": "9.11.8",
+        "@dhis2-ui/tab": "9.11.8",
+        "@dhis2-ui/table": "9.11.8",
+        "@dhis2-ui/tag": "9.11.8",
+        "@dhis2-ui/text-area": "9.11.8",
+        "@dhis2-ui/tooltip": "9.11.8",
+        "@dhis2-ui/transfer": "9.11.8",
+        "@dhis2-ui/user-avatar": "9.11.8",
+        "@dhis2/ui-constants": "9.11.8",
+        "@dhis2/ui-forms": "9.11.8",
+        "@dhis2/ui-icons": "9.11.8",
         "prop-types": "^15.7.2"
     },
     "peerDependencies": {

diff --git a/components/alert/package.json b/components/alert/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/alert",
-    "version": "9.11.4",
+    "version": "9.11.8",
     "description": "UI Alert",
     "repository": {
         "type": "git",
@@ -33,9 +33,9 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/portal": "9.11.4",
-        "@dhis2/ui-constants": "9.11.4",
-        "@dhis2/ui-icons": "9.11.4",
+        "@dhis2-ui/portal": "9.11.8",
+        "@dhis2/ui-constants": "9.11.8",
+        "@dhis2/ui-icons": "9.11.8",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/alert/src/alert-bar/alert-bar.js b/components/alert/src/alert-bar/alert-bar.js
@@ -13,10 +13,10 @@ const AlertBar = ({
     children,
     className,
     critical,
-    dataTest,
-    duration,
+    dataTest = 'dhis2-uicore-alertbar',
+    duration = 8000,
     hidden,
-    icon,
+    icon = true,
     permanent,
     success,
     warning,
@@ -142,12 +142,6 @@ const alertTypePropType = mutuallyExclusive(
     PropTypes.bool
 )
 
-AlertBar.defaultProps = {
-    duration: 8000,
-    dataTest: 'dhis2-uicore-alertbar',
-    icon: true,
-}
-
 AlertBar.propTypes = {
     /** An array of 0-2 action objects 
 `[{label: "Save", onClick: clickHandler}]`*/

diff --git a/components/alert/src/alert-bar/icon.js b/components/alert/src/alert-bar/icon.js
@@ -9,7 +9,7 @@ import {
 import PropTypes from 'prop-types'
 import React from 'react'
 
-const StatusIcon = ({ error, warning, valid, info, defaultTo }) => {
+const StatusIcon = ({ error, warning, valid, info, defaultTo = null }) => {
     if (error) {
         return <IconErrorFilled24 color={colors.white} />
     }
@@ -26,10 +26,6 @@ const StatusIcon = ({ error, warning, valid, info, defaultTo }) => {
     return defaultTo
 }
 
-StatusIcon.defaultProps = {
-    defaultTo: null,
-}
-
 StatusIcon.propTypes = {
     defaultTo: PropTypes.element,
     error: PropTypes.bool,

diff --git a/components/alert/src/alert-stack/alert-stack.js b/components/alert/src/alert-stack/alert-stack.js
@@ -4,7 +4,11 @@ import cx from 'classnames'
 import PropTypes from 'prop-types'
 import React from 'react'
 
-export const AlertStack = ({ className, children, dataTest }) => (
+export const AlertStack = ({
+    className,
+    children,
+    dataTest = 'dhis2-uicore-alertstack',
+}) => (
     <Portal>
         <div className={cx(className)} data-test={dataTest}>
             {children}
@@ -33,10 +37,6 @@ export const AlertStack = ({ className, children, dataTest }) => (
     </Portal>
 )
 
-AlertStack.defaultProps = {
-    dataTest: 'dhis2-uicore-alertstack',
-}
-
 AlertStack.propTypes = {
     children: PropTypes.node,
     className: PropTypes.string,

diff --git a/components/box/package.json b/components/box/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/box",
-    "version": "9.11.4",
+    "version": "9.11.8",
     "description": "UI Box",
     "repository": {
         "type": "git",
@@ -33,7 +33,7 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "9.11.4",
+        "@dhis2/ui-constants": "9.11.8",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/box/src/box.js b/components/box/src/box.js
@@ -11,7 +11,7 @@ export const Box = ({
     maxWidth,
     marginTop,
     children,
-    dataTest,
+    dataTest = 'dhis2-uicore-box',
     className,
 }) => (
     <div data-test={dataTest} className={className}>
@@ -31,10 +31,6 @@ export const Box = ({
     </div>
 )
 
-Box.defaultProps = {
-    dataTest: 'dhis2-uicore-box',
-}
-
 Box.propTypes = {
     children: PropTypes.node,
     className: PropTypes.string,

diff --git a/components/button/package.json b/components/button/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/button",
-    "version": "9.11.4",
+    "version": "9.11.8",
     "description": "UI Button",
     "repository": {
         "type": "git",
@@ -33,11 +33,11 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/layer": "9.11.4",
-        "@dhis2-ui/loader": "9.11.4",
-        "@dhis2-ui/popper": "9.11.4",
-        "@dhis2/ui-constants": "9.11.4",
-        "@dhis2/ui-icons": "9.11.4",
+        "@dhis2-ui/layer": "9.11.8",
+        "@dhis2-ui/loader": "9.11.8",
+        "@dhis2-ui/popper": "9.11.8",
+        "@dhis2/ui-constants": "9.11.8",
+        "@dhis2/ui-icons": "9.11.8",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/button/src/button-strip/button-strip.js b/components/button/src/button-strip/button-strip.js
@@ -4,7 +4,13 @@ import cx from 'classnames'
 import PropTypes from 'prop-types'
 import React, { Children } from 'react'
 
-const ButtonStrip = ({ className, children, middle, end, dataTest }) => (
+const ButtonStrip = ({
+    className,
+    children,
+    middle,
+    end,
+    dataTest = 'dhis2-uicore-buttonstrip',
+}) => (
     <div
         className={cx(className, { start: !middle && !end, middle, end })}
         data-test={dataTest}
@@ -39,10 +45,6 @@ const ButtonStrip = ({ className, children, middle, end, dataTest }) => (
 
 const alignmentPropType = mutuallyExclusive(['middle', 'end'], PropTypes.bool)
 
-ButtonStrip.defaultProps = {
-    dataTest: 'dhis2-uicore-buttonstrip',
-}
-
 ButtonStrip.propTypes = {
     children: PropTypes.node,
     className: PropTypes.string,