Merge branch 'master' into refactor/use-platform-plugin-components

.github/workflows/release.yml

@@ -13,14 +13,15 @@ env:
     GH_TOKEN: ${{secrets.DHIS2_BOT_GITHUB_TOKEN}}
     D2_APP_HUB_TOKEN: ${{secrets.DHIS2_BOT_APPHUB_TOKEN}}
     CI: true
-    build_exists: false
 
 jobs:
     release:
         runs-on: ubuntu-latest
         if: >
             ${{ !github.event.push.repository.fork &&
             github.actor != 'dependabot[bot]' }}
+        outputs:
+            build_exists: ${{ steps.check_build.outputs.build_exists }}
         steps:
             - uses: actions/checkout@v4
               with:
@@ -39,17 +40,17 @@ jobs:
               env:
                   GITHUB_TOKEN: ${{ secrets.DHIS2_BOT_GITHUB_TOKEN }}
 
-            - name: Set build_exists env var
+            - name: Set build_exists output
               id: check_build
               run: |
                   if ls build/bundle/maps-*.zip 1> /dev/null 2>&1; then
-                      echo "build_exists=true" >> $GITHUB_ENV
+                      echo "build_exists=yes" >> $GITHUB_OUTPUT
                   else
-                      echo "build_exists=false" >> $GITHUB_ENV
+                      echo "build_exists=no" >> $GITHUB_OUTPUT
                   fi
 
             - name: Publish to AppHub
-              if: env.build_exists == 'true'
+              if: ${{ steps.check_build.outputs.build_exists == 'yes' }}
               run: yarn run d2-app-scripts publish
 
     report-release-result:
@@ -58,19 +59,19 @@ jobs:
         needs: release
         steps:
             - name: Checkout code
-              if: ${{ env.build_exists == 'true' && success() }}
+              if: ${{ needs.release.outputs.build_exists == 'yes' && success() }}
               uses: actions/checkout@v4
               with:
                   ref: master
                   fetch-depth: 0
 
             - name: Extract version
-              if: ${{ env.build_exists == 'true' && success() }}
+              if: ${{ needs.release.outputs.build_exists == 'yes' && success() }}
               id: extract_version
               uses: Saionaro/[email protected]
 
             - name: Send success message to analytics-internal-bot slack channel
-              if: ${{ env.build_exists == 'true' && success() }}
+              if: ${{ needs.release.outputs.build_exists == 'yes' && success() }}
               id: slack_success
               uses: slackapi/[email protected]
               with:

cypress/integration/layers/thematiclayer.cy.js

@@ -104,7 +104,9 @@ context('Thematic Layers', () => {
             .selectIndicatorGroup('Stock')
             .selectIndicator('BCG Stock PHU')
             .selectTab('Period')
-            .selectRelativePeriod('This month')
+            .selectPeriodType('Start/end dates')
+            .typeStartDate(`${CURRENT_YEAR}-11-01`)
+            .typeEndDate(`${CURRENT_YEAR}-11-30`)
             .selectTab('Style')
             .selectIncludeNoDataOU()
             .selectTab('Org Units')
@@ -138,7 +140,7 @@ context('Thematic Layers', () => {
         cy.get('#dhis2-map-container')
             .findByDataTest('dhis2-uicore-componentcover', EXTENDED_TIMEOUT)
             .should('not.exist')
-        cy.get('.dhis2-map').click('center') //Click somewhere on the map
+        cy.get('.dhis2-map').click('center') //Click in the middle of the map
 
         cy.get('.maplibregl-popup').contains('Value: 0').should('be.visible')
 
@@ -159,7 +161,7 @@ context('Thematic Layers', () => {
         cy.get('#dhis2-map-container')
             .findByDataTest('dhis2-uicore-componentcover', EXTENDED_TIMEOUT)
             .should('not.exist')
-        cy.get('.dhis2-map').click('center') //Click somewhere on the map
+        cy.get('.dhis2-map').click('center') //Click in the middle of the map
 
         cy.get('.maplibregl-popup')
             .contains('Value: No data')