Merge pull request 'bugfix/org' (#893) from bugfix/org into dev

Reviewed-on: baron/baron-sso#893

Makefile

@@ -263,7 +263,7 @@ code-check-userfront-lint:
 code-check-front-lint:
 	@echo "==> adminfront biome lint/format check"
 	rm -rf adminfront/playwright-report adminfront/test-results
-	cd adminfront && pnpm install --frozen-lockfile --ignore-scripts
+	cd adminfront && CI=true pnpm install --frozen-lockfile --ignore-scripts
 	cd adminfront && npx biome check . --formatter-enabled=false --organize-imports-enabled=false
 	cd adminfront && npx biome check . --linter-enabled=false --organize-imports-enabled=false
 	@echo "==> devfront biome lint/format check"

adminfront/Dockerfile

@@ -2,6 +2,9 @@ FROM node:lts
 
 WORKDIR /workspace
 
+# Set CI environment variable to true to avoid TTY issues with pnpm
+ENV CI=true
+
 # Install pnpm
 RUN npm install -g pnpm
 

adminfront/scripts/runtime-mode.sh

@@ -106,7 +106,7 @@ ensure_frontend_dependencies() {
       return 0
     fi
     if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then
-      (cd /workspace/common && pnpm install --filter "${APP_WORKSPACE_FILTER}..." --frozen-lockfile --ignore-scripts)
+      (cd /workspace/common && CI=true pnpm install --filter "${APP_WORKSPACE_FILTER}..." --no-frozen-lockfile --ignore-scripts)
     else
       npm ci
     fi

common/pnpm-lock.yaml

@@ -423,6 +423,9 @@ importers:
       autoprefixer:
         specifier: ^10.5.0
         version: 10.5.0(postcss@8.5.14)
+      jsdom:
+        specifier: ^28.1.0
+        version: 28.1.0
       postcss:
         specifier: ^8.5.14
         version: 8.5.14

devfront/Dockerfile

@@ -2,6 +2,9 @@ FROM node:lts
 
 WORKDIR /workspace
 
+# Set CI environment variable to true to avoid TTY issues with pnpm
+ENV CI=true
+
 # Install pnpm
 RUN npm install -g pnpm
 

devfront/scripts/runtime-mode.sh

@@ -106,7 +106,7 @@ ensure_frontend_dependencies() {
       return 0
     fi
     if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then
-      (cd /workspace/common && pnpm install --filter "${APP_WORKSPACE_FILTER}..." --frozen-lockfile --ignore-scripts)
+      (cd /workspace/common && CI=true pnpm install --filter "${APP_WORKSPACE_FILTER}..." --no-frozen-lockfile --ignore-scripts)
     else
       npm ci
     fi

orgfront/Dockerfile

@@ -2,6 +2,9 @@ FROM node:lts
 
 WORKDIR /workspace
 
+# Set CI environment variable to true to avoid TTY issues with pnpm
+ENV CI=true
+
 # Install pnpm
 RUN npm install -g pnpm
 

orgfront/scripts/runtime-mode.sh

@@ -106,7 +106,7 @@ ensure_frontend_dependencies() {
       return 0
     fi
     if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then
-      (cd /workspace/common && pnpm install --filter "${APP_WORKSPACE_FILTER}..." --frozen-lockfile --ignore-scripts)
+      (cd /workspace/common && CI=true pnpm install --filter "${APP_WORKSPACE_FILTER}..." --no-frozen-lockfile --ignore-scripts)
     else
       npm ci
     fi

scripts/run_adminfront_ci_tests.sh

@@ -201,7 +201,7 @@ set +e
     if ! command -v pnpm >/dev/null 2>&1; then
       run_with_retry 3 npm install -g pnpm
     fi
-    run_with_retry 3 pnpm install -C ../common --no-frozen-lockfile --store-dir "$pnpm_store_dir"
+    run_with_retry 3 CI=true pnpm install -C ../common --no-frozen-lockfile --store-dir "$pnpm_store_dir"
   fi
 ) 2>&1 | tee reports/adminfront-install.log
 install_exit_code=${PIPESTATUS[0]}