Merge branch 'main' into fix/filter-date

Author: carlosthe19916

.devcontainer/Dockerfile

@@ -0,0 +1,10 @@
+# Image tag should match package.json > @playwright/test
+FROM mcr.microsoft.com/playwright:v1.55.0-jammy
+
+RUN apt update && \
+    apt install sudo && \
+    usermod -aG sudo pwuser  && \
+    echo "%sudo ALL=(ALL) NOPASSWD:ALL" | tee -a /etc/sudoers > /dev/null
+
+RUN chown pwuser:pwuser -R /home/pwuser
+USER pwuser

.devcontainer/README.md

@@ -0,0 +1,42 @@
+# Devcontainers
+
+Use [Devcontainers](https://code.visualstudio.com/docs/devcontainers/containers) to prepare a fully automated working environment.
+
+Generate the `devcontainer.json` executing:
+
+```shell
+cd .devcontainer
+./generate_devcontainer.sh
+```
+
+Now you should see the file `.devcontainer/devcontainer.json`. At this point you can use your favorite IDE to run Devcontainers
+
+## VSCode
+
+Install the extension https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers
+
+To open the repository with DevContainers do `Ctrl + Shift + P` and enter `Dev Containers: Rebuild and Reopen in Container`. For more options see the Extension documentations.
+
+### Docker
+
+Docker defaults should work fine therefore there is nothing to do.
+
+### Podman
+
+Start Podman service for a regular user (rootless) and make it listen to a socket:
+
+```shell
+systemctl --user enable --now podman.socket
+```
+
+Restart your OS if necessary and verify that podman listens:
+
+```shell
+systemctl --user status podman.socket
+```
+
+Go to the Extension Settings:
+
+- `Dev › Containers: Docker Compose Path` set `podman-compose`
+- `Dev › Containers: Docker Path` set `podman`
+- `Dev › Containers: Docker Socket Path` set `/run/podman/podman.sock`

.devcontainer/generate_devcontainer.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+
+HOSTNAME=$(hostname)
+envsubst '${HOSTNAME}' < template.json > devcontainer.json

.devcontainer/template.json

@@ -0,0 +1,34 @@
+{
+  "name": "playwright",
+  "image": "mcr.microsoft.com/playwright:v1.55.0-jammy",
+  "workspaceFolder": "/workspaces/trustify-ui/e2e",
+  "runArgs": [
+    "--privileged",
+    "--userns=keep-id",
+    "--network=host",
+    "--add-host=${HOSTNAME}:127.0.0.1",
+    "-e DISPLAY=:2"
+  ],
+  "remoteUser": "pwuser",
+  "features": {
+    "ghcr.io/devcontainers/features/desktop-lite:1": {
+      "VNC_RESOLUTION": "1920x1200x16"
+    }
+  },
+  "forwardPorts": [6080, 5901],
+  "portsAttributes": {
+    "6080": {
+      "label": "browser vnc"
+    },
+    "5901": {
+      "label": "real vnc"
+    }
+  },
+  "customizations": {
+    "vscode": {
+      "extensions": [
+        "ms-playwright.playwright"
+      ]
+    }
+  }
+}

.env

@@ -4,7 +4,7 @@ TRUSTIFY_UI_IMAGE=ghcr.io/trustification/trustify-ui:latest
 POSTGRESQL_IMAGE=postgres:16
 
 PLAYWRIGHT_IMAGE=mcr.microsoft.com/playwright
-PLAYWRIGHT_VERSION=v1.49.1
+PLAYWRIGHT_VERSION=v1.55.0
 UBUNTU_VERSION_ALIAS=-jammy
 PLAYWRIGHT_PORT=5000
 PLAYWRIGHT_HOME=/home/pwuser

.github/actions/start-trustify/action.yml

@@ -16,6 +16,11 @@ inputs:
     type: string
     required: false
     default: ""
+  playwright_version:
+    description: version of the playwright image to run
+    type: string
+    required: false
+    default: ""
 outputs:
   server_port:
     description: Port where the server is running
@@ -33,18 +38,25 @@ runs:
       working-directory: ${{ github.action_path }}/../../..
       shell: bash
       run: |
-        images=""
+        opts=""
+
         if [ -n "${{ inputs.server_image }}" ]; then
-          images="${images} TRUSTIFY_IMAGE=${{ inputs.server_image }}"
-        elif [ -n "${{ inputs.ui_image }}" ]; then
-          images="${images} TRUSTIFY_UI_IMAGE=${{ inputs.ui_image }}"
-        elif [ -n "${{ inputs.server_db_image }}" ]; then
-          images="${images} POSTGRESQL_IMAGE=${{ inputs.server_db_image }}"
+          opts="${opts} TRUSTIFY_IMAGE=${{ inputs.server_image }}"
+        fi
+        if [ -n "${{ inputs.ui_image }}" ]; then
+          opts="${opts} TRUSTIFY_UI_IMAGE=${{ inputs.ui_image }}"
+        fi
+        if [ -n "${{ inputs.server_db_image }}" ]; then
+          opts="${opts} POSTGRESQL_IMAGE=${{ inputs.server_db_image }}"
+        fi
+
+        if [ -n "${{ inputs.playwright_version }}" ]; then
+          opts="${opts} PLAYWRIGHT_VERSION=${{ inputs.playwright_version }}"
         fi
 
-        echo "images to overwrite: $images"
+        echo "opts: $opts"
 
-        eval "${images} docker compose up -d"
+        eval "${opts} docker compose up -d"
 
     - name: Wait for services to be ready
       shell: bash
@@ -55,7 +67,7 @@ runs:
             sleep 2
           done
         done
-    
+
     - id: set-output
       shell: bash
       run: |

.github/workflows/ci-coverage.yaml

@@ -0,0 +1,65 @@
+name: CI Coverage
+
+on:
+  push:
+    branches:
+      - "main"
+  pull_request:
+    branches:
+      - "main"
+  workflow_call:
+  merge_group:
+
+concurrency:
+  group: ci-coverage-e2e-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+      - name: install dependencies
+        run: npm ci
+
+      - name: install trustify
+        id: install-trustify
+        uses: ./.github/actions/start-trustify
+        with:
+          ui_image: ${{ inputs.ui_image }}
+          server_image: ${{ inputs.server_image }}
+          server_db_image: ${{ inputs.server_db_image }}
+
+      - name: trustify-ui - start in dev mode
+        run: |
+          AUTH_REQUIRED=false npm run start:dev & echo "dev ui started"
+      - name: trustify-ui - wait
+        run: |
+          until curl -s http://localhost:3000 | grep -qi "<html"; do
+            echo "Waiting for HTML page"
+            sleep 2
+          done
+
+      - name: Tests with coverage
+        working-directory: e2e
+        run: |
+          PW_TEST_CONNECT_WS_ENDPOINT=ws://localhost:${{ steps.install-trustify.outputs.playwright_port }}/ TRUSTIFY_UI_URL=http://localhost:3000 AUTH_REQUIRED=false npm run test:ui
+          ls -la .nyc_output
+
+      - name: Generate coverage report
+        run: |
+          npx nyc report --temp-dir e2e/.nyc_output --reporter=html --reporter=text --reporter=lcov
+      - name: Upload coverage report
+        uses: actions/upload-artifact@v4
+        with:
+          name: coverage-report
+          path: coverage
+      - name: Upload coverage reports to Codecov
+        uses: codecov/codecov-action@v5
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          slug: trustification/trustify-ui

.github/workflows/ci-global-template.yaml renamed to .github/workflows/ci-e2e-template.yaml

@@ -1,4 +1,4 @@
-name: Run global Trustify CI tests
+name: Run e2e Trustify CI tests
 
 on:
   workflow_call:
@@ -37,18 +37,6 @@ on:
         type: boolean
         required: false
         default: true
-      tests_ref:
-        description: |
-          The branch or PR of the trustify-tests repository to clone.
-          For a pull request, the reference format would be "refs/pull/${PR_NUMBER}/merge".
-          For a branch, the reference format would just be the branch name.
-          This input can be set automatically on a pull request by adding a string of the format:
-            UI tests PR: 140
-          replacing "140" with the appropriate PR number. This will make it easier to coordinate changes
-          that require updating the global tests as well.
-        required: false
-        type: string
-        default: main
   workflow_dispatch:
     inputs:
       artifact:
@@ -85,26 +73,14 @@ on:
         type: boolean
         required: false
         default: true
-      tests_ref:
-        description: |
-          The branch or PR of the trustify-tests repository to clone.
-          For a pull request, the reference format would be "refs/pull/${PR_NUMBER}/merge".
-          For a branch, the reference format would just be the branch name.
-          This input can be set automatically on a pull request by adding a string of the format:
-            UI tests PR: 140
-          replacing "140" with the appropriate PR number. This will make it easier to coordinate changes
-          that require updating the global tests as well.
-        required: false
-        type: string
-        default: main
 
 jobs:
   check-images:
     runs-on: ubuntu-latest
     steps:
       - name: Download artifact
         if: "${{ inputs.artifact != '' }}"
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact }}
           path: /tmp
