feat: merge remote-tracking branch master

dhis2 · Nov 18, 2024 · 115f74b · 115f74b
2 parents c5b5f8d + 13b4e09
commit 115f74b
Show file tree

Hide file tree

Showing 123 changed files with 4,541 additions and 2,233 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,30 @@
+## [9.14.1](https://github.com/dhis2/ui/compare/v9.14.0...v9.14.1) (2024-11-17)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([d89ce94](https://github.com/dhis2/ui/commit/d89ce946b7145851a5c39ede8a4cbbaaa60411ca))
+
+# [9.14.0](https://github.com/dhis2/ui/compare/v9.13.0...v9.14.0) (2024-11-13)
+
+
+### Features
+
+* add data sharing to sharing dialog [LIBS-677] ([#1629](https://github.com/dhis2/ui/issues/1629)) ([7e15c7f](https://github.com/dhis2/ui/commit/7e15c7f19becf6fc6657270a3f1ef94d8a48f048))
+
+# [9.13.0](https://github.com/dhis2/ui/compare/v9.12.0...v9.13.0) (2024-11-05)
+
+
+### Bug Fixes
+
+* peer dependency issue with npm publish ([#1628](https://github.com/dhis2/ui/issues/1628)) ([1319654](https://github.com/dhis2/ui/commit/13196549eb2450d33d3debcbfa68d0321f8c6358))
+* **translations:** sync translations from transifex (master) ([7f22330](https://github.com/dhis2/ui/commit/7f22330ddfd1af2ac6e0199f4df78abf695200a2))
+
+
+### Features
+
+* update react peer dependency to react@18 ([#1624](https://github.com/dhis2/ui/issues/1624)) ([5d3c2a4](https://github.com/dhis2/ui/commit/5d3c2a4f6fc4683354a5af3d8ec2f8bfd88169f5))
+
 # [9.12.0](https://github.com/dhis2/ui/compare/v9.11.8...v9.12.0) (2024-10-29)
 
 

diff --git a/collections/forms/package.json b/collections/forms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui-forms",
-    "version": "9.12.0",
+    "version": "9.14.1",
     "main": "./build/cjs/index.js",
     "module": "./build/es/index.js",
     "sideEffects": [
@@ -30,20 +30,20 @@
         "build": "d2-app-scripts build"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13"
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18"
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/button": "9.12.0",
-        "@dhis2-ui/checkbox": "9.12.0",
-        "@dhis2-ui/field": "9.12.0",
-        "@dhis2-ui/file-input": "9.12.0",
-        "@dhis2-ui/input": "9.12.0",
-        "@dhis2-ui/radio": "9.12.0",
-        "@dhis2-ui/select": "9.12.0",
-        "@dhis2-ui/switch": "9.12.0",
-        "@dhis2-ui/text-area": "9.12.0",
+        "@dhis2-ui/button": "9.14.1",
+        "@dhis2-ui/checkbox": "9.14.1",
+        "@dhis2-ui/field": "9.14.1",
+        "@dhis2-ui/file-input": "9.14.1",
+        "@dhis2-ui/input": "9.14.1",
+        "@dhis2-ui/radio": "9.14.1",
+        "@dhis2-ui/select": "9.14.1",
+        "@dhis2-ui/switch": "9.14.1",
+        "@dhis2-ui/text-area": "9.14.1",
         "classnames": "^2.3.1",
         "final-form": "^4.20.2",
         "prop-types": "^15.7.2",
@@ -54,8 +54,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13"
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1"
     },
     "types": "types"
 }
diff --git a/collections/ui/API.md b/collections/ui/API.md
@@ -1982,13 +1982,14 @@ import { SharingDialog } from '@dhis2/ui'
 |---|---|---|---|---|
 |id|string||*|The id of the object to share|
 |type|DIALOG_TYPES_LIST||*|The type of object to share|
+|dataSharing|boolean|`false`||Whether to expose the ability to set data sharing (in addition to metadata sharing)|
 |dataTest|string|`'dhis2-uicore-sharingdialog'`|||
-|initialSharingSettings|{<br/>  "allowPublic": "boolean",<br/>  "groups": "objectOf",<br/>  "name": "string",<br/>  "public": "import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js' │ import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js' │ import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js'",<br/>  "users": "objectOf"<br/>}|`{
+|initialSharingSettings|{<br/>  "allowPublic": "boolean",<br/>  "groups": "objectOf",<br/>  "name": "string",<br/>  "public": "{<br/>  \"data\": \"import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js' │ import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js' │ import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js'\",<br/>  \"metadata\": \"import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js' │ import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js' │ import {\\n    ACCESS_NONE,\\n    ACCESS_VIEW_ONLY,\\n    ACCESS_VIEW_AND_EDIT,\\n    DIALOG_TYPES_LIST,\\n} from './constants.js'\"<br/>} │ import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js' │ import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js' │ import {\n    ACCESS_NONE,\n    ACCESS_VIEW_ONLY,\n    ACCESS_VIEW_AND_EDIT,\n    DIALOG_TYPES_LIST,\n} from './constants.js'",<br/>  "users": "objectOf"<br/>}|`{
     name: '',
     allowPublic: true,
-    public: ACCESS_NONE,
-    groups: {},
-    users: {},
+    public: { data: ACCESS_NONE, metadata: ACCESS_NONE },
+    groups: [],
+    users: [],
 }`||Used to seed the component with data to show whilst loading|
 |onClose|function|`() => {}`|||
 |onError|function|`() => {}`|||

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

diff --git a/components/alert/package.json b/components/alert/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/alert",
-    "version": "9.12.0",
+    "version": "9.14.1",
     "description": "UI Alert",
     "repository": {
         "type": "git",
@@ -27,15 +27,15 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/portal": "9.12.0",
-        "@dhis2/ui-constants": "9.12.0",
-        "@dhis2/ui-icons": "9.12.0",
+        "@dhis2-ui/portal": "9.14.1",
+        "@dhis2/ui-constants": "9.14.1",
+        "@dhis2/ui-icons": "9.14.1",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },
@@ -44,8 +44,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/box/package.json b/components/box/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/box",
-    "version": "9.12.0",
+    "version": "9.14.1",
     "description": "UI Box",
     "repository": {
         "type": "git",
@@ -27,13 +27,13 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "9.12.0",
+        "@dhis2/ui-constants": "9.14.1",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },
@@ -42,8 +42,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/button/package.json b/components/button/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/button",
-    "version": "9.12.0",
+    "version": "9.14.1",
     "description": "UI Button",
     "repository": {
         "type": "git",
@@ -27,17 +27,17 @@
         "test": "d2-app-scripts test --jestConfig ../../jest.config.shared.js"
     },
     "peerDependencies": {
-        "react": "^16.13",
-        "react-dom": "^16.13",
+        "react": "^16.13 || ^18",
+        "react-dom": "^16.13 || ^18",
         "styled-jsx": "^4"
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/layer": "9.12.0",
-        "@dhis2-ui/loader": "9.12.0",
-        "@dhis2-ui/popper": "9.12.0",
-        "@dhis2/ui-constants": "9.12.0",
-        "@dhis2/ui-icons": "9.12.0",
+        "@dhis2-ui/layer": "9.14.1",
+        "@dhis2-ui/loader": "9.14.1",
+        "@dhis2-ui/popper": "9.14.1",
+        "@dhis2/ui-constants": "9.14.1",
+        "@dhis2/ui-icons": "9.14.1",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },
@@ -46,8 +46,8 @@
         "types"
     ],
     "devDependencies": {
-        "react": "16.13",
-        "react-dom": "16.13",
+        "react": "^18.3.1",
+        "react-dom": "^18.3.1",
         "styled-jsx": "^4.0.1"
     },
     "types": "types"

diff --git a/components/button/src/split-button/split-button.test.js b/components/button/src/split-button/split-button.test.js
@@ -1,6 +1,5 @@
 import { render, fireEvent, cleanup, waitFor } from '@testing-library/react'
 import React from 'react'
-import '@testing-library/jest-dom/extend-expect'
 import { SplitButton } from './split-button.js'
 
 describe('SplitButton', () => {