fix: scorecard form

Improvement of the data groups configuration

packages/app/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-09-06T09:01:38.368Z\n"
-"PO-Revision-Date: 2024-09-06T09:01:38.368Z\n"
+"POT-Creation-Date: 2024-09-07T15:01:43.543Z\n"
+"PO-Revision-Date: 2024-09-07T15:01:43.543Z\n"
 
 msgid "Could not determine scorecard's access"
 msgstr "Could not determine scorecard's access"
@@ -101,12 +101,12 @@ msgstr "Can Read"
 msgid "Can Read and Write"
 msgstr "Can Read and Write"
 
+msgid "Groups"
+msgstr "Groups"
+
 msgid "Save"
 msgstr "Save"
 
-msgid "Cancel"
-msgstr "Cancel"
-
 msgid "Click to configure, drag to rearrange"
 msgstr "Click to configure, drag to rearrange"
 
@@ -146,6 +146,9 @@ msgstr "Organisation Unit Specific Targets"
 msgid "Other Periods"
 msgstr "Other Periods"
 
+msgid "Cancel"
+msgstr "Cancel"
+
 msgid "Update"
 msgstr "Update"
 
@@ -182,8 +185,11 @@ msgstr "Organisation Unit Level"
 msgid "Add Data source"
 msgstr "Add Data source"
 
-msgid "Please select at least one data source for this group"
-msgstr "Please select at least one data source for this group"
+msgid "Default"
+msgstr "Default"
+
+msgid "Add group"
+msgstr "Add group"
 
 msgid "Add Group"
 msgstr "Add Group"
@@ -212,9 +218,6 @@ msgstr "Select a data source to configure"
 msgid "Search for Indicator"
 msgstr "Search for Indicator"
 
-msgid "Groups"
-msgstr "Groups"
-
 msgid "Name"
 msgstr "Name"
 
@@ -239,18 +242,14 @@ msgstr "High is Good"
 msgid "Show Colors"
 msgstr "Show Colors"
 
-msgid "Title"
-msgstr "Title"
+msgid "Additional labels"
+msgstr "Additional labels"
 
-msgid "Title is required"
-msgstr "Title is required"
+msgid "Add new label"
+msgstr "Add new label"
 
-msgid ""
-"A scorecard with the title '{{value}}' already exists. Please select "
-"another title"
-msgstr ""
-"A scorecard with the title '{{value}}' already exists. Please select "
-"another title"
+msgid "Title"
+msgstr "Title"
 
 msgid "Subtitle"
 msgstr "Subtitle"
@@ -261,9 +260,6 @@ msgstr "Description"
 msgid "Custom Header"
 msgstr "Custom Header"
 
-msgid "Additional Labels (Tags)"
-msgstr "Additional Labels (Tags)"
-
 msgid "Legend Definitions"
 msgstr "Legend Definitions"
 
@@ -360,6 +356,34 @@ msgstr ""
 "In this page you can set default options for the scorecard view. These "
 "options affect the scorecard view"
 
+msgid "N/A"
+msgstr "N/A"
+
+msgid "No Data"
+msgstr "No Data"
+
+msgid "Target Reached/ On Track"
+msgstr "Target Reached/ On Track"
+
+msgid "Progress, but more effort required"
+msgstr "Progress, but more effort required"
+
+msgid "Not on track"
+msgstr "Not on track"
+
+msgid "Title is required"
+msgstr "Title is required"
+
+msgid "Title must have at least 4 characters"
+msgstr "Title must have at least 4 characters"
+
+msgid ""
+"A scorecard with the title '{{value}}' already exists. Please select "
+"another title"
+msgstr ""
+"A scorecard with the title '{{value}}' already exists. Please select "
+"another title"
+
 msgid "Preparing migration..."
 msgstr "Preparing migration..."
 

packages/app/package.json

@@ -23,6 +23,7 @@
     "@types/cypress": "^1.1.3",
     "@types/node": "^20.14.11",
     "@types/react": "^18.3.3",
+    "@types/react-beautiful-dnd": "^13.1.8",
     "@types/react-dom": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^7.16.1",
     "@typescript-eslint/parser": "^7.16.1",