@@ -147,36 +123,9 @@ jobs:
     needs: check-images
     runs-on: ubuntu-latest
     steps:
-      - name: Extract pull request number from inputs or PR description
-        env:
-          body: ${{ github.event.pull_request.body }}
-        run: |
-          PULL_REQUEST_NUMBER=$(echo ${body} | grep -oP '[T|t]ests [P|p][R|r]: \K\d+' || true)
-          [ -z "$PULL_REQUEST_NUMBER" ] \
-            && TESTS_REF=${{ inputs.tests_ref }} \
-            || TESTS_REF=refs/pull/$PULL_REQUEST_NUMBER/merge
-
-          echo "TESTS_REF=${TESTS_REF}" >>"$GITHUB_ENV"
-          echo "Using TESTS_REF \`${TESTS_REF}\`" >>"$GITHUB_STEP_SUMMARY"
-
-      - name: Checkout tests repo
-        uses: actions/checkout@v5
-        with:
-          repository: trustification/trustify-tests
-          path: trustify-tests
-          ref: "${{ env.TESTS_REF }}"
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 20
-          cache: "npm"
-          cache-dependency-path: "trustify-tests/package-lock.json"
-      - name: Install dependencies
-        run: npm ci
-        working-directory: trustify-tests
-
       - name: Download artifact
         if: "${{ inputs.artifact != '' }}"
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: ${{ inputs.artifact }}
           path: /tmp
