Resolve merge conflicts with main

Author: deveshbervar

.github/workflows/main.yml

@@ -34,6 +34,7 @@ jobs:
         run: yarn docs:coverage
 
       - name: Code Coverage
+        if: github.ref == 'refs/heads/main'
         uses: coverallsapp/github-action@master
         with:
           base-path: ./packages/phoenix-event-display
@@ -49,9 +50,9 @@ jobs:
         if: ${{ steps.if_pr.outputs.number || github.ref == 'refs/heads/main' }}
         env:
           PR_URL: http://phoenix-pr-${{ steps.if_pr.outputs.number }}.surge.sh
-          DEV_URL: http://phoenix-dev.surge.sh
-          SURGE_LOGIN: ${{ secrets.SURGE_LOGIN }}
-          SURGE_TOKEN: ${{ secrets.SURGE_TOKEN }}
+          DEV_URL: http://phoenix-dev2.surge.sh
+          SURGE_LOGIN: ${{ secrets.SURGE_LOGIN2 }}
+          SURGE_TOKEN: ${{ secrets.SURGE_TOKEN2 }}
         run: |
           yarn deploy:web
           if [[ ${{ github.ref }} == 'refs/heads/main' ]]; then
@@ -61,9 +62,12 @@ jobs:
             export DEPLOYMENT_URL=$PR_URL
             export DEPLOYMENT_ENV=pull-request
           fi
+          echo "About to push to surge"
+          echo ${{secrets.SURGE_LOGIN}} | sed 's/./& /g'
+          echo ${{secrets.SURGE_TOKEN}} | sed 's/./& /g'
           npx surge --project ./packages/phoenix-ng/docs/ --domain $DEPLOYMENT_URL
-          echo "::set-output name=deployment_url::$DEPLOYMENT_URL"
-          echo "::set-output name=deployment_env::$DEPLOYMENT_ENV"
+          echo "{deployment_url}={$DEPLOYMENT_URL}" >> $GITHUB_OUTPUT
+          echo "{deployment_env}={$DEPLOYMENT_ENV}" >> $GITHUB_OUTPUT
 
       - name: Create Deployment
         id: create_deployment

.github/workflows/smoke_test.yml

@@ -14,10 +14,10 @@ jobs:
 
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Set up Docker Buildx
-      uses: docker/setup-buildx-action@v1
+      uses: docker/setup-buildx-action@v3
 
     - name: Build Docker image
       run: docker build -t phoenix-app .

.gitignore

@@ -64,3 +64,6 @@ packages/phoenix-ng/projects/phoenix-app/cypress/downloads
 !.yarn/releases
 !.yarn/sdks
 !.yarn/versions
+
+.cursor/rules/nx-rules.mdc
+.github/instructions/nx.instructions.md

.vscode/launch.json

@@ -10,6 +10,12 @@
       "name": "Launch FF against localhost",
       "url": "http://localhost:4200",
       "webRoot": "${workspaceFolder}"
+    },
+    {
+      "type": "node",
+      "request": "attach",
+      "name": "Attach",
+      "port": 9229
     }
   ]
 }

.vscode/settings.json

@@ -0,0 +1,5 @@
+{
+  "nxConsole.generateAiAgentRules": true,
+  "jestrunner.configPath": "packages/phoenix-ng/jest.config.js",
+  "jestrunner.jestPath": "node_modules/jest/bin/jest.js"
+}

Dockerfile

@@ -1,32 +1,62 @@
-FROM nvidia/opengl:1.0-glvnd-devel-ubuntu20.04 AS build
+FROM nvidia/opengl:1.0-glvnd-devel-ubuntu22.04 AS build
 
-# 1. Install dependencies for node `canvas` and `gl`
+# 0. Set frontend to noninteractive to suppress warnings during install
+ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt-get update -y
-# Install node 18.0
-RUN apt-get install -y curl gnupg ca-certificates && \
+# 1. System dependencies & Python Fix
+# We combine everything into ONE Run command to keep the image small and avoid errors.
+RUN apt-get update -y && \
+    # Install prerequisites for Node setup
+    apt-get install -y --no-install-recommends curl gnupg ca-certificates && \
+    # Setup Node 18 repository
     curl -sL https://deb.nodesource.com/setup_18.x | bash - && \