@@ -50,6 +51,9 @@
     "@dhis2/app-service-datastore": "^1.0.0-alpha.2",
     "@dhis2/multi-calendar-dates": "^1.2.4",
     "@dhis2/ui": "^9.11.0",
+    "@dnd-kit/core": "^6.1.0",
+    "@dnd-kit/modifiers": "^7.0.0",
+    "@dnd-kit/utilities": "^3.2.2",
     "@hisptz/dhis2-analytics": "^2.0.20",
     "@hisptz/dhis2-ui": "^2.0.17",
     "@hisptz/dhis2-utils": "^2.0.5",
@@ -71,7 +75,7 @@
     "lerna": "^8.1.8",
     "lodash": "^4.17.21",
     "luxon": "^2.0.2",
-    "react-beautiful-dnd": "^13.1.0",
+    "react-beautiful-dnd": "^13.1.1",
     "react-color": "^2.19.3",
     "react-dnd": "^15.1.1",
     "react-dnd-html5-backend": "^15.1.2",

packages/app/src/locales/en/translations.json

@@ -30,8 +30,8 @@
     "No Access": "No Access",
     "Can Read": "Can Read",
     "Can Read and Write": "Can Read and Write",
+    "Groups": "Groups",
     "Save": "Save",
-    "Cancel": "Cancel",
     "Click to configure, drag to rearrange": "Click to configure, drag to rearrange",
     "Click to {{linkAction}}": "Click to {{linkAction}}",
     "unlink": "unlink",
@@ -45,6 +45,7 @@
     "Change": "Change",
     "Organisation Unit Specific Targets": "Organisation Unit Specific Targets",
     "Other Periods": "Other Periods",
+    "Cancel": "Cancel",
     "Update": "Update",
     "Period Specific Targets": "Period Specific Targets",
     "Period": "Period",
@@ -57,7 +58,8 @@
     "Specific target type": "Specific target type",
     "Organisation Unit Level": "Organisation Unit Level",
     "Add Data source": "Add Data source",
-    "Please select at least one data source for this group": "Please select at least one data source for this group",
+    "Default": "Default",
+    "Add group": "Add group",
     "Add Group": "Add Group",
     "Configure Data Sources": "Configure Data Sources",
     "Add a data source group": "Add a data source group",
@@ -67,7 +69,6 @@
     "View the changes on the preview panel above": "View the changes on the preview panel above",
     "Select a data source to configure": "Select a data source to configure",
     "Search for Indicator": "Search for Indicator",
-    "Groups": "Groups",
     "Name": "Name",
     "Label": "Label",
     "Label is required": "Label is required",
@@ -76,13 +77,12 @@
     "Display Arrows": "Display Arrows",
     "High is Good": "High is Good",
     "Show Colors": "Show Colors",
+    "Additional labels": "Additional labels",
+    "Add new label": "Add new label",
     "Title": "Title",
-    "Title is required": "Title is required",
-    "A scorecard with the title '{{value}}' already exists. Please select another title": "A scorecard with the title '{{value}}' already exists. Please select another title",
     "Subtitle": "Subtitle",
     "Description": "Description",
     "Custom Header": "Custom Header",
-    "Additional Labels (Tags)": "Additional Labels (Tags)",
     "Legend Definitions": "Legend Definitions",
     "Select": "Select",
     "Select default period(s)": "Select default period(s)",
@@ -109,6 +109,14 @@
     "In this page you can configure the default organisation unit and sharing access for the scorecard.": "In this page you can configure the default organisation unit and sharing access for the scorecard.",
     "Options": "Options",
     "In this page you can set default options for the scorecard view. These options affect the scorecard view": "In this page you can set default options for the scorecard view. These options affect the scorecard view",
+    "N/A": "N/A",
+    "No Data": "No Data",
+    "Target Reached/ On Track": "Target Reached/ On Track",
+    "Progress, but more effort required": "Progress, but more effort required",
+    "Not on track": "Not on track",
+    "Title is required": "Title is required",
+    "Title must have at least 4 characters": "Title must have at least 4 characters",
+    "A scorecard with the title '{{value}}' already exists. Please select another title": "A scorecard with the title '{{value}}' already exists. Please select another title",
     "Preparing migration...": "Preparing migration...",
     "Migrating scorecards": "Migrating scorecards",
     "of": "of",