Merge pull request #1604 from dhis2/master-in-alpha-rebase

chore: merge master in alpha rebase
dhis2 · Sep 23, 2024 · 2ddb141 · 2ddb141
2 parents 9bc470a + 0c6b966
commit 2ddb141
Show file tree

Hide file tree

Showing 102 changed files with 1,518 additions and 2,007 deletions.
diff --git a/.github/workflows/dhis2-verify-lib.yml b/.github/workflows/dhis2-verify-lib.yml
@@ -48,7 +48,7 @@ jobs:
 
             - run: ./scripts/create-artifact.sh
 
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               with:
                   name: lib-build
                   path: lib-build.tar
@@ -63,7 +63,7 @@ jobs:
               with:
                   node-version: 20.x
 
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
               with:
                   name: lib-build
 
@@ -84,7 +84,7 @@ jobs:
               with:
                   node-version: 20.x
 
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
               with:
                   name: lib-build
 
@@ -100,7 +100,6 @@ jobs:
         runs-on: ubuntu-latest
         if: "!github.event.push.repository.fork && github.actor != 'dependabot[bot]'"
         needs: [build, setup-matrix]
-
         strategy:
             fail-fast: false
             matrix:
@@ -116,7 +115,7 @@ jobs:
               with:
                   node-version: 20.x
 
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
               with:
                   name: lib-build
 
@@ -176,7 +175,7 @@ jobs:
               with:
                   node-version: 20.x
 
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
               with:
                   name: lib-build
 

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [9.11.4](https://github.com/dhis2/ui/compare/v9.11.3...v9.11.4) (2024-09-10)
+
+
+### Bug Fixes
+
+* circular dependency in input-field ([#1590](https://github.com/dhis2/ui/issues/1590)) ([bcd0f41](https://github.com/dhis2/ui/commit/bcd0f41f3ba583c5ce23af316a61709e4f90b93a))
+
 ## [9.11.3](https://github.com/dhis2/ui/compare/v9.11.2...v9.11.3) (2024-08-21)
 
 

diff --git a/collections/forms/i18n/en.pot b/collections/forms/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-07-17T14:10:05.852Z\n"
-"PO-Revision-Date: 2024-07-17T14:10:05.853Z\n"
+"POT-Creation-Date: 2024-09-09T12:09:30.724Z\n"
+"PO-Revision-Date: 2024-09-09T12:09:30.724Z\n"
 
 msgid "Upload file"
 msgstr "Upload file"

diff --git a/collections/forms/package.json b/collections/forms/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui-forms",
-    "version": "9.11.3",
+    "version": "9.11.4",
     "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.3",
-        "@dhis2-ui/checkbox": "9.11.3",
-        "@dhis2-ui/field": "9.11.3",
-        "@dhis2-ui/file-input": "9.11.3",
-        "@dhis2-ui/input": "9.11.3",
-        "@dhis2-ui/radio": "9.11.3",
-        "@dhis2-ui/select": "9.11.3",
-        "@dhis2-ui/switch": "9.11.3",
-        "@dhis2-ui/text-area": "9.11.3",
+        "@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",
         "classnames": "^2.3.1",
         "final-form": "^4.20.2",
         "prop-types": "^15.7.2",

diff --git a/collections/ui/package.json b/collections/ui/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/ui",
-    "version": "9.11.3",
+    "version": "9.11.4",
     "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.3",
-        "@dhis2-ui/box": "9.11.3",
-        "@dhis2-ui/button": "9.11.3",
-        "@dhis2-ui/calendar": "9.11.3",
-        "@dhis2-ui/card": "9.11.3",
-        "@dhis2-ui/center": "9.11.3",
-        "@dhis2-ui/checkbox": "9.11.3",
-        "@dhis2-ui/chip": "9.11.3",
-        "@dhis2-ui/cover": "9.11.3",
-        "@dhis2-ui/css": "9.11.3",
-        "@dhis2-ui/divider": "9.11.3",
-        "@dhis2-ui/field": "9.11.3",
-        "@dhis2-ui/file-input": "9.11.3",
-        "@dhis2-ui/header-bar": "9.11.3",
-        "@dhis2-ui/help": "9.11.3",
-        "@dhis2-ui/input": "9.11.3",
-        "@dhis2-ui/intersection-detector": "9.11.3",
-        "@dhis2-ui/label": "9.11.3",
-        "@dhis2-ui/layer": "9.11.3",
-        "@dhis2-ui/legend": "9.11.3",
-        "@dhis2-ui/loader": "9.11.3",
-        "@dhis2-ui/logo": "9.11.3",
-        "@dhis2-ui/menu": "9.11.3",
-        "@dhis2-ui/modal": "9.11.3",
-        "@dhis2-ui/node": "9.11.3",
-        "@dhis2-ui/notice-box": "9.11.3",
-        "@dhis2-ui/organisation-unit-tree": "9.11.3",
-        "@dhis2-ui/pagination": "9.11.3",
-        "@dhis2-ui/popover": "9.11.3",
-        "@dhis2-ui/popper": "9.11.3",
-        "@dhis2-ui/portal": "9.11.3",
-        "@dhis2-ui/radio": "9.11.3",
-        "@dhis2-ui/required": "9.11.3",
-        "@dhis2-ui/segmented-control": "9.11.3",
-        "@dhis2-ui/select": "9.11.3",
-        "@dhis2-ui/selector-bar": "9.11.3",
-        "@dhis2-ui/sharing-dialog": "9.11.3",
-        "@dhis2-ui/switch": "9.11.3",
-        "@dhis2-ui/tab": "9.11.3",
-        "@dhis2-ui/table": "9.11.3",
-        "@dhis2-ui/tag": "9.11.3",
-        "@dhis2-ui/text-area": "9.11.3",
-        "@dhis2-ui/tooltip": "9.11.3",
-        "@dhis2-ui/transfer": "9.11.3",
-        "@dhis2-ui/user-avatar": "9.11.3",
-        "@dhis2/ui-constants": "9.11.3",
-        "@dhis2/ui-forms": "9.11.3",
-        "@dhis2/ui-icons": "9.11.3",
+        "@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",
         "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.3",
+    "version": "9.11.4",
     "description": "UI Alert",
     "repository": {
         "type": "git",
@@ -33,9 +33,9 @@
     },
     "dependencies": {
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2-ui/portal": "9.11.3",
-        "@dhis2/ui-constants": "9.11.3",
-        "@dhis2/ui-icons": "9.11.3",
+        "@dhis2-ui/portal": "9.11.4",
+        "@dhis2/ui-constants": "9.11.4",
+        "@dhis2/ui-icons": "9.11.4",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },

diff --git a/components/alert/src/alert-bar/alert-bar.prod.stories.js b/components/alert/src/alert-bar/alert-bar.prod.stories.js
@@ -48,6 +48,9 @@ const alertTypeArgType = {
             summary: 'bool',
             detail: "'success', 'warning', and 'critical' are mutually exclusive props",
         },
+        defaultValue: {
+            summary: false,
+        },
     },
     control: {
         type: 'boolean',
@@ -60,6 +63,29 @@ const iconArgType = {
         },
     },
 }
+
+const permanentArgType = {
+    table: {
+        type: {
+            summary: 'bool',
+        },
+        defaultValue: {
+            summary: false,
+        },
+    },
+    control: {
+        type: 'boolean',
+    },
+}
+
+const childrenArgType = {
+    table: {
+        type: {
+            summary: 'String to display in the alert bar',
+        },
+    },
+}
+
 const actionsArgType = {
     table: {
         type: {
@@ -72,6 +98,9 @@ export default {
     title: 'Alert Bar',
     component: AlertBar,
     decorators: [Wrapper],
+    args: {
+        children: 'I will autohide',
+    },
     parameters: {
         componentSubtitle: subtitle,
         docs: {
@@ -85,13 +114,13 @@ export default {
         critical: { ...alertTypeArgType },
         success: { ...alertTypeArgType },
         warning: { ...alertTypeArgType },
+        permanent: { ...permanentArgType },
+        children: { ...childrenArgType },
         icon: { ...iconArgType },
     },
 }
 
-export const Default = (args) => (
-    <AlertBar {...args}>Default - I will autohide</AlertBar>
-)
+export const Default = (args) => <AlertBar {...args}></AlertBar>
 
 export const States = () => (
     <React.Fragment>

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

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

diff --git a/components/calendar/package.json b/components/calendar/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2-ui/calendar",
-    "version": "9.11.3",
+    "version": "9.11.4",
     "description": "UI Calendar",
     "repository": {
         "type": "git",
@@ -33,15 +33,15 @@
         "styled-jsx": "^4"
     },
     "dependencies": {
-        "@dhis2-ui/button": "9.11.3",
-        "@dhis2-ui/card": "9.11.3",
-        "@dhis2-ui/input": "9.11.3",
-        "@dhis2-ui/layer": "9.11.3",
-        "@dhis2-ui/popper": "9.11.3",
-        "@dhis2/multi-calendar-dates": "^1.2.3",
+        "@dhis2-ui/button": "9.11.4",
+        "@dhis2-ui/card": "9.11.4",
+        "@dhis2-ui/input": "9.11.4",
+        "@dhis2-ui/layer": "9.11.4",
+        "@dhis2-ui/popper": "9.11.4",
+        "@dhis2/multi-calendar-dates": "1.0.0-alpha.29",
         "@dhis2/prop-types": "^3.1.2",
-        "@dhis2/ui-constants": "9.11.3",
-        "@dhis2/ui-icons": "9.11.3",
+        "@dhis2/ui-constants": "9.11.4",
+        "@dhis2/ui-icons": "9.11.4",
         "classnames": "^2.3.1",
         "prop-types": "^15.7.2"
     },