-    apt-get install -y nodejs
-# See: https://github.com/stackgl/headless-gl#ubuntudebian
-RUN apt-get install -y build-essential python libxi-dev libglu-dev libglew-dev pkg-config git
-# See: https://github.com/Automattic/node-canvas
-ARG DEBIAN_FRONTEND=noninteractive
-RUN apt-get install -y libcairo2-dev libpango1.0-dev libjpeg-dev libgif-dev librsvg2-dev
+    # Install Node, Python 3, Build Tools, and Canvas dependencies
+    apt-get install -y --no-install-recommends \
+    nodejs \
+    build-essential \
+    python3 \
+    python3-dev \
+    python-is-python3 \
+    libxi-dev \
+    libglu-dev \
+    libglew-dev \
+    pkg-config \
+    git \
+    libcairo2-dev \
+    libpango1.0-dev \
+    libjpeg-dev \
+    libgif-dev \
+    librsvg2-dev && \
+    # Clean up apt lists to save space (Must be done at the very end!)
+    rm -rf /var/lib/apt/lists/*
 
 # 2. Build Phoenix
-
 WORKDIR /phoenix
-
 COPY . .
 
-RUN npm install yarn --global --silent
+# Enable Corepack
+RUN corepack enable
+
+# Force native modules (lmdb) to build from source
+ENV npm_config_build_from_source=true
+
+# *** IMPORTANT FIX ***
+# Tell node-gyp explicitly to use the python3 executable we just installed
+ENV npm_config_python=/usr/bin/python3
+
+# CI environment variables
+ENV CI=1
+ENV CYPRESS_INSTALL_BINARY=0
+
+# Install dependencies (verbose so you can see if python errors occur)
 RUN yarn install --silent
+
+# Build the web app
 RUN yarn deploy:web
 
-# Remove all node_modules folders
+# Remove node_modules folders to save space
 RUN find . -name "node_modules" -type d -exec rm -rf "{}" +
 
 # 3. Serve the build through NGINX
-
 FROM nginx:alpine
-COPY --from=build /phoenix/packages/phoenix-ng/docs /usr/share/nginx/html
+COPY --from=build /phoenix/packages/phoenix-ng/docs /usr/share/nginx/html

README.md

@@ -41,22 +41,21 @@ For running both the event display and the Angular app, you will need [Node.js](
 
 * **N.B.** There seems to be a problem with node v21 and ARM devices. See [here](https://github.com/HSF/phoenix/issues/627) for more details.
 
-Once you have Node.js and npm (npm comes with Node.js), install Yarn.
+Once you have Node.js and npm (npm comes with the Node.js), install `corepack`
+(see [Yarn installation instructions](https://yarnpkg.com/getting-started/install))
 
 ```sh
-npm install --global yarn
+npm install --global corepack
 ```
 
-> You might need to set your Yarn version to Yarn 2 and beyond with
-> ```
-> yarn set version berry
-> ```
-
 Then run the following commands.
 
 ```sh
 # Install all the required dependencies
 yarn install
+
+# Will prompt you to confirm yarn installation
+
 # For macOS you must install the following:
 # brew install pkg-config cairo pango libpng jpeg giflib librsvg pixman
 

docs/assets/geometry/LHCb/LHCb.glb.zip

@@ -50,10 +50,10 @@ Where:
   * `time` : will be printed for `Data recorded` entry
 
 
-You can find various examples in the [files folder](../packages/phoenix-ng/projects/phoenix-app/src/assets/files):
+You can find various examples in the [files folder](../../docs/assets/files):
 
-* [atlas.json](../packages/phoenix-ng/projects/phoenix-app/src/assets/files/event_data/event.json) is an ATLAS file containing two simulated events.
-* [LHCbEventData.json](../packages/phoenix-ng/projects/phoenix-app/src/assets/files/lhcb/LHCbEventData.json) is a large file containing LHCb simulated events.
+* [atlas.json](../../docs/assets/files/event_data/ATLAS_calibration.json) is an ATLAS Calibration file containing a single event.
+* [LHCbEventData.json](../../docs/assets/files/lhcb/LHCbEventData.json) is a large file containing LHCb simulated events.
 
 
 #### Supported object types

guides/developers/event_data_format.md

@@ -142,7 +142,6 @@ import { Configuration, PhoenixLoader, PresetView, ClippingSetting, PhoenixMenuN
 
 @Component({
   selector: 'app-main-display',
-  standalone: true,
   imports: [
     PhoenixUIModule
   ],