@@ -186,18 +135,22 @@ jobs:
           docker load --input /tmp/${{ inputs.artifact }}.tar
 
       - name: Checkout ui repo
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          path: trustify-ui
+          node-version: 22
+          cache: "npm"
+      - name: Install dependencies
+        run: npm ci
+
       - name: Start trustify
-        uses: ./trustify-ui/.github/actions/start-trustify
+        uses: ./.github/actions/start-trustify
         with:
           ui_image: ${{ inputs.ui_image }}
           server_image: ${{ inputs.server_image }}
           server_db_image: ${{ inputs.server_db_image }}
 
       - name: Run Playwright tests
-        working-directory: trustify-tests
         run: |
           script=""
           if [ "${{ inputs.run_api_tests }}" = "true" ] && [ "${{ inputs.run_ui_tests }}" = "true" ]; then
@@ -210,4 +163,4 @@ jobs:
 
           echo "script to run: ${script}"
 
-          PW_TEST_CONNECT_WS_ENDPOINT=ws://localhost:5000/ TRUSTIFY_URL=http://localhost:8081 TRUSTIFY_AUTH_ENABLED=false npm run $script
+          PW_TEST_CONNECT_WS_ENDPOINT=ws://localhost:5000/ TRUSTIFY_UI_URL=http://localhost:8081 AUTH_REQUIRED=false npm run -w e2e $script