Merge branch 'works' of https://github.com/Lemeri123/OpenELIS-Global-2 …

…into works
I-TECH-UW · Jan 23, 2025 · 1715ed9 · 1715ed9
2 parents c903786 + fdbc4ba
commit 1715ed9
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 3 deletions.
diff --git 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
@@ -303,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
@@ -344,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

diff --git 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
@@ -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

diff --git 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) {

diff --git 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) => (
                                 <TableRow
                                   key={row.id}
-                                  onClick={() => {
-                                    setSelectedRowId(row.id);
-                                  }}
                                 >
                                   {row.cells.map((cell) =>
                                     renderCell(cell, row),

diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -53,3 +53,6 @@ vapid.public.key=BJDIyXHWK_o9fYNwD3fUie2Ed04-yx5fxz9-GUT1c0QhfdDiGMvVbJwvB_On3Xa
		vapid.private.key=FVONpka44MuWq6U8l3X4HY1hAfWM1v1IQB698gsS0KQ


		# org.openelisglobal.program.autocreate:true