Merged in Main

Author: RyanBirtch-aot

.devcontainer/.dockerignore

@@ -0,0 +1,24 @@
+# Devcontainer specific ignores
+.DS_Store
+*.log
+
+# Chef's local files (will be copied during build)
+chefs_local/local.json
+chefs_local/test.json
+
+# Temporary files
+*.tmp
+*.temp
+
+# IDE files
+.vscode/
+.idea/
+
+# OS files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db 

.devcontainer/Dockerfile

@@ -1,24 +1,40 @@
 ARG VARIANT="20.18.3-bookworm"
 FROM node:${VARIANT}
 
-# Install some extras such as vim for interactive rebases. Also some
-# Cypress prerequisites for running in Debian containers:
-# https://docs.cypress.io/app/get-started/install-cypress#UbuntuDebian
-# and we set up k6 for performance testing
-RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C5AD17C747E3415A3642D57D77C6C491D6AC1D69 && \
-    echo "deb https://dl.k6.io/deb stable main" | tee /etc/apt/sources.list.d/k6.list && \
-    apt-get update && \
+# Layer 1: Install basic system utilities (rarely change)
+RUN apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
-        k6 \
-        libasound2 \
-        libgbm-dev \
-        libgtk-3-0 \
-        libgtk2.0-0 \
-        libnotify-dev \
-        libnss3 \
-        libxss1 \
-        libxtst6 \
         vim \
         xauth \
         xvfb \
+        wget \
     && apt-get clean
+
+# Layer 2: Install k6 for performance testing (changes occasionally)
+RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys C5AD17C747E3415A3642D57D77C6C491D6AC1D69 && \
+    echo "deb https://dl.k6.io/deb stable main" | tee /etc/apt/sources.list.d/k6.list && \
+    apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y k6 && \
+    apt-get clean
+
+# Layer 3: Install Cypress dependencies (changes with Cypress updates)
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+    libasound2 \
+    libgbm-dev \
+    libgtk-3-0 \
+    libnss3 \
+    libxss1 \
+    libxtst6 \
+    && apt-get clean
+
+# Layer 4: Install Java for SonarLint (changes with project dependencies)
+RUN apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+        openjdk-17-jre-headless \
+    && apt-get clean
+
+# Layer 5: Install global npm packages (changes with project dependencies)
+RUN npm install -g knex jest dotenv-cli
+
+# Layer 6: Ensure devcontainer scripts are executable (will be set during container startup)

.devcontainer/devcontainer.json

@@ -8,7 +8,9 @@
   },
 
   "features": {
-    "ghcr.io/devcontainers/features/docker-in-docker:2": {}
+    "ghcr.io/devcontainers/features/docker-in-docker:2": {},
+    "ghcr.io/devcontainers/features/git:1": {}
+
   },
 
   // Use this environment variable if you need to bind mount your local source code into a new container.
@@ -28,7 +30,7 @@
   ],
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  "postCreateCommand": "bash ./.devcontainer/post-install.sh",
+  "postCreateCommand": "chmod +x ./.devcontainer/*.sh && bash ./.devcontainer/post-install.sh",
 
   // Configure tool-specific properties.
   "customizations": {
@@ -46,7 +48,11 @@
       "settings": {
         "database-client.telemetry.usesOnlineServices": false,
         "editor.defaultFormatter": "esbenp.prettier-vscode",
-        "editor.formatOnSave": true
+        "editor.formatOnSave": true,
+        "sonarlint.autoDownload": true,
+        "sonarlint.ls.javaHome": "/usr/lib/jvm/java-17-openjdk-amd64",
+        "sonarlint.analysisExcludesStandalone": "**/*.{c,cpp,h,hpp,cc,cxx}"
+
       }
     }
   },
@@ -79,5 +85,7 @@
     "64120": {
       "label": "Sonarlint IDE"
     }
-  }
+  },
+  "mounts": ["source=npm-cache,target=/root/.npm,type=volume"]
+
 }

.devcontainer/install-cypress.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+
+# Interactive Cypress installation script with explicit paths
+echo "🤔 Checking for Cypress setup..."
+
+# Define explicit paths - handle running from .devcontainer directory
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+WORKSPACE_ROOT="${WORKSPACE_ROOT:-$(dirname "${SCRIPT_DIR}")}"
+CYPRESS_DIR="${WORKSPACE_ROOT}/tests/functional/cypress"
+PACKAGE_JSON="${CYPRESS_DIR}/package.json"
+
+echo "📍 Script directory: ${SCRIPT_DIR}"
+echo "📍 Workspace root: ${WORKSPACE_ROOT}"
+echo "📍 Cypress directory: ${CYPRESS_DIR}"
+
+if [ -f "${PACKAGE_JSON}" ]; then
+  echo "📦 Found package.json in ${CYPRESS_DIR}"
+  read -p "Install Cypress? (y/n): " -n 1 -r
+  echo ""
+  
+  if [[ $REPLY =~ ^[Yy]$ ]]; then
+    echo "📦 Installing Cypress in ${CYPRESS_DIR}..."
+    cd "${CYPRESS_DIR}"
+    if npm ci; then
+      echo "✅ Cypress installed successfully!"
+      echo "📍 Installation location: ${CYPRESS_DIR}"
+    else
+      echo "❌ Cypress installation failed"
+      exit 1
+    fi
+  else
+    echo "⏭️ Skipped Cypress installation"
+  fi
+else
+  echo "❌ package.json not found at ${PACKAGE_JSON}"
+  echo "💡 Expected location: ${CYPRESS_DIR}/package.json"
+  echo "💡 Current working directory: $(pwd)"
+  exit 1
+fi 

