Merge branch 'develop_3x' into test/addresspart-unit-tests

.github/workflows/frontend-qa.yml

@@ -2,6 +2,8 @@ name: OpenELis Frontend QA framework workflow
 on:
   push:
     branches: [ 'develop_3x' ]
+  pull_request:
+    branches: ['develop_3x']  
   workflow_dispatch:
 jobs:
   install:

.github/workflows/label-merge-conflict.yml

@@ -0,0 +1,27 @@
+name: Auto Label Conflicts
+
+permissions:
+  issues: write
+  pull-requests: write
+
+on:
+  push:
+    branches: [develop_3x]
+  pull_request:
+    branches: [develop_3x]
+
+jobs:
+  auto-label:
+    if: github.repository == 'I-TECH-UW/OpenELIS-Global-2'
+    runs-on: ubuntu-latest
+    steps:
+      - uses: prince-chrismc/label-merge-conflicts-action@v2
+        with:
+          conflict_label_name: "merge conflict"
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          max_retries: 5
+          wait_ms: 15000
+          detect_merge_changes: false
+          conflict_comment: |
+            :wave: Hi, @${author},
+            Conflicts have been detected against the base branch. Please rebase your branch against the base branch.

.github/workflows/publish-frontend-dev.yml

@@ -8,6 +8,8 @@ name: Publish 3.X Dev FrontEnd Docker image
 on:
   push:
     branches: [ 'develop_3x']
+  pull_request:
+    branches: [develop_3x]  
   workflow_dispatch:
 
 
@@ -37,6 +39,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Login to DockerHub
+        if: github.event_name == 'push'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
@@ -50,6 +53,7 @@ jobs:
           images: ${{ env.DOCKER_NAME }}
 
       - name: Build and push Docker image
+        if: github.event_name == 'push'
         uses: docker/build-push-action@v5
         with:
           context: ./frontend
@@ -58,3 +62,11 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=${{github.repository}}:latest
           cache-to: type=inline
+
+      - name: Build Docker image
+        if: github.event_name == 'pull_request'
+        uses: docker/build-push-action@v5
+        with:
+          context: ./frontend
+          push: false
+

.github/workflows/publish-frontend.yml

@@ -8,6 +8,8 @@ name: Publish 3.X FrontEnd Docker image
 on:
   push:
     branches: [ 'develop_3x']
+  pull_request:
+    branches: [develop_3x]   
   release:
     types: [published]
   workflow_dispatch:
@@ -38,6 +40,7 @@ jobs:
         uses: docker/setup-buildx-action@v3
 
       - name: Log in to the Container registry
+        if: github.event_name == 'push'
         uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
@@ -51,6 +54,7 @@ jobs:
           images: ${{ env.DOCKER_NAME }}
 
       - name: Build and push Docker image
+        if: github.event_name == 'push'
         uses: docker/build-push-action@v5
         with:
           context: ./frontend
@@ -60,3 +64,13 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=registry,ref=${{github.repository}}:latest
           cache-to: type=inline
+
+      - name: Build Docker image
+        if: github.event_name == 'pull_request'
+        uses: docker/build-push-action@v5
+        with:
+          context: ./frontend
+          file: ./frontend/Dockerfile.prod
+          push: false
+
+

.gitpod.yml

@@ -0,0 +1,12 @@
+# This configuration file is created to run on Gitpod.
+# Please adjust to your needs (see https://www.gitpod.io/docs/introduction/learn-gitpod/gitpod-yaml)
+# and commit this file to your remote git repository to share the goodness with others.
+
+# Learn more from ready-to-use templates: https://www.gitpod.io/docs/introduction/getting-started/quickstart
+
+tasks:
+  - name: Build the Dependencies and Start the docker containers
+    init:  cd dataexport && mvn clean install -DskipTests && cd .. && mvn clean install 
+    command:  docker-compose -f dev.docker-compose.yml up -d    
+
+

README.md

@@ -15,19 +15,20 @@ You can find more information on how to set up OpenELIS at our [docs page](http:
     docker-compose -f build.docker-compose.yml up -d --build
 
 #### Running docker compose With locally compiled/built Artifacts (ie the War file and React code) For Developers
-1. Clone the Repository
+1. Fork the [OpenELIS-Global Repository](https://github.com/I-TECH-UW/OpenELIS-Global-2.git) and clone the forked repo. The `username` below is the `username` of your Github profile.
 
-         git clone https://github.com/I-TECH-UW/OpenELIS-Global-2.git 
+         git clone https://github.com/username/OpenELIS-Global-2.git 
 
 2. innitialize and build sub modules
 
+        cd OpenELIS-Global-2
         git submodule update --init --recursive
-        cd OpenELIS-Global-2/dataexport
+        cd dataexport
         mvn clean install -DskipTests
 
 3.   Build the War file
 
-            cd OpenELIS-Global-2
+            cd ..
             mvn clean install -DskipTests
 
 4. Start the containers to mount the locally compiled artifacts
@@ -52,3 +53,7 @@ You can find more information on how to set up OpenELIS at our [docs page](http:
 | Legacy UI   |  https://localhost/api/OpenELIS-Global/  | admin: adminADMIN! |
 | New React UI  |    https://localhost/  |  admin: adminADMIN!
 
+**Note:** If your browser indicates that the website is not secure after accessing any of these links, simply follow these steps:
+1. Scroll down on the warning page.
+2. Click on the "Advanced" button.
+3. Finally, click on "Proceed to https://localhost" to access the development environment.