Add referesh button to the peers table (#286)

Co-authored-by: braginini <bangvalo@gmail.com>

.github/workflows/build_and_push.yml

@@ -5,20 +5,21 @@ on:
       - main
     tags:
       - "**"
+  pull_request:
 
 jobs:
   build_n_push:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: setup-node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
           node-version: '16'
           cache: 'npm'
 
-      - name: Install dependecies
+      - name: Install dependencies
         run: npm install
 
       - name: Build 
@@ -26,26 +27,26 @@ jobs:
         run: CI=false npm run build
       - 
         name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
       - 
         name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
       -
         name: Docker meta
         id: meta
-        uses: docker/metadata-action@v3
+        uses: docker/metadata-action@v4
         with:
           images: wiretrustee/dashboard
       -
         name: Login to DockerHub
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USER }}
           password: ${{ secrets.DOCKER_TOKEN }}
       -
         name: Docker build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           context: .
           file: docker/Dockerfile

.github/workflows/e2e-tests.yml

@@ -0,0 +1,42 @@
+name: run e2e tests
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  e2e_tests:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: setup-node
+        uses: actions/setup-node@v3
+        with:
+          node-version: '16'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm install
+
+      - name: install playwright
+        run: npx playwright install
+
+      - name: install playwright deps
+        run: npx playwright install-deps
+
+      - name: create test environment
+        run: bash ./e2e-tests/create-test-env.sh
+
+      - name: run e2e tests
+        run: npx playwright test --workers 2
+
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: playwright-report
+          path: |
+            playwright-report/
+            test-results/
+          retention-days: 3

.gitignore

@@ -2,6 +2,7 @@
 
 # dependencies
 /node_modules
+/node_modules.bkp
 /.pnp
 .pnp.js
 
@@ -25,4 +26,18 @@ yarn-error.log*
 src/auth_config.json
 .idea
 .eslintcache
-src/.local-config.json
+src/.local-config*.json
+/public/OidcServiceWorker.js
+/public/OidcTrustedDomains.js
+/e2e-tests/node_modules/
+/e2e-tests/playwright-report/
+/e2e-tests/test-results/
+/test-results/
+/playwright-report/
+.env
+Caddyfile
+docker-compose.yml
+machinekey/
+management.json
+turnserver.conf
+zitadel.env

README.md

@@ -36,24 +36,43 @@ Disclaimer. We believe that proper user management system is not a trivial task
 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/)
-2. register [Auth0](https://auth0.com/) account
-3. running Wiretrustee UI Dashboard requires the following Auth0 environmental variables to be set (see docker command below):
+1. Install [Docker](https://docs.docker.com/get-docker/)
+2. Register [Auth0](https://auth0.com/) account
+3. Running Wiretrustee UI Dashboard requires the following Auth0 environmental variables to be set (see docker command below):
 
-   ```AUTH0_DOMAIN``` ```AUTH0_CLIENT_ID``` ```AUTH0_AUDIENCE```
+   `AUTH0_DOMAIN` `AUTH0_CLIENT_ID` `AUTH0_AUDIENCE`
 
    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. Wiretrustee UI Dashboard uses Wiretrustee Management Service HTTP API, so setting ```WIRETRUSTEE_MGMT_API_ENDPOINT``` is required. Most likely it will be ```http://localhost:33071``` if you are hosting Management API on the same server.
+4. Wiretrustee UI Dashboard uses Wiretrustee 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):
 
-   ```docker run -d --name wiretrustee-dashboard --rm -p 80:80 -p 443:443  -e AUTH0_DOMAIN=<SET YOUR AUTH DOMAIN> -e AUTH0_CLIENT_ID=<SET YOUR CLIENT ID> -e AUTH0_AUDIENCE=<SET YOUR AUDIENCE> -e  WIRETRUSTEE_MGMT_API_ENDPOINT=<SET YOUR MANAGEMETN API URL> wiretrustee/dashboard:main```
+   ```shell
+   docker run -d --name wiretrustee-dashboard \
+     --rm -p 80:80 -p 443:443 \
+     -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 MANAGEMETN API URL> \
+     wiretrustee/dashboard:main
+   ```
 6. Run docker container with SSL (Let's Encrypt):
 
-   ```docker run -d --name wiretrustee-dashboard --rm -p 80:80 -p 443:443 -e NGINX_SSL_PORT=443 -e LETSENCRYPT_DOMAIN=<YOUR PUBLIC DOMAIN> -e LETSENCRYPT_EMAIL=<YOUR EMAIL>  -e AUTH0_DOMAIN=<SET YOUR AUTH DOMAIN> -e AUTH0_CLIENT_ID=<SET YOUR CLEITN ID> -e AUTH0_AUDIENCE=<SET YOUR AUDIENCE> -e  WIRETRUSTEE_MGMT_API_ENDPOINT=<SET YOUR MANAGEMETN API URL> wiretrustee/dashboard:main```
+   ```shell
+   docker run -d --name wiretrustee-dashboard \
+     --rm -p 80:80 -p 443:443 \
+     -e NGINX_SSL_PORT=443 \
+     -e LETSENCRYPT_DOMAIN=<YOUR PUBLIC DOMAIN> \
+     -e LETSENCRYPT_EMAIL=<YOUR EMAIL> \
+     -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 MANAGEMETN API URL> \
+     wiretrustee/dashboard:main
+   ```
 
 ## How to run local development
 1. Install node 16
-2. create and update the src/.local-config.json file. This file should contain values to be replaced from src/config.json
+2. create and update the `src/.local-config.json` file. This file should contain values to be replaced from `src/config.json`
 3. run `npm install`
-4. run `npm run start dev`
+4. run `npm run start dev`

docker/init_react_envs.sh

@@ -1,19 +1,43 @@
 #!/bin/bash
 set -e
 
-if [[ -z "${AUTH0_DOMAIN}" ]]; then
-    echo "AUTH0_DOMAIN environment variable must be set"
-    exit 1
+if [[ -z "${AUTH_AUTHORITY}" ]]; then
+    if [[ -z "${AUTH0_DOMAIN}" ]]; then
+        echo "AUTH_AUTHORITY or AUTH0_DOMAIN environment variable must be set"
+        exit 1
+    fi
 fi
 
-if [[ -z "${AUTH0_CLIENT_ID}" ]]; then
-    echo "AUTH0_CLIENT_ID environment variable must be set"
-    exit 1
+if [[ -z "${AUTH_CLIENT_ID}" ]]; then
+    if [[ -z "${AUTH0_CLIENT_ID}" ]]; then
+        echo "AUTH_CLIENT_ID or AUTH0_CLIENT_ID environment variable must be set"
+        exit 1
+    fi
 fi
 
-if [[ -z "${AUTH0_AUDIENCE}" ]]; then
-    echo "AUTH0_AUDIENCE environment variable must be set"
-    exit 1
+if [[ -z "${AUTH_AUDIENCE}" ]]; then
+    if [[ -z "${AUTH0_AUDIENCE}" ]]; then
+        echo "AUTH_AUDIENCE or AUTH0_AUDIENCE environment variable must be set"
+        exit 1
+    fi
+fi
+
+if [[ "${AUTH_AUDIENCE}" == "none" ]]; then
+    unset AUTH_AUDIENCE
+fi
+
+if [[ -z "${AUTH_SUPPORTED_SCOPES}" ]]; then
+    if [[ -z "${AUTH0_DOMAIN}" ]]; then
+        echo "AUTH_SUPPORTED_SCOPES environment variable must be set"
+        exit 1
+    fi
+fi
+
+if [[ -z "${USE_AUTH0}" ]]; then
+    if [[ -z "${AUTH0_DOMAIN}" ]]; then
+        echo "USE_AUTH0 environment variable must be set"
+        exit 1
+    fi
 fi
 
 if [[ -z "${NETBIRD_MGMT_API_ENDPOINT}" ]]; then
@@ -21,23 +45,29 @@ if [[ -z "${NETBIRD_MGMT_API_ENDPOINT}" ]]; then
     exit 1
 fi
 
-AUTH0_DOMAIN=${AUTH0_DOMAIN}
-AUTH0_CLIENT_ID=${AUTH0_CLIENT_ID}
-AUTH0_AUDIENCE=${AUTH0_AUDIENCE}
-NETBIRD_MGMT_API_ENDPOINT=${NETBIRD_MGMT_API_ENDPOINT}
-NETBIRD_MGMT_GRPC_API_ENDPOINT=${NETBIRD_MGMT_GRPC_API_ENDPOINT}
+export AUTH_AUTHORITY=${AUTH_AUTHORITY:-https://$AUTH0_DOMAIN}
+export AUTH_CLIENT_ID=${AUTH_CLIENT_ID:-$AUTH0_CLIENT_ID}
+export AUTH_CLIENT_SECRET=${AUTH_CLIENT_SECRET}
+export AUTH_AUDIENCE=${AUTH_AUDIENCE:-$AUTH0_AUDIENCE}
+export AUTH_REDIRECT_URI=${AUTH_REDIRECT_URI}
+export AUTH_SILENT_REDIRECT_URI=${AUTH_SILENT_REDIRECT_URI}
+export USE_AUTH0=${USE_AUTH0:-true}
+export AUTH_SUPPORTED_SCOPES=${AUTH_SUPPORTED_SCOPES:-openid profile email api offline_access email_verified}
+
+export NETBIRD_MGMT_API_ENDPOINT=$(echo $NETBIRD_MGMT_API_ENDPOINT | sed -E 's/(:80|:443)$//')
+export NETBIRD_MGMT_GRPC_API_ENDPOINT=${NETBIRD_MGMT_GRPC_API_ENDPOINT}
+export NETBIRD_HOTJAR_TRACK_ID=${NETBIRD_HOTJAR_TRACK_ID}
+export NETBIRD_TOKEN_SOURCE=${NETBIRD_TOKEN_SOURCE:-accessToken}
+export NETBIRD_DRAG_QUERY_PARAMS=${NETBIRD_DRAG_QUERY_PARAMS:-false}
 
-REPO="https://github.com/netbirdio/netbird/"
-# this command will fetch the latest release e.g. v0.6.3
-export NETBIRD_LATEST_VERSION=$(basename $(curl -fs -o/dev/null -w %{redirect_url} ${REPO}releases/latest))
 echo "NetBird latest version: ${NETBIRD_LATEST_VERSION}"
 
 # replace ENVs in the config
-ENV_STR="\$\$AUTH0_DOMAIN \$\$AUTH0_CLIENT_ID \$\$AUTH0_AUDIENCE \$\$NETBIRD_MGMT_API_ENDPOINT \$\$NETBIRD_MGMT_GRPC_API_ENDPOINT \$\$NETBIRD_LATEST_VERSION"
+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 \$\$AUTH_REDIRECT_URI \$\$AUTH_SILENT_REDIRECT_URI \$\$NETBIRD_TOKEN_SOURCE \$\$NETBIRD_DRAG_QUERY_PARAMS"
+
 MAIN_JS=$(find /usr/share/nginx/html/static/js/main.*js)
+OIDC_TRUSTED_DOMAINS="/usr/share/nginx/html/OidcTrustedDomains.js"
 cp "$MAIN_JS" "$MAIN_JS".copy
 envsubst "$ENV_STR" < "$MAIN_JS".copy > "$MAIN_JS"
-rm "$MAIN_JS".copy
-
-
-
+envsubst "$ENV_STR" < "$OIDC_TRUSTED_DOMAINS".tmpl > "$OIDC_TRUSTED_DOMAINS"
+rm "$MAIN_JS".copy

e2e-tests/clean-test-env.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+docker-compose down --volumes
+rm -f docker-compose.yml Caddyfile zitadel.env dashboard.env machinekey/zitadel-admin-sa.token turnserver.conf management.json

e2e-tests/create-test-env.sh

@@ -0,0 +1,697 @@
+#!/bin/bash
+
+set -e
+
+handle_request_command_status() {
+  PARSED_RESPONSE=$1
+  FUNCTION_NAME=$2
+  RESPONSE=$3
+  if [[ $PARSED_RESPONSE -ne 0 ]]; then
+    echo "ERROR calling $FUNCTION_NAME:" $(echo "$RESPONSE" | jq -r '.message') > /dev/stderr
+    exit 1
+  fi
+}
+
+handle_zitadel_request_response() {
+  PARSED_RESPONSE=$1
+  FUNCTION_NAME=$2
+  RESPONSE=$3
+  if [[ $PARSED_RESPONSE == "null" ]]; then
+    echo "ERROR calling $FUNCTION_NAME:" $(echo "$RESPONSE" | jq -r '.message') > /dev/stderr
+    exit 1
+  fi
+  sleep 1
+}
+
+check_docker_compose() {
+  if command -v docker-compose &> /dev/null
+  then
+      echo "docker-compose"
+      return
+  fi
+  if docker compose --help &> /dev/null
+  then
+      echo "docker compose"
+      return
+  fi
+
+  echo "docker-compose is not installed or not in PATH. Please follow the steps from the official guide: https://docs.docker.com/engine/install/" > /dev/stderr
+  exit 1
+}
+
+check_jq() {
+  if ! command -v jq &> /dev/null
+  then
+    echo "jq is not installed or not in PATH, please install with your package manager. e.g. sudo apt install jq" > /dev/stderr
+    exit 1
+  fi
+}
+
+wait_crdb() {
+  set +e
+  while true; do
+    if $DOCKER_COMPOSE_COMMAND exec -T crdb curl -sf -o /dev/null 'http://localhost:8080/health?ready=1'; then
+      break
+    fi
+    echo -n " ."
+    sleep 5
+  done
+  echo " done"
+  set -e
+}
+
+init_crdb() {
+  echo -e "\nInitializing Zitadel's CockroachDB\n\n"
+  $DOCKER_COMPOSE_COMMAND up -d crdb
+  echo ""
+  # shellcheck disable=SC2028
+  echo -n "Waiting cockroachDB  to become ready "
+  wait_crdb
+  $DOCKER_COMPOSE_COMMAND exec -T crdb /bin/bash -c "cp /cockroach/certs/* /zitadel-certs/ && cockroach cert create-client --overwrite --certs-dir /zitadel-certs/ --ca-key /zitadel-certs/ca.key zitadel_user && chown -R 1000:1000 /zitadel-certs/"
+  handle_request_command_status $? "init_crdb failed" ""
+}
+
+get_main_ip_address() {
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    interface=$(route -n get default | grep 'interface:' | awk '{print $2}')
+    ip_address=$(ifconfig "$interface" | grep 'inet ' | awk '{print $2}')
+  else
+    interface=$(ip route | grep default | awk '{print $5}' | head -n 1)
+    ip_address=$(ip addr show "$interface" | grep 'inet ' | awk '{print $2}' | cut -d'/' -f1)
+  fi
+
+  echo "$ip_address"
+}
+
+wait_pat() {
+  PAT_PATH=$1
+  set +e
+  while true; do
+    if [[ -f "$PAT_PATH" ]]; then
+      break
+    fi
+    echo -n " ."
+    sleep 1
+  done
+  echo " done"
+  set -e
+}
+
+wait_api() {
+    INSTANCE_URL=$1
+    PAT=$2
+    set +e
+    while true; do
+      curl -s --fail -o /dev/null "$INSTANCE_URL/auth/v1/users/me" -H "Authorization: Bearer $PAT"
+      if [[ $? -eq 0 ]]; then
+        break
+      fi
+      echo -n " ."
+      sleep 1
+    done
+    echo " done"
+    set -e
+}
+
+create_new_project() {
+  INSTANCE_URL=$1
+  PAT=$2
+  PROJECT_NAME="NETBIRD"
+
+  RESPONSE=$(
+    curl -sS -X POST "$INSTANCE_URL/management/v1/projects" \
+      -H "Authorization: Bearer $PAT" \
+      -H "Content-Type: application/json" \
+      -d '{"name": "'"$PROJECT_NAME"'"}'
+  )
+  PARSED_RESPONSE=$(echo "$RESPONSE" | jq -r '.id')
+  handle_zitadel_request_response "$PARSED_RESPONSE" "create_new_project" "$RESPONSE"
+  echo "$PARSED_RESPONSE"
+}
+
+create_new_application() {
+  INSTANCE_URL=$1
+  PAT=$2
+  APPLICATION_NAME=$3
+  BASE_REDIRECT_URL1=$4
+  BASE_REDIRECT_URL2=$5
+  LOGOUT_URL=$6
+  ZITADEL_DEV_MODE=$7
+
+  RESPONSE=$(
+    curl -sS -X POST "$INSTANCE_URL/management/v1/projects/$PROJECT_ID/apps/oidc" \
+      -H "Authorization: Bearer $PAT" \
+      -H "Content-Type: application/json" \
+      -d '{
+    "name": "'"$APPLICATION_NAME"'",
+    "redirectUris": [
+      "'"$BASE_REDIRECT_URL1"'",
+      "'"$BASE_REDIRECT_URL2"'"
+    ],
+    "postLogoutRedirectUris": [
+       "'"$LOGOUT_URL"'"
+    ],
+    "RESPONSETypes": [
+      "OIDC_RESPONSE_TYPE_CODE"
+    ],
+    "grantTypes": [
+      "OIDC_GRANT_TYPE_AUTHORIZATION_CODE",
+      "OIDC_GRANT_TYPE_REFRESH_TOKEN"
+    ],
+    "appType": "OIDC_APP_TYPE_USER_AGENT",
+    "authMethodType": "OIDC_AUTH_METHOD_TYPE_NONE",
+    "version": "OIDC_VERSION_1_0",
+    "devMode": '"$ZITADEL_DEV_MODE"',
+    "accessTokenType": "OIDC_TOKEN_TYPE_JWT",
+    "accessTokenRoleAssertion": true,
+    "skipNativeAppSuccessPage": true
+  }'
+  )
+
+  PARSED_RESPONSE=$(echo "$RESPONSE" | jq -r '.clientId')
+  handle_zitadel_request_response "$PARSED_RESPONSE" "create_new_application" "$RESPONSE"
+  echo "$PARSED_RESPONSE"
+}
+
+create_service_user() {
+  INSTANCE_URL=$1
+  PAT=$2
+
+  RESPONSE=$(
+    curl -sS -X POST "$INSTANCE_URL/management/v1/users/machine" \
+      -H "Authorization: Bearer $PAT" \
+      -H "Content-Type: application/json" \
+      -d '{
+            "userName": "netbird-service-account",
+            "name": "Netbird Service Account",
+            "description": "Netbird Service Account for IDP management",
+            "accessTokenType": "ACCESS_TOKEN_TYPE_JWT"
+      }'
+  )
+  PARSED_RESPONSE=$(echo "$RESPONSE" | jq -r '.userId')
+  handle_zitadel_request_response "$PARSED_RESPONSE" "create_service_user" "$RESPONSE"
+  echo "$PARSED_RESPONSE"
+}
+
+create_service_user_secret() {
+  INSTANCE_URL=$1
+  PAT=$2
+  USER_ID=$3
+
+  RESPONSE=$(
+    curl -sS -X PUT "$INSTANCE_URL/management/v1/users/$USER_ID/secret" \
+      -H "Authorization: Bearer $PAT" \
+      -H "Content-Type: application/json" \
+      -d '{}'
+  )
+  SERVICE_USER_CLIENT_ID=$(echo "$RESPONSE" | jq -r '.clientId')
+  handle_zitadel_request_response "$SERVICE_USER_CLIENT_ID" "create_service_user_secret_id" "$RESPONSE"
+  SERVICE_USER_CLIENT_SECRET=$(echo "$RESPONSE" | jq -r '.clientSecret')
+  handle_zitadel_request_response "$SERVICE_USER_CLIENT_SECRET" "create_service_user_secret" "$RESPONSE"
+}
+
+add_organization_user_manager() {
+  INSTANCE_URL=$1
+  PAT=$2
+  USER_ID=$3
+
+  RESPONSE=$(
+    curl -sS -X POST "$INSTANCE_URL/management/v1/orgs/me/members" \
+      -H "Authorization: Bearer $PAT" \
+      -H "Content-Type: application/json" \
+      -d '{
+            "userId": "'"$USER_ID"'",
+            "roles": [
+              "ORG_USER_MANAGER"
+            ]
+      }'
+  )
+  PARSED_RESPONSE=$(echo "$RESPONSE" | jq -r '.details.creationDate')
+  handle_zitadel_request_response "$PARSED_RESPONSE" "add_organization_user_manager" "$RESPONSE"
+  echo "$PARSED_RESPONSE"
+}
+
+create_admin_user() {
+    INSTANCE_URL=$1
+    PAT=$2
+    USERNAME=$3
+    PASSWORD=$4
+    RESPONSE=$(
+        curl -sS -X POST "$INSTANCE_URL/management/v1/users/human/_import" \
+          -H "Authorization: Bearer $PAT" \
+          -H "Content-Type: application/json" \
+          -d '{
+                "userName": "'"$USERNAME"'",
+                "profile": {
+                  "firstName": "Zitadel",
+                  "lastName": "Admin"
+                },
+                "email": {
+                  "email": "'"$USERNAME"'",
+                  "isEmailVerified": true
+                },
+                "password": "'"$PASSWORD"'",
+                "passwordChangeRequired": false
+          }'
+      )
+      PARSED_RESPONSE=$(echo "$RESPONSE" | jq -r '.userId')
+      handle_zitadel_request_response "$PARSED_RESPONSE" "create_admin_user" "$RESPONSE"
+      echo "$PARSED_RESPONSE"
+}
+
+add_instance_admin() {
+  INSTANCE_URL=$1
+  PAT=$2
+  USER_ID=$3
+
+  RESPONSE=$(
+    curl -sS -X POST "$INSTANCE_URL/admin/v1/members" \
+      -H "Authorization: Bearer $PAT" \
+      -H "Content-Type: application/json" \
+      -d '{
+            "userId": "'"$USER_ID"'",
+            "roles": [
+              "IAM_OWNER"
+            ]
+      }'
+  )
+  PARSED_RESPONSE=$(echo "$RESPONSE" | jq -r '.details.creationDate')
+  handle_zitadel_request_response "$PARSED_RESPONSE" "add_instance_admin" "$RESPONSE"
+  echo "$PARSED_RESPONSE"
+}
+
+delete_auto_service_user() {
+  INSTANCE_URL=$1
+  PAT=$2
+
+  RESPONSE=$(
+    curl -sS -X GET "$INSTANCE_URL/auth/v1/users/me" \
+      -H "Authorization: Bearer $PAT" \
+      -H "Content-Type: application/json" \
+  )
+  USER_ID=$(echo "$RESPONSE" | jq -r '.user.id')
+  handle_zitadel_request_response "$USER_ID" "delete_auto_service_user_get_user" "$RESPONSE"
+
+  RESPONSE=$(
+      curl -sS -X DELETE "$INSTANCE_URL/admin/v1/members/$USER_ID" \
+        -H "Authorization: Bearer $PAT" \
+        -H "Content-Type: application/json" \
+  )
+  PARSED_RESPONSE=$(echo "$RESPONSE" | jq -r '.details.changeDate')
+  handle_zitadel_request_response "$PARSED_RESPONSE" "delete_auto_service_user_remove_instance_permissions" "$RESPONSE"
+
+  RESPONSE=$(
+      curl -sS -X DELETE "$INSTANCE_URL/management/v1/orgs/me/members/$USER_ID" \
+        -H "Authorization: Bearer $PAT" \
+        -H "Content-Type: application/json" \
+  )
+  PARSED_RESPONSE=$(echo "$RESPONSE" | jq -r '.details.changeDate')
+  handle_zitadel_request_response "$PARSED_RESPONSE" "delete_auto_service_user_remove_org_permissions" "$RESPONSE"
+  echo "$PARSED_RESPONSE"
+}
+
+init_zitadel() {
+  echo -e "\nInitializing Zitadel with NetBird's applications\n"
+  INSTANCE_URL="$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN:$NETBIRD_PORT"
+
+  TOKEN_PATH=./machinekey/zitadel-admin-sa.token
+
+  echo -n "Waiting for Zitadel's PAT to be created "
+  wait_pat "$TOKEN_PATH"
+  echo "Reading Zitadel PAT"
+  PAT=$(cat $TOKEN_PATH)
+  if [ "$PAT" = "null" ]; then
+    echo "Failed requesting getting Zitadel PAT"
+    exit 1
+  fi
+
+  echo -n "Waiting for Zitadel to become ready "
+  wait_api "$INSTANCE_URL" "$PAT"
+
+  #  create the zitadel project
+  echo "Creating new zitadel project"
+  PROJECT_ID=$(create_new_project "$INSTANCE_URL" "$PAT")
+
+  ZITADEL_DEV_MODE=false
+  BASE_REDIRECT_URL=$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN
+  if [[ $NETBIRD_HTTP_PROTOCOL == "http" ]]; then
+    ZITADEL_DEV_MODE=true
+  fi
+
+  # create zitadel spa applications
+  echo "Creating new Zitadel SPA Dashboard application"
+  DASHBOARD_APPLICATION_CLIENT_ID=$(create_new_application "$INSTANCE_URL" "$PAT" "Dashboard" "http://localhost:3000/nb-auth" "http://localhost:3000/nb-silent-auth" "http://localhost:3000/" "true")
+
+  echo "Creating new Zitadel SPA Cli application"
+  CLI_APPLICATION_CLIENT_ID=$(create_new_application "$INSTANCE_URL" "$PAT" "Cli" "http://localhost:53000/" "http://localhost:54000/" "http://localhost:53000/" "true")
+
+  MACHINE_USER_ID=$(create_service_user "$INSTANCE_URL" "$PAT")
+
+  SERVICE_USER_CLIENT_ID="null"
+  SERVICE_USER_CLIENT_SECRET="null"
+
+  create_service_user_secret "$INSTANCE_URL" "$PAT" "$MACHINE_USER_ID"
+
+  DATE=$(add_organization_user_manager "$INSTANCE_URL" "$PAT" "$MACHINE_USER_ID")
+
+  ZITADEL_ADMIN_USERNAME="admin@localhost"
+  ZITADEL_ADMIN_PASSWORD="testMe123@"
+
+  HUMAN_USER_ID=$(create_admin_user "$INSTANCE_URL" "$PAT" "$ZITADEL_ADMIN_USERNAME" "$ZITADEL_ADMIN_PASSWORD")
+
+  DATE="null"
+
+  DATE=$(add_instance_admin "$INSTANCE_URL" "$PAT" "$HUMAN_USER_ID")
+
+  DATE="null"
+  DATE=$(delete_auto_service_user "$INSTANCE_URL" "$PAT")
+  if [ "$DATE" = "null" ]; then
+      echo "Failed deleting auto service user"
+      echo "Please remove it manually"
+  fi
+
+  export NETBIRD_AUTH_CLIENT_ID=$DASHBOARD_APPLICATION_CLIENT_ID
+  export NETBIRD_AUTH_CLIENT_ID_CLI=$CLI_APPLICATION_CLIENT_ID
+  export NETBIRD_IDP_MGMT_CLIENT_ID=$SERVICE_USER_CLIENT_ID
+  export NETBIRD_IDP_MGMT_CLIENT_SECRET=$SERVICE_USER_CLIENT_SECRET
+  export ZITADEL_ADMIN_USERNAME
+  export ZITADEL_ADMIN_PASSWORD
+}
+
+check_nb_domain() {
+  DOMAIN=$1
+  if [ "$DOMAIN-x" == "-x" ]; then
+    echo "The NETBIRD_DOMAIN variable cannot be empty." > /dev/stderr
+    return 1
+  fi
+
+  if [ "$DOMAIN" == "netbird.example.com" ]; then
+    echo "The NETBIRD_DOMAIN cannot be netbird.example.com" > /dev/stderr
+    retrun 1
+  fi
+  return 0
+}
+
+read_nb_domain() {
+  READ_NETBIRD_DOMAIN=""
+  echo -n "Enter the domain you want to use for NetBird (e.g. netbird.my-domain.com): " > /dev/stderr
+  read -r READ_NETBIRD_DOMAIN < /dev/tty
+  if ! check_nb_domain "$READ_NETBIRD_DOMAIN"; then
+    read_nb_domain
+  fi
+  echo "$READ_NETBIRD_DOMAIN"
+}
+
+initEnvironment() {
+  CADDY_SECURE_DOMAIN=""
+  ZITADEL_EXTERNALSECURE="false"
+  ZITADEL_TLS_MODE="disabled"
+  ZITADEL_MASTERKEY="$(openssl rand -base64 32 | head -c 32)"
+  NETBIRD_PORT=80
+  NETBIRD_HTTP_PROTOCOL="http"
+  TURN_USER="self"
+  TURN_PASSWORD=$(openssl rand -base64 32 | sed 's/=//g')
+  TURN_MIN_PORT=49152
+  TURN_MAX_PORT=65535
+
+  NETBIRD_DOMAIN=$(get_main_ip_address)
+
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+      ZIDATE_TOKEN_EXPIRATION_DATE=$(date -u -v+30M "+%Y-%m-%dT%H:%M:%SZ")
+  else
+      ZIDATE_TOKEN_EXPIRATION_DATE=$(date -u -d "+30 minutes" "+%Y-%m-%dT%H:%M:%SZ")
+  fi
+
+  check_jq
+
+  DOCKER_COMPOSE_COMMAND=$(check_docker_compose)
+
+  if [ -f zitadel.env ]; then
+    echo "Generated files already exist, if you want to reinitialize the environment, please remove them first."
+    echo "You can use the following commands:"
+    echo "  $DOCKER_COMPOSE_COMMAND down --volumes # to remove all containers and volumes"
+    echo "  rm -f docker-compose.yml Caddyfile zitadel.env dashboard.env machinekey/zitadel-admin-sa.token turnserver.conf management.json"
+    echo "Be aware that this will remove all data from the database, and you will have to reconfigure the dashboard."
+    exit 1
+  fi
+
+  echo Rendering initial files...
+  renderDockerCompose > docker-compose.yml
+  renderCaddyfile > Caddyfile
+  renderZitadelEnv > zitadel.env
+  echo "" > turnserver.conf
+  echo "" > management.json
+
+  mkdir -p machinekey
+  chmod 777 machinekey
+
+  init_crdb
+
+  echo -e "\nStarting Zidatel IDP for user management\n\n"
+  $DOCKER_COMPOSE_COMMAND up -d caddy zitadel
+  init_zitadel
+
+  echo -e "\nRendering NetBird files...\n"
+  renderTurnServerConf > turnserver.conf
+  renderManagementJson > management.json
+  renderDashboardEnv > src/.local-config.json
+
+  echo -e "\nStarting NetBird services\n"
+  $DOCKER_COMPOSE_COMMAND up -d
+  echo -e "\nDone!\n"
+  echo "You can access the NetBird dashboard at $NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN:$NETBIRD_PORT"
+  echo "Login with the following credentials:"
+  echo "Username: $ZITADEL_ADMIN_USERNAME" | tee .env
+  echo "Password: $ZITADEL_ADMIN_PASSWORD" | tee -a .env
+}
+
+renderCaddyfile() {
+  cat <<EOF
+{
+  debug
+	servers :80,:443 {
+    protocols h1 h2c
+  }
+}
+
+:80${CADDY_SECURE_DOMAIN} {
+    # Signal
+    reverse_proxy /signalexchange.SignalExchange/* h2c://signal:10000
+    # Management
+    reverse_proxy /api/* management:80
+    reverse_proxy /management.ManagementService/* h2c://management:80
+    # Zitadel
+    reverse_proxy /zitadel.admin.v1.AdminService/* h2c://zitadel:8080
+    reverse_proxy /admin/v1/* h2c://zitadel:8080
+    reverse_proxy /zitadel.auth.v1.AuthService/* h2c://zitadel:8080
+    reverse_proxy /auth/v1/* h2c://zitadel:8080
+    reverse_proxy /zitadel.management.v1.ManagementService/* h2c://zitadel:8080
+    reverse_proxy /management/v1/* h2c://zitadel:8080
+    reverse_proxy /zitadel.system.v1.SystemService/* h2c://zitadel:8080
+    reverse_proxy /system/v1/* h2c://zitadel:8080
+    reverse_proxy /assets/v1/* h2c://zitadel:8080
+    reverse_proxy /ui/* h2c://zitadel:8080
+    reverse_proxy /oidc/v1/* h2c://zitadel:8080
+    reverse_proxy /saml/v2/* h2c://zitadel:8080
+    reverse_proxy /oauth/v2/* h2c://zitadel:8080
+    reverse_proxy /.well-known/openid-configuration h2c://zitadel:8080
+    reverse_proxy /openapi/* h2c://zitadel:8080
+    reverse_proxy /debug/* h2c://zitadel:8080
+    # Dashboard
+    reverse_proxy /* dashboard:80
+}
+EOF
+}
+
+renderTurnServerConf() {
+  cat <<EOF
+listening-port=3478
+tls-listening-port=5349
+min-port=$TURN_MIN_PORT
+max-port=$TURN_MAX_PORT
+fingerprint
+lt-cred-mech
+user=$TURN_USER:$TURN_PASSWORD
+realm=wiretrustee.com
+cert=/etc/coturn/certs/cert.pem
+pkey=/etc/coturn/private/privkey.pem
+log-file=stdout
+no-software-attribute
+pidfile="/var/tmp/turnserver.pid"
+no-cli
+EOF
+}
+
+renderManagementJson() {
+  cat <<EOF
+{
+    "Stuns": [
+        {
+            "Proto": "udp",
+            "URI": "stun:$NETBIRD_DOMAIN:3478"
+        }
+    ],
+    "TURNConfig": {
+        "Turns": [
+            {
+                "Proto": "udp",
+                "URI": "turn:$NETBIRD_DOMAIN:3478",
+                "Username": "$TURN_USER",
+                "Password": "$TURN_PASSWORD"
+            }
+        ],
+        "TimeBasedCredentials": false
+    },
+    "Signal": {
+        "Proto": "$NETBIRD_HTTP_PROTOCOL",
+        "URI": "$NETBIRD_DOMAIN:$NETBIRD_PORT"
+    },
+    "HttpConfig": {
+        "AuthIssuer": "$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN",
+        "AuthAudience": "$NETBIRD_AUTH_CLIENT_ID",
+        "OIDCConfigEndpoint":"$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN/.well-known/openid-configuration"
+    },
+    "IdpManagerConfig": {
+        "ManagerType": "zitadel",
+        "ClientConfig": {
+            "Issuer": "$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN:$NETBIRD_PORT",
+            "TokenEndpoint": "$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN:$NETBIRD_PORT/oauth/v2/token",
+            "ClientID": "$NETBIRD_IDP_MGMT_CLIENT_ID",
+            "ClientSecret": "$NETBIRD_IDP_MGMT_CLIENT_SECRET",
+            "GrantType": "client_credentials"
+        },
+        "ExtraConfig": {
+            "ManagementEndpoint": "$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN:$NETBIRD_PORT/management/v1"
+        }
+     },
+    "PKCEAuthorizationFlow": {
+        "ProviderConfig": {
+            "Audience": "$NETBIRD_AUTH_CLIENT_ID_CLI",
+            "ClientID": "$NETBIRD_AUTH_CLIENT_ID_CLI",
+            "Scope": "openid profile email offline_access",
+            "RedirectURLs": ["http://localhost:53000/","http://localhost:54000/"]
+        }
+    }
+}
+EOF
+}
+
+renderDashboardEnv() {
+  cat <<EOF
+{
+  "auth0Auth": "false",
+  "authAuthority": "$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN:$NETBIRD_PORT",
+  "authClientId": "$NETBIRD_AUTH_CLIENT_ID",
+  "authScopesSupported": "openid profile email offline_access",
+  "authAudience": "$NETBIRD_AUTH_CLIENT_ID",
+  "apiOrigin": "$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN:$NETBIRD_PORT",
+  "grpcApiOrigin": "$NETBIRD_HTTP_PROTOCOL://$NETBIRD_DOMAIN:$NETBIRD_PORT",
+  "redirectURI": "/nb-auth",
+  "silentRedirectURI": "/nb-silent-auth"
+}
+EOF
+}
+
+renderZitadelEnv() {
+  cat <<EOF
+ZITADEL_LOG_LEVEL=debug
+ZITADEL_MASTERKEY=$ZITADEL_MASTERKEY
+ZITADEL_DATABASE_COCKROACH_HOST=crdb
+ZITADEL_DATABASE_COCKROACH_USER_USERNAME=zitadel_user
+ZITADEL_DATABASE_COCKROACH_USER_SSL_MODE=verify-full
+ZITADEL_DATABASE_COCKROACH_USER_SSL_ROOTCERT="/crdb-certs/ca.crt"
+ZITADEL_DATABASE_COCKROACH_USER_SSL_CERT="/crdb-certs/client.zitadel_user.crt"
+ZITADEL_DATABASE_COCKROACH_USER_SSL_KEY="/crdb-certs/client.zitadel_user.key"
+ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_MODE=verify-full
+ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_ROOTCERT="/crdb-certs/ca.crt"
+ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_CERT="/crdb-certs/client.root.crt"
+ZITADEL_DATABASE_COCKROACH_ADMIN_SSL_KEY="/crdb-certs/client.root.key"
+ZITADEL_EXTERNALSECURE=$ZITADEL_EXTERNALSECURE
+ZITADEL_TLS_ENABLED="false"
+ZITADEL_EXTERNALPORT=$NETBIRD_PORT
+ZITADEL_EXTERNALDOMAIN=$NETBIRD_DOMAIN
+ZITADEL_FIRSTINSTANCE_PATPATH=/machinekey/zitadel-admin-sa.token
+ZITADEL_FIRSTINSTANCE_ORG_MACHINE_MACHINE_USERNAME=zitadel-admin-sa
+ZITADEL_FIRSTINSTANCE_ORG_MACHINE_MACHINE_NAME=Admin
+ZITADEL_FIRSTINSTANCE_ORG_MACHINE_PAT_SCOPES=openid
+ZITADEL_FIRSTINSTANCE_ORG_MACHINE_PAT_EXPIRATIONDATE=$ZIDATE_TOKEN_EXPIRATION_DATE
+EOF
+}
+
+renderDockerCompose() {
+  cat <<EOF
+version: "3.4"
+services:
+  # Caddy reverse proxy
+  caddy:
+    image: caddy
+    restart: unless-stopped
+    networks: [ netbird ]
+    ports:
+      - '443:443'
+      - '80:80'
+      - '8080:8080'
+    volumes:
+      - netbird_caddy_data:/data
+      - ./Caddyfile:/etc/caddy/Caddyfile
+  # Management
+  management:
+    image: netbirdio/management:latest
+    restart: unless-stopped
+    networks: [netbird]
+    volumes:
+      - netbird_management:/var/lib/netbird
+      - ./management.json:/etc/netbird/management.json
+    command: [
+      "--port", "80",
+      "--log-file", "console",
+      "--log-level", "info",
+      "--disable-anonymous-metrics=false",
+      "--single-account-mode-domain=netbird.selfhosted",
+      "--dns-domain=netbird.selfhosted",
+      "--idp-sign-key-refresh-enabled",
+    ]
+  # Zitadel - identity provider
+  zitadel:
+    restart: 'always'
+    networks: [netbird]
+    image: 'ghcr.io/zitadel/zitadel:v2.31.3'
+    command: 'start-from-init --masterkeyFromEnv --tlsMode $ZITADEL_TLS_MODE'
+    env_file:
+      - ./zitadel.env
+    depends_on:
+      crdb:
+        condition: 'service_healthy'
+    volumes:
+      - ./machinekey:/machinekey
+      - netbird_zitadel_certs:/crdb-certs:ro
+  # CockroachDB for zitadel
+  crdb:
+    restart: 'always'
+    networks: [netbird]
+    image: 'cockroachdb/cockroach:v22.2.2'
+    command: 'start-single-node --advertise-addr crdb'
+    volumes:
+      - netbird_crdb_data:/cockroach/cockroach-data
+      - netbird_crdb_certs:/cockroach/certs
+      - netbird_zitadel_certs:/zitadel-certs
+    healthcheck:
+      test: [ "CMD", "curl", "-f", "http://localhost:8080/health?ready=1" ]
+      interval: '10s'
+      timeout: '30s'
+      retries: 5
+      start_period: '20s'
+
+volumes:
+  netbird_management:
+  netbird_caddy_data:
+  netbird_crdb_data:
+  netbird_crdb_certs:
+  netbird_zitadel_certs:
+
+networks:
+  netbird:
+EOF
+}
+
+initEnvironment

e2e-tests/pages/access-control-page.ts

@@ -0,0 +1,56 @@
+import { Page, test, expect } from "@playwright/test";
+
+export class AccessControlPage {
+    private readonly accessControlUrl = 'http://localhost:3000/acls'
+    private readonly defaulAccessControl = this.page.getByRole('cell', { name: 'Default' })
+    private readonly deleteButton = this.page.getByRole('button', { name: 'Delete' })
+    private readonly deleteModal = this.page.getByTestId('confirm-delete-modal-title')
+    private readonly confirmButton = this.page.getByRole('button', { name: 'OK' })
+    private readonly addRulesButton = this.page.getByTestId('add-rule-empty-state-button')
+
+    constructor(private readonly page: Page) {}
+
+      async openAccessControlPage() {
+        await test.step('Open Access Control page', async () => {
+            await this.page.goto(this.accessControlUrl);
+        })
+      }
+  
+    async assertDefaultAccessCotrolIsCreated() {
+      await test.step('Assert that default cotrol access is created', async () => {
+          await expect(this.defaulAccessControl).toBeVisible();
+      })
+    }
+
+    async pressDeleteButton() {
+      await test.step('Press delete button', async () => {
+          await this.deleteButton.click();
+      })
+    }
+
+    async assertDeleteModalIsVisibile() {
+      await test.step('Assert access control deletion modal is visible', async () => {
+          await expect(this.deleteModal).toBeVisible();
+      })
+    }
+
+    async pressConfirmButton() {
+      await test.step('Press confirm button on access control deletion modal', async () => {
+        await this.confirmButton.click();
+      })
+    }
+
+    async assertDefaultAccessCotrolIsDeleted() {
+      await test.step('Assert default access control should be deleted', async () => {
+          await expect(this.defaulAccessControl).not.toBeVisible();
+      })
+    }
+
+    async assertAddRuleButtonIsVisile() {
+      await test.step('Assert Add Rules button is visible', async () => {
+          await expect(this.addRulesButton).toBeVisible();
+      })
+    }
+  }
+
+export default AccessControlPage;

e2e-tests/pages/login-page.ts

@@ -0,0 +1,34 @@
+import { Page, test, expect} from "@playwright/test";
+
+export class LoginPage {
+    private readonly localUrl = 'http://localhost:3000/'
+    private readonly usernameField = this.page.getByPlaceholder('username@domain')
+    private readonly nextButton = this.page.getByRole('button', { name: 'next' })
+    private readonly passwordField = this.page.getByLabel('Password')
+    private readonly skipButton = this.page.getByRole('button', { name: 'skip' });
+    private readonly netBirdLogo = this.page.getByRole('link', { name: 'logo' })
+
+    constructor(private readonly page: Page) {}
+
+      async doLogin() {
+        await test.step('Login to local enviroment', async () => {
+          await this.page.goto(this.localUrl);
+          await this.usernameField.fill('admin@localhost');
+          await this.pressNextButton();
+          await this.passwordField.fill('testMe123@');
+          await this.pressNextButton();
+          if (await this.skipButton.isVisible({ timeout: 300 })) {
+              await this.skipButton.click();
+          }
+          await expect(this.netBirdLogo).toBeVisible();
+        })
+      }
+
+      async pressNextButton() {
+        await test.step('Press next button', async () => {
+          await this.nextButton.click();
+        })
+      }
+    }
+
+export default LoginPage;

e2e-tests/pages/modals/add-peer-modal.ts

@@ -0,0 +1,111 @@
+import { Page, test, expect } from "@playwright/test";
+
+export class AddPeerModal {
+    private readonly addPeerModal = this.page.getByTestId('add-peer-modal').locator('div').nth(2)
+    private readonly linuxTab = this.page.getByTestId('add-peer-modal-linux-tab')
+    private readonly windowsTab = this.page.getByTestId('add-peer-modal-windows-tab')
+    private readonly macTab = this.page.getByTestId('add-peer-modal-mac-tab')
+    private readonly androidTab = this.page.getByTestId('add-peer-modal-android-tab')
+    private readonly dockerTab = this.page.getByTestId('add-peer-modal-docker-tab')
+    private readonly linuxTabText = this.page.locator('pre').filter({ hasText: 'curl -fsSL https://pkgs.netbird.io/install.sh | sh' })
+    private readonly windowsDownloadButton = this.page.getByTestId('download-windows-button')
+    private readonly intelDownloadButton = this.page.getByTestId('download-intel-button')
+    private readonly m1M2DownloadButton = this.page.getByTestId('download-m1-m2-button')
+    private readonly androidDownloadButton = this.page.getByTestId('download-android-button')
+    private readonly dockerDownloadButton = this.page.getByTestId('download-docker-button')
+    private readonly closeButton = this.page.getByLabel('Close', { exact: true })
+
+    constructor(private readonly page: Page) {}
+
+    async assertPeerModalIsVisible() {
+        await test.step('Assert that add peer modal is visible', async () => {
+            await expect(this.addPeerModal).toBeVisible();
+        })
+      }
+
+      async assertPeerModalIsNotVisible() {
+        await test.step('Assert that add peer modal is not visible', async () => {
+            await expect(this.addPeerModal).not.toBeVisible();
+        })
+      }
+
+      async openLinuxTab() {
+        await test.step('Open Linux tab on add peer modal', async () => {
+            await this.linuxTab.click();
+            
+        })
+      }
+
+      async openWindowsTab() {
+        await test.step('Open Windows tab on add peer modal', async () => {
+            await this.windowsTab.click();
+            
+        })
+      }
+
+      async openMacTab() {
+        await test.step('Open MacOS tab on add peer modal', async () => {
+            await this.macTab.click();
+            
+        })
+      }
+
+      async openAndroidTab() {
+        await test.step('Open Android tab on add peer modal', async () => {
+            await this.androidTab.click();
+            
+        })
+      }
+
+      async openDockerTab() {
+        await test.step('Open Docker tab on add peer modal', async () => {
+            await this.dockerTab.click();
+            
+        })
+      }
+
+      async assertLinuxTabHasCorrectText() {
+        await test.step('Assert Linux tab has correct installation text', async () => {
+            await expect(this.linuxTabText).toBeVisible();
+        })
+      }
+
+      async assertWindowsDownloadButtonHasCorrectLink() {
+        await test.step('Assert Windows download button has a correct link', async () => {
+            await expect(this.windowsDownloadButton).toHaveAttribute('href', 'https://pkgs.netbird.io/windows/x64');
+        })
+      }
+
+      async assertIntelDownloadButtonHasCorrectLink() {
+        await test.step('Assert Intel download button has a correct link', async () => {
+            await expect(this.intelDownloadButton).toHaveAttribute('href', 'https://pkgs.netbird.io/macos/amd64');
+        })
+      }
+
+      async assertM1M2DownloadButtonHasCorrectLink() {
+        await test.step('Assert M1 & M2 download button has a correct link', async () => {
+            await expect(this.m1M2DownloadButton).toHaveAttribute('href', 'https://pkgs.netbird.io/macos/arm64');
+        })
+      }
+
+      async assertAndroidDownloadButtonHasCorrectLink() {
+        await test.step('Assert Android download button has a correct link', async () => {
+            await expect(this.androidDownloadButton).toHaveAttribute('href', 'https://play.google.com/store/apps/details?id=io.netbird.client');
+        })
+      }
+
+      async assertDockerDownloadButtonHasCorrectLink() {
+        await test.step('Assert Docker download button has a correct link', async () => {
+            await expect(this.dockerDownloadButton).toHaveAttribute('href', 'https://docs.docker.com/engine/install/');
+        })
+      }
+
+      async closeAddPeerModal() {
+        await test.step('Close Add peer modal', async () => {
+          await this.closeButton.click();
+        })
+      }
+      
+    }
+
+export default AddPeerModal;

e2e-tests/pages/peers-page.ts

@@ -0,0 +1,15 @@
+import { Page, test } from "@playwright/test";
+
+export class PeersPage {
+    private readonly addNewPeerButton = this.page.getByTestId('add-new-peer-button')
+
+    constructor(private readonly page: Page) {}
+
+      async clickOnAddNewPeerButton() {
+        await test.step('Click on Add new peer Button to open Add peer modal', async () => {
+            await this.addNewPeerButton.click();
+        })
+      }
+    }
+
+export default PeersPage;

e2e-tests/pages/top-menu.ts

@@ -0,0 +1,15 @@
+import { Page, test} from "@playwright/test";
+
+export class TopMenu {
+    private readonly accessControlButton = this.page.getByTestId('access-control-page')
+
+    constructor(private readonly page: Page) {}
+
+      async clickOnAccessControlOnTopMenu() {
+        await test.step('Click on Access Control page on a top menu', async () => {
+          await this.accessControlButton.click();  
+        })
+      }
+    }
+
+export default TopMenu;

e2e-tests/tests/access-control.test.ts

@@ -0,0 +1,22 @@
+import { test } from '@playwright/test'
+import {LoginPage} from '../pages/login-page'
+import {AccessControlPage} from '../pages/access-control-page'
+
+let loginPage: LoginPage
+let accessControlPage: AccessControlPage
+
+test.beforeEach(async ({ page }) => {
+  loginPage = new LoginPage(page);
+  await loginPage.doLogin();
+});
+
+ test('Confirm that new user has Default access', async ({ page }) => {
+  accessControlPage = new AccessControlPage(page);
+  await accessControlPage.openAccessControlPage();
+  await accessControlPage.assertDefaultAccessCotrolIsCreated();
+  await accessControlPage.pressDeleteButton();
+  await accessControlPage.assertDeleteModalIsVisibile();
+  await accessControlPage.pressConfirmButton();
+  await accessControlPage.assertDefaultAccessCotrolIsDeleted();
+  await accessControlPage.assertAddRuleButtonIsVisile();
+ });

e2e-tests/tests/peers.test.ts

@@ -0,0 +1,49 @@
+import { test } from '@playwright/test'
+import {AddPeerModal} from '../pages/modals/add-peer-modal'
+import {PeersPage} from '../pages/peers-page'
+import {LoginPage} from '../pages/login-page'
+
+let addPeerModal: AddPeerModal
+let peersPage: PeersPage
+let loginPage: LoginPage
+
+test.beforeEach(async ({ page }) => {
+  addPeerModal = new AddPeerModal(page);
+  loginPage = new LoginPage(page);
+  await loginPage.doLogin();
+  await addPeerModal.assertPeerModalIsVisible();
+});
+
+test('Test Linux tab on a first access add peer modal / @bc', async function () {
+    await addPeerModal.openLinuxTab();
+    await addPeerModal.assertLinuxTabHasCorrectText();
+  });
+
+test('Test Windows tab on a first access add peer modal / @bc', async () => {
+  await addPeerModal.openWindowsTab();
+  await addPeerModal.assertWindowsDownloadButtonHasCorrectLink();
+});
+
+test('Test MacOS tab on a first access add peer modal / @bc', async () => {
+  await addPeerModal.openMacTab();
+  await addPeerModal.assertIntelDownloadButtonHasCorrectLink();
+  await addPeerModal.assertM1M2DownloadButtonHasCorrectLink();
+});
+
+test('Test Android tab on a first access add peer modal', async () => {
+  await addPeerModal.openAndroidTab();
+  await addPeerModal.assertAndroidDownloadButtonHasCorrectLink();
+});
+
+ test('Test Docker tab on a first access add peer modal', async () => {
+  await addPeerModal.openDockerTab();
+  await addPeerModal.assertDockerDownloadButtonHasCorrectLink();
+ });
+
+ test('Close and open Add peer modal', async ({ page }) => {
+  peersPage = new PeersPage(page);
+  await addPeerModal.closeAddPeerModal();
+  await addPeerModal.assertPeerModalIsNotVisible();
+  await peersPage.clickOnAddNewPeerButton();
+  await addPeerModal.assertPeerModalIsVisible();
+ });

package.json

@@ -3,8 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
-    "@ant-design/icons": "^4.7.0",
-    "@auth0/auth0-react": "^1.6.0",
+    "@ant-design/icons": "^4.8.0",
+    "@axa-fr/react-oidc": "^5.14.0",
     "@headlessui/react": "^1.5.0",
     "@heroicons/react": "^1.0.4",
     "@testing-library/jest-dom": "^5.11.4",
@@ -18,32 +18,43 @@
     "@types/react-redux": "^7.1.24",
     "@types/react-router-dom": "^5.3.3",
     "@types/styled-components": "^5.1.25",
-    "antd": "^4.20.6",
+    "antd": "^5.3.1",
     "autoprefixer": "^10.4.4",
     "axios": "^0.27.2",
+    "cidr-regex": "^3.1.1",
+    "copyfiles": "^2.4.1",
     "heroicons": "^1.0.6",
     "highlight.js": "^11.2.0",
     "history": "^5.0.1",
     "lodash": "^4.17.21",
+    "moment": "^2.29.4",
     "postcss": "^8.4.12",
     "prop-types": "^15.7.2",
-    "react": "^18.1.0",
+    "punycode": "^2.1.1",
+    "rc-overflow": "^1.2.8",
+    "react": "^18.2.0",
+    "react-copy-to-clipboard": "^5.1.0",
     "react-dom": "^18.1.0",
-    "react-highlight": "^0.14.0",
+    "react-hotjar": "^5.1.0",
     "react-redux": "^8.0.2",
-    "react-router-dom": "^5.2.0",
+    "react-router-dom": "^5.3.3",
     "react-scripts": "^5.0.1",
+    "react-select": "^5.7.3",
+    "react-syntax-highlighter": "^15.5.0",
     "react-table": "^7.7.0",
     "redux": "^4.2.0",
     "redux-devtools-extension": "^2.13.9",
     "redux-saga": "^1.1.3",
     "styled-components": "^5.3.5",
     "tailwindcss": "^3.0.23",
+    "ts-md5": "^1.3.1",
     "typesafe-actions": "^5.1.0",
     "typescript": "^4.6.4",
     "web-vitals": "^2.1.4"
   },
   "scripts": {
+    "copy": "copyfiles -f ./node_modules/@axa-fr/react-oidc/dist/OidcServiceWorker.js ./public",
+    "copytrusted": "copyfiles -f ./public/local/OidcTrustedDomains.js ./public",
     "start": "react-scripts start",
     "build": "react-scripts build",
     "test": "react-scripts test",
@@ -68,6 +79,7 @@
     ]
   },
   "devDependencies": {
-    "@types/react-highlight": "^0.12.5"
+    "@types/react-syntax-highlighter": "^15.5.3",
+    "@playwright/test": "^1.36.2"
   }
 }

playwright.config.ts

@@ -0,0 +1,80 @@
+import { defineConfig, devices } from '@playwright/test';
+
+/**
+ * Read environment variables from file.
+ * https://github.com/motdotla/dotenv
+ */
+// require('dotenv').config();
+
+/**
+ * See https://playwright.dev/docs/test-configuration.
+ */
+export default defineConfig({
+  testDir: './e2e-tests/tests',
+  /* Run tests in files in parallel */
+  fullyParallel: true,
+  /* Fail the build on CI if you accidentally left test.only in the source code. */
+  forbidOnly: !!process.env.CI,
+  /* Retry on CI only */
+  retries: process.env.CI ? 2 : 0,
+  /* Opt out of parallel tests on CI. */
+  workers: process.env.CI ? 1 : undefined,
+  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
+  reporter: 'html',
+  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
+  use: {
+    /* Base URL to use in actions like `await page.goto('/')`. */
+    // baseURL: 'http://127.0.0.1:3000',
+
+    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
+    trace: 'on-first-retry',
+    screenshot: 'only-on-failure',
+    video: 'retain-on-failure',
+  },
+
+  /* Configure projects for major browsers */
+  projects: [
+    {
+      name: 'chromium',
+      use: { channel: 'chrome', },
+    },
+
+    // {
+    //   name: 'firefox',
+    //   use: {  browserName: 'firefox', },
+    // },
+    //
+    // {
+    //   name: 'webkit',
+    //   use: { browserName: 'webkit', },
+    // },
+
+    /* Test against mobile viewports. */
+    // {
+    //   name: 'Mobile Chrome',
+    //   use: { ...devices['Pixel 5'] },
+    // },
+    // {
+    //   name: 'Mobile Safari',
+    //   use: { ...devices['iPhone 12'] },
+    // },
+
+    /* Test against branded browsers. */
+    // {
+    //   name: 'Microsoft Edge',
+    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
+    // },
+    // {
+    //   name: 'Google Chrome',
+    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
+    // },
+  ],
+
+  /* Run your local dev server before starting the tests */
+  webServer: {
+    command: 'npm run start',
+    url: 'http://127.0.0.1:3000',
+    reuseExistingServer: !process.env.CI,
+    timeout: 180 * 1000,
+  },
+});

public/OidcTrustedDomains.js.tmpl

@@ -0,0 +1,6 @@
+
+// Add here trusted domains, access tokens will be send to 
+const trustedDomains = {
+    default:["$NETBIRD_MGMT_API_ENDPOINT"],
+    auth0:[]
+};  

public/index.html

@@ -5,6 +5,7 @@
     <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
+    <meta name="robots" content="noindex">
     <meta
       name="description"
       content="NetBird Management Dashboard"

public/local/OidcTrustedDomains.js

@@ -0,0 +1,6 @@
+
+// Add here trusted domains, access tokens will be send to 
+const trustedDomains = {
+    default:["http://localhost:3001","http://127.0.0.1:3001", "http://0.0.0.0:33071"],
+    auth0:[]
+};  

public/robots.txt

@@ -1,3 +1,3 @@
 # https://www.robotstxt.org/robotstxt.html
 User-agent: *
-Disallow:
+Disallow: /

run-local-keycloak.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+MGMT_PORT=$1
+
+npm run build
+docker build -f docker/Dockerfile -t netbird/dashboard-local:latest .
+
+docker rm -f netbird-dashboard
+docker run -d --name netbird-dashboard  \
+  -p 3000:80 -p 443:443 \
+  -e AUTH_AUDIENCE=netbird-client  \
+  -e AUTH_AUTHORITY=http://localhost:8080/realms/netbird  \
+  -e AUTH_CLIENT_ID=netbird-client \
+  -e USE_AUTH0=false  \
+  -e AUTH_SUPPORTED_SCOPES='openid profile email api offline_access' \
+  -e NETBIRD_MGMT_API_ENDPOINT=http://localhost:$MGMT_PORT  \
+  -e NETBIRD_MGMT_GRPC_API_ENDPOINT=http://localhost:$MGMT_PORT \
+  netbird/dashboard-local:latest

run-local-legacy.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+MGMT_PORT=$1
+
+npm run build
+docker build -f docker/Dockerfile -t netbird/dashboard-local:latest .
+
+docker rm -f netbird-dashboard
+docker run -d --name netbird-dashboard  \
+ -p 3000:80 -p 443:443  \
+ -e AUTH0_AUDIENCE=http://localhost:3000/ \
+ -e AUTH0_DOMAIN=netbird-localdev.eu.auth0.com  \
+ -e AUTH0_CLIENT_ID=kBRMAOqIZ7hvpVCaypQLCJvTzkYYIXVt  \
+ -e NETBIRD_MGMT_API_ENDPOINT=http://localhost:$MGMT_PORT  \
+ -e NETBIRD_MGMT_GRPC_API_ENDPOINT=http://localhost:$MGMT_PORT  \
+ netbird/dashboard-local:latest

run-local.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+
+MGMT_PORT=$1
+
+npm run build
+docker build -f docker/Dockerfile -t netbird/dashboard-local:latest .
+
+docker rm -f netbird-dashboard
+docker run -d --name netbird-dashboard  \
+  -p 3000:80 -p 443:443 \
+  -e AUTH_AUDIENCE=http://localhost:3000/ \
+  -e AUTH_AUTHORITY=https://netbird-localdev.eu.auth0.com \
+  -e AUTH_CLIENT_ID=kBRMAOqIZ7hvpVCaypQLCJvTzkYYIXVt  \
+  -e USE_AUTH0=true \
+  -e AUTH_SUPPORTED_SCOPES='openid profile email api offline_access email_verified' \
+  -e NETBIRD_MGMT_API_ENDPOINT=http://localhost:$MGMT_PORT  \
+  -e NETBIRD_MGMT_GRPC_API_ENDPOINT=http://localhost:$MGMT_PORT \
+  netbird/dashboard-local:latest

src/App.tsx

@@ -1,45 +1,48 @@
-import React, {useEffect, useState} from 'react';
+import React, {useEffect, useRef, useState} from 'react';
 import {Provider} from "react-redux";
-import {Link, Redirect, Route, Switch} from 'react-router-dom';
-import {useAuth0} from "@auth0/auth0-react";
-import Navbar from './components/Navbar';
-import Peers from './views/Peers';
-import FooterComponent from './components/FooterComponent';
-import Loading from "./components/Loading";
-import SetupKeys from "./views/SetupKeys";
-import AddPeer from "./views/AddPeer";
-import Users from './views/Users';
-import AccessControl from './views/AccessControl';
-// import Activity from './views/Activity';
+import {apiClient, store} from "./store";
+import {hotjar} from 'react-hotjar';
+import {getConfig} from "./config";
 import Banner from "./components/Banner";
-import {store} from "./store";
-
-import {Button, Col, Layout, Result, Row} from 'antd';
+import {Col, ConfigProvider, Layout, Row} from "antd";
 import {Container} from "./components/Container";
+import Navbar from "./components/Navbar";
+import {Redirect, Route, Switch} from "react-router-dom";
+import {withOidcSecure} from "@axa-fr/react-oidc";
+import Peers from "./views/Peers";
+import Routes from "./views/Routes";
+import AddPeer from "./views/AddPeer";
+import SetupKeys from "./views/SetupKeys";
+import AccessControl from "./views/AccessControl";
+import Users from "./views/Users";
+import FooterComponent from "./components/FooterComponent";
+import {useGetTokenSilently, useTokenSource} from "./utils/token";
+import {User} from "./store/user/types";
+import {SecureLoading} from "./components/Loading";
+import DNS from "./views/DNS";
+import Activity from "./views/Activity";
+import Settings from "./views/Settings";
+
 
 const {Header, Content} = Layout;
 
 function App() {
-
-    const {
-        isLoading,
-        isAuthenticated,
-        loginWithRedirect,
-        logout,
-        error
-    } = useAuth0();
+    const run = useRef(false)
+    const [show, setShow] = useState(false)
+    const {hotjarTrackID,tokenSource} = getConfig();
+    useTokenSource(tokenSource)
+    const {getTokenSilently} = useGetTokenSilently();
+    // @ts-ignore
+    if (hotjarTrackID && window._DATADOG_SYNTHETICS_BROWSER === undefined) {
+        hotjar.initialize(hotjarTrackID, 6);
+    }
 
     const [isOpen, setIsOpen] = useState(false);
 
-    const toggle = () => {
-        setIsOpen(!isOpen);
-    };
-
     useEffect(() => {
         const hideMenu = () => {
             if (window.innerWidth > 768 && isOpen) {
                 setIsOpen(false);
-                console.log('i resized');
             }
         };
 
@@ -48,81 +51,72 @@ function App() {
         return () => {
             window.removeEventListener('resize', hideMenu);
         };
-    });
+    }, []);
 
-    if (error) {
-        return <Result
-            status="warning"
-            title={error.message}
-            extra={<>
-                <a href={window.location.origin}>
-                    <Button type="primary">
-                        Try again
-                    </Button>
-                </a>
-                <Button type="primary" onClick={function () {
-                    logout({
-                        returnTo: window.location.origin,
-                    })
-                }}>
-                    Log out
-                </Button>
-            </>
-            }
-        />
-    }
+    useEffect(() => {
+        if (!run.current) {
+            run.current = true
+            apiClient.request<User[]>('GET', `/api/users`, {getAccessTokenSilently: getTokenSilently})
+                .then(() => {
+                    setShow(true)
+                })
+                .catch(e => {
+                    setShow(true)
+                    console.log(e)
+                })
+        }
 
-    if (isLoading) {
-        return <Loading padding="3em" width="50px" height="50px"/>;
-    }
-
-    if (!isAuthenticated) {
-        loginWithRedirect({})
-    }
+    }, [getTokenSilently])
 
     return (
-        <Provider store={store}>
-            {isAuthenticated &&
-                <Layout>
-                    <Banner/>
-                    <Header className="header" style={{
-                        display: "flex",
-                        flexDirection: "column",
-                        justifyContent: "space-around",
-                        alignContent: "center"
-                    }}>
-                        <Row justify="space-around" align="middle">
-                            <Col span={24}>
-                                <Container>
-                                    <Navbar/>
-                                </Container>
-                            </Col>
-                        </Row>
-                    </Header>
-                    <Content style={{ minHeight: "100vh"}}>
-                        <Switch>
-                            <Route
-                                exact
-                                path="/"
-                                render={() => {
-                                    return (
-                                        <Redirect to="/peers"/>
-                                    )
-                                }}
-                            />
-                            <Route path='/peers' exact component={Peers}/>
-                            <Route path="/add-peer" component={AddPeer}/>
-                            <Route path="/setup-keys" component={SetupKeys}/>
-                            <Route path="/acls" component={AccessControl}/>
-                            {/*<Route path="/activity" component={Activity}/>*/}
-                            <Route path="/users" component={Users}/>
-                        </Switch>
-                    </Content>
-                    <FooterComponent/>
-                </Layout>
-            }
-        </Provider>
-    );
+        <>
+
+            <Provider store={store}>
+                {!show && <SecureLoading padding="3em" width={50} height={50}/>}
+                {show &&
+                    <Layout>
+                        <Banner/>
+                        <Header className="header" style={{
+                            display: "flex",
+                            flexDirection: "column",
+                            justifyContent: "space-around",
+                            alignContent: "center"
+                        }}>
+                            <Row justify="space-around" align="middle">
+                                <Col span={24}>
+                                    <Container>
+                                        <Navbar/>
+                                    </Container>
+                                </Col>
+                            </Row>
+                        </Header>
+                        <Content style={{minHeight: "100vh"}}>
+                            <Switch>
+                                <Route
+                                    exact
+                                    path="/"
+                                    render={() => {
+                                        return (
+                                            <Redirect to="/peers"/>
+                                        )
+                                    }}
+                                />
+                                <Route path='/peers' exact component={withOidcSecure(Peers)}/>
+                                <Route path="/setup-keys" component={withOidcSecure(SetupKeys)}/>
+                                <Route path="/acls" component={withOidcSecure(AccessControl)}/>
+                                <Route path="/routes" component={withOidcSecure(Routes)}/>
+                                <Route path="/users" component={withOidcSecure(Users)}/>
+                                <Route path="/dns" component={withOidcSecure(DNS)}/>
+                                <Route path="/activity" component={withOidcSecure(Activity)}/>
+                                <Route path="/settings" component={withOidcSecure(Settings)}/>
+                            </Switch>
+                        </Content>
+                        <FooterComponent/>
+                    </Layout>
+                }
+            </Provider>
+        </>
+    )
 }
 
 export default App;

src/assets/direct_bi.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="29.435" height="7.636" viewBox="0 0 29.435 7.636">
-  <path id="direct_bi" d="M3.64,8.158-.178,4.34,3.64.522,4.3,1.17l-2.7,2.7h25.89l-2.7-2.7.656-.648L29.257,4.34,27.213,6.384,25.439,8.158,24.783,7.5l2.7-2.693H1.595L4.3,7.5Z" transform="translate(0.178 -0.522)" fill="#1e429f"/>
+<svg width="39" height="6" viewBox="0 0 39 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.451731 2.66267C0.315048 2.79935 0.315048 3.02096 0.451731 3.15764L2.67912 5.38503C2.8158 5.52171 3.03741 5.52171 3.17409 5.38503C3.31078 5.24835 3.31078 5.02674 3.17409 4.89006L1.19419 2.91016L3.17409 0.930257C3.31078 0.793574 3.31078 0.571966 3.17409 0.435282C3.03741 0.298599 2.8158 0.298599 2.67912 0.435282L0.451731 2.66267ZM38.3807 3.15764C38.5174 3.02096 38.5174 2.79935 38.3807 2.66267L36.1533 0.435282C36.0166 0.298599 35.795 0.298599 35.6583 0.435282C35.5216 0.571966 35.5216 0.793574 35.6583 0.930257L37.6382 2.91016L35.6583 4.89006C35.5216 5.02674 35.5216 5.24835 35.6583 5.38503C35.795 5.52171 36.0166 5.52171 36.1533 5.38503L38.3807 3.15764ZM0.699219 3.26016H38.1332V2.56016H0.699219V3.26016Z" fill="#03543F"/>
 </svg>

src/assets/direct_out.svg

@@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="29.497" height="7.636" viewBox="0 0 29.497 7.636">
-  <path id="direct_out" d="M26.589,8l-.656-.656,2.7-2.693H.91V3.713H28.635l-2.7-2.7.656-.648,3.818,3.818Z" transform="translate(-0.91 -0.364)" fill="#03543f"/>
+<svg width="39" height="6" viewBox="0 0 39 6" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.3807 3.15764C38.5174 3.02096 38.5174 2.79935 38.3807 2.66267L36.1533 0.435282C36.0166 0.298599 35.795 0.298599 35.6583 0.435282C35.5216 0.571966 35.5216 0.793574 35.6583 0.930257L37.6382 2.91016L35.6583 4.89006C35.5216 5.02674 35.5216 5.24835 35.6583 5.38503C35.795 5.52171 36.0166 5.52171 36.1533 5.38503L38.3807 3.15764ZM0.699219 3.26016H38.1332V2.56016H0.699219V3.26016Z" fill="#1E429F"/>
 </svg>

src/assets/forward_default.svg

@@ -0,0 +1,3 @@
+<svg width="39" height="7" viewBox="0 0 39 7" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.3846 3.68889C38.5213 3.55221 38.5213 3.3306 38.3846 3.19392L36.1572 0.966532C36.0205 0.829849 35.7989 0.829849 35.6622 0.966532C35.5255 1.10322 35.5255 1.32482 35.6622 1.46151L37.6421 3.44141L35.6622 5.42131C35.5255 5.55799 35.5255 5.7796 35.6622 5.91628C35.7989 6.05296 36.0205 6.05296 36.1572 5.91628L38.3846 3.68889ZM0.703125 3.79141H38.1371V3.09141H0.703125V3.79141Z" fill="#D9D9D9"/>
+</svg>

src/assets/in_bound.svg

@@ -0,0 +1,3 @@
+<svg width="39" height="7" viewBox="0 0 39 7" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.615425 3.3111C0.478741 3.44779 0.478741 3.66939 0.615425 3.80608L2.84281 6.03346C2.97949 6.17015 3.2011 6.17015 3.33778 6.03346C3.47447 5.89678 3.47447 5.67517 3.33778 5.53849L1.35789 3.55859L3.33778 1.57869C3.47447 1.44201 3.47447 1.2204 3.33778 1.08372C3.2011 0.947033 2.97949 0.947033 2.84281 1.08372L0.615425 3.3111ZM38.2969 3.20859L0.862911 3.20859L0.862911 3.90859L38.2969 3.90859L38.2969 3.20859Z" fill="#2B4DA5"/>
+</svg>

src/assets/out_bound_blue.svg

@@ -0,0 +1,3 @@
+<svg width="39" height="7" viewBox="0 0 39 7" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.3807 3.68889C38.5174 3.55221 38.5174 3.3306 38.3807 3.19392L36.1533 0.966532C36.0166 0.829849 35.795 0.829849 35.6583 0.966532C35.5216 1.10322 35.5216 1.32482 35.6583 1.46151L37.6382 3.44141L35.6583 5.42131C35.5216 5.55799 35.5216 5.7796 35.6583 5.91628C35.795 6.05296 36.0166 6.05296 36.1533 5.91628L38.3807 3.68889ZM0.699219 3.79141L38.1332 3.79141V3.09141L0.699219 3.09141V3.79141Z" fill="#2B4DA5"/>
+</svg>

src/assets/out_bound_green.svg

@@ -0,0 +1,3 @@
+<svg width="39" height="7" viewBox="0 0 39 7" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M38.3846 3.68889C38.5213 3.55221 38.5213 3.3306 38.3846 3.19392L36.1572 0.966532C36.0205 0.829849 35.7989 0.829849 35.6622 0.966532C35.5255 1.10322 35.5255 1.32482 35.6622 1.46151L37.6421 3.44141L35.6622 5.42131C35.5255 5.55799 35.5255 5.7796 35.6622 5.91628C35.7989 6.05296 36.0205 6.05296 36.1572 5.91628L38.3846 3.68889ZM0.703125 3.79141H38.1371V3.09141H0.703125V3.79141Z" fill="#03543F"/>
+</svg>

src/assets/reverse_default.svg

@@ -0,0 +1,3 @@
+<svg width="39" height="7" viewBox="0 0 39 7" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.615425 3.3111C0.478741 3.44779 0.478741 3.66939 0.615425 3.80608L2.84281 6.03346C2.97949 6.17015 3.2011 6.17015 3.33778 6.03346C3.47447 5.89678 3.47447 5.67517 3.33778 5.53849L1.35789 3.55859L3.33778 1.57869C3.47447 1.44201 3.47447 1.2204 3.33778 1.08372C3.2011 0.947033 2.97949 0.947033 2.84281 1.08372L0.615425 3.3111ZM38.2969 3.20859L0.862911 3.20859L0.862911 3.90859L38.2969 3.90859L38.2969 3.20859Z" fill="#D9D9D9"/>
+</svg>

src/assets/reverse_green.svg

@@ -0,0 +1,3 @@
+<svg width="39" height="7" viewBox="0 0 39 7" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M0.615425 3.3111C0.478741 3.44779 0.478741 3.66939 0.615425 3.80608L2.84281 6.03346C2.97949 6.17015 3.2011 6.17015 3.33778 6.03346C3.47447 5.89678 3.47447 5.67517 3.33778 5.53849L1.35789 3.55859L3.33778 1.57869C3.47447 1.44201 3.47447 1.2204 3.33778 1.08372C3.2011 0.947033 2.97949 0.947033 2.84281 1.08372L0.615425 3.3111ZM38.2969 3.20859L0.862911 3.20859L0.862911 3.90859L38.2969 3.90859L38.2969 3.20859Z" fill="#03543F"/>
+</svg>

src/components/AccessControlEdit.tsx

@@ -0,0 +1,943 @@
+import React, { useEffect, useRef, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { RootState } from "typesafe-actions";
+import { actions as policyActions } from "../store/policy";
+import {
+  Button,
+  Col,
+  Divider,
+  Form,
+  Input,
+  Card,
+  Row,
+  Select,
+  SelectProps,
+  Switch,
+  Tag,
+  Typography,
+  Breadcrumb,
+} from "antd";
+import inbound from "../assets/in_bound.svg";
+import outBoundGreen from "../assets/out_bound_green.svg";
+import outBoundblue from "../assets/out_bound_blue.svg";
+import reverseDefault from "../assets/reverse_default.svg";
+import forwardDefault from "../assets/forward_default.svg";
+import reverseGreen from "../assets/reverse_green.svg";
+import { Policy, PolicyToSave } from "../store/policy/types";
+import { uniq } from "lodash";
+import { Header } from "antd/es/layout/layout";
+import { RuleObject } from "antd/lib/form";
+import { useGetTokenSilently } from "../utils/token";
+import { Container } from "./Container";
+import { useGetGroupTagHelpers } from "../utils/groups";
+
+const { Paragraph } = Typography;
+const { Option } = Select;
+const { Text } = Typography;
+
+interface FormPolicy {
+  id?: string;
+  name: string;
+  description: string;
+  enabled: boolean;
+  query: string;
+  bidirectional: boolean;
+  protocol: string;
+  ports: string[];
+  action: string;
+  tagSourceGroups: string[];
+  tagDestinationGroups: string[];
+}
+
+const AccessControlEdit = () => {
+  const { optionRender, blueTagRender, tagGroups, grayTagRender } =
+    useGetGroupTagHelpers();
+
+  const { getTokenSilently } = useGetTokenSilently();
+  const dispatch = useDispatch();
+  const setupEditPolicyVisible = useSelector(
+    (state: RootState) => state.policy.setupEditPolicyVisible
+  );
+  const groups = useSelector((state: RootState) => state.group.data);
+  const actions: SelectProps["options"] = [
+    { label: "Accept", value: "accept" },
+    { label: "Drop", value: "drop" },
+  ];
+  const protocols: SelectProps["options"] = [
+    { label: "ALL", value: "all" },
+    { label: "TCP", value: "tcp" },
+    { label: "UDP", value: "udp" },
+    { label: "ICMP", value: "icmp" },
+  ];
+  const formPolicyCopy: any = ["ALL"];
+
+  const policy = useSelector((state: RootState) => state.policy.policy);
+  const savedPolicy = useSelector(
+    (state: RootState) => state.policy.savedPolicy
+  );
+  const [editName, setEditName] = useState(false);
+  const [editDescription, setEditDescription] = useState(false);
+  const [direction, setDirection] = useState<any>({
+    biDirectional: false,
+    reverseDirectional: false,
+  });
+  // const [tagGroups, setTagGroups] = useState([] as string[]);
+  const [formPolicy, setFormPolicy] = useState({} as FormPolicy);
+  const [form] = Form.useForm();
+  const inputNameRef = useRef<any>(null);
+  const inputDescriptionRef = useRef<any>(null);
+  useEffect(() => {
+    //Unmounting component clean
+    return () => {
+      onCancel();
+    };
+  }, []);
+
+  useEffect(() => {
+    if (editName) inputNameRef.current!.focus({ cursor: "end" });
+  }, [editName]);
+  useEffect(() => {
+    if (editDescription) inputDescriptionRef.current!.focus({ cursor: "end" });
+  }, [editDescription]);
+  // useEffect(() => {
+  //   setTagGroups(groups?.map((g) => g.name) || []);
+  // }, [groups]);
+  useEffect(() => {
+    if (!policy) return;
+    const fPolicy = {
+      id: policy.id,
+      name: policy.name,
+      description: policy.description,
+      enabled: policy.enabled,
+      query: "",
+      bidirectional: policy.rules[0].bidirectional,
+      protocol: policy.rules[0].protocol,
+      ports: policy.rules[0].ports,
+      action: policy.rules[0].action,
+      tagSourceGroups: policy.rules[0].sources
+        ? policy.rules[0].sources?.map((t) => t.id || "")
+        : [],
+      tagDestinationGroups: policy.rules[0].destinations
+        ? policy.rules[0].destinations?.map((t) => t.id || "")
+        : [],
+    } as FormPolicy;
+    setFormPolicy(fPolicy);
+    form.setFieldsValue(fPolicy);
+    if (fPolicy.bidirectional) {
+      setDirection({
+        biDirectional: true,
+        reverseDirectional: true,
+      });
+    } else {
+      setDirection({
+        biDirectional: false,
+        reverseDirectional: false,
+      });
+    }
+  }, [policy, form]);
+
+  const createPolicyToSave = (): PolicyToSave => {
+    const sources =
+      groups
+        ?.filter((g) => formPolicy.tagSourceGroups.includes(g.id || ""))
+        .map((g) => g.id || "") || [];
+
+    const destinations =
+      groups
+        ?.filter((g) => formPolicy.tagDestinationGroups.includes(g.id || ""))
+        .map((g) => g.id || "") || [];
+
+    const existingGroupsNames: any[] = groups?.map((g) => g.id);
+    const sourcesNoId = formPolicy.tagSourceGroups.filter(
+      (s) => !existingGroupsNames.includes(s)
+    );
+
+    const destinationsNoId = formPolicy.tagDestinationGroups.filter(
+      (s) => !existingGroupsNames.includes(s)
+    );
+    const groupsToSave = uniq([...sourcesNoId, ...destinationsNoId]);
+    return {
+      id: formPolicy.id,
+      name: formPolicy.name,
+      description: formPolicy.description,
+      enabled: formPolicy.enabled,
+      sourcesNoId,
+      destinationsNoId,
+      groupsToSave,
+      rules: [
+        {
+          id: formPolicy.id,
+          name: formPolicy.name,
+          description: formPolicy.description,
+          enabled: formPolicy.enabled,
+          sources:
+            direction.reverseDirectional && !direction.biDirectional
+              ? destinations
+              : sources,
+          destinations:
+            direction.reverseDirectional && !direction.biDirectional
+              ? sources
+              : destinations,
+          bidirectional: formPolicy.bidirectional,
+          protocol: formPolicy.protocol,
+          ports: formPolicy.ports,
+          action: "accept",
+        },
+      ],
+    } as PolicyToSave;
+  };
+
+  const handleFormSubmit = () => {
+    form
+      .validateFields()
+      .then((_) => {
+        const policyToSave = createPolicyToSave();
+        dispatch(
+          policyActions.savePolicy.request({
+            getAccessTokenSilently: getTokenSilently,
+            payload: policyToSave,
+          })
+        );
+      })
+      .catch((errorInfo) => {
+        console.log("errorInfo", errorInfo);
+      });
+  };
+
+  const setVisibleNewRule = (status: boolean) => {
+    dispatch(policyActions.setSetupEditPolicyVisible(status));
+  };
+
+  const onCancel = () => {
+    if (savedPolicy.loading) return;
+    setEditName(false);
+    dispatch(
+      policyActions.setPolicy({
+        name: "",
+        description: "",
+        enabled: true,
+        query: "",
+        rules: [
+          {
+            name: "",
+            description: "",
+            enabled: true,
+            sources: [],
+            destinations: [],
+            bidirectional: true,
+            protocol: "all",
+            ports: [],
+            action: "accept",
+          },
+        ],
+      } as Policy)
+    );
+    setVisibleNewRule(false);
+  };
+
+  const onChange = (data: any) => {
+    setFormPolicy({ ...formPolicy, ...data });
+  };
+
+  const handleChangeSource = (value: string[]) => {
+    setFormPolicy({
+      ...formPolicy,
+      tagSourceGroups: value,
+    });
+  };
+
+  const handleChangeDestination = (value: string[]) => {
+    setFormPolicy({
+      ...formPolicy,
+      tagDestinationGroups: value,
+    });
+  };
+
+  const handleChangeProtocol = (value: string) => {
+    if (value === "all" || value === "icmp") {
+      setDirection({
+        biDirectional: true,
+        reverseDirectional: true,
+      });
+    }
+    setFormPolicy({
+      ...formPolicy,
+      ports: value === "all" || value === "icmp" ? [] : formPolicy.ports,
+      protocol: value,
+    });
+  };
+
+  const handleChangePorts = (value: string[]) => {
+    setFormPolicy({
+      ...formPolicy,
+      ports: value,
+    });
+  };
+
+  const handleChangeDisabled = (checked: boolean) => {
+    setFormPolicy({
+      ...formPolicy,
+      enabled: checked,
+    });
+  };
+
+  const handleChangeBidirect = (checked: boolean) => {
+    setFormPolicy({
+      ...formPolicy,
+      bidirectional: checked,
+    });
+  };
+
+  const dropDownRenderGroups = (menu: React.ReactElement) => (
+    <>
+      {menu}
+      <Divider style={{ margin: "8px 0" }} />
+      <Row style={{ padding: "0 8px 4px" }}>
+        <Col flex="auto">
+          <span style={{ color: "#9CA3AF" }}>
+            Add new group by pressing "Enter"
+          </span>
+        </Col>
+        <Col flex="none">
+          <svg
+            width="14"
+            height="12"
+            viewBox="0 0 14 12"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M1.70455 7.19176V5.89915H10.3949C10.7727 5.89915 11.1174 5.80634 11.429 5.62074C11.7405 5.43513 11.9875 5.18655 12.1697 4.875C12.3554 4.56345 12.4482 4.21875 12.4482 3.84091C12.4482 3.46307 12.3554 3.12003 12.1697 2.81179C11.9841 2.50024 11.7356 2.25166 11.424 2.06605C11.1158 1.88044 10.7727 1.78764 10.3949 1.78764H9.83807V0.5H10.3949C11.0114 0.5 11.5715 0.650805 12.0753 0.952414C12.5791 1.25402 12.9818 1.65672 13.2834 2.16051C13.585 2.6643 13.7358 3.22443 13.7358 3.84091C13.7358 4.30161 13.648 4.73414 13.4723 5.13849C13.3 5.54285 13.0613 5.89915 12.7564 6.20739C12.4515 6.51562 12.0968 6.75758 11.6925 6.93324C11.2881 7.10559 10.8556 7.19176 10.3949 7.19176H1.70455ZM4.90128 11.0646L0.382102 6.54545L4.90128 2.02628L5.79119 2.91619L2.15696 6.54545L5.79119 10.1747L4.90128 11.0646Z"
+              fill="#9CA3AF"
+            />
+          </svg>
+        </Col>
+      </Row>
+    </>
+  );
+
+  const dropDownRenderPorts = (menu: React.ReactElement) => (
+    <>
+      {menu}
+      <Divider style={{ margin: "8px 0" }} />
+      <Row style={{ padding: "0 8px 4px" }}>
+        <Col flex="auto">
+          <Text type={"secondary"}>Add new ports by pressing "Enter"</Text>
+        </Col>
+        <Col flex="none">
+          <svg
+            width="14"
+            height="12"
+            viewBox="0 0 14 12"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M1.70455 7.19176V5.89915H10.3949C10.7727 5.89915 11.1174 5.80634 11.429 5.62074C11.7405 5.43513 11.9875 5.18655 12.1697 4.875C12.3554 4.56345 12.4482 4.21875 12.4482 3.84091C12.4482 3.46307 12.3554 3.12003 12.1697 2.81179C11.9841 2.50024 11.7356 2.25166 11.424 2.06605C11.1158 1.88044 10.7727 1.78764 10.3949 1.78764H9.83807V0.5H10.3949C11.0114 0.5 11.5715 0.650805 12.0753 0.952414C12.5791 1.25402 12.9818 1.65672 13.2834 2.16051C13.585 2.6643 13.7358 3.22443 13.7358 3.84091C13.7358 4.30161 13.648 4.73414 13.4723 5.13849C13.3 5.54285 13.0613 5.89915 12.7564 6.20739C12.4515 6.51562 12.0968 6.75758 11.6925 6.93324C11.2881 7.10559 10.8556 7.19176 10.3949 7.19176H1.70455ZM4.90128 11.0646L0.382102 6.54545L4.90128 2.02628L5.79119 2.91619L2.15696 6.54545L5.79119 10.1747L4.90128 11.0646Z"
+              fill="#9CA3AF"
+            />
+          </svg>
+        </Col>
+      </Row>
+    </>
+  );
+
+  const toggleEditDescription = (status: boolean) => {
+    setEditDescription(status);
+  };
+
+  const selectValidator = (_: RuleObject, value: string[]) => {
+    let hasSpaceNamed = [];
+    if (!value.length) {
+      return Promise.reject(new Error("Please enter at least one group"));
+    }
+
+    value.forEach(function (v: string) {
+      if (!v.trim().length) {
+        hasSpaceNamed.push(v);
+      }
+    });
+
+    if (hasSpaceNamed.length) {
+      return Promise.reject(
+        new Error("Group names with just spaces are not allowed")
+      );
+    }
+
+    return Promise.resolve();
+  };
+
+  const selectPortRangeValidator = (_: RuleObject, value: string[]) => {
+    if (value) {
+      var failed = false;
+      value.forEach(function (v: string) {
+        let p = Number(v);
+        if (Number.isNaN(p) || p < 1 || p > 65535 || !Number.isInteger(p)) {
+          failed = true;
+          return;
+        }
+      });
+      if (failed) {
+        return Promise.reject(
+          new Error("Port value must be in 1..65535 range")
+        );
+      }
+    }
+    return Promise.resolve();
+  };
+
+  const selectPortProtocolValidator = (_: RuleObject, value: string[]) => {
+    if (!formPolicy.bidirectional && value.length === 0) {
+      return Promise.reject(new Error("Directional traffic require ports"));
+    }
+    return Promise.resolve();
+  };
+
+  const handleDirection = (directionValue: string) => {
+    if (
+      directionValue === "forwardDirectional" &&
+      !direction.reverseDirectional
+    ) {
+      setDirection({
+        biDirectional: false,
+        reverseDirectional: false,
+      });
+    }
+
+    if (
+      directionValue === "forwardDirectional" &&
+      direction.reverseDirectional
+    ) {
+      setDirection({
+        ...direction,
+        biDirectional: !direction.biDirectional,
+      });
+    }
+
+    if (directionValue === "reverseDirectional" && direction.biDirectional) {
+      setDirection({
+        biDirectional: false,
+        reverseDirectional: !direction.reverseDirectional,
+      });
+    }
+
+    if (directionValue === "reverseDirectional" && !direction.biDirectional) {
+      setDirection({
+        biDirectional: true,
+        reverseDirectional: true,
+      });
+    }
+  };
+
+  const onBreadcrumbUsersClick = () => {
+    onCancel();
+  };
+
+  const toggleEditName = (status: boolean) => {
+    setEditName(status);
+  };
+
+  useEffect(() => {
+    if (Object.keys(formPolicy).length > 0) {
+      setFormPolicy({
+        ...formPolicy,
+        bidirectional: direction.biDirectional,
+      });
+    }
+  }, [direction]);
+
+  return (
+    <>
+      {policy && (
+        <Container style={{ paddingTop: "40px" }}>
+          <Breadcrumb
+            style={{ marginBottom: "25px" }}
+            items={[
+              {
+                title: <a onClick={onBreadcrumbUsersClick}>Access Control</a>,
+              },
+              {
+                title: policy.name,
+              },
+            ]}
+          />
+
+          <Card bordered={true} style={{ marginBottom: "7px" }}>
+            <div style={{ maxWidth: "550px" }}>
+              <Form
+                layout="vertical"
+                requiredMark={false}
+                form={form}
+                onValuesChange={onChange}
+              >
+                <Row gutter={16}>
+                  <Col span={24}>
+                    <Header
+                      style={{
+                        border: "none",
+                      }}
+                    >
+                      {!editName && (
+                        <Paragraph
+                          style={{
+                            textAlign: "start",
+                            whiteSpace: "pre-line",
+                            fontSize: "22px",
+                            margin: "0px",
+                            marginBottom: "10px",
+                            cursor: "pointer",
+                            fontWeight: "500",
+                          }}
+                          onDoubleClick={() => toggleEditName(true)}
+                        >
+                          {formPolicy.name}
+                        </Paragraph>
+                      )}
+                      <Row align="top">
+                        <Col flex="auto">
+                          {editName && (
+                            <>
+                              <Paragraph
+                                style={{
+                                  whiteSpace: "pre-line",
+                                  margin: 0,
+                                  fontWeight: "500",
+                                }}
+                              >
+                                Rule name
+                              </Paragraph>
+                              <Form.Item
+                                name="name"
+                                label=""
+                                rules={[
+                                  {
+                                    required: true,
+                                    message:
+                                      "Please add a name for this access rule",
+                                    whitespace: true,
+                                  },
+                                ]}
+                              >
+                                <Input
+                                  placeholder={'for example "UserAccessRule"'}
+                                  ref={inputNameRef}
+                                  onPressEnter={() => toggleEditName(false)}
+                                  onBlur={() => toggleEditName(false)}
+                                  autoComplete="off"
+                                />
+                              </Form.Item>
+                            </>
+                          )}
+
+                          {!editDescription ? (
+                            <div
+                              style={{
+                                margin: "0 0 39px",
+                                lineHeight: "22px",
+                                cursor: "pointer",
+                              }}
+                              onClick={() => toggleEditDescription(true)}
+                            >
+                              {formPolicy.description &&
+                              formPolicy.description.trim() !== "" ? (
+                                formPolicy.description
+                              ) : (
+                                <span style={{ textDecoration: "underline" }}>
+                                  Add description
+                                </span>
+                              )}
+                            </div>
+                          ) : (
+                            <Form.Item
+                              name="description"
+                              label="Description"
+                              style={{ marginTop: 10, fontWeight: "500" }}
+                            >
+                              <Input
+                                placeholder="Add description..."
+                                ref={inputDescriptionRef}
+                                onPressEnter={() =>
+                                  toggleEditDescription(false)
+                                }
+                                onBlur={() => toggleEditDescription(false)}
+                                autoComplete="off"
+                              />
+                            </Form.Item>
+                          )}
+                        </Col>
+                      </Row>
+                    </Header>
+                  </Col>
+                  <Col span={24} style={{ marginBottom: "15px" }}>
+                    <Form.Item name="enabled" label="">
+                      <div
+                        style={{
+                          display: "flex",
+                          gap: "15px",
+                        }}
+                      >
+                        <Switch
+                          onChange={handleChangeDisabled}
+                          defaultChecked={policy.enabled}
+                          size="small"
+                        />
+                        <div>
+                          <label
+                            style={{
+                              color: "rgba(0, 0, 0, 0.88)",
+                              fontSize: "14px",
+                              fontWeight: "500",
+                            }}
+                          >
+                            Enabled
+                          </label>
+                          <Paragraph
+                            type={"secondary"}
+                            style={{
+                              marginTop: "-2",
+                              fontWeight: "400",
+                              marginBottom: "0",
+                            }}
+                          >
+                            {formPolicy.enabled
+                              ? "Disable this rule to apply it later"
+                              : "Enable this rule to apply it immediately"}
+                          </Paragraph>
+                        </div>
+                      </div>
+                    </Form.Item>
+                  </Col>
+
+                  <Col span={24}>
+                    <Row gutter={15}>
+                      <Col span={10}>
+                        <Form.Item
+                          name="tagSourceGroups"
+                          label="Source groups"
+                          rules={[{ validator: selectValidator }]}
+                          style={{ fontWeight: "500" }}
+                        >
+                          <Select
+                            mode="tags"
+                            style={{ width: "100%", fontWeight: "500" }}
+                            placeholder="Select groups"
+                            tagRender={blueTagRender}
+                            onChange={handleChangeSource}
+                            dropdownRender={dropDownRenderGroups}
+                            optionFilterProp="serchValue"
+                          >
+                            {tagGroups.map((m, index) => (
+                              <Option
+                                key={index}
+                                value={m.id}
+                                serchValue={m.name}
+                              >
+                                {optionRender(m.name, m.id)}
+                              </Option>
+                            ))}
+                          </Select>
+                        </Form.Item>
+                      </Col>
+                      <Col
+                        span={4}
+                        style={{ padding: "0 2.5px", lineHeight: "16px" }}
+                      >
+                        <Button
+                          type={"ghost"}
+                          disabled={
+                            formPolicy.protocol === "all" ||
+                            formPolicy.protocol === "icmp"
+                          }
+                          onClick={() => handleDirection("forwardDirectional")}
+                          style={{
+                            padding: "0",
+                            width: "100%",
+                            marginTop: "30px",
+                            height: "13px",
+                          }}
+                        >
+                          <Tag
+                            style={{
+                              marginInlineEnd: "0",
+                              width: "100%",
+                              textAlign: "center",
+                              height: "13px",
+                              display: "flex",
+                              justifyContent: "center",
+                            }}
+                            color={
+                              !direction.biDirectional &&
+                              !direction.reverseDirectional
+                                ? "processing"
+                                : direction.biDirectional
+                                ? "green"
+                                : "default"
+                            }
+                          >
+                            {!direction.biDirectional &&
+                            !direction.reverseDirectional ? (
+                              <img
+                                src={outBoundblue}
+                                style={{
+                                  width: "100%",
+                                  maxWidth: "45px",
+                                }}
+                                alt="out icon"
+                              />
+                            ) : direction.biDirectional ? (
+                              <img
+                                src={outBoundGreen}
+                                alt="out icon"
+                                style={{
+                                  width: "100%",
+                                  maxWidth: "45px",
+                                }}
+                              />
+                            ) : (
+                              <img
+                                src={forwardDefault}
+                                style={{
+                                  width: "100%",
+                                  maxWidth: "45px",
+                                }}
+                                alt="out icon"
+                              />
+                            )}
+                          </Tag>
+                        </Button>
+                        <Button
+                          type="ghost"
+                          disabled={
+                            formPolicy.protocol === "all" ||
+                            formPolicy.protocol === "icmp"
+                          }
+                          onClick={() => handleDirection("reverseDirectional")}
+                          style={{
+                            padding: "0",
+                            width: "100%",
+                            textAlign: "center",
+                            height: "13px",
+                            marginTop: "0",
+                          }}
+                        >
+                          <Tag
+                            style={{
+                              marginInlineEnd: "0",
+                              width: "100%",
+                              textAlign: "center",
+                              height: "13px",
+                              display: "flex",
+                              justifyContent: "center",
+                            }}
+                            color={
+                              direction.reverseDirectional &&
+                              direction.biDirectional
+                                ? "green"
+                                : direction.reverseDirectional
+                                ? "processing"
+                                : "default"
+                            }
+                          >
+                            {direction.reverseDirectional &&
+                            direction.biDirectional ? (
+                              <img
+                                src={reverseGreen}
+                                style={{
+                                  width: "100%",
+                                  maxWidth: "45px",
+                                }}
+                                alt="out icon"
+                              />
+                            ) : direction.reverseDirectional ? (
+                              <img
+                                src={inbound}
+                                style={{
+                                  width: "100%",
+                                  maxWidth: "45px",
+                                }}
+                                alt="out icon"
+                              />
+                            ) : (
+                              <img
+                                src={reverseDefault}
+                                style={{
+                                  width: "100%",
+                                  maxWidth: "45px",
+                                }}
+                                alt="out icon"
+                              />
+                            )}
+                          </Tag>
+                        </Button>
+                      </Col>
+                      <Col span={10}>
+                        <Form.Item
+                          name="tagDestinationGroups"
+                          label="Destination groups"
+                          rules={[{ validator: selectValidator }]}
+                          style={{ fontWeight: "500" }}
+                        >
+                          <Select
+                            mode="tags"
+                            style={{ width: "100%", fontWeight: "500" }}
+                            placeholder="Select groups"
+                            tagRender={blueTagRender}
+                            onChange={handleChangeDestination}
+                            dropdownRender={dropDownRenderGroups}
+                            optionFilterProp="serchValue"
+                          >
+                            {tagGroups.map((m, index) => (
+                              <Option
+                                key={index}
+                                value={m.id}
+                                serchValue={m.name}
+                              >
+                                {optionRender(m.name, m.id)}
+                              </Option>
+                            ))}
+                          </Select>
+                        </Form.Item>
+                      </Col>
+                    </Row>
+                  </Col>
+                  <Col span={24} style={{ marginBottom: "15px" }}>
+                    <Paragraph
+                      type={"secondary"}
+                      style={{ marginTop: "-15px", marginBottom: "30px" }}
+                    >
+                      To change traffic direction and ports, select TCP or UDP
+                      protocol below
+                    </Paragraph>
+                  </Col>
+                  <Col span={24} style={{ marginBottom: "15px" }}>
+                    <Row>
+                      <Col span={10}>
+                        <Form.Item
+                          name="protocol"
+                          label="Protocol"
+                          style={{ fontWeight: "500" }}
+                          className="tag-box"
+                        >
+                          <Select
+                            style={{ width: "100%", maxWidth: "260px" }}
+                            options={protocols}
+                            onChange={handleChangeProtocol}
+                            className="menlo-font"
+                            defaultValue={"all"}
+                          />
+                        </Form.Item>
+                      </Col>
+                    </Row>
+                  </Col>
+
+                  <Col span={24}>
+                    <Row>
+                      <Col span={10}>
+                        {formPolicy.protocol === "all" ||
+                        formPolicy.protocol === "icmp" ? (
+                          <Form.Item
+                            label="Ports"
+                            style={{ fontWeight: "500" }}
+                          >
+                            <Select
+                              mode="tags"
+                              style={{
+                                width: "100%",
+                                maxWidth: "260px",
+                                fontWeight: "500",
+                              }}
+                              placeholder={
+                                <div
+                                  color={"rgba(0,0,0,0.25)"}
+                                  className="arimo-font"
+                                >
+                                  Select ports
+                                </div>
+                              }
+                              className="menlo-font"
+                              value={formPolicyCopy}
+                              disabled={true}
+                            ></Select>
+                          </Form.Item>
+                        ) : (
+                          <Form.Item
+                            name="ports"
+                            label="Ports"
+                            style={{ fontWeight: "500" }}
+                            rules={[
+                              {
+                                message:
+                                  "Directional traffic requires at least one port",
+                                validator: selectPortProtocolValidator,
+                                required: false,
+                              },
+                              {
+                                message: "Port value must be in 1..65535 range",
+                                validator: selectPortRangeValidator,
+                                required: false,
+                              },
+                            ]}
+                          >
+                            <Select
+                              mode="tags"
+                              style={{
+                                width: "100%",
+                                maxWidth: "260px",
+                                fontWeight: "500",
+                              }}
+                              placeholder={
+                                <div
+                                  color={"rgba(0,0,0,0.25)"}
+                                  className="arimo-font"
+                                >
+                                  Select ports
+                                </div>
+                              }
+                              tagRender={grayTagRender}
+                              onChange={handleChangePorts}
+                              className="menlo-font"
+                              dropdownRender={dropDownRenderPorts}
+                            >
+                              {formPolicy &&
+                                formPolicy.ports?.map((m) => (
+                                  <Option key={m}>
+                                    <Tag style={{ marginRight: 3 }}>{m}</Tag>
+                                  </Option>
+                                ))}
+                            </Select>
+                          </Form.Item>
+                        )}
+                      </Col>
+                    </Row>
+                  </Col>
+                </Row>
+              </Form>
+            </div>
+            <Container
+              style={{
+                display: "flex",
+                flexDirection: "row",
+                justifyContent: "start",
+                padding: 0,
+                gap: "10px",
+                marginTop: "12px",
+              }}
+              key={0}
+            >
+              <Button onClick={onCancel} disabled={savedPolicy.loading}>
+                Cancel
+              </Button>
+              <Button
+                type="primary"
+                disabled={savedPolicy.loading}
+                onClick={handleFormSubmit}
+              >{`${formPolicy.id ? "Save" : "Create"}`}</Button>
+            </Container>
+          </Card>
+        </Container>
+      )}
+    </>
+  );
+};
+
+export default AccessControlEdit;

src/components/AccessControlModalGroups.tsx

@@ -1,8 +1,4 @@
 import React, {useEffect, useState} from 'react';
-import {useDispatch, useSelector} from "react-redux";
-import {RootState} from "typesafe-actions";
-import { actions as ruleActions } from '../store/rule';
-import {string} from "prop-types";
 import {Avatar, List, Modal} from "antd";
 import {Group} from "../store/group/types";
 
@@ -20,7 +16,7 @@ const AccessControlModalGroups:React.FC<Props> = ({data, title, visible, onCance
 
     return (
         <>
-            <Modal title={title} visible={isModalVisible} onCancel={() => onCancel()} footer={null}>
+            <Modal title={title} open={isModalVisible} onCancel={() => onCancel()} footer={null}>
                 <List
                     itemLayout="horizontal"
                     dataSource={data as Group[] | undefined}

src/components/Banner.tsx

@@ -1,20 +1,28 @@
-import { useState } from "react";
+import {useEffect, useState} from "react";
 import {Button, Col, Row, Space, Typography} from "antd";
 import { CloseOutlined } from '@ant-design/icons';
+import {Md5} from "ts-md5";
 
 const { Text } = Typography
 
 const Banner = () => {
-	const [show, setShow] = useState(true);
+	const [show, setShow] = useState(false);
+	const banner_md5_key = 'banner_md5'
+	const banner_closed_key = 'banner_closed'
 
 	const dismiss = () => {
 		setShow(false);
+		localStorage.setItem(banner_closed_key,'true');
 	};
 
+	const announcement = "New Release! Manage DNS with NetBird."
+
+	const announcement_md5 = Md5.hashStr(announcement)
+
 	const linkLearnMore = () => {
 		return (
 			<a
-				href="https://netbird.io/blog/introducing-access-control"
+				href="https://docs.netbird.io/how-to/manage-dns-in-your-network"
 				className="font-bold underline"
 				target="_blank"
 				rel="noreferrer"
@@ -22,12 +30,24 @@ const Banner = () => {
 		)
 	}
 
+	useEffect(()=>{
+		let store_banner_md5 = localStorage.getItem(banner_md5_key);
+		let stored_banner_closed = localStorage.getItem(banner_closed_key);
+
+		if((!stored_banner_closed || stored_banner_closed !== 'true') ||
+			(!store_banner_md5 || store_banner_md5 !== announcement_md5)) {
+			//setShow(true);
+			localStorage.setItem(banner_md5_key,announcement_md5);
+			localStorage.setItem(banner_closed_key,'false');
+		}
+	},[])
+
 	return show ? (
 		<div className="relative bg-indigo-600 white" color="white" style={{position: "relative", padding: "0.3rem"}} >
 			<Row>
 				<Col xs={24} sm={0} lg={0}>
 					<Text className="ant-col-md-0" style={{color: "#ffffff"}}>
-						Big news! Introducing NetBird Access Control.
+						{announcement}
 					</Text>
 				</Col>
 				<Col xs={24} sm={0} lg={0}>
@@ -38,7 +58,7 @@ const Banner = () => {
 				<Col xs={0} sm={24}>
 					<Space align="center" style={{display: "flex", justifyContent: "center"}}>
 						<Text style={{color: "#ffffff"}}>
-							Big news! Introducing NetBird Access Control.
+							{announcement}
 						</Text>
 						<span>
 							{linkLearnMore()}

src/components/ButtonCopyMessage.tsx

@@ -1,24 +1,36 @@
 import {copyToClipboard} from "../utils/common";
-import {Button, message} from "antd";
-import {StepCommand} from "./addpeer/types";
-import React from "react";
+import {Button, message, Typography} from "antd";
+import React, {ReactNode} from "react";
+
+const {Text} = Typography;
 
 type Props = {
     keyMessage: string;
-    text: string;
+    toCopy: string;
+    body: ReactNode;
     messageText: string;
     styleNotification?: any;
     style?: any;
-    className?:any;
+    className?: any;
 };
 
-const ButtonCopyMessage:React.FC<Props> = ({ keyMessage, text, messageText, styleNotification, style, className}) => {
+const ButtonCopyMessage: React.FC<Props> = ({
+                                                keyMessage,
+                                                toCopy,
+                                                body,
+                                                messageText,
+                                                styleNotification,
+                                                style,
+                                                className
+                                            }) => {
     const copyTextMessage = () => {
-        copyToClipboard(text)
-        message.success({ content: `${messageText}`, key: keyMessage, duration: 1, style: (styleNotification || {}) });
+        copyToClipboard(toCopy)
+        message.success({content: `${messageText}`, key: keyMessage, duration: 1, style: (styleNotification || {})});
     }
     return (
-        <Button type="text" onClick={copyTextMessage} style={style || {}} className={className}>{text}</Button>
+        <Button type="text" onClick={copyTextMessage} style={style || {}} className={className}>
+            {body}
+        </Button>
     )
 }
 

src/components/FooterComponent.tsx

@@ -6,7 +6,7 @@ const { Footer } = Layout
 export default () => {
   return (
       <Footer style={{ textAlign: 'center',  bottom: "0"}}>
-          Copyright © 2022 <a href="https://netbird.io">NetBird Authors</a>
+          Copyright © 2023 <a href="https://netbird.io">NetBird Authors</a>
       </Footer>
   );
-};
+};

src/components/Loading.tsx

@@ -1,17 +1,32 @@
 import React from "react";
 import loading from "../assets/bars.svg";
 import {Space} from "antd";
+import {OidcSecure} from "@axa-fr/react-oidc";
 
-type Props = {
+type LoadingProps = {
     padding?: string;
-    width?: string;
-    height?: string;
+    width?: number;
+    height?: number;
 };
 
-const Loading:React.FC<Props> = ({padding, width, height}) => (
-    <Space direction="vertical" align="center" style={{display: 'flex', padding: `${padding || `.25em`}`}}>
-        <img src={loading} alt="Loading" style={{width: `${width || '25px'}`, height: `${height || '25px'}`}}/>
+const Loading: React.FC<LoadingProps> = ({padding, width, height}) => (
+    <Space direction="vertical" align="center" style={{
+        marginTop: `-${height ? (height / 2) + "px" : '-25px'}`,
+        marginLeft: `-${width ? (width / 2) + "px" : '-25px'}`,
+        position: "absolute",
+        top: "50%",
+        left: "50%",
+        display: 'flex'
+    }}>
+        <img src={loading} alt="Loading"
+             style={{width: `${width ? width + "px" : '25px'}`, height: `${height ? height + "px" : '25px'}`}}/>
     </Space>
 );
 
 export default Loading;
+// Wrapper of Loading to handle cases when it is shown within the authenticated layout and has to trigger authentication when token expires.
+export const SecureLoading = (props: LoadingProps) => (
+    <OidcSecure>
+        <Loading {...props} />
+    </OidcSecure>
+);

src/components/LoginError.tsx

@@ -0,0 +1,57 @@
+import {useOidc, useOidcUser} from "@axa-fr/react-oidc";
+import {Anchor, Button, Col, Result, Row, Space} from "antd";
+import React from "react";
+import {getConfig} from "../config";
+import {ResultStatusType} from "antd/lib/result";
+
+const {Link} = Anchor;
+
+function LoginError() {
+    const {logout} = useOidc();
+    const config = getConfig();
+    const {oidcUserLoadingState} = useOidcUser();
+    const queryString = window.location.search;
+    const urlParams = new URLSearchParams(queryString);
+
+    if (urlParams.get("error") === "access_denied") {
+
+        let title = urlParams.get("error_description")
+        let status: ResultStatusType = "warning"
+        // this comes from the auth0 rule that links accounts
+        if (title === "account linked successfully") {
+            status = "success"
+            title = "Your account has been linked successfully. Please log in again to complete the setup."
+        }
+
+        return <Result
+            status={status}
+            title={title}
+            extra={<>
+                <Space style={{
+                    display: "flex-inline",
+                    flexDirection: "column",
+                    justifyContent: "space-around",
+                    alignContent: "center"
+                }}>
+                    <h4>Already verified your email address?</h4>
+                    <a href={window.location.origin}>
+                        <Button type="primary">
+                            Continue
+                        </Button>
+                    </a>
+
+                <Button type="link" onClick={function () {
+                    logout("", {client_id: config.clientId})
+                }}>
+                    Trouble logging in? Try again.
+                </Button>
+                </Space>
+
+            </>
+            }
+        />
+    }
+    return <div>{"Login Error: User state: " + oidcUserLoadingState}</div>
+}
+
+export default LoginError;

src/components/NameServerGroupAdd.tsx

@@ -0,0 +1,896 @@
+import React, { useEffect, useRef, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { RootState } from "typesafe-actions";
+import { actions as nsGroupActions } from "../store/nameservers";
+import {
+  Button,
+  Col,
+  Switch,
+  Form,
+  FormListFieldData,
+  Input,
+  InputNumber,
+  message,
+  Modal,
+  Row,
+  Select,
+  Space,
+  Typography,
+} from "antd";
+import {
+  CloseOutlined,
+  MinusCircleOutlined,
+  PlusOutlined,
+} from "@ant-design/icons";
+import { Header } from "antd/es/layout/layout";
+import { RuleObject } from "antd/lib/form";
+import cidrRegex from "cidr-regex";
+import {
+  NameServer,
+  NameServerGroup,
+  NameServerGroupToSave,
+} from "../store/nameservers/types";
+import { useGetGroupTagHelpers } from "../utils/groups";
+import { useGetTokenSilently } from "../utils/token";
+import { domainValidator } from "../utils/common";
+
+const { Paragraph, Text } = Typography;
+
+interface formNSGroup extends NameServerGroup {}
+
+const NameServerGroupAdd = () => {
+  const {
+    blueTagRender,
+    handleChangeTags,
+    dropDownRender,
+    optionRender,
+    tagGroups,
+    getExistingAndToCreateGroupsLists,
+    getGroupNamesFromIDs,
+    selectValidator,
+  } = useGetGroupTagHelpers();
+  const dispatch = useDispatch();
+  const { getTokenSilently } = useGetTokenSilently();
+  const { Option } = Select;
+  const nsGroup = useSelector(
+    (state: RootState) => state.nameserverGroup.nameserverGroup
+  );
+  const setupNewNameServerGroupVisible = useSelector(
+    (state: RootState) => state.nameserverGroup.setupNewNameServerGroupVisible
+  );
+  const savedNSGroup = useSelector(
+    (state: RootState) => state.nameserverGroup.savedNameServerGroup
+  );
+  const nsGroupData = useSelector(
+    (state: RootState) => state.nameserverGroup.data
+  );
+
+  const [formNSGroup, setFormNSGroup] = useState({} as formNSGroup);
+  const [form] = Form.useForm();
+  const [editName, setEditName] = useState(false);
+  const [isPrimary, setIsPrimary] = useState(false);
+  const [editDescription, setEditDescription] = useState(false);
+  const inputNameRef = useRef<any>(null);
+  const inputDescriptionRef = useRef<any>(null);
+  const [selectCustom, setSelectCustom] = useState(false);
+
+  useEffect(() => {
+    if (editName)
+      inputNameRef.current!.focus({
+        cursor: "end",
+      });
+  }, [editName]);
+
+  useEffect(() => {
+    if (editDescription)
+      inputDescriptionRef.current!.focus({
+        cursor: "end",
+      });
+  }, [editDescription]);
+
+  useEffect(() => {
+    if (!nsGroup) return;
+
+    let newFormGroup = {
+      ...nsGroup,
+      groups: getGroupNamesFromIDs(nsGroup.groups),
+    } as formNSGroup;
+    setFormNSGroup(newFormGroup);
+    form.setFieldsValue(newFormGroup);
+    if (nsGroup.id) {
+      setSelectCustom(true);
+    }
+    if (nsGroup.primary !== undefined) {
+      setIsPrimary(nsGroup.primary);
+    }
+  }, [nsGroup]);
+
+  const onCancel = () => {
+    dispatch(nsGroupActions.setSetupNewNameServerGroupVisible(false));
+    dispatch(
+      nsGroupActions.setNameServerGroup({
+        id: "",
+        name: "",
+        description: "",
+        primary: false,
+        domains: [],
+        nameservers: [] as NameServer[],
+        groups: [],
+        enabled: false,
+      } as NameServerGroup)
+    );
+    setEditName(false);
+    setSelectCustom(false);
+    setIsPrimary(false);
+  };
+
+  const onChange = (changedValues: any) => {
+    if (changedValues.primary !== undefined) {
+      setIsPrimary(changedValues.primary);
+    }
+    setFormNSGroup({ ...formNSGroup, ...changedValues });
+  };
+
+  let googleChoice = "Google DNS";
+  let cloudflareChoice = "Cloudflare DNS";
+  let quad9Choice = "Quad9 DNS";
+  let customChoice = "Add custom nameserver";
+
+  let defaultDNSOptions: NameServerGroup[] = [
+    {
+      name: googleChoice,
+      description: "Google DNS servers",
+      domains: [],
+      primary: true,
+      nameservers: [
+        {
+          ip: "8.8.8.8",
+          ns_type: "udp",
+          port: 53,
+        },
+        {
+          ip: "8.8.4.4",
+          ns_type: "udp",
+          port: 53,
+        },
+      ],
+      groups: [],
+      enabled: true,
+    },
+    {
+      name: cloudflareChoice,
+      description: "Cloudflare DNS servers",
+      domains: [],
+      primary: true,
+      nameservers: [
+        {
+          ip: "1.1.1.1",
+          ns_type: "udp",
+          port: 53,
+        },
+        {
+          ip: "1.0.0.1",
+          ns_type: "udp",
+          port: 53,
+        },
+      ],
+      groups: [],
+      enabled: true,
+    },
+    {
+      name: quad9Choice,
+      description: "Quad9 DNS servers",
+      domains: [],
+      primary: true,
+      nameservers: [
+        {
+          ip: "9.9.9.9",
+          ns_type: "udp",
+          port: 53,
+        },
+        {
+          ip: "149.112.112.112",
+          ns_type: "udp",
+          port: 53,
+        },
+      ],
+      groups: [],
+      enabled: true,
+    },
+  ];
+
+  const handleSelectChange = (value: string) => {
+    let nsGroupLocal = {} as NameServerGroup;
+    if (value === customChoice) {
+      nsGroupLocal = nsGroup;
+    } else {
+      defaultDNSOptions.forEach((nsg) => {
+        if (value === nsg.name) {
+          nsGroupLocal = nsg;
+        }
+      });
+    }
+    let newFormGroup = {
+      ...nsGroupLocal,
+      groups: getGroupNamesFromIDs(nsGroupLocal.groups),
+    } as formNSGroup;
+    setFormNSGroup(newFormGroup);
+    form.setFieldsValue(newFormGroup);
+    setSelectCustom(true);
+  };
+
+  const handleFormSubmit = () => {
+    form
+      .validateFields()
+      .then((values) => {
+        const nsGroupToSave = createNSGroupToSave(values as NameServerGroup);
+        dispatch(
+          nsGroupActions.saveNameServerGroup.request({
+            getAccessTokenSilently: getTokenSilently,
+            payload: nsGroupToSave,
+          })
+        );
+      })
+      .then(() => onCancel())
+      .catch((errorInfo) => {
+        let msg = "please check the fields and try again";
+        if (errorInfo.errorFields) {
+          msg = errorInfo.errorFields[0].errors[0];
+        }
+        message.error({
+          content: msg,
+          duration: 1,
+        });
+      });
+  };
+
+  const createNSGroupToSave = (
+    values: NameServerGroup
+  ): NameServerGroupToSave => {
+    let [existingGroups, newGroups] = getExistingAndToCreateGroupsLists(
+      values.groups
+    );
+    return {
+      id: formNSGroup.id || null,
+      name: values.name ? values.name : formNSGroup.name,
+      description: values.description
+        ? values.description
+        : formNSGroup.description,
+      primary: values.domains.length ? false : true,
+      domains: values.primary ? [] : values.domains,
+      nameservers: values.nameservers,
+      groups: existingGroups,
+      groupsToCreate: newGroups,
+      enabled: values.enabled,
+    } as NameServerGroupToSave;
+  };
+
+  const toggleEditName = (status: boolean) => {
+    setEditName(status);
+  };
+
+  const toggleEditDescription = (status: boolean) => {
+    setEditDescription(status);
+  };
+
+  const nameValidator = (_: RuleObject, value: string) => {
+    const found = nsGroupData.find(
+      (u) => u.name == value && u.id !== formNSGroup.id
+    );
+    if (found) {
+      return Promise.reject(
+        new Error(
+          "Please enter a unique name for your nameserver configuration"
+        )
+      );
+    }
+
+    return Promise.resolve();
+  };
+
+  const ipValidator = (_: RuleObject, value: string) => {
+    if (!cidrRegex().test(value + "/32")) {
+      return Promise.reject(
+        new Error("Please enter a valid IP, e.g. 192.168.1.1 or 8.8.8.8")
+      );
+    }
+
+    return Promise.resolve();
+  };
+
+  // @ts-ignore
+  const formListValidator = (_: RuleObject, names) => {
+    if (names.length >= 3) {
+      return Promise.reject(
+        new Error("Exceeded maximum number of Nameservers. (Max is 2)")
+      );
+    }
+    if (names.length < 1) {
+      return Promise.reject(new Error("You should add at least 1 Nameserver"));
+    }
+    return Promise.resolve();
+  };
+
+  // @ts-ignore
+  const renderNSList = (
+    fields: FormListFieldData[],
+    { add, remove }: any,
+    { errors }: any
+  ) => (
+    <div style={{ width: "100%", maxWidth: "360px" }}>
+      <label
+        style={{
+          color: "rgba(0, 0, 0, 0.88)",
+          fontSize: "14px",
+          fontWeight: "500",
+          marginBottom: "10px",
+          display: "block",
+        }}
+      >
+        Nameservers
+      </label>
+
+      {!!fields.length && (
+        <Row align="middle">
+          <Col span={4} style={{ textAlign: "left" }}>
+            <Typography.Text
+              style={{ color: "#818183", paddingLeft: "5px" }}
+            ></Typography.Text>
+          </Col>
+          <Col span={10} style={{ textAlign: "left" }}>
+            <Typography.Text style={{ color: "#818183", paddingLeft: "5px" }}>
+              Nameserver IP
+            </Typography.Text>
+          </Col>
+          <Col span={4} style={{ textAlign: "left" }}>
+            <Typography.Text style={{ color: "#818183", paddingLeft: "5px" }}>
+              Port
+            </Typography.Text>
+          </Col>
+          <Col span={4} />
+        </Row>
+      )}
+      {fields.map((field, index) => {
+        return (
+          <Row key={index}>
+            <Col span={4} style={{ textAlign: "left" }}>
+              <Form.Item
+                style={{ margin: "3px" }}
+                name={[field.name, "ns_type"]}
+                rules={[{ required: true, message: "Missing first protocol" }]}
+                initialValue={"udp"}
+              >
+                <Select
+                  disabled
+                  style={{ width: "100%" }}
+                  className="style-like-text"
+                >
+                  <Option value="udp">UDP</Option>
+                </Select>
+              </Form.Item>
+            </Col>
+            <Col span={10} style={{ margin: "1px" }}>
+              <Form.Item
+                style={{ margin: "1px" }}
+                name={[field.name, "ip"]}
+                rules={[{ validator: ipValidator }]}
+              >
+                <Input
+                  placeholder="e.g. X.X.X.X"
+                  style={{ width: "100%" }}
+                  autoComplete="off"
+                />
+              </Form.Item>
+            </Col>
+            <Col span={4} style={{ textAlign: "center" }}>
+              <Form.Item
+                style={{ margin: "1px" }}
+                name={[field.name, "port"]}
+                rules={[{ required: true, message: "Missing port" }]}
+                initialValue={53}
+              >
+                <InputNumber placeholder="Port" style={{ width: "100%" }} />
+              </Form.Item>
+            </Col>
+            <Col
+              span={2}
+              style={{
+                textAlign: "center",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+              }}
+            >
+              <MinusCircleOutlined onClick={() => remove(field.name)} />
+            </Col>
+          </Row>
+        );
+      })}
+
+      <Row>
+        <Col span={20}>
+          <Form.Item>
+            <Button
+              type="dashed"
+              onClick={() => add()}
+              block
+              style={{
+                maxWidth: "270px",
+                marginTop: "5px",
+              }}
+              disabled={fields.length > 1}
+              icon={<PlusOutlined />}
+            >
+              Add nameserver
+            </Button>
+            <Form.ErrorList errors={errors} />
+          </Form.Item>
+        </Col>
+      </Row>
+    </div>
+  );
+
+  // @ts-ignore
+  const renderDomains = (
+    fields: FormListFieldData[],
+    { add, remove }: any,
+    { errors }: any
+  ) => (
+    <>
+      <Row>
+        <Space>
+          <Col>
+            <label
+              style={{
+                color: "rgba(0, 0, 0, 0.88)",
+                fontSize: "14px",
+                fontWeight: "500",
+              }}
+            >
+              Match domains
+            </label>
+            <Paragraph
+              type={"secondary"}
+              style={{
+                marginTop: "-4px",
+                fontWeight: "400",
+                marginBottom: "4px",
+              }}
+            >
+              Add domain if you want to have a specific one
+            </Paragraph>
+          </Col>
+        </Space>
+      </Row>
+      {fields.map((field, index) => {
+        return (
+          <Row key={index} style={{ marginBottom: "5px" }}>
+            <Col span={22}>
+              <Form.Item
+                style={{ margin: "0" }}
+                {...field}
+                rules={[{ validator: domainValidator }]}
+              >
+                <Input
+                  placeholder="e.g. example.com"
+                  style={{ width: "100%" }}
+                  autoComplete="off"
+                />
+              </Form.Item>
+            </Col>
+            <Col
+              span={2}
+              style={{
+                textAlign: "center",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+              }}
+            >
+              <MinusCircleOutlined
+                className="dynamic-delete-button"
+                onClick={() => remove(field.name)}
+              />
+            </Col>
+          </Row>
+        );
+      })}
+
+      <Row>
+        <Col span={24} style={{ margin: "1px" }}>
+          <Form.Item>
+            <Button
+              type="dashed"
+              onClick={() => add()}
+              block
+              icon={<PlusOutlined />}
+              style={{ marginTop: "5px" }}
+            >
+              Add Domain
+            </Button>
+          </Form.Item>
+        </Col>
+      </Row>
+      <Form.ErrorList errors={errors} />
+    </>
+  );
+
+  const handleChangeDisabled = (checked: boolean) => {
+    setFormNSGroup({
+      ...formNSGroup,
+      enabled: checked,
+    });
+  };
+
+  return (
+    <>
+      {nsGroup && (
+        <Modal
+          forceRender={true}
+          footer={false}
+          onCancel={onCancel}
+          open={setupNewNameServerGroupVisible}
+        >
+          <Row gutter={16}>
+            <Col span={24}>
+              <Paragraph
+                style={{
+                  textAlign: "start",
+                  whiteSpace: "pre-line",
+                  fontSize: "18px",
+                  fontWeight: "500",
+                }}
+              >
+                Add nameserver
+              </Paragraph>
+              <Paragraph
+                type={"secondary"}
+                style={{
+                  textAlign: "start",
+                  whiteSpace: "pre-line",
+                  marginTop: "-20px",
+                  fontSize: "14px",
+                  paddingBottom: "25px",
+                  marginBottom: "4px",
+                }}
+              >
+                Use this nameserver to resolve domains in your network
+              </Paragraph>
+            </Col>
+          </Row>
+          {selectCustom ? (
+            <Form
+              layout="vertical"
+              requiredMark={false}
+              form={form}
+              onValuesChange={onChange}
+            >
+              <Row gutter={16}>
+                <Col span={24}>
+                  <Header
+                    style={{
+                      border: "none",
+                    }}
+                  >
+                    <Row align="top">
+                      <Col flex="none" style={{ display: "flex" }}>
+                        {!editName && !editDescription && formNSGroup.id && (
+                          <button
+                            type="button"
+                            aria-label="Close"
+                            className="ant-drawer-close"
+                            style={{ paddingTop: 3 }}
+                            onClick={onCancel}
+                          >
+                            <span
+                              role="img"
+                              aria-label="close"
+                              className="anticon anticon-close"
+                            >
+                              <CloseOutlined size={16} />
+                            </span>
+                          </button>
+                        )}
+                      </Col>
+                      <Col flex="auto">
+                        {!editName && formNSGroup.id ? (
+                          <div
+                            className={
+                              "access-control input-text ant-drawer-title"
+                            }
+                            onClick={() => toggleEditName(true)}
+                          >
+                            {formNSGroup.id
+                              ? formNSGroup.name
+                              : "New nameserver group"}
+                          </div>
+                        ) : (
+                          <div style={{ lineHeight: "15px" }}>
+                            <label
+                              style={{
+                                color: "rgba(0, 0, 0, 0.88)",
+                                fontSize: "14px",
+                                fontWeight: "500",
+                              }}
+                            >
+                              Name
+                            </label>
+                            <Form.Item
+                              name="name"
+                              rules={[
+                                {
+                                  required: true,
+                                  message:
+                                    "Please add an identifier for this nameserver group",
+                                  whitespace: true,
+                                },
+                                {
+                                  validator: nameValidator,
+                                },
+                              ]}
+                              style={{
+                                marginBottom: "10px",
+                                marginTop: "10px",
+                              }}
+                            >
+                              <Input
+                                placeholder="e.g. Public DNS"
+                                ref={inputNameRef}
+                                onPressEnter={() => toggleEditName(false)}
+                                onBlur={() => toggleEditName(false)}
+                                autoComplete="off"
+                                maxLength={40}
+                              />
+                            </Form.Item>
+                          </div>
+                        )}
+                        {!editDescription ? (
+                          <div
+                            className={
+                              "access-control input-text ant-drawer-subtitle"
+                            }
+                            style={{ marginTop: "0" }}
+                            onClick={() => toggleEditDescription(true)}
+                          >
+                            {formNSGroup.description &&
+                            formNSGroup.description.trim() !== ""
+                              ? formNSGroup.description
+                              : "Add description"}
+                          </div>
+                        ) : (
+                          <div
+                            style={{ lineHeight: "15px", marginTop: "24px" }}
+                          >
+                            <label
+                              style={{
+                                color: "rgba(0, 0, 0, 0.88)",
+                                fontSize: "14px",
+                                fontWeight: "500",
+                              }}
+                            >
+                              Description
+                            </label>
+                            <Form.Item
+                              name="description"
+                              style={{ marginTop: "8px" }}
+                            >
+                              <Input
+                                placeholder="Add description..."
+                                ref={inputDescriptionRef}
+                                onPressEnter={() =>
+                                  toggleEditDescription(false)
+                                }
+                                onBlur={() => toggleEditDescription(false)}
+                                autoComplete="off"
+                              />
+                            </Form.Item>
+                          </div>
+                        )}
+                      </Col>
+                    </Row>
+                  </Header>
+                </Col>
+                <Col span={24}>
+                  <Form.List
+                    name="nameservers"
+                    rules={[{ validator: formListValidator }]}
+                  >
+                    {renderNSList}
+                  </Form.List>
+                </Col>
+                <Col span={24}>
+                  <Form.List name="domains">{renderDomains}</Form.List>
+                </Col>
+                <Col span={24}>
+                  <label
+                    style={{
+                      color: "rgba(0, 0, 0, 0.88)",
+                      fontSize: "14px",
+                      fontWeight: "500",
+                    }}
+                  >
+                    Distribution groups
+                  </label>
+                  <Paragraph
+                    type={"secondary"}
+                    style={{
+                      marginTop: "-4px",
+                      fontWeight: "400",
+                      marginBottom: "4px",
+                    }}
+                  >
+                    Advertise this route to peers that belong to the following
+                    groups
+                  </Paragraph>
+                  <Form.Item
+                    name="groups"
+                    rules={[{ validator: selectValidator }]}
+                  >
+                    <Select
+                      mode="tags"
+                      style={{ width: "100%" }}
+                      placeholder="Associate groups with the NS group"
+                      tagRender={blueTagRender}
+                      onChange={handleChangeTags}
+                      dropdownRender={dropDownRender}
+                      optionFilterProp="serchValue"
+                    >
+                      {tagGroups.map((m, index) => (
+                        <Option key={index} value={m.id} serchValue={m.name}>
+                          {optionRender(m.name, m.id)}
+                        </Option>
+                      ))}
+                    </Select>
+                  </Form.Item>
+                </Col>
+                <Col span={24}>
+                  <Form.Item name="enabled" label="">
+                    <div
+                      style={{
+                        display: "flex",
+                        gap: "15px",
+                      }}
+                    >
+                      <Switch
+                        onChange={handleChangeDisabled}
+                        defaultChecked={formNSGroup.enabled}
+                        size="small"
+                      />
+                      <div>
+                        <label
+                          style={{
+                            color: "rgba(0, 0, 0, 0.88)",
+                            fontSize: "14px",
+                            fontWeight: "500",
+                          }}
+                        >
+                          Enabled
+                        </label>
+                        <Paragraph
+                          type={"secondary"}
+                          style={{
+                            marginTop: "-2",
+                            fontWeight: "400",
+                            marginBottom: "0",
+                          }}
+                        >
+                          {formNSGroup.enabled
+                            ? "Disable this server if you don't want it to apply immediately"
+                            : " Enable this server if you want it to apply immediately"}
+                        </Paragraph>
+                      </div>
+                    </div>
+                  </Form.Item>
+                </Col>
+                <Col
+                  span={24}
+                  style={{ marginTop: "10px", marginBottom: "24px" }}
+                >
+                  <Text type={"secondary"}>
+                    Learn more about
+                    <a
+                      target="_blank"
+                      rel="noreferrer"
+                      href="https://docs.netbird.io/how-to/manage-dns-in-your-network"
+                    >
+                      {" "}
+                      DNS
+                    </a>
+                  </Text>
+                </Col>
+                <Col
+                  style={{
+                    width: "100%",
+                  }}
+                >
+                  <Space
+                    style={{
+                      display: "flex",
+                      justifyContent: "end",
+                      width: "100%",
+                    }}
+                  >
+                    <Button onClick={onCancel} disabled={savedNSGroup.loading}>
+                      Cancel
+                    </Button>
+                    <Button
+                      type="primary"
+                      onClick={handleFormSubmit}
+                      disabled={savedNSGroup.loading}
+                    >
+                      Create nameserver
+                    </Button>
+                  </Space>
+                </Col>
+              </Row>
+            </Form>
+          ) : (
+            <>
+              <Space direction={"vertical"} style={{ width: "100%" }}>
+                <Row align="middle">
+                  <Col span={24} style={{ textAlign: "left" }}>
+                    <span className="ant-form-item font-500">
+                      Select a predefined one
+                    </span>
+                  </Col>
+                </Row>
+                <Row align="middle">
+                  <Col span={24} style={{ textAlign: "center" }}>
+                    <Select
+                      style={{ width: "100%" }}
+                      onChange={handleSelectChange}
+                      options={[
+                        {
+                          value: googleChoice,
+                          label: googleChoice,
+                        },
+                        {
+                          value: cloudflareChoice,
+                          label: cloudflareChoice,
+                        },
+                        {
+                          value: quad9Choice,
+                          label: quad9Choice,
+                        },
+                        {
+                          value: customChoice,
+                          label: customChoice,
+                        },
+                      ]}
+                    />
+                  </Col>
+                </Row>
+                <Row align="middle">
+                  <Col span={24} style={{ textAlign: "left" }}>
+                    <Col span={24} style={{ textAlign: "left" }}>
+                      <span className="ant-form-item blue-color">
+                        <Typography.Link
+                          onClick={() => handleSelectChange(customChoice)}
+                        >
+                          or create custom
+                        </Typography.Link>
+                      </span>
+                    </Col>
+                  </Col>
+                </Row>
+              </Space>
+              <Space
+                style={{
+                  display: "flex",
+                  justifyContent: "end",
+                  marginTop: "25px",
+                }}
+              >
+                <Button onClick={onCancel} type="primary">
+                  Cancel
+                </Button>
+              </Space>
+            </>
+          )}
+        </Modal>
+      )}
+    </>
+  );
+};
+
+export default NameServerGroupAdd;

src/components/NameServerGroupUpdate.tsx

@@ -0,0 +1,792 @@
+import React, { useEffect, useRef, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { RootState } from "typesafe-actions";
+import { actions as nsGroupActions } from "../store/nameservers";
+import {
+  Button,
+  Col,
+  Switch,
+  Form,
+  FormListFieldData,
+  Input,
+  InputNumber,
+  message,
+  Row,
+  Select,
+  Space,
+  Typography,
+  Card,
+  Breadcrumb,
+} from "antd";
+import { MinusCircleOutlined, PlusOutlined } from "@ant-design/icons";
+import { Header } from "antd/es/layout/layout";
+import { RuleObject } from "antd/lib/form";
+import cidrRegex from "cidr-regex";
+import {
+  NameServer,
+  NameServerGroup,
+  NameServerGroupToSave,
+} from "../store/nameservers/types";
+import { useGetGroupTagHelpers } from "../utils/groups";
+import { useGetTokenSilently } from "../utils/token";
+import { Container } from "./Container";
+import { domainValidator } from "../utils/common";
+const { Paragraph, Text } = Typography;
+
+interface formNSGroup extends NameServerGroup {}
+
+const NameServerGroupUpdate = (props: any) => {
+  const { isGroupUpdateView, setShowGroupModal } = props;
+
+  const {
+    blueTagRender,
+    handleChangeTags,
+    dropDownRender,
+    optionRender,
+    tagGroups,
+    getExistingAndToCreateGroupsLists,
+    selectValidator,
+  } = useGetGroupTagHelpers();
+  const dispatch = useDispatch();
+  const { getTokenSilently } = useGetTokenSilently();
+  const { Option } = Select;
+  const nsGroup = useSelector(
+    (state: RootState) => state.nameserverGroup.nameserverGroup
+  );
+  const setupEditNameServerGroupVisible = useSelector(
+    (state: RootState) => state.nameserverGroup.setupEditNameServerGroupVisible
+  );
+  const savedNSGroup = useSelector(
+    (state: RootState) => state.nameserverGroup.savedNameServerGroup
+  );
+  const nsGroupData = useSelector(
+    (state: RootState) => state.nameserverGroup.data
+  );
+
+  const [formNSGroup, setFormNSGroup] = useState({} as formNSGroup);
+  const [form] = Form.useForm();
+  const [editName, setEditName] = useState(false);
+  const [isPrimary, setIsPrimary] = useState(false);
+  const [editDescription, setEditDescription] = useState(false);
+  const inputNameRef = useRef<any>(null);
+  const inputDescriptionRef = useRef<any>(null);
+
+  useEffect(() => {
+    if (editName)
+      inputNameRef.current!.focus({
+        cursor: "end",
+      });
+  }, [editName]);
+
+  useEffect(() => {
+    //Unmounting component clean
+    return () => {
+      onCancel();
+    };
+  }, []);
+
+  useEffect(() => {
+    if (editDescription)
+      inputDescriptionRef.current!.focus({
+        cursor: "end",
+      });
+  }, [editDescription]);
+
+  useEffect(() => {
+    if (!nsGroup) return;
+
+    let newFormGroup = {
+      ...nsGroup,
+      groups: nsGroup.groups,
+    } as formNSGroup;
+    setFormNSGroup(newFormGroup);
+    form.setFieldsValue(newFormGroup);
+
+    if (nsGroup.primary !== undefined) {
+      setIsPrimary(nsGroup.primary);
+    }
+  }, [nsGroup]);
+
+  const onCancel = () => {
+    dispatch(nsGroupActions.setSetupEditNameServerGroupVisible(false));
+    dispatch(
+      nsGroupActions.setNameServerGroup({
+        id: "",
+        name: "",
+        description: "",
+        primary: false,
+        domains: [],
+        nameservers: [] as NameServer[],
+        groups: [],
+        enabled: false,
+      } as NameServerGroup)
+    );
+    setEditName(false);
+    setIsPrimary(false);
+    if (setShowGroupModal) {
+      setShowGroupModal(false);
+    }
+  };
+
+  const onChange = (changedValues: any) => {
+    if (changedValues.primary !== undefined) {
+      setIsPrimary(changedValues.primary);
+    }
+    setFormNSGroup({ ...formNSGroup, ...changedValues });
+  };
+
+  let googleChoice = "Google DNS";
+  let cloudflareChoice = "Cloudflare DNS";
+  let quad9Choice = "Quad9 DNS";
+  let customChoice = "Add custom nameserver";
+
+  let defaultDNSOptions: NameServerGroup[] = [
+    {
+      name: googleChoice,
+      description: "Google DNS servers",
+      domains: [],
+      primary: true,
+      nameservers: [
+        {
+          ip: "8.8.8.8",
+          ns_type: "udp",
+          port: 53,
+        },
+        {
+          ip: "8.8.4.4",
+          ns_type: "udp",
+          port: 53,
+        },
+      ],
+      groups: [],
+      enabled: true,
+    },
+    {
+      name: cloudflareChoice,
+      description: "Cloudflare DNS servers",
+      domains: [],
+      primary: true,
+      nameservers: [
+        {
+          ip: "1.1.1.1",
+          ns_type: "udp",
+          port: 53,
+        },
+        {
+          ip: "1.0.0.1",
+          ns_type: "udp",
+          port: 53,
+        },
+      ],
+      groups: [],
+      enabled: true,
+    },
+    {
+      name: quad9Choice,
+      description: "Quad9 DNS servers",
+      domains: [],
+      primary: true,
+      nameservers: [
+        {
+          ip: "9.9.9.9",
+          ns_type: "udp",
+          port: 53,
+        },
+        {
+          ip: "149.112.112.112",
+          ns_type: "udp",
+          port: 53,
+        },
+      ],
+      groups: [],
+      enabled: true,
+    },
+  ];
+
+  const handleFormSubmit = () => {
+    form
+      .validateFields()
+      .then((values) => {
+        let nsGroupToSave = createNSGroupToSave(values as NameServerGroup);
+        nsGroupToSave = { ...nsGroupToSave, enabled: formNSGroup.enabled };
+        dispatch(
+          nsGroupActions.saveNameServerGroup.request({
+            getAccessTokenSilently: getTokenSilently,
+            payload: nsGroupToSave,
+          })
+        );
+      })
+      .then(() => onCancel())
+      .catch((errorInfo) => {
+        let msg = "please check the fields and try again";
+        if (errorInfo.errorFields) {
+          msg = errorInfo.errorFields[0].errors[0];
+        }
+        message.error({
+          content: msg,
+          duration: 1,
+        });
+      });
+  };
+
+  const createNSGroupToSave = (
+    values: NameServerGroup
+  ): NameServerGroupToSave => {
+    let [existingGroups, newGroups] = getExistingAndToCreateGroupsLists(
+      values.groups
+    );
+    return {
+      id: formNSGroup.id || null,
+      name: values.name ? values.name : formNSGroup.name,
+      description: values.description
+        ? values.description
+        : formNSGroup.description,
+      primary: values.domains.length ? false : true,
+      domains: values.primary ? [] : values.domains,
+      nameservers: values.nameservers,
+      groups: existingGroups,
+      groupsToCreate: newGroups,
+      enabled: values.enabled,
+    } as NameServerGroupToSave;
+  };
+
+  const toggleEditName = (status: boolean) => {
+    setEditName(status);
+  };
+
+  const toggleEditDescription = (status: boolean) => {
+    setEditDescription(status);
+  };
+
+  const nameValidator = (_: RuleObject, value: string) => {
+    const found = nsGroupData.find(
+      (u) => u.name == value && u.id !== formNSGroup.id
+    );
+    if (found) {
+      return Promise.reject(
+        new Error(
+          "Please enter a unique name for your nameserver configuration"
+        )
+      );
+    }
+
+    return Promise.resolve();
+  };
+
+  const ipValidator = (_: RuleObject, value: string) => {
+    if (!cidrRegex().test(value + "/32")) {
+      return Promise.reject(
+        new Error("Please enter a valid IP, e.g. 192.168.1.1 or 8.8.8.8")
+      );
+    }
+
+    return Promise.resolve();
+  };
+
+  // @ts-ignore
+  const formListValidator = (_: RuleObject, names) => {
+    if (names.length >= 3) {
+      return Promise.reject(
+        new Error("Exceeded maximum number of Nameservers. (Max is 2)")
+      );
+    }
+    if (names.length < 1) {
+      return Promise.reject(new Error("You should add at least 1 Nameserver"));
+    }
+    return Promise.resolve();
+  };
+
+  // @ts-ignore
+  const renderNSList = (
+    fields: FormListFieldData[],
+    { add, remove }: any,
+    { errors }: any
+  ) => (
+    <Row>
+      <Col span={24} style={{ marginBottom: "15px" }}>
+        <Form.Item name="enabled" label="">
+          <div
+            style={{
+              display: "flex",
+              gap: "15px",
+            }}
+          >
+            <Switch
+              onChange={handleChangeDisabled}
+              defaultChecked={formNSGroup.enabled}
+              size="small"
+              checked={formNSGroup.enabled}
+            />
+            <div>
+              <label
+                style={{
+                  color: "rgba(0, 0, 0, 0.88)",
+                  fontSize: "14px",
+                  fontWeight: "500",
+                }}
+              >
+                Enabled
+              </label>
+              <Paragraph
+                type={"secondary"}
+                style={{
+                  marginTop: "-2",
+                  fontWeight: "400",
+                  marginBottom: "0",
+                }}
+              >
+                {formNSGroup.enabled
+                  ? "Disable this server if you don't want the configuration to apply immediately"
+                  : " Enable this server if you want the configuration to apply immediately"}
+              </Paragraph>
+            </div>
+          </div>
+        </Form.Item>
+      </Col>
+      <Col>
+        <div style={{ width: "100%", maxWidth: "360px" }}>
+          <label
+            style={{
+              color: "rgba(0, 0, 0, 0.88)",
+              fontSize: "14px",
+              fontWeight: "500",
+              marginBottom: "10px",
+              display: "block",
+            }}
+          >
+            Nameservers
+          </label>
+
+          {!!fields.length && (
+            <Row align="middle">
+              <Col span={4} style={{ textAlign: "left" }}>
+                <Text style={{ color: "#818183", paddingLeft: "5px" }}></Text>
+              </Col>
+              <Col span={10} style={{ textAlign: "left" }}>
+                <Text style={{ color: "#818183", paddingLeft: "5px" }}>
+                  Nameserver IP
+                </Text>
+              </Col>
+              <Col span={4} style={{ textAlign: "left" }}>
+                <Text style={{ color: "#818183", paddingLeft: "5px" }}>
+                  Port
+                </Text>
+              </Col>
+              <Col span={4} />
+            </Row>
+          )}
+          {fields.map((field, index) => {
+            return (
+              <Row key={index}>
+                <Col span={4} style={{ textAlign: "left" }}>
+                  <Form.Item
+                    style={{ margin: "3px" }}
+                    name={[field.name, "ns_type"]}
+                    rules={[
+                      { required: true, message: "Missing first protocol" },
+                    ]}
+                    initialValue={"udp"}
+                  >
+                    <Select
+                      disabled
+                      style={{ width: "100%" }}
+                      className="style-like-text"
+                    >
+                      <Option value="udp">UDP</Option>
+                    </Select>
+                  </Form.Item>
+                </Col>
+                <Col span={10} style={{ margin: "1px" }}>
+                  <Form.Item
+                    style={{ margin: "1px" }}
+                    name={[field.name, "ip"]}
+                    rules={[{ validator: ipValidator }]}
+                  >
+                    <Input
+                      placeholder="e.g. X.X.X.X"
+                      style={{ width: "100%" }}
+                      autoComplete="off"
+                    />
+                  </Form.Item>
+                </Col>
+                <Col span={4} style={{ textAlign: "center" }}>
+                  <Form.Item
+                    style={{ margin: "1px" }}
+                    name={[field.name, "port"]}
+                    rules={[{ required: true, message: "Missing port" }]}
+                    initialValue={53}
+                  >
+                    <InputNumber placeholder="Port" style={{ width: "100%" }} />
+                  </Form.Item>
+                </Col>
+                <Col
+                  span={2}
+                  style={{
+                    textAlign: "center",
+                    display: "flex",
+                    alignItems: "center",
+                    justifyContent: "center",
+                  }}
+                >
+                  <MinusCircleOutlined onClick={() => remove(field.name)} />
+                </Col>
+              </Row>
+            );
+          })}
+
+          <Row>
+            <Col span={20}>
+              <Form.Item>
+                <Button
+                  type="dashed"
+                  onClick={() => add()}
+                  block
+                  style={{
+                    maxWidth: "270px",
+                    marginTop: "5px",
+                  }}
+                  disabled={fields.length > 1}
+                  icon={<PlusOutlined />}
+                >
+                  Add Nameserver
+                </Button>
+                <Form.ErrorList errors={errors} />
+              </Form.Item>
+            </Col>
+          </Row>
+        </div>
+      </Col>
+    </Row>
+  );
+
+  // @ts-ignore
+  const renderDomains = (
+    fields: FormListFieldData[],
+    { add, remove }: any,
+    { errors }: any
+  ) => (
+    <div style={{ width: "100%", maxWidth: "305px" }}>
+      <Row>
+        <Space>
+          <Col>
+            <label
+              style={{
+                color: "rgba(0, 0, 0, 0.88)",
+                fontSize: "14px",
+                fontWeight: "500",
+              }}
+            >
+              Match domains
+            </label>
+            <Paragraph
+              type={"secondary"}
+              style={{
+                fontWeight: "400",
+                marginBottom: "10px",
+              }}
+            >
+              Add domain if you want to have a specific one
+            </Paragraph>
+          </Col>
+        </Space>
+      </Row>
+      {fields.map((field, index) => {
+        return (
+          <Row key={index} style={{ marginBottom: "5px" }}>
+            <Col span={22}>
+              <Form.Item
+                style={{ margin: "0" }}
+                // hidden={isPrimary}
+                {...field}
+                rules={[{ validator: domainValidator }]}
+              >
+                <Input
+                  placeholder="e.g. example.com"
+                  style={{ width: "100%" }}
+                  autoComplete="off"
+                />
+              </Form.Item>
+            </Col>
+            <Col
+              span={2}
+              style={{
+                textAlign: "center",
+                display: "flex",
+                alignItems: "center",
+                justifyContent: "center",
+              }}
+            >
+              <MinusCircleOutlined
+                // hidden={isPrimary}
+                className="dynamic-delete-button"
+                onClick={() => remove(field.name)}
+              />
+            </Col>
+          </Row>
+        );
+      })}
+
+      <Row>
+        <Col span={24} style={{ margin: "1px" }}>
+          <Form.Item>
+            <Button
+              type="dashed"
+              onClick={() => add()}
+              block
+              icon={<PlusOutlined />}
+              style={{ marginTop: "5px", maxWidth: "280px" }}
+            >
+              Add Domain
+            </Button>
+          </Form.Item>
+        </Col>
+      </Row>
+      <Form.ErrorList errors={errors} />
+    </div>
+  );
+
+  const handleChangeDisabled = (checked: boolean) => {
+    setFormNSGroup({
+      ...formNSGroup,
+      enabled: checked,
+    });
+  };
+
+  const onBreadcrumbUsersClick = () => {
+    onCancel();
+  };
+
+  return (
+    <>
+      <Container style={{ paddingTop: `${!isGroupUpdateView ? "40px" : "0"}` }}>
+        {!isGroupUpdateView && (
+          <Breadcrumb
+            style={{ marginBottom: "25px" }}
+            items={[
+              {
+                title: <a onClick={onBreadcrumbUsersClick}>DNS</a>,
+              },
+              {
+                title: formNSGroup.name,
+              },
+            ]}
+          />
+        )}
+        <Card className={isGroupUpdateView ? "noborderPadding" : ""}>
+          <Form
+            layout="vertical"
+            requiredMark={false}
+            form={form}
+            onValuesChange={onChange}
+          >
+            <Row gutter={16}>
+              
+                <span className={isGroupUpdateView ? "d-none" : ""}>
+                  <Col span={24}>
+                    <Header
+                      style={{
+                        border: "none",
+                      }}
+                    >
+                      <Row align="top">
+                        <Col flex="auto">
+                          {!editName && formNSGroup.id ? (
+                            <div
+                              className={
+                                "access-control input-text ant-drawer-title"
+                              }
+                              onClick={() => toggleEditName(true)}
+                              style={{
+                                fontSize: "22px",
+                                margin: " 0px 0px 10px",
+                                cursor: "pointer",
+                                fontWeight: "500",
+                                lineHeight: "24px",
+                              }}
+                            >
+                              {formNSGroup.id
+                                ? formNSGroup.name
+                                : "New nameserver group"}
+                            </div>
+                          ) : (
+                            <Row>
+                              <Col span={8}>
+                                <div style={{ lineHeight: "15px" }}>
+                                  <label
+                                    style={{
+                                      color: "rgba(0, 0, 0, 0.88)",
+                                      fontSize: "14px",
+                                      fontWeight: "500",
+                                    }}
+                                  >
+                                    Name
+                                  </label>
+                                  <Form.Item
+                                    name="name"
+                                    rules={[
+                                      {
+                                        required: true,
+                                        message:
+                                          "Please add an identifier for this nameserver group",
+                                        whitespace: true,
+                                      },
+                                      {
+                                        validator: nameValidator,
+                                      },
+                                    ]}
+                                    style={{
+                                      marginBottom: "10px",
+                                      marginTop: "10px",
+                                    }}
+                                  >
+                                    <Input
+                                      placeholder="e.g. Public DNS"
+                                      ref={inputNameRef}
+                                      onPressEnter={() => toggleEditName(false)}
+                                      onBlur={() => toggleEditName(false)}
+                                      autoComplete="off"
+                                      maxLength={40}
+                                    />
+                                  </Form.Item>
+                                </div>
+                              </Col>
+                            </Row>
+                          )}
+                          {!editDescription ? (
+                            <div
+                              className={
+                                "access-control input-text ant-drawer-subtitle"
+                              }
+                              style={{ margin: "0 0 39px 0px" }}
+                              onClick={() => toggleEditDescription(true)}
+                            >
+                              {formNSGroup.description &&
+                              formNSGroup.description.trim() !== ""
+                                ? formNSGroup.description
+                                : "Add description"}
+                            </div>
+                          ) : (
+                            <Row>
+                              <Col span={8} style={{ marginBottom: "15px" }}>
+                                <div
+                                  style={{
+                                    lineHeight: "15px",
+                                    marginTop: "24px",
+                                  }}
+                                >
+                                  <label
+                                    style={{
+                                      color: "rgba(0, 0, 0, 0.88)",
+                                      fontSize: "14px",
+                                      fontWeight: "500",
+                                    }}
+                                  >
+                                    Description
+                                  </label>
+                                  <Form.Item
+                                    name="description"
+                                    style={{ marginTop: "8px" }}
+                                  >
+                                    <Input
+                                      placeholder="Add description..."
+                                      ref={inputDescriptionRef}
+                                      onPressEnter={() =>
+                                        toggleEditDescription(false)
+                                      }
+                                      onBlur={() =>
+                                        toggleEditDescription(false)
+                                      }
+                                      autoComplete="off"
+                                    />
+                                  </Form.Item>
+                                </div>
+                              </Col>
+                            </Row>
+                          )}
+                        </Col>
+                      </Row>
+                    </Header>
+                  </Col>
+
+                  <Col span={24} style={{ marginBottom: "15px" }}>
+                    <Form.List
+                      name="nameservers"
+                      rules={[{ validator: formListValidator }]}
+                    >
+                      {renderNSList}
+                    </Form.List>
+                  </Col>
+
+                  <Col span={24} style={{ marginBottom: "15px" }}>
+                    <Form.List name="domains">{renderDomains}</Form.List>
+                  </Col>
+                </span>
+               
+              <Col span={24} style={{ marginBottom: "15px" }}>
+                <label
+                  style={{
+                    color: "rgba(0, 0, 0, 0.88)",
+                    fontSize: "14px",
+                    fontWeight: "500",
+                    marginBottom: "5px",
+                    display: "block",
+                  }}
+                >
+                  Distribution groups
+                </label>
+                <Form.Item
+                  name="groups"
+                  rules={[{ validator: selectValidator }]}
+                  style={{ maxWidth: "380px" }}
+                >
+                  <Select
+                    mode="tags"
+                    style={{ width: "100%" }}
+                    placeholder="Associate groups with the NS group"
+                    tagRender={blueTagRender}
+                    onChange={handleChangeTags}
+                    dropdownRender={dropDownRender}
+                    optionFilterProp="serchValue"
+                  >
+                    {tagGroups.map((m, index) => (
+                      <Option key={index} value={m.id} serchValue={m.name}>
+                        {optionRender(m.name, m.id)}
+                      </Option>
+                    ))}
+                  </Select>
+                </Form.Item>
+              </Col>
+
+              <Col
+                style={{
+                  width: "100%",
+                }}
+              >
+                <Space
+                  style={{
+                    display: "flex",
+                    justifyContent: `${!isGroupUpdateView ? "start" : "end"}`,
+                    width: "100%",
+                  }}
+                >
+                  <Button onClick={onCancel} disabled={savedNSGroup.loading}>
+                    Cancel
+                  </Button>
+                  <Button
+                    type="primary"
+                    onClick={handleFormSubmit}
+                    disabled={savedNSGroup.loading}
+                  >
+                    Save
+                  </Button>
+                </Space>
+              </Col>
+            </Row>
+          </Form>
+        </Card>
+      </Container>
+    </>
+  );
+};
+
+export default NameServerGroupUpdate;

src/components/Navbar.tsx

@@ -1,118 +1,244 @@
-import React, {useEffect, useState} from 'react';
-import {Link} from 'react-router-dom';
+import React, { useEffect, useState } from "react";
+import { Link, useLocation } from "react-router-dom";
 import logo from "../assets/logo.png";
-import {useAuth0} from "@auth0/auth0-react";
-import {useLocation} from 'react-router-dom';
-import {Menu, Row, Col, Grid, Dropdown, Avatar, Button, Typography, Space} from 'antd'
-import {ItemType} from "antd/lib/menu/hooks/useItems";
-import {AvatarSize} from "antd/es/avatar/SizeContext";
-import { UserOutlined } from '@ant-design/icons';
+import { Avatar, Button, Col, Dropdown, Grid, Menu, Row } from "antd";
+import { ItemType } from "antd/lib/menu/hooks/useItems";
+import { AvatarSize } from "antd/es/avatar/SizeContext";
+import { UserOutlined } from "@ant-design/icons";
+import { useOidc, useOidcIdToken, useOidcUser } from "@axa-fr/react-oidc";
+import { getConfig } from "../config";
+import { User } from "../store/user/types";
+import { useDispatch, useSelector } from "react-redux";
+import { RootState } from "typesafe-actions";
+import { actions as userActions } from "../store/user";
+import { useGetTokenSilently } from "../utils/token";
+import { actions as personalAccessTokenActions } from "../store/personal-access-token";
 
-const { Text } = Typography
 const { useBreakpoint } = Grid;
 
 const Navbar = () => {
-    let location = useLocation();
-    const {
-        user,
-        isAuthenticated,
-        logout,
-    } = useAuth0();
+  let location = useLocation();
+  const config = getConfig();
+  const { logout } = useOidc();
+  const { getTokenSilently } = useGetTokenSilently();
+  const dispatch = useDispatch();
 
-    const screens = useBreakpoint();
+  const { oidcUser } = useOidcUser();
+  const { idTokenPayload } = useOidcIdToken();
+  const user = oidcUser;
+  const [currentUser, setCurrentUser] = useState({} as User);
 
-    const [hideMenuUser, setHideMenuUser] = useState(false)
+  const screens = useBreakpoint();
 
-    const userEmailKey = 'user-email'
-    const userLogoutKey = 'user-logout'
-    const userDividerKey = 'user-divider'
-    const [menuItems, setMenuItems] = useState([
-        { label: (<Link  to="/peers">Peers</Link>), key: '/peers' },
-        { label: (<Link  to="/add-peer">Add Peer</Link>), key: '/add-peer' },
-        { label: (<Link  to="/setup-keys">Setup Keys</Link>), key: '/setup-keys' },
-        { label: (<Link  to="/acls">Access Control</Link>), key: '/acls' },
-        // { label: (<Link  to="/activity">Activity</Link>), key: '/activity' },
-        { label: (<Link  to="/users">Users</Link>), key: '/users' }
-    ] as ItemType[])
+  const [hideMenuUser, setHideMenuUser] = useState(false);
+  const users = useSelector((state: RootState) => state.user.data);
+  const [isRefreshingUserState, setIsRefreshingUserState] = useState(false);
 
-    useEffect(() => {
-        const fs = menuItems.filter(m => m?.key !== userEmailKey && m?.key !== userLogoutKey && m?.key !== userDividerKey)
-        if (screens.xs === true) {
-            setHideMenuUser(false)
-            fs.push({ type: 'divider', key: userDividerKey })
-            fs.push({
-                label: (
-                    <Link to="#">{user?.name}</Link>
-                ),
-                icon: createAvatar("small"),
-                key: userEmailKey
-            })
-            fs.push({ label: (<Button type="link" block onClick={logoutWithRedirect}>Logout</Button>), key: userLogoutKey })
-            setMenuItems([...fs])
-            return
-        }
-        setMenuItems([...fs])
-        setHideMenuUser(true)
-    }, [screens])
+  const items = [
+    { label: <Link data-testid="peers-page" to="/peers">Peers</Link>, key: "/peers" },
+    { label: <Link data-testid="setup-keys-page" to="/setup-keys">Setup Keys</Link>, key: "/setup-keys" },
+    { label: <Link data-testid="access-control-page" to="/acls">Access Control</Link>, key: "/acls" },
+    { label: <Link data-testid="network-routes-page" to="/routes">Network Routes</Link>, key: "/routes" },
+    { label: <Link data-testid="dns-page"to="/dns">DNS</Link>, key: "/dns" },
+    { label: <Link data-testid="usersf-page" to="/users">Users</Link>, key: "/users" },
+    { label: <Link to="/activity">Activity</Link>, key: "/activity" },
+    { label: <Link to="/settings">Settings</Link>, key: "/settings" },
+  ] as ItemType[];
 
-    const menuUser = (
-        <Menu
-            items={[
-                {
-                    label: <>{user?.email}</>,
-                    key: '0',
-                },
-                {
-                    label: <a onClick={e => {
-                        logoutWithRedirect()
-                        e.preventDefault()}
-                    }>Logout</a>,
-                    key: '1',
-                }
-            ]}
-        />
+  const userEmailKey = "user-email";
+  const userLogoutKey = "user-logout";
+  const userDividerKey = "user-divider";
+  const adminOnlyTabs = [
+    "/setup-keys",
+    "/acls",
+    "/routes",
+    "/dns",
+    "/users",
+    "/activity",
+    "/settings",
+  ];
+  const [menuItems, setMenuItems] = useState(items);
+  const logoutWithRedirect = () => {
+    let lRemove = [
+      "peerFilter",
+      "setupKeysFilter",
+      "accessControlFilter",
+      "routesFilter",
+      "nameServerFilter",
+      "userFilter",
+      "serviceUserFilter",
+      "activityFilter",
+    ];
+    lRemove.forEach((element) => {
+      localStorage.removeItem(element);
+    });
+    logout("/", { client_id: config.clientId });
+  };
+
+  const openPersonalUserPage = () => {
+    dispatch(
+      userActions.setUser({
+        id: currentUser.id,
+        email: currentUser.email,
+        role: currentUser.role,
+        auto_groups: currentUser.auto_groups ? currentUser.auto_groups : [],
+        name: currentUser.name,
+        is_current: currentUser.is_current,
+        is_service_user: currentUser.is_service_user,
+      } as User)
     );
+    dispatch(userActions.setUserTabOpen("Users"));
+    dispatch(userActions.setEditUserPopupVisible(true));
+  };
 
-    const logoutWithRedirect = () =>
-        logout({
-            returnTo: window.location.origin,
-        });
+  useEffect(() => {
+    const fs = items.filter(
+      (m) =>
+        showTab(m?.key?.toString(), currentUser) &&
+        m?.key !== userEmailKey &&
+        m?.key !== userLogoutKey &&
+        m?.key !== userDividerKey
+    );
+    if (screens.xs === true) {
+      setHideMenuUser(false);
+      fs.push({ type: "divider", key: userDividerKey });
+      fs.push({
+        label: <Link to="#">{user?.name}</Link>,
+        icon: createAvatar("small"),
+        key: userEmailKey,
+      });
+      fs.push({
+        label: (
+          <Button type="link" block onClick={logoutWithRedirect}>
+            Logout
+          </Button>
+        ),
+        key: userLogoutKey,
+      });
+      setMenuItems([...fs]);
+      return;
+    }
+    setMenuItems([...fs]);
+    setHideMenuUser(true);
+  }, [screens, currentUser]);
 
-    const createAvatar = (size:AvatarSize) => {
-        return user?.picture ? (
-            <Avatar size={size} src={user?.picture} icon={<UserOutlined />} />
-        ) : (
-            <Avatar size={size}>{(user?.name || '').slice(0, 1).toUpperCase()}</Avatar>
-        )
+  useEffect(() => {
+    if (
+      users.length === 0 &&
+      !isRefreshingUserState &&
+      window.location.pathname !== "/peers" &&
+      window.location.pathname !== "/users"
+    ) {
+      setIsRefreshingUserState(true);
+      dispatch(
+        userActions.getUsers.request({
+          getAccessTokenSilently: getTokenSilently,
+          payload: null,
+        })
+      );
+      return;
+    }
+    if (users.length === 0 && isRefreshingUserState) {
+      return;
+    }
+    let runUser = oidcUser;
+    if (!oidcUser) {
+      runUser = idTokenPayload;
+    }
+    setIsRefreshingUserState(false);
+    if (runUser) {
+      const found = users.find((u) =>
+        u.is_current ? u.is_current : runUser.sub ? u.id == runUser.sub : false
+      );
+      if (found) {
+        setCurrentUser(found);
+      }
+    }
+  }, [users, oidcUser]);
+
+  const showTab = (key: string | undefined, user: User | undefined) => {
+    if (!user) {
+      return false;
     }
 
-    return (
-        <>
-            <Row justify="space-evenly" align="middle">
-                <Col flex="0 1 60px">
-                    <Link id="logo" to="/">
-                        <img
-                            alt="logo"
-                            style={{width: "55px"}}
-                            src={logo}
-                        />
-                    </Link>
-                </Col>
-                <Col flex="1 1 auto">
-                    <div>
-                        <Menu mode="horizontal" selectable={true} selectedKeys={[location.pathname]} defaultSelectedKeys={[location.pathname]} items={menuItems}/>
-                    </div>
-                </Col>
-                {hideMenuUser &&
-                    <Col>
-                        <Dropdown overlay={menuUser} placement="bottomRight" trigger={['click']}>
-                            {createAvatar("large")}
-                        </Dropdown>
-                    </Col>
-                }
-            </Row>
-        </>
+    if (user.role?.toLowerCase() === "admin") {
+      return true;
+    }
+    return !adminOnlyTabs.find((t) => t === key);
+  };
+
+  const menuUser = (
+    <Menu
+      items={[
+        {
+          label: (
+            <Link to="/users" onClick={openPersonalUserPage}>
+              {user?.email}
+            </Link>
+          ),
+          key: "0",
+        },
+        {
+          label: (
+            <Link to="/logout" onClick={logoutWithRedirect}>
+              Logout
+            </Link>
+          ),
+          key: "1",
+        },
+      ]}
+    />
+  );
+
+  const createAvatar = (size: AvatarSize) => {
+    return user?.picture ? (
+      <Avatar size={size} src={user?.picture} icon={<UserOutlined />} />
+    ) : (
+      <Avatar size={size}>
+        {(user?.name || "").slice(0, 1).toUpperCase()}
+      </Avatar>
     );
+  };
+
+  return (
+    <>
+      <Row justify="space-evenly" align="middle">
+        <Col flex="0 1 60px">
+          <Link id="logo" to="/">
+            <img alt="logo" style={{ width: "55px" }} src={logo} />
+          </Link>
+        </Col>
+        <Col flex="1 1 auto">
+          <div>
+            <Menu
+              mode="horizontal"
+              selectable={true}
+              selectedKeys={[location.pathname]}
+              onSelect={(e) => {
+                dispatch(userActions.setUser(null as unknown as User));
+                dispatch(
+                  personalAccessTokenActions.resetPersonalAccessTokens(null)
+                );
+              }}
+              defaultSelectedKeys={[location.pathname]}
+              items={menuItems}
+            />
+          </div>
+        </Col>
+        {hideMenuUser && (
+          <Col>
+            <Dropdown
+              overlay={menuUser}
+              placement="bottomRight"
+              trigger={["click"]}
+            >
+              {createAvatar("large")}
+            </Dropdown>
+          </Col>
+        )}
+      </Row>
+    </>
+  );
 };
 
 export default Navbar;

src/components/RouteAddNew.tsx

@@ -0,0 +1,999 @@
+import React, { useEffect, useRef, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { RootState } from "typesafe-actions";
+import { actions as routeActions } from "../store/route";
+import {
+  Button,
+  Col,
+  Collapse,
+  Form,
+  Input,
+  message,
+  InputNumber,
+  Row,
+  Select,
+  SelectProps,
+  Space,
+  Switch,
+  Modal,
+  Typography,
+  Tabs,
+} from "antd";
+import type { TabsProps } from "antd";
+import CreatableSelect from "react-select/creatable";
+import { Route, RouteToSave } from "../store/route/types";
+import { Header } from "antd/es/layout/layout";
+import { RuleObject } from "antd/lib/form";
+import cidrRegex from "cidr-regex";
+import {
+  initPeerMaps,
+  peerToPeerIP,
+  routePeerSeparator,
+  transformGroupedDataTable,
+} from "../utils/routes";
+import { useGetTokenSilently } from "../utils/token";
+import { useGetGroupTagHelpers } from "../utils/groups";
+
+const { Paragraph, Text } = Typography;
+const { Panel } = Collapse;
+
+interface FormRoute extends Route {}
+
+const RouteAddNew = (selectedPeer: any) => {
+  const [activeTab, setActiveTab] = useState<string | null>(null);
+  const {
+    blueTagRender,
+    handleChangeTags,
+    dropDownRender,
+    optionRender,
+    tagGroups,
+    getExistingAndToCreateGroupsLists,
+    getGroupNamesFromIDs,
+    selectValidator,
+  } = useGetGroupTagHelpers();
+
+  const { Option } = Select;
+  const { getTokenSilently } = useGetTokenSilently();
+  const dispatch = useDispatch();
+  const setupNewRouteVisible = useSelector(
+    (state: RootState) => state.route.setupNewRouteVisible
+  );
+  const setupNewRouteHA = useSelector(
+    (state: RootState) => state.route.setupNewRouteHA
+  );
+  const peers = useSelector((state: RootState) => state.peer.data);
+  const route = useSelector((state: RootState) => state.route.route);
+  const routes = useSelector((state: RootState) => state.route.data);
+  const savedRoute = useSelector((state: RootState) => state.route.savedRoute);
+  const [previousRouteKey, setPreviousRouteKey] = useState("");
+  const [editName, setEditName] = useState(false);
+  const [editDescription, setEditDescription] = useState(false);
+  const options: SelectProps["options"] = [];
+  const testOptions: SelectProps["options"] = [];
+  const [formRoute, setFormRoute] = useState({} as FormRoute);
+  const [form] = Form.useForm();
+  const inputNameRef = useRef<any>(null);
+  const inputDescriptionRef = useRef<any>(null);
+  const [enableNetwork, setEnableNetwork] = useState(false);
+  const [peerNameToIP, peerIPToName, peerIPToID] = initPeerMaps(peers);
+  const [newRoute, setNewRoute] = useState(false);
+
+  useEffect(() => {
+    if (setupNewRouteVisible) setActiveTab("routingPeer");
+  }, [setupNewRouteVisible]);
+
+  useEffect(() => {
+    if (editName)
+      inputNameRef.current!.focus({
+        cursor: "end",
+      });
+  }, [editName]);
+
+  useEffect(() => {
+    if (editDescription)
+      inputDescriptionRef.current!.focus({
+        cursor: "end",
+      });
+  }, [editDescription]);
+
+  useEffect(() => {
+    if (!route) return;
+
+    if (selectedPeer && selectedPeer.selectedPeer) {
+      options?.push({
+        label: peerToPeerIP(
+          selectedPeer.selectedPeer.name,
+          selectedPeer.selectedPeer.ip
+        ),
+        value: peerToPeerIP(
+          selectedPeer.selectedPeer.name,
+          selectedPeer.selectedPeer.ip
+        ),
+        disabled: false,
+      });
+      const udpateRoute = { ...route, peer: options[0].value } as FormRoute;
+      setFormRoute(udpateRoute);
+      form.setFieldsValue(udpateRoute);
+      setPreviousRouteKey(udpateRoute.network_id + udpateRoute.network);
+    } else {
+      const fRoute = {
+        ...route,
+        groups: getGroupNamesFromIDs(route.groups),
+      } as FormRoute;
+      setFormRoute(fRoute);
+      setPreviousRouteKey(fRoute.network_id + fRoute.network);
+      form.setFieldsValue(fRoute);
+    }
+
+    if (!route.network_id) {
+      setNewRoute(true);
+    } else {
+      setNewRoute(false);
+    }
+  }, [route]);
+
+  selectedPeer &&
+    selectedPeer.notPeerRoutes &&
+    selectedPeer.notPeerRoutes.forEach((element: any, index: number) => {
+      testOptions?.push({
+        label: element.network_id + " - " + element.network,
+        value: element.network_id + "+" + index,
+        network: element.network,
+        disabled: false,
+        key: index,
+      });
+    });
+  if (!selectedPeer.selectedPeer) {
+    peers.forEach((p) => {
+      let os: string;
+      os = p.os;
+      if (
+        !os.toLowerCase().startsWith("darwin") &&
+        !os.toLowerCase().startsWith("windows") &&
+        !os.toLowerCase().startsWith("android") &&
+        route &&
+        !routes
+          .filter((r) => r.network_id === route.network_id)
+          .find((r) => r.peer === p.id)
+      ) {
+        options?.push({
+          label: peerToPeerIP(p.name, p.ip),
+          value: peerToPeerIP(p.name, p.ip),
+          disabled: false,
+        });
+      }
+    });
+  }
+
+  const createRouteToSave = (inputRoute: FormRoute): RouteToSave => {
+    if (inputRoute.peer_groups) {
+      inputRoute = {
+        ...inputRoute,
+        peer_groups: [inputRoute.peer_groups[inputRoute.peer_groups.length - 1]],
+      };
+    }
+    let peerIDList = inputRoute.peer.split(routePeerSeparator);
+    let peerID: string;
+    if (peerIDList.length === 1) {
+      peerID = inputRoute.peer;
+    } else {
+      if (peerIDList[1]) {
+        peerID = peerIPToID[peerIDList[1]];
+      } else {
+        peerID = peerIPToID[peerNameToIP[inputRoute.peer]];
+      }
+    }
+
+    let [existingGroups, groupsToCreate] = getExistingAndToCreateGroupsLists(
+      inputRoute.groups
+    );
+
+    const payload = {
+      id: inputRoute.id,
+      network: inputRoute.network,
+      network_id: inputRoute.network_id,
+      description: inputRoute.description,
+      enabled: inputRoute.enabled,
+      masquerade: inputRoute.masquerade,
+      metric: inputRoute.metric,
+      groups: existingGroups,
+      groupsToCreate: groupsToCreate,
+    } as RouteToSave;
+ 
+    if (activeTab === "routingPeer") {
+      let pay = { ...payload, peer: peerID };
+      return pay;
+    }
+
+    if (activeTab === "groupOfPeers") {
+      if (inputRoute.peer_groups) {
+        let [currentPeersGroup, peerGroupsToCreate] =
+          getExistingAndToCreateGroupsLists(inputRoute.peer_groups);
+
+        let pay = {
+          ...payload,
+          peer_groups: currentPeersGroup,
+          peerGroupsToCreate: peerGroupsToCreate,
+        };
+        return pay;
+      }
+    }
+
+    return payload;
+  };
+
+  const handleFormSubmit = () => {
+    form
+      .validateFields()
+      .then(() => {
+        const t = routes.filter((route) => {
+          if (
+            route.network_id === formRoute.network_id &&
+            route.network === formRoute.network
+          ) {
+            return route;
+          }
+        });
+
+        if (
+          formRoute.peer_groups &&
+          formRoute.peer_groups.length > 0 &&
+          t &&
+          t.length > 0
+        ) {
+          const style = { marginTop: 85 };
+          const duplicateNetworkIdKey = "duplicateKey";
+          return message.error({
+            content:
+              "A route with this network identifier and network range already exists. Please use a different network identifier or network range.",
+            key: duplicateNetworkIdKey,
+            duration: 5,
+            style,
+          });
+        }
+
+        if (!setupNewRouteHA || formRoute.peer != "") {
+          const routeToSave = createRouteToSave(formRoute);
+          dispatch(
+            routeActions.saveRoute.request({
+              getAccessTokenSilently: getTokenSilently,
+              payload: routeToSave,
+            })
+          );
+        } else {
+          let groupedDataTable = transformGroupedDataTable(routes, peers);
+          groupedDataTable.forEach((group) => {
+            if (group.key == previousRouteKey) {
+              group.groupedRoutes.forEach((route) => {
+                let updateRoute: FormRoute = {
+                  ...formRoute,
+                  id: route.id,
+                  peer: route.peer,
+                  metric: route.metric,
+                  enabled:
+                    formRoute.enabled != group.enabled
+                      ? formRoute.enabled
+                      : route.enabled,
+                };
+                const routeToSave = createRouteToSave(updateRoute);
+                dispatch(
+                  routeActions.saveRoute.request({
+                    getAccessTokenSilently: getTokenSilently,
+                    payload: routeToSave,
+                  })
+                );
+              });
+            }
+          });
+        }
+      })
+      .catch((errorInfo) => {
+        console.log("errorInfo", errorInfo);
+      });
+  };
+
+  const setVisibleNewRoute = (status: boolean) => {
+    dispatch(routeActions.setSetupNewRouteVisible(status));
+  };
+
+  const setSetupNewRouteHA = (status: boolean) => {
+    dispatch(routeActions.setSetupNewRouteHA(status));
+  };
+
+  const onCancel = () => {
+    if (savedRoute.loading) return;
+    setActiveTab(null);
+    setEditName(false);
+    dispatch(
+      routeActions.setRoute({
+        network: "",
+        network_id: "",
+        description: "",
+        peer: "",
+        metric: 9999,
+        masquerade: false,
+        enabled: true,
+        groups: [],
+        peer_groups: [],
+      } as Route)
+    );
+    setVisibleNewRoute(false);
+    setSetupNewRouteHA(false);
+    setPreviousRouteKey("");
+    setNewRoute(false);
+  };
+
+  const onChange = (data: any) => {
+    setFormRoute({ ...formRoute, ...data });
+  };
+
+  const peerDropDownRender = (menu: React.ReactElement) => <>{menu}</>;
+
+  const toggleEditName = (status: boolean) => {
+    setEditName(status);
+  };
+
+  const toggleEditDescription = (status: boolean) => {
+    setEditDescription(status);
+  };
+
+  const networkRangeValidator = (_: RuleObject, value: string) => {
+    if (!cidrRegex().test(value)) {
+      return Promise.reject(
+        new Error("Please enter a valid CIDR, e.g. 192.168.1.0/24")
+      );
+    }
+
+    if (Number(value.split("/")[1]) < 7) {
+      return Promise.reject(
+        new Error("Please enter a network mask larger than /7")
+      );
+    }
+
+    return Promise.resolve();
+  };
+
+  const peerValidator = (_: RuleObject, value: string) => {
+    if (value == "" && newRoute) {
+      return Promise.reject(new Error("Please select routing one peer"));
+    }
+
+    return Promise.resolve();
+  };
+
+  const peerGroupsValidaton = (_: RuleObject, value: string) => {
+     if (value.length < 1) {
+      return Promise.reject(new Error("Please select a peer group"));
+    }
+    return Promise.resolve();
+  };
+ 
+  const selectPreValidator = (obj: RuleObject, value: string[]) => {
+    if (setupNewRouteHA && formRoute.peer === "") {
+      let [, newGroups] = getExistingAndToCreateGroupsLists(value);
+      if (newGroups.length > 0) {
+        return Promise.reject(
+          new Error(
+            "You can't add new Groups from the group update view, please remove:\"" +
+              newGroups +
+              '"'
+          )
+        );
+      }
+    }
+    return selectValidator(obj, value);
+  };
+
+  const handleMasqueradeChange = (checked: boolean) => {
+    setFormRoute({
+      ...formRoute,
+      masquerade: checked,
+    });
+  };
+
+  const handleEnableChange = (checked: boolean) => {
+    setFormRoute({
+      ...formRoute,
+      enabled: checked,
+    });
+  };
+
+  const onNetworkChange = (selectedOption: any) => {
+    if (selectedOption === null) {
+      const updateNetwork = {
+        ...formRoute,
+        network: "",
+        network_id: "",
+      };
+      form.setFieldsValue(updateNetwork);
+      setFormRoute(updateNetwork);
+      setEnableNetwork(false);
+    } else if (!!selectedOption.__isNew__) {
+      const updateNetwork = {
+        ...formRoute,
+        network: "",
+        network_id: selectedOption.value.split("+")[0],
+      };
+      form.setFieldsValue(updateNetwork);
+      setFormRoute(updateNetwork);
+      setEnableNetwork(false);
+    } else {
+      const updateNetwork = {
+        ...formRoute,
+        network: selectedOption.network,
+        network_id: selectedOption.value.split("+")[0],
+      };
+      form.setFieldsValue(updateNetwork);
+      setFormRoute(updateNetwork);
+      setEnableNetwork(true);
+    }
+  };
+
+  const onTabChange = (key: string) => {
+    setActiveTab(key);
+  };
+
+  const handleSingleChangeTags = (values: any) => {
+     const lastValue = values[values.length - 1];
+     if (values.length > 0) {
+      form.setFieldsValue({
+        peer_groups: [lastValue],
+      });
+    }
+  };
+
+  const items: TabsProps["items"] = [
+    {
+      key: "routingPeer",
+      label: "Routing Peer",
+      children: (
+        <>
+          <Paragraph
+            type={"secondary"}
+            style={{
+              marginTop: "-2",
+              fontWeight: "400",
+              marginBottom: "5px",
+            }}
+          >
+            Assign a peer as a routing peer for the Network CIDR
+          </Paragraph>
+          {activeTab === "routingPeer" && (
+            <Form.Item name="peer" rules={[{ validator: peerValidator }]}>
+              <Select
+                showSearch
+                style={{ width: "100%" }}
+                placeholder="Select Peer"
+                dropdownRender={peerDropDownRender}
+                options={options}
+                allowClear={true}
+                disabled={!!selectedPeer.selectedPeer}
+              />
+            </Form.Item>
+          )}{" "}
+        </>
+      ),
+    },
+    {
+      key: "groupOfPeers",
+      label: "Peer group",
+      children: (
+        <>
+          <Paragraph
+            type={"secondary"}
+            style={{
+              marginTop: "-2",
+              fontWeight: "400",
+              marginBottom: "5px",
+            }}
+          >
+            Assign peer group with Linux machines to be used as routing peers
+          </Paragraph>
+          {activeTab === "groupOfPeers" && (
+            <Form.Item
+              name="peer_groups"
+              rules={[{ validator: peerGroupsValidaton }]}
+            >
+              <Select
+                mode="tags"
+                style={{ width: "100%" }}
+                tagRender={blueTagRender}
+                onChange={handleSingleChangeTags}
+                dropdownRender={dropDownRender}
+                optionFilterProp="serchValue"
+              >
+                {tagGroups.map((m, index) => (
+                  <Option key={index} value={m.id} serchValue={m.name}>
+                    {optionRender(m.name, m.id)}
+                  </Option>
+                ))}
+              </Select>
+            </Form.Item>
+          )}
+        </>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      {route && setupNewRouteVisible && (
+        <Modal
+          open={setupNewRouteVisible}
+          onCancel={onCancel}
+          footer={
+            <Space style={{ display: "flex", justifyContent: "end" }}>
+              <Button onClick={onCancel} disabled={savedRoute.loading}>
+                Cancel
+              </Button>
+              <Button
+                type="primary"
+                disabled={savedRoute.loading}
+                onClick={handleFormSubmit}
+              >
+                Add route
+              </Button>
+            </Space>
+          }
+        >
+          <Form
+            layout="vertical"
+            form={form}
+            requiredMark={false}
+            onValuesChange={onChange}
+            className="route-form"
+          >
+            <Row gutter={16}>
+              <Col span={24}>
+                <Header
+                  style={{
+                    border: "none",
+                  }}
+                >
+                  <Paragraph
+                    style={{
+                      textAlign: "start",
+                      whiteSpace: "pre-line",
+                      fontSize: "18px",
+                      margin: "0px",
+                      fontWeight: 500,
+                      marginBottom: "25px",
+                    }}
+                  >
+                    Add route
+                  </Paragraph>
+
+                  {!!selectedPeer.selectedPeer && (
+                    <div style={{ lineHeight: "20px" }}>
+                      <label
+                        style={{
+                          color: "rgba(0, 0, 0, 0.88)",
+                          fontSize: "14px",
+                          fontWeight: "500",
+                        }}
+                      >
+                        Routing Peer
+                      </label>
+                      <Paragraph
+                        type={"secondary"}
+                        style={{
+                          marginTop: "-2",
+                          fontWeight: "400",
+                          marginBottom: "5px",
+                        }}
+                      >
+                        Assign a peer as a routing peer for the Network CIDR
+                      </Paragraph>
+                      <Form.Item
+                        name="peer"
+                        rules={[{ validator: peerValidator }]}
+                      >
+                        <Select
+                          showSearch
+                          style={{ width: "100%" }}
+                          placeholder="Select Peer"
+                          dropdownRender={peerDropDownRender}
+                          options={options}
+                          allowClear={true}
+                          disabled={!!selectedPeer.selectedPeer}
+                        />
+                      </Form.Item>
+                    </div>
+                  )}
+
+                  <Row align="top">
+                    <Col span={24} style={{ lineHeight: "20px" }}>
+                      {!editName && formRoute.id ? (
+                        <div
+                          className={
+                            "access-control input-text ant-drawer-title"
+                          }
+                          onClick={() => toggleEditName(true)}
+                        >
+                          {formRoute.id ? formRoute.network_id : "New Route"}
+                        </div>
+                      ) : (
+                        <div style={{ marginBottom: "15px" }}>
+                          {!!selectedPeer.selectedPeer && (
+                            <>
+                              <label
+                                style={{
+                                  color: "rgba(0, 0, 0, 0.88)",
+                                  fontSize: "14px",
+                                  fontWeight: "500",
+                                }}
+                              >
+                                Network Identifier
+                              </label>
+                              <Paragraph
+                                type={"secondary"}
+                                style={{
+                                  marginTop: "-2",
+                                  fontWeight: "400",
+                                  marginBottom: "5px",
+                                }}
+                              >
+                                Add a unique cryptographic key that is assigned
+                                to each device
+                              </Paragraph>
+                              <CreatableSelect
+                                isClearable
+                                className="ant-select-selector-custom"
+                                options={testOptions}
+                                onChange={onNetworkChange}
+                                placeholder="Select an existing network or add a new one"
+                                classNamePrefix="react-select"
+                              />
+                            </>
+                          )}
+                          {!!!selectedPeer.selectedPeer && (
+                            <>
+                              <label
+                                style={{
+                                  color: "rgba(0, 0, 0, 0.88)",
+                                  fontSize: "14px",
+                                  fontWeight: "500",
+                                }}
+                              >
+                                Network Identifier
+                              </label>
+                              <Paragraph
+                                type={"secondary"}
+                                style={{
+                                  marginTop: "-2",
+                                  fontWeight: "400",
+                                  marginBottom: "5px",
+                                }}
+                              >
+                                Add a unique network identifier that is assigned
+                                to each device
+                              </Paragraph>
+                              <Form.Item
+                                name="network_id"
+                                label=""
+                                style={{ marginBottom: "10px" }}
+                                rules={[
+                                  {
+                                    required: true,
+                                    message:
+                                      "Please add an identifier for this access route",
+                                    whitespace: true,
+                                  },
+                                ]}
+                              >
+                                <Input
+                                  placeholder="for example “e.g. aws-eu-central-1-vpc”"
+                                  ref={inputNameRef}
+                                  disabled={!setupNewRouteHA && !newRoute}
+                                  onPressEnter={() => toggleEditName(false)}
+                                  onBlur={() => toggleEditName(false)}
+                                  autoComplete="off"
+                                  maxLength={40}
+                                />
+                              </Form.Item>
+                            </>
+                          )}
+                        </div>
+                      )}
+                      {!editDescription ? (
+                        <div
+                          onClick={() => toggleEditDescription(true)}
+                          style={{
+                            margin: "0 0 15px",
+                            lineHeight: "22px",
+                            cursor: "pointer",
+                          }}
+                        >
+                          {formRoute.description &&
+                          formRoute.description.trim() !== "" ? (
+                            formRoute.description
+                          ) : (
+                            <span style={{ textDecoration: "underline" }}>
+                              Add description
+                            </span>
+                          )}
+                        </div>
+                      ) : (
+                        <Form.Item
+                          name="description"
+                          label="Description"
+                          style={{ marginTop: 24, fontWeight: 500 }}
+                        >
+                          <Input
+                            placeholder="Add description..."
+                            ref={inputDescriptionRef}
+                            disabled={!setupNewRouteHA && !newRoute}
+                            onPressEnter={() => toggleEditDescription(false)}
+                            onBlur={() => toggleEditDescription(false)}
+                            autoComplete="off"
+                            maxLength={200}
+                          />
+                        </Form.Item>
+                      )}
+                    </Col>
+                  </Row>
+                  <Row align="top">
+                    <Col flex="auto"></Col>
+                  </Row>
+                </Header>
+              </Col>
+              <Col span={24}>
+                <label
+                  style={{
+                    color: "rgba(0, 0, 0, 0.88)",
+                    fontSize: "14px",
+                    fontWeight: "500",
+                  }}
+                >
+                  Network Range
+                </label>
+                <Paragraph
+                  type={"secondary"}
+                  style={{
+                    marginTop: "-2",
+                    fontWeight: "400",
+                    marginBottom: "5px",
+                  }}
+                >
+                  Add a private IP address range
+                </Paragraph>
+                <Form.Item
+                  name="network"
+                  label=""
+                  rules={[{ validator: networkRangeValidator }]}
+                >
+                  <Input
+                    placeholder="for example “172.16.0.0/16”"
+                    disabled={(!setupNewRouteHA && !newRoute) || enableNetwork}
+                    autoComplete="off"
+                    minLength={9}
+                    maxLength={43}
+                  />
+                </Form.Item>
+              </Col>
+
+              {!!!selectedPeer.selectedPeer && (
+                <Col span={24}>
+                  {activeTab ? (
+                    <Tabs
+                      defaultActiveKey={activeTab}
+                      items={items}
+                      onChange={onTabChange}
+                    />
+                  ) : (
+                    ""
+                  )}
+                </Col>
+              )}
+              <Col span={24}>
+                <label
+                  style={{
+                    color: "rgba(0, 0, 0, 0.88)",
+                    fontSize: "14px",
+                    fontWeight: "500",
+                  }}
+                >
+                  Distribution groups
+                </label>
+                <Paragraph
+                  type={"secondary"}
+                  style={{
+                    marginTop: "-2",
+                    fontWeight: "400",
+                    marginBottom: "5px",
+                  }}
+                >
+                  Advertise this route to peers that belong to the following
+                  groups
+                </Paragraph>
+                <Form.Item
+                  name="groups"
+                  label=""
+                  rules={[{ validator: selectPreValidator }]}
+                >
+                  <Select
+                    mode="tags"
+                    style={{ width: "100%" }}
+                    placeholder="Associate groups with the network route"
+                    tagRender={blueTagRender}
+                    onChange={handleChangeTags}
+                    dropdownRender={dropDownRender}
+                    optionFilterProp="serchValue"
+                  >
+                    {tagGroups.map((m, index) => (
+                      <Option key={index} value={m.id} serchValue={m.name}>
+                        {optionRender(m.name, m.id)}
+                      </Option>
+                    ))}
+                  </Select>
+                </Form.Item>
+              </Col>
+
+              <Col span={24}>
+                <Form.Item name="enabled" label="">
+                  <div
+                    style={{
+                      display: "flex",
+                      gap: "15px",
+                    }}
+                  >
+                    <Switch
+                      size={"small"}
+                      checked={formRoute.enabled}
+                      onChange={handleEnableChange}
+                    />
+                    <div>
+                      <label
+                        style={{
+                          color: "rgba(0, 0, 0, 0.88)",
+                          fontSize: "14px",
+                          fontWeight: "500",
+                        }}
+                      >
+                        Enabled
+                      </label>
+                      <Paragraph
+                        type={"secondary"}
+                        style={{
+                          marginTop: "-2",
+                          fontWeight: "400",
+                          marginBottom: "0",
+                        }}
+                      >
+                        You can enable or disable the route
+                      </Paragraph>
+                    </div>
+                  </div>
+                </Form.Item>
+              </Col>
+
+              <Col span={24}>
+                <Collapse
+                  onChange={onChange}
+                  bordered={false}
+                  ghost={true}
+                  style={{ padding: "0" }}
+                  className="remove-bg"
+                >
+                  <Panel
+                    key="0"
+                    header={
+                      <Paragraph
+                        style={{
+                          textAlign: "left",
+                          whiteSpace: "pre-line",
+                          fontSize: "14px",
+                          fontWeight: "400",
+                          margin: "0",
+                          textDecoration: "underline",
+                        }}
+                      >
+                        More settings
+                      </Paragraph>
+                    }
+                    className="system-info-panel"
+                  >
+                    <Row gutter={16} style={{ padding: "15px 0 0" }}>
+                      <Col span={22}>
+                        <Form.Item name="masquerade" label="">
+                          <div
+                            style={{
+                              display: "flex",
+                              gap: "15px",
+                            }}
+                          >
+                            <Switch
+                              size={"small"}
+                              disabled={!setupNewRouteHA && !newRoute}
+                              checked={formRoute.masquerade}
+                              onChange={handleMasqueradeChange}
+                            />
+                            <div>
+                              <label
+                                style={{
+                                  color: "rgba(0, 0, 0, 0.88)",
+                                  fontSize: "14px",
+                                  fontWeight: "500",
+                                }}
+                              >
+                                Masquerade
+                              </label>
+                              <Paragraph
+                                type={"secondary"}
+                                style={{
+                                  marginTop: "-2",
+                                  fontWeight: "400",
+                                  marginBottom: "0",
+                                }}
+                              >
+                                Allow access to your private networks without
+                                configuring routes on your local routers or
+                                other devices.
+                              </Paragraph>
+                            </div>
+                          </div>
+                        </Form.Item>
+                      </Col>
+
+                      <Col span={24}>
+                        <label
+                          style={{
+                            color: "rgba(0, 0, 0, 0.88)",
+                            fontSize: "14px",
+                            fontWeight: "500",
+                          }}
+                        >
+                          Metric
+                        </label>
+                        <Paragraph
+                          type={"secondary"}
+                          style={{
+                            marginTop: "-2",
+                            fontWeight: "400",
+                            marginBottom: "5px",
+                          }}
+                        >
+                          Lower metrics indicating higher priority routes
+                        </Paragraph>
+                        <Row>
+                          <Col span={12}>
+                            <Form.Item name="metric" label="">
+                              <InputNumber
+                                min={1}
+                                max={9999}
+                                autoComplete="off"
+                                className="w-100"
+                              />
+                            </Form.Item>
+                          </Col>
+                        </Row>
+                      </Col>
+                    </Row>
+                  </Panel>
+                </Collapse>
+              </Col>
+              <Col
+                span={24}
+                style={{ marginTop: "24px", marginBottom: "12px" }}
+              >
+                <Text type={"secondary"}>
+                  Learn more about
+                  <a
+                    target="_blank"
+                    rel="noreferrer"
+                    href="https://docs.netbird.io/how-to/routing-traffic-to-private-networks"
+                  >
+                    {" "}
+                    network routes
+                  </a>
+                </Text>
+              </Col>
+            </Row>
+          </Form>
+        </Modal>
+      )}
+    </>
+  );
+};
+
+export default RouteAddNew;

src/components/RoutePeerUpdate.tsx

@@ -0,0 +1,739 @@
+import React, { useEffect, useRef, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { RootState } from "typesafe-actions";
+import { actions as routeActions } from "../store/route";
+import {
+  Button,
+  Col,
+  Collapse,
+  Form,
+  Input,
+  InputNumber,
+  message,
+  Row,
+  Select,
+  SelectProps,
+  Breadcrumb,
+  Switch,
+  Card,
+  Typography,
+  Tabs,
+} from "antd";
+import type { TabsProps } from "antd";
+import { Route, RouteToSave } from "../store/route/types";
+import { Header } from "antd/es/layout/layout";
+import { RuleObject } from "antd/lib/form";
+import { isEmpty } from "lodash";
+import {
+  initPeerMaps,
+  peerToPeerIP,
+  routePeerSeparator,
+} from "../utils/routes";
+import { useGetTokenSilently } from "../utils/token";
+import { useGetGroupTagHelpers } from "../utils/groups";
+import { Container } from "./Container";
+
+const { Paragraph, Text } = Typography;
+const { Panel } = Collapse;
+
+interface FormRoute extends Route {}
+
+const RoutePeerUpdate = () => {
+  const {
+    blueTagRender,
+    handleChangeTags,
+    dropDownRender,
+    optionRender,
+    tagGroups,
+    getExistingAndToCreateGroupsLists,
+    getGroupNamesFromIDs,
+    selectValidator,
+  } = useGetGroupTagHelpers();
+
+  const { Option } = Select;
+  const { getTokenSilently } = useGetTokenSilently();
+  const dispatch = useDispatch();
+
+  const peers = useSelector((state: RootState) => state.peer.data);
+  const route = useSelector((state: RootState) => state.route.route);
+  const routes = useSelector((state: RootState) => state.route.data);
+  const savedRoute = useSelector((state: RootState) => state.route.savedRoute);
+  const [editDescription, setEditDescription] = useState(false);
+  const options: SelectProps["options"] = [];
+  const [formRoute, setFormRoute] = useState({} as FormRoute);
+  const [form] = Form.useForm();
+  const inputDescriptionRef = useRef<any>(null);
+  const [peerNameToIP, peerIPToName, peerIPToID] = initPeerMaps(peers);
+  const [activeTab, setActiveTab] = useState<string | null>(null);
+
+  useEffect(() => {
+    if (!isEmpty(formRoute))
+      if (formRoute.peer_groups) {
+        setActiveTab("groupOfPeers");
+      } else {
+        setActiveTab("routingPeer");
+      }
+  }, [formRoute]);
+
+  useEffect(() => {
+    if (editDescription)
+      inputDescriptionRef.current!.focus({
+        cursor: "end",
+      });
+  }, [editDescription]);
+
+  useEffect(() => {
+    if (!route) return;
+    const fRoute = {
+      ...route,
+      groups: route.groups,
+    } as FormRoute;
+    setFormRoute(fRoute);
+    form.setFieldsValue(fRoute);
+    // let options = [];
+  }, [route]);
+
+  peers.forEach((p) => {
+    let os: string;
+    os = p.os;
+    if (
+      !os.toLowerCase().startsWith("darwin") &&
+      !os.toLowerCase().startsWith("windows") &&
+      !os.toLowerCase().startsWith("android") &&
+      route &&
+      !routes
+        .filter((r) => r.network_id === route.network_id)
+        .find((r) => r.peer === p.id)
+    ) {
+      options?.push({
+        label: peerToPeerIP(p.name, p.ip),
+        value: peerToPeerIP(p.name, p.ip),
+        disabled: false,
+      });
+    }
+  });
+
+   const handleSingleChangeTags = (values: any) => {
+      const lastValue = values[values.length - 1];
+      if (values.length > 0) {
+       form.setFieldsValue({
+         peer_groups: [lastValue],
+       });
+     }
+   };
+  
+  const createRouteToSave = (inputRoute: FormRoute): RouteToSave => {
+    if (inputRoute.peer_groups) {
+      inputRoute = {
+        ...inputRoute,
+        peer_groups: [
+          inputRoute.peer_groups[inputRoute.peer_groups.length - 1],
+        ],
+      };
+    }
+
+    let peerIDList = inputRoute.peer.split(routePeerSeparator);
+    let peerID: string;
+    if (peerIDList.length === 1) {
+      peerID = inputRoute.peer;
+    } else {
+      if (peerIDList[1]) {
+        peerID = peerIPToID[peerIDList[1]];
+      } else {
+        peerID = peerIPToID[peerNameToIP[inputRoute.peer]];
+      }
+    }
+    let [existingGroups, groupsToCreate] = getExistingAndToCreateGroupsLists(
+      inputRoute.groups
+    );
+
+    const payload = {
+      id: inputRoute.id,
+      network: inputRoute.network,
+      network_id: inputRoute.network_id,
+      description: inputRoute.description,
+      enabled: inputRoute.enabled,
+      masquerade: inputRoute.masquerade,
+      metric: inputRoute.metric,
+      groups: existingGroups,
+      groupsToCreate: groupsToCreate,
+    } as RouteToSave;
+
+    if (activeTab === "routingPeer") {
+      let pay = { ...payload, peer: peerID };
+      return pay;
+    }
+
+    if (activeTab === "groupOfPeers") {
+      if (inputRoute.peer_groups) {
+        let [currentPeersGroup, peerGroupsToCreate] =
+          getExistingAndToCreateGroupsLists(inputRoute.peer_groups);
+
+        let pay = {
+          ...payload,
+          peer_groups: currentPeersGroup,
+          peerGroupsToCreate: peerGroupsToCreate,
+        };
+        return pay;
+      }
+    }
+
+    return payload;
+  };
+
+  const handleFormSubmit = () => {
+    form
+      .validateFields()
+      .then(() => {
+        if (formRoute.peer !== "") {
+          const routeToSave = createRouteToSave(formRoute);
+          dispatch(
+            routeActions.saveRoute.request({
+              getAccessTokenSilently: getTokenSilently,
+              payload: routeToSave,
+            })
+          );
+        }
+      })
+      .catch((errorInfo) => {
+        console.log("errorInfo", errorInfo);
+      });
+  };
+
+  const setVisibleNewRoute = (status: boolean) => {
+    dispatch(routeActions.setSetupEditRoutePeerVisible(status));
+  };
+
+  const onCancel = () => {
+    if (savedRoute.loading) return;
+    dispatch(
+      routeActions.setRoute({
+        network: "",
+        network_id: "",
+        description: "",
+        peer: "",
+        metric: 9999,
+        masquerade: false,
+        enabled: true,
+        groups: [],
+        peer_groups: [],
+      } as Route)
+    );
+    setVisibleNewRoute(false);
+  };
+
+  const onChange = (data: any) => {
+    setFormRoute({ ...formRoute, ...data });
+  };
+
+  const peerDropDownRender = (menu: React.ReactElement) => <>{menu}</>;
+
+  const toggleEditDescription = (status: boolean) => {
+    setEditDescription(status);
+  };
+
+  const peerValidator = (_: RuleObject, value: string) => {
+    if (value == "") {
+      return Promise.reject(new Error("Please select routing one peer"));
+    }
+
+    return Promise.resolve();
+  };
+
+  const selectPreValidator = (obj: RuleObject, value: string[]) => {
+    if (formRoute.peer === "") {
+      let [, newGroups] = getExistingAndToCreateGroupsLists(value);
+      if (newGroups.length > 0) {
+        return Promise.reject(
+          new Error(
+            "You can't add new Groups from the group update view, please remove:\"" +
+              newGroups +
+              '"'
+          )
+        );
+      }
+    }
+    return selectValidator(obj, value);
+  };
+
+  const handleMasqueradeChange = (checked: boolean) => {
+    setFormRoute({
+      ...formRoute,
+      masquerade: checked,
+    });
+  };
+
+  const handleEnableChange = (checked: boolean) => {
+    setFormRoute({
+      ...formRoute,
+      enabled: checked,
+    });
+  };
+
+  const onBreadcrumbUsersClick = () => {
+    onCancel();
+  };
+
+  const styleNotification = { marginTop: 85 };
+
+  const saveKey = "saving";
+  useEffect(() => {
+    if (savedRoute.loading) {
+      message.loading({
+        content: "Saving...",
+        key: saveKey,
+        duration: 0,
+        style: styleNotification,
+      });
+    } else if (savedRoute.success) {
+      message.success({
+        content: "Route has been successfully updated.",
+        key: saveKey,
+        duration: 2,
+        style: styleNotification,
+      });
+      dispatch(routeActions.setSetupNewRouteVisible(false));
+      dispatch(routeActions.setSetupEditRouteVisible(false));
+      dispatch(routeActions.setSetupEditRoutePeerVisible(false));
+      dispatch(routeActions.setSavedRoute({ ...savedRoute, success: false }));
+      dispatch(routeActions.resetSavedRoute(null));
+    } else if (savedRoute.error) {
+      let errorMsg = "Failed to update network route";
+      switch (savedRoute.error.statusCode) {
+        case 403:
+          errorMsg =
+            "Failed to update network route. You might not have enough permissions.";
+          break;
+        default:
+          errorMsg = savedRoute.error.data.message
+            ? savedRoute.error.data.message
+            : errorMsg;
+          break;
+      }
+      message.error({
+        content: errorMsg,
+        key: saveKey,
+        duration: 5,
+        style: styleNotification,
+      });
+      dispatch(routeActions.setSavedRoute({ ...savedRoute, error: null }));
+      dispatch(routeActions.resetSavedRoute(null));
+    }
+  }, [savedRoute]);
+
+  const onTabChange = (key: string) => {
+    console.log(key);
+    // setActiveTab(key);
+  };
+
+  const items: TabsProps["items"] = [
+    {
+      key: "routingPeer",
+      label: "Routing Peer",
+      disabled: true,
+      children: (
+        <>
+          <Paragraph
+            type={"secondary"}
+            style={{
+              marginTop: "-2",
+              fontWeight: "400",
+              marginBottom: "5px",
+            }}
+          >
+            Assign a peer as a routing peer for the Network CIDR
+          </Paragraph>
+          <Form.Item
+            name="peer"
+            rules={[
+              {
+                required: true,
+                message: "Please select routing one peer",
+              },
+            ]}
+            style={{ maxWidth: "400px" }}
+          >
+            <Select
+              showSearch
+              style={{ width: "100%" }}
+              placeholder="Select Peer"
+              dropdownRender={peerDropDownRender}
+              options={options}
+              allowClear={true}
+            />
+          </Form.Item>
+        </>
+      ),
+    },
+    {
+      key: "groupOfPeers",
+      label: "Peer group",
+      disabled: true,
+      children: (
+        <>
+          <Paragraph
+            type={"secondary"}
+            style={{
+              marginTop: "-2",
+              fontWeight: "400",
+              marginBottom: "5px",
+            }}
+          >
+            Assign peer group with Linux machines to be used as routing peers
+          </Paragraph>
+          <Form.Item
+            name="peer_groups"
+            rules={[
+              {
+                required: true,
+                message: "Please select peer group",
+              },
+            ]}
+          >
+            <Select
+              mode="tags"
+              style={{ maxWidth: "400px" }}
+              tagRender={blueTagRender}
+              onChange={handleSingleChangeTags}
+              dropdownRender={dropDownRender}
+              optionFilterProp="serchValue"
+            >
+              {tagGroups.map((m, index) => (
+                <Option key={index} value={m.id} serchValue={m.name}>
+                  {optionRender(m.name, m.id)}
+                </Option>
+              ))}
+            </Select>
+          </Form.Item>
+        </>
+      ),
+    },
+  ];
+
+  return (
+    <>
+      <Container style={{ paddingTop: "40px", paddingBottom: "50px" }}>
+        <Breadcrumb
+          style={{ marginBottom: "25px" }}
+          items={[
+            {
+              title: <a onClick={onBreadcrumbUsersClick}>Network Routes</a>,
+            },
+            {
+              title: formRoute.network_id,
+            },
+          ]}
+        />
+        {route && (
+          <Card>
+            <Form
+              layout="vertical"
+              form={form}
+              requiredMark={false}
+              onValuesChange={onChange}
+              style={{ width: "100%", maxWidth: "600px" }}
+              className="route-form  edit-form-wrapper"
+            >
+              <Row gutter={16}>
+                <Col span={24}>
+                  <Header
+                    style={{
+                      border: "none",
+                    }}
+                  >
+                    <Row align="top">
+                      <Col span={24} style={{ lineHeight: "20px" }}>
+                        <div
+                          style={{
+                            color: "rgba(0, 0, 0, 0.88)",
+                            fontWeight: "500",
+                            fontSize: "22px",
+                          }}
+                        >
+                          {formRoute.network_id}
+
+                          <Paragraph
+                            type={"secondary"}
+                            style={{
+                              textAlign: "left",
+                              whiteSpace: "pre-line",
+                              fontWeight: "400",
+                              marginBottom: "0",
+                            }}
+                          >
+                            <div style={{ margin: "5px 0" }}>
+                              {" "}
+                              {formRoute.network}
+                            </div>
+                            <div></div>
+                          </Paragraph>
+                        </div>
+
+                        {!editDescription ? (
+                          <div
+                            onClick={() => toggleEditDescription(true)}
+                            style={{
+                              margin: "0 0 30px",
+                              lineHeight: "22px",
+                              cursor: "pointer",
+                            }}
+                          >
+                            {formRoute.description &&
+                            formRoute.description.trim() !== "" ? (
+                              formRoute.description
+                            ) : (
+                              <span style={{ textDecoration: "underline" }}>
+                                Add description
+                              </span>
+                            )}
+                          </div>
+                        ) : (
+                          <Form.Item
+                            name="description"
+                            label="Description"
+                            style={{ marginTop: 24, fontWeight: 500 }}
+                          >
+                            <Input
+                              placeholder="Add description..."
+                              ref={inputDescriptionRef}
+                              onPressEnter={() => toggleEditDescription(false)}
+                              onBlur={() => toggleEditDescription(false)}
+                              autoComplete="off"
+                              style={{ maxWidth: "400px" }}
+                            />
+                          </Form.Item>
+                        )}
+                      </Col>
+                    </Row>
+                    <Row align="top">
+                      <Col flex="auto"></Col>
+                    </Row>
+                  </Header>
+                </Col>
+
+                <Col span={24}>
+                  <Form.Item name="enabled" label="">
+                    <div
+                      style={{
+                        display: "flex",
+                        gap: "15px",
+                      }}
+                    >
+                      <Switch
+                        size={"small"}
+                        checked={formRoute.enabled}
+                        onChange={handleEnableChange}
+                      />
+                      <div>
+                        <label
+                          style={{
+                            color: "rgba(0, 0, 0, 0.88)",
+                            fontSize: "14px",
+                            fontWeight: "500",
+                          }}
+                        >
+                          Enabled
+                        </label>
+                        <Paragraph
+                          type={"secondary"}
+                          style={{
+                            marginTop: "-2",
+                            fontWeight: "400",
+                            marginBottom: "0",
+                          }}
+                        >
+                          You can enable or disable the route
+                        </Paragraph>
+                      </div>
+                    </div>
+                  </Form.Item>
+                </Col>
+
+                <Col span={24}>
+                  {activeTab && (
+                    <Tabs
+                      defaultActiveKey={activeTab}
+                      items={items}
+                      onChange={onTabChange}
+                    />
+                  )}
+                </Col>
+                <Col span={24}>
+                  <label
+                    style={{
+                      color: "rgba(0, 0, 0, 0.88)",
+                      fontSize: "14px",
+                      fontWeight: "500",
+                    }}
+                  >
+                    Distribution groups
+                  </label>
+                  <Paragraph
+                    type={"secondary"}
+                    style={{
+                      marginTop: "-2",
+                      fontWeight: "400",
+                      marginBottom: "5px",
+                    }}
+                  >
+                    Advertise this route to peers that belong to the following
+                    groups
+                  </Paragraph>
+                  <Form.Item
+                    name="groups"
+                    label=""
+                    rules={[{ validator: selectPreValidator }]}
+                    style={{ maxWidth: "400px" }}
+                  >
+                    <Select
+                      mode="tags"
+                      style={{ width: "100%" }}
+                      placeholder="Associate groups with the network route"
+                      tagRender={blueTagRender}
+                      onChange={handleChangeTags}
+                      dropdownRender={dropDownRender}
+                      optionFilterProp="serchValue"
+                    >
+                      {tagGroups.map((m, index) => (
+                        <Option key={index} value={m.id} serchValue={m.name}>
+                          {optionRender(m.name, m.id)}
+                        </Option>
+                      ))}
+                    </Select>
+                  </Form.Item>
+                </Col>
+
+                <Col span={24}>
+                  <Collapse
+                    onChange={onChange}
+                    bordered={false}
+                    ghost={true}
+                    style={{ padding: "0" }}
+                    className="remove-bg"
+                  >
+                    <Panel
+                      key="0"
+                      header={
+                        <Paragraph
+                          style={{
+                            textAlign: "left",
+                            whiteSpace: "pre-line",
+                            fontSize: "14px",
+                            fontWeight: "400",
+                            margin: "0",
+                            textDecoration: "underline",
+                          }}
+                        >
+                          More settings
+                        </Paragraph>
+                      }
+                      className="system-info-panel"
+                    >
+                      <Row gutter={16} style={{ padding: "15px 0 0" }}>
+                        <Col span={12}>
+                          <Form.Item name="masquerade" label="">
+                            <div
+                              style={{
+                                display: "flex",
+                                gap: "15px",
+                              }}
+                            >
+                              <Switch
+                                size={"small"}
+                                checked={formRoute.masquerade}
+                                onChange={handleMasqueradeChange}
+                              />
+                              <div>
+                                <label
+                                  style={{
+                                    color: "rgba(0, 0, 0, 0.88)",
+                                    fontSize: "14px",
+                                    fontWeight: "500",
+                                  }}
+                                >
+                                  Masquerade
+                                </label>
+                                <Paragraph
+                                  type={"secondary"}
+                                  style={{
+                                    marginTop: "-2",
+                                    fontWeight: "400",
+                                    marginBottom: "0",
+                                  }}
+                                >
+                                  Allow access to your private networks without
+                                  configuring routes on your local routers or
+                                  other devices.
+                                </Paragraph>
+                              </div>
+                            </div>
+                          </Form.Item>
+                        </Col>
+
+                        <Col span={12}>
+                          <label
+                            style={{
+                              color: "rgba(0, 0, 0, 0.88)",
+                              fontSize: "14px",
+                              fontWeight: "500",
+                            }}
+                          >
+                            Metric
+                          </label>
+                          <Paragraph
+                            type={"secondary"}
+                            style={{
+                              marginTop: "-2",
+                              fontWeight: "400",
+                              marginBottom: "5px",
+                            }}
+                          >
+                            Lower metrics indicating higher priority routes
+                          </Paragraph>
+                          <Row>
+                            <Col span={12}>
+                              <Form.Item name="metric" label="">
+                                <InputNumber
+                                  min={1}
+                                  max={9999}
+                                  autoComplete="off"
+                                  className="w-100"
+                                />
+                              </Form.Item>
+                            </Col>
+                          </Row>
+                        </Col>
+                      </Row>
+                    </Panel>
+                  </Collapse>
+                </Col>
+              </Row>
+              <Col
+                span={24}
+                style={{
+                  display: "flex",
+                  justifyContent: "start",
+                  gap: "10px",
+                  marginTop: "20px",
+                }}
+              >
+                <Button onClick={onCancel} disabled={savedRoute.loading}>
+                  Cancel
+                </Button>
+                <Button
+                  type="primary"
+                  disabled={savedRoute.loading}
+                  onClick={handleFormSubmit}
+                >
+                  Save
+                </Button>
+              </Col>
+            </Form>
+          </Card>
+        )}
+      </Container>
+    </>
+  );
+};
+
+export default RoutePeerUpdate;

src/components/RouteUpdate.tsx

@@ -0,0 +1,545 @@
+import React, { useEffect, useRef, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { RootState } from "typesafe-actions";
+import { actions as routeActions } from "../store/route";
+import {
+  Button,
+  Col,
+  Form,
+  Input,
+  Row,
+  Select,
+  SelectProps,
+  message,
+  Space,
+  Modal,
+  Typography,
+} from "antd";
+import { Route, RouteToSave } from "../store/route/types";
+import { Header } from "antd/es/layout/layout";
+import { RuleObject } from "antd/lib/form";
+import {
+  initPeerMaps,
+  peerToPeerIP,
+  routePeerSeparator,
+  transformGroupedDataTable,
+} from "../utils/routes";
+import { useGetTokenSilently } from "../utils/token";
+import { useGetGroupTagHelpers } from "../utils/groups";
+
+const { Paragraph } = Typography;
+
+interface FormRoute extends Route {}
+
+const RouteAddNew = () => {
+  const {
+    blueTagRender,
+    handleChangeTags,
+    dropDownRender,
+    optionRender,
+    tagGroups,
+    getExistingAndToCreateGroupsLists,
+    getGroupNamesFromIDs,
+    selectValidator,
+  } = useGetGroupTagHelpers();
+
+  const { Option } = Select;
+  const { getTokenSilently } = useGetTokenSilently();
+  const dispatch = useDispatch();
+  const setupEditRouteVisible = useSelector(
+    (state: RootState) => state.route.setupEditRouteVisible
+  );
+  const setupNewRouteHA = useSelector(
+    (state: RootState) => state.route.setupNewRouteHA
+  );
+  const peers = useSelector((state: RootState) => state.peer.data);
+  const route = useSelector((state: RootState) => state.route.route);
+  const routes = useSelector((state: RootState) => state.route.data);
+  const savedRoute = useSelector((state: RootState) => state.route.savedRoute);
+  const [previousRouteKey, setPreviousRouteKey] = useState("");
+  const [editName, setEditName] = useState(false);
+  const options: SelectProps["options"] = [];
+  const [formRoute, setFormRoute] = useState({} as FormRoute);
+  const [form] = Form.useForm();
+  const inputNameRef = useRef<any>(null);
+  const [peerNameToIP, peerIPToName, peerIPToID] = initPeerMaps(peers);
+  const [newRoute, setNewRoute] = useState(false);
+
+  useEffect(() => {
+    if (editName)
+      inputNameRef.current!.focus({
+        cursor: "end",
+      });
+  }, [editName]);
+
+  useEffect(() => {
+    if (!route) return;
+    const fRoute = {
+      ...route,
+      groups: route.groups,
+    } as FormRoute;
+    setFormRoute(fRoute);
+    setPreviousRouteKey(fRoute.network_id + fRoute.network);
+    form.setFieldsValue(fRoute);
+
+    if (!route.network_id) {
+      setNewRoute(true);
+    } else {
+      setNewRoute(false);
+    }
+  }, [route]);
+
+  peers.forEach((p) => {
+    let os: string;
+    os = p.os;
+    if (
+      !os.toLowerCase().startsWith("darwin") &&
+      !os.toLowerCase().startsWith("windows") &&
+      !os.toLowerCase().startsWith("android") &&
+      route &&
+      !routes
+        .filter((r) => r.network_id === route.network_id)
+        .find((r) => r.peer === p.id)
+    ) {
+      options?.push({
+        label: peerToPeerIP(p.name, p.ip),
+        value: peerToPeerIP(p.name, p.ip),
+        disabled: false,
+      });
+    }
+  });
+
+  const createRouteToSave = (inputRoute: FormRoute): RouteToSave => {
+    if (inputRoute.peer_groups) {
+      inputRoute = {
+        ...inputRoute,
+        peer_groups: [
+          inputRoute.peer_groups[inputRoute.peer_groups.length - 1],
+        ],
+      };
+    }
+    let peerIDList = inputRoute.peer.split(routePeerSeparator);
+    let peerID: string;
+    if (peerIDList.length === 1) {
+      peerID = inputRoute.peer;
+    } else {
+      if (peerIDList[1]) {
+        peerID = peerIPToID[peerIDList[1]];
+      } else {
+        peerID = peerIPToID[peerNameToIP[inputRoute.peer]];
+      }
+    }
+
+    let [existingGroups, groupsToCreate] = getExistingAndToCreateGroupsLists(
+      inputRoute.groups
+    );
+
+    const payload = {
+      id: inputRoute.id,
+      network: inputRoute.network,
+      network_id: inputRoute.network_id,
+      description: inputRoute.description,
+      enabled: inputRoute.enabled,
+      masquerade: inputRoute.masquerade,
+      metric: inputRoute.metric,
+      groups: existingGroups,
+      groupsToCreate: groupsToCreate,
+    } as RouteToSave;
+
+    if (inputRoute.peer_groups) {
+      let [currentPeersGroup, peerGroupsToCreate] =
+        getExistingAndToCreateGroupsLists(inputRoute.peer_groups);
+
+      let pay = {
+        ...payload,
+        peer_groups: currentPeersGroup,
+        peerGroupsToCreate: peerGroupsToCreate,
+      };
+      return pay;
+    }
+
+    if (inputRoute.peer) {
+      let pay = { ...payload, peer: peerID };
+      return pay;
+    }
+
+    return payload;
+  };
+
+    const handleSingleChangeTags = (values: any) => {
+       const lastValue = values[values.length - 1];
+       if (values.length > 0) {
+        form.setFieldsValue({
+          peer_groups: [lastValue],
+        });
+      }
+    };
+  
+  const handleFormSubmit = () => {
+    form
+      .validateFields()
+      .then(() => {
+        if (!setupNewRouteHA || formRoute.peer != "") {
+          const routeToSave = createRouteToSave(formRoute);
+          dispatch(
+            routeActions.saveRoute.request({
+              getAccessTokenSilently: getTokenSilently,
+              payload: routeToSave,
+            })
+          );
+        } else {
+          let groupedDataTable = transformGroupedDataTable(routes, peers);
+          groupedDataTable.forEach((group) => {
+            if (group.key == previousRouteKey) {
+              group.groupedRoutes.forEach((route) => {
+                let updateRoute: FormRoute = {
+                  ...formRoute,
+                  id: route.id,
+                  peer: route.peer,
+                  metric: route.metric,
+                  enabled:
+                    formRoute.enabled != group.enabled
+                      ? formRoute.enabled
+                      : route.enabled,
+                };
+                const routeToSave = createRouteToSave(updateRoute);
+                dispatch(
+                  routeActions.saveRoute.request({
+                    getAccessTokenSilently: getTokenSilently,
+                    payload: routeToSave,
+                  })
+                );
+              });
+            }
+          });
+        }
+      })
+      .catch((errorInfo) => {
+        console.log("errorInfo", errorInfo);
+      });
+  };
+
+  const setVisibleNewRoute = (status: boolean) => {
+    dispatch(routeActions.setSetupEditRouteVisible(status));
+  };
+
+  const setSetupNewRouteHA = (status: boolean) => {
+    dispatch(routeActions.setSetupNewRouteHA(status));
+  };
+
+  const onCancel = () => {
+    if (savedRoute.loading) return;
+    setEditName(false);
+    dispatch(
+      routeActions.setRoute({
+        network: "",
+        network_id: "",
+        description: "",
+        peer: "",
+        metric: 9999,
+        masquerade: false,
+        enabled: true,
+        groups: [],
+      } as Route)
+    );
+    setVisibleNewRoute(false);
+    setSetupNewRouteHA(false);
+    setPreviousRouteKey("");
+    setNewRoute(false);
+  };
+
+  const onChange = (data: any) => {
+    setFormRoute({ ...formRoute, ...data });
+  };
+
+  const peerDropDownRender = (menu: React.ReactElement) => <>{menu}</>;
+
+  const toggleEditName = (status: boolean) => {
+    setEditName(status);
+  };
+
+  const peerValidator = (_: RuleObject, value: string) => {
+    if (value == "" && newRoute) {
+      return Promise.reject(new Error("Please select routing one peer"));
+    }
+
+    return Promise.resolve();
+  };
+
+  const selectPreValidator = (obj: RuleObject, value: string[]) => {
+    if (setupNewRouteHA && formRoute.peer == "" && !formRoute.peer_groups) {
+      let [, newGroups] = getExistingAndToCreateGroupsLists(value);
+      if (newGroups.length > 0) {
+        return Promise.reject(
+          new Error(
+            "You can't add new Groups from the group update view, please remove:\"" +
+              newGroups +
+              '"'
+          )
+        );
+      }
+    }
+    return selectValidator(obj, value);
+  };
+
+  return (
+    <>
+      {route && (
+        <Modal
+          open={setupEditRouteVisible}
+          onCancel={onCancel}
+          footer={
+            <Space style={{ display: "flex", justifyContent: "end" }}>
+              <Button onClick={onCancel} disabled={savedRoute.loading}>
+                Cancel
+              </Button>
+              <Button
+                type="primary"
+                disabled={savedRoute.loading}
+                onClick={handleFormSubmit}
+              >
+                {formRoute.peer_groups ? "Save" : "Add route"}
+              </Button>
+            </Space>
+          }
+        >
+          <Form
+            layout="vertical"
+            form={form}
+            requiredMark={false}
+            onValuesChange={onChange}
+            className="route-form"
+          >
+            <Row gutter={16}>
+              <Col span={24}>
+                <Header
+                  style={{
+                    border: "none",
+                  }}
+                >
+                  <Paragraph
+                    style={{
+                      textAlign: "start",
+                      whiteSpace: "pre-line",
+                      fontSize: "18px",
+                      fontWeight: 500,
+                    }}
+                  >
+                    {formRoute.peer_groups
+                      ? "Configure peer group"
+                      : "Add new routing peer"}
+                  </Paragraph>
+                  <Paragraph
+                    type={"secondary"}
+                    style={{
+                      textAlign: "start",
+                      whiteSpace: "pre-line",
+                      marginTop: "-23px",
+                      fontSize: "14px",
+                      paddingBottom: "25px",
+                      marginBottom: "4px",
+                    }}
+                  >
+                    {formRoute.peer_groups
+                      ? "Add peer group with multiple peers to enable high availability"
+                      : "When you add multiple routing peers, NetBird enables high availability"}
+                  </Paragraph>
+
+                  <Row align="top">
+                    <Col span={24} style={{ lineHeight: "20px" }}>
+                      <>
+                        <label
+                          style={{
+                            color: "rgba(0, 0, 0, 0.88)",
+                            fontSize: "14px",
+                            fontWeight: "500",
+                          }}
+                        >
+                          Network Identifier
+                        </label>
+                        <Paragraph
+                          type={"secondary"}
+                          style={{
+                            marginTop: "-2",
+                            fontWeight: "400",
+                            marginBottom: "5px",
+                          }}
+                        >
+                          Network name and CIDR that you are adding the route to
+                        </Paragraph>
+                        <Form.Item
+                          label=""
+                          rules={[
+                            {
+                              required: true,
+                              message:
+                                "Please add an identifier for this access route",
+                              whitespace: true,
+                            },
+                          ]}
+                        >
+                          <Input
+                            placeholder="for example “e.g. aws-eu-central-1-vpc”"
+                            ref={inputNameRef}
+                            disabled={true}
+                            onPressEnter={() => toggleEditName(false)}
+                            onBlur={() => toggleEditName(false)}
+                            autoComplete="off"
+                            maxLength={40}
+                            value={
+                              formRoute.network_id + "-" + formRoute.network
+                            }
+                          />
+                        </Form.Item>
+                      </>
+                    </Col>
+                  </Row>
+                  <Row align="top">
+                    <Col flex="auto"></Col>
+                  </Row>
+                </Header>
+              </Col>
+
+              <Col span={24}>
+                {formRoute.peer_groups ? (
+                  <>
+                    <label
+                      style={{
+                        color: "rgba(0, 0, 0, 0.88)",
+                        fontSize: "14px",
+                        fontWeight: "500",
+                      }}
+                    >
+                      Peer group
+                    </label>
+                    <Paragraph
+                      type={"secondary"}
+                      style={{
+                        marginTop: "-2",
+                        fontWeight: "400",
+                        marginBottom: "5px",
+                      }}
+                    >
+                      Assign peer group with Linux machines to be used as
+                      routing peers
+                    </Paragraph>
+                    <Form.Item
+                      name="peer_groups"
+                      rules={[
+                        {
+                          required: true,
+                          message: "Please select peer group",
+                        },
+                      ]}
+                    >
+                      <Select
+                        mode="tags"
+                        style={{ maxWidth: "100%" }}
+                        tagRender={blueTagRender}
+                        onChange={handleSingleChangeTags}
+                        dropdownRender={dropDownRender}
+                        optionFilterProp="serchValue"
+                      >
+                        {tagGroups.map((m, index) => (
+                          <Option key={index} value={m.id} serchValue={m.name}>
+                            {optionRender(m.name, m.id)}
+                          </Option>
+                        ))}
+                      </Select>
+                    </Form.Item>
+                  </>
+                ) : (
+                  <>
+                    <label
+                      style={{
+                        color: "rgba(0, 0, 0, 0.88)",
+                        fontSize: "14px",
+                        fontWeight: "500",
+                      }}
+                    >
+                      Routing Peer
+                    </label>
+                    <Paragraph
+                      type={"secondary"}
+                      style={{
+                        marginTop: "-2",
+                        fontWeight: "400",
+                        marginBottom: "5px",
+                      }}
+                    >
+                      Assign a routing peer to the network. This peer has to
+                      reside in the network
+                    </Paragraph>
+                    <Form.Item
+                      name="peer"
+                      rules={[
+                        {
+                          required: true,
+                          message: "Please select routing one peer",
+                        },
+                      ]}
+                    >
+                      <Select
+                        showSearch
+                        style={{ width: "100%" }}
+                        placeholder="Select Peer"
+                        dropdownRender={peerDropDownRender}
+                        options={options}
+                        allowClear={true}
+                      />
+                    </Form.Item>
+                  </>
+                )}
+              </Col>
+              <Col span={24}>
+                <label
+                  style={{
+                    color: "rgba(0, 0, 0, 0.88)",
+                    fontSize: "14px",
+                    fontWeight: "500",
+                  }}
+                >
+                  Distribution groups
+                </label>
+                <Paragraph
+                  type={"secondary"}
+                  style={{
+                    marginTop: "-2",
+                    fontWeight: "400",
+                    marginBottom: "5px",
+                  }}
+                >
+                  Advertise this route to peers that belong to the following
+                  groups
+                </Paragraph>
+                <Form.Item
+                  name="groups"
+                  label=""
+                  rules={[{ validator: selectPreValidator }]}
+                >
+                  <Select
+                    mode="tags"
+                    style={{ width: "100%" }}
+                    placeholder="Associate groups with the network route"
+                    tagRender={blueTagRender}
+                    onChange={handleChangeTags}
+                    dropdownRender={dropDownRender}
+                    optionFilterProp="serchValue"
+                  >
+                    {tagGroups.map((m, index) => (
+                      <Option key={index} value={m.id} serchValue={m.name}>
+                        {optionRender(m.name, m.id)}
+                      </Option>
+                    ))}
+                  </Select>
+                </Form.Item>
+              </Col>
+            </Row>
+          </Form>
+        </Modal>
+      )}
+    </>
+  );
+};
+
+export default RouteAddNew;

src/components/SetupKeyEdit.tsx

@@ -0,0 +1,514 @@
+import React, { useEffect, useRef, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { actions as setupKeyActions } from "../store/setup-key";
+import {
+  Button,
+  Col,
+  Divider,
+  Form,
+  Input,
+  Row,
+  Select,
+  Breadcrumb,
+  Tag,
+  Typography,
+  Card,
+  Tooltip,
+} from "antd";
+import { RootState } from "typesafe-actions";
+import {
+  FormSetupKey,
+  SetupKey,
+  SetupKeyToSave,
+} from "../store/setup-key/types";
+import { formatDate } from "../utils/common";
+import { RuleObject } from "antd/lib/form";
+import { Group } from "../store/group/types";
+import { useGetTokenSilently } from "../utils/token";
+import moment from "moment";
+import { Container } from "./Container";
+import Paragraph from "antd/es/typography/Paragraph";
+import { LockOutlined } from "@ant-design/icons";
+import { actions as personalAccessTokenActions } from "../store/personal-access-token";
+import { useGetGroupTagHelpers } from "../utils/groups";
+
+const { Option } = Select;
+const { Text } = Typography;
+
+const customExpiresFormat = (value: Date): string | null => {
+  return formatDate(value);
+};
+
+const SetupKeyNew = (props: any) => {
+  const { isGroupUpdateView, setShowGroupModal } = props;
+  const {
+    optionRender,
+    blueTagRender,
+    tagGroups,
+    getExistingAndToCreateGroupsLists,
+    setGroupTagFilterAll,
+  } = useGetGroupTagHelpers();
+  const { getTokenSilently } = useGetTokenSilently();
+  const dispatch = useDispatch();
+
+  const setupKey = useSelector((state: RootState) => state.setupKey.setupKey);
+  const savedSetupKey = useSelector(
+    (state: RootState) => state.setupKey.savedSetupKey
+  );
+ 
+  const groups = useSelector((state: RootState) => state.group.data);
+
+  const [form] = Form.useForm();
+  const [editName, setEditName] = useState(false);
+  const [formSetupKey, setFormSetupKey] = useState({} as FormSetupKey);
+  const inputNameRef = useRef<any>(null);
+
+  useEffect(() => {
+    setGroupTagFilterAll(true);
+  }, []);
+
+  useEffect(() => {
+    //Unmounting component clean
+    return () => {
+      setVisibleNewSetupKey(false);
+    };
+  }, []);
+
+  useEffect(() => {
+    if (!editName) return;
+
+    inputNameRef.current!.focus({ cursor: "end" });
+  }, [editName]);
+
+  useEffect(() => {
+    if (!setupKey) return;
+
+    const allGroups = new Map<string, Group>();
+    let formKeyGroups: string[] = [];
+    groups.forEach((g) => allGroups.set(g.id!, g));
+
+    if (setupKey.auto_groups) {
+      formKeyGroups = setupKey.auto_groups
+        .filter((g) => allGroups.get(g))
+        .map((g) => allGroups.get(g)!.name);
+    }
+    const fSetupKey = {
+      ...setupKey,
+      autoGroupNames: setupKey.auto_groups || [],
+      exp: moment(setupKey.expires),
+      last: moment(setupKey.last_used),
+    } as FormSetupKey;
+     form.setFieldsValue(fSetupKey);
+    setFormSetupKey(fSetupKey);
+  }, [setupKey]);
+
+  const createSetupKeyToSave = (): SetupKeyToSave => {
+    let [existingGroups, groupsToCreate] = getExistingAndToCreateGroupsLists(
+      formSetupKey.autoGroupNames
+    );
+
+    const expiresIn = formSetupKey.expires_in * 24 * 3600; // the api expects seconds while the form returns days
+    return {
+      id: formSetupKey.id,
+      name: formSetupKey.name,
+      type: formSetupKey.type,
+      auto_groups: existingGroups,
+      revoked: formSetupKey.revoked,
+      groupsToCreate: groupsToCreate,
+      expires_in: expiresIn,
+      usage_limit: formSetupKey.usage_limit,
+      ephemeral: formSetupKey.ephemeral,
+    } as SetupKeyToSave;
+  };
+
+  const handleFormSubmit = async () => {
+    try {
+      await form.validateFields();
+    } catch (e) {
+      const errorFields = (e as any).errorFields;
+     }
+
+    const setupKeyToSave = createSetupKeyToSave();
+    dispatch(
+      setupKeyActions.saveSetupKey.request({
+        getAccessTokenSilently: getTokenSilently,
+        payload: setupKeyToSave,
+      })
+    );
+  };
+
+  const setVisibleNewSetupKey = (status: boolean) => {
+    form.resetFields();
+    dispatch(setupKeyActions.setSetupEditKeyVisible(status));
+  };
+
+  const onCancel = () => {
+    if (savedSetupKey.loading) return;
+
+    dispatch(
+      setupKeyActions.setSetupKey({
+        name: "",
+        type: "one-off",
+        key: "",
+        last_used: "",
+        expires: "",
+        state: "valid",
+        auto_groups: [] as string[],
+        usage_limit: 0,
+        used_times: 0,
+        expires_in: 0,
+      } as SetupKey)
+    );
+    setFormSetupKey({} as FormSetupKey);
+    setVisibleNewSetupKey(false);
+    if (setShowGroupModal) {
+      setShowGroupModal(false);
+    }
+  };
+
+  const onChange = (data: any) => {
+    setFormSetupKey({ ...formSetupKey, ...data });
+  };
+
+  const toggleEditName = (status: boolean) => {
+    setEditName(status);
+  };
+
+  const selectValidator = (_: RuleObject, value: string[]) => {
+    let hasSpaceNamed = [];
+
+    value.forEach(function (v: string) {
+      if (!v.trim().length) {
+        hasSpaceNamed.push(v);
+      }
+    });
+
+    if (hasSpaceNamed.length) {
+      return Promise.reject(
+        new Error("Group names with just spaces are not allowed")
+      );
+    }
+
+    return Promise.resolve();
+  };
+
+  const dropDownRender = (menu: React.ReactElement) => (
+    <>
+      {menu}
+      <Divider style={{ margin: "8px 0" }} />
+      <Row style={{ padding: "0 8px 4px" }}>
+        <Col flex="auto">
+          <span style={{ color: "#9CA3AF" }}>
+            Add new group by pressing "Enter"
+          </span>
+        </Col>
+        <Col flex="none">
+          <svg
+            width="14"
+            height="12"
+            viewBox="0 0 14 12"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M1.70455 7.19176V5.89915H10.3949C10.7727 5.89915 11.1174 5.80634 11.429 5.62074C11.7405 5.43513 11.9875 5.18655 12.1697 4.875C12.3554 4.56345 12.4482 4.21875 12.4482 3.84091C12.4482 3.46307 12.3554 3.12003 12.1697 2.81179C11.9841 2.50024 11.7356 2.25166 11.424 2.06605C11.1158 1.88044 10.7727 1.78764 10.3949 1.78764H9.83807V0.5H10.3949C11.0114 0.5 11.5715 0.650805 12.0753 0.952414C12.5791 1.25402 12.9818 1.65672 13.2834 2.16051C13.585 2.6643 13.7358 3.22443 13.7358 3.84091C13.7358 4.30161 13.648 4.73414 13.4723 5.13849C13.3 5.54285 13.0613 5.89915 12.7564 6.20739C12.4515 6.51562 12.0968 6.75758 11.6925 6.93324C11.2881 7.10559 10.8556 7.19176 10.3949 7.19176H1.70455ZM4.90128 11.0646L0.382102 6.54545L4.90128 2.02628L5.79119 2.91619L2.15696 6.54545L5.79119 10.1747L4.90128 11.0646Z"
+              fill="#9CA3AF"
+            />
+          </svg>
+        </Col>
+      </Row>
+    </>
+  );
+
+  const changesDetected = (): boolean => {
+    return (
+      formSetupKey.name == null ||
+      formSetupKey.name !== setupKey.name ||
+      groupsChanged() ||
+      formSetupKey.usage_limit !== setupKey.usage_limit
+    );
+  };
+
+  const groupsChanged = (): boolean => {
+    if (
+      setupKey &&
+      setupKey.auto_groups &&
+      formSetupKey.autoGroupNames.length !== setupKey.auto_groups.length
+    ) {
+      return true;
+    }
+    const formGroupIds =
+      groups
+        ?.filter((g) => formSetupKey.autoGroupNames.includes(g.name))
+        .map((g) => g.id || "") || [];
+
+    return (
+      setupKey.auto_groups?.filter((g) => !formGroupIds.includes(g)).length > 0
+    );
+  };
+
+  const getFormKey = (key: string) => {
+    if (key) return key.substring(0, 4).concat("****");
+  };
+
+  const onBreadcrumbUsersClick = () => {
+    if (savedSetupKey.loading) return;
+    // dispatch(userActions.setUser(null as unknown as User));
+    dispatch(personalAccessTokenActions.resetPersonalAccessTokens(null));
+    setVisibleNewSetupKey(false);
+  };
+   return (
+    <>
+      {!isGroupUpdateView && (
+        <Breadcrumb
+          style={{ marginBottom: "25px" }}
+          items={[
+            {
+              title: <a onClick={onBreadcrumbUsersClick}>Setup Keys</a>,
+            },
+            {
+              title: setupKey.name,
+            },
+          ]}
+        />
+      )}
+      <Card
+        bordered={true}
+        className={isGroupUpdateView ? " noborderPadding" : ""}
+        style={{ marginBottom: "7px", border: "none" }}
+      >
+        <div style={{ maxWidth: "800px" }}>
+          {!isGroupUpdateView && (
+            <h3
+              style={{
+                fontSize: "22px",
+                fontWeight: "500",
+                marginBottom: "30px",
+              }}
+            >
+              {setupKey.name}
+            </h3>
+          )}
+          <Form
+            layout="vertical"
+            requiredMark={false}
+            form={form}
+            onValuesChange={onChange}
+            initialValues={{
+              usage_limit: 1,
+            }}
+          >
+            {!isGroupUpdateView && (
+              <Row style={{ marginTop: "10px" }}>
+                <Col
+                  sm={24}
+                  md={8}
+                  lg={8}
+                  style={{
+                    paddingRight: "70px",
+                  }}
+                >
+                  <Paragraph
+                    style={{
+                      whiteSpace: "pre-line",
+                      fontWeight: "500",
+                      margin: 0,
+                    }}
+                  >
+                    Key
+                    <Tag
+                      color={`${
+                        formSetupKey.state === "valid" ? "green" : "red"
+                      }`}
+                      style={{
+                        marginLeft: "10px",
+                        borderRadius: "2px",
+                        fontWeight: "500",
+                      }}
+                    >
+                      {formSetupKey.state}
+                    </Tag>
+                  </Paragraph>
+                  <Input
+                    style={{ marginTop: "8px" }}
+                    disabled
+                    value={getFormKey(formSetupKey.key)}
+                    suffix={<LockOutlined style={{ color: "#BFBFBF" }} />}
+                  />
+                </Col>
+
+                <Col
+                  sm={24}
+                  md={8}
+                  lg={6}
+                  style={{
+                    paddingRight: "70px",
+                  }}
+                >
+                  <Paragraph
+                    style={{
+                      whiteSpace: "pre-line",
+                      margin: 0,
+                      fontWeight: "500",
+                    }}
+                  >
+                    <Paragraph
+                      style={{
+                        whiteSpace: "pre-line",
+                        margin: 0,
+                        fontWeight: "500",
+                      }}
+                    ></Paragraph>
+                    Type{" "}
+                    {formSetupKey.ephemeral ? (
+                      <Tooltip title="Peers that are offline for over 10 minutes will be removed automatically">
+                        <Tag>
+                          <Text type="secondary" style={{ fontSize: 10 }}>
+                            ephemeral
+                          </Text>
+                        </Tag>
+                      </Tooltip>
+                    ) : (
+                      " "
+                    )}
+                  </Paragraph>
+                  <Col>
+                    <Input
+                      disabled
+                      value={
+                        formSetupKey.type === "one-off" ? "One-off" : "Reusable"
+                      }
+                      suffix={<LockOutlined style={{ color: "#BFBFBF" }} />}
+                      style={{ marginTop: "8px" }}
+                    />
+                  </Col>
+                </Col>
+
+                <Col sm={24} md={8} lg={3}>
+                  <Paragraph
+                    style={{
+                      whiteSpace: "pre-line",
+                      margin: 0,
+                      fontWeight: "500",
+                    }}
+                  >
+                    <Paragraph
+                      style={{
+                        whiteSpace: "pre-line",
+                        margin: 0,
+                        fontWeight: "500",
+                      }}
+                    ></Paragraph>
+                    {/* {formSetupKey.type === "one-off" ? "One-off" : "Reusable"}, */}
+                    Available uses
+                  </Paragraph>
+                  <Col>
+                    <Input
+                      disabled
+                      value={
+                        formSetupKey.type === "reusable" &&
+                        formSetupKey.usage_limit === 0
+                          ? "unlimited"
+                          : formSetupKey.usage_limit - formSetupKey.used_times
+                      }
+                      suffix={<LockOutlined style={{ color: "#BFBFBF" }} />}
+                      style={{ marginTop: "8px" }}
+                    />
+                  </Col>
+                </Col>
+              </Row>
+            )}
+            <Row style={{ marginTop: `${isGroupUpdateView ? "0" : "39px"}` }}>
+              {!isGroupUpdateView && (
+                <Col xs={24} sm={24} md={5} lg={5} xl={5} xxl={5} span={5}>
+                  <Paragraph style={{ margin: 0, fontWeight: "500" }}>
+                    Expires
+                  </Paragraph>
+                  <Row>
+                    <Input
+                      style={{ marginTop: "8px" }}
+                      disabled
+                      suffix={<LockOutlined style={{ color: "#BFBFBF" }} />}
+                      value={
+                        customExpiresFormat(new Date(formSetupKey.expires))!
+                      }
+                    />
+                  </Row>
+                </Col>
+              )}
+            </Row>
+            <Row style={{ marginTop: `${isGroupUpdateView ? "0" : "39px"}` }}>
+              <Col
+                xs={24}
+                sm={24}
+                md={!isGroupUpdateView ? 11 : 24}
+                lg={!isGroupUpdateView ? 11 : 24}
+                xl={!isGroupUpdateView ? 11 : 24}
+                xxl={!isGroupUpdateView ? 11 : 24}
+                span={!isGroupUpdateView ? 11 : 24}
+                style={{
+                  paddingRight: `${!isGroupUpdateView ? "70px" : "0"}`,
+                }}
+              >
+                <Paragraph
+                  style={{
+                    whiteSpace: "pre-line",
+                    margin: 0,
+                    fontWeight: "500",
+                  }}
+                >
+                  Auto-assigned groups
+                </Paragraph>
+
+                <Col span={24}>
+                  <Form.Item
+                    style={{ marginTop: "8px", marginBottom: 0 }}
+                    name="autoGroupNames"
+                    rules={[{ validator: selectValidator }]}
+                  >
+                    <Select
+                      mode="tags"
+                      style={{ width: "100%" }}
+                      placeholder="Associate groups with the key"
+                      tagRender={blueTagRender}
+                      dropdownRender={dropDownRender}
+                      optionFilterProp="searchValue"
+                    >
+                      {tagGroups.map((m, index) => (
+                        <Option key={index} value={m.id} serchValue={m.name}>
+                          {optionRender(m.name, m.id)}
+                        </Option>
+                      ))}
+                    </Select>
+                  </Form.Item>
+                </Col>
+              </Col>
+            </Row>
+          </Form>
+        </div>
+        <Container
+          style={{
+            display: "flex",
+            flexDirection: "row",
+            justifyContent: `${!isGroupUpdateView ? "start" : "end"}`,
+            padding: 0,
+            gap: "10px",
+            marginTop: "24px",
+          }}
+          key={0}
+        >
+          <Button onClick={onCancel}>Cancel</Button>
+          <Button
+            type="primary"
+            disabled={savedSetupKey.loading || !changesDetected()}
+            onClick={handleFormSubmit}
+          >
+            {`${formSetupKey.id ? "Save" : "Create"} key`}
+          </Button>
+        </Container>
+      </Card>
+    </>
+  );
+};
+
+export default SetupKeyNew;

src/components/SetupKeyNew.tsx

@@ -1,141 +1,616 @@
-import React, {useEffect, useState} from 'react';
-import {useDispatch, useSelector} from "react-redux";
-import { actions as setupKeyActions } from '../store/setup-key';
+import React, { useEffect, useRef, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { actions as setupKeyActions } from "../store/setup-key";
 import {
-    Col,
-    Row,
-    Typography,
-    Input,
-    Space,
-    Radio,
-    Button, Drawer, Form, List, Divider
+  Button,
+  Col,
+  Divider,
+  Form,
+  Input,
+  InputNumber,
+  Modal,
+  Row,
+  Select,
+  Switch,
+  Typography,
 } from "antd";
-import {RootState} from "typesafe-actions";
-import {QuestionCircleFilled} from "@ant-design/icons";
-import {SetupKey} from "../store/setup-key/types";
-import {useAuth0} from "@auth0/auth0-react";
+import { RootState } from "typesafe-actions";
+import {
+  FormSetupKey,
+  SetupKey,
+  SetupKeyToSave,
+} from "../store/setup-key/types";
+import { RuleObject } from "antd/lib/form";
+import { useGetTokenSilently } from "../utils/token";
+import { Container } from "./Container";
+import Paragraph from "antd/es/typography/Paragraph";
+import { CheckOutlined, CopyOutlined } from "@ant-design/icons";
+import { copyToClipboard } from "../utils/common";
+import { useGetGroupTagHelpers } from "../utils/groups";
+
+const { Option } = Select;
 const { Text } = Typography;
 
 const SetupKeyNew = () => {
-    const { getAccessTokenSilently } = useAuth0()
-    const dispatch = useDispatch()
-    const setupNewKeyVisible = useSelector((state: RootState) => state.setupKey.setupNewKeyVisible)
-    const setupKey =  useSelector((state: RootState) => state.setupKey.setupKey)
-    const createdSetupKey = useSelector((state: RootState) => state.setupKey.createdSetupKey)
+  const {
+    optionRender,
+    blueTagRender,
+    tagGroups,
+    getExistingAndToCreateGroupsLists,
+    setGroupTagFilterAll,
+  } = useGetGroupTagHelpers();
+  const { getTokenSilently } = useGetTokenSilently();
+  const dispatch = useDispatch();
+  const setupNewKeyVisible = useSelector(
+    (state: RootState) => state.setupKey.setupNewKeyVisible
+  );
+  const setupKey = useSelector((state: RootState) => state.setupKey.setupKey);
+  const savedSetupKey = useSelector(
+    (state: RootState) => state.setupKey.savedSetupKey
+  );
+  const groups = useSelector((state: RootState) => state.group.data);
 
-    const [formSetupKey, setFormSetupKey] = useState({} as SetupKey)
-    const [form] = Form.useForm()
+  const [form] = Form.useForm();
+  const [editName] = useState(false);
+  const [showPlainToken, setShowPlainToken] = useState(false);
+  const [plainToken, setPlainToken] = useState("");
+  const [tokenCopied, setTokenCopied] = useState(false);
+  const [formSetupKey, setFormSetupKey] = useState({} as FormSetupKey);
+  const inputNameRef = useRef<any>(null);
 
-    useEffect(() => {
-        setFormSetupKey({ ...setupKey } as SetupKey)
-        form.setFieldsValue(setupKey)
-    }, [setupKey])
+  useEffect(() => {
+    if (!editName) return;
 
-    const handleFormSubmit = () => {
-        form.validateFields()
-            .then((values) => {
-                dispatch(setupKeyActions.createSetupKey.request({getAccessTokenSilently, payload: formSetupKey}))
-            })
-            .catch((errorInfo) => {
-                console.log('errorInfo', errorInfo)
-            });
-    };
-    
-    const setVisibleNewSetupKey = (status:boolean) => {
-        dispatch(setupKeyActions.setSetupNewKeyVisible(status));
+    inputNameRef.current!.focus({ cursor: "end" });
+  }, [editName]);
+
+  useEffect(() => {
+    setGroupTagFilterAll(true);
+  }, []);
+
+  const createSetupKeyToSave = (): SetupKeyToSave => {
+    let [existingGroups, groupsToCreate] = getExistingAndToCreateGroupsLists(
+      formSetupKey.autoGroupNames || []
+    );
+    const expiresIn = formSetupKey.expires_in
+      ? formSetupKey.expires_in * 24 * 3600
+      : 7 * 24 * 3600; // the api expects seconds we have days
+
+    return {
+      id: formSetupKey.id,
+      name: formSetupKey.name,
+      type: formSetupKey.type ? formSetupKey.type : "one-off",
+      auto_groups: existingGroups,
+      revoked: formSetupKey.revoked,
+      groupsToCreate: groupsToCreate,
+      expires_in: expiresIn,
+      usage_limit: formSetupKey.usage_limit,
+      ephemeral: formSetupKey.ephemeral,
+    } as SetupKeyToSave;
+  };
+
+  const handleFormSubmit = async () => {
+    try {
+      await form.validateFields();
+    } catch (e) {
+      const errorFields = (e as any).errorFields;
+      return console.log("errorInfo", errorFields);
     }
 
-    const onCancel = () => {
-        if (createdSetupKey.loading) return
-        dispatch(setupKeyActions.setSetupKey({
-            name: '',
-            type: 'reusable'
-        } as SetupKey))
-        setVisibleNewSetupKey(false)
+    let setupKeyToSave = createSetupKeyToSave();
+    if (setupKeyToSave.type === "reusable") {
+      const updateUsageLimit =
+        setupKeyToSave.usage_limit === "unlimited" ||
+        setupKeyToSave.usage_limit === undefined ||
+        setupKeyToSave.usage_limit === " "
+          ? 0
+          : Number(setupKeyToSave.usage_limit);
+
+      setupKeyToSave = {
+        ...setupKeyToSave,
+        usage_limit: updateUsageLimit,
+      };
+    } else {
+      setupKeyToSave = {
+        ...setupKeyToSave,
+        usage_limit: 1,
+      };
     }
 
-    const onChange = (data:any) => {
-        setFormSetupKey({...formSetupKey, ...data})
+    dispatch(
+      setupKeyActions.saveSetupKey.request({
+        getAccessTokenSilently: getTokenSilently,
+        payload: setupKeyToSave,
+      })
+    );
+  };
+
+  const setVisibleNewSetupKey = (status: boolean) => {
+    form.resetFields();
+    setPlainToken("");
+    setShowPlainToken(false);
+    dispatch(setupKeyActions.setSetupNewKeyVisible(status));
+  };
+
+  useEffect(() => {
+    if (savedSetupKey.success) {
+      setPlainToken(savedSetupKey.data.key);
+      setShowPlainToken(true);
+    } else if (savedSetupKey.error) {
+      setPlainToken("");
+      setShowPlainToken(false);
+    }
+  }, [savedSetupKey]);
+
+  const onCancel = () => {
+    if (savedSetupKey.loading) return;
+
+    dispatch(
+      setupKeyActions.setSetupKey({
+        name: "",
+        type: "one-off",
+        key: "",
+        last_used: "",
+        expires: "7",
+        state: "valid",
+        auto_groups: [] as string[],
+        usage_limit: 0,
+        used_times: 0,
+        expires_in: 7,
+        ephemeral: false,
+      } as SetupKey)
+    );
+    setFormSetupKey({} as FormSetupKey);
+    setVisibleNewSetupKey(false);
+  };
+
+  const onChange = (data: any) => {
+    let ifReusbaleEdit = Object.keys(data).includes("reusable");
+
+    if (ifReusbaleEdit && data.reusable) {
+      form.setFieldValue("usage_limit", "unlimited");
+    }
+    if (ifReusbaleEdit && !data.reusable) {
+      form.setFieldValue("usage_limit", "1");
+    }
+    setFormSetupKey({ ...formSetupKey, ...data });
+  };
+
+  const selectValidator = (_: RuleObject, value: string[]) => {
+    let hasSpaceNamed = [];
+
+    value.forEach(function (v: string) {
+      if (!v.trim().length) {
+        hasSpaceNamed.push(v);
+      }
+    });
+
+    if (hasSpaceNamed.length) {
+      return Promise.reject(
+        new Error("Group names with just spaces are not allowed")
+      );
     }
 
+    return Promise.resolve();
+  };
+
+  const dropDownRender = (menu: React.ReactElement) => (
+    <>
+      {menu}
+      <Divider style={{ margin: "8px 0" }} />
+      <Row style={{ padding: "0 8px 4px" }}>
+        <Col flex="auto">
+          <span style={{ color: "#9CA3AF" }}>
+            Add new group by pressing "Enter"
+          </span>
+        </Col>
+        <Col flex="none">
+          <svg
+            width="14"
+            height="12"
+            viewBox="0 0 14 12"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M1.70455 7.19176V5.89915H10.3949C10.7727 5.89915 11.1174 5.80634 11.429 5.62074C11.7405 5.43513 11.9875 5.18655 12.1697 4.875C12.3554 4.56345 12.4482 4.21875 12.4482 3.84091C12.4482 3.46307 12.3554 3.12003 12.1697 2.81179C11.9841 2.50024 11.7356 2.25166 11.424 2.06605C11.1158 1.88044 10.7727 1.78764 10.3949 1.78764H9.83807V0.5H10.3949C11.0114 0.5 11.5715 0.650805 12.0753 0.952414C12.5791 1.25402 12.9818 1.65672 13.2834 2.16051C13.585 2.6643 13.7358 3.22443 13.7358 3.84091C13.7358 4.30161 13.648 4.73414 13.4723 5.13849C13.3 5.54285 13.0613 5.89915 12.7564 6.20739C12.4515 6.51562 12.0968 6.75758 11.6925 6.93324C11.2881 7.10559 10.8556 7.19176 10.3949 7.19176H1.70455ZM4.90128 11.0646L0.382102 6.54545L4.90128 2.02628L5.79119 2.91619L2.15696 6.54545L5.79119 10.1747L4.90128 11.0646Z"
+              fill="#9CA3AF"
+            />
+          </svg>
+        </Col>
+      </Row>
+    </>
+  );
+
+  const changesDetected = (): boolean => {
+     return (
+      formSetupKey.name == null ||
+      formSetupKey.name !== setupKey.name ||
+      formSetupKey?.usage_limit !== setupKey.usage_limit
+    );
+  };
+
+  const groupsChanged = (): boolean => {
+     if (
+      setupKey &&
+      setupKey?.auto_groups &&
+      formSetupKey?.autoGroupNames &&
+      formSetupKey?.autoGroupNames.length !== setupKey?.auto_groups.length
+    ) {
+      return true;
+    }
+    const formGroupIds =
+      groups
+        ?.filter((g) => formSetupKey?.autoGroupNames.includes(g.name))
+        .map((g) => g.id || "") || [];
 
     return (
-        <>
-        {setupKey &&
-        <Drawer
-            title="New setup key"
-            forceRender={true}
-            // width={512}
-            visible={setupNewKeyVisible}
-            bodyStyle={{paddingBottom: 80}}
-            onClose={onCancel}
-            footer={
-                <Space style={{display: 'flex', justifyContent: 'end'}}>
-                    <Button disabled={createdSetupKey.loading} onClick={onCancel}>Cancel</Button>
-                    <Button disabled={createdSetupKey.loading} type="primary" onClick={handleFormSubmit}>Create</Button>
-                </Space>
-            }
+      setupKey.auto_groups?.filter((g) => !formGroupIds.includes(g)).length > 0
+    );
+  };
+
+  const onCopyClick = (text: string, copied: boolean) => {
+    copyToClipboard(text);
+    setTokenCopied(true);
+    if (copied) {
+      setTimeout(() => {
+        onCopyClick(text, false);
+      }, 2000);
+    }
+  };
+
+  return (
+    <Modal
+      style={{
+        ...{ maxWidth: window.screen.availWidth <= 425 ? "90%" : "414px" },
+      }}
+      open={setupNewKeyVisible}
+      onCancel={onCancel}
+      footer={[
+        <Container
+          style={{
+            display: "flex",
+            flexDirection: "row",
+            justifyContent: "end",
+            padding: 0,
+          }}
+          key={0}
         >
-            <Form layout="vertical" hideRequiredMark form={form} onValuesChange={onChange}>
-                <Row gutter={16}>
-                    <Col span={24}>
-                        <Form.Item
-                            name="Name"
-                            label="Name"
-                            rules={[{required: true, message: 'Please enter key name'}]}
-                        >
-                            <Input placeholder="Please enter key name" autoComplete="off"/>
-                        </Form.Item>
-                    </Col>
-                    <Col span={24}>
-                        <Form.Item
-                            name="Type"
-                            label="Type"
-                            rules={[{required: true, message: 'Please enter key type'}]}
-                            style={{display: 'flex'}}
-                        >
-                            <Radio.Group style={{display: 'flex'}}>
-                                <Space direction="vertical" style={{flex: 1}}>
-                                    <List
-                                        size="large"
-                                        bordered
-                                    >
-                                        <List.Item>
-                                            <Radio value={"reusable"}>
-                                                <Space direction="vertical" size="small">
-                                                    <Text strong>Reusable</Text>
-                                                    <Text>This type of a setup key allows to setup multiple
-                                                        machine</Text>
-                                                </Space>
-                                            </Radio>
-                                        </List.Item>
-                                        <List.Item>
-                                            <Radio value={"one-off"}>
-                                                <Space direction="vertical" size="small">
-                                                    <Text strong>One-off</Text>
-                                                    <Text>This key can be used only once</Text>
-                                                </Space>
-                                            </Radio>
-                                        </List.Item>
-                                    </List>
+          {!showPlainToken && (
+            <>
+              <Button onClick={onCancel}>Cancel</Button>
+              <Button
+                type="primary"
+                style={{
+                  height: "100%",
+                  fontSize: "14px",
+                  borderRadius: "2px",
+                }}
+                disabled={savedSetupKey.loading || !!!formSetupKey.name}
+                onClick={handleFormSubmit}
+              >
+                Create key
+              </Button>
+            </>
+          )}
+          {showPlainToken && (
+            <Button
+              type="primary"
+              disabled={!showPlainToken}
+              onClick={onCancel}
+            >
+              Done
+            </Button>
+          )}
+        </Container>,
+      ]}
+    >
+      <Container
+        style={{
+          textAlign: "start",
+          marginLeft: "-15px",
+          marginRight: "-15px",
+        }}
+      >
+        <Paragraph
+          style={{
+            textAlign: "start",
+            whiteSpace: "pre-line",
+            fontSize: "18px",
+            fontWeight: "500",
+          }}
+        >
+          {showPlainToken
+            ? "Setup key created successfully!"
+            : " Create setup key"}
+        </Paragraph>
+        <Paragraph
+          type={"secondary"}
+          style={{
+            textAlign: "start",
+            whiteSpace: "pre-line",
+            marginTop: "-20px",
+            fontSize: "14px",
+            paddingBottom: "25px",
+            marginBottom: "4px",
+          }}
+        >
+          {showPlainToken
+            ? "This key will not be shown again, so be sure to copy it and store in a secure location"
+            : "Use this key to register new machines in your network"}
+        </Paragraph>
+        {!showPlainToken && (
+          <Form
+            layout="vertical"
+            requiredMark={false}
+            form={form}
+            onValuesChange={onChange}
+            initialValues={{
+              usage_limit: 1,
+              expires_in: 7,
+            }}
+          >
+            <Row>
+              <Col span={24}>
+                <Paragraph style={{ fontWeight: "500" }}>Name</Paragraph>
+                <Paragraph
+                  type={"secondary"}
+                  style={{ marginTop: "-15px", marginBottom: "-5px" }}
+                >
+                  Set an easily identifiable name for your key
+                </Paragraph>
+              </Col>
 
-                                </Space>
-                            </Radio.Group>
-                        </Form.Item>
-                    </Col>
-                    <Col span={24}>
-                        <Divider></Divider>
-                        <Button icon={<QuestionCircleFilled/>} type="link" target="_blank"
-                                href="https://docs.netbird.io/docs/overview/setup-keys" style={{color: 'rgb(07, 114, 128)'}}>Learn
-                            more about setup keys</Button>
-                    </Col>
+              <Col span={24}>
+                <Form.Item
+                  style={{ marginBottom: "0px", marginTop: "10px" }}
+                  name="name"
+                  rules={[
+                    { required: true, message: "Please enter key name." },
+                  ]}
+                >
+                  <Input placeholder={`e.g. "AWS servers"`} />
+                </Form.Item>
+              </Col>
+            </Row>
+
+            <Row style={{ marginTop: "24px" }} justify={"space-between"}>
+              <Col span={18}>
+                <Paragraph
+                  style={{
+                    whiteSpace: "pre-line",
+                    margin: 0,
+                    fontWeight: "500",
+                  }}
+                >
+                  Reusable
+                </Paragraph>
+                <Paragraph
+                  type={"secondary"}
+                  style={{ whiteSpace: "pre-line", margin: 0 }}
+                >
+                  Use this type to enroll multiple peers
+                </Paragraph>
+              </Col>
+              <Col span={6}>
+                <Row justify={"end"}>
+                  <Form.Item name="reusable" valuePropName="checked">
+                    <Switch
+                      size="small"
+                      onChange={(checked) => {
+                        setFormSetupKey({
+                          ...formSetupKey,
+                          type: checked ? "reusable" : "one-off",
+                        });
+                      }}
+                    />
+                  </Form.Item>
                 </Row>
-            </Form>
+              </Col>
+            </Row>
 
-        </Drawer>
-        }
-        </>
-    )
-}
+            <Row style={{ marginTop: "16px" }}>
+              <Col span={24}>
+                <Paragraph
+                  style={{
+                    whiteSpace: "pre-line",
+                    margin: 0,
+                    fontWeight: "500",
+                  }}
+                >
+                  Usage limit
+                </Paragraph>
+              </Col>
 
-export default SetupKeyNew
+              <Col>
+                <Form.Item
+                  name="usage_limit"
+                  rules={[
+                    {
+                      pattern: new RegExp(/(^unlimited$|[0-9])/),
+                      message: "Please enter correct usage limit.",
+                    },
+                  ]}
+                >
+                  <Input
+                    type={"text"}
+                    style={{ marginTop: "5px", width: "112px" }}
+                    disabled={setupKey.id || formSetupKey.type !== "reusable"}
+                  />
+                </Form.Item>
+                <Paragraph
+                  type={"secondary"}
+                  style={{ marginTop: "-18px", marginBottom: 0 }}
+                >
+                  For example, set to 30 if you want to enroll 30 peers
+                </Paragraph>
+              </Col>
+            </Row>
+
+            <Row style={{ marginTop: "24px" }}>
+              <Col span={24}>
+                <Paragraph
+                  style={{
+                    whiteSpace: "pre-line",
+                    margin: 0,
+                    fontWeight: "500",
+                  }}
+                >
+                  Expires in
+                </Paragraph>
+              </Col>
+              <Col>
+                <Form.Item
+                  name="expires_in"
+                  rules={[
+                    {
+                      type: "number",
+                      min: 1,
+                      max: 365,
+                      message:
+                        "The expiration should be set between 1 and 365 days",
+                    },
+                    { required: true, message: "Please enter expiration date" },
+                  ]}
+                >
+                  <InputNumber
+                    placeholder={`2`}
+                    type="number"
+                    addonAfter=" Days"
+                    value={setupKey.expires_in}
+                    style={{ width: "160px", marginTop: "5px" }}
+                  />
+                </Form.Item>
+                <Paragraph
+                  type={"secondary"}
+                  style={{ marginTop: "-18px", marginBottom: 0 }}
+                >
+                  Should be between 1 and 365 days
+                </Paragraph>
+              </Col>
+            </Row>
+
+            <Row style={{ marginTop: "24px" }} justify={"space-between"}>
+              <Col span={18}>
+                <Paragraph
+                  style={{
+                    whiteSpace: "pre-line",
+                    margin: 0,
+                    fontWeight: "500",
+                  }}
+                >
+                  Ephemeral peers
+                </Paragraph>
+                <Paragraph
+                  type={"secondary"}
+                  style={{ whiteSpace: "pre-line", margin: 0 }}
+                >
+                  Peers that are offline for over 10 minutes will be removed
+                  automatically
+                </Paragraph>
+              </Col>
+              <Col span={6}>
+                <Row justify={"end"}>
+                  <Form.Item name="ephemeral" valuePropName="checked">
+                    <Switch
+                      size="small"
+                      onChange={(checked) => {
+                        setFormSetupKey({
+                          ...formSetupKey,
+                          ephemeral: checked,
+                        });
+                      }}
+                    />
+                  </Form.Item>
+                </Row>
+              </Col>
+            </Row>
+
+            <Row style={{ marginTop: "24px" }}>
+              <Col span={24}>
+                <Paragraph
+                  style={{
+                    whiteSpace: "pre-line",
+                    margin: 0,
+                    fontWeight: "500",
+                  }}
+                >
+                  Auto-assigned groups
+                </Paragraph>
+                <Text type={"secondary"}>
+                  These groups will be automatically assigned to peers enrolled
+                  with this key
+                </Text>
+              </Col>
+              <Col span={24}>
+                <Form.Item
+                  style={{ marginTop: "5px", marginBottom: 0 }}
+                  name="autoGroupNames"
+                >
+                  <Select
+                    mode="tags"
+                    style={{ width: "100%" }}
+                    placeholder="Associate groups with the key"
+                    tagRender={blueTagRender}
+                    dropdownRender={dropDownRender}
+                    // enabled only when we have a new key !setupkey.id or when the key is valid
+                    disabled={!(!setupKey.id || setupKey.valid)}
+                    optionFilterProp="serchValue"
+                  >
+                    {tagGroups.map((m, index) => (
+                      <Option key={index} value={m.id} serchValue={m.name}>
+                        {optionRender(m.name, m.id)}
+                      </Option>
+                    ))}
+                  </Select>
+                </Form.Item>
+              </Col>
+            </Row>
+            <Row style={{ marginTop: "24px", marginBottom: "24px" }}>
+              <Text type={"secondary"}>
+                Learn more about
+                <a
+                  target="_blank"
+                  rel="noreferrer"
+                  href="https://docs.netbird.io/how-to/register-machines-using-setup-keys"
+                >
+                  {" "}
+                  setup keys
+                </a>
+              </Text>
+            </Row>
+          </Form>
+        )}
+        {showPlainToken && (
+          <Input
+            style={{ marginTop: "-15px", marginBottom: "25px" }}
+            suffix={
+              !tokenCopied ? (
+                <Button
+                  type="text"
+                  size="middle"
+                  className="btn-copy-code"
+                  icon={<CopyOutlined />}
+                  style={{ color: "rgb(107, 114, 128)", marginTop: "-1px" }}
+                  onClick={() => onCopyClick(plainToken, true)}
+                />
+              ) : (
+                <Button
+                  type="text"
+                  size="middle"
+                  className="btn-copy-code"
+                  icon={<CheckOutlined />}
+                  style={{ color: "green", marginTop: "-1px" }}
+                />
+              )
+            }
+            defaultValue={plainToken}
+            readOnly={true}
+          ></Input>
+        )}
+      </Container>
+    </Modal>
+  );
+};
+
+export default SetupKeyNew;

src/components/UpdateKeyGroupModal.tsx

@@ -0,0 +1,21 @@
+import React, { useEffect, useState } from "react";
+import { Modal } from "antd";
+import SetupKeyNew from "./SetupKeyEdit";
+export const UpdateKeyGroupModal = (props:any) => {
+  return (
+    <>
+      <Modal
+        closable={false}
+        open={true}
+        footer={[]}
+        onCancel={() => props.setShowGroupModal(false)}
+        width={450}
+      >
+        <SetupKeyNew
+          isGroupUpdateView={true}
+          setShowGroupModal={props.setShowGroupModal}
+        />
+      </Modal>
+    </>
+  );
+};

src/components/UpdateNameServerGroupModal.tsx

@@ -0,0 +1,21 @@
+import React, { useEffect, useState } from "react";
+import { Modal } from "antd";
+import NameServerGroupUpdate from "./NameServerGroupUpdate";
+export const UpdateNameServerGroupModal = (props:any) => {
+  return (
+    <>
+      <Modal
+        closable={false}
+        open={true}
+        footer={[]}
+        onCancel={() => props.setShowGroupModal(false)}
+        width={450}
+      >
+        <NameServerGroupUpdate
+          isGroupUpdateView={true}
+          setShowGroupModal={props.setShowGroupModal}
+        />
+      </Modal>
+    </>
+  );
+};

src/components/UpdatePeerGroupModal.tsx

@@ -0,0 +1,21 @@
+import React, { useEffect, useState } from "react";
+import { Modal } from "antd";
+import PeerUpdate from "./PeerUpdate";
+export const UpdatePeerGroupModal = (props:any) => {
+  return (
+    <>
+      <Modal
+        closable={false}
+        open={true}
+        footer={[]}
+        onCancel={() => props.setShowGroupModal(false)}
+        width={450}
+      >
+        <PeerUpdate
+          isGroupUpdateView={true}
+          setShowGroupModal={props.setShowGroupModal}
+        />
+      </Modal>
+    </>
+  );
+};

src/components/UpdateUsersGroupModal.tsx

@@ -0,0 +1,24 @@
+import React, { useEffect, useState } from "react";
+import { Modal } from "antd";
+import UserEdit from "./UserEdit";
+
+export const UpdateUsersGroupModal = (props: any) => {
+  return (
+    <>
+      <Modal
+        closable={false}
+        open={true}
+        footer={[]}
+        onCancel={() => props.setShowGroupModal(false)}
+        width={450}
+      >
+        {props.showGroupModal && (
+          <UserEdit
+            isGroupUpdateView={true}
+            setShowGroupModal={props.setShowGroupModal}
+          />
+        )}
+      </Modal>
+    </>
+  );
+};

src/components/UserEdit.tsx

@@ -0,0 +1,742 @@
+import {
+  Badge,
+  Breadcrumb,
+  Button,
+  Card,
+  Col,
+  Divider,
+  Form,
+  Input,
+  List,
+  Modal,
+  Row,
+  Select,
+  Skeleton,
+  Space,
+  Switch,
+  Table,
+  Tag,
+  Typography,
+} from "antd";
+import { useDispatch, useSelector } from "react-redux";
+import { RootState } from "typesafe-actions";
+import { actions as userActions } from "../store/user";
+import { FormUser, User, UserToSave } from "../store/user/types";
+import { useGetTokenSilently } from "../utils/token";
+import React, { useEffect, useState } from "react";
+import { RuleObject } from "antd/lib/form";
+import { CustomTagProps } from "rc-select/lib/BaseSelect";
+import { actions as groupActions } from "../store/group";
+import { actions as personalAccessTokenActions } from "../store/personal-access-token";
+import {
+  PersonalAccessToken,
+  PersonalAccessTokenCreate,
+  SpecificPAT,
+} from "../store/personal-access-token/types";
+import tableSpin from "./Spin";
+import AddPATPopup from "./popups/AddPATPopup";
+import { fullDate } from "../utils/common";
+import { ExclamationCircleOutlined } from "@ant-design/icons";
+import Column from "antd/lib/table/Column";
+import { useOidcUser } from "@axa-fr/react-oidc";
+import { useGetGroupTagHelpers } from "../utils/groups";
+
+const { Option } = Select;
+const { Meta } = Card;
+const { Title, Paragraph, Text } = Typography;
+
+interface TokenDataTable extends PersonalAccessToken {
+  key: string;
+  status: string;
+  created_by_email: string;
+}
+
+const UserEdit = (props: any) => {
+  const { isGroupUpdateView, setShowGroupModal } = props;
+
+  const { getTokenSilently } = useGetTokenSilently();
+  const dispatch = useDispatch();
+  const { optionRender, blueTagRender, tagGroups, handleChangeTags } =
+    useGetGroupTagHelpers();
+
+  const groups = useSelector((state: RootState) => state.group.data);
+  const users = useSelector((state: RootState) => state.user.data);
+  const user = useSelector((state: RootState) => state.user.user);
+  const savedUser = useSelector((state: RootState) => state.user.savedUser);
+  const personalAccessTokens = useSelector(
+    (state: RootState) => state.personalAccessToken.data
+  );
+  const tab = useSelector((state: RootState) => state.user.userTabOpen);
+
+  const loading = useSelector((state: RootState) => state.user.loading);
+
+  const { oidcUser } = useOidcUser();
+  const [tokenTable, setTokenTable] = useState([] as TokenDataTable[]);
+
+  // const [tagGroups, setTagGroups] = useState([] as string[])
+  const [currentGroups, setCurrentGroups] = useState([] as string[]);
+
+  const [formUser, setFormUser] = useState({} as FormUser);
+  const [form] = Form.useForm();
+  const [isAdmin, setIsAdmin] = useState(false);
+
+  const [confirmModal, confirmModalContextHolder] = Modal.useModal();
+
+  const onCancel = () => {
+    if (savedUser.loading) return;
+    dispatch(userActions.setUser(null as unknown as User));
+    dispatch(personalAccessTokenActions.resetPersonalAccessTokens(null));
+    setFormUser({} as FormUser);
+    dispatch(userActions.setEditUserPopupVisible(false));
+    if (setShowGroupModal) {
+      setShowGroupModal(false);
+    }
+  };
+
+  const createUserToSave = (values: any): UserToSave => {
+    const autoGroups =
+      groups
+        ?.filter((g) => values.autoGroupsNames.includes(g.id))
+        .map((g) => g.id || "") || [];
+    // find groups that do not yet exist (newly added by the user)
+    const allGroupsNames: string[] = groups?.map((g) => g.id || "");
+    const groupsToCreate = values.autoGroupsNames.filter(
+      (s: string) => !allGroupsNames.includes(s)
+    );
+    let userID = user ? user.id : "";
+    let isServiceUser = user ? user?.is_service_user : false;
+    return {
+      id: userID,
+      role: values.role,
+      name: values.name,
+      groupsToCreate: groupsToCreate,
+      auto_groups: autoGroups,
+      is_service_user: isServiceUser,
+      is_blocked: values.is_blocked,
+    } as UserToSave;
+  };
+
+  useEffect(() => {
+    if (users) {
+      let currentUser = users.find((user) => user?.is_current);
+      if (currentUser) {
+        setIsAdmin(currentUser.role === "admin");
+      }
+    }
+  }, [users]);
+
+  const handleFormSubmit = () => {
+    form
+      .validateFields()
+      .then((values) => {
+        let userToSave = createUserToSave(values);
+        dispatch(
+          userActions.saveUser.request({
+            getAccessTokenSilently: getTokenSilently,
+            payload: userToSave,
+          })
+        );
+        dispatch(userActions.setEditUserPopupVisible(false));
+        dispatch(userActions.setUser(null as unknown as User));
+        dispatch(personalAccessTokenActions.resetPersonalAccessTokens(null));
+        if (setShowGroupModal) {
+          setShowGroupModal(false);
+        }
+      })
+      .catch((errorInfo) => {
+        console.log("errorInfo", errorInfo);
+      });
+  };
+
+  const onClickAddNewPersonalAccessToken = () => {
+    dispatch(
+      personalAccessTokenActions.setPersonalAccessToken({
+        user_id: "",
+        name: "",
+        expires_in: 7,
+      } as PersonalAccessTokenCreate)
+    );
+    dispatch(
+      personalAccessTokenActions.setNewPersonalAccessTokenPopupVisible(true)
+    );
+  };
+
+  const onBreadcrumbUsersClick = (key: string) => {
+    if (savedUser.loading) return;
+    dispatch(userActions.setUser(null as unknown as User));
+    dispatch(personalAccessTokenActions.resetPersonalAccessTokens(null));
+    dispatch(userActions.setUserTabOpen(key));
+    dispatch(userActions.setEditUserPopupVisible(false));
+  };
+
+  const selectValidator = (_: RuleObject, value: string[]) => {
+    let hasSpaceNamed = [];
+
+    value.forEach(function (v: string) {
+      if (!v.trim().length) {
+        hasSpaceNamed.push(v);
+      }
+    });
+
+    if (hasSpaceNamed.length) {
+      return Promise.reject(
+        new Error("Group names with just spaces are not allowed")
+      );
+    }
+
+    return Promise.resolve();
+  };
+
+  const dropDownRender = (menu: React.ReactElement) => (
+    <>
+      {menu}
+      <Divider style={{ margin: "8px 0" }} />
+      <Row style={{ padding: "0 8px 4px" }}>
+        <Col flex="auto">
+          <span style={{ color: "#9CA3AF" }}>
+            Add new group by pressing "Enter"
+          </span>
+        </Col>
+        <Col flex="none">
+          <svg
+            width="14"
+            height="12"
+            viewBox="0 0 14 12"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M1.70455 7.19176V5.89915H10.3949C10.7727 5.89915 11.1174 5.80634 11.429 5.62074C11.7405 5.43513 11.9875 5.18655 12.1697 4.875C12.3554 4.56345 12.4482 4.21875 12.4482 3.84091C12.4482 3.46307 12.3554 3.12003 12.1697 2.81179C11.9841 2.50024 11.7356 2.25166 11.424 2.06605C11.1158 1.88044 10.7727 1.78764 10.3949 1.78764H9.83807V0.5H10.3949C11.0114 0.5 11.5715 0.650805 12.0753 0.952414C12.5791 1.25402 12.9818 1.65672 13.2834 2.16051C13.585 2.6643 13.7358 3.22443 13.7358 3.84091C13.7358 4.30161 13.648 4.73414 13.4723 5.13849C13.3 5.54285 13.0613 5.89915 12.7564 6.20739C12.4515 6.51562 12.0968 6.75758 11.6925 6.93324C11.2881 7.10559 10.8556 7.19176 10.3949 7.19176H1.70455ZM4.90128 11.0646L0.382102 6.54545L4.90128 2.02628L5.79119 2.91619L2.15696 6.54545L5.79119 10.1747L4.90128 11.0646Z"
+              fill="#9CA3AF"
+            />
+          </svg>
+        </Col>
+      </Row>
+    </>
+  );
+
+  const transformTokenTable = (d: PersonalAccessToken[]): TokenDataTable[] => {
+    if (!d) {
+      return [];
+    }
+    return d.map(
+      (p) =>
+        ({
+          key: p.id,
+          status:
+            Date.parse(p.expiration_date) > Date.now() ? "valid" : "expired",
+          created_by_email: getEmail(p),
+          ...p,
+        } as TokenDataTable)
+    );
+  };
+
+  const getEmail = (token: PersonalAccessToken): string => {
+    return users.find((u) => u.id === token.created_by)?.email || "";
+  };
+
+  const showConfirmDelete = (token: TokenDataTable) => {
+    confirmModal.confirm({
+      icon: <ExclamationCircleOutlined />,
+      title: <span className="font-500">Delete token {token.name}</span>,
+      width: 600,
+      content: (
+        <Space direction="vertical" size="small">
+          <Paragraph>Are you sure you want to delete this token?</Paragraph>
+        </Space>
+      ),
+      onOk() {
+        dispatch(
+          personalAccessTokenActions.deletePersonalAccessToken.request({
+            getAccessTokenSilently: getTokenSilently,
+            payload: {
+              user_id: user.id,
+              id: token.id,
+              name: token.name,
+            } as SpecificPAT,
+          })
+        );
+      },
+      onCancel() {
+        // noop
+      },
+    });
+  };
+
+  useEffect(() => {
+    setTokenTable(transformTokenTable(personalAccessTokens));
+  }, [personalAccessTokens, users]);
+
+  useEffect(() => {
+    if (user) {
+      // @ts-ignore
+      setCurrentGroups(groups.filter((g) => g.name != "All" && user.auto_groups.includes(g.id)).map((g) => g.id) || []
+      );
+    }
+  }, [groups, user]);
+
+  useEffect(() => {
+    dispatch(
+      userActions.getUsers.request({
+        getAccessTokenSilently: getTokenSilently,
+        payload: null,
+      })
+    );
+    dispatch(
+      groupActions.getGroups.request({
+        getAccessTokenSilently: getTokenSilently,
+        payload: null,
+      })
+    );
+  }, []);
+
+  useEffect(() => {
+    if (user?.is_current || user?.is_service_user) {
+      dispatch(
+        personalAccessTokenActions.getPersonalAccessTokens.request({
+          getAccessTokenSilently: getTokenSilently,
+          payload: user.id,
+        })
+      );
+    }
+  }, [user]);
+
+  useEffect(() => {
+    if (user && currentGroups) {
+      form.setFieldsValue({
+        name: user.name,
+        role: user.role,
+        email: user.email,
+        is_blocked: user.is_blocked,
+        autoGroupsNames: currentGroups,
+      });
+    }
+  }, [form, user, currentGroups]);
+
+  return (
+    <>
+      <div style={{ paddingTop: "13px" }}>
+        {!isGroupUpdateView && (
+          <Breadcrumb
+            style={{ marginBottom: "30px" }}
+            items={[
+              {
+                title: (
+                  <a onClick={() => onBreadcrumbUsersClick("Users")}>
+                    All Users
+                  </a>
+                ),
+              },
+              {
+                title: <a onClick={() => onBreadcrumbUsersClick(tab)}>{tab}</a>,
+                // menu: { items: menuItems },
+              },
+              {
+                title: user?.name,
+              },
+            ]}
+          />
+        )}
+        <Card
+          className={isGroupUpdateView ? " noborderPadding" : ""}
+          bordered={true}
+          loading={loading}
+          style={{ marginBottom: "7px" }}
+        >
+          <h3
+            style={{
+              fontSize: "22px",
+              fontWeight: "500",
+              marginBottom: "25px",
+            }}
+            className={isGroupUpdateView ? "d-none" : ""}
+          >
+            {user?.name}
+          </h3>
+
+          <div style={{ maxWidth: "800px" }}>
+            <Form
+              layout="vertical"
+              hideRequiredMark
+              form={form}
+              initialValues={{
+                name: formUser.name,
+                role: formUser.role,
+                email: formUser.email,
+                is_blocked: formUser.is_blocked,
+                autoGroupsNames: formUser.autoGroupsNames,
+              }}
+            >
+              <Row
+                style={{ paddingBottom: "15px" }}
+                className={isGroupUpdateView ? "d-none" : ""}
+              >
+                {!user?.is_service_user && (
+                  <Col
+                    xs={24}
+                    sm={24}
+                    md={11}
+                    lg={11}
+                    xl={11}
+                    xxl={11}
+                    span={11}
+                  >
+                    <Form.Item
+                      name="email"
+                      label={<Text style={{}}>Email</Text>}
+                      style={{ marginRight: "70px", fontWeight: "500" }}
+                    >
+                      <Input
+                        disabled={user?.id}
+                        value={formUser.email}
+                        style={{ color: "#8c8c8c" }}
+                        autoComplete="off"
+                      />
+                    </Form.Item>
+                  </Col>
+                )}
+                <Col xs={24} sm={24} md={5} lg={5} xl={5} xxl={5} span={5}>
+                  <Form.Item
+                    name="role"
+                    label={<Text style={{ fontWeight: "500" }}>Role</Text>}
+                    style={{ marginRight: "50px", fontWeight: "500" }}
+                  >
+                    <Select
+                      style={{ width: "100%" }}
+                      disabled={user?.is_current}
+                    >
+                      <Option value="admin">
+                        <Text type={"secondary"}>admin</Text>
+                      </Option>
+                      <Option value="user">
+                        <Text type={"secondary"}>user</Text>
+                      </Option>
+                    </Select>
+                  </Form.Item>
+                </Col>
+              </Row>
+              {!user?.is_service_user && (
+                <Row style={{ paddingBottom: "15px" }}>
+                  <Col
+                    xs={24}
+                    sm={24}
+                    md={isGroupUpdateView ? 24 : 11}
+                    lg={isGroupUpdateView ? 24 : 11}
+                    xl={isGroupUpdateView ? 24 : 11}
+                    xxl={isGroupUpdateView ? 24 : 11}
+                    span={isGroupUpdateView ? 24 : 11}
+                  >
+                    <Form.Item
+                      name="autoGroupsNames"
+                      label={
+                        <Text style={{ fontWeight: "500" }}>
+                          Auto-assigned groups
+                        </Text>
+                      }
+                      tooltip="Every peer enrolled with this user will be automatically added to these groups"
+                      rules={[{ validator: selectValidator }]}
+                      style={{
+                        marginRight: `${!isGroupUpdateView ? "70px" : "0"}`,
+                      }}
+                    >
+                      <Select
+                        mode="tags"
+                        placeholder="Associate groups with the user"
+                        tagRender={blueTagRender}
+                        dropdownRender={dropDownRender}
+                        disabled={!isAdmin}
+                        optionFilterProp="serchValue"
+                      >
+                        {tagGroups.map((m, index) => (
+                          <Option key={index} value={m.id} serchValue={m.name}>
+                            {optionRender(m.name, m.id)}
+                          </Option>
+                        ))}
+                      </Select>
+                    </Form.Item>
+                  </Col>
+
+                  {!user?.is_current && isAdmin && (
+                    <Col
+                      xs={24}
+                      sm={24}
+                      md={5}
+                      lg={5}
+                      xl={5}
+                      xxl={5}
+                      span={5}
+                      className={isGroupUpdateView ? "d-none" : ""}
+                    >
+                      <Form.Item
+                        valuePropName="checked"
+                        name="is_blocked"
+                        label="Block user"
+                        style={{ marginRight: "50px", fontWeight: "500" }}
+                      >
+                        <Switch />
+                      </Form.Item>
+                    </Col>
+                  )}
+                </Row>
+              )}
+              <Space
+                style={{
+                  display: "flex",
+                  justifyContent: `${!isGroupUpdateView ? "start" : "end"}`,
+                }}
+              >
+                <Button disabled={loading} onClick={onCancel}>
+                  Cancel
+                </Button>
+                <Button type="primary" onClick={handleFormSubmit}>
+                  Save
+                </Button>
+              </Space>
+            </Form>
+          </div>
+        </Card>
+
+        {user &&
+          !isGroupUpdateView &&
+          (user?.is_current || user?.is_service_user) && (
+            <Card
+              bordered={true}
+              loading={loading}
+              style={{ marginBottom: "7px" }}
+            >
+              <div style={{ maxWidth: "800px" }}>
+                <Paragraph
+                  style={{
+                    textAlign: "left",
+                    whiteSpace: "pre-line",
+                    fontSize: "18px",
+                    fontWeight: "500",
+                  }}
+                >
+                  Access tokens
+                </Paragraph>
+                <Row
+                  gutter={21}
+                  style={{ marginTop: "-16px", marginBottom: "10px" }}
+                >
+                  <Col
+                    xs={24}
+                    sm={24}
+                    md={20}
+                    lg={20}
+                    xl={20}
+                    xxl={20}
+                    span={20}
+                  >
+                    <Paragraph
+                      type={"secondary"}
+                      style={{ textAlign: "left", whiteSpace: "pre-line" }}
+                    >
+                      Access tokens give access to NetBird API
+                    </Paragraph>
+                  </Col>
+                  <Col
+                    xs={24}
+                    sm={24}
+                    md={1}
+                    lg={1}
+                    xl={1}
+                    xxl={1}
+                    span={1}
+                    style={{ marginTop: "-16px" }}
+                  >
+                    {personalAccessTokens &&
+                      personalAccessTokens.length > 0 && (
+                        <Button
+                          type="primary"
+                          onClick={onClickAddNewPersonalAccessToken}
+                        >
+                          Create token
+                        </Button>
+                      )}
+                  </Col>
+                </Row>
+                {personalAccessTokens && personalAccessTokens.length > 0 && (
+                  <Table
+                    size={"small"}
+                    style={{ marginTop: "-10px" }}
+                    showHeader={false}
+                    scroll={{ x: 800 }}
+                    pagination={false}
+                    loading={tableSpin(loading)}
+                    dataSource={tokenTable}
+                  >
+                    <Column
+                      className={"non-highlighted-table-column"}
+                      sorter={(a, b) =>
+                        (a as TokenDataTable).created_at.localeCompare(
+                          (b as TokenDataTable).created_at
+                        )
+                      }
+                      defaultSortOrder="descend"
+                      render={(text, record, index) => {
+                        return (
+                          <>
+                            <Row>
+                              <Col>
+                                <Badge
+                                  status={
+                                    (record as TokenDataTable).status ===
+                                    "valid"
+                                      ? "success"
+                                      : "error"
+                                  }
+                                  style={{
+                                    marginTop: "1px",
+                                    marginRight: "5px",
+                                    marginLeft: "0px",
+                                  }}
+                                />
+                              </Col>
+                              <Col>
+                                <Paragraph
+                                  style={{
+                                    margin: "0px",
+                                    padding: "0px",
+                                  }}
+                                >
+                                  {(record as TokenDataTable).name}
+                                </Paragraph>
+                                <Paragraph
+                                  type={"secondary"}
+                                  style={{
+                                    fontSize: "13px",
+                                    fontWeight: "400",
+                                    margin: "0px",
+                                    marginTop: "-2px",
+                                    padding: "0px",
+                                  }}
+                                >
+                                  {"Created" +
+                                    ((record as TokenDataTable)
+                                      .created_by_email && user?.is_service_user
+                                      ? " by " +
+                                        (record as TokenDataTable)
+                                          .created_by_email
+                                      : "") +
+                                    " on " +
+                                    fullDate(
+                                      (record as TokenDataTable).created_at
+                                    )}
+                                </Paragraph>
+                              </Col>
+                            </Row>
+                          </>
+                        );
+                      }}
+                    />
+                    <Column
+                      render={(text, record, index) => {
+                        return (
+                          <>
+                            <Paragraph
+                              type={"secondary"}
+                              style={{ textAlign: "left", fontSize: "11px" }}
+                            >
+                              Expires on
+                            </Paragraph>
+                            <Paragraph
+                              type={"secondary"}
+                              style={{
+                                textAlign: "left",
+                                marginTop: "-10px",
+                                marginBottom: "0",
+                                fontSize: "15px",
+                              }}
+                            >
+                              {fullDate(
+                                (record as TokenDataTable).expiration_date
+                              )}
+                            </Paragraph>
+                          </>
+                        );
+                      }}
+                    />
+                    <Column
+                      render={(text, record, index) => {
+                        return (
+                          <>
+                            <Paragraph
+                              type={"secondary"}
+                              style={{ textAlign: "left", fontSize: "11px" }}
+                            >
+                              Last used
+                            </Paragraph>
+                            <Paragraph
+                              type={"secondary"}
+                              style={{
+                                textAlign: "left",
+                                marginTop: "-10px",
+                                marginBottom: "0",
+                                fontSize: "15px",
+                              }}
+                            >
+                              {(record as TokenDataTable).last_used
+                                ? fullDate((record as TokenDataTable).last_used)
+                                : "Never"}
+                            </Paragraph>
+                          </>
+                        );
+                      }}
+                    />
+                    <Column
+                      align="right"
+                      render={(text, record, index) => {
+                        return (
+                          <Button
+                            danger={true}
+                            type={"text"}
+                            onClick={() => {
+                              showConfirmDelete(record as TokenDataTable);
+                            }}
+                          >
+                            Delete
+                          </Button>
+                        );
+                      }}
+                    />
+                  </Table>
+                )}
+                <Divider style={{ marginTop: "-12px" }}></Divider>
+                {(personalAccessTokens === null ||
+                  personalAccessTokens.length === 0) && (
+                  <Space
+                    direction="vertical"
+                    size="small"
+                    align="start"
+                    style={{
+                      display: "flex",
+                      padding: "35px 0px",
+                      marginTop: "-40px",
+                      justifyContent: "center",
+                    }}
+                  >
+                    <Paragraph
+                      style={{ textAlign: "start", whiteSpace: "pre-line" }}
+                    >
+                      You don’t have any access tokens yet
+                    </Paragraph>
+                    <Button
+                      type="primary"
+                      onClick={onClickAddNewPersonalAccessToken}
+                    >
+                      Create token
+                    </Button>
+                  </Space>
+                )}
+              </div>
+            </Card>
+          )}
+      </div>
+      <AddPATPopup />
+      {confirmModalContextHolder}
+    </>
+  );
+};
+
+export default UserEdit;

src/components/addpeer/LinuxTab.tsx

@@ -1,28 +0,0 @@
-import { useState } from 'react';
-
-import { Button } from "antd";
-import TabSteps from "./TabSteps";
-import { StepCommand } from "./types"
-
-
-export const OtherTab = () => {
-
-    const [steps, _] = useState([
-        {
-            key: 1,
-            title: 'For other installation options check our documentation.',
-            commands: (
-                <Button type="primary" href={`https://netbird.io/docs/getting-started/installation#binary-install`} target="_blank">
-                    Documentation
-                </Button>
-            ),
-            copied: false,
-        } as StepCommand,
-    ])
-
-    return (
-        <TabSteps stepsItems={steps} />
-    )
-}
-
-export default OtherTab

src/components/addpeer/MacTab.tsx

@@ -1,55 +0,0 @@
-import React, {useState} from 'react';
-
-import { Button } from "antd";
-import TabSteps from "./TabSteps";
-import { StepCommand } from "./types"
-
-export const LinuxTab = () => {
-
-    const [steps, setSteps] = useState([
-        {
-            key: 1,
-            title: 'Download and install Brew (package manager)',
-            commands: (
-                <Button type="primary" href="https://brew.sh/" target="_blank">Download Brew</Button>
-            ),
-            copied: false
-        } as StepCommand,
-        {
-            key: 2,
-            title: 'Install NetBird:',
-            commands: [
-                `# for CLI only`,
-                `brew install netbirdio/tap/netbird`,
-                `# for GUI package`,
-                `brew install --cask netbirdio/tap/netbird-ui`
-            ].join('\n'),
-            copied: false,
-            showCopyButton: true
-        } as StepCommand,
-        {
-            key: 3,
-            title: 'Run NetBird and log in the browser:',
-            commands: [
-                `sudo netbird up`
-            ].join('\n'),
-            copied: false,
-            showCopyButton: true
-        } as StepCommand,
-        {
-            key: 4,
-            title: 'Get your IP address:',
-            commands: [
-                `sudo ifconfig utun100`
-            ].join('\n'),
-            copied: false,
-            showCopyButton: true
-        } as StepCommand
-    ])
-
-    return (
-        <TabSteps stepsItems={steps}/>
-    )
-}
-
-export default LinuxTab

src/components/addpeer/TabSteps.tsx

@@ -1,79 +0,0 @@
-import {useDispatch, useSelector} from "react-redux";
-import Highlight from 'react-highlight';
-import "highlight.js/styles/mono-blue.css";
-import "highlight.js/lib/languages/bash";
-import { StepCommand } from './types'
-
-import {
-    Typography,
-    Space,
-    Steps, Button
-} from "antd";
-import {copyToClipboard} from "../../utils/common";
-import {CheckOutlined, CopyOutlined} from "@ant-design/icons";
-import React, {useEffect, useState} from "react";
-
-const { Title, Text } = Typography;
-const { Step } = Steps;
-
-type Props = {
-    stepsItems: Array<StepCommand>
-};
-
-const TabSteps:React.FC<Props> = ({stepsItems}) => {
-
-    const [steps, setSteps] = useState(stepsItems)
-
-    useEffect(() => setSteps(stepsItems), [stepsItems])
-
-    const onCopyClick = (key: string | number, commands:React.ReactNode | string, copied: boolean) => {
-        if (!(typeof commands === 'string')) return
-        copyToClipboard(commands)
-        const step = steps.find(s => s.key === key)
-        if (step) step.copied = copied
-        setSteps([...steps])
-
-        if (copied) {
-            setTimeout(() => {
-                onCopyClick(key, commands, false)
-            }, 2000)
-        }
-    }
-
-    return (
-        <Steps direction="vertical" current={0}>
-            {steps.map(c =>
-                <Step
-                    key={c.key}
-                    title={c.title}
-                    description={
-                        <Space className="nb-code" direction="vertical" size="small" style={{display: "flex"}}>
-                            { (c.commands && (typeof c.commands === 'string' || c.commands instanceof String)) ? (
-                            <Highlight className='bash'>
-                                {c.commands}
-                            </Highlight>
-                            ) : (
-                                c.commands
-                            )}
-                            { c.showCopyButton &&
-                                <>
-                                { !c.copied ? (
-                                    <Button type="text" size="large" className="btn-copy-code" icon={<CopyOutlined/>}
-                                            style={{color: "rgb(107, 114, 128)"}}
-                                            onClick={() => onCopyClick(c.key, c.commands, true)}/>
-                                ): (
-                                    <Button type="text" size="large" className="btn-copy-code" icon={<CheckOutlined/>}
-                                            style={{color: "green"}}/>
-                                )}
-                                </>
-                            }
-
-                        </Space>
-                    }
-                />
-            )}
-        </Steps>
-    )
-}
-
-export default TabSteps;

src/components/addpeer/UbuntuTab.tsx

@@ -1,82 +0,0 @@
-import React, { useState } from 'react';
-
-import { Button } from "antd";
-import TabSteps from "./TabSteps";
-import { StepCommand } from "./types"
-import { getConfig } from "../../config";
-import Paragraph from 'antd/lib/skeleton/Paragraph';
-const { grpcApiOrigin } = getConfig();
-
-
-export const UbuntuTab = () => {
-
-    const formatNetBirdUP = () => {
-        let cmd = "sudo netbird up"
-        if (grpcApiOrigin) {
-            cmd = "sudo netbird up --management-url " + grpcApiOrigin
-        }
-        return [
-            cmd
-        ].join('\n')
-    }
-
-    const [steps, setSteps] = useState([
-        {
-            key: 1,
-            title: 'Add repository:',
-            commands: [
-                `sudo apt install ca-certificates curl gnupg -y`,
-                `curl -L https://pkgs.wiretrustee.com/debian/public.key | sudo apt-key add -`,
-                `echo 'deb https://pkgs.wiretrustee.com/debian stable main' | sudo tee /etc/apt/sources.list.d/wiretrustee.list`
-            ].join('\n'),
-            copied: false,
-            showCopyButton: true
-        } as StepCommand,
-        {
-            key: 2,
-            title: 'Install NetBird:',
-            commands: [
-                `sudo apt-get update`,
-                `# for CLI only`,
-                `sudo apt-get install netbird`,
-                `# for GUI package`,
-                `sudo apt-get install netbird-ui`
-            ].join('\n'),
-            copied: false,
-            showCopyButton: true
-        } as StepCommand,
-        {
-            key: 3,
-            title: 'Run NetBird and log in the browser:',
-            commands: formatNetBirdUP(),
-            copied: false,
-            showCopyButton: true
-        } as StepCommand,
-        {
-            key: 4,
-            title: 'Get your IP address:',
-            commands: [
-                `ip addr show wt0`
-            ].join('\n'),
-            copied: false,
-            showCopyButton: true
-        } as StepCommand,
-    ])
-
-    /*const clickTest = () => {
-        steps.push({
-            key: steps.length+1,
-            title: `Test ${steps.length+1}`,
-            commands: [`hi lorena!`].join('\n'),
-            copied: false
-        })
-        console.log(steps)
-        setSteps([...steps])
-    }*/
-
-    return (
-        <TabSteps stepsItems={steps} />
-    )
-}
-
-export default UbuntuTab

src/components/addpeer/WindowsTab.tsx

@@ -1,42 +0,0 @@
-import React, {useState} from 'react';
-
-import { Button } from "antd";
-import TabSteps from "./TabSteps";
-import { StepCommand } from "./types"
-import {getConfig} from "../../config";
-const {latestVersion} = getConfig();
-
-export const WindowsTab = () => {
-
-    const releaseVersion = latestVersion ? latestVersion.replace("v", "") : "0.6.3"
-    const [steps, setSteps] = useState([
-        {
-            key: 1,
-            title: 'Download and run Windows installer:',
-            commands: (
-                <Button type="primary" href={`https://github.com/netbirdio/netbird/releases/download/v${releaseVersion}/netbird_installer_${releaseVersion}_windows_amd64.exe`} target="_blank">Download NetBird</Button>
-            ),
-            copied: false
-        } as StepCommand,
-        {
-            key: 2,
-            title: 'Click on "Connect" from the NetBird icon in your system tray.',
-            commands: '',
-            copied: false,
-            showCopyButton: false
-        },
-        {
-            key: 3,
-            title: 'Log in your browser.\n',
-            commands: '',
-            copied: false,
-            showCopyButton: false
-        }
-    ])
-
-    return (
-        <TabSteps stepsItems={steps}/>
-    )
-}
-
-export default WindowsTab

src/components/addpeer/types.ts

@@ -1,9 +0,0 @@
-import * as React from "react";
-
-export interface StepCommand {
-    key: number | string,
-    title: string,
-    commands: React.ReactNode | string | null,
-    copied?: boolean,
-    showCopyButton?: boolean
-}

src/components/icons/docker_icon.svg

@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg data-name="Layer 1" id="Layer_1" viewBox="0 0 512 512" xmlns="http://www.w3.org/2000/svg"><path d="M507,211.16c-1.42-1.19-14.25-10.94-41.79-10.94a132.55,132.55,0,0,0-21.61,1.9c-5.22-36.4-35.38-54-36.57-55l-7.36-4.28-4.75,6.9a101.65,101.65,0,0,0-13.06,30.45c-5,20.7-1.9,40.2,8.55,56.85-12.59,7.14-33,8.8-37.28,9H15.94A15.93,15.93,0,0,0,0,262.07,241.25,241.25,0,0,0,14.75,348.9C26.39,379.35,43.72,402,66,415.74,91.22,431.2,132.3,440,178.6,440a344.23,344.23,0,0,0,62.45-5.71,257.44,257.44,0,0,0,81.69-29.73,223.55,223.55,0,0,0,55.57-45.67c26.83-30.21,42.74-64,54.38-94h4.75c29.21,0,47.26-11.66,57.23-21.65a63.31,63.31,0,0,0,15.2-22.36l2.14-6.18Z"/><path d="M47.29,236.37H92.4a4,4,0,0,0,4-4h0V191.89a4,4,0,0,0-4-4H47.29a4,4,0,0,0-4,4h0v40.44a4.16,4.16,0,0,0,4,4h0"/><path d="M109.5,236.37h45.12a4,4,0,0,0,4-4h0V191.89a4,4,0,0,0-4-4H109.5a4,4,0,0,0-4,4v40.44a4.16,4.16,0,0,0,4,4"/><path d="M172.9,236.37H218a4,4,0,0,0,4-4h0V191.89a4,4,0,0,0-4-4H172.9a4,4,0,0,0-4,4h0v40.44a3.87,3.87,0,0,0,4,4h0"/><path d="M235.36,236.37h45.12a4,4,0,0,0,4-4V191.89a4,4,0,0,0-4-4H235.36a4,4,0,0,0-4,4h0v40.44a4,4,0,0,0,4,4h0"/><path d="M109.5,178.57h45.12a4.16,4.16,0,0,0,4-4V134.09a4,4,0,0,0-4-4H109.5a4,4,0,0,0-4,4v40.44a4.34,4.34,0,0,0,4,4"/><path d="M172.9,178.57H218a4.16,4.16,0,0,0,4-4V134.09a4,4,0,0,0-4-4H172.9a4,4,0,0,0-4,4h0v40.44a4,4,0,0,0,4,4"/><path d="M235.36,178.57h45.12a4.16,4.16,0,0,0,4-4V134.09a4.16,4.16,0,0,0-4-4H235.36a4,4,0,0,0-4,4h0v40.44a4.16,4.16,0,0,0,4,4"/><path d="M235.36,120.53h45.12a4,4,0,0,0,4-4V76a4.16,4.16,0,0,0-4-4H235.36a4,4,0,0,0-4,4h0v40.44a4.17,4.17,0,0,0,4,4"/><path d="M298.28,236.37H343.4a4,4,0,0,0,4-4V191.89a4,4,0,0,0-4-4H298.28a4,4,0,0,0-4,4h0v40.44a4.16,4.16,0,0,0,4,4"/></svg>

src/components/icons/terminal_icon.svg

@@ -0,0 +1 @@
+<?xml version="1.0" ?><svg height="512" viewBox="0 0 512 512" width="512" xmlns="http://www.w3.org/2000/svg"><title/><path d="M432,32H80A64.07,64.07,0,0,0,16,96V416a64.07,64.07,0,0,0,64,64H432a64.07,64.07,0,0,0,64-64V96A64.07,64.07,0,0,0,432,32ZM96,256a16,16,0,0,1-10-28.49L150.39,176,86,124.49a16,16,0,1,1,20-25l80,64a16,16,0,0,1,0,25l-80,64A16,16,0,0,1,96,256Zm160,0H192a16,16,0,0,1,0-32h64a16,16,0,0,1,0,32Z"/></svg>

src/components/popups/AddPATPopup.tsx

@@ -0,0 +1,213 @@
+import {useGetTokenSilently} from "../../utils/token";
+import {useDispatch, useSelector} from "react-redux";
+import {RootState} from "typesafe-actions";
+import {Button, Col, Divider, Form, Input, InputNumber, message, Modal, Row, Space, Typography} from "antd";
+import {Container} from "../Container";
+import {CheckOutlined, CopyOutlined, QuestionCircleFilled} from "@ant-design/icons";
+import SyntaxHighlighter from "react-syntax-highlighter";
+import React, {useEffect, useRef, useState} from "react";
+import {actions as personalAccessTokenActions} from "../../store/personal-access-token";
+import {PersonalAccessTokenCreate} from "../../store/personal-access-token/types";
+import {copyToClipboard} from "../../utils/common";
+
+const {Title, Text, Paragraph} = Typography;
+
+const ExpiresInDefault = 30
+const styleNotification = {marginTop: 85}
+
+const AddPATPopup = () => {
+    const {getTokenSilently} = useGetTokenSilently()
+    const dispatch = useDispatch()
+
+    const user = useSelector((state: RootState) => state.user.user)
+
+    const addTokenModalOpen = useSelector((state: RootState) => state.personalAccessToken.newPersonalAccessTokenPopupVisible)
+    const [confirmModal, confirmModalContextHolder] = Modal.useModal();
+    const [showPlainToken, setShowPlainToken] = useState(false);
+    const [tokenCopied, setTokenCopied] = useState(false);
+    const [plainToken, setPlainToken] = useState("")
+    const inputNameRef = useRef<any>(null)
+    const [form] = Form.useForm()
+
+    const savedPersonalAccessToken = useSelector((state: RootState) => state.personalAccessToken.savedPersonalAccessToken);
+
+    const onCopyClick = (text: string, copied: boolean) => {
+        copyToClipboard(text)
+        setTokenCopied(true)
+        if (copied) {
+            setTimeout(() => {
+                onCopyClick(text, false)
+            }, 2000)
+        }
+    }
+
+    const onCancel = () => {
+        setShowPlainToken(false)
+        setTokenCopied(false)
+        if (savedPersonalAccessToken.loading) return
+        dispatch(personalAccessTokenActions.setPersonalAccessToken({
+            user_id: "",
+            name: "",
+            expires_in: 7
+        } as PersonalAccessTokenCreate))
+        form.resetFields()
+        dispatch(personalAccessTokenActions.setNewPersonalAccessTokenPopupVisible(false));
+        dispatch(personalAccessTokenActions.setSavedPersonalAccessToken({...savedPersonalAccessToken, success: false}));
+        dispatch(personalAccessTokenActions.resetSavedPersonalAccessToken(null))
+    }
+
+    const handleFormSubmit = () => {
+        form.validateFields()
+            .then((values) => {
+                let personalAccessTokenToSave = {
+                    user_id: user.id,
+                    name: values.name,
+                    expires_in: values.expires_in,
+                } as PersonalAccessTokenCreate
+                dispatch(personalAccessTokenActions.savePersonalAccessToken.request({
+                    getAccessTokenSilently: getTokenSilently,
+                    payload: personalAccessTokenToSave
+                }))
+            })
+            .catch((errorInfo) => {
+                console.log('errorInfo', errorInfo)
+            });
+    };
+
+    const createKey = 'saving';
+    useEffect(() => {
+        if (savedPersonalAccessToken.loading) {
+            message.loading({content: 'Saving...', key: createKey, duration: 0, style: styleNotification});
+        } else if (savedPersonalAccessToken.success) {
+            message.destroy(createKey)
+            setPlainToken(savedPersonalAccessToken.data.plain_token)
+            setShowPlainToken(true)
+            form.resetFields()
+        } else if (savedPersonalAccessToken.error) {
+            message.error({
+                content: 'Failed to create personal access token. You might not have enough permissions.',
+                key: createKey,
+                duration: 2,
+                style: styleNotification
+            });
+            dispatch(personalAccessTokenActions.setNewPersonalAccessTokenPopupVisible(false));
+            setShowPlainToken(false)
+            setTokenCopied(false)
+            dispatch(personalAccessTokenActions.setSavedPersonalAccessToken({...savedPersonalAccessToken, error: null}));
+            dispatch(personalAccessTokenActions.resetSavedPersonalAccessToken(null))
+        }
+    }, [savedPersonalAccessToken])
+
+
+    return (
+        <>
+            <Modal
+                open={addTokenModalOpen}
+                onCancel={onCancel}
+                footer={
+                    <Space style={{display: 'flex', justifyContent: 'end'}}>
+                        {!showPlainToken && <Button disabled={savedPersonalAccessToken.loading} onClick={onCancel}>{"Cancel"}</Button>}
+                        {!showPlainToken && <Button type="primary" disabled={showPlainToken}
+                                onClick={handleFormSubmit}>{"Create token"}</Button>}
+                        {showPlainToken && <Button type="primary" disabled={!showPlainToken} onClick={onCancel}>Done</Button>}
+                    </Space>
+                }
+                width={460}
+            >
+                <Container style={{textAlign: "start", marginLeft: "-15px", marginRight: "-15px"}}>
+                    <Paragraph
+                        style={{textAlign: "start", whiteSpace: "pre-line", fontSize: "18px",fontWeight:"500"}}>
+                        {showPlainToken ? "Token created successfully!" : "Create token"}
+                    </Paragraph>
+                    {!showPlainToken && <Paragraph type={"secondary"}
+                               style={{
+                                   textAlign: "start",
+                                   whiteSpace: "pre-line",
+                                   marginTop: "-23px",
+                                   paddingBottom: "25px",
+                               }}>
+                        {"Use this token to access NetBird's public API"}
+                    </Paragraph>}
+                    {showPlainToken && <Paragraph type={"secondary"} style={{
+                        textAlign: "start",
+                        whiteSpace: "pre-line",
+                        marginTop: "25px",
+                    }}>{"This token won't be shown again, so be sure to copy and store it in a secure location"}</Paragraph>}
+                    {!showPlainToken && <Form layout="vertical" hideRequiredMark form={form}
+                                              initialValues={{
+                                                  expires_in: ExpiresInDefault,
+                                              }}
+                    >
+                        <Row gutter={16}>
+                            <Col span={24}>
+                                <Row align="top">
+                                    <Col flex="auto">
+                                        <Paragraph style={{fontWeight: "500", marginTop: "-10px"}}>Name</Paragraph>
+                                        <Paragraph type={"secondary"} style={{marginTop: "-15px"}}>Set an easily identifiable name for your token</Paragraph>
+                                        <Form.Item
+                                            name="name"
+                                            style={{marginTop: "-10px"}}
+                                            rules={[{
+                                                required: true,
+                                                message: 'Please add a name for this token',
+                                                whitespace: true
+                                            }]}
+                                        >
+                                            <Input
+                                                placeholder={"for example \"Infra token\""}
+                                                ref={inputNameRef}
+                                                autoComplete="off"/>
+                                        </Form.Item>
+                                    </Col>
+                                </Row>
+                            </Col>
+                            <Col span={24} style={{textAlign: "left", marginTop: "10px"}}>
+                                <Paragraph style={{fontWeight: "500", marginTop: "-10px"}}>Expires in</Paragraph>
+                                <Paragraph type={"secondary"} style={{marginTop: "-15px"}}>Number of days this token will be valid for</Paragraph>
+                                <Form.Item
+                                    name="expires_in"
+                                    style={{marginTop: "-10px"}}
+                                    rules={[{
+                                        type: 'number',
+                                        min: 1,
+                                        max: 365,
+                                        message: 'The expiration should be set between 1 and 365 days'
+                                    }]}>
+                                    <InputNumber addonAfter=" Days" style={{maxWidth: "150px"}}/>
+                                </Form.Item>
+                                <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-18px"}}>Should be between 1 and 365 days</Paragraph>
+                            </Col>
+                            <Col span={24} style={{marginTop: "15px"}}>
+                                <Text type={"secondary"}>
+                                    Learn more about
+                                    <a
+                                        target="_blank"
+                                        rel="noreferrer"
+                                        href="https://docs.netbird.io/how-to/access-netbird-public-api"
+                                    >
+                                        {" "}
+                                        access tokens
+                                    </a>
+                                </Text>
+                            </Col>
+                        </Row>
+                    </Form>}
+                    {showPlainToken &&
+                                <Input style={{marginTop: "-15px", marginBottom: "25px"}} suffix={
+                                    !tokenCopied ? <Button type="text" size="middle" className="btn-copy-code" icon={<CopyOutlined/>}
+                                    style={{color: "rgb(107, 114, 128)", marginTop: "-1px"}}
+                                    onClick={() => onCopyClick(plainToken, true)}/>
+                                    : <Button type="text" size="middle"  className="btn-copy-code" icon={<CheckOutlined/>}
+                                              style={{color: "green", marginTop: "-1px"}}/>
+                                }
+                                       defaultValue={plainToken}
+                                       readOnly={true}
+                                ></Input>}
+                </Container>
+            </Modal>
+            {confirmModalContextHolder}
+        </>
+    )
+}
+
+export default AddPATPopup

src/components/popups/AddServiceUserPopup.tsx

@@ -0,0 +1,362 @@
+import {
+  Button,
+  Col,
+  Divider,
+  Form,
+  Input,
+  Modal,
+  Row,
+  Select,
+  Space,
+  Tag,
+  Typography,
+} from "antd";
+import { Container } from "../Container";
+import { CloseOutlined } from "@ant-design/icons";
+import React, { useEffect, useRef, useState } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { RootState } from "typesafe-actions";
+import { useGetTokenSilently } from "../../utils/token";
+import { actions as userActions } from "../../store/user";
+import { actions as groupActions } from "../../store/group";
+import { User, UserToSave } from "../../store/user/types";
+import { Header } from "antd/es/layout/layout";
+import { RuleObject } from "antd/lib/form";
+import { CustomTagProps } from "rc-select/lib/BaseSelect";
+
+const { Title, Text, Paragraph } = Typography;
+const { Option } = Select;
+
+const AddServiceUserPopup = () => {
+  const { getTokenSilently } = useGetTokenSilently();
+  const dispatch = useDispatch();
+
+  const groups = useSelector((state: RootState) => state.group.data);
+  const users = useSelector((state: RootState) => state.user.data);
+
+  const user = useSelector((state: RootState) => state.user.user);
+  const failed = useSelector((state: RootState) => state.user.failed);
+  const loading = useSelector((state: RootState) => state.user.loading);
+  const addServiceUserModalOpen = useSelector(
+    (state: RootState) => state.user.addServiceUserPopupVisible
+  );
+  const savedUser = useSelector((state: RootState) => state.user.savedUser);
+
+  const [confirmModal, confirmModalContextHolder] = Modal.useModal();
+
+  const [form] = Form.useForm();
+  const inputNameRef = useRef<any>(null);
+
+  const [tagGroups, setTagGroups] = useState([] as string[]);
+  const [selectedTagGroups, setSelectedTagGroups] = useState([] as string[]);
+
+  const createUserToSave = (values: any): UserToSave => {
+    const autoGroups =
+      groups
+        ?.filter(
+          (g) =>
+            values.autoGroupsNames && values.autoGroupsNames.includes(g.name)
+        )
+        .map((g) => g.id || "") || [];
+    // find groups that do not yet exist (newly added by the user)
+    const allGroupsNames: string[] = groups?.map((g) => g.name);
+    const groupsToCreate =
+      values.autoGroupsNames?.filter(
+        (s: string) => !allGroupsNames.includes(s)
+      ) || [];
+    return {
+      id: values.id,
+      role: values.role,
+      name: values.name,
+      groupsToCreate: groupsToCreate,
+      auto_groups: autoGroups,
+      is_service_user: true,
+    } as UserToSave;
+  };
+
+  const onCancel = () => {
+    if (savedUser.loading) return;
+    dispatch(userActions.setUser(null as unknown as User));
+    form.resetFields();
+    dispatch(userActions.setAddServiceUserPopupVisible(false));
+  };
+
+  const handleFormSubmit = () => {
+    form
+      .validateFields()
+      .then((values) => {
+        let userToSave = createUserToSave(values);
+        dispatch(
+          userActions.saveUser.request({
+            getAccessTokenSilently: getTokenSilently,
+            payload: userToSave,
+          })
+        );
+        form.resetFields();
+        dispatch(
+          userActions.getServiceUsers.request({
+            getAccessTokenSilently: getTokenSilently,
+            payload: null,
+          })
+        );
+        dispatch(userActions.setAddServiceUserPopupVisible(false));
+      })
+      .catch((errorInfo) => {
+        console.log("errorInfo", errorInfo);
+      });
+  };
+
+  const selectValidator = (_: RuleObject, value: string[]) => {
+    let hasSpaceNamed = [];
+
+    if (!value) {
+      return Promise.resolve();
+    }
+
+    value.forEach(function (v: string) {
+      if (!v.trim().length) {
+        hasSpaceNamed.push(v);
+      }
+    });
+
+    if (hasSpaceNamed.length) {
+      return Promise.reject(
+        new Error("Group names with just spaces are not allowed")
+      );
+    }
+
+    return Promise.resolve();
+  };
+
+  const tagRender = (props: CustomTagProps) => {
+    const { label, value, closable, onClose } = props;
+    const onPreventMouseDown = (event: React.MouseEvent<HTMLSpanElement>) => {
+      event.preventDefault();
+      event.stopPropagation();
+    };
+
+    return (
+      <Tag
+        color="blue"
+        onMouseDown={onPreventMouseDown}
+        closable={closable}
+        onClose={onClose}
+        style={{ marginRight: 3 }}
+      >
+        <strong>{value}</strong>
+      </Tag>
+    );
+  };
+
+  const handleChangeTags = (value: string[]) => {
+    let validatedValues: string[] = [];
+    value.forEach(function (v) {
+      if (v.trim().length) {
+        validatedValues.push(v);
+      }
+    });
+    setSelectedTagGroups(validatedValues);
+  };
+
+  const dropDownRender = (menu: React.ReactElement) => (
+    <>
+      {menu}
+      <Divider style={{ margin: "8px 0" }} />
+      <Row style={{ padding: "0 8px 4px" }}>
+        <Col flex="auto">
+          <span style={{ color: "#9CA3AF" }}>
+            Add new group by pressing "Enter"
+          </span>
+        </Col>
+        <Col flex="none">
+          <svg
+            width="14"
+            height="12"
+            viewBox="0 0 14 12"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M1.70455 7.19176V5.89915H10.3949C10.7727 5.89915 11.1174 5.80634 11.429 5.62074C11.7405 5.43513 11.9875 5.18655 12.1697 4.875C12.3554 4.56345 12.4482 4.21875 12.4482 3.84091C12.4482 3.46307 12.3554 3.12003 12.1697 2.81179C11.9841 2.50024 11.7356 2.25166 11.424 2.06605C11.1158 1.88044 10.7727 1.78764 10.3949 1.78764H9.83807V0.5H10.3949C11.0114 0.5 11.5715 0.650805 12.0753 0.952414C12.5791 1.25402 12.9818 1.65672 13.2834 2.16051C13.585 2.6643 13.7358 3.22443 13.7358 3.84091C13.7358 4.30161 13.648 4.73414 13.4723 5.13849C13.3 5.54285 13.0613 5.89915 12.7564 6.20739C12.4515 6.51562 12.0968 6.75758 11.6925 6.93324C11.2881 7.10559 10.8556 7.19176 10.3949 7.19176H1.70455ZM4.90128 11.0646L0.382102 6.54545L4.90128 2.02628L5.79119 2.91619L2.15696 6.54545L5.79119 10.1747L4.90128 11.0646Z"
+              fill="#9CA3AF"
+            />
+          </svg>
+        </Col>
+      </Row>
+    </>
+  );
+
+  const optionRender = (label: string) => {
+    let peersCount = "";
+    const g = groups.find((_g) => _g.name === label);
+    if (g)
+      peersCount = ` - ${g.peers_count || 0} ${
+        !g.peers_count || parseInt(g.peers_count) !== 1 ? "peers" : "peer"
+      } `;
+    return (
+      <>
+        <Tag color="blue" style={{ marginRight: 3 }}>
+          <strong>{label}</strong>
+        </Tag>
+        <span style={{ fontSize: ".85em" }}>{peersCount}</span>
+      </>
+    );
+  };
+
+  useEffect(() => {
+    setTagGroups(
+      groups?.filter((g) => g.name != "All").map((g) => g.name) || []
+    );
+  }, [groups]);
+
+  useEffect(() => {
+    dispatch(
+      groupActions.getGroups.request({
+        getAccessTokenSilently: getTokenSilently,
+        payload: null,
+      })
+    );
+  }, []);
+
+  return (
+    <>
+      <Modal
+        open={addServiceUserModalOpen}
+        onCancel={onCancel}
+        footer={
+          <Space style={{ display: "flex", justifyContent: "end" }}>
+            <Button disabled={loading} onClick={onCancel}>
+              Cancel
+            </Button>
+            <Button type="primary" onClick={handleFormSubmit}>
+              Create user
+            </Button>
+          </Space>
+        }
+        width={460}
+      >
+        <Container
+          style={{
+            textAlign: "start",
+            marginLeft: "-15px",
+            marginRight: "-15px",
+          }}
+        >
+          <Paragraph
+            style={{
+              textAlign: "start",
+              whiteSpace: "pre-line",
+              fontSize: "18px",
+              fontWeight: "500",
+            }}
+          >
+            {"Add service user"}
+          </Paragraph>
+          <Paragraph
+            type={"secondary"}
+            style={{
+              textAlign: "start",
+              whiteSpace: "pre-line",
+              marginTop: "-23px",
+              paddingBottom: "25px",
+            }}
+          >
+            {
+              "Service users are non-login users that are not associated with any specific person."
+            }
+          </Paragraph>
+          <Form
+            layout="vertical"
+            hideRequiredMark
+            form={form}
+            initialValues={{
+              ["role"]: "user",
+            }}
+          >
+            <Row gutter={16}>
+              <Col span={24}>
+                <Paragraph style={{ fontWeight: "500", marginTop: "-10px" }}>
+                  Name
+                </Paragraph>
+                <Paragraph type={"secondary"} style={{ marginTop: "-15px" }}>
+                  Set a name to easily identify the user
+                </Paragraph>
+                <Form.Item
+                  name="name"
+                  rules={[
+                    {
+                      required: true,
+                      message: "Please add a new name for this user",
+                      whitespace: true,
+                    },
+                  ]}
+                  style={{ marginTop: "-8px" }}
+                >
+                  <Input
+                    placeholder={'for example "Ansible user"'}
+                    ref={inputNameRef}
+                    autoComplete="off"
+                  />
+                </Form.Item>
+              </Col>
+              <Col span={24}>
+                <Paragraph style={{ fontWeight: "500", marginTop: "0px" }}>
+                  Role
+                </Paragraph>
+                <Paragraph
+                  type={"secondary"}
+                  style={{ fontSize: "14px", marginTop: "-15px" }}
+                >
+                  Set a role for the user to assign access permissions
+                </Paragraph>
+                <Form.Item
+                  name="role"
+                  rules={[
+                    {
+                      required: true,
+                      message: "Please select a role for this user",
+                      whitespace: true,
+                    },
+                  ]}
+                  style={{ marginTop: "-8px" }}
+                >
+                  <Select style={{ width: "120px" }}>
+                    <Option value="admin">admin</Option>
+                    <Option value="user">user</Option>
+                  </Select>
+                </Form.Item>
+              </Col>
+              {/*<Col span={24}>*/}
+              {/*    <Paragraph style={{fontWeight: "bold", marginTop: "0px"}}>Auto-assigned groups</Paragraph>*/}
+              {/*    <Paragraph type={"secondary"} style={{fontSize: "14px", marginTop: "-15px"}}>Add groups, that will be assigned to peers added by this user</Paragraph>*/}
+              {/*    <Form.Item*/}
+              {/*        name="autoGroupsNames"*/}
+              {/*        label="Auto-assigned groups"*/}
+              {/*        tooltip="Every peer enrolled with this user will be automatically added to these groups"*/}
+              {/*        rules={[{validator: selectValidator}]}*/}
+              {/*    >*/}
+              {/*        <Select mode="tags"*/}
+              {/*                style={{width: '100%'}}*/}
+              {/*                placeholder="Associate groups with the user"*/}
+              {/*                tagRender={tagRender}*/}
+              {/*                onChange={handleChangeTags}*/}
+              {/*                dropdownRender={dropDownRender}*/}
+              {/*        >*/}
+              {/*            {*/}
+              {/*                tagGroups.map(m =>*/}
+              {/*                    <Option key={m}>{optionRender(m)}</Option>*/}
+              {/*                )*/}
+              {/*            }*/}
+              {/*        </Select>*/}
+              {/*    </Form.Item>*/}
+              {/*</Col>*/}
+            </Row>
+          </Form>
+        </Container>
+      </Modal>
+      {confirmModalContextHolder}
+    </>
+  );
+};
+
+export default AddServiceUserPopup;

src/components/popups/InviteUserPopup.tsx

@@ -0,0 +1,367 @@
+import {
+  Button,
+  Col,
+  Divider,
+  Form,
+  Input,
+  Modal,
+  Row,
+  Select,
+  Space,
+  Typography,
+} from "antd";
+import { Container } from "../Container";
+import React, { useEffect, useRef } from "react";
+import { useDispatch, useSelector } from "react-redux";
+import { RootState } from "typesafe-actions";
+import { useGetTokenSilently } from "../../utils/token";
+import { actions as userActions } from "../../store/user";
+import { actions as groupActions } from "../../store/group";
+import { User, UserToSave } from "../../store/user/types";
+import { RuleObject } from "antd/lib/form";
+import { CustomTagProps } from "rc-select/lib/BaseSelect";
+import { QuestionCircleFilled } from "@ant-design/icons";
+import { useGetGroupTagHelpers } from "../../utils/groups";
+
+const { Title, Text, Paragraph } = Typography;
+const { Option } = Select;
+
+const InviteUserPopup = () => {
+  const { optionRender, blueTagRender, tagGroups, handleChangeTags } =
+    useGetGroupTagHelpers();
+  const { getTokenSilently } = useGetTokenSilently();
+  const dispatch = useDispatch();
+
+  const groups = useSelector((state: RootState) => state.group.data);
+  const users = useSelector((state: RootState) => state.user.data);
+
+  const user = useSelector((state: RootState) => state.user.user);
+  const failed = useSelector((state: RootState) => state.user.failed);
+  const loading = useSelector((state: RootState) => state.user.loading);
+  const inviteUserModalOpen = useSelector(
+    (state: RootState) => state.user.inviteUserPopupVisible
+  );
+  const savedUser = useSelector((state: RootState) => state.user.savedUser);
+
+  const [confirmModal, confirmModalContextHolder] = Modal.useModal();
+
+  const [form] = Form.useForm();
+  const inputNameRef = useRef<any>(null);
+
+  const createUserToSave = (values: any): UserToSave => {
+    const autoGroups =
+      groups
+        ?.filter(
+          (g) =>
+            values.autoGroupsNames && values.autoGroupsNames.includes(g.id)
+        )
+        .map((g) => g.id || "") || [];
+    // find groups that do not yet exist (newly added by the user)
+    const allGroupsNames: string[] = groups?.map((g) => g.id || "");
+    const groupsToCreate =
+      values.autoGroupsNames?.filter(
+        (s: string) => !allGroupsNames.includes(s)
+      ) || [];
+    return {
+      id: values.id,
+      role: values.role,
+      email: values.email,
+      name: values.name,
+      groupsToCreate: groupsToCreate,
+      auto_groups: autoGroups,
+      is_service_user: false,
+    } as UserToSave;
+  };
+
+  const onCancel = () => {
+    if (savedUser.loading) return;
+    dispatch(userActions.setUser(null as unknown as User));
+    form.resetFields();
+    dispatch(userActions.setInviteUserPopupVisible(false));
+  };
+
+  const handleFormSubmit = () => {
+    form
+      .validateFields()
+      .then((values) => {
+        let userToSave = createUserToSave(values);
+        dispatch(
+          userActions.saveUser.request({
+            getAccessTokenSilently: getTokenSilently,
+            payload: userToSave,
+          })
+        );
+        form.resetFields();
+        dispatch(
+          userActions.getRegularUsers.request({
+            getAccessTokenSilently: getTokenSilently,
+            payload: null,
+          })
+        );
+        dispatch(userActions.setInviteUserPopupVisible(false));
+      })
+      .catch((errorInfo) => {
+        console.log("errorInfo", errorInfo);
+      });
+  };
+
+  const selectValidator = (_: RuleObject, value: string[]) => {
+    let hasSpaceNamed = [];
+
+    if (!value) {
+      return Promise.resolve();
+    }
+
+    value.forEach(function (v: string) {
+      if (!v.trim().length) {
+        hasSpaceNamed.push(v);
+      }
+    });
+
+    if (hasSpaceNamed.length) {
+      return Promise.reject(
+        new Error("Group names with just spaces are not allowed")
+      );
+    }
+
+    return Promise.resolve();
+  };
+
+  // const handleChangeTags = (value: string[]) => {
+  //   let validatedValues: string[] = [];
+  //   value.forEach(function (v) {
+  //     if (v.trim().length) {
+  //       validatedValues.push(v);
+  //     }
+  //   });
+  //   setSelectedTagGroups(validatedValues);
+  // };
+
+  const dropDownRender = (menu: React.ReactElement) => (
+    <>
+      {menu}
+      <Divider style={{ margin: "8px 0" }} />
+      <Row style={{ padding: "0 8px 4px" }}>
+        <Col flex="auto">
+          <span style={{ color: "#9CA3AF" }}>
+            Add new group by pressing "Enter"
+          </span>
+        </Col>
+        <Col flex="none">
+          <svg
+            width="14"
+            height="12"
+            viewBox="0 0 14 12"
+            fill="none"
+            xmlns="http://www.w3.org/2000/svg"
+          >
+            <path
+              d="M1.70455 7.19176V5.89915H10.3949C10.7727 5.89915 11.1174 5.80634 11.429 5.62074C11.7405 5.43513 11.9875 5.18655 12.1697 4.875C12.3554 4.56345 12.4482 4.21875 12.4482 3.84091C12.4482 3.46307 12.3554 3.12003 12.1697 2.81179C11.9841 2.50024 11.7356 2.25166 11.424 2.06605C11.1158 1.88044 10.7727 1.78764 10.3949 1.78764H9.83807V0.5H10.3949C11.0114 0.5 11.5715 0.650805 12.0753 0.952414C12.5791 1.25402 12.9818 1.65672 13.2834 2.16051C13.585 2.6643 13.7358 3.22443 13.7358 3.84091C13.7358 4.30161 13.648 4.73414 13.4723 5.13849C13.3 5.54285 13.0613 5.89915 12.7564 6.20739C12.4515 6.51562 12.0968 6.75758 11.6925 6.93324C11.2881 7.10559 10.8556 7.19176 10.3949 7.19176H1.70455ZM4.90128 11.0646L0.382102 6.54545L4.90128 2.02628L5.79119 2.91619L2.15696 6.54545L5.79119 10.1747L4.90128 11.0646Z"
+              fill="#9CA3AF"
+            />
+          </svg>
+        </Col>
+      </Row>
+    </>
+  );
+
+  // useEffect(() => {
+  //   setTagGroups(
+  //     groups?.filter((g) => g.name != "All").map((g) => g.name) || []
+  //   );
+  // }, [groups]);
+
+  useEffect(() => {
+    dispatch(
+      groupActions.getGroups.request({
+        getAccessTokenSilently: getTokenSilently,
+        payload: null,
+      })
+    );
+  }, []);
+
+  return (
+    <>
+      <Modal
+        open={inviteUserModalOpen}
+        onCancel={onCancel}
+        footer={
+          <Space style={{ display: "flex", justifyContent: "end" }}>
+            <Button disabled={loading} onClick={onCancel}>
+              Cancel
+            </Button>
+            <Button type="primary" onClick={handleFormSubmit}>
+              Invite
+            </Button>
+          </Space>
+        }
+        width={460}
+      >
+        <Container
+          style={{
+            textAlign: "start",
+            marginLeft: "-15px",
+            marginRight: "-15px",
+          }}
+        >
+          <Paragraph
+            style={{
+              textAlign: "start",
+              whiteSpace: "pre-line",
+              fontSize: "18px",
+              fontWeight: "500",
+            }}
+          >
+            {"Invite user"}
+          </Paragraph>
+          <Paragraph
+            type={"secondary"}
+            style={{
+              textAlign: "start",
+              whiteSpace: "pre-line",
+              fontSize: "14px",
+              marginTop: "-23px",
+              paddingBottom: "25px",
+            }}
+          >
+            {"Invite a user to your network and set their permissions."}
+          </Paragraph>
+          <Form
+            layout="vertical"
+            hideRequiredMark
+            form={form}
+            initialValues={{
+              ["role"]: "user",
+            }}
+          >
+            <Row gutter={16}>
+              <Col span={24}>
+                <Paragraph style={{ fontWeight: "500", marginTop: "-10px" }}>
+                  Name
+                </Paragraph>
+                <Paragraph type={"secondary"} style={{ marginTop: "-15px" }}>
+                  Set a name to easily identify the user
+                </Paragraph>
+                <Form.Item
+                  name="name"
+                  rules={[
+                    {
+                      required: true,
+                      message: "Please add a name for this user",
+                      whitespace: true,
+                    },
+                  ]}
+                  style={{ marginTop: "-8px" }}
+                >
+                  <Input
+                    placeholder={'for example "Max Schmidt"'}
+                    ref={inputNameRef}
+                    autoComplete="off"
+                  />
+                </Form.Item>
+              </Col>
+              <Col span={24}>
+                <Paragraph style={{ fontWeight: "500", marginTop: "0px" }}>
+                  Email
+                </Paragraph>
+                <Paragraph type={"secondary"} style={{ marginTop: "-15px" }}>
+                  Provide the email address of the user
+                </Paragraph>
+                <Form.Item
+                  name="email"
+                  rules={[
+                    {
+                      required: true,
+                      message: "Please add a valid email address for this user",
+                      whitespace: false,
+                      pattern: new RegExp(
+                        /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i
+                      ),
+                    },
+                  ]}
+                  style={{ marginTop: "-8px" }}
+                >
+                  <Input
+                    placeholder={'for example "max.schmidt@gmail.com"'}
+                    ref={inputNameRef}
+                    autoComplete="off"
+                  />
+                </Form.Item>
+              </Col>
+              <Col span={24}>
+                <Paragraph style={{ fontWeight: "500", marginTop: "0px" }}>
+                  Role
+                </Paragraph>
+                <Paragraph type={"secondary"} style={{ marginTop: "-15px" }}>
+                  Set a role for the user to assign access permissions
+                </Paragraph>
+                <Form.Item
+                  name="role"
+                  rules={[
+                    {
+                      required: true,
+                      message: "Please select a role for this user",
+                      whitespace: true,
+                    },
+                  ]}
+                  style={{ marginTop: "-8px" }}
+                >
+                  <Select style={{ width: "120px" }}>
+                    <Option value="admin">admin</Option>
+                    <Option value="user">user</Option>
+                  </Select>
+                </Form.Item>
+              </Col>
+              <Col span={24}>
+                <Paragraph style={{ fontWeight: "500", marginTop: "0px" }}>
+                  Auto-assigned groups
+                </Paragraph>
+                <Paragraph type={"secondary"} style={{ marginTop: "-15px" }}>
+                  Add groups, that will be assigned to peers added by this user
+                </Paragraph>
+                <Form.Item
+                  name="autoGroupsNames"
+                  tooltip="Every peer enrolled with this user will be automatically added to these groups"
+                  rules={[{ validator: selectValidator }]}
+                  style={{ marginTop: "-8px" }}
+                >
+                  <Select
+                    mode="tags"
+                    style={{ width: "100%" }}
+                    placeholder="Associate groups with the user"
+                    tagRender={blueTagRender}
+                    onChange={handleChangeTags}
+                    optionFilterProp="serchValue"
+                    dropdownRender={dropDownRender}
+                  >
+                    {tagGroups.map((m, index) => (
+                      <Option key={index} value={m.id} serchValue={m.name}>
+                        {optionRender(m.name, m.id)}
+                      </Option>
+                    ))}
+                  </Select>
+                </Form.Item>
+              </Col>
+              <Col span={24}>
+                <Text type={"secondary"}>
+                  Learn more about
+                  <a
+                    target="_blank"
+                    rel="noreferrer"
+                    href="https://docs.netbird.io/how-to/add-users-to-your-network"
+                  >
+                    {" "}
+                    user management
+                  </a>
+                </Text>
+              </Col>
+            </Row>
+          </Form>
+        </Container>
+      </Modal>
+      {confirmModalContextHolder}
+    </>
+  );
+};
+
+export default InviteUserPopup;

src/components/popups/addpeer/addpeer/AddPeerPopup.tsx

@@ -0,0 +1,101 @@
+import React, {useState} from 'react';
+
+import {Tabs, TabsProps} from "antd";
+import Icon, {AndroidFilled, AppleFilled, WindowsFilled} from "@ant-design/icons";
+import {ReactComponent as LinuxSVG} from "../../../icons/terminal_icon.svg";
+import UbuntuTab from "./UbuntuTab";
+import {ReactComponent as DockerSVG} from "../../../icons/docker_icon.svg";
+import Paragraph from "antd/lib/typography/Paragraph";
+import WindowsTab from "./WindowsTab";
+import MacTab from "./MacTab";
+import Link from "antd/lib/typography/Link";
+import DockerTab from "./DockerTab";
+import AndroidTab from "./AndroidTab";
+
+type Props = {
+    greeting?: string;
+    headline: string;
+};
+
+const detectOSTab = () => {
+    let os = 1;
+    if (navigator.userAgent.indexOf("Win") !== -1) os = 2;
+    if (navigator.userAgent.indexOf("Mac") !== -1) os = 3;
+    if (navigator.userAgent.indexOf("X11") !== -1) os = 1;
+    if (navigator.userAgent.indexOf("Linux") !== -1) os = 1
+    return os
+}
+
+export const AddPeerPopup: React.FC<Props> = ({
+                                                  greeting,
+                                                  headline,
+                                              }) => {
+
+    const [openTab, setOpenTab] = useState(detectOSTab);
+
+    const [width, setWidth] = useState<number>(window.innerWidth);
+    const isMobile = width <= 768;
+
+    const items: TabsProps['items'] = [
+        {
+            key: "1",
+            label: <span data-testid="add-peer-modal-linux-tab"><Icon component={LinuxSVG}/>Linux</span>,
+            children: <UbuntuTab/>,
+        },
+        {
+            key: "2",
+            label: <span data-testid="add-peer-modal-windows-tab"><WindowsFilled/>Windows</span>,
+            children: <WindowsTab/>,
+        },
+        {
+            key: "3",
+            label: <span data-testid="add-peer-modal-mac-tab"><AppleFilled/>MacOS</span>,
+            children: <MacTab/>,
+        },
+        {
+            key: "4",
+            label: <span data-testid="add-peer-modal-android-tab"><AndroidFilled/>Android</span>,
+            children: <AndroidTab/>,
+        },
+        {
+            key: "5",
+            label: <span data-testid="add-peer-modal-docker-tab"><Icon component={DockerSVG}/>Docker</span>,
+            children: <DockerTab/>,
+        }
+    ];
+
+    return <>
+        {greeting && <Paragraph
+            style={{textAlign: "center", whiteSpace: "pre-line", fontSize: "2em", marginBottom: -10}}>
+            {greeting}
+        </Paragraph>}
+        <Paragraph
+            style={{textAlign: "center", whiteSpace: "pre-line", fontSize: "2em"}}>
+            {headline}
+        </Paragraph>
+        <Paragraph type={"secondary"}
+                   style={{
+                       marginTop: "-15px",
+                       textAlign: "center",
+                       whiteSpace: "pre-line",
+                   }}>
+            To get started, install NetBird and log in using your {"\n"} email account.
+        </Paragraph>
+
+        <Tabs centered={!isMobile}
+              defaultActiveKey={openTab.toString()} tabPosition="top" animated={{inkBar: true, tabPane: false}}
+              items={items}/>
+        <Paragraph type={"secondary"}
+                   style={{
+                       marginTop: "15px",
+                   }}>
+            After that you should be connected. Add more devices to your network or manage your existing devices in the
+            admin panel.
+            If you have further questions check out our {<Link target="_blank"
+                                                               href={"https://docs.netbird.io/how-to/getting-started#installation"}>installation
+            guide</Link>}
+        </Paragraph>
+    </>
+}
+
+export default AddPeerPopup

src/components/popups/addpeer/addpeer/AndroidTab.tsx

@@ -0,0 +1,62 @@
+import React, {useState} from 'react';
+
+import {Button, Image, Typography} from "antd";
+import TabSteps from "./TabSteps";
+import { StepCommand } from "./types"
+import googleplay from '../../../../assets/google-play-badge.png';
+import {getConfig} from "../../../../config";
+const { grpcApiOrigin } = getConfig();
+
+const {Text} = Typography;
+
+export const AndroidTab = () => {
+
+    const [steps, setSteps] = useState([
+        {
+            key: 1,
+            title: 'Download and install the application from Google Play Store:',
+            commands: (
+                <a data-testid="download-android-button" href="https://play.google.com/store/apps/details?id=io.netbird.client" target="_blank">
+                    <Image width="12em" preview={false} style={{marginTop: "5px"}} src={googleplay}/>
+                </a>
+            ),
+            copied: false
+        } as StepCommand,
+        ... grpcApiOrigin ? [{
+            key: 2,
+            title: 'Click on "Change Server" and enter the following "Server"',
+            commands: grpcApiOrigin,
+            commandsForCopy: grpcApiOrigin,
+            copied: false,
+            showCopyButton: false
+        }] : [],
+        {
+            key: 2 + (grpcApiOrigin ? 1 : 0),
+            title: 'Click on the "Connect" button in the middle of the screen',
+            commands: '',
+            copied: false,
+            showCopyButton: false
+        },
+        {
+            key: 3 + (grpcApiOrigin ? 1 : 0),
+            title: 'Sign up using your email address',
+            commands: '',
+            copied: false,
+            showCopyButton: false
+        }
+    ])
+
+    return (
+        <div style={{marginTop: 10}}>
+            <Text style={{fontWeight: "bold"}}>
+                Install on Android
+            </Text>
+            <div style={{marginTop: 5}}>
+                <TabSteps stepsItems={steps}/>
+            </div>
+
+        </div>
+    )
+}
+
+export default AndroidTab

src/components/popups/addpeer/addpeer/DockerTab.tsx

@@ -0,0 +1,77 @@
+import React, {useState} from 'react';
+import {StepCommand} from "./types"
+import {formatDockerCommand, formatNetBirdUP} from "./common"
+import SyntaxHighlighter from "react-syntax-highlighter";
+import TabSteps from "./TabSteps";
+import {Button, Typography} from "antd";
+import Link from "antd/lib/typography/Link";
+
+const {Title, Paragraph, Text} = Typography;
+
+export const DockerTab = () => {
+
+    const [steps, setSteps] = useState([
+      {
+        key: 1,
+        title: "Install Docker",
+        commands: (
+          <Button
+            data-testid="download-docker-button"
+            style={{ marginTop: "5px" }}
+            type="primary"
+            href="https://docs.docker.com/engine/install/"
+            target="_blank"
+          >
+            Official Docker website
+          </Button>
+        ),
+        copied: false,
+        showCopyButton: false,
+      } as StepCommand,
+      {
+        key: 2,
+        title: "Run NetBird container",
+        commands: formatDockerCommand(),
+        commandsForCopy: formatDockerCommand(),
+        copied: false,
+        showCopyButton: false,
+      } as StepCommand,
+      {
+        key: 3,
+        title: "Read docs",
+        commands: (
+          <Link
+            href="https://docs.netbird.io/how-to/getting-started#running-net-bird-in-docker"
+            target="_blank"
+          >
+            Running NetBird in Docker
+          </Link>
+        ),
+        copied: false,
+        showCopyButton: false,
+      } as StepCommand,
+    ]);
+
+    return (
+        <div style={{marginTop: 10}}>
+            {/*<Text style={{fontWeight: "bold"}}>
+                Run in Docker
+            </Text>
+            <div style={{fontSize: ".85em", marginTop: 5, marginBottom: 25}}>
+                <SyntaxHighlighter language="bash">
+                    {formatDockerCommand()}
+                </SyntaxHighlighter>
+            </div>*/}
+            <Text style={{fontWeight: "bold"}}>
+                Install on Ubuntu
+            </Text>
+            <div style={{marginTop: 5}}>
+                <TabSteps stepsItems={steps}/>
+            </div>
+        </div>
+
+
+    )
+}
+
+export default DockerTab

src/components/popups/addpeer/addpeer/LinuxTab.tsx

@@ -0,0 +1,28 @@
+import { useState } from "react";
+
+import { Button } from "antd";
+import TabSteps from "./TabSteps";
+import { StepCommand } from "./types";
+
+export const OtherTab = () => {
+  const [steps, _] = useState([
+    {
+      key: 1,
+      title: "For other installation options check our documentation.",
+      commands: (
+        <Button
+          type="primary"
+          href={`https://docs.netbird.io/how-to/getting-started#binary-install`}
+          target="_blank"
+        >
+          Documentation
+        </Button>
+      ),
+      copied: false,
+    } as StepCommand,
+  ]);
+
+  return <TabSteps stepsItems={steps} />;
+};
+
+export default OtherTab;

src/components/popups/addpeer/addpeer/MacTab.tsx

@@ -0,0 +1,223 @@
+import React, { useState } from "react";
+
+import { Button, Divider, Row, Tooltip, Typography } from "antd";
+import TabSteps from "./TabSteps";
+import { StepCommand } from "./types";
+import { formatNetBirdUP } from "./common";
+import { Collapse } from "antd";
+import SyntaxHighlighter from "react-syntax-highlighter";
+import { QuestionCircleOutlined } from "@ant-design/icons";
+import { CheckOutlined, CopyOutlined } from "@ant-design/icons";
+import { copyToClipboard } from "../../../../utils/common";
+import {getConfig} from "../../../../config";
+const { grpcApiOrigin } = getConfig();
+
+const { Panel } = Collapse;
+
+const { Text } = Typography;
+
+export const LinuxTab = () => {
+  const [copied, setCopied] = useState(false);
+  const [quickSteps, setQuickSteps] = useState([
+    {
+      key: 1,
+      title: (
+        <Row>
+          <Text>Download and run MacOS installer: </Text>
+          <Tooltip
+            title={
+              <text>
+                If you don't know what chip your Mac has, you can find out by
+                clicking on the Apple logo in the top left corner of your screen
+                and selecting 'About This Mac'. For more information click{" "}
+                <a
+                  href="https://support.apple.com/en-us/HT211814"
+                  target="_blank"
+                >
+                  here
+                </a>
+              </text>
+            }
+            className={"ant-form-item-tooltip"}
+          >
+            <QuestionCircleOutlined
+              style={{
+                color: "rgba(0, 0, 0, 0.45)",
+                cursor: "help",
+                marginLeft: "3px",
+              }}
+            />
+          </Tooltip>
+        </Row>
+      ),
+      commands: (
+        <Row style={{ paddingTop: "5px" }}>
+          <Button
+            data-testid="download-intel-button"
+            style={{ marginRight: "10px" }}
+            type="primary"
+            href="https://pkgs.netbird.io/macos/amd64"
+          >
+            Download for Intel
+          </Button>
+          <Button
+            data-testid="download-m1-m2-button"
+            style={{ marginRight: "10px" }}
+            type="default"
+            href="https://pkgs.netbird.io/macos/arm64"
+          >
+            Download for M1 & M2
+          </Button>
+        </Row>
+      ),
+      copied: false,
+    } as StepCommand,
+    ... grpcApiOrigin ? [{
+      key: 2,
+      title: 'Click on "Settings" from the NetBird icon in your system tray and enter the following "Management URL"',
+      commands: grpcApiOrigin,
+      commandsForCopy: grpcApiOrigin,
+      copied: false,
+      showCopyButton: false,
+    }] : [],
+    {
+      key: 2 + (grpcApiOrigin ? 1 : 0),
+      title: 'Click on "Connect" from the NetBird icon in your system tray',
+      commands: "",
+      copied: false,
+      showCopyButton: false,
+    },
+    {
+      key: 3 + (grpcApiOrigin) ? 1 : 0,
+      title: "Sign up using your email address",
+      commands: "",
+      copied: false,
+      showCopyButton: false,
+    },
+  ]);
+
+  const [steps, setSteps] = useState([
+    {
+      key: 1,
+      title: "Download and install Homebrew",
+      commands: (
+        <Button
+          style={{ marginTop: "5px" }}
+          type="primary"
+          href="https://brew.sh/"
+          target="_blank"
+        >
+          Download Brew
+        </Button>
+      ),
+      copied: false,
+    } as StepCommand,
+    {
+      key: 2,
+      title: "Install NetBird:",
+      commands: [
+        `# for CLI only`,
+        `brew install netbirdio/tap/netbird`,
+        `# for GUI package`,
+        `brew install --cask netbirdio/tap/netbird-ui`,
+      ].join("\n"),
+      commandsForCopy: [
+        `brew install netbirdio/tap/netbird`,
+        `brew install --cask netbirdio/tap/netbird-ui`,
+      ].join("\n"),
+      copied: false,
+      showCopyButton: true,
+    } as StepCommand,
+    {
+      key: 3,
+      title: "Start NetBird daemon:",
+      commands: [
+        `sudo netbird service install`,
+        `sudo netbird service start`,
+      ].join("\n"),
+      commandsForCopy: [
+        `sudo netbird service install`,
+        `sudo netbird service start`,
+      ].join("\n"),
+      copied: false,
+      showCopyButton: true,
+    } as StepCommand,
+    {
+      key: 4,
+      title: "Run NetBird and log in the browser:",
+      commands: formatNetBirdUP(),
+      commandsForCopy: formatNetBirdUP(),
+      copied: false,
+      showCopyButton: true,
+    } as StepCommand,
+  ]);
+
+  const onCopyClick = () => {
+    const stringToCopy = "curl -fsSL https://pkgs.netbird.io/install.sh | sh";
+    copyToClipboard(stringToCopy);
+    setCopied(true);
+    setTimeout(() => {
+      setCopied(false);
+    }, 2000);
+  };
+    
+  return (
+    <div style={{ marginTop: 10 }}>
+      <Text style={{ fontWeight: "bold" }}>Install on MacOS</Text>
+      <div style={{ marginTop: 5, marginBottom: 5 }}>
+        <TabSteps stepsItems={quickSteps} />
+      </div>
+      <div style={{ marginTop: 0 }} />
+      {/*<Divider style={{marginTop: "5px"}} />*/}
+      <Collapse bordered={false} style={{ backgroundColor: "unset" }}>
+        <Panel
+          className="CustomPopupCollapse"
+          header={<Text strong={true}>Or install via command line</Text>}
+          key="1"
+        >
+          <div style={{ marginLeft: "25px" }}>
+            <Text style={{ fontWeight: "bold" }}>Install with one command</Text>
+            <div
+              style={{
+                fontSize: ".85em",
+                marginTop: 5,
+                marginBottom: 25,
+                position: "relative",
+              }}
+            >
+              {!copied ? (
+                <Button
+                  type="text"
+                  size="middle"
+                  className="btn-copy-code peer"
+                  icon={<CopyOutlined />}
+                  style={{ color: "rgb(107, 114, 128)", top: "0", zIndex: "3" }}
+                  onClick={onCopyClick}
+                />
+              ) : (
+                <Button
+                  type="text"
+                  size="middle"
+                  className="btn-copy-code peer"
+                  icon={<CheckOutlined />}
+                  style={{ color: "green", top: "0", zIndex: "3" }}
+                />
+              )}
+              <SyntaxHighlighter language="bash">
+                curl -fsSL https://pkgs.netbird.io/install.sh | sh
+              </SyntaxHighlighter>
+            </div>
+            <Text style={{ fontWeight: "bold" }}>
+              Or install manually with HomeBrew
+            </Text>
+            <div style={{ marginTop: 5 }}>
+              <TabSteps stepsItems={steps} />
+            </div>
+          </div>
+        </Panel>
+      </Collapse>
+    </div>
+  );
+};
+
+export default LinuxTab;

src/components/popups/addpeer/addpeer/TabSteps.tsx

@@ -0,0 +1,89 @@
+import "highlight.js/styles/mono-blue.css";
+import "highlight.js/lib/languages/bash";
+import { StepCommand } from "./types";
+import SyntaxHighlighter from "react-syntax-highlighter";
+import { Typography, Space, Steps, Button, Popover, StepsProps } from "antd";
+import { copyToClipboard } from "../../../../utils/common";
+import { CheckOutlined, CopyOutlined } from "@ant-design/icons";
+import React, { useEffect, useState } from "react";
+const { Step } = Steps;
+const { Text } = Typography;
+
+type Props = {
+  stepsItems: Array<StepCommand>;
+};
+
+const TabSteps: React.FC<Props> = ({ stepsItems }) => {
+  const [steps, setSteps] = useState(stepsItems);
+
+  useEffect(() => setSteps(stepsItems), [stepsItems]);
+
+  const onCopyClick = (
+    key: string | number,
+    commands: React.ReactNode | string,
+    copied: boolean
+  ) => {
+    if (!(typeof commands === "string")) return;
+    copyToClipboard(commands);
+    const step = steps.find((s) => s.key === key);
+    if (step) step.copied = copied;
+    setSteps([...steps]);
+
+    if (copied) {
+      setTimeout(() => {
+        onCopyClick(key, commands, false);
+      }, 2000);
+    }
+  };
+  return (
+    <Steps direction="vertical" size={"small"}>
+      {steps.map((c) => (
+        <Step
+          status={"process"}
+          key={c.key}
+          title={<Text>{c.title}</Text>}
+          description={
+            <Space
+              className="nb-code"
+              direction="vertical"
+              size="small"
+              style={{ display: "flex", fontSize: ".85em" }}
+            >
+              {c.commands && typeof c.commands === "string" ? (
+                <>
+                  {!c.copied ? (
+                    <Button
+                      type="text"
+                      size="middle"
+                      className="btn-copy-code peer"
+                      icon={<CopyOutlined />}
+                      style={{ color: "rgb(107, 114, 128)"}}
+                      onClick={() => {
+                        onCopyClick(c.key, c.commandsForCopy, true);
+                      }}
+                    />
+                  ) : (
+                    <Button
+                      type="text"
+                      size="middle"
+                      className="btn-copy-code peer"
+                      icon={<CheckOutlined />}
+                      style={{ color: "green"}}
+                    />
+                  )}
+                  <SyntaxHighlighter language="bash">
+                    {c.commands}
+                  </SyntaxHighlighter>
+                </>
+              ) : (
+                c.commands
+              )}
+            </Space>
+          }
+        />
+      ))}
+    </Steps>
+  );
+};
+
+export default TabSteps;

src/components/popups/addpeer/addpeer/UbuntuTab.tsx

@@ -0,0 +1,112 @@
+import React, { useState } from "react";
+import { StepCommand } from "./types";
+import { formatNetBirdUP } from "./common";
+import SyntaxHighlighter from "react-syntax-highlighter";
+import TabSteps from "./TabSteps";
+import { Typography, Button } from "antd";
+import { CheckOutlined, CopyOutlined } from "@ant-design/icons";
+import { copyToClipboard } from "../../../../utils/common";
+
+const { Title, Paragraph, Text } = Typography;
+
+export const UbuntuTab = () => {
+  const [copied, setCopied] = useState(false);
+
+  const [steps, setSteps] = useState([
+    {
+      key: 1,
+      title: "Add repository",
+      commands: [
+        `sudo apt-get update`,
+        `sudo apt install ca-certificates curl gnupg -y`,
+        `curl -sSL https://pkgs.netbird.io/debian/public.key | sudo gpg --dearmor --output /usr/share/keyrings/netbird-archive-keyring.gpg`,
+        `echo 'deb [signed-by=/usr/share/keyrings/netbird-archive-keyring.gpg] https://pkgs.netbird.io/debian stable main' | sudo tee /etc/apt/sources.list.d/netbird.list`,
+      ].join("\n"),
+      commandsForCopy: [
+        `sudo apt-get update`,
+        `sudo apt-get install ca-certificates curl gnupg -y`,
+        `curl -sSL https://pkgs.netbird.io/debian/public.key | sudo gpg --dearmor --output /usr/share/keyrings/netbird-archive-keyring.gpg`,
+        `echo 'deb [signed-by=/usr/share/keyrings/netbird-archive-keyring.gpg] https://pkgs.netbird.io/debian stable main' | sudo tee /etc/apt/sources.list.d/netbird.list`,
+      ].join("\n"),
+      copied: false,
+      showCopyButton: false,
+    } as StepCommand,
+    {
+      key: 2,
+      title: "Install NetBird",
+      commands: [
+        `sudo apt-get update`,
+        `# for CLI only`,
+        `sudo apt-get install netbird`,
+        `# for GUI package`,
+        `sudo apt-get install netbird-ui`,
+      ].join("\n"),
+      commandsForCopy: [
+        `sudo apt-get update`,
+        `sudo apt-get install netbird`,
+        `sudo apt-get install netbird-ui`,
+      ].join("\n"),
+      copied: false,
+      showCopyButton: false,
+    } as StepCommand,
+    {
+      key: 3,
+      title: "Run NetBird and log in the browser",
+      commands: formatNetBirdUP(),
+      commandsForCopy: formatNetBirdUP(),
+      copied: false,
+      showCopyButton: false,
+    } as StepCommand,
+  ]);
+
+  const onCopyClick = () => {
+    const stringToCopy = "curl -fsSL https://pkgs.netbird.io/install.sh | sh";
+    copyToClipboard(stringToCopy);
+    setCopied(true);
+    setTimeout(() => {
+      setCopied(false);
+    }, 2000);
+  };
+
+  return (
+    <div style={{ marginTop: 10 }}>
+      <Text style={{ fontWeight: "bold" }}>Install with one command</Text>
+      <div
+        style={{
+          fontSize: ".85em",
+          marginTop: 5,
+          marginBottom: 25,
+          position: "relative",
+        }}
+      >
+        {!copied ? (
+          <Button
+            type="text"
+            size="middle"
+            className="btn-copy-code peer"
+            icon={<CopyOutlined />}
+            style={{ color: "rgb(107, 114, 128)", top: "0", zIndex: "3" }}
+            onClick={onCopyClick}
+          />
+        ) : (
+          <Button
+            type="text"
+            size="middle"
+            className="btn-copy-code peer"
+            icon={<CheckOutlined />}
+            style={{ color: "green", top: "0", zIndex: "3" }}
+          />
+        )}
+        <SyntaxHighlighter language="bash">
+          curl -fsSL https://pkgs.netbird.io/install.sh | sh
+        </SyntaxHighlighter>
+      </div>
+      <Text style={{ fontWeight: "bold" }}>Or install manually on Ubuntu</Text>
+      <div style={{ marginTop: 5 }}>
+        <TabSteps stepsItems={steps} />
+      </div>
+    </div>
+  );
+};
+
+export default UbuntuTab;

src/components/popups/addpeer/addpeer/WindowsTab.tsx

@@ -0,0 +1,59 @@
+import React, {useState} from 'react';
+
+import {Button, Typography} from "antd";
+import TabSteps from "./TabSteps";
+import { StepCommand } from "./types"
+import {getConfig} from "../../../../config";
+const { grpcApiOrigin } = getConfig();
+
+const {Text} = Typography;
+
+export const WindowsTab = () => {
+
+    const [steps, setSteps] = useState([
+        {
+            key: 1,
+            title: 'Download and run Windows installer:',
+            commands: (
+                <Button data-testid="download-windows-button" style={{marginTop: "5px"}} type="primary" href="https://pkgs.netbird.io/windows/x64" target="_blank">Download NetBird</Button>
+            ),
+            copied: false
+        } as StepCommand,
+        ... grpcApiOrigin ? [{
+            key: 2,
+            title: 'Click on "Settings" from the NetBird icon in your system tray and enter the following "Management URL"',
+            commands: grpcApiOrigin,
+            commandsForCopy: grpcApiOrigin,
+            copied: false,
+            showCopyButton: false
+        }] : [],
+        {
+            key: 2 + (grpcApiOrigin ? 1 : 0),
+            title: 'Click on "Connect" from the NetBird icon in your system tray',
+            commands: '',
+            copied: false,
+            showCopyButton: false
+        },
+        {
+            key: 3 + (grpcApiOrigin ? 1 : 0),
+            title: 'Sign up using your email address',
+            commands: '',
+            copied: false,
+            showCopyButton: false
+        }
+    ])
+
+    return (
+        <div style={{marginTop: 10}}>
+            <Text style={{fontWeight: "bold"}}>
+                Install on Windows
+            </Text>
+            <div style={{marginTop: 5}}>
+                <TabSteps stepsItems={steps}/>
+            </div>
+
+        </div>
+    )
+}
+
+export default WindowsTab

src/components/popups/addpeer/addpeer/common.ts

@@ -0,0 +1,25 @@
+import {getConfig} from "../../../../config";
+const { grpcApiOrigin } = getConfig();
+
+
+export const formatNetBirdUP = () => {
+    let cmd = "netbird up"
+    if (grpcApiOrigin) {
+        cmd = "netbird up --management-url " + grpcApiOrigin
+    }
+    return [
+        cmd
+    ].join('\n')
+}
+
+export const formatDockerCommand = () => {
+    let cmd = ["docker run --rm -d",
+        "   --cap-add=NET_ADMIN",
+        "   -e NB_SETUP_KEY=SETUP_KEY",
+        "   -v netbird-client:/etc/netbird"]
+    if (grpcApiOrigin) {
+        cmd.push("   -e NB_MANAGEMENT_URL="+grpcApiOrigin)
+    }
+    cmd.push("   netbirdio/netbird:latest")
+    return cmd.join(' \\\n')
+}

src/components/popups/addpeer/addpeer/types.ts

@@ -0,0 +1,10 @@
+import * as React from "react";
+
+export interface StepCommand {
+  key: number | string;
+  title: React.ReactNode | string | null;
+  commands: React.ReactNode | string | null;
+  commandsForCopy?: React.ReactNode | string | null;
+  copied?: boolean;
+  showCopyButton?: boolean;
+}

src/config.json

@@ -1,8 +1,16 @@
 {
-  "domain": "$AUTH0_DOMAIN",
-  "clientId": "$AUTH0_CLIENT_ID",
-  "audience": "$AUTH0_AUDIENCE",
+  "auth0Auth": "$USE_AUTH0",
+  "authAuthority": "$AUTH_AUTHORITY",
+  "authClientId": "$AUTH_CLIENT_ID",
+  "authClientSecret": "$AUTH_CLIENT_SECRET",
+  "authScopesSupported": "$AUTH_SUPPORTED_SCOPES",
+  "authAudience": "$AUTH_AUDIENCE",
+
   "apiOrigin": "$NETBIRD_MGMT_API_ENDPOINT",
   "grpcApiOrigin": "$NETBIRD_MGMT_GRPC_API_ENDPOINT",
-  "latestVersion": "$NETBIRD_LATEST_VERSION"
+  "hotjarTrackID": "$NETBIRD_HOTJAR_TRACK_ID",
+  "redirectURI": "$AUTH_REDIRECT_URI",
+  "silentRedirectURI": "$AUTH_SILENT_REDIRECT_URI",
+  "tokenSource": "$NETBIRD_TOKEN_SOURCE",
+  "dragQueryParams": "$NETBIRD_DRAG_QUERY_PARAMS"
 }

src/config.ts

@@ -7,24 +7,39 @@ if (process.env.NODE_ENV !== 'production') {
   configJson = require("./config.json");
 }
 
+const defaultRedirectURI = '/#callback';
+const defaultSilentRedirectURI = '/#silent-callback'
+const defaultTokenSource = "accessToken"
 export function getConfig() {
-  // Configure the audience here. By default, it will take whatever is in the config
-  // (specified by the `audience` key) unless it's the default value of "YOUR_API_IDENTIFIER" (which
-  // is what you get sometimes by using the Auth0 sample download tool from the quickstart page, if you
-  // don't have an API).
-  // If this resolves to `null`, the API page changes to show some helpful info about what to do
-  // with the audience.
-  const audience =
-    configJson.audience && configJson.audience !== "YOUR_API_IDENTIFIER"
-      ? configJson.audience
-      : null;
+  let redirectURI = defaultRedirectURI
+  if (configJson.redirectURI) {
+    redirectURI = configJson.redirectURI
+  }
+
+  let silentRedirectURI = defaultSilentRedirectURI
+  if (configJson.silentRedirectURI) {
+    silentRedirectURI = configJson.silentRedirectURI
+  }
+
+  let tokenSource = defaultTokenSource
+  if (configJson.tokenSource) {
+    tokenSource = configJson.tokenSource
+  }
 
   return {
-    domain: configJson.domain,
-    clientId: configJson.clientId,
+    auth0Auth: configJson.auth0Auth == "true", //due to substitution we can't use boolean in the config
+    authority: configJson.authAuthority.replace(/\/+$/, ''),
+    clientId: configJson.authClientId,
+    clientSecret: configJson.authClientSecret,
+    scopesSupported: configJson.authScopesSupported,
     apiOrigin: configJson.apiOrigin,
     grpcApiOrigin: configJson.grpcApiOrigin,
-    latestVersion: configJson.latestVersion,
-    ...(audience ? { audience } : null),
+    audience: configJson.authAudience,
+    hotjarTrackID: configJson.hotjarTrackID,
+    redirectURI: redirectURI,
+    silentRedirectURI: silentRedirectURI,
+    tokenSource: tokenSource,
+    // drags all the query params to the auth layer specified in the URL when accessing dashboard.
+    dragQueryParams: configJson.dragQueryParams == "true"
   };
 }

src/index.css

@@ -1,20 +1,35 @@
-@import '~antd/dist/antd.css';
+@import url('https://fonts.googleapis.com/css2?family=Arimo:wght@400;500;600&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Inconsolata:wght@400;500&display=swap');
+@import 'antd/dist/reset.css';
 
-/*@tailwind base;*/
-/*@tailwind components;*/
-/*@tailwind utilities;*/
+pre,
+code,
+kbd,
+samp,
+pre *,
+code *,
+kbd *,
+samp * {
+  font-family: 'SFMono-Regular', Consolas, 'Liberation Mono', Menlo, Courier, monospace !important;
+}
+
+html,
+body,
+* {
+  font-family: 'Arimo', sans-serif !important;
+}
 
 body {
   font-size: 16px;
   background-color: #f0f2f5;
 }
 
+
 .ant-layout-header {
   background: #fff;
   padding: 0;
   height: auto;
   min-height: 64px;
-
   border-bottom: 1px solid #e0e0e0;
 }
 
@@ -27,13 +42,14 @@ body {
   border: none;
 }
 
-.ant-menu-horizontal > .ant-menu-item a {
+.ant-menu-horizontal>.ant-menu-item a {
   color: rgba(107, 114, 128, 1);
-  font-weight: 500;
+  font-weight: 400;
 }
 
-.ant-menu-horizontal > .ant-menu-item-selected a {
+.ant-menu-horizontal>.ant-menu-item-selected a {
   color: rgba(17, 24, 39, 1);
+  font-weight: 500;
 }
 
 
@@ -51,23 +67,25 @@ body {
   flex-wrap: wrap;
   align-items: flex-start;
 }
+
 .space-align-block {
   flex: none;
   margin: 8px 4px;
   padding: 4px;
   border: none;
 }
+
 .space-align-block .mock-block {
   display: inline-block;
   padding: 32px 8px 16px;
   background: rgba(150, 150, 150, 0.2);
 }
 
-.bg-indigo-600{
+.bg-indigo-600 {
   background-color: rgb(79, 70, 229);
 }
 
-.card-table-no-placeholder .ant-table-placeholder{
+.card-table-no-placeholder .ant-table-placeholder {
   display: none;
 }
 
@@ -79,9 +97,10 @@ body {
   height: 200px;
 }
 
-.card-table .ant-table-ping-left:not(.ant-table-has-fix-left) .ant-table-container::before  {
+.card-table .ant-table-ping-left:not(.ant-table-has-fix-left) .ant-table-container::before {
   box-shadow: none;
 }
+
 .card-table .ant-table-ping-right:not(.ant-table-has-fix-right) .ant-table-container::after {
   box-shadow: none;
 }
@@ -92,20 +111,6 @@ body {
   align-self: center;
 }
 
-.ant-steps-item-tail::after {
-  background-color: #1890ff !important;
-}
-
-.ant-steps-item-icon {
-  background: #1890ff !important;
-  color: #ffffff !important;
-  border: none;
-}
-
-.ant-steps-icon {
-  color: #ffffff !important;
-}
-
 .nb-code {
   margin-bottom: 1em;
 }
@@ -135,4 +140,455 @@ body {
 .access-control.ant-drawer-subtitle {
   line-height: 22px;
   margin: 24px 0;
+}
+
+.ant-steps-item-icon {
+  background: #EBEBEB !important;
+  border-color: #EBEBEB !important;
+}
+
+.ant-steps-icon-dot {
+  background: #EBEBEB !important;
+  border-color: #EBEBEB !important;
+}
+
+.ant-steps-icon {
+  background: #EBEBEB !important;
+  border: none;
+  color: black !important;
+}
+
+.ant-steps-item-tail::after {
+  background: #EBEBEB !important;
+}
+
+.ant-steps-item-tail {
+  border: none;
+}
+
+td.non-highlighted-table-column {
+  background-color: #FFFFFF !important;
+}
+
+.ant-table-tbody>tr.ant-table-row:hover>td {
+  background: #FAFAFA !important;
+}
+
+.ant-table-thead .ant-table-cell {
+  font-weight: normal !important;
+}
+
+.CustomPopupCollapse .ant-collapse-content-box,
+.CustomPopupCollapse .ant-collapse-header {
+  padding-left: 0 !important;
+  padding-top: 0 !important;
+}
+
+.system-info-panel .ant-collapse-header {
+  padding: 0 !important;
+}
+
+.system-info-panel .ant-collapse-content-box {
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+}
+
+.peers-form .ant-layout-header {
+  line-height: 25px;
+  height: auto;
+  min-height: auto;
+  padding-bottom: 15px;
+  cursor: pointer;
+}
+
+.cursor-pointer {
+  cursor: pointer;
+}
+
+.ant-modal-content {
+  border-radius: 0px !important;
+}
+
+.ant-form-item-explain-error {
+  font-weight: 500;
+  font-size: 12px;
+  line-height: 14px;
+  margin-top: 2px;
+}
+
+.menlo-font,
+.menlo-font * {
+  font-family: 'Menlo', monospace !important;
+}
+
+.arimo-font,
+.arimo-font * {
+  font-family: 'Arimo', sans-serif !important;
+}
+
+.tag-box .ant-select-selector {
+  padding: 0 5px !important;
+}
+
+.tag-box .ant-select-selection-item {
+  width: 100%;
+  line-height: 20px;
+  justify-content: center;
+  list-style: none;
+  display: flex;
+  white-space: nowrap;
+  background: rgba(0, 0, 0, 0.02);
+  border: 1px solid #d9d9d9;
+  border-radius: 4px;
+  opacity: 1;
+  transition: all 0.2s;
+  text-align: start;
+  max-width: 40px;
+  height: 25px;
+  padding: 0 4px !important;
+  align-items: center;
+  margin-top: 3px;
+  text-align: center;
+}
+
+.w-100 {
+  width: 100%;
+}
+
+.font-500 {
+  font-weight: 500;
+}
+
+.page-heading {
+  font-weight: 500 !important;
+  font-size: 22px !important;
+  margin: 0 !important;
+}
+
+.ant-tag {
+  font-weight: 400 !important;
+}
+
+.react-select__indicator-separator {
+  display: none !important;
+}
+
+.react-select__control,
+.react-select__value-container,
+.react-select__input-container {
+  min-height: 32px !important;
+  padding: 0 5px !important;
+  max-height: 32px !important;
+  margin: 0 !important;
+}
+
+.react-select__value-container {
+  align-items: center !important;
+}
+
+.react-select__indicator {
+  padding: 0 5px !important;
+}
+
+.ant-badge-status-dot {
+  width: 8px !important;
+  height: 8px !important;
+}
+
+.routes-accordian {
+  margin-top: 20px;
+}
+
+.routes-accordian .ant-collapse-header {
+  background: #fff;
+  align-items: center !important;
+}
+
+.ant-collapse-content-box {
+  background: #FAFAFA;
+  padding: 5px 16px !important;
+}
+
+.accordian-header p {
+  font-weight: 600;
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  color: rgba(0, 0, 0, 0.85);
+  margin: 0;
+  width: 25%;
+}
+
+.headerInner {
+  display: flex;
+  height: 45px;
+}
+
+.headerInner p {
+  margin: 0;
+  width: 33.33%;
+  display: flex;
+  align-items: center;
+}
+
+.accordian-header {
+  display: flex;
+  padding: 10px 40px;
+}
+
+.accordian-inner-header {
+  display: flex;
+  padding: 10px 40px;
+  margin-bottom: 10px;
+}
+
+.accordian-inner-header p {
+  font-weight: 600;
+  font-size: 14px;
+  display: flex;
+  align-items: center;
+  color: rgba(0, 0, 0, 0.85);
+  margin: 0;
+  width: 20%;
+}
+
+.accordian-inner-listing {
+  padding: 3px 40px;
+  display: flex;
+  align-items: center;
+}
+
+.accordian-inner-listing p {
+  font-size: 14px;
+  align-items: center;
+  color: rgba(0, 0, 0, 0.85);
+  width: 10%;
+  margin: 0;
+}
+
+.headerInner .text-right {
+  display: block;
+  text-align: right;
+  padding-right: 40px;
+}
+
+.accordian-inner-listing p:nth-child(5) {
+  text-align: right;
+}
+
+.text-center {
+  text-align: center;
+}
+
+
+.accordian-inner-listing p:nth-child(1) {
+  width: 25%;
+  padding-right: 0;
+}
+
+.accordian-inner-header p:nth-child(1) {
+  width: calc(20% + 50px);
+}
+
+.accordian-inner-listing p:nth-child(2) {
+  width: 25%;
+}
+
+.accordian-inner-header p:nth-child(2) {
+  width: 25%;
+}
+
+.accordian-inner-listing p:nth-child(3) {
+  width: 20%;
+}
+
+.accordian-inner-listing p:nth-child(4) {
+  width: 20%;
+}
+
+.ant-list-item {
+  padding: 5px 0 !important;
+  margin-inline: 0 !important;
+}
+
+ul.ant-list-items {
+  margin-top: 5px !important;
+}
+
+.container-spinner {
+  margin: 20px 0;
+  margin-bottom: 20px;
+  padding: 30px 50px;
+  text-align: center;
+  background: rgb(0 0 0 / 2%);
+  border-radius: 4px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 300px;
+}
+
+.remove-bg .ant-collapse-content-box {
+  background-color: transparent;
+}
+
+.route-form .ant-form-item {
+  margin-bottom: 24px;
+}
+
+.nb-code {
+  position: relative;
+}
+
+.btn-copy-code.peer {
+  position: absolute;
+  top: 10px;
+  right: 2px;
+}
+
+.blue-color {
+  color: #1890FF;
+}
+
+.style-like-text .ant-select-selector {
+  background: transparent !important;
+  border: none !important;
+  padding: 0 !important;
+  color: rgba(0, 0, 0, 1) !important;
+}
+
+.style-like-text .ant-select-selection-search::after {
+  display: none !important;
+}
+
+.style-like-text .ant-select-selection-item {
+  padding-inline-end: 0 !important;
+}
+
+.style-like-text .ant-select-arrow {
+  display: none !important;
+}
+
+
+.ant-spin-nested-loading .ant-spin-spinning {
+  min-height: 300px;
+}
+
+.route-form.edit-form-wrapper .ant-form-item {
+  margin-bottom: 39px;
+}
+
+.delete-button {
+  cursor: auto !important;
+}
+
+.groupsSelect {
+  max-width: 200px;
+  width: 100%;
+}
+
+@media (max-width: 1220px) {
+  .groupsSelect {
+    margin-left: 0;
+    margin-top: 15px;
+  }
+}
+
+@media (max-width: 991px) {
+  .setting-nav {
+    flex-flow: column !important;
+  }
+
+  .setting-nav>div {
+    max-width: 100% !important;
+  }
+}
+
+.noborderPadding .ant-card-body {
+  padding: 0 !important;
+}
+
+.noborderPadding {
+  border: none !important;
+  box-shadow: none !important;
+}
+
+.d-none {
+  display: none !important;
+}
+
+.nohover {
+  background: transparent !important;
+  cursor: text;
+}
+
+.emp-wrapper {
+  display: flex;
+  align-items: center;
+  gap: 8px;
+}
+
+.emp-wrapper p {
+  margin: 0;
+}
+
+.g-r-wrapper {
+  display: flex;
+  gap: 8px;
+  margin-bottom: 10px;
+}
+
+.gp-main-wrapper .g-r-wrapper {
+  margin: 0;
+}
+
+.gp-main-wrapper {
+  display: flex;
+  gap: 5px;
+  align-items: center;
+}
+
+.availtooltip a {
+  padding: 5px 0 0;
+  display: inline-block;
+  font-size: 14px;
+}
+
+.availtooltip {
+  padding: 5px;
+}
+
+.availtooltip p {
+  color: #000;
+  font-size: 13.5px;
+  margin: 0;
+}
+
+.avail-inner {
+  display: flex;
+  align-items: flex-start;
+  gap: 10px;
+}
+
+.avail-inner span {
+  color: #1890FF;
+  font-size: 24px;
+}
+
+.avail-icon {
+  font-size: 24px;
+}
+.peer-avail-tooltip .ant-tooltip-inner {
+  color: #000;
+  font-size: 14px;
+  line-height: 24px;
+  padding: 25px;
+}
+
+.peer-avail-tooltip {
+  min-width: 400px;
+}
+.info-icon {
+  font-size: 22px;
+  color: #FD9349;
 }

src/index.tsx

@@ -4,40 +4,105 @@ import './index.css';
 import App from './App';
 import reportWebVitals from './reportWebVitals';
 import history from "./utils/history";
-import { getConfig } from "./config";
-import {Auth0Provider} from "@auth0/auth0-react";
+import {getConfig} from "./config";
+import {OidcProvider} from '@axa-fr/react-oidc';
 import {BrowserRouter} from "react-router-dom";
-
-const onRedirectCallback = (appState:any) => {
-    history.push(
-        appState && appState.returnTo ? appState.returnTo : window.location.pathname
-    );
-};
+import Loading from "./components/Loading";
+import LoginError from "./components/LoginError";
+import {AuthorityConfiguration} from "@axa-fr/react-oidc/dist/vanilla/oidc";
+import InstallPage from "./views/Install";
+import {ConfigProvider} from "antd";
 
 const config = getConfig();
 
+// Unfortunately Auth0 https://<DOMAIN>/.well-known/openid-configuration doesn't contain end_session_endpoint that
+// is required for doing logout. Therefore, we need to hardcode the config for auth
+const auth0AuthorityConfig: AuthorityConfiguration = {
+    authorization_endpoint: new URL("authorize", config.authority).href,
+    token_endpoint: new URL("oauth/token", config.authority).href,
+    revocation_endpoint: new URL("oauth/revoke", config.authority).href,
+    end_session_endpoint: new URL("v2/logout", config.authority).href,
+    userinfo_endpoint: new URL("userinfo", config.authority).href,
+} as AuthorityConfiguration
+
+const buildExtras = (config: any) => {
+    type Extras = { [key: string]: string }
+    let extras: Extras = {};
+
+    if (config.dragQueryParams) {
+        const searchParams = new URLSearchParams(window.location.search);
+        searchParams.forEach((value, key) => {
+            extras[key] = value
+        });
+    }
+
+    if (config.audience) {
+        extras.audience = config.audience
+    }
+    return extras
+}
+
 const providerConfig = {
-    domain: config.domain,
-    clientId: config.clientId,
-    ...(config.audience ? { audience: config.audience } : null),
-    redirectUri: window.location.origin,
-    useRefreshTokens: true,
-    onRedirectCallback,
+    authority: config.authority,
+    client_id: config.clientId,
+    redirect_uri: window.location.origin + config.redirectURI,
+    refresh_time_before_tokens_expiration_in_second: 30,
+    silent_redirect_uri: window.location.origin + config.silentRedirectURI,
+    scope: config.scopesSupported,
+    // disabling service worker
+    // service_worker_relative_url:'/OidcServiceWorker.js',
+    service_worker_only: false,
+    authority_configuration: config.auth0Auth ? auth0AuthorityConfig : undefined,
+    extras: buildExtras(config),
+    ...(config.clientSecret ? {token_request_extras: {client_secret: config.clientSecret}} : null)
 };
 
 const root = ReactDOM.createRoot(
     document.getElementById('root') as HTMLElement
 );
 
-root.render(
-    <BrowserRouter>
-        <Auth0Provider {...providerConfig}>
+const loadingComponent = () => <Loading padding="3em" width={50} height={50}/>
+
+const showApp = () => {
+    if (window.location.pathname === "/install") {
+        // We bypass authentication for pages that do not require auth.
+        // E.g., when we just want to show installation steps for public.
+        return <InstallPage/>
+    }
+
+    return <OidcProvider
+        configuration={providerConfig}
+        callbackSuccessComponent={loadingComponent}
+        authenticatingErrorComponent={LoginError}
+        authenticatingComponent={loadingComponent}
+        sessionLostComponent={loadingComponent}
+        loadingComponent={loadingComponent}
+        onSessionLost={() => {
+            history.push("/peers")
+        }}
+    >
+        <BrowserRouter>
             <App/>
-        </Auth0Provider>
-    </BrowserRouter>
+        </BrowserRouter>
+    </OidcProvider>
+}
+
+root.render(
+    <ConfigProvider
+        theme={{
+            token: {
+                borderRadius: 4,
+                colorPrimary: "#1890ff",
+                fontFamily: "Arial"
+            },
+            components: {Badge: {fontSizeSM: 20}},
+        }}
+    >
+        {showApp()}
+    </ConfigProvider>
 );
 
 // If you want to start measuring performance in your app, pass a function
 // to log results (for example: reportWebVitals(console.log))
 // or send to an analytics endpoint. Learn more: https://bit.ly/CRA-vitals
-reportWebVitals();
+reportWebVitals();

src/services/api-client/api-request.ts

@@ -1,14 +1,8 @@
-import axios, {AxiosError} from 'axios';
+import axios from 'axios';
 
-import {ApiRequestParams, ApiResponse, ApiError} from './types';
+import {ApiError, ApiRequestParams, ApiResponse} from './types';
 import {headersFactory, RequestHeader} from './header-factory';
 
-/*axios.interceptors.response.use(undefined, err => {
-  let res = err.response;
-  if (res.status === 401) {
-  }
-})*/
-
 async function apiRequest<T>(params: ApiRequestParams): Promise<ApiResponse<T>> {
   const data = params.data ? (params.data as any).payload : undefined;
   const url = `${params.urlBase}${params.url}`;
@@ -16,18 +10,20 @@ async function apiRequest<T>(params: ApiRequestParams): Promise<ApiResponse<T>>
   const extraHeaders = params.extraHeaders || {};
   const headers = await headersFactory((params.data as any).getAccessTokenSilently);
 
-  const builtHeader: RequestHeader = { ...headers, ...extraHeaders };
+  const builtHeader: RequestHeader = {...headers, ...extraHeaders};
 
   let response;
-  let error:ApiError = {
+  let error: ApiError = {
     code: '-1',
     message: '',
     data: null,
     statusCode: -1
   };
 
+  let queryParams = (params.data as any).queryParams ? (params.data as any).queryParams : {};
+
   try {
-    response = await axios.request({ url, data, method: params.method, headers: builtHeader as any });
+    response = await axios.request({url, data, method: params.method, headers: builtHeader as any, params: queryParams});
   } catch (err: any) {
     error = <ApiError>{
       code: err ? err.code : '-1',
@@ -35,11 +31,19 @@ async function apiRequest<T>(params: ApiRequestParams): Promise<ApiResponse<T>>
       data: (err && err.response) ? err.response.data : null,
       statusCode: (err && err.response) ? err.response.status : -1,
     };
-
+    if (error.statusCode === 401) {
+      let old = error.message
+      error.message = old + ". Please refresh the page if the issue continues."
+      error.code = 'ERR_UNAUTHORIZED'
+    } else if (error.statusCode === 403) {
+      error.code = 'ERR_FORBIDDEN'
+      console.log(error)
+    }
+    console.log(error)
     throw error;
   }
 
-  return { statusCode: response ? response.status : error.statusCode, body: response ? response.data : error };
+  return {statusCode: response ? response.status : error.statusCode, body: response ? response.data : error};
 }
 
-export { apiRequest };
+export {apiRequest};

src/services/api-client/header-factory.ts

@@ -9,10 +9,7 @@ const headersFactory = async (getAccessTokenSilently:any): Promise<RequestHeader
     'Accept': 'application/json'
   };
 
-  //const token = await getLocalItem<string>(StorageKey.token);
-  //const token = ''
-  const token = await getAccessTokenSilently()
-
+  const token = await getAccessTokenSilently() as string
   if (token) {
     headers.authorization = `Bearer ${token}`;
   }

src/services/api-client/types.ts

@@ -1,12 +1,13 @@
-import { Method } from 'axios';
+import { Method } from "axios";
 
 export interface RequestPayload<T> {
-  getAccessTokenSilently: any;
-  payload:T;
+  getAccessTokenSilently: any | null;
+  queryParams?: any | null;
+  payload: T;
 }
 
 export interface RequestHeader {
-  'content-type': string;
+  "content-type": string;
   [key: string]: string;
 }
 
@@ -27,15 +28,16 @@ export interface RequestConfig {
 export interface ApiRequestParams extends RequestConfig {
   method: Method;
   url: string;
+  params?: any;
   data: unknown;
   urlBase: string;
 }
 
 export interface ApiError {
-  code:string;
-  message:string;
-  data?:any;
-  statusCode:number;
+  code: string;
+  message: string;
+  data?: any;
+  statusCode: number;
 }
 
 export interface DeleteResponse<T> {
@@ -43,7 +45,7 @@ export interface DeleteResponse<T> {
   success: boolean;
   failure: boolean;
   error: ApiError | null;
-  data : T;
+  data: T;
 }
 
 export interface CreateResponse<T> {
@@ -51,7 +53,7 @@ export interface CreateResponse<T> {
   success: boolean;
   failure: boolean;
   error: ApiError | null;
-  data : T;
+  data: T;
 }
 
 export interface ChangeResponse<T> {
@@ -59,5 +61,5 @@ export interface ChangeResponse<T> {
   success: boolean;
   failure: boolean;
   error: ApiError | null;
-  data : T;
-}
+  data: T;
+}

src/services/local/index.ts

@@ -1,29 +1,30 @@
 export enum StorageKey {
-  token
+    token,
+    hadFirstRun
 }
 
 const setLocalItem = async <T>(key: StorageKey, value: T): Promise<void> => {
-  try {
-    localStorage.setItem(`@net-bird:${key}`, JSON.stringify(value));
-  } catch (err) {
-    console.log(err);
-  }
+    try {
+        localStorage.setItem(`@net-bird:${key}`, JSON.stringify(value));
+    } catch (err) {
+        console.log(err);
+    }
 };
 
 const getLocalItem = async <T>(key: StorageKey): Promise<T | null> => {
-  try {
-    const item = localStorage.getItem(`@net-bird:${key}`);
-    if (!item) {
-      return null;
+    try {
+        const item = localStorage.getItem(`@net-bird:${key}`);
+        if (!item) {
+            return null;
+        }
+        return JSON.parse(item) as T;
+    } catch (err) {
+        console.log(err);
     }
-    return JSON.parse(item) as T;
-  } catch (err) {
-    console.log(err);
-  }
-  return null;
+    return null;
 };
 
 export {
-  getLocalItem,
-  setLocalItem
+    getLocalItem,
+    setLocalItem
 }

src/store/account/actions.ts

@@ -0,0 +1,23 @@
+import {ActionType, createAction, createAsyncAction} from 'typesafe-actions';
+import {Account} from './types';
+import {ApiError, ChangeResponse, RequestPayload} from '../../services/api-client/types';
+
+const actions = {
+    getAccounts: createAsyncAction(
+        'GET_ACCOUNTS_REQUEST',
+        'GET_ACCOUNTS_SUCCESS',
+        'GET_ACCOUNTS_FAILURE',
+    )<RequestPayload<null>, Account[], ApiError>(),
+
+    updateAccount: createAsyncAction(
+        'UPDATE_ACCOUNT',
+        'UPDATE_ACCOUNT_SUCCESS',
+        'UPDATE_ACCOUNT_FAILURE',
+    )<RequestPayload<Account>, ChangeResponse<Account | null>, ChangeResponse<Account | null>>(),
+    setUpdateAccount: createAction('SET_UPDATED_ACCOUNT')<ChangeResponse<Account | null>>(),
+    resetUpdateAccount: createAction('RESET_UPDATED_ACCOUNT')<null>(),
+};
+
+
+export type ActionTypes = ActionType<typeof actions>;
+export default actions;

src/store/account/index.ts

@@ -0,0 +1,7 @@
+import actions, { ActionTypes as _actionTypes } from './actions';
+import reducer from './reducer';
+import sagas from './sagas';
+
+export type ActionTypes = _actionTypes;
+
+export { actions, reducer, sagas };

src/store/account/reducer.ts

@@ -0,0 +1,54 @@
+import { createReducer } from 'typesafe-actions';
+import { combineReducers } from 'redux';
+import { Account } from './types';
+import actions, { ActionTypes } from './actions';
+import {ApiError, ChangeResponse} from "../../services/api-client/types";
+
+type StateType = Readonly<{
+  data: Account[] | null;
+  loading: boolean;
+  failed: ApiError | null;
+  savedAccount: ChangeResponse<Account | null>;
+}>;
+
+const initialState: StateType = {
+  data: [],
+  loading: false,
+  failed: null,
+  savedAccount: <ChangeResponse<Account | null>>{
+    loading: false,
+    success: false,
+    failure: false,
+    error: null,
+    data : null
+  },
+};
+
+const data = createReducer<Account[], ActionTypes>(initialState.data as Account[])
+  .handleAction(actions.getAccounts.success,(_, action) => action.payload)
+  .handleAction(actions.getAccounts.failure, () => []);
+
+const loading = createReducer<boolean, ActionTypes>(initialState.loading)
+    .handleAction(actions.getAccounts.request, () => true)
+    .handleAction(actions.getAccounts.success, () => false)
+    .handleAction(actions.getAccounts.failure, () => false);
+
+const failed = createReducer<ApiError | null, ActionTypes>(initialState.failed)
+    .handleAction(actions.getAccounts.request, () => null)
+    .handleAction(actions.getAccounts.success, () => null)
+    .handleAction(actions.getAccounts.failure, (store, action) => action.payload);
+
+const updatedAccount = createReducer<ChangeResponse<Account | null>, ActionTypes>(initialState.savedAccount)
+    .handleAction(actions.updateAccount.request, () => initialState.savedAccount)
+    .handleAction(actions.updateAccount.success, (store, action) => action.payload)
+    .handleAction(actions.updateAccount.failure, (store, action) => action.payload)
+    .handleAction(actions.setUpdateAccount, (store, action) => action.payload)
+    .handleAction(actions.resetUpdateAccount, () => initialState.savedAccount)
+
+
+export default combineReducers({
+  data,
+  loading,
+  failed,
+  updatedAccount
+});

src/store/account/sagas.ts

@@ -0,0 +1,64 @@
+import {all, call, put, takeLatest} from 'redux-saga/effects';
+import {ApiError, ApiResponse, ChangeResponse} from '../../services/api-client/types';
+import {Account} from './types'
+import service from './service';
+import actions from './actions';
+
+export function* getAccounts(action: ReturnType<typeof actions.getAccounts.request>): Generator {
+    try {
+        const effect = yield call(service.getAccounts, action.payload);
+        const response = effect as ApiResponse<Account[]>;
+
+        yield put(actions.getAccounts.success(response.body));
+    } catch (err) {
+        yield put(actions.getAccounts.failure(err as ApiError));
+    }
+}
+
+export function* updateAccount(action: ReturnType<typeof actions.updateAccount.request>): Generator {
+    try {
+        yield put(actions.setUpdateAccount({
+            loading: true,
+            success: false,
+            failure: false,
+            error: null,
+            data: null
+        }))
+
+        const account = action.payload.payload
+
+        const payloadToSave = {
+            getAccessTokenSilently: action.payload.getAccessTokenSilently,
+            payload: account
+        }
+
+        const effect = yield call(service.updateAccount, payloadToSave)
+        const response = effect as ApiResponse<Account>;
+
+        yield put(actions.updateAccount.success({
+            loading: false,
+            success: true,
+            failure: false,
+            error: null,
+            data: response.body
+        } as ChangeResponse<Account | null>));
+
+    } catch (err) {
+        console.log(err)
+        yield put(actions.updateAccount.failure({
+            loading: false,
+            success: false,
+            failure: true,
+            error: err as ApiError,
+            data: null
+        } as ChangeResponse<Account | null>));
+    }
+}
+
+export default function* sagas(): Generator {
+    yield all([
+        takeLatest(actions.getAccounts.request, getAccounts),
+        takeLatest(actions.updateAccount.request, updateAccount),
+    ]);
+}
+

src/store/account/service.ts

@@ -0,0 +1,19 @@
+import {ApiResponse, RequestPayload} from '../../services/api-client/types';
+import { apiClient } from '../../services/api-client';
+import {Account} from './types';
+
+export default {
+  async getAccounts(payload:RequestPayload<null>): Promise<ApiResponse<Account[]>> {
+    return apiClient.get<Account[]>(
+      `/api/accounts`,
+        payload
+    );
+  },
+  async updateAccount(payload:RequestPayload<Account>): Promise<ApiResponse<Account>> {
+    const id = payload.payload.id
+    return apiClient.put<Account>(
+        `/api/accounts/${id}`,
+        payload
+    );
+  }
+};

src/store/account/types.ts

@@ -0,0 +1,20 @@
+import {ExpiresInValue} from "../../views/ExpiresInInput";
+
+export interface Account {
+  id: string;
+  settings: {
+    peer_login_expiration_enabled: boolean;
+    peer_login_expiration: number;
+    jwt_groups_enabled: boolean;
+    groups_propagation_enabled: boolean;
+    jwt_groups_claim_name: string;
+  };
+}
+
+export interface FormAccount extends Account {
+  peer_login_expiration_enabled: boolean;
+  jwt_groups_enabled: boolean;
+  groups_propagation_enabled: boolean;
+  jwt_groups_claim_name: string;
+  peer_login_expiration_formatted: ExpiresInValue;
+}

src/store/dns-settings/actions.ts

@@ -0,0 +1,26 @@
+import { ActionType, createAction, createAsyncAction } from 'typesafe-actions';
+import {DNSSettings, DNSSettingsToSave} from './types';
+import {ApiError, CreateResponse, RequestPayload} from '../../services/api-client/types';
+
+const actions = {
+  getDNSSettings: createAsyncAction(
+      'GET_DNSSettings_REQUEST',
+      'GET_DNSSettings_SUCCESS',
+      'GET_DNSSettings_FAILURE',
+  )<RequestPayload<null>, DNSSettings, ApiError>(),
+
+  saveDNSSettings: createAsyncAction(
+      'SAVE_DNSSettings_REQUEST',
+      'SAVE_DNSSettings_SUCCESS',
+      'SAVE_DNSSettings_FAILURE',
+  )<RequestPayload<DNSSettingsToSave>, CreateResponse<DNSSettings | null>, CreateResponse<DNSSettings | null>>(),
+  setSavedDNSSettings: createAction('SET_CREATE_DNSSettings')<CreateResponse<DNSSettings | null>>(),
+  resetSavedDNSSettings: createAction('RESET_CREATE_DNSSettings')<null>(),
+
+  setDNSSettings: createAction('SET_DNSSettings')<DNSSettings>(),
+  setSetupNewDNSSettingsVisible: createAction('SET_SETUP_NEW_DNSSettings_VISIBLE')<boolean>(),
+  setSetupNewDNSSettingsHA: createAction('SET_SETUP_NEW_DNSSettings_HA')<boolean>()
+};
+
+export type ActionTypes = ActionType<typeof actions>;
+export default actions;

src/store/dns-settings/index.ts

@@ -0,0 +1,7 @@
+import actions, { ActionTypes as _actionTypes } from './actions';
+import reducer from './reducer';
+import sagas from './sagas';
+
+export type ActionTypes = _actionTypes;
+
+export { actions, reducer, sagas };

src/store/dns-settings/reducer.ts

@@ -0,0 +1,79 @@
+import { createReducer } from 'typesafe-actions';
+import { combineReducers } from 'redux';
+import { DNSSettings } from './types';
+import actions, { ActionTypes } from './actions';
+import {ApiError, CreateResponse} from "../../services/api-client/types";
+
+type StateType = Readonly<{
+  data: DNSSettings | null;
+  dnsSettings: DNSSettings | null;
+  loading: boolean;
+  failed: ApiError | null;
+  saving: boolean;
+  savedDNSSettings: CreateResponse<DNSSettings | null>;
+  setupNewDNSSettingsVisible: boolean;
+  setupNewDNSSettingsHA: boolean
+}>;
+
+const initialState: StateType = {
+  data: null,
+  dnsSettings: null,
+  loading: false,
+  failed: null,
+  saving: false,
+  savedDNSSettings: <CreateResponse<DNSSettings | null>>{
+    loading: false,
+    success: false,
+    failure: false,
+    error: null,
+    data : null
+  },
+  setupNewDNSSettingsVisible: false,
+  setupNewDNSSettingsHA: false
+};
+
+const data = createReducer<DNSSettings, ActionTypes>(initialState.data as DNSSettings)
+    .handleAction(actions.getDNSSettings.success,(settings, action) => action.payload)
+    .handleAction(actions.getDNSSettings.failure,(settings, _) => settings);
+
+const dnsSettings = createReducer<DNSSettings, ActionTypes>(initialState.dnsSettings as DNSSettings)
+    .handleAction(actions.setDNSSettings, (store, action) => action.payload);
+
+const loading = createReducer<boolean, ActionTypes>(initialState.loading)
+    .handleAction(actions.getDNSSettings.request, () => true)
+    .handleAction(actions.getDNSSettings.success, () => false)
+    .handleAction(actions.getDNSSettings.failure, () => false);
+
+const failed = createReducer<ApiError | null, ActionTypes>(initialState.failed)
+    .handleAction(actions.getDNSSettings.request, () => null)
+    .handleAction(actions.getDNSSettings.success, () => null)
+    .handleAction(actions.getDNSSettings.failure, (store, action) => action.payload);
+
+const saving = createReducer<boolean, ActionTypes>(initialState.saving)
+    .handleAction(actions.getDNSSettings.request, () => true)
+    .handleAction(actions.getDNSSettings.success, () => false)
+    .handleAction(actions.getDNSSettings.failure, () => false);
+
+const savedDNSSettings = createReducer<CreateResponse<DNSSettings | null>, ActionTypes>(initialState.savedDNSSettings)
+    .handleAction(actions.saveDNSSettings.request, () => initialState.savedDNSSettings)
+    .handleAction(actions.saveDNSSettings.success, (store, action) => action.payload)
+    .handleAction(actions.saveDNSSettings.failure, (store, action) => action.payload)
+    .handleAction(actions.setSavedDNSSettings, (store, action) => action.payload)
+    .handleAction(actions.resetSavedDNSSettings, () => initialState.savedDNSSettings)
+
+const setupNewDNSSettingsVisible = createReducer<boolean, ActionTypes>(initialState.setupNewDNSSettingsVisible)
+    .handleAction(actions.setSetupNewDNSSettingsVisible, (store, action) => action.payload)
+
+const setupNewDNSSettingsHA = createReducer<boolean, ActionTypes>(initialState.setupNewDNSSettingsHA)
+    .handleAction(actions.setSetupNewDNSSettingsHA, (store, action) => action.payload)
+
+export default combineReducers({
+  data,
+  dnsSettings,
+  loading,
+  failed,
+  saving,
+  savedDNSSettings,
+  setupNewDNSSettingsVisible,
+  setupNewDNSSettingsHA
+});

src/store/dns-settings/sagas.ts

@@ -0,0 +1,95 @@
+import {all, call, put, takeLatest} from 'redux-saga/effects';
+import {ApiError, ApiResponse, CreateResponse} from '../../services/api-client/types';
+import {DNSSettings} from './types'
+import service from './service';
+import actions from './actions';
+import serviceGroup from "../group/service";
+import {Group} from "../group/types";
+import {actions as groupActions} from "../group";
+
+export function* getDNSSettings(action: ReturnType<typeof actions.getDNSSettings.request>): Generator {
+  try {
+
+    const effect = yield call(service.getDNSSettings, action.payload);
+    const response = effect as ApiResponse<DNSSettings>;
+
+    yield put(actions.getDNSSettings.success(response.body));
+  } catch (err) {
+    yield put(actions.getDNSSettings.failure(err as ApiError));
+  }
+}
+
+export function* saveDNSSettings(action: ReturnType<typeof actions.saveDNSSettings.request>): Generator {
+  try {
+    yield put(actions.setSavedDNSSettings({
+      loading: true,
+      success: false,
+      failure: false,
+      error: null,
+      data: null
+    } as CreateResponse<DNSSettings | null>))
+
+    const settingsToSave = action.payload.payload
+
+    let groupsToCreate = settingsToSave.groupsToCreate
+    if (!groupsToCreate) {
+      groupsToCreate = []
+    }
+
+    // first, create groups that were newly added by user
+    const responsesGroup = yield all(groupsToCreate.map(g => call(serviceGroup.createGroup, {
+          getAccessTokenSilently: action.payload.getAccessTokenSilently,
+          payload: {name: g}
+        })
+    ))
+
+    const resGroups = (responsesGroup as ApiResponse<Group>[]).filter(r => r.statusCode === 200).map(g => (g.body as Group)).map(g => g.id)
+    const newGroups = [...settingsToSave.disabled_management_groups, ...resGroups]
+
+    const payloadToSave = {
+      getAccessTokenSilently: action.payload.getAccessTokenSilently,
+      payload: {
+        disabled_management_groups: newGroups,
+      } as DNSSettings
+    }
+
+    let effect = yield call(service.editDNSSettings, payloadToSave);
+    const response = effect as ApiResponse<DNSSettings>;
+
+    yield put(actions.saveDNSSettings.success({
+      loading: false,
+      success: true,
+      failure: false,
+      error: null,
+      data: response.body
+    } as CreateResponse<DNSSettings | null>));
+
+    yield put(groupActions.getGroups.request({
+      getAccessTokenSilently: action.payload.getAccessTokenSilently,
+      payload: null
+    }));
+
+    yield put(actions.getDNSSettings.request({ getAccessTokenSilently: action.payload.getAccessTokenSilently, payload: null }));
+
+  } catch (err) {
+    yield put(groupActions.getGroups.request({
+      getAccessTokenSilently: action.payload.getAccessTokenSilently,
+      payload: null
+    }));
+    yield put(actions.saveDNSSettings.failure({
+      loading: false,
+      success: false,
+      failure: true,
+      error: err as ApiError,
+      data: null
+    } as CreateResponse<DNSSettings | null>));
+  }
+}
+
+export default function* sagas(): Generator {
+  yield all([
+    takeLatest(actions.getDNSSettings.request, getDNSSettings),
+    takeLatest(actions.saveDNSSettings.request, saveDNSSettings),
+  ]);
+}
+

src/store/dns-settings/service.ts

@@ -0,0 +1,18 @@
+import {ApiResponse, RequestPayload} from '../../services/api-client/types';
+import { apiClient } from '../../services/api-client';
+import { DNSSettings } from './types';
+
+export default {
+  async getDNSSettings(payload:RequestPayload<null>): Promise<ApiResponse<DNSSettings>> {
+    return apiClient.get<DNSSettings>(
+      `/api/dns/settings`,
+        payload
+    );
+  },
+  async editDNSSettings(payload:RequestPayload<DNSSettings>): Promise<ApiResponse<DNSSettings>> {
+    return apiClient.put<DNSSettings>(
+        `/api/dns/settings`,
+        payload
+    );
+  },
+};

src/store/dns-settings/types.ts

@@ -0,0 +1,8 @@
+export interface DNSSettings {
+    disabled_management_groups:  string[]
+}
+
+export interface DNSSettingsToSave extends DNSSettings
+{
+    groupsToCreate: string[]
+}

src/store/event/actions.ts

@@ -0,0 +1,14 @@
+import {ActionType, createAsyncAction} from 'typesafe-actions';
+import {Event} from './types';
+import {ApiError, RequestPayload} from '../../services/api-client/types';
+
+const actions = {
+  getEvents: createAsyncAction(
+      'GET_EVENTS_REQUEST',
+      'GET_EVENTS_SUCCESS',
+      'GET_EVENTS_FAILURE',
+  )<RequestPayload<null>, Event[], ApiError>(),
+};
+
+export type ActionTypes = ActionType<typeof actions>;
+export default actions;

src/store/event/index.ts

@@ -0,0 +1,7 @@
+import actions, { ActionTypes as _actionTypes } from './actions';
+import reducer from './reducer';
+import sagas from './sagas';
+
+export type ActionTypes = _actionTypes;
+
+export { actions, reducer, sagas };

src/store/event/reducer.ts

@@ -0,0 +1,38 @@
+import { createReducer } from 'typesafe-actions';
+import { combineReducers } from 'redux';
+import { Event } from './types';
+import actions, { ActionTypes } from './actions';
+import {ApiError, CreateResponse} from "../../services/api-client/types";
+
+type StateType = Readonly<{
+  data: Event[] | null;
+  loading: boolean;
+  failed: ApiError | null;
+}>;
+
+const initialState: StateType = {
+  data: [],
+  loading: false,
+  failed: null,
+};
+
+const data = createReducer<Event[], ActionTypes>(initialState.data as Event[])
+  .handleAction(actions.getEvents.success,(_, action) => action.payload)
+  .handleAction(actions.getEvents.failure, () => []);
+
+const loading = createReducer<boolean, ActionTypes>(initialState.loading)
+    .handleAction(actions.getEvents.request, () => true)
+    .handleAction(actions.getEvents.success, () => false)
+    .handleAction(actions.getEvents.failure, () => false);
+
+const failed = createReducer<ApiError | null, ActionTypes>(initialState.failed)
+    .handleAction(actions.getEvents.request, () => null)
+    .handleAction(actions.getEvents.success, () => null)
+    .handleAction(actions.getEvents.failure, (store, action) => action.payload);
+
+
+export default combineReducers({
+  data,
+  loading,
+  failed,
+});