Cypress qa work

.github/workflows/frontend-qa.yml

@@ -0,0 +1,79 @@
+name: Cypress OE QA workflows
+
+on:
+  push:
+    branches: [ '2.8' ]
+  pull_request:
+    branches: [ '2.8' ]
+  workflow_dispatch:
+
+jobs:
+  install:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set up JDK 11
+        uses: actions/setup-java@v1
+        with:
+          java-version: 11
+      - name: Cache local Maven repository
+        uses: actions/cache@v2
+        with:
+          path: ~/.m2/repository
+          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            ${{ runner.os }}-maven-
+      - name: Log in to the Container registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Checkout dataexport module
+        uses: actions/checkout@v2
+        with:
+          repository: I-TECH-UW/dataexport
+          ref: develop
+      - name: install dataexport module
+        run: mvn clean install
+
+      - name: Checkout OpenELIS-Global2
+        uses: actions/checkout@v3
+        with:
+          repository: ${{github.repository}}
+
+      - name: Build OpenELIS-Global2
+        run: mvn clean install
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: 14.x
+
+      - name: Install dependencies
+        run: npm install
+        working-directory: react-ui
+
+      - name: Install React scripts
+        run: npm install [email protected] -g
+        working-directory: react-ui
+
+      - name: Run OpenELS image
+        run: docker-compose -f build.docker-compose.yml up -d
+
+      - name: Sleep for 8 minutes for OpenELIS to start
+        run: sleep 8m
+        shell: bash
+
+      - name: check containers
+        run: docker ps
+      - name: check frontend container logs
+        run: docker logs --tail 20 openelisglobal-front-end
+
+      - name: Run Frontend Qa Workflow
+        run: npx cypress run –headless
+        working-directory: react-ui
+
+
+
+
+

.github/workflows/publish-frontend.yml

@@ -44,8 +44,8 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
         with:
-          context: ./react-ui
-          file: ./react-ui/Dockerfile.prod
+          context: ./frontend
+          file: ./frontend/Dockerfile.prod
           push: true
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

README.md

