From 9de9b2e64a14609d4a1e651b86ee4663299d655b Mon Sep 17 00:00:00 2001 From: Rene Pot Date: Sun, 8 Sep 2024 23:07:58 +0100 Subject: [PATCH 1/3] Revert "chore: temp disable e2e" This reverts commit 5eb6e5ca5af4d4eb3d839c04a3ef7e561200a1fe. --- .github/workflows/dhis2-verify-lib.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/dhis2-verify-lib.yml b/.github/workflows/dhis2-verify-lib.yml index eaaa951aab..b820e8122a 100644 --- a/.github/workflows/dhis2-verify-lib.yml +++ b/.github/workflows/dhis2-verify-lib.yml @@ -107,6 +107,13 @@ jobs: env: SHOULD_RECORD: ${{ contains(github.event.head_commit.message, '[e2e record]') || contains(join(github.event.pull_request.labels.*.name), 'e2e record') }} + strategy: + fail-fast: false + matrix: + spec-group: ${{ fromJson(needs.setup-matrix.outputs.matrix) }} + env: + SHOULD_RECORD: ${{ contains(github.event.head_commit.message, '[e2e record]') || contains(join(github.event.pull_request.labels.*.name), 'e2e record') }} + steps: - name: Checkout uses: actions/checkout@v2 From 21ce73c7c09fdeb58e1fa28f3891d4eba90e337d Mon Sep 17 00:00:00 2001 From: Rene Pot Date: Mon, 9 Sep 2024 09:27:45 +0100 Subject: [PATCH 2/3] docs:fix demo url --- docs/src/constants.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/constants.js b/docs/src/constants.js index 5321a33669..c4eaafccf6 100644 --- a/docs/src/constants.js +++ b/docs/src/constants.js @@ -1,2 +1,2 @@ -// export const DEMO_URL = 'https://ui.dhis2.nu/demo' -export const DEMO_URL = 'http://127.0.0.1:8080' +// export const DEMO_URL = 'http://127.0.0.1:8080' +export const DEMO_URL = '/demo' From 79f15bc18efddc3cc9a77340f6d1bc2200acd575 Mon Sep 17 00:00:00 2001 From: Rene Pot Date: Mon, 9 Sep 2024 09:31:17 +0100 Subject: [PATCH 3/3] docs:fix 2 linting issues --- docs/src/components/DemoComponent.jsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/src/components/DemoComponent.jsx b/docs/src/components/DemoComponent.jsx index 34a7492a1c..d371542dd2 100644 --- a/docs/src/components/DemoComponent.jsx +++ b/docs/src/components/DemoComponent.jsx @@ -1,6 +1,6 @@ -import { DEMO_URL } from '@site/src/constants.js' import PropTypes from 'prop-types' import React, { useRef } from 'react' +import { DEMO_URL } from '../constants.js' import styles from './DemoComponent.module.css' export const Demo = ({ path, args, height }) => { @@ -8,7 +8,7 @@ export const Demo = ({ path, args, height }) => { const handleReload = () => { if (iframeRef.current) { - iframeRef.current.src = iframeRef.current.src + iframeRef.current.contentWindow.location.reload() } }