From 7f5be0e17c6e15f7c5e3cd8ef720ed18e2b59373 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 22 Jan 2025 09:06:00 +0300 Subject: [PATCH 1/5] Modify config only when user explicitly clicks on select --- .../components/admin/generalConfig/common/ConfigMenuDisplay.js | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/src/components/admin/generalConfig/common/ConfigMenuDisplay.js b/frontend/src/components/admin/generalConfig/common/ConfigMenuDisplay.js index bf6ccce46..9356548cc 100644 --- a/frontend/src/components/admin/generalConfig/common/ConfigMenuDisplay.js +++ b/frontend/src/components/admin/generalConfig/common/ConfigMenuDisplay.js @@ -271,9 +271,6 @@ function ConfigMenuDisplay(props) { {rows.map((row) => ( { - setSelectedRowId(row.id); - }} > {row.cells.map((cell) => renderCell(cell, row), From 7520a56a221f9eed727e2280823b06a018c319d4 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 22 Jan 2025 09:51:28 +0300 Subject: [PATCH 2/5] add auto create property to the properties file --- src/main/resources/application.properties | 3 +++ volume/properties/common.properties | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index 0b2dd9b10..a4e9534e6 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -53,3 +53,6 @@ vapid.public.key=BJDIyXHWK_o9fYNwD3fUie2Ed04-yx5fxz9-GUT1c0QhfdDiGMvVbJwvB_On3Xa vapid.private.key=FVONpka44MuWq6U8l3X4HY1hAfWM1v1IQB698gsS0KQ +# org.openelisglobal.program.autocreate:true + + diff --git a/volume/properties/common.properties b/volume/properties/common.properties index da2bed4d4..8fc289822 100644 --- a/volume/properties/common.properties +++ b/volume/properties/common.properties @@ -54,3 +54,6 @@ org.openelisglobal.paging.patients.pageSize=99 org.openelisglobal.paging.results.pageSize=99 org.openelisglobal.paging.validation.pageSize=99 org.openelisglobal.paging.displaylist.pageSize=99 + +#AUto create Programmes from Questionare Resources under programs directory +org.openelisglobal.program.autocreate = true From 628313507bf67bc553999aac5e04097493c86c63 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 22 Jan 2025 10:19:56 +0300 Subject: [PATCH 3/5] Run publish jobs only on ITECH repo --- .github/workflows/publish-and-test.yml | 4 ++++ .github/workflows/publish-dev-backend-images.yml | 2 ++ .github/workflows/publish-dev-frontend-images.yml | 2 ++ 3 files changed, 8 insertions(+) diff --git a/.github/workflows/publish-and-test.yml b/.github/workflows/publish-and-test.yml index b419f9397..105405305 100644 --- a/.github/workflows/publish-and-test.yml +++ b/.github/workflows/publish-and-test.yml @@ -20,6 +20,7 @@ env: jobs: build-and-push-test-image-backend: + if: ${{ github.repository == 'I-TECH-UW/OpenELIS-Global-2' }} runs-on: ubuntu-latest permissions: contents: read @@ -63,6 +64,7 @@ jobs: build-args: SKIP_SPOTLESS=true build-and-push-test-image-frontend: + if: ${{ github.repository == 'I-TECH-UW/OpenELIS-Global-2' }} runs-on: ubuntu-latest permissions: contents: read @@ -105,6 +107,7 @@ jobs: cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache,mode=max build-and-push-test-image-proxy: + if: ${{ github.repository == 'I-TECH-UW/OpenELIS-Global-2' }} runs-on: ubuntu-latest permissions: contents: read @@ -146,6 +149,7 @@ jobs: cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache,mode=max build-and-push-test-image-fhir: + if: ${{ github.repository == 'I-TECH-UW/OpenELIS-Global-2' }} runs-on: ubuntu-latest permissions: contents: read diff --git a/.github/workflows/publish-dev-backend-images.yml b/.github/workflows/publish-dev-backend-images.yml index b38c5892a..b2185522b 100644 --- a/.github/workflows/publish-dev-backend-images.yml +++ b/.github/workflows/publish-dev-backend-images.yml @@ -19,6 +19,7 @@ env: jobs: build-and-push-image-backend-dev: + if: ${{ github.repository == 'I-TECH-UW/OpenELIS-Global-2' }} runs-on: ubuntu-latest strategy: fail-fast: false @@ -83,6 +84,7 @@ jobs: retention-days: 1 merge-backend-dev-platform-images: + if: ${{ github.repository == 'I-TECH-UW/OpenELIS-Global-2' }} runs-on: ubuntu-latest needs: - build-and-push-image-backend-dev diff --git a/.github/workflows/publish-dev-frontend-images.yml b/.github/workflows/publish-dev-frontend-images.yml index d3b06bf02..71563805e 100644 --- a/.github/workflows/publish-dev-frontend-images.yml +++ b/.github/workflows/publish-dev-frontend-images.yml @@ -19,6 +19,7 @@ env: jobs: build-and-push-image-frontend-dev: + if: ${{ github.repository == 'I-TECH-UW/OpenELIS-Global-2' }} runs-on: ubuntu-latest strategy: fail-fast: false @@ -85,6 +86,7 @@ jobs: retention-days: 1 merge-frontend-dev-platform-images: + if: ${{ github.repository == 'I-TECH-UW/OpenELIS-Global-2' }} runs-on: ubuntu-latest needs: - build-and-push-image-frontend-dev From 5c3f77e3e4d30f1d21cb0353d05c3839ff4fd398 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 22 Jan 2025 10:22:29 +0300 Subject: [PATCH 4/5] fix --- .github/workflows/publish-and-test.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/publish-and-test.yml b/.github/workflows/publish-and-test.yml index 105405305..bdb831db8 100644 --- a/.github/workflows/publish-and-test.yml +++ b/.github/workflows/publish-and-test.yml @@ -307,6 +307,7 @@ jobs: cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-frontend:buildcache,mode=max build-and-push-image-proxy: + if: ${{ github.repository == 'I-TECH-UW/OpenELIS-Global-2' }} runs-on: ubuntu-latest permissions: contents: read @@ -348,6 +349,7 @@ jobs: cache-to: type=registry,ref=${{ env.DOCKER_TEST_NAME }}-proxy:buildcache,mode=max build-and-push-image-fhir: + if: ${{ github.repository == 'I-TECH-UW/OpenELIS-Global-2' }} runs-on: ubuntu-latest permissions: contents: read From ef1a72a0deb386efa94da2ffcb7f78efd2389fb0 Mon Sep 17 00:00:00 2001 From: mozzy11 Date: Wed, 22 Jan 2025 10:38:45 +0300 Subject: [PATCH 5/5] turn off cypress video recording to optimise running e2e tests --- frontend/cypress.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/cypress.config.js b/frontend/cypress.config.js index f8c3f9b81..cc6c267c1 100755 --- a/frontend/cypress.config.js +++ b/frontend/cypress.config.js @@ -4,6 +4,7 @@ module.exports = defineConfig({ defaultCommandTimeout: 8000, viewportWidth: 1200, viewportHeight: 700, + video: false, watchForFileChanges: false, e2e: { setupNodeEvents(on, config) {