fixed the hover behavior, so "rows per page" button behaves the same way as other buttons in the peers overview

.github/workflows/build_and_push.yml

@@ -19,7 +19,7 @@ jobs:
       - name: setup-node
         uses: actions/setup-node@v3
         with:
-          node-version: '20'
+          node-version: '18'
           cache: 'npm'
 
       - name: Install dependencies
@@ -27,46 +27,8 @@ jobs:
 
       - run: echo '{}' > .local-config.json
 
-      - name: Download IronRDP release TS files
-        uses: robinraju/release-downloader@v1.7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          repository: netbirdio/IronRDP
-          latest: true
-          fileName: "*.ts"
-          out-file-path: 'public/ironrdp-pkg'
-
-      - name: Download IronRDP release JS files
-        uses: robinraju/release-downloader@v1.7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          repository: netbirdio/IronRDP
-          latest: true
-          fileName: "*.js"
-          out-file-path: 'public/ironrdp-pkg'
-
-      - name: Download IronRDP release WASM file
-        uses: robinraju/release-downloader@v1.7
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
-          repository: netbirdio/IronRDP
-          latest: true
-          fileName: "ironrdp_web_bg.wasm"
-          out-file-path: 'public/ironrdp-pkg'
-
-      - name: Get version from tag
-        id: version
-        run: |
-          if [[ "${{ github.ref }}" == refs/tags/* ]]; then
-            echo "version=${GITHUB_REF#refs/tags/}" >> $GITHUB_OUTPUT
-          else
-            echo "version=development" >> $GITHUB_OUTPUT
-          fi
-
       - name: Build
         run: npm run build
-        env:
-          NEXT_PUBLIC_DASHBOARD_VERSION: ${{ steps.version.outputs.version }}
       -
         name: Set up QEMU
         uses: docker/setup-qemu-action@v2
@@ -81,6 +43,7 @@ jobs:
           images: ${{ env.IMAGE_NAME }}
       -
         name: Login to DockerHub
+        if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.NB_DOCKER_USER }}
@@ -91,7 +54,7 @@ jobs:
         with:
           context: .
           file: docker/Dockerfile
-          push: true
+          push: ${{ github.event_name != 'pull_request' }}
           platforms: linux/amd64,linux/arm64,linux/arm
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.github/workflows/codespell.yml

@@ -12,5 +12,4 @@ jobs:
         uses: codespell-project/actions-codespell@v2
         with:
           only_warn: 1
-          skip: package-lock.json,*.svg
-          ignore_words_list: mappin, allTime
+          skip: package-lock.json,*.svg

.gitignore

@@ -41,8 +41,3 @@ next-env.d.ts
 .configs/.staging-config.json
 .configs/.temp-config.json
 .configs
-
-/public/ironrdp-pkg/
-/public/netbird.wasm
-.idea
-src/.local-config*

CONTRIBUTOR_LICENSE_AGREEMENT.md

@@ -1,64 +0,0 @@
-##  Contributor License Agreement
-
-This Contributor License Agreement (referred to as the "Agreement") is entered into by the individual 
-submitting this Agreement and NetBird GmbH, Brunnenstraße 196, 10119 Berlin, Germany, 
-referred to as "NetBird" (collectively, the "Parties"). The Agreement outlines the terms and conditions 
-under which NetBird may utilize software contributions provided by the Contributor for inclusion in 
-its software development projects. By submitting this Agreement, the Contributor confirms their acceptance 
-of the terms and conditions outlined below. The Contributor further represents that they are authorized to 
-complete this process as described herein.
-
-
-## 1 Preamble
-In order to clarify the IP Rights situation with regard to Contributions from any person or entity, NetBird 
-must have a contributor license agreement on file to be signed by each Contributor, containing the license 
-terms below. This license serves as protection for both the Contributor as well as NetBird and its software users; 
-it does not change Contributor’s rights to use his/her own Contributions for any other purpose.
-
-## 2 Definitions
-2.1 “IP Rights” shall mean all industrial and intellectual property rights, whether registered or not registered, whether created by Contributor or acquired by Contributor from third parties, and similar rights, including (but not limited to) semiconductor property rights, design rights, copyrights (including in the form of database rights and rights to software), all neighbouring rights (Leistungsschutzrechte), trademarks, service marks, titles, internet domain names, trade names and other labelling rights, rights deriving from corresponding applications and registrations of such rights as well as any licenses (Nutzungsrechte) under and entitlements to any such intellectual and industrial property rights.
-
-2.2 "Contribution" shall mean any original work of authorship, including any modifications or additions to an existing work, that is or previously has been intentionally Submitted by Contributor to NetBird for inclusion in, or documentation of any Work. 
-
-2.3 "Contributor" shall mean the copyright owner or legal entity authorized by the copyright owner that is concluding this Agreement with NetBird. For legal entities, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, "control" means (i) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the outstanding shares, or (iii) beneficial ownership of such entity.
-
-2.4 "Submitted" shall mean any form of electronic, verbal, or written communication sent to NetBird or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, NetBird for the purpose of discussing and improving the Work, but excluding communication that is marked or otherwise designated in writing by Contributor as "Not a Contribution".
-
-2.5 "Work" means any of the products owned or managed by NetBird, in particular, but not exclusively, software.
-
-## 3 Licenses 
-3.1 Subject to the terms and conditions of this agreement, Contributor hereby grants to NetBird and to recipients of software distributed by NetBird a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable license to reproduce by any means and in any form, in whole or in part, permanently or temporarily, the Contributions (including loading, displaying, executing, transmitting or storing works for the purpose of executing and processing data or transferring them to video, audio and other data carriers), including the right to distribute, display and present such Contributions and make them available to the public (e.g. via the internet) and to transmit and display such Contributions by any means. The license also includes the right to modify, translate, adapt, edit and otherwise alter the Contributions and to use these results in the same manner as the original Contributions and derivative works. Except for licenses in patents acc. to Sec. 3, such license refers to any IP Rights in the Contributions and derivative works. The Contributor acknowledges that NetBird is not required to credit them by name for their Contribution and agrees to waive any moral rights associated with their Contribution in relation to NetBird or its sublicensees.
-
-3.2 Subject to the terms and conditions of this agreement, Contributor hereby grants to NetBird and to recipients of software distributed by NetBird a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable (except as stated in this section) patent license in the Contributions to make, have made, use, sell, offer to sell, import, and otherwise transfer the Work, where such license applies only to those patent claims licensable by the Contributor which are necessarily infringed by Contributor‘s Contribution(s) alone or by combination of Contributor’s Contribution(s) with the Work to which such Contribution(s) was Submitted. 
-
-3.3 NetBird hereby accepts such licenses. 
-
-## 4 Contributor’s Representations
-4.1 Contributor represents that Contributor is legally entitled to grant the above license. If Contributor’s employer has IP Rights to Contributor’s Contributions, Contributor represent that he/she has received permission to make Contributions on behalf of such employer, that such employer has waived such IP Rights to the Contributions of Contributor to NetBird, or that such employer has executed a separate contributor license agreement with NetBird.
-
-4.2 Contributor represents that any Contribution is his/her original creation. 
-
-4.3 Contributor represents to his/her best knowledge that any Contribution does not violate any third party IP Rights.
-
-4.4 Contributor represents that any Contribution submission includes complete details of any third-party license or other restriction (including, but not limited to, related patents and trademarks) of which Contributor is personally aware and which are associated with any part of the Contribution.
-
-4.5 The Contributor represents that their Contribution does not include any work distributed under a copyleft license.
-
-## 5 Information obligation
-Contributor agrees to notify NetBird of any facts or circumstances of which Contributor become aware that would make these representations inaccurate in any respect.
-
-## 6 Submission of Third-Party works
-Should Contributor wish to submit work that is not Contributor’s original creation, Contributor may submit it to NetBird separately from any Contribution, identifying the complete details of its source and of any license or other restriction (including, but not limited to, related patents, trademarks, and license agreements) of which Contributor are personally aware, and conspicuously marking the work as "Submitted on behalf of a third-party: [named here]".
-
-## 7 No Consideration
-Unless compensation is mandatory under statutory law, no compensation for any license under this agreement shall be payable. 
-
-## 8 Final Provisions
-8.1 Laws. This Agreement is governed by the laws of the Federal Republic of Germany. 
-
-8.2 Venue. Place of jurisdiction shall, to the extent legally permissible, be Berlin, Germany. 
-
-8.3 Severability. If any provision in this agreement is unlawful, invalid or ineffective, it shall not affect the enforceability or effectiveness of the remainder of this agreement. The parties agree to replace any unlawful, invalid or ineffective provision with a provision that comes as close as possible to the commercial intent and purpose of the original provision. This section also applies accordingly to any gaps in the contract. 
-
-8.4 Variations. Any variations, amendments or supplements to this Agreement must be in writing. This also applies to any variation of this Section 8.4.
-

README.md

@@ -10,7 +10,6 @@ See [NetBird repo](https://github.com/netbirdio/netbird)
 
 The purpose of this project is simple - make it easy to manage VPN built with [NetBird](https://github.com/netbirdio/netbird).
 The dashboard makes it possible to:
-
 - track the status of your peers
 - remove peers
 - manage Setup Keys (to authenticate new peers)
@@ -18,25 +17,23 @@ The dashboard makes it possible to:
 - define access controls
 
 ## Some Screenshots
-
 <img src="./src/assets/screenshots/peers.png" alt="peers"/>
 <img src="./src/assets/screenshots/add-peer.png" alt="add-peer"/>
 
+
 ## Technologies Used
 
 - NextJS
 - ReactJS
 - Tailwind CSS
-- [React Flow](https://reactflow.dev/) for the Control Center
 - Auth0
 - Nginx
 - Docker
 - Let's Encrypt
 
 ## How to run
-
 Disclaimer. We believe that proper user management system is not a trivial task and requires quite some effort to make it right. Therefore we decided to
-use Auth0 service that covers all our needs (user management, social login, JWT for the management API).
+use Auth0 service that covers all our needs (user management, social login, JTW for the management API).
 Auth0 so far is the only 3rd party dependency that can't be really self-hosted.
 
 1. Install [Docker](https://docs.docker.com/get-docker/)
@@ -45,9 +42,9 @@ Auth0 so far is the only 3rd party dependency that can't be really self-hosted.
 
    `AUTH0_DOMAIN` `AUTH0_CLIENT_ID` `AUTH0_AUDIENCE`
 
-   To obtain these, please use [Auth0 React SDK Guide](https://auth0.com/docs/quickstart/spa/react) up until "Configure Allowed Web Origins"
+   To obtain these, please use [Auth0 React SDK Guide](https://auth0.com/docs/quickstart/spa/react/01-login#configure-auth0) up until "Configure Allowed Web Origins"
 
-4. NetBird UI Dashboard uses NetBird's Management Service HTTP API, so setting `NETBIRD_MGMT_API_ENDPOINT` is required. Most likely it will be `http://localhost:33071` if you are hosting Management API on the same server.
+4. NetBird UI Dashboard uses NetBirds Management Service HTTP API, so setting `NETBIRD_MGMT_API_ENDPOINT` is required. Most likely it will be `http://localhost:33071` if you are hosting Management API on the same server.
 5. Run docker container without SSL (Let's Encrypt):
 
    ```shell
@@ -56,10 +53,9 @@ Auth0 so far is the only 3rd party dependency that can't be really self-hosted.
      -e AUTH0_DOMAIN=<SET YOUR AUTH DOMAIN> \
      -e AUTH0_CLIENT_ID=<SET YOUR CLIENT ID> \
      -e AUTH0_AUDIENCE=<SET YOUR AUDIENCE> \
-     -e NETBIRD_MGMT_API_ENDPOINT=<SET YOUR MANAGEMENT API URL> \
+     -e NETBIRD_MGMT_API_ENDPOINT=<SET YOUR MANAGEMETN API URL> \
      netbirdio/dashboard:main
    ```
-
 6. Run docker container with SSL (Let's Encrypt):
 
    ```shell
@@ -71,7 +67,7 @@ Auth0 so far is the only 3rd party dependency that can't be really self-hosted.
      -e AUTH0_DOMAIN=<SET YOUR AUTH DOMAIN> \
      -e AUTH0_CLIENT_ID=<SET YOUR CLEITN ID> \
      -e AUTH0_AUDIENCE=<SET YOUR AUDIENCE> \
-     -e NETBIRD_MGMT_API_ENDPOINT=<SET YOUR MANAGEMENT API URL> \
+     -e NETBIRD_MGMT_API_ENDPOINT=<SET YOUR MANAGEMETN API URL> \
      netbirdio/dashboard:main
    ```
 
@@ -87,11 +83,11 @@ Open [http://localhost:3000](http://localhost:3000) with your browser to see the
 You can start editing by modifying the code inside `src/..`  
 The page auto-updates as you edit the file.
 
-## How to migrate from old dashboard (v1)
+## How to migrate from old dashboard (v1) 
 
 The new dashboard comes with a new docker image `netbirdio/dashboard:main`.  
 To migrate from the old dashboard (v1) `wiretrustee/dashboard:main` to the new one, please follow the steps below.
 
 1. Stop the dashboard container `docker compose down dashboard`
 2. Replace the docker image name in your `docker-compose.yml` with `netbirdio/dashboard:main`
-3. Recreate the dashboard container `docker compose up -d --force-recreate dashboard`
+3. Recreate the dashboard container `docker compose up -d --force-recreate dashboard`

announcements.json

@@ -1,12 +0,0 @@
-[
-  {
-    "tag": "New",
-    "text": "Custom DNS Zones for Private Network Resolution",
-    "link": "https://netbird.io/knowledge-hub/custom-dns-zones",
-    "linkText": "Read Release Article",
-    "variant": "important",
-    "isExternal": true,
-    "closeable": true,
-    "isCloudOnly": false
-  }
-]

config.json

@@ -12,7 +12,5 @@
   "tokenSource": "$NETBIRD_TOKEN_SOURCE",
   "dragQueryParams": "$NETBIRD_DRAG_QUERY_PARAMS",
   "hotjarTrackID": "$NETBIRD_HOTJAR_TRACK_ID",
-  "googleAnalyticsID": "$NETBIRD_GOOGLE_ANALYTICS_ID",
-  "googleTagManagerID": "$NETBIRD_GOOGLE_TAG_MANAGER_ID",
-  "wasmPath": "$NETBIRD_WASM_PATH"
-}
+  "googleAnalyticsID": "$NETBIRD_GOOGLE_ANALYTICS_ID"
+}

docker/default.conf

@@ -1,37 +1,16 @@
+# simple server configuration to replace nginx's default
 server {
 	listen 80 default_server;
 	listen [::]:80 default_server;
 
     root /usr/share/nginx/html;
-    location = /netbird.wasm {
-        root /usr/share/nginx/html;
-        default_type application/wasm;
-    }
-    location = /ironrdp-pkg/ironrdp_web_bg.wasm {
-        root /usr/share/nginx/html;
-        default_type application/wasm;
-    }
 
     location / {
       try_files $uri $uri.html $uri/ =404;
-      add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0" always;
-      add_header X-Frame-Options "SAMEORIGIN" always;
-      add_header X-Content-Type-Options "nosniff" always;
-      add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
-      add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' 'unsafe-eval' data: blob: ws: wss: https:;" always;
-      add_header Last-Modified "";
-      expires off;
    }
 
    error_page 404 /404.html;
    location = /404.html {
       internal;
-      add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0" always;
-      add_header X-Frame-Options "SAMEORIGIN" always;
-      add_header X-Content-Type-Options "nosniff" always;
-      add_header Strict-Transport-Security "max-age=31536000; includeSubDomains" always;
-      add_header Content-Security-Policy "default-src 'self' 'unsafe-inline' 'unsafe-eval' data: blob: ws: wss: https:;" always;
-      add_header Last-Modified "";
-      expires off;
    }
 }

docker/init_react_envs.sh

@@ -58,99 +58,13 @@ export NETBIRD_MGMT_API_ENDPOINT=$(echo $NETBIRD_MGMT_API_ENDPOINT | sed -E 's/(
 export NETBIRD_MGMT_GRPC_API_ENDPOINT=${NETBIRD_MGMT_GRPC_API_ENDPOINT}
 export NETBIRD_HOTJAR_TRACK_ID=${NETBIRD_HOTJAR_TRACK_ID}
 export NETBIRD_GOOGLE_ANALYTICS_ID=${NETBIRD_GOOGLE_ANALYTICS_ID}
-export NETBIRD_GOOGLE_TAG_MANAGER_ID=${NETBIRD_GOOGLE_TAG_MANAGER_ID}
 export NETBIRD_TOKEN_SOURCE=${NETBIRD_TOKEN_SOURCE:-accessToken}
 export NETBIRD_DRAG_QUERY_PARAMS=${NETBIRD_DRAG_QUERY_PARAMS:-false}
-export NETBIRD_WASM_PATH=${NETBIRD_WASM_PATH}
-export NETBIRD_CSP=${NETBIRD_CSP}
-export NETBIRD_CSP_CONNECT_SRC=${NETBIRD_CSP_CONNECT_SRC}
-export NETBIRD_DISABLE_CSP=${NETBIRD_DISABLE_CSP}
 
 echo "NetBird latest version: ${NETBIRD_LATEST_VERSION}"
 
-# Build CSP
-if [[ "${NETBIRD_DISABLE_CSP}" == "true" ]]; then
-    echo "CSP disabled via NETBIRD_DISABLE_CSP"
-    sed -i '/add_header Content-Security-Policy/d' /etc/nginx/http.d/default.conf
-else
-  FIRST_PARTY_CSP="https://pkgs.netbird.io"
-  FIRST_PARTY_CSP_CONNECT_SRC="$NETBIRD_CSP_CONNECT_SRC"
-  THIRD_PARTY_CSP=""
-  THIRD_PARTY_CSP_CONNECT_SRC="https://api.github.com/repos/netbirdio/netbird/releases/latest https://raw.githubusercontent.com/netbirdio/dashboard/"
-  THIRD_PARTY_CSP_SCRIPT_SRC=""
-
-  CSP_DOMAINS=""
-  CSP_DOMAINS_CONNECT_SRC=""
-
-  if [[ -n "${NETBIRD_CSP}" ]]; then
-      CSP_DOMAINS="$CSP_DOMAINS $NETBIRD_CSP"
-  fi
-
-  # Add AUTH_AUTHORITY to CSP
-  if [[ -n "${AUTH_AUTHORITY}" ]]; then
-      CSP_DOMAINS="$CSP_DOMAINS $AUTH_AUTHORITY"
-  fi
-
-  # Add AUTH_AUDIENCE to CSP
-  if [[ -n "${AUTH_AUDIENCE}" && "${AUTH_AUDIENCE}" != "none" && "${AUTH_AUDIENCE}" == *.* ]]; then
-      if [[ "${AUTH_AUDIENCE}" == *"http://"* || "${AUTH_AUDIENCE}" == *"https://"* ]]; then
-          CSP_DOMAINS="$CSP_DOMAINS $AUTH_AUDIENCE"
-      else
-          CSP_DOMAINS="$CSP_DOMAINS https://$AUTH_AUDIENCE"
-      fi
-  fi
-
-  # Add NETBIRD_MGMT_API_ENDPOINT to CSP
-  if [[ -n "${NETBIRD_MGMT_API_ENDPOINT}" ]]; then
-      MGMT_HOST=$(echo "$NETBIRD_MGMT_API_ENDPOINT" | sed -E 's|https?://||' | cut -d'/' -f1)
-      if [[ -n "$MGMT_HOST" ]]; then
-          if [[ "$NETBIRD_MGMT_API_ENDPOINT" == https://* ]]; then
-              CSP_DOMAINS="$CSP_DOMAINS $NETBIRD_MGMT_API_ENDPOINT"
-              CSP_DOMAINS_CONNECT_SRC="$CSP_DOMAINS_CONNECT_SRC wss://$MGMT_HOST"
-          elif [[ "$NETBIRD_MGMT_API_ENDPOINT" == http://* ]]; then
-              CSP_DOMAINS="$CSP_DOMAINS $NETBIRD_MGMT_API_ENDPOINT"
-              CSP_DOMAINS_CONNECT_SRC="$CSP_DOMAINS_CONNECT_SRC ws://$MGMT_HOST"
-          fi
-      fi
-  fi
-
-  # Add LETSENCRYPT_DOMAIN to CSP
-  if [[ -n "${LETSENCRYPT_DOMAIN}" && "${LETSENCRYPT_DOMAIN}" != "none" ]]; then
-      if [[ "$LETSENCRYPT_DOMAIN" == *"localhost"* ]]; then
-          CSP_DOMAINS="$CSP_DOMAINS http://$LETSENCRYPT_DOMAIN"
-          CSP_DOMAINS_CONNECT_SRC="$CSP_DOMAINS_CONNECT_SRC ws://$LETSENCRYPT_DOMAIN ws://*.$LETSENCRYPT_DOMAIN"
-      else
-          CSP_DOMAINS="$CSP_DOMAINS https://$LETSENCRYPT_DOMAIN"
-          CSP_DOMAINS_CONNECT_SRC="$CSP_DOMAINS_CONNECT_SRC wss://$LETSENCRYPT_DOMAIN wss://*.$LETSENCRYPT_DOMAIN"
-      fi
-  fi
-
-  CSP_CONNECT_SRC="$CSP_DOMAINS $CSP_DOMAINS_CONNECT_SRC $FIRST_PARTY_CSP $FIRST_PARTY_CSP_CONNECT_SRC $THIRD_PARTY_CSP $THIRD_PARTY_CSP_CONNECT_SRC"
-  CSP_FRAME_SRC="$CSP_DOMAINS $FIRST_PARTY_CSP $THIRD_PARTY_CSP"
-  CSP_SCRIPT_SRC="$CSP_DOMAINS $FIRST_PARTY_CSP $THIRD_PARTY_CSP $THIRD_PARTY_CSP_SCRIPT_SRC"
-
-  # Remove duplicates
-  CSP_CONNECT_SRC=$(echo $CSP_CONNECT_SRC | tr ' ' '\n' | grep -v '^$' | sort -u | tr '\n' ' ' | sed 's/ $//')
-  CSP_FRAME_SRC=$(echo $CSP_FRAME_SRC | tr ' ' '\n' | grep -v '^$' | sort -u | tr '\n' ' ' | sed 's/ $//')
-  CSP_SCRIPT_SRC=$(echo $CSP_SCRIPT_SRC | tr ' ' '\n' | grep -v '^$' | sort -u | tr '\n' ' ' | sed 's/ $//')
-
-  # Update CSP in nginx config
-  CSP_POLICY="default-src 'none'; connect-src 'self' $CSP_CONNECT_SRC; frame-src 'self' $CSP_FRAME_SRC; script-src 'self' 'wasm-unsafe-eval' $CSP_SCRIPT_SRC; font-src 'self'; img-src * data:; manifest-src 'self'; style-src 'self' 'unsafe-inline'; frame-ancestors 'self'; base-uri 'self'; form-action 'self'; upgrade-insecure-requests;"
-  CSP_HEADER="add_header Content-Security-Policy \"$CSP_POLICY\" always;"
-
-  # Escape sed special characters in replacement string (& | \)
-  CSP_HEADER=$(printf '%s' "$CSP_HEADER" | sed -e 's/[\\&|]/\\&/g')
-
-  echo "CSP header: $CSP_HEADER"
-
-  # Replace CSP header in nginx config
-  sed -i "s|add_header Content-Security-Policy \"[^\"]*\" always;|$CSP_HEADER|g" /etc/nginx/http.d/default.conf || {
-      echo "Failed to replace CSP header"
-  }
-fi
-
 # replace ENVs in the config
-ENV_STR="\$\$USE_AUTH0 \$\$AUTH_AUDIENCE \$\$AUTH_AUTHORITY \$\$AUTH_CLIENT_ID \$\$AUTH_CLIENT_SECRET \$\$AUTH_SUPPORTED_SCOPES \$\$NETBIRD_MGMT_API_ENDPOINT \$\$NETBIRD_MGMT_GRPC_API_ENDPOINT \$\$NETBIRD_HOTJAR_TRACK_ID \$\$NETBIRD_GOOGLE_ANALYTICS_ID \$\$NETBIRD_GOOGLE_TAG_MANAGER_ID \$\$AUTH_REDIRECT_URI \$\$AUTH_SILENT_REDIRECT_URI \$\$NETBIRD_TOKEN_SOURCE \$\$NETBIRD_DRAG_QUERY_PARAMS \$\$NETBIRD_WASM_PATH"
+ENV_STR="\$\$USE_AUTH0 \$\$AUTH_AUDIENCE \$\$AUTH_AUTHORITY \$\$AUTH_CLIENT_ID \$\$AUTH_CLIENT_SECRET \$\$AUTH_SUPPORTED_SCOPES \$\$NETBIRD_MGMT_API_ENDPOINT \$\$NETBIRD_MGMT_GRPC_API_ENDPOINT \$\$NETBIRD_HOTJAR_TRACK_ID \$\$NETBIRD_GOOGLE_ANALYTICS_ID \$\$AUTH_REDIRECT_URI \$\$AUTH_SILENT_REDIRECT_URI \$\$NETBIRD_TOKEN_SOURCE \$\$NETBIRD_DRAG_QUERY_PARAMS"
 
 OIDC_TRUSTED_DOMAINS="/usr/share/nginx/html/OidcTrustedDomains.js"
 envsubst "$ENV_STR" < "$OIDC_TRUSTED_DOMAINS".tmpl > "$OIDC_TRUSTED_DOMAINS"
@@ -158,7 +72,4 @@ for f in $(grep -R -l AUTH_SUPPORTED_SCOPES /usr/share/nginx/html); do
     cp "$f" "$f".copy
     envsubst "$ENV_STR" < "$f".copy > "$f"
     rm "$f".copy
-done
-
-# Reload nginx to pick up the updated CSP and config
-nginx -s reload
+done

docker/nginx.conf

@@ -101,7 +101,6 @@ http {
     application/rss+xml
     application/vnd.geo+json
     application/vnd.ms-fontobject
-    application/wasm
     application/x-font-ttf
     application/x-web-app-manifest+json
     application/xhtml+xml

next.config.js

@@ -5,11 +5,6 @@ const nextConfig = {
     unoptimized: true,
   },
   reactStrictMode: false,
-  env: {
-    APP_ENV: process.env.APP_ENV || "production",
-    NEXT_PUBLIC_DASHBOARD_VERSION:
-      process.env.NEXT_PUBLIC_DASHBOARD_VERSION || "development",
-  },
 };
 
 module.exports = nextConfig;

package.json

@@ -2,102 +2,78 @@
   "name": "netbird-dashboard",
   "version": "2.0.0",
   "private": true,
-  "engines": {
-    "node": ">=20.9.0"
-  },
   "scripts": {
     "copy": "copyfiles -f ./node_modules/@axa-fr/react-oidc/dist/OidcServiceWorker.js ./public",
     "copytrusted": "copyfiles -f ./public/local/OidcTrustedDomains.js ./public",
     "dev": "next dev -p 3000",
     "turbo": "next dev -p 3000 --turbo",
     "build": "next build",
-    "postbuild": "node postbuild.js",
     "start": "next start",
     "lint": "next lint",
     "cypress:open": "cypress open"
   },
   "dependencies": {
-    "@axa-fr/react-oidc": "^7.26.3",
-    "@dagrejs/dagre": "^1.1.5",
-    "@radix-ui/react-accordion": "^1.2.12",
-    "@radix-ui/react-checkbox": "^1.3.3",
-    "@radix-ui/react-collapsible": "^1.1.12",
-    "@radix-ui/react-dialog": "^1.1.15",
-    "@radix-ui/react-dropdown-menu": "^2.1.16",
-    "@radix-ui/react-hover-card": "^1.1.15",
-    "@radix-ui/react-label": "^2.1.8",
-    "@radix-ui/react-popover": "^1.1.15",
-    "@radix-ui/react-radio-group": "^1.3.8",
-    "@radix-ui/react-scroll-area": "^1.2.10",
-    "@radix-ui/react-select": "^2.2.6",
-    "@radix-ui/react-slider": "^1.3.6",
-    "@radix-ui/react-slot": "^1.2.4",
-    "@radix-ui/react-switch": "^1.2.6",
-    "@radix-ui/react-tabs": "^1.1.13",
-    "@radix-ui/react-toast": "^1.2.15",
-    "@radix-ui/react-tooltip": "^1.2.8",
-    "@tabler/icons-react": "^3.36.1",
+    "@axa-fr/react-oidc": "^5.14.0",
+    "@radix-ui/react-accordion": "^1.1.2",
+    "@radix-ui/react-checkbox": "^1.0.4",
+    "@radix-ui/react-collapsible": "^1.0.3",
+    "@radix-ui/react-dialog": "^1.0.5",
+    "@radix-ui/react-dropdown-menu": "^2.0.6",
+    "@radix-ui/react-label": "^2.0.2",
+    "@radix-ui/react-popover": "^1.0.7",
+    "@radix-ui/react-radio-group": "^1.1.3",
+    "@radix-ui/react-scroll-area": "^1.0.5",
+    "@radix-ui/react-select": "^2.0.0",
+    "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-switch": "^1.0.3",
+    "@radix-ui/react-tabs": "^1.0.4",
+    "@radix-ui/react-toast": "^1.1.5",
+    "@radix-ui/react-tooltip": "^1.0.7",
+    "@tabler/icons-react": "^2.39.0",
     "@tanstack/match-sorter-utils": "^8.8.4",
     "@tanstack/react-table": "^8.10.7",
-    "@types/crypto-js": "^4.2.2",
-    "@types/d3": "^7.4.3",
     "@types/lodash": "^4.14.200",
     "@types/node": "20.10.6",
-    "@types/react": "^19",
-    "@types/react-dom": "^19",
-    "@types/react-window": "^1.8.8",
-    "@xterm/addon-fit": "^0.10.0",
-    "@xterm/xterm": "^5.5.0",
-    "@xyflow/react": "^12.8.4",
+    "@types/react": "^18",
+    "@types/react-dom": "^18",
     "autoprefixer": "^10",
-    "chart.js": "^4.4.8",
-    "chroma-js": "^3.1.2",
     "class-variance-authority": "^0.7.0",
-    "classnames": "^2.5.1",
     "clsx": "^2.0.0",
-    "cmdk": "^1.1.1",
-    "crypto-js": "^4.2.0",
-    "d3": "^7.9.0",
+    "cmdk": "^0.2.0",
     "date-fns": "^2.30.0",
     "dayjs": "^1.11.10",
-    "elkjs": "^0.10.0",
+    "eslint": "^8",
+    "eslint-config-next": "13.5.5",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
-    "framer-motion": "^12.29.2",
-    "ip-address": "^10.1.0",
+    "flowbite": "^1.8.1",
+    "flowbite-react": "^0.6.4",
+    "framer-motion": "^10.16.4",
     "ip-cidr": "^3.1.0",
-    "js-cookie": "^3.0.5",
-    "lodash": "^4.17.23",
-    "lucide-react": "^0.539.0",
-    "next": "^16.1.6",
+    "lodash": "^4.17.21",
+    "lucide-react": "^0.287.0",
+    "next": "13.5.5",
     "next-themes": "^0.2.1",
     "punycode": "^2.3.1",
-    "react": "^19.2.4",
-    "react-day-picker": "^9.13.0",
-    "react-dom": "^19.2.4",
+    "react": "^18",
+    "react-day-picker": "^8.9.1",
+    "react-dom": "^18",
     "react-ga4": "^2.1.0",
     "react-hot-toast": "^2.4.1",
-    "react-hotjar": "^6.3.1",
+    "react-hotjar": "^6.2.0",
     "react-hotkeys-hook": "^4.4.1",
-    "react-icons": "^5.5.0",
     "react-jwt": "^1.2.0",
     "react-loading-skeleton": "^3.3.1",
     "react-responsive": "^9.0.2",
-    "react-virtuoso": "^4.9.0",
     "swr": "^2.2.4",
     "tailwind-merge": "^1.14.0",
     "tailwindcss-animate": "^1.0.7",
-    "timescape": "^0.7.1",
     "typescript": "^5"
   },
   "devDependencies": {
-    "@faker-js/faker": "^9.5.1",
-    "@types/chroma-js": "^3.1.1",
-    "@types/js-cookie": "^3.0.6",
-    "eslint": "^9.39.1",
-    "eslint-config-next": "^16.1.6",
+    "cypress": "^13.3.3",
     "postcss": "^8",
     "prettier": "3.0.3",
-    "tailwindcss": "^3.4.17"
+    "tailwindcss": "^3"
   }
 }

postbuild.js

@@ -1,96 +0,0 @@
-const { resolve, join } = require("path");
-const { createHash } = require("crypto");
-const {
-  readFileSync,
-  writeFileSync,
-  mkdirSync,
-  readdirSync,
-  statSync,
-} = require("fs");
-
-process.env.NODE_ENV = "production";
-const PLACEHOLDER = "NB_INLINE_SCRIPT_PLACEHOLDER";
-console.log("Starting post-build script to extract inline scripts...");
-
-// Function to find HTML files recursively
-function findHtmlFiles(dir) {
-  const files = [];
-  const entries = readdirSync(dir);
-
-  for (const entry of entries) {
-    const fullPath = join(dir, entry);
-    const stat = statSync(fullPath);
-
-    if (stat.isDirectory()) {
-      files.push(...findHtmlFiles(fullPath));
-    } else if (entry.endsWith(".html")) {
-      files.push(fullPath);
-    }
-  }
-
-  return files;
-}
-
-// For Next.js export output, the files are in the 'out' directory
-const baseDir = resolve("out");
-const htmlFiles = findHtmlFiles(baseDir);
-
-console.log(`Found ${htmlFiles.length} .html files to process`);
-
-// Ensure assets directory exists
-const assetsDir = `${baseDir}/assets`;
-mkdirSync(assetsDir, { recursive: true });
-
-htmlFiles.forEach((file) => {
-  // Read file contents
-  const contents = readFileSync(file, "utf8");
-  const scripts = [];
-
-  // Extract inline scripts
-  const newFile = contents.replace(
-    /<script(?![^>]*src)([^>]*)>(.+?)<\/script>/gs,
-    (match, attributes, scriptContent) => {
-      // Skip if script has src attribute (external script)
-      if (attributes.includes("src=")) {
-        return match;
-      }
-
-      const addPlaceholderString = scripts.length === 0;
-      const cleanedScript = scriptContent.trim();
-
-      if (cleanedScript) {
-        scripts.push(
-          `${cleanedScript}${cleanedScript.endsWith(";") ? "" : ";"}`,
-        );
-      }
-
-      return addPlaceholderString ? PLACEHOLDER : "";
-    },
-  );
-
-  // Early exit if no inline scripts found
-  if (!scripts.length) {
-    console.log(`No inline scripts found`);
-    return;
-  }
-
-  // Combine scripts and create hash
-  const chunk = scripts.join("\n");
-  const hash = createHash("md5").update(chunk).digest("hex").slice(0, 8);
-  const chunkFileName = `chunk.${hash}.js`;
-  const chunkPath = `${assetsDir}/${chunkFileName}`;
-
-  // Write the chunk file
-  writeFileSync(chunkPath, chunk, "utf8");
-
-  // Replace placeholder string with script tag
-  const updatedFile = newFile.replace(
-    PLACEHOLDER,
-    `<script src="/assets/${chunkFileName}" crossorigin=""></script>`,
-  );
-
-  // Write updated HTML file
-  writeFileSync(file, updatedFile, "utf8");
-});
-
-console.log("Post-build script completed successfully!");

src/app/(dashboard)/(deprecated)/activity/page.tsx

@@ -1,10 +0,0 @@
-"use client";
-
-import FullScreenLoading from "@components/ui/FullScreenLoading";
-import { useRedirect } from "@hooks/useRedirect";
-import React from "react";
-
-export default function Redirect() {
-  useRedirect("/events/audit");
-  return <FullScreenLoading height={"auto"} />;
-}

src/app/(dashboard)/access-control/page.tsx

@@ -5,13 +5,11 @@ import InlineLink from "@components/InlineLink";
 import Paragraph from "@components/Paragraph";
 import SkeletonTable from "@components/skeletons/SkeletonTable";
 import { RestrictedAccess } from "@components/ui/RestrictedAccess";
-import { usePortalElement } from "@hooks/usePortalElement";
 import useFetchApi from "@utils/api";
 import { ExternalLinkIcon } from "lucide-react";
 import React, { lazy, Suspense } from "react";
 import AccessControlIcon from "@/assets/icons/AccessControlIcon";
 import GroupsProvider from "@/contexts/GroupsProvider";
-import { usePermissions } from "@/contexts/PermissionsProvider";
 import PoliciesProvider from "@/contexts/PoliciesProvider";
 import { Policy } from "@/interfaces/Policy";
 import PageContainer from "@/layouts/PageContainer";
@@ -20,25 +18,25 @@ const AccessControlTable = lazy(
   () => import("@/modules/access-control/table/AccessControlTable"),
 );
 export default function AccessControlPage() {
-  const { permission } = usePermissions();
-
   const { data: policies, isLoading } = useFetchApi<Policy[]>("/policies");
 
-  const { ref: headingRef, portalTarget } =
-    usePortalElement<HTMLHeadingElement>();
-
   return (
     <PageContainer>
       <GroupsProvider>
         <div className={"p-default py-6"}>
           <Breadcrumbs>
             <Breadcrumbs.Item
-              href={"/access-control"}
+              href={"/policies"}
               label={"Access Control"}
               icon={<AccessControlIcon size={14} />}
             />
           </Breadcrumbs>
-          <h1 ref={headingRef}>Access Control Policies</h1>
+
+          <h1>
+            {policies && policies.length > 1
+              ? `${policies.length} Access Control Policies`
+              : "Access Control Policies"}
+          </h1>
           <Paragraph>
             Create rules to manage access in your network and define what peers
             can connect.
@@ -56,17 +54,10 @@ export default function AccessControlPage() {
           </Paragraph>
         </div>
 
-        <RestrictedAccess
-          page={"Access Control"}
-          hasAccess={permission.policies.read}
-        >
+        <RestrictedAccess page={"Access Control"}>
           <PoliciesProvider>
             <Suspense fallback={<SkeletonTable />}>
-              <AccessControlTable
-                isLoading={isLoading}
-                policies={policies}
-                headingTarget={portalTarget}
-              />
+              <AccessControlTable isLoading={isLoading} policies={policies} />
             </Suspense>
           </PoliciesProvider>
         </RestrictedAccess>

src/app/(dashboard)/activity/page.tsx

@@ -4,60 +4,54 @@ import Breadcrumbs from "@components/Breadcrumbs";
 import InlineLink from "@components/InlineLink";
 import Paragraph from "@components/Paragraph";
 import { RestrictedAccess } from "@components/ui/RestrictedAccess";
-import { usePortalElement } from "@hooks/usePortalElement";
 import useFetchApi from "@utils/api";
-import { ExternalLinkIcon, LogsIcon } from "lucide-react";
+import { isLocalDev, isNetBirdHosted } from "@utils/netbird";
+import { ExternalLinkIcon } from "lucide-react";
 import React from "react";
 import ActivityIcon from "@/assets/icons/ActivityIcon";
-import { usePermissions } from "@/contexts/PermissionsProvider";
 import { ActivityEvent } from "@/interfaces/ActivityEvent";
 import PageContainer from "@/layouts/PageContainer";
 import ActivityTable from "@/modules/activity/ActivityTable";
+import { EventStreamingCard } from "@/modules/integrations/event-streaming/EventStreamingCard";
 
 export default function Activity() {
-  const { permission } = usePermissions();
-
-  const { data: events, isLoading } =
-    useFetchApi<ActivityEvent[]>("/events/audit");
-
-  const { ref: headingRef, portalTarget } =
-    usePortalElement<HTMLHeadingElement>();
+  const { data: events, isLoading } = useFetchApi<ActivityEvent[]>("/events");
 
   return (
     <PageContainer>
       <div className={"p-default py-6"}>
         <Breadcrumbs>
           <Breadcrumbs.Item
+            href={"/activity"}
             label={"Activity"}
-            disabled={true}
             icon={<ActivityIcon size={13} />}
           />
-          <Breadcrumbs.Item
-            href={"/events/audit"}
-            label={"Audit Events"}
-            icon={<LogsIcon size={18} />}
-          />
         </Breadcrumbs>
-        <h1 ref={headingRef}>Audit Events</h1>
-        <Paragraph>Here you can see all the audit activity events.</Paragraph>
+        <h1>
+          {events && events.length > 1
+            ? `${events.length} Activity Events`
+            : "Activity Events"}
+        </h1>
+        <Paragraph>
+          Here you can see all the account and network activity events.
+        </Paragraph>
         <Paragraph>
           Learn more about{" "}
           <InlineLink
-            href={"https://docs.netbird.io/how-to/audit-events-logging"}
+            href={
+              "https://docs.netbird.io/how-to/monitor-system-and-network-activity"
+            }
             target={"_blank"}
           >
-            Audit Events
+            Activity Events
             <ExternalLinkIcon size={12} />
           </InlineLink>
           in our documentation.
         </Paragraph>
       </div>
-      <RestrictedAccess page={"Activity"} hasAccess={permission.events.read}>
-        <ActivityTable
-          events={events}
-          isLoading={isLoading}
-          headingTarget={portalTarget}
-        />
+      <RestrictedAccess page={"Activity"}>
+        {(isLocalDev() || isNetBirdHosted()) && <EventStreamingCard />}
+        <ActivityTable events={events} isLoading={isLoading} />
       </RestrictedAccess>
     </PageContainer>
   );