fix: merge to master

.github/dependabot.yml

@@ -5,5 +5,4 @@ updates:
       schedule:
           interval: weekly
       open-pull-requests-limit: 10
-      target-branch: master
       versioning-strategy: increase

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

@@ -94,7 +94,7 @@ jobs:
               id: yarn-cache
               with:
                   path: '**/node_modules'
-                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+                  key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('patches/*.patch') }}
 
             - name: End-to-End tests
               uses: cypress-io/github-action@v2
@@ -104,7 +104,7 @@ jobs:
                   start: ${{ env.SERVER_START_CMD }}
                   wait-on: ${{ env.SERVER_URL }}
                   wait-on-timeout: 300
-                  cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+                  cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}-${{ hashFiles('patches/*.patch') }}
                   group: 'e2e'
                   tag: ${{ github.event_name }}
               env:
@@ -114,8 +114,8 @@ jobs:
                   SERVER_START_CMD: 'yarn cypress:start'
                   SERVER_URL: 'http://localhost:3000'
                   cypress_dhis2_api_stub_mode: 'DISABLED'
-                  REACT_APP_DHIS2_BASE_URL: ${{ secrets.CYPRESS_DHIS2_BASE_URL_40 }}
-                  cypress_dhis2_base_url: ${{ secrets.CYPRESS_DHIS2_BASE_URL_40}}
+                  REACT_APP_DHIS2_BASE_URL: ${{ secrets.CYPRESS_DHIS2_BASE_URL_41 }}
+                  cypress_dhis2_base_url: ${{ secrets.CYPRESS_DHIS2_BASE_URL_41}}
                   cypress_dhis2_username: ${{ secrets.CYPRESS_DHIS2_USERNAME }}
                   cypress_dhis2_password: ${{ secrets.CYPRESS_DHIS2_PASSWORD }}
                   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -126,7 +126,7 @@ jobs:
         if: |
             !github.event.push.repository.fork &&
             github.actor != 'dependabot[bot]' &&
