feat: fixed merge conflicts with dev

.github/workflows/cleanClosedPR.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo

.github/workflows/cleanMergedPR.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo

.github/workflows/deploy.yml

@@ -6,6 +6,7 @@ on:
   pull_request:
     types: [opened, reopened, synchronize, ready_for_review]
     branches-ignore:
+      - test
       - prod
 
 concurrency:
@@ -128,7 +129,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
   # Build the web frontend app image
   buildAPP:
@@ -151,7 +152,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -213,7 +214,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -274,7 +275,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -330,7 +331,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -390,7 +391,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -444,7 +445,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -499,7 +500,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -556,7 +557,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo

.github/workflows/deployStatic.yml

@@ -67,7 +67,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Checkout Target Branch
         uses: actions/checkout@v4
@@ -101,7 +101,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -151,7 +151,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -201,7 +201,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -251,7 +251,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -302,7 +302,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -353,7 +353,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -405,7 +405,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -457,7 +457,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -510,7 +510,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo

.github/workflows/e2e-pr-test.yml

@@ -56,7 +56,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: E2E Smoke tests
         uses: cypress-io/github-action@v6

.github/workflows/lint-format.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Checkout Target Branch
         uses: actions/checkout@v4
@@ -50,7 +50,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -81,7 +81,7 @@ jobs:
 
       - name: Install api dependencies
         working-directory: api
-        run: npm install
+        run: npm ci --include=dev
 
       - name: Run api linter
         working-directory: api
@@ -105,7 +105,7 @@ jobs:
 
       - name: Install app dependencies
         working-directory: app
-        run: npm install
+        run: npm ci --include=dev
 
       - name: Run app linter
         working-directory: app
@@ -129,7 +129,7 @@ jobs:
 
       - name: Install database dependencies
         working-directory: database
-        run: npm install
+        run: npm ci --include=dev
 
       - name: Run database linter
         working-directory: database

.github/workflows/test.yml

@@ -25,7 +25,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       - name: Checkout Target Branch
         uses: actions/checkout@v4
@@ -53,7 +53,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 20
 
       # Load repo from cache
       - name: Cache repo
@@ -84,7 +84,7 @@ jobs:
 
       - name: Install api dependencies
         working-directory: api
-        run: npm install
+        run: npm ci --include=dev
 
       - name: Run api tests with coverage
         working-directory: api
@@ -110,7 +110,7 @@ jobs:
 
       - name: Install app dependencies
         working-directory: app
-        run: npm install
+        run: npm ci --include=dev
 
       - name: Run app tests with coverage
         working-directory: app

.gitignore

@@ -109,10 +109,5 @@ dist
 # Apple macOS folder attributes file
 **/.DS_Store
 
-# n8N - ignore root level temp config folder
-.n8n
-n8n/.n8n
-n8n/.config
-
 # IDE custom workspace settings
 .vscode/settings.json

Makefile

@@ -23,7 +23,7 @@ env: | setup ## Copies the default ./env_config/env.docker to ./.env
 
 postgres: | close build-postgres run-postgres ## Performs all commands necessary to run the postgres project (db) in docker
 backend: | close build-backend run-backend ## Performs all commands necessary to run all backend projects (db, api) in docker
-web: | close build-web run-web ## Performs all commands necessary to run all backend+web projects (db, api, app) in docker
+web: | close build-web check-env run-web ## Performs all commands necessary to run all backend+web projects (db, api, app) in docker
 
 db-setup: | build-db-setup run-db-setup ## Performs all commands necessary to run the database migrations and seeding
 db-migrate: | build-db-migrate run-db-migrate ## Performs all commands necessary to run the database migrations
@@ -62,6 +62,12 @@ prune: ## Deletes ALL docker artifacts (even those not associated to this projec
 	@docker system prune --all --volumes -f
 	@docker volume prune --all -f
 
+check-env: ## Check for missing env vars
+	@echo "==============================================="
+	@echo "Make: check-env - checking for missing env vars"
+	@echo "==============================================="
+	@awk -F '=' 'NR==FNR && !/^#/ && NF {a[$$1]; next} !/^#/ && NF && !($$1 in a)' .env env_config/env.docker
+
 ## ------------------------------------------------------------------------------
 ## Build/Run Postgres DB Commands
 ## - Builds all of the SIMS postgres db projects (db, db_setup)
@@ -303,7 +309,17 @@ pipeline-install: ## Runs `npm install` for all projects
 ## Run `docker logs <container> -f` commands for all projects
 ## - You can include additional parameters by appaending an `args` param
 ## - Ex: `make log-app args="--tail 0"`
+## Note: The default args, if not provided, are `--tail 2000`
 ## ------------------------------------------------------------------------------
+
+args ?= --tail 2000 ## Default args if none are provided
+
+log: ## Runs `docker-compose logs -f` for all containers
+	@echo "==============================================="
+	@echo "Running docker logs for the app container"
+	@echo "==============================================="
+	@docker-compose logs -f $(args)
+
 log-app: ## Runs `docker logs <container> -f` for the app container
 	@echo "==============================================="
 	@echo "Running docker logs for the app container"