dhis2 · HendrikThePendric · Feb 3, 2025 · Jan 28, 2025 · Jan 29, 2025 · Jan 29, 2025
diff --git a/.cypress-cucumber-preprocessorrc.json b/.cypress-cucumber-preprocessorrc.json
@@ -1,6 +1,6 @@
 {
     "nonGlobalStepDefinitions": true,
     "e2e": {
-        "stepDefinitions": ["cypress/e2e/**/*.{js,ts}"]
+        "stepDefinitions": ["cypress/e2e_cucumber/**/*.{js,ts}"]
     }
 }
diff --git a/cypress.config.js b/cypress.config.js
@@ -5,10 +5,14 @@ const createEsbuildPlugin = require('@badeball/cypress-cucumber-preprocessor/esb
 const createBundler = require('@bahmutov/cypress-esbuild-preprocessor')
 const { chromeAllowXSiteCookies } = require('@dhis2/cypress-plugins')
 const { defineConfig } = require('cypress')
+// const {
+//     excludeByVersionTags,
+// } = require('./cypress/plugins/excludeByVersionTags.js')
 
 async function setupNodeEvents(on, config) {
     await addCucumberPreprocessorPlugin(on, config)
     chromeAllowXSiteCookies(on, config)
+    // excludeByVersionTags(on, config)
 
     on(
         'file:preprocessor',
@@ -26,7 +30,7 @@ module.exports = defineConfig({
     e2e: {
         setupNodeEvents,
         baseUrl: 'http://localhost:3000',
-        specPattern: 'cypress/e2e/*.feature',
+        specPattern: ['cypress/e2e_cucumber/*.feature', 'cypress/e2e/*.cy.js'],
         viewportWidth: 1280,
         viewportHeight: 800,
         defaultCommandTimeout: 45000,

diff --git a/cypress/e2e/embedded_superset_dashboard.cy.js b/cypress/e2e/embedded_superset_dashboard.cy.js
@@ -0,0 +1,210 @@
+import { newButtonSel } from '../elements/viewDashboard.js'
+import { EXTENDED_TIMEOUT } from '../support/utils.js'
+
+const SUPERSET_BASE_URL = 'https://superset-test.dhis2.org'
+const NAME = 'My new dashboard'
+const NAME_UPDATED = 'My updated dashboard'
+const CODE = 'MY_CODE'
+const DESCRIPTION = 'My dashboard description text'
+const DESCRIPTION_UPATED = 'My updated dashboard description'
+const UUID = '2e5ae28f-60d1-4fb9-a609-5bd4586bf4ac'
+const UUID_UPDATED = '418b4581-3c2a-43a9-8561-9725eadcaffd'
+const SUPERSET_DASHBOARD_STUB = `
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <title>Superset dashboard stub</title>
+  </head>
+  <body>
+    <h1>Superset dashboard stub</h1>
+  </body>
+</html>
+`
+
+const getInputByLabelText = (labelText, inputTag = 'input') =>
+    cy.get('form').contains('label', labelText).parent().find(inputTag)
+
+describe('Creating, viewing, editing and deleting an embedded superset dashboard', function () {
+    before(function () {
+        // Skip this test if the DHIS2 Core version is below 42
+        const version = parseInt(Cypress.env('dhis2InstanceVersion'))
+        if (version < 42) {
+            this.skip()
+        }
+    })
+
+    beforeEach(() => {
+        // Fake support for embedded dashboards by intercepting the requests below
+        cy.intercept('**', (req) => {
+            if (req.url.includes('/systemSettings?')) {
+                // Append system setting for embedded dashboard support
+                req.continue((resp) => {
+                    resp.body.keyEmbeddedDashboardsEnabled = true
+                    return resp
+                })
+            } else if (req.url.includes('/superset-gateway/api/info')) {
+                // Stub the response to the superset gateway info request
+                req.reply({
+                    supersetBaseUrl: SUPERSET_BASE_URL,
+                    apiDocsPath:
+                        '/superset-gateway/apidocs/dhis2-superset-gateway/swagger-ui/',
+                })
+            } else if (
+                req.url.includes(
+                    '/superset-gateway/api/guestTokens/dhis2/dashboards/'
+                )
+            ) {
+                // Stub the response to the superset gatewat guest token request
+                req.reply({
+                    // Note that the string below does need to have a particular pattern: it was
+                    // copied from the network tab and cannot be replaced by a random shorter string.
+                    // The superset embed SDK must do some sort of pattern validation on it
+                    token: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1c2VyIjp7InVzZXJuYW1lIjoiYW5hbHl0aWNzIiwiZmlyc3RfbmFtZSI6IkRISVMgMiBTdXBlcnNldCIsImxhc3RfbmFtZSI6IkdhdGV3YXkifSwicmVzb3VyY2VzIjpbeyJ0eXBlIjoiZGFzaGJvYXJkIiwiaWQiOiI2NmEzNGMyYS1mYTA2LTRkYjUtYmQ2ZS0wOGZkMjRiZjVhY2MifV0sInJsc19ydWxlcyI6W10sImlhdCI6MTczNzk5NTE0My4yMTU5NjcsImV4cCI6MTczNzk5NTQ0My4yMTU5NjcsImF1ZCI6Imh0dHA6Ly8wLjAuMC4wOjgwODAvIiwidHlwZSI6Imd1ZXN0In0.AayCHirBjomllKxThOCQsn4RHoIfaXfULOVtcnylhj8',
+                })
+            } else if (req.url.includes(`${SUPERSET_BASE_URL}/embedded/`)) {
+                req.reply(SUPERSET_DASHBOARD_STUB)
+            } else {
+                // Just return the response by default
+                req.continue((resp) => resp)
+            }
+        })
+    })
+
+    it('creates an embedded superset dashboard', () => {
+        // Start a new dashboard from the start page
+        cy.visit('#/start')
+
+        cy.get(newButtonSel, EXTENDED_TIMEOUT).click()
+
+        // Choose the embedded dashboard option
+        cy.contains('External: Data from another source')
+            .should('be.visible')
+            .click()
+
+        // Click the configure source button
+        cy.contains('Configure source').should('be.visible').click()
+
+        // A modal form to create a new embedded dashboard is showing
+        cy.contains(
+            'New dashboard: configure external source (superset)'
+        ).should('be.visible')
+
+        // Check all initial values and change them
+        getInputByLabelText('Title').should('have.value', '').type(NAME)
+        getInputByLabelText('Code').should('have.value', '').type(CODE)
+        getInputByLabelText('Description', 'textarea')
+            .should('have.value', '')
+            .type(DESCRIPTION)
+        getInputByLabelText('Superset Embed ID')
+            .should('have.value', '')
+            .type(UUID)
+        getInputByLabelText('Show chart controls on dashboard items')
+            .should('be.checked')
+            .uncheck()
+        getInputByLabelText('Show filters').should('be.checked').uncheck()
+
+        // Click the create button
+        cy.contains('Save dashboard').should('be.enabled').click()
+
+        cy.contains('h3', NAME).should('be.visible')
+        cy.contains('External data').should('be.visible')
+        // An iframe should be visible with the UUID in the src
+        cy.get('iframe')
+            .should('be.visible')
+            .and('have.attr', 'src')
+            .and('contain', UUID)
+    })
+
+    it('has some options disabled in the action-bar', () => {
+        // Primary actions
+        cy.contains('button', 'Slideshow').should('be.disabled')
+        cy.contains('button', 'Filter').should('be.disabled')
+        // Actions in the more-menu
+        cy.getByDataTest('more-actions-button').should('be.enabled').click()
+        cy.contains('a', 'Make available offline').should(
+            'have.attr',
+            'aria-disabled',
+            'true'
+        )
+        cy.contains('a', 'Print')
+            .should('have.attr', 'aria-disabled', 'true')
+            .and('have.attr', 'aria-expanded', 'false')
+        // Close the menu by clicking the backdrop
+        cy.get('.backdrop').should('be.visible').click()
+    })
+
+    it('shows the description', () => {
+        cy.getByDataTest('more-actions-button').should('be.enabled').click()
+        cy.contains('a', 'Show description').should('be.visible').click()
+        cy.contains(DESCRIPTION).should('be.visible')
+        // Keep visible so we can check it updates correctly later on
+    })
+
+    it('stars and unstars the superset embedded dashboard', () => {
+        // Can be starred via menu bar
+        cy.getByDataTest('dashboard-unstarred').click()
+        cy.getByDataTest('dashboard-starred').should('be.visible')
+        // And unstarred via ...menu
+        cy.getByDataTest('more-actions-button').should('be.enabled').click()
+        cy.contains('a', 'Unstar dashboard').should('be.visible').click()
+        cy.getByDataTest('dashboard-unstarred').should('be.visible')
+    })
+
+    it('can share the superset embedded dashboard', () => {
+        cy.contains('button', 'Share').should('be.enabled').click()
+        cy.contains('h1', `Sharing and access: ${NAME}`).should('be.visible')
+        // We don't test the actual sharing, just if the sharing modal pops up
+        cy.contains('button', 'Close').should('be.enabled').click()
+    })
+
+    it('edits the superset embedded dashboard', () => {
+        cy.contains('button', 'Edit').should('be.enabled').click()
+        cy.contains('Edit external dashboard').should('be.visible')
+        // Check all initial values are as when created and change some of them
+        getInputByLabelText('Title')
+            .should('have.value', NAME)
+            .clear()
+            .type(NAME_UPDATED)
+        getInputByLabelText('Code').should('have.value', CODE)
+        getInputByLabelText('Description', 'textarea')
+            .should('have.value', DESCRIPTION)
+            .clear()
+            .type(DESCRIPTION_UPATED)
+        getInputByLabelText('Superset Embed ID')
+            .should('have.value', UUID)
+            .clear()
+            .type(UUID_UPDATED)
+        getInputByLabelText('Show chart controls on dashboard items').should(
+            'not.be.checked'
+        )
+        getInputByLabelText('Show filters').should('not.be.checked')
+
+        // Click the update button
+        cy.contains('Update dashboard').should('be.enabled').click()
+
+        cy.contains('h3', NAME_UPDATED).should('be.visible')
+        cy.contains('External data').should('be.visible')
+        cy.contains(DESCRIPTION_UPATED).should('be.visible')
+        // An iframe should be visible with the UUID in the src
+        cy.get('iframe')
+            .should('be.visible')
+            .and('have.attr', 'src')
+            .and('contain', UUID_UPDATED)
+    })
+
+    it('hides the description', () => {
+        cy.getByDataTest('more-actions-button').should('be.enabled').click()
+        cy.contains('a', 'Hide description').should('be.visible').click()
+        cy.contains(DESCRIPTION_UPATED).should('not.exist')
+    })
+
+    it('deletes the new superset embedded dashboard', () => {
+        cy.contains('Edit').should('be.enabled').click()
+        cy.contains('Edit external dashboard').should('be.visible')
+        cy.contains('Delete').should('be.enabled').click()
+        cy.contains('Delete dashboard').should('be.visible')
+        cy.contains('button', 'Delete').should('be.enabled').click()
+        cy.url().should('satisfy', (href) => href.endsWith('/#/'))
+    })
+})
diff --git a/...mon/SL_dashboard_displays_in_view_mode.js → ...mon/SL_dashboard_displays_in_view_mode.js b/...mon/SL_dashboard_displays_in_view_mode.js → ...mon/SL_dashboard_displays_in_view_mode.js
diff --git a/...ess/e2e/common/add_a_FILTERTYPE_filter.js → ...ucumber/common/add_a_FILTERTYPE_filter.js b/...ess/e2e/common/add_a_FILTERTYPE_filter.js → ...ucumber/common/add_a_FILTERTYPE_filter.js
diff --git a/cypress/e2e/common/add_dashboard_items.js → ...2e_cucumber/common/add_dashboard_items.js b/cypress/e2e/common/add_dashboard_items.js → ...2e_cucumber/common/add_dashboard_items.js
diff --git a/cypress/e2e/common/before_each_visit_root.js → ...cucumber/common/before_each_visit_root.js b/cypress/e2e/common/before_each_visit_root.js → ...cucumber/common/before_each_visit_root.js
diff --git a/.../e2e/common/choose_to_delete_dashboard.js → ...mber/common/choose_to_delete_dashboard.js b/.../e2e/common/choose_to_delete_dashboard.js → ...mber/common/choose_to_delete_dashboard.js
diff --git a/...ss/e2e/common/choose_to_edit_dashboard.js → ...cumber/common/choose_to_edit_dashboard.js b/...ss/e2e/common/choose_to_edit_dashboard.js → ...cumber/common/choose_to_edit_dashboard.js
diff --git a/...n/click_on_the_FILTERTYPE_filter_badge.js → ...n/click_on_the_FILTERTYPE_filter_badge.js b/...n/click_on_the_FILTERTYPE_filter_badge.js → ...n/click_on_the_FILTERTYPE_filter_badge.js
diff --git a/cypress/e2e/common/close_item_selector.js → ...2e_cucumber/common/close_item_selector.js b/cypress/e2e/common/close_item_selector.js → ...2e_cucumber/common/close_item_selector.js
diff --git a/cypress/e2e/common/confirm_delete.js → ...ess/e2e_cucumber/common/confirm_delete.js b/cypress/e2e/common/confirm_delete.js → ...ess/e2e_cucumber/common/confirm_delete.js
diff --git a/...ess/e2e/common/confirm_discard_changes.js → ...ucumber/common/confirm_discard_changes.js b/...ess/e2e/common/confirm_discard_changes.js → ...ucumber/common/confirm_discard_changes.js
diff --git a/cypress/e2e/common/exit_print_layout.js → .../e2e_cucumber/common/exit_print_layout.js b/cypress/e2e/common/exit_print_layout.js → .../e2e_cucumber/common/exit_print_layout.js
diff --git a/cypress/e2e/common/exit_without_saving.js → ...2e_cucumber/common/exit_without_saving.js b/cypress/e2e/common/exit_without_saving.js → ...2e_cucumber/common/exit_without_saving.js
diff --git a/cypress/e2e/common/index.js → cypress/e2e_cucumber/common/index.js b/cypress/e2e/common/index.js → cypress/e2e_cucumber/common/index.js
diff --git a/...e2e/common/message_dashboard_not_found.js → ...ber/common/message_dashboard_not_found.js b/...e2e/common/message_dashboard_not_found.js → ...ber/common/message_dashboard_not_found.js
diff --git a/cypress/e2e/common/open_print_layout.js → .../e2e_cucumber/common/open_print_layout.js b/cypress/e2e/common/open_print_layout.js → .../e2e_cucumber/common/open_print_layout.js
diff --git a/cypress/e2e/common/open_the_SL_dashboard.js → ..._cucumber/common/open_the_SL_dashboard.js b/cypress/e2e/common/open_the_SL_dashboard.js → ..._cucumber/common/open_the_SL_dashboard.js
diff --git a/cypress/e2e/common/print_layout_displays.js → ..._cucumber/common/print_layout_displays.js b/cypress/e2e/common/print_layout_displays.js → ..._cucumber/common/print_layout_displays.js
diff --git a/cypress/e2e/common/start_new_dashboard.js → ...2e_cucumber/common/start_new_dashboard.js b/cypress/e2e/common/start_new_dashboard.js → ...2e_cucumber/common/start_new_dashboard.js
diff --git a/...shboard_description_is_(not)_displayed.js → ...shboard_description_is_(not)_displayed.js b/...shboard_description_is_(not)_displayed.js → ...shboard_description_is_(not)_displayed.js
diff --git a/cypress/e2e/common/type_invalid_id_in_url.js → ...cucumber/common/type_invalid_id_in_url.js b/cypress/e2e/common/type_invalid_id_in_url.js → ...cucumber/common/type_invalid_id_in_url.js
diff --git a/cypress/e2e/dashboard_filter.feature → ...ess/e2e_cucumber/dashboard_filter.feature b/cypress/e2e/dashboard_filter.feature → ...ess/e2e_cucumber/dashboard_filter.feature
diff --git a/.../e2e/dashboard_filter/create_dashboard.js → ...mber/dashboard_filter/create_dashboard.js b/.../e2e/dashboard_filter/create_dashboard.js → ...mber/dashboard_filter/create_dashboard.js
diff --git a/.../e2e/dashboard_filter/dashboard_filter.js → ...mber/dashboard_filter/dashboard_filter.js b/.../e2e/dashboard_filter/dashboard_filter.js → ...mber/dashboard_filter/dashboard_filter.js
diff --git a/cypress/e2e/dashboard_filter/index.js → ...ss/e2e_cucumber/dashboard_filter/index.js b/cypress/e2e/dashboard_filter/index.js → ...ss/e2e_cucumber/dashboard_filter/index.js
diff --git a/cypress/e2e/edit_dashboard.feature → cypress/e2e_cucumber/edit_dashboard.feature b/cypress/e2e/edit_dashboard.feature → cypress/e2e_cucumber/edit_dashboard.feature
diff --git a/cypress/e2e/edit_dashboard/edit_dashboard.js → ...cucumber/edit_dashboard/edit_dashboard.js b/cypress/e2e/edit_dashboard/edit_dashboard.js → ...cucumber/edit_dashboard/edit_dashboard.js
diff --git a/cypress/e2e/edit_dashboard/index.js → cypress/e2e_cucumber/edit_dashboard/index.js b/cypress/e2e/edit_dashboard/index.js → cypress/e2e_cucumber/edit_dashboard/index.js
diff --git a/cypress/e2e/edit_dashboard/sharing.js → ...ss/e2e_cucumber/edit_dashboard/sharing.js b/cypress/e2e/edit_dashboard/sharing.js → ...ss/e2e_cucumber/edit_dashboard/sharing.js
diff --git a/...ss/e2e/edit_dashboard/show_description.js → ...cumber/edit_dashboard/show_description.js b/...ss/e2e/edit_dashboard/show_description.js → ...cumber/edit_dashboard/show_description.js
diff --git a/cypress/e2e/edit_dashboard/star_dashboard.js → ...cucumber/edit_dashboard/star_dashboard.js b/cypress/e2e/edit_dashboard/star_dashboard.js → ...cucumber/edit_dashboard/star_dashboard.js
diff --git a/...e2e/edit_dashboard/translate_dashboard.js → ...ber/edit_dashboard/translate_dashboard.js b/...e2e/edit_dashboard/translate_dashboard.js → ...ber/edit_dashboard/translate_dashboard.js
diff --git a/cypress/e2e/edit_errors.feature → cypress/e2e_cucumber/edit_errors.feature b/cypress/e2e/edit_errors.feature → cypress/e2e_cucumber/edit_errors.feature
diff --git a/...ss/e2e/edit_errors/error_during_delete.js → ...cumber/edit_errors/error_during_delete.js b/...ss/e2e/edit_errors/error_during_delete.js → ...cumber/edit_errors/error_during_delete.js
diff --git a/cypress/e2e/edit_errors/error_during_save.js → ...cucumber/edit_errors/error_during_save.js b/cypress/e2e/edit_errors/error_during_save.js → ...cucumber/edit_errors/error_during_save.js
diff --git a/cypress/e2e/edit_errors/index.js → cypress/e2e_cucumber/edit_errors/index.js b/cypress/e2e/edit_errors/index.js → cypress/e2e_cucumber/edit_errors/index.js
diff --git a/cypress/e2e/filter_restrict.feature → cypress/e2e_cucumber/filter_restrict.feature b/cypress/e2e/filter_restrict.feature → cypress/e2e_cucumber/filter_restrict.feature
diff --git a/...ss/e2e/filter_restrict/filter_restrict.js → ...cumber/filter_restrict/filter_restrict.js b/...ss/e2e/filter_restrict/filter_restrict.js → ...cumber/filter_restrict/filter_restrict.js
diff --git a/cypress/e2e/filter_restrict/index.js → ...ess/e2e_cucumber/filter_restrict/index.js b/cypress/e2e/filter_restrict/index.js → ...ess/e2e_cucumber/filter_restrict/index.js
diff --git a/cypress/e2e/item_context_menu.feature → ...ss/e2e_cucumber/item_context_menu.feature b/cypress/e2e/item_context_menu.feature → ...ss/e2e_cucumber/item_context_menu.feature
diff --git a/cypress/e2e/item_context_menu/fullscreen.js → ..._cucumber/item_context_menu/fullscreen.js b/cypress/e2e/item_context_menu/fullscreen.js → ..._cucumber/item_context_menu/fullscreen.js
diff --git a/cypress/e2e/item_context_menu/index.js → ...s/e2e_cucumber/item_context_menu/index.js b/cypress/e2e/item_context_menu/index.js → ...s/e2e_cucumber/item_context_menu/index.js
diff --git a/cypress/e2e/item_context_menu/open_in_app.js → ...cucumber/item_context_menu/open_in_app.js b/cypress/e2e/item_context_menu/open_in_app.js → ...cucumber/item_context_menu/open_in_app.js
diff --git a/...item_context_menu/show_interpretations.js → ...item_context_menu/show_interpretations.js b/...item_context_menu/show_interpretations.js → ...item_context_menu/show_interpretations.js
diff --git a/cypress/e2e/item_context_menu/view_as.js → ...e2e_cucumber/item_context_menu/view_as.js b/cypress/e2e/item_context_menu/view_as.js → ...e2e_cucumber/item_context_menu/view_as.js
diff --git a/cypress/e2e/offline.feature.disabled → ...ess/e2e_cucumber/offline.feature.disabled b/cypress/e2e/offline.feature.disabled → ...ess/e2e_cucumber/offline.feature.disabled
diff --git a/cypress/e2e/offline/index.js → cypress/e2e_cucumber/offline/index.js b/cypress/e2e/offline/index.js → cypress/e2e_cucumber/offline/index.js
diff --git a/cypress/e2e/offline/offline.js → cypress/e2e_cucumber/offline/offline.js b/cypress/e2e/offline/offline.js → cypress/e2e_cucumber/offline/offline.js
diff --git a/cypress/e2e/responsive_dashboard.feature → ...e2e_cucumber/responsive_dashboard.feature b/cypress/e2e/responsive_dashboard.feature → ...e2e_cucumber/responsive_dashboard.feature
diff --git a/cypress/e2e/responsive_dashboard/index.js → ...2e_cucumber/responsive_dashboard/index.js b/cypress/e2e/responsive_dashboard/index.js → ...2e_cucumber/responsive_dashboard/index.js
diff --git a/...e/responsive_dashboard/phone_landscape.js → ...r/responsive_dashboard/phone_landscape.js b/...e/responsive_dashboard/phone_landscape.js → ...r/responsive_dashboard/phone_landscape.js
diff --git a/...ponsive_dashboard/responsive_dashboard.js → ...ponsive_dashboard/responsive_dashboard.js b/...ponsive_dashboard/responsive_dashboard.js → ...ponsive_dashboard/responsive_dashboard.js
diff --git a/cypress/e2e/slideshow.feature → cypress/e2e_cucumber/slideshow.feature b/cypress/e2e/slideshow.feature → cypress/e2e_cucumber/slideshow.feature
diff --git a/cypress/e2e/slideshow/index.js → cypress/e2e_cucumber/slideshow/index.js b/cypress/e2e/slideshow/index.js → cypress/e2e_cucumber/slideshow/index.js
diff --git a/cypress/e2e/slideshow/slideshow.js → cypress/e2e_cucumber/slideshow/slideshow.js b/cypress/e2e/slideshow/slideshow.js → cypress/e2e_cucumber/slideshow/slideshow.js
diff --git a/cypress/e2e/smoke.feature → cypress/e2e_cucumber/smoke.feature b/cypress/e2e/smoke.feature → cypress/e2e_cucumber/smoke.feature
diff --git a/cypress/e2e/view_dashboard.feature → cypress/e2e_cucumber/view_dashboard.feature b/cypress/e2e/view_dashboard.feature → cypress/e2e_cucumber/view_dashboard.feature
diff --git a/...ashboard/dashboard_items_without_shape.js → ...ashboard/dashboard_items_without_shape.js b/...ashboard/dashboard_items_without_shape.js → ...ashboard/dashboard_items_without_shape.js
diff --git a/cypress/e2e/view_dashboard/index.js → cypress/e2e_cucumber/view_dashboard/index.js b/cypress/e2e/view_dashboard/index.js → cypress/e2e_cucumber/view_dashboard/index.js
diff --git a/.../e2e/view_dashboard/open_dashboard_app.js → ...mber/view_dashboard/open_dashboard_app.js b/.../e2e/view_dashboard/open_dashboard_app.js → ...mber/view_dashboard/open_dashboard_app.js
diff --git a/cypress/e2e/view_dashboard/print.js → cypress/e2e_cucumber/view_dashboard/print.js b/cypress/e2e/view_dashboard/print.js → cypress/e2e_cucumber/view_dashboard/print.js
diff --git a/...2e/view_dashboard/search_for_dashboard.js → ...er/view_dashboard/search_for_dashboard.js b/...2e/view_dashboard/search_for_dashboard.js → ...er/view_dashboard/search_for_dashboard.js
diff --git a/cypress/e2e/view_dashboard/te_map_legend.js → ..._cucumber/view_dashboard/te_map_legend.js b/cypress/e2e/view_dashboard/te_map_legend.js → ..._cucumber/view_dashboard/te_map_legend.js
diff --git a/..._dashboard/toggle_show_more_dashboards.js → ..._dashboard/toggle_show_more_dashboards.js b/..._dashboard/toggle_show_more_dashboards.js → ..._dashboard/toggle_show_more_dashboards.js
diff --git a/cypress/e2e/view_errors.feature → cypress/e2e_cucumber/view_errors.feature b/cypress/e2e/view_errors.feature → cypress/e2e_cucumber/view_errors.feature
diff --git a/...iew_errors/dashboard_item_missing_type.js → ...iew_errors/dashboard_item_missing_type.js b/...iew_errors/dashboard_item_missing_type.js → ...iew_errors/dashboard_item_missing_type.js
diff --git a/...error_while_fetching_dashboard_details.js → ...error_while_fetching_dashboard_details.js b/...error_while_fetching_dashboard_details.js → ...error_while_fetching_dashboard_details.js
diff --git a/...ew_errors/error_while_show_description.js → ...ew_errors/error_while_show_description.js b/...ew_errors/error_while_show_description.js → ...ew_errors/error_while_show_description.js
diff --git a/..._errors/error_while_starring_dashboard.js → ..._errors/error_while_starring_dashboard.js b/..._errors/error_while_starring_dashboard.js → ..._errors/error_while_starring_dashboard.js
diff --git a/cypress/e2e/view_errors/index.js → cypress/e2e_cucumber/view_errors/index.js b/cypress/e2e/view_errors/index.js → cypress/e2e_cucumber/view_errors/index.js
diff --git a/...s/e2e/view_errors/invalid_dashboard_id.js → ...umber/view_errors/invalid_dashboard_id.js b/...s/e2e/view_errors/invalid_dashboard_id.js → ...umber/view_errors/invalid_dashboard_id.js
diff --git a/...view_errors/item_chart_fails_to_render.js → ...view_errors/item_chart_fails_to_render.js b/...view_errors/item_chart_fails_to_render.js → ...view_errors/item_chart_fails_to_render.js
diff --git a/cypress/e2e/view_errors/no_dashboards.js → ...e2e_cucumber/view_errors/no_dashboards.js b/cypress/e2e/view_errors/no_dashboards.js → ...e2e_cucumber/view_errors/no_dashboards.js
diff --git a/cypress/e2e/view_errors/no_edit_access.js → ...2e_cucumber/view_errors/no_edit_access.js b/cypress/e2e/view_errors/no_edit_access.js → ...2e_cucumber/view_errors/no_edit_access.js
diff --git a/package.json b/package.json
@@ -42,7 +42,8 @@
         "cy:run": "start-server-and-test 'yarn cy:start' http://localhost:3000 'yarn cypress run --browser chrome headless'"
     },
     "devDependencies": {
-        "@badeball/cypress-cucumber-preprocessor": "^20.1.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+        "@badeball/cypress-cucumber-preprocessor": "^22.0.0",
         "@bahmutov/cypress-esbuild-preprocessor": "^2.2.1",
         "@cypress/webpack-preprocessor": "^6.0.2",
         "@dhis2/cli-app-scripts": "^11.7.1",
@@ -56,6 +57,7 @@
         "@testing-library/react": "^12",
         "cypress": "^13.13.1",
         "cypress-real-events": "^1.13.0",
+        "cypress-tags": "^1.2.2",
         "d2-manifest": "^1.0.0",
         "eslint-plugin-cypress": "^3.3.0",
         "immutability-helper": "^3.1.1",
@@ -65,7 +67,8 @@
         "redux-mock-store": "^1.5.4",
         "resize-observer-polyfill": "^1.5.1",
         "semantic-release": "^20",
-        "start-server-and-test": "^1.14.0"
+        "start-server-and-test": "^1.14.0",
+        "typescript": "^5.7.3"
     },
     "jest": {
         "moduleNameMapper": {

diff --git a/src/components/DashboardsBar/InformationBlock/ActionsBar.js b/src/components/DashboardsBar/InformationBlock/ActionsBar.js
@@ -161,7 +161,10 @@ const ActionsBar = ({
                         ? i18n.t('Unstar dashboard')
                         : i18n.t('Star dashboard')
                 }
-                onClick={toggleDashboardStarred}
+                onClick={() => {
+                    toggleDashboardStarred()
+                    setMoreOptionsIsOpen(false)
+                }}
             />
             <MenuItem
                 dense

diff --git a/src/pages/view/EmbeddedSupersetDashboard.js b/src/pages/view/EmbeddedSupersetDashboard.js
@@ -70,6 +70,10 @@ export const EmbeddedSupersetDashboard = () => {
         loadEmbeddedSupersetDashboard()
     }, [loading, error, success, loadEmbeddedSupersetDashboard])
 
+    useEffect(() => {
+        dispatch({ type: LOAD_RESET })
+    }, [embedData])
+
     return (
         <div className={styles.container}>
             <div