Skip to content

Commit

Permalink
Merge branch 'dev' into chip-design
Browse files Browse the repository at this point in the history
  • Loading branch information
martinkrulltott authored Apr 26, 2024
2 parents 65079a9 + 8fdb79a commit 717d4ce
Show file tree
Hide file tree
Showing 45 changed files with 1,804 additions and 1,537 deletions.
1 change: 0 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ updates:
schedule:
interval: weekly
open-pull-requests-limit: 10
target-branch: master
versioning-strategy: increase
49 changes: 39 additions & 10 deletions .github/workflows/dhis2-verify-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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:
Expand All @@ -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 }}
Expand All @@ -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:
Expand Down Expand Up @@ -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
Expand All @@ -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>"
}
}
]
Expand Down
39 changes: 39 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,42 @@
## [100.2.1](https://github.com/dhis2/dashboard-app/compare/v100.2.0...v100.2.1) (2024-04-24)


### Bug Fixes

* in paragraphs were removed in dashboard item description ([#2962](https://github.com/dhis2/dashboard-app/issues/2962)) ([783399e](https://github.com/dhis2/dashboard-app/commit/783399eb916556d1fe5723af1781d2e3c74e6f18))
* short name was not being shown in visualizations ([#2959](https://github.com/dhis2/dashboard-app/issues/2959)) ([c0fc1d6](https://github.com/dhis2/dashboard-app/commit/c0fc1d68b3fae20c1dcd3e5912a26e745fb015cb))
* **translations:** sync translations from transifex (dev) ([3651a71](https://github.com/dhis2/dashboard-app/commit/3651a716531dee8064a44c1771d74a55d6f3e4e1))

# [100.2.0](https://github.com/dhis2/dashboard-app/compare/v100.1.0...v100.2.0) (2024-04-17)


### Bug Fixes

* **translations:** sync translations from transifex (dev) ([dc1f032](https://github.com/dhis2/dashboard-app/commit/dc1f03262dde9bef167cfefe1ac5deab2ac799dc))


### Features

* add metadata support for TE (DHIS2-17242) ([#2956](https://github.com/dhis2/dashboard-app/issues/2956)) ([39bedbe](https://github.com/dhis2/dashboard-app/commit/39bedbe5b5c467d4730857ffe23f4db0c7a74db1))

# [100.1.0](https://github.com/dhis2/dashboard-app/compare/v100.0.4...v100.1.0) (2024-03-21)


### Bug Fixes

* show tag/tooltip about not applied filters for Outlier table (DHIS2-13858) ([#2937](https://github.com/dhis2/dashboard-app/issues/2937)) ([dffb754](https://github.com/dhis2/dashboard-app/commit/dffb75440509a6627d84b80aadf0c045ae1d3ae2))
* show tag/tooltip only when a filter other than ou/pe is used ([#2941](https://github.com/dhis2/dashboard-app/issues/2941)) ([b6b8850](https://github.com/dhis2/dashboard-app/commit/b6b8850a886955252e96b204a06bae36da3d5865))
* **translations:** sync translations from transifex (dev) ([755c6df](https://github.com/dhis2/dashboard-app/commit/755c6dff1e4a9d9e578b63c5711c109f0ad32248))
* use interpretations component from Analytics (DHIS2-15441) ([#2430](https://github.com/dhis2/dashboard-app/issues/2430)) ([0af5c5b](https://github.com/dhis2/dashboard-app/commit/0af5c5b3d4da3591da8766e9d746695830d83492))
* **translations:** sync translations from transifex (dev) ([0de3606](https://github.com/dhis2/dashboard-app/commit/0de3606aed8918ebd1bb4a6f304020bae22ffc75))
* **translations:** sync translations from transifex (dev) ([b88e87c](https://github.com/dhis2/dashboard-app/commit/b88e87cc57e6c1ce2e358dbcce706e3f3f7809e4))
* **translations:** sync translations from transifex (dev) ([#2920](https://github.com/dhis2/dashboard-app/issues/2920)) ([add7139](https://github.com/dhis2/dashboard-app/commit/add7139653fbe6d3c9b2bbd077e3894092b64780))


### Features

* support outlier table plugin (DHIS2-16751) ([#2912](https://github.com/dhis2/dashboard-app/issues/2912)) ([1af22d5](https://github.com/dhis2/dashboard-app/commit/1af22d5566409c438243f932379beae2315e6f41))

## [100.0.4](https://github.com/dhis2/dashboard-app/compare/v100.0.3...v100.0.4) (2023-11-06)


Expand Down
18 changes: 9 additions & 9 deletions cypress/integration/edit/edit_dashboard.feature
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
61 changes: 47 additions & 14 deletions i18n/ar.po
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -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 "حدثت مشكلة أثناء تحميل عنصر لوحة المعلومات هذا"

Expand All @@ -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 "حدث خطأ أثناء تحميل البيانات لهذا العنصر"

Expand Down Expand Up @@ -141,6 +171,9 @@ msgstr "تقارير الحدث"
msgid "Event charts"
msgstr "المخطط البياني للأحداث"

msgid "Line lists"
msgstr ""

msgid "Apps"
msgstr "التطبيقات"

Expand Down Expand Up @@ -210,7 +243,7 @@ msgid ""
"This action cannot be undone. Are you sure you want to permanently delete "
"this dashboard?"
msgstr ""
"سيؤدي حذف لوحة المعلومات \"{{dashboardName}}\" إلى إزالتها عن جميع "
"سيؤدي حذف لوحة المعلومات \"{{ dashboardName }}\" إلى إزالتها عن جميع "
"المستخدمين. لا يمكن التراجع عن هذا الإجراء. هل تريد بالتأكيد حذف لوحة "
"المعلومات هذه نهائياً؟"

Expand Down
Loading

0 comments on commit 717d4ce

Please sign in to comment.