.devcontainer/post-install.sh

@@ -1,44 +1,131 @@
 #!/bin/bash
-set -ex
+set -e
+
+# Function to handle errors
+error_handler() {
+  echo "❌ Error occurred in line $1"
+  exit 1
+}
+
+# Set error handler
+trap 'error_handler $LINENO' ERR
 
 # Convenience workspace directory for later use
 WORKSPACE_DIR=$(pwd)
 CHEFS_LOCAL_DIR=${WORKSPACE_DIR}/.devcontainer/chefs_local
+# Note: Global npm packages (knex, jest, dotenv-cli) are now installed in Dockerfile
+
+# Ensure we're in the workspace root
+cd ${WORKSPACE_DIR}
+echo "📍 Working directory: $(pwd)"
+
+# Check if Docker is available
+if ! command -v docker &> /dev/null; then
+  echo "❌ Error: Docker is not available"
+  exit 1
+fi
+
+# Check if Docker Compose is available
+if ! command -v docker-compose &> /dev/null && ! docker compose version &> /dev/null; then
+  echo "❌ Error: Docker Compose is not available"
+  exit 1
+fi
+
+# Check if required directories exist
+if [ ! -d "components" ]; then
+  echo "❌ Error: components directory not found"
+  exit 1
+fi
+
+if [ ! -d "app" ]; then
+  echo "❌ Error: app directory not found"
+  exit 1
+fi
+
+if [ ! -d "app/frontend" ]; then
+  echo "❌ Error: app/frontend directory not found"
+  exit 1
+fi
+
+# install dependencies in parallel for faster setup
+echo "📦 Installing dependencies in parallel..."
 
-npm install knex -g
-npm install jest -g
-npm install dotenv-cli -g
+# Install components dependencies
+(cd components && npm install) &
+COMPONENTS_PID=$!
 
-# install components/formio libraries, prepare for ux development and debugging...
-cd components
-npm install
+# Install app dependencies  
+(cd app && npm install) &
+APP_PID=$!
 
- # install app libraries, prepare for app development and debugging...
-cd ../app
-npm install
+# Install frontend dependencies
+(cd app/frontend && npm install) &
+FRONTEND_PID=$!
 
-# install frontend libraries, prepare for ux development and debugging...
-cd frontend
-npm install
+# Wait for all installations to complete
+wait $COMPONENTS_PID $APP_PID $FRONTEND_PID
+
+# Check if any installations failed
+if [ $? -ne 0 ]; then
+  echo "❌ Error: One or more npm installations failed"
+  exit 1
+fi
+
+echo "✅ All dependencies installed successfully!"
 
 # make an initial build of formio components and ready them for frontend
+cd ${WORKSPACE_DIR}/app/frontend
 npm run build:formio
 npm run deploy:formio
 
 # copy over the sample files to the image...
-cp -u ${CHEFS_LOCAL_DIR}/local.sample.json ${CHEFS_LOCAL_DIR}/local.json
+if [ ! -f "${CHEFS_LOCAL_DIR}/local.json" ]; then
+  cp ${CHEFS_LOCAL_DIR}/local.sample.json ${CHEFS_LOCAL_DIR}/local.json
+fi
 
 # fire up postgres... we want to seed the db
-docker compose -f ${CHEFS_LOCAL_DIR}/docker-compose.yml up --wait
+echo "🐘 Starting PostgreSQL..."
+if ! docker compose -f ${CHEFS_LOCAL_DIR}/docker-compose.yml up postgres -d; then
+  echo "❌ Failed to start PostgreSQL"
+  exit 1
+fi
+
+# Wait for PostgreSQL to be ready
+echo "⏳ Waiting for PostgreSQL to be ready..."
+max_attempts=30
+attempt=1
+while [ $attempt -le $max_attempts ]; do
+  if docker compose -f ${CHEFS_LOCAL_DIR}/docker-compose.yml exec -T postgres pg_isready -U app -d chefs > /dev/null 2>&1; then
+    echo "✅ PostgreSQL is ready!"
+    break
+  fi
+  echo "⏳ Attempt $attempt/$max_attempts: PostgreSQL not ready yet..."
+  sleep 2
+  attempt=$((attempt + 1))
+done
+
+if [ $attempt -gt $max_attempts ]; then
+  echo "❌ PostgreSQL failed to start within expected time"
+  exit 1
+fi
+
 # run an initial migration for the db and seed it...
 export NODE_CONFIG_DIR=${CHEFS_LOCAL_DIR} # need this to connect to the running postgres instance.
-cd .. # back to app dir
-npm run migrate
+cd ${WORKSPACE_DIR}/app # ensure we're in the app directory
+echo "🗄️ Running database migrations..."
+if ! npm run migrate; then
+  echo "❌ Failed to run database migrations"
+  exit 1
+fi
 # npm run seed:run
 
-# install cypress libraries
-cd ../tests/functional/cypress
-npm ci
-
 # take down postgres, do not need them running all the time.
-docker compose -f ${CHEFS_LOCAL_DIR}/docker-compose.yml down
+echo "🛑 Stopping PostgreSQL..."
+if ! docker compose -f ${CHEFS_LOCAL_DIR}/docker-compose.yml down; then
+  echo "⚠️ Warning: Failed to stop PostgreSQL containers"
+fi
+
+# Note: Cypress installation is now handled via VS Code tasks
+# Run Task -> Install Cypress
+# Run Task -> Run Cypress Tests (Interactive)
+