-            github.event_name != 'pull_request'
+            (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/dev')
         steps:
             - uses: actions/checkout@v3
               with:
@@ -196,8 +196,9 @@ jobs:
         needs: release
         if: |
             success() &&
-            !cancelled()  &&
-            github.ref == 'refs/heads/master'
+            !cancelled() &&
+            github.ref == 'refs/heads/master' &&
+            contains(github.event.head_commit.message, 'chore(release)')
         steps:
             - name: Checkout code
               uses: actions/checkout@master
@@ -213,13 +214,41 @@ jobs:
                   channel-id: ${{ secrets.SLACK_CHANNEL_ID }}
                   payload: |
                       {
-                        "text": ":large_green_circle: :dashboard-app: :tada: Dashboard app release succeeded for version: ${{ steps.extract_version.outputs.version }}",
+                        "text": "Dashboard app release ${{ steps.extract_version.outputs.version }} succeeded",
                         "blocks": [
+                          {
+                            "type": "header",
+                            "text": {
+                                "type": "plain_text",
+                                "text": ":large_green_circle: :dashboard-app: Dashboard version ${{ steps.extract_version.outputs.version }} released :tada:",
+                                "emoji": true
+                            }
+                          },
+                          {
+                            "type": "divider"
+                          },
                           {
                             "type": "section",
                             "text": {
-                              "type": "mrkdwn",
-                              "text": ":large_green_circle: :dashboard-app: :tada: Dashboard version ${{ steps.extract_version.outputs.version }} released <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Asuccess|successfully>"
+                                "type": "mrkdwn",
+                                "text": "*Release Notes*"
+                            }
+                          },
+                          {
+                            "type": "section",
+                            "text": {
+                                "type": "mrkdwn",
+                                "text": ${{ toJSON(github.event.head_commit.message) }}
+                            }
+                          },
+                          {
+                            "type": "divider"
+                          },
+                          {
+                            "type": "section",
+                            "text": {
+                                "type": "mrkdwn",
+                                "text": "Link to <https://github.com/dhis2/dashboard-app/actions/workflows/dhis2-verify-app.yml?query=branch%3Amaster+is%3Asuccess|build>"
                             }
                           }
                         ]

cypress/integration/edit/edit_dashboard.feature

@@ -55,15 +55,15 @@ Feature: Creating, editing and deleting dashboard
         Then the dashboard is not starred
 
 
-    @mutating
-    Scenario: I toggle show description
-        Given I open existing dashboard
-        # And the description is not shown
-        And the dashboard description is not displayed
-        When I click to show description
-        Then the dashboard description is displayed
-        When I click to hide the description
-        Then the dashboard description is not displayed
+    #    @mutating
+    #    Scenario: I toggle show description
+    #        Given I open existing dashboard
+    #        # And the description is not shown
+    #        And the dashboard description is not displayed
+    #        When I click to show description
+    #        Then the dashboard description is displayed
+    #        When I click to hide the description
+    #        Then the dashboard description is not displayed
 
     # FIXME
     # @nonmutating

cypress/integration/view/item_context_menu/show_interpretations.js

@@ -23,7 +23,7 @@ When(
 Then('the interpretations panel is displayed', () => {
     getDashboardItem(chartItemUid)
         .find(itemDetailsSel)
-        .contains('Visualization details')
+        .contains('About this')
         .scrollIntoView()
         .should('be.visible')
 

i18n/ar.po

@@ -1,16 +1,16 @@
 # 
 # Translators:
 # Viktor Varland <[email protected]>, 2020
-# phil_dhis2, 2021
-# Hamza Assada <[email protected]>, 2022
+# Philip Larsen Donnelly, 2024
+# Hamza Assada <[email protected]>, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n"
+"POT-Creation-Date: 2024-02-26T14:42:02.563Z\n"
 "PO-Revision-Date: 2019-06-25 12:37+0000\n"
-"Last-Translator: Hamza Assada <[email protected]>, 2022\n"
-"Language-Team: Arabic (https://www.transifex.com/hisp-uio/teams/100509/ar/)\n"
+"Last-Translator: Hamza Assada <[email protected]>, 2024\n"
+"Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -72,6 +72,15 @@ msgstr "عنصر نصي"
 msgid "Add text here"
 msgstr "اضف نص هنا"
 
+msgid "Back to all interpretations"
+msgstr "العودة إلى كل التفسيرات"
+
+msgid "Filters are not applied to line list dashboard items"
+msgstr ""
+
+msgid "Filters not applied"
+msgstr ""
+
 msgid "There was a problem loading this dashboard item"
 msgstr "حدثت مشكلة أثناء تحميل عنصر لوحة المعلومات هذا"
 
@@ -90,30 +99,51 @@ msgstr "المشاهدة بحجم الشاشة"
 msgid "This map can't be displayed as a chart"
 msgstr "لا يمكن عرض هذه الخريطة كمخطط"
 
+msgid "This map can't be displayed as a pivot table"
+msgstr ""
+
+msgid "This visualization can't be displayed as a pivot table"
+msgstr ""
+
+msgid "This visualization can't be displayed as a map"
+msgstr ""
+
 msgid "View as Chart"
 msgstr "عرض كمخطط بياني"
 
-msgid "This map can't be displayed as a table"
-msgstr "لا يمكن عرض هذه الخريطة كجدول"
-
-msgid "View as Table"
-msgstr "عرض كجدول"
+msgid "View as Pivot table"
+msgstr ""
 
 msgid "View as Map"
 msgstr "عرض كخريطة"
 
 msgid "There was a problem loading interpretations for this item"
 msgstr "حدثت مشكلة أثناء تحميل التفسيرات لهذا العنصر"
 
+msgid "The plugin for rendering this item is not available"
+msgstr ""
+
+msgid "Install the {{appName}} app from the App Hub"
+msgstr ""
+
+msgid "No data to display"
+msgstr "لا توجد بيانات للعرض"
+
+msgid ""
+"Install Line Listing app version ${minLLVersion.join(\n"
+"                                '.'\n"
+"                            )} or higher in order to display this item."
+msgstr ""
+
+msgid "Show without filters"
+msgstr ""
+
 msgid "Maps with Earth Engine layers cannot be displayed when offline"
 msgstr "لا يمكن عرض خرائط مع طبقات Earth Engine في حالة عدم الاتصال بالإنترنت"
 
 msgid "Unable to load the plugin for this item"
 msgstr "تعذر تحميل المكوّن الإضافي لهذا العنصر"
 
-msgid "No data to display"
-msgstr "لا توجد بيانات للعرض"
-
 msgid "There was an error loading data for this item"
 msgstr "حدث خطأ أثناء تحميل البيانات لهذا العنصر"
 
@@ -141,6 +171,9 @@ msgstr "تقارير الحدث"
 msgid "Event charts"
 msgstr "المخطط البياني للأحداث"
 
+msgid "Line lists"
+msgstr ""
+
 msgid "Apps"
 msgstr "التطبيقات"
 
@@ -210,7 +243,7 @@ msgid ""
 "This action cannot be undone. Are you sure you want to permanently delete "
 "this dashboard?"
 msgstr ""
-"سيؤدي حذف لوحة المعلومات \"{{dashboardName}}\" إلى إزالتها عن جميع "
+"سيؤدي حذف لوحة المعلومات \"{{ dashboardName }}\" إلى إزالتها عن جميع "
 "المستخدمين. لا يمكن التراجع عن هذا الإجراء. هل تريد بالتأكيد حذف لوحة "
 "المعلومات هذه نهائياً؟"
 

i18n/ar_IQ.po

@@ -1,14 +1,15 @@
 # 
 # Translators:
 # KRG HIS <[email protected]>, 2021
+# Philip Larsen Donnelly, 2024
 # 
 msgid ""
 msgstr ""
 "Project-Id-Version: i18next-conv\n"
-"POT-Creation-Date: 2021-12-21T08:20:25.327Z\n"
+"POT-Creation-Date: 2023-05-03T11:08:21.315Z\n"
 "PO-Revision-Date: 2019-06-25 12:37+0000\n"
-"Last-Translator: KRG HIS <[email protected]>, 2021\n"
-"Language-Team: Arabic (Iraq) (https://www.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n"
+"Last-Translator: Philip Larsen Donnelly, 2024\n"
+"Language-Team: Arabic (Iraq) (https://app.transifex.com/hisp-uio/teams/100509/ar_IQ/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -70,6 +71,12 @@ msgstr "عنصر نصي"
 msgid "Add text here"
 msgstr "اضف نص هنا"
 
+msgid "Filters are not applied to line list dashboard items"
+msgstr ""
+
+msgid "Filters not applied"
+msgstr ""
+
 msgid "There was a problem loading this dashboard item"
 msgstr "حدثت مشكلة أثناء تحميل عنصر لوحة المعلومات هذا"
 
@@ -103,15 +110,30 @@ msgstr "عرض كخريطة"
 msgid "There was a problem loading interpretations for this item"
 msgstr ""
 
-msgid "Maps with Earth Engine layers cannot be displayed when offline"
+msgid "The plugin for rendering this item is not available"
 msgstr ""
 
-msgid "Unable to load the plugin for this item"
-msgstr "تعذر تحميل المكوّن الإضافي لهذا العنصر"
+msgid "Install the {{appName}} app from the App Hub"
+msgstr ""
 
 msgid "No data to display"
 msgstr "لا توجد بيانات للعرض"
 
+msgid ""
+"Install Line Listing app version ${minLLVersion.join(\n"
+"                                '.'\n"
+"                            )} or higher in order to display this item."
+msgstr ""
+
+msgid "Show without filters"
+msgstr ""
+
+msgid "Maps with Earth Engine layers cannot be displayed when offline"
+msgstr ""
+
+msgid "Unable to load the plugin for this item"
+msgstr "تعذر تحميل المكوّن الإضافي لهذا العنصر"
+
 msgid "There was an error loading data for this item"
 msgstr ""
 
@@ -139,6 +161,9 @@ msgstr "تقارير الحدث"
 msgid "Event charts"
 msgstr "المخطط البياني للأحداث"
 
+msgid "Line lists"
+msgstr ""
+
 msgid "Apps"
 msgstr "التطبيقات"
 
@@ -204,9 +229,9 @@ msgid ""
 "This action cannot be undone. Are you sure you want to permanently delete "
 "this dashboard?"
 msgstr ""
-"سيؤدي حذف لوحة المعلومات \"{{dashboardName}}\" إلى إزالتها لجميع المستخدمين."
-" لا يمكن التراجع عن هذا الإجراء. هل تريد بالتأكيد حذف لوحة المعلومات هذه "
-"نهائياً؟"
+"سيؤدي حذف لوحة المعلومات \"{{ dashboardName }}\" إلى إزالتها لجميع "
+"المستخدمين. لا يمكن التراجع عن هذا الإجراء. هل تريد بالتأكيد حذف لوحة "
+"المعلومات هذه نهائياً؟"
 
 msgid "Cancel"
 msgstr "إلغاء"