Merge branch 'master' into category-option-forms

.eslintignore

@@ -11,3 +11,4 @@ cypress.env.json
 cypress/screenshots/*
 
 src/types/generated
+.prettierrc.js

.eslintrc.js

@@ -1,4 +1,4 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const { config } = require('@dhis2/cli-style')
 
 module.exports = {
@@ -16,5 +16,7 @@ module.exports = {
     },
     rules: {
         'import/extensions': 'off',
+        '@typescript-eslint/no-explicit-any': 1,
+        '@typescript-eslint/no-unused-vars': 1,
     },
 }

.github/workflows/dhis2-verify-app.yml

@@ -19,7 +19,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v3
               with:
-                  node-version: 16
+                  node-version: 20
 
             - uses: c-hive/gha-yarn-cache@v1
             - run: yarn install --frozen-lockfile
@@ -30,7 +30,7 @@ jobs:
             - name: Build
               run: yarn d2-app-scripts build
 
-            - uses: actions/upload-artifact@v2
+            - uses: actions/upload-artifact@v4
               with:
                   name: app-build
                   path: |
@@ -44,7 +44,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v3
               with:
-                  node-version: 16
+                  node-version: 20
 
             - uses: c-hive/gha-yarn-cache@v1
             - run: yarn install --frozen-lockfile
@@ -63,7 +63,7 @@ jobs:
             - uses: actions/checkout@v2
             - uses: actions/setup-node@v3
               with:
-                  node-version: 16
+                  node-version: 20
 
             - uses: c-hive/gha-yarn-cache@v1
             - run: yarn install --frozen-lockfile
@@ -86,7 +86,7 @@ jobs:
               uses: actions/checkout@v2
             - uses: actions/setup-node@v1
               with:
-                  node-version: 16
+                  node-version: 20
 
             - name: End-to-End tests
               uses: cypress-io/github-action@v5
@@ -117,9 +117,9 @@ jobs:
 
             - uses: actions/setup-node@v3
               with:
-                  node-version: 18
+                  node-version: 20
 
-            - uses: actions/download-artifact@v2
+            - uses: actions/download-artifact@v4
               with:
                   name: app-build
 

.prettierrc.js

@@ -1,4 +1,3 @@
-// eslint-disable-next-line @typescript-eslint/no-var-requires
 const { config } = require('@dhis2/cli-style')
 
 module.exports = {

CHANGELOG.md

@@ -1,3 +1,26 @@
+# [0.6.0](https://github.com/dhis2/maintenance-app-beta/compare/v0.5.0...v0.6.0) (2024-09-30)
+
+
+### Features
+
+* add details panel to org list ([8d3b87b](https://github.com/dhis2/maintenance-app-beta/commit/8d3b87b7c47399bac5a8c4b88a8c0046fd69ca74))
+
+# [0.5.0](https://github.com/dhis2/maintenance-app-beta/compare/v0.4.0...v0.5.0) (2024-09-30)
+
+
+### Features
+
+* **catCombo:** add category combo form and list ([#410](https://github.com/dhis2/maintenance-app-beta/issues/410)) ([7687c13](https://github.com/dhis2/maintenance-app-beta/commit/7687c13d99335154880275e7631af9c221d0aceb))
+
+# [0.4.0](https://github.com/dhis2/maintenance-app-beta/compare/v0.3.1...v0.4.0) (2024-09-28)
+
+
+### Features
+
+* **categories:** category forms and form refactor ([#407](https://github.com/dhis2/maintenance-app-beta/issues/407)) ([66216c4](https://github.com/dhis2/maintenance-app-beta/commit/66216c4c4c7beb11411e790fd804a0761e980b19))
+* org list deselect all + multi select actions  ([56fa5fc](https://github.com/dhis2/maintenance-app-beta/commit/56fa5fc572903636e802a2ff0c47d23432abe38a))
+* remove select all checkbox from org list ([84cfd3e](https://github.com/dhis2/maintenance-app-beta/commit/84cfd3eb8d5161b3ee7d47779fae88bd13790021))
+
 ## [0.3.1](https://github.com/dhis2/maintenance-app-beta/compare/v0.3.0...v0.3.1) (2024-08-20)
 
 

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-08-28T01:15:41.705Z\n"
-"PO-Revision-Date: 2024-08-28T01:15:41.705Z\n"
+"POT-Creation-Date: 2024-09-30T15:09:50.864Z\n"
+"PO-Revision-Date: 2024-09-30T15:09:50.864Z\n"
 
 msgid "schemas"
 msgstr "schemas"
@@ -66,9 +66,6 @@ msgstr "All"
 msgid "Filter options"
 msgstr "Filter options"
 
-msgid "Something went wrong when submitting the form"
-msgstr "Something went wrong when submitting the form"
-
 msgid "Save and close"
 msgstr "Save and close"
 
@@ -78,6 +75,15 @@ msgstr "Exit without saving"
 msgid "Create {{modelName}} "
 msgstr "Create {{modelName}} "
 
+msgid "Validation errors"
+msgstr "Validation errors"
+
+msgid "Some fields have validation errors. Please fix them before saving."
+msgstr "Some fields have validation errors. Please fix them before saving."
+
+msgid "Something went wrong when submitting the form"
+msgstr "Something went wrong when submitting the form"
+
 msgid "<No value>"
 msgstr "<No value>"
 
@@ -114,6 +120,21 @@ msgstr "Failed to load {{label}}"
 msgid "Failed to load"
 msgstr "Failed to load"
 
+msgid "Download"
+msgstr "Download"
+
+msgid "Merge"
+msgstr "Merge"
+
+msgid "Delete source data element values"
+msgstr "Delete source data element values"
+
+msgid "Last updated"
+msgstr "Last updated"
+
+msgid "Discard"
+msgstr "Discard"
+
 msgid "Aggregation level(s)"
 msgstr "Aggregation level(s)"
 
@@ -213,9 +234,6 @@ msgstr "Created"
 msgid "Last updated by"
 msgstr "Last updated by"
 
-msgid "Last updated"
-msgstr "Last updated"
-
 msgid "Id"
 msgstr "Id"
 
@@ -237,9 +255,6 @@ msgstr "Details"
 msgid "Failed to load details"
 msgstr "Failed to load details"
 
-msgid "Download"
-msgstr "Download"
-
 msgid "Download {{section}}"
 msgstr "Download {{section}}"
 
@@ -276,6 +291,9 @@ msgstr "Include user sharing settings"
 msgid "Clear all filters"
 msgstr "Clear all filters"
 
+msgid "Category"
+msgstr "Category"
+
 msgid "Type to filter options"
 msgstr "Type to filter options"
 
@@ -408,9 +426,6 @@ msgstr "Edit and view"
 msgid "Search for a user or group"
 msgstr "Search for a user or group"
 
-msgid "Category"
-msgstr "Category"
-
 msgid "Categories"
 msgstr "Categories"
 
@@ -810,6 +825,9 @@ msgstr "GeoJSON"
 msgid "Disaggregation"
 msgstr "Disaggregation"
 
+msgid "Aggregation type"
+msgstr "Aggregation type"
+
 msgid "Favorite"
 msgstr "Favorite"
 
@@ -837,6 +855,21 @@ msgstr "Data dimension type"
 msgid "This field requires a unique value, please choose another one"
 msgstr "This field requires a unique value, please choose another one"
 
+msgid "{{label}} (required)"
+msgstr "{{label}} (required)"
+
+msgid "No changes to be saved"
+msgstr "No changes to be saved"
+
+msgid "Saved successfully"
+msgstr "Saved successfully"
+
+msgid "Cannot save empty object"
+msgstr "Cannot save empty object"
+
+msgid "Created successfully"
+msgstr "Created successfully"
+
 msgid "Required"
 msgstr "Required"
 
@@ -876,6 +909,30 @@ msgstr "Filter available category options"
 msgid "Filter selected category options"
 msgstr "Filter selected category options"
 
+msgid "Choose how this category combo will be used to capture and analyze data."
+msgstr "Choose how this category combo will be used to capture and analyze data."
+
+msgid "Skip category total in reports"
+msgstr "Skip category total in reports"
+
+msgid "Choose the categories to include in this category combo."
+msgstr "Choose the categories to include in this category combo."
+
+msgid "Available categories"
+msgstr "Available categories"
+
+msgid "Selected categories"
+msgstr "Selected categories"
+
+msgid "Filter available categories"
+msgstr "Filter available categories"
+
+msgid "Filter selected categories"
+msgstr "Filter selected categories"
+
+msgid "At least one category is required"
+msgstr "At least one category is required"
+
 msgid "Create data element group"
 msgstr "Create data element group"
 
@@ -909,9 +966,6 @@ msgstr "The default way to aggregate this data element in analytics."
 msgid "Disabled for the selected value type."
 msgstr "Disabled for the selected value type."
 
-msgid "Aggregation type"
-msgstr "Aggregation type"
-
 msgid "Color and icon"
 msgstr "Color and icon"
 

package.json

@@ -1,6 +1,6 @@
 {
     "name": "maintenance-app",
-    "version": "0.3.1",
+    "version": "0.6.0",
     "description": "",
     "license": "BSD-3-Clause",
     "private": true,
@@ -19,38 +19,40 @@
         "postinstall": "yarn d2-style install"
     },
     "devDependencies": {
-        "@dhis2/cli-app-scripts": "^10.3.9",
+        "@dhis2/cli-app-scripts": "^11.7.0",
         "@dhis2/cli-style": "^10.5.1",
         "@dhis2/cypress-commands": "^10.0.3",
         "@dhis2/cypress-plugins": "^10.0.3",
+        "@faker-js/faker": "^8.4.1",
         "@testing-library/jest-dom": "^6.1.2",
         "@testing-library/react": "^12.1.5",
         "@testing-library/react-hooks": "^8.0.1",
-        "@testing-library/user-event": "^12.8.3",
+        "@testing-library/user-event": "^14.5.2",
         "@types/jest": "^29.5.3",
         "@types/react": "^18.2.6",
-        "@typescript-eslint/eslint-plugin": "^5.55.0",
-        "@typescript-eslint/parser": "^5.55.0",
-        "cypress": "^12.14.0",
-        "typescript": "^5.0.4",
+        "@typescript-eslint/eslint-plugin": "^8.2.0",
+        "@typescript-eslint/parser": "^8.2.0",
+        "cypress": "^13.13.3",
+        "eslint": "^8",
+        "typescript": "^5.5.4",
         "whatwg-fetch": "^3.6.17"
     },
     "dependencies": {
         "@dhis2/app-runtime": "^3.9.3",
-        "@dhis2/ui": "^9.2.0",
+        "@dhis2/ui": "^9.11.3",
         "@tanstack/react-table": "^8.16.0",
         "@types/lodash": "^4.14.198",
         "lodash": "^4.17.21",
         "react-color": "^2.19.3",
         "react-error-boundary": "^4.0.11",
         "react-final-form": "^6.5.9",
-        "react-router-dom": "^6.11.2",
-        "use-debounce": "^9.0.4",
+        "react-router-dom": "^6.26.1",
+        "use-debounce": "^10.0.3",
         "use-query-params": "^2.2.1",
         "zod": "^3.22.2",
         "zustand": "^4.4.0"
     },
     "resolutions": {
-        "@dhis2/ui": "^9.2.0"
+        "eslint": "^8"
     }
 }