Merge remote-tracking branch 'origin/master' into refactor/use-platfo…

…rm-plugin-components

CHANGELOG.md

@@ -1,3 +1,17 @@
+## [101.1.12](https://github.com/dhis2/line-listing-app/compare/v101.1.11...v101.1.12) (2024-12-10)
+
+
+### Bug Fixes
+
+* enable ou tree and levels/groups with user orgunits (DHIS2-18066) ([#626](https://github.com/dhis2/line-listing-app/issues/626)) ([57b8b45](https://github.com/dhis2/line-listing-app/commit/57b8b45dd7aedf9d360648c2c2786c605e5c790a)), closes [dhis2/analytics#1702](https://github.com/dhis2/analytics/issues/1702)
+
+## [101.1.11](https://github.com/dhis2/line-listing-app/compare/v101.1.10...v101.1.11) (2024-12-08)
+
+
+### Bug Fixes
+
+* **translations:** sync translations from transifex (master) ([240f280](https://github.com/dhis2/line-listing-app/commit/240f2808153e772e0360396b83ddc09a188d9b2c))
+
 ## [101.1.10](https://github.com/dhis2/line-listing-app/compare/v101.1.9...v101.1.10) (2024-12-04)
 
 

cypress/integration/orgUnitDimension.cy.js

@@ -14,7 +14,6 @@ import {
     expectOrgUnitDimensionModalToBeVisible,
     expectOrgUnitDimensionToNotBeLoading,
     expectOrgUnitItemToBeSelected,
-    expectOrgUnitTreeToBeDisabled,
     expectOrgUnitTreeToBeEnabled,
     openOuDimension,
     selectOrgUnitTreeItem,
@@ -46,7 +45,7 @@ describe(`Org unit dimension`, () => {
         openOuDimension(DIMENSION_ID_ORGUNIT)
         expectOrgUnitDimensionModalToBeVisible()
         expectOrgUnitDimensionToNotBeLoading()
-        expectOrgUnitTreeToBeDisabled()
+        expectOrgUnitTreeToBeEnabled()
         deselectUserOrgUnit(TEST_DEFAULT_ORG_UNIT)
         selectOrgUnitTreeItem(TEST_ROOT)
         selectOrgUnitTreeItem(TEST_DISTRICT_1)
@@ -154,20 +153,19 @@ describe(`Org unit dimension`, () => {
         expectOrgUnitItemToBeSelected(TEST_ROOT)
         expectOrgUnitTreeToBeEnabled()
         selectUserOrgUnit(TEST_USER_ORG_UNIT)
-        expectOrgUnitTreeToBeDisabled()
+        expectOrgUnitTreeToBeEnabled()
         clickOrgUnitDimensionModalUpdateButton()
         expectTableToBeVisible()
-        assertChipContainsText(TEST_CHIP_LABEL, 1)
-        assertTooltipContainsEntries(TEST_CHIP_LABEL, [TEST_USER_ORG_UNIT])
+        assertChipContainsText('Organisation unit', 2)
+        assertTooltipContainsEntries([TEST_USER_ORG_UNIT])
 
         cy.log(`deselects '${TEST_USER_ORG_UNIT}'`)
         openOuDimension(DIMENSION_ID_ORGUNIT)
         expectOrgUnitDimensionModalToBeVisible()
         expectOrgUnitDimensionToNotBeLoading()
-        expectOrgUnitTreeToBeDisabled()
+        expectOrgUnitTreeToBeEnabled()
         deselectUserOrgUnit(TEST_USER_ORG_UNIT)
         expectOrgUnitTreeToBeEnabled()
-        selectOrgUnitTreeItem(TEST_ROOT)
         expectOrgUnitItemToBeSelected(TEST_ROOT)
         clickOrgUnitDimensionModalUpdateButton()
         expectTableToBeVisible()
@@ -185,7 +183,7 @@ describe(`Org unit dimension`, () => {
         openOuDimension(DIMENSION_ID_ORGUNIT)
         expectOrgUnitDimensionModalToBeVisible()
         expectOrgUnitDimensionToNotBeLoading()
-        expectOrgUnitTreeToBeDisabled()
+        expectOrgUnitTreeToBeEnabled()
         deselectUserOrgUnit(TEST_DEFAULT_ORG_UNIT)
         TEST_DISTRICTS.forEach((district) => selectOrgUnitTreeItem(district))
         toggleOrgUnitLevel(TEST_LEVEL)

package.json

@@ -1,6 +1,6 @@
 {
     "name": "line-listing-app",
-    "version": "101.1.10",
+    "version": "101.1.12",
     "description": "DHIS2 Line Listing",
     "license": "BSD-3-Clause",
     "private": true,
@@ -42,6 +42,7 @@
     "dependencies": {
         "@dhis2/analytics": "git+https://github.com/d2-ci/analytics.git#f773c16d5dd71dae2fd4b5ce0738092bcb6aa21a",
         "@dhis2/app-runtime": "^3.10.6",
+        "@dhis2/ui": "^9.4.2",
         "@dnd-kit/core": "^5.0.3",
         "@dnd-kit/sortable": "^6.0.1",
         "@dnd-kit/utilities": "^3.2.2",