@@ -7,7 +7,6 @@ You can find more information on how to set up OpenELIS at our [docs page](http:
 
 [![Publish Docker Image Status](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/publish.yml/badge.svg)](https://github.com/I-TECH-UW/OpenELIS-Global-2/actions/workflows/publish.yml)
 
-
 ### Running OpenELIS in Docker
 #### Running with published docker images
     docker-compose up -d
@@ -21,3 +20,4 @@ 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!
+

build.docker-compose.yml

@@ -88,18 +88,18 @@ services:
       - source: common.properties
 
   frontend.openelis.org:
-    image: react-ui
+    image: frontend
     build:
-      context: ./react-ui
+      context: ./frontend
       dockerfile: ./Dockerfile
     container_name: openelisglobal-front-end  
     # ports:
     #   - 3000:3000
     networks:
       - default
     volumes:
-      - './react-ui/src:/app/src'
-      - './react-ui/public:/app/public'
+      - './frontend/src:/app/src'
+      - './frontend/public:/app/public'
     environment:
       - CHOKIDAR_USEPOLLING=true
     tty: true

build.sh

@@ -92,7 +92,7 @@ echo "creating docker images"
 #bash ${INSTALL_DIR}/buildProject.sh -dl ${CONSOLIDATED_SERVER_DIR}
 bash ${INSTALL_DIR}/buildProject.sh -dl ${PROJECT_DIR}/fhir -t hapi-fhir-jpaserver
 #create the frontend docker image 
-bash ${INSTALL_DIR}/buildProject.sh -dl ${PROJECT_DIR}/react-ui -t openelisglobal-frontend
+bash ${INSTALL_DIR}/buildProject.sh -dl ${PROJECT_DIR}/frontend -t openelisglobal-frontend
 #create the frontend docker image 
 bash ${INSTALL_DIR}/buildProject.sh -dl ${PROJECT_DIR}/nginx-proxy -t nginx-proxy
 #create the docker image 

docker-compose.yml

@@ -1,132 +1,133 @@
 version: '3.3'
 services:
-  certs:
-    container_name: oe-certs
-    image: ghcr.io/i-tech-uw/certgen:main
-    restart: always
-    environment:
-      - KEYSTORE_PW="kspass"
-      - TRUSTSTORE_PW="tspass"
-    networks:
-      - default
-    volumes:
-      - key_trust-store-volume:/etc/openelis-global
-      - keys-vol:/etc/ssl/private/
-      - certs-vol:/etc/ssl/certs/
-  database:
-    container_name: openelisglobal-database
-    image: postgres:9.5
-    ports:
-      - "15432:5432"
-    restart: always
-    env_file:
-      - ./volume/database/database.env
-    volumes:
-      # preserves the database between containers
-      - db-data:/var/lib/postgresql/data
-      # files here will run on install
-      - ./volume/database/dbInit:/docker-entrypoint-initdb.d
-    networks:
-      - default
-    healthcheck:
-      test: [ "CMD", "pg_isready", "-q", "-d", "clinlims", "-U", "clinlims" ]
-      timeout: 45s
-      interval: 10s
-      retries: 10
+    certs:
+        container_name: oe-certs 
+        image: ghcr.io/i-tech-uw/certgen:main
+        restart: always
+        environment:
+            - KEYSTORE_PW="kspass"
+            - TRUSTSTORE_PW="tspass"
+        networks:
+            - default
+        volumes:
+            -  key_trust-store-volume:/etc/openelis-global
+            -  keys-vol:/etc/ssl/private/
+            -  certs-vol:/etc/ssl/certs/
 
-  oe.openelis.org:
-    container_name: openelisglobal-webapp
-    image: ghcr.io/i-tech-uw/openelis-global-2:2.8
-    depends_on:
-      - database
-    ports:
-      - "8080:8080"
-      - "8443:8443"
-    restart: always
-    networks:
-      default:
-        ipv4_address: 172.20.1.121
+    database:
+        container_name: openelisglobal-database 
+        image: postgres:9.5
+        ports:
+            - "15432:5432"
+        restart: always
+        env_file:
+            - ./volume/database/database.env
+        volumes:
+              # preserves the database between containers
+             - db-data:/var/lib/postgresql/data                
+              # files here will run on install
+             - ./volume/database/dbInit:/docker-entrypoint-initdb.d
+        networks:
+            - default
+        healthcheck:
+            test: [ "CMD", "pg_isready", "-q", "-d", "clinlims", "-U", "clinlims" ]
+            timeout: 45s
+            interval: 10s
+            retries: 10 
+
+    oe.openelis.org:
+        container_name: openelisglobal-webapp 
+        image: ghcr.io/i-tech-uw/openelis-global-2:2.8    
+        depends_on:
+            - database
+        ports:
+            - "8080:8080"
+            - "8443:8443"
+        restart: always
+        networks:
+          default:
+              ipv4_address: 172.20.1.121
 
-    environment:
-      - DEFAULT_PW=adminADMIN!
-      - TZ=Africa/Nairobi
-      # context.xml doesn't seem to be able to pick up environment variables directly, so we are passing them in as CATALINA_OPTS
-      - CATALINA_OPTS= -Ddatasource.url=jdbc:postgresql://database:5432/clinlims -Ddatasource.username=clinlims
-    volumes:
-      -  key_trust-store-volume:/etc/openelis-global
-      - ./volume/plugins/:/var/lib/openelis-global/plugins
-      - ./volume/tomcat/oe_server.xml:/usr/local/tomcat/conf/server.xml
-    secrets:
-      - source: datasource.password
-      - source: common.properties
+        environment:
+            - DEFAULT_PW=adminADMIN! 
+            - TZ=Africa/Nairobi
+              # context.xml doesn't seem to be able to pick up environment variables directly, so we are passing them in as CATALINA_OPTS
+            - CATALINA_OPTS= -Ddatasource.url=jdbc:postgresql://database:5432/clinlims -Ddatasource.username=clinlims
+        volumes:
+            -  key_trust-store-volume:/etc/openelis-global
+            - ./volume/plugins/:/var/lib/openelis-global/plugins
+            - ./volume/tomcat/oe_server.xml:/usr/local/tomcat/conf/server.xml
+        secrets:
+            - source: datasource.password
+            - source: common.properties
+
+    fhir.openelis.org:
+        container_name: external-fhir-api
+        image: hapiproject/hapi:v5.5.1
+        ports:
+            - "8081:8080"
+            - "8444:8443"
+        networks:
+            - default
+        restart: always
+        environment:
+          TZ: Africa/Nairobi
 
-  fhir.openelis.org:
-    container_name: external-fhir-api
-    image: hapiproject/hapi:v5.5.1
-    ports:
-      - "8081:8080"
-      - "8444:8443"
-    networks:
-      - default
-    restart: always
-    environment:
-      TZ: Africa/Nairobi
-
-      JAVA_OPTS: "-Djavax.net.ssl.trustStore=/etc/openelis-global/truststore 
+          JAVA_OPTS: "-Djavax.net.ssl.trustStore=/etc/openelis-global/truststore 
                       -Djavax.net.ssl.trustStorePassword=tspass
                       -Djavax.net.ssl.trustStoreType=pkcs12 
                       -Djavax.net.ssl.keyStore=/etc/openelis-global/keystore 
                       -Djavax.net.ssl.keyStorePassword=kspass 
-                      -Djavax.net.ssl.keyStoreType=pkcs12"
-
-    volumes:
-      -  key_trust-store-volume:/etc/openelis-global
-      - ./volume/tomcat/hapi_server.xml:/usr/local/tomcat/conf/server.xml
-
-
-  frontend.openelis.org:
-    image: ghcr.io/i-tech-uw/openelis-global-2-frontend:2.8
-    container_name: openelisglobal-front-end
-    # ports:
-    #   - 80:80
-    networks:
-      - default
-    volumes:
-      - './react-ui/src:/app/src'
-      - './react-ui/public:/app/public'
-    environment:
-      - CHOKIDAR_USEPOLLING=true
-    tty: true
+                      -Djavax.net.ssl.keyStoreType=pkcs12"            
+
+        volumes:
+            -  key_trust-store-volume:/etc/openelis-global
+            - ./volume/tomcat/hapi_server.xml:/usr/local/tomcat/conf/server.xml
 
-  proxy:
-    image: nginx:1.15-alpine
-    container_name: openelisglobal-proxy
-    ports:
-      - 80:80
-      - 443:443
-    volumes:
-      - certs-vol:/etc/nginx/certs/
-      - keys-vol:/etc/nginx/keys/
-      - ./volume/nginx/nginx-prod.conf:/etc/nginx/nginx.conf:ro
-    restart: unless-stopped
-    depends_on:
-      - certs
+
+    frontend.openelis.org:
+        image: ghcr.io/i-tech-uw/openelis-global-2-frontend:2.8
+        container_name: openelisglobal-front-end
+        # ports:
+        #   - 80:80
+        networks:
+        - default
+        volumes:
+        - './react-ui/src:/app/src'
+        - './react-ui/public:/app/public'
+        environment:
+        - CHOKIDAR_USEPOLLING=true
+        tty: true
 
+    proxy:
+        image: nginx:1.15-alpine
+        container_name: openelisglobal-proxy
+        ports:
+        - 80:80
+        - 443:443
+        volumes:
+        - certs-vol:/etc/nginx/certs/
+        - keys-vol:/etc/nginx/keys/
+        - ./volume/nginx/nginx-prod.conf:/etc/nginx/nginx.conf:ro
+        restart: unless-stopped
+        depends_on:
+        - certs        
+
 secrets:
   datasource.password:
-    file: ./volume/properties/datasource.password
+    file: ./volume/properties/datasource.password  
   common.properties:
-    file:  ./volume/properties/common.properties
+    file:  ./volume/properties/common.properties  
 
 networks:
   default:
     driver: bridge
     ipam:
       config:
-        - subnet: 172.20.1.0/24
-
+        - subnet: 172.20.1.0/24  
+        
 volumes:
   db-data:
   key_trust-store-volume:
   certs-vol:
-  keys-vol:
+  keys-vol:

docs/27upgrade.md

@@ -92,7 +92,7 @@ If you are running these commands on a remote server, it is recommended to use a
     10.     run the setup script for the new version with updated db, ignoring db backup couldn’t occur step
 
 
-        a)     sudo setup_OpenELIS.py
+        a)     sudo python3 setup_OpenELIS.py
 
 
     11.  ensure systems start up and that data is present