Add user view to control center (#525)

* Add user creation with password copy

* Add initial identity provider view

* Add IdP logos

* Add IdP id to user

* Add IdP logo to user obj

* Fix okta icon

* Return callback URL when creating an IdP

* Create user for self-hosted

* Clear up password from the state

* Show IdPs and create user when enabled

* Fetch IdPs only when embedded idp is enabled

* Update src/app/(dashboard)/settings/page.tsx

Co-authored-by: Eduard Gert <kontakt@eduardgert.de>

* Update src/app/(dashboard)/settings/page.tsx

Co-authored-by: Eduard Gert <kontakt@eduardgert.de>

* Update src/modules/settings/IdentityProvidersTab.tsx

Co-authored-by: Eduard Gert <kontakt@eduardgert.de>

* Update src/modules/settings/IdentityProviderModal.tsx

Co-authored-by: Eduard Gert <kontakt@eduardgert.de>

* Update src/modules/settings/IdentityProvidersTab.tsx

Co-authored-by: Eduard Gert <kontakt@eduardgert.de>

* Update src/modules/settings/IdentityProviderModal.tsx

Co-authored-by: Eduard Gert <kontakt@eduardgert.de>

* Rename IdentityProvider to SSOIdentityProvider

* Fix build and extract icons

* Fix initial onboarding

* Add icons

* Move name to the top

* Fix setup wizard background color

* Update instance setup ui

* Update instance setup ui

* Use input component

* Move idp label and icons

* Fix setup wizard width

* Add authentik and keycloak

* Add idp hints

* Handle idp permissions

* Consider selfhosted instances when checking if netbird is hosted

* Update redirect

* Add max retries to redirect

* Require new secret when clientid changed

* Add callback URL on the idp creation step

* Add idp activity events

---------

Co-authored-by: Eduard Gert <kontakt@eduardgert.de>

.github/workflows/build_and_push.yml

@@ -2,7 +2,6 @@ name: build and push
 on:
   push:
     branches:
-      - "feature/**"
       - main
     tags:
       - "**"
@@ -28,6 +27,33 @@ jobs:
 
       - run: echo '{}' > .local-config.json
 
+      - name: Download IronRDP release TS files
+        uses: robinraju/release-downloader@v1.7
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository: netbirdio/IronRDP
+          latest: true
+          fileName: "*.ts"
+          out-file-path: 'public/ironrdp-pkg'
+
+      - name: Download IronRDP release JS files
+        uses: robinraju/release-downloader@v1.7
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository: netbirdio/IronRDP
+          latest: true
+          fileName: "*.js"
+          out-file-path: 'public/ironrdp-pkg'
+
+      - name: Download IronRDP release WASM file
+        uses: robinraju/release-downloader@v1.7
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          repository: netbirdio/IronRDP
+          latest: true
+          fileName: "ironrdp_web_bg.wasm"
+          out-file-path: 'public/ironrdp-pkg'
+
       - name: Build
         run: npm run build
       -
@@ -44,7 +70,6 @@ jobs:
           images: ${{ env.IMAGE_NAME }}
       -
         name: Login to DockerHub
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v2
         with:
           username: ${{ secrets.NB_DOCKER_USER }}
@@ -55,7 +80,7 @@ jobs:
         with:
           context: .
           file: docker/Dockerfile
-          push: ${{ github.event_name != 'pull_request' }}
+          push: true
           platforms: linux/amd64,linux/arm64,linux/arm
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

.gitignore

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

CONTRIBUTOR_LICENSE_AGREEMENT.md

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

LICENSE

@@ -1,13 +1,661 @@
-BSD 3-Clause License
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (c) 2024 Wiretrustee UG (haftungsbeschränkt) & AUTHORS
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+                            Preamble
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
 
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

README.md

@@ -26,6 +26,7 @@ The dashboard makes it possible to:
 - NextJS
 - ReactJS
 - Tailwind CSS
+- [React Flow](https://reactflow.dev/) for the Control Center
 - Auth0
 - Nginx
 - Docker

config.json

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

docker/default.conf

@@ -3,6 +3,14 @@ server {
 	listen [::]:80 default_server;
 
     root /usr/share/nginx/html;
+    location = /netbird.wasm {
+        root /usr/share/nginx/html;
+        default_type application/wasm;
+    }
+    location = /ironrdp-pkg/ironrdp_web_bg.wasm {
+        root /usr/share/nginx/html;
+        default_type application/wasm;
+    }
 
     location / {
       try_files $uri $uri.html $uri/ =404;

docker/init_react_envs.sh

@@ -58,13 +58,15 @@ export NETBIRD_MGMT_API_ENDPOINT=$(echo $NETBIRD_MGMT_API_ENDPOINT | sed -E 's/(
 export NETBIRD_MGMT_GRPC_API_ENDPOINT=${NETBIRD_MGMT_GRPC_API_ENDPOINT}
 export NETBIRD_HOTJAR_TRACK_ID=${NETBIRD_HOTJAR_TRACK_ID}
 export NETBIRD_GOOGLE_ANALYTICS_ID=${NETBIRD_GOOGLE_ANALYTICS_ID}
+export NETBIRD_GOOGLE_TAG_MANAGER_ID=${NETBIRD_GOOGLE_TAG_MANAGER_ID}
 export NETBIRD_TOKEN_SOURCE=${NETBIRD_TOKEN_SOURCE:-accessToken}
 export NETBIRD_DRAG_QUERY_PARAMS=${NETBIRD_DRAG_QUERY_PARAMS:-false}
+export NETBIRD_WASM_PATH=${NETBIRD_WASM_PATH}
 
 echo "NetBird latest version: ${NETBIRD_LATEST_VERSION}"
 
 # replace ENVs in the config
-ENV_STR="\$\$USE_AUTH0 \$\$AUTH_AUDIENCE \$\$AUTH_AUTHORITY \$\$AUTH_CLIENT_ID \$\$AUTH_CLIENT_SECRET \$\$AUTH_SUPPORTED_SCOPES \$\$NETBIRD_MGMT_API_ENDPOINT \$\$NETBIRD_MGMT_GRPC_API_ENDPOINT \$\$NETBIRD_HOTJAR_TRACK_ID \$\$NETBIRD_GOOGLE_ANALYTICS_ID \$\$AUTH_REDIRECT_URI \$\$AUTH_SILENT_REDIRECT_URI \$\$NETBIRD_TOKEN_SOURCE \$\$NETBIRD_DRAG_QUERY_PARAMS"
+ENV_STR="\$\$USE_AUTH0 \$\$AUTH_AUDIENCE \$\$AUTH_AUTHORITY \$\$AUTH_CLIENT_ID \$\$AUTH_CLIENT_SECRET \$\$AUTH_SUPPORTED_SCOPES \$\$NETBIRD_MGMT_API_ENDPOINT \$\$NETBIRD_MGMT_GRPC_API_ENDPOINT \$\$NETBIRD_HOTJAR_TRACK_ID \$\$NETBIRD_GOOGLE_ANALYTICS_ID \$\$NETBIRD_GOOGLE_TAG_MANAGER_ID \$\$AUTH_REDIRECT_URI \$\$AUTH_SILENT_REDIRECT_URI \$\$NETBIRD_TOKEN_SOURCE \$\$NETBIRD_DRAG_QUERY_PARAMS \$\$NETBIRD_WASM_PATH"
 
 OIDC_TRUSTED_DOMAINS="/usr/share/nginx/html/OidcTrustedDomains.js"
 envsubst "$ENV_STR" < "$OIDC_TRUSTED_DOMAINS".tmpl > "$OIDC_TRUSTED_DOMAINS"

docker/nginx.conf

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

package.json

@@ -14,6 +14,7 @@
   },
   "dependencies": {
     "@axa-fr/react-oidc": "^7.22.18",
+    "@dagrejs/dagre": "^1.1.5",
     "@radix-ui/react-accordion": "^1.1.2",
     "@radix-ui/react-checkbox": "^1.0.4",
     "@radix-ui/react-collapsible": "^1.0.3",
@@ -35,34 +36,41 @@
     "@tanstack/match-sorter-utils": "^8.8.4",
     "@tanstack/react-table": "^8.10.7",
     "@types/crypto-js": "^4.2.2",
+    "@types/d3": "^7.4.3",
     "@types/lodash": "^4.14.200",
     "@types/node": "20.10.6",
     "@types/react": "^18",
     "@types/react-dom": "^18",
     "@types/react-window": "^1.8.8",
+    "@xterm/addon-fit": "^0.10.0",
+    "@xterm/xterm": "^5.5.0",
+    "@xyflow/react": "^12.8.4",
     "autoprefixer": "^10",
+    "chart.js": "^4.4.8",
+    "chroma-js": "^3.1.2",
     "class-variance-authority": "^0.7.0",
     "clsx": "^2.0.0",
     "cmdk": "^0.2.0",
     "crypto-js": "^4.2.0",
+    "d3": "^7.9.0",
     "date-fns": "^2.30.0",
     "dayjs": "^1.11.10",
-    "eslint": "^8",
-    "eslint-config-next": "13.5.5",
+    "elkjs": "^0.10.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-simple-import-sort": "^10.0.0",
     "flowbite": "^1.8.1",
     "flowbite-react": "^0.6.4",
     "framer-motion": "^10.16.4",
     "ip-cidr": "^3.1.0",
+    "js-cookie": "^3.0.5",
     "lodash": "^4.17.21",
-    "lucide-react": "^0.460.0",
-    "next": "13.5.7",
+    "lucide-react": "^0.539.0",
+    "next": "^14.2.35",
     "next-themes": "^0.2.1",
     "punycode": "^2.3.1",
-    "react": "^18",
+    "react": "^18.3.1",
     "react-day-picker": "^8.9.1",
-    "react-dom": "^18",
+    "react-dom": "^18.3.1",
     "react-ga4": "^2.1.0",
     "react-hot-toast": "^2.4.1",
     "react-hotjar": "^6.2.0",
@@ -74,12 +82,17 @@
     "swr": "^2.2.4",
     "tailwind-merge": "^1.14.0",
     "tailwindcss-animate": "^1.0.7",
+    "timescape": "^0.7.1",
     "typescript": "^5"
   },
   "devDependencies": {
-    "cypress": "^13.13.0",
+    "@faker-js/faker": "^9.5.1",
+    "@types/chroma-js": "^3.1.1",
+    "@types/js-cookie": "^3.0.6",
+    "eslint": "^9.39.1",
+    "eslint-config-next": "^16.0.5",
     "postcss": "^8",
     "prettier": "3.0.3",
-    "tailwindcss": "^3"
+    "tailwindcss": "^3.4.17"
   }
 }

public/wasm_exec.js

@@ -0,0 +1,575 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+"use strict";
+
+(() => {
+	const enosys = () => {
+		const err = new Error("not implemented");
+		err.code = "ENOSYS";
+		return err;
+	};
+
+	if (!globalThis.fs) {
+		let outputBuf = "";
+		globalThis.fs = {
+			constants: { O_WRONLY: -1, O_RDWR: -1, O_CREAT: -1, O_TRUNC: -1, O_APPEND: -1, O_EXCL: -1, O_DIRECTORY: -1 }, // unused
+			writeSync(fd, buf) {
+				outputBuf += decoder.decode(buf);
+				const nl = outputBuf.lastIndexOf("\n");
+				if (nl != -1) {
+					console.log(outputBuf.substring(0, nl));
+					outputBuf = outputBuf.substring(nl + 1);
+				}
+				return buf.length;
+			},
+			write(fd, buf, offset, length, position, callback) {
+				if (offset !== 0 || length !== buf.length || position !== null) {
+					callback(enosys());
+					return;
+				}
+				const n = this.writeSync(fd, buf);
+				callback(null, n);
+			},
+			chmod(path, mode, callback) { callback(enosys()); },
+			chown(path, uid, gid, callback) { callback(enosys()); },
+			close(fd, callback) { callback(enosys()); },
+			fchmod(fd, mode, callback) { callback(enosys()); },
+			fchown(fd, uid, gid, callback) { callback(enosys()); },
+			fstat(fd, callback) { callback(enosys()); },
+			fsync(fd, callback) { callback(null); },
+			ftruncate(fd, length, callback) { callback(enosys()); },
+			lchown(path, uid, gid, callback) { callback(enosys()); },
+			link(path, link, callback) { callback(enosys()); },
+			lstat(path, callback) { callback(enosys()); },
+			mkdir(path, perm, callback) { callback(enosys()); },
+			open(path, flags, mode, callback) { callback(enosys()); },
+			read(fd, buffer, offset, length, position, callback) { callback(enosys()); },
+			readdir(path, callback) { callback(enosys()); },
+			readlink(path, callback) { callback(enosys()); },
+			rename(from, to, callback) { callback(enosys()); },
+			rmdir(path, callback) { callback(enosys()); },
+			stat(path, callback) { callback(enosys()); },
+			symlink(path, link, callback) { callback(enosys()); },
+			truncate(path, length, callback) { callback(enosys()); },
+			unlink(path, callback) { callback(enosys()); },
+			utimes(path, atime, mtime, callback) { callback(enosys()); },
+		};
+	}
+
+	if (!globalThis.process) {
+		globalThis.process = {
+			getuid() { return -1; },
+			getgid() { return -1; },
+			geteuid() { return -1; },
+			getegid() { return -1; },
+			getgroups() { throw enosys(); },
+			pid: -1,
+			ppid: -1,
+			umask() { throw enosys(); },
+			cwd() { throw enosys(); },
+			chdir() { throw enosys(); },
+		}
+	}
+
+	if (!globalThis.path) {
+		globalThis.path = {
+			resolve(...pathSegments) {
+				return pathSegments.join("/");
+			}
+		}
+	}
+
+	if (!globalThis.crypto) {
+		throw new Error("globalThis.crypto is not available, polyfill required (crypto.getRandomValues only)");
+	}
+
+	if (!globalThis.performance) {
+		throw new Error("globalThis.performance is not available, polyfill required (performance.now only)");
+	}
+
+	if (!globalThis.TextEncoder) {
+		throw new Error("globalThis.TextEncoder is not available, polyfill required");
+	}
+
+	if (!globalThis.TextDecoder) {
+		throw new Error("globalThis.TextDecoder is not available, polyfill required");
+	}
+
+	const encoder = new TextEncoder("utf-8");
+	const decoder = new TextDecoder("utf-8");
+
+	globalThis.Go = class {
+		constructor() {
+			this.argv = ["js"];
+			this.env = {};
+			this.exit = (code) => {
+				if (code !== 0) {
+					console.warn("exit code:", code);
+				}
+			};
+			this._exitPromise = new Promise((resolve) => {
+				this._resolveExitPromise = resolve;
+			});
+			this._pendingEvent = null;
+			this._scheduledTimeouts = new Map();
+			this._nextCallbackTimeoutID = 1;
+
+			const setInt64 = (addr, v) => {
+				this.mem.setUint32(addr + 0, v, true);
+				this.mem.setUint32(addr + 4, Math.floor(v / 4294967296), true);
+			}
+
+			const setInt32 = (addr, v) => {
+				this.mem.setUint32(addr + 0, v, true);
+			}
+
+			const getInt64 = (addr) => {
+				const low = this.mem.getUint32(addr + 0, true);
+				const high = this.mem.getInt32(addr + 4, true);
+				return low + high * 4294967296;
+			}
+
+			const loadValue = (addr) => {
+				const f = this.mem.getFloat64(addr, true);
+				if (f === 0) {
+					return undefined;
+				}
+				if (!isNaN(f)) {
+					return f;
+				}
+
+				const id = this.mem.getUint32(addr, true);
+				return this._values[id];
+			}
+
+			const storeValue = (addr, v) => {
+				const nanHead = 0x7FF80000;
+
+				if (typeof v === "number" && v !== 0) {
+					if (isNaN(v)) {
+						this.mem.setUint32(addr + 4, nanHead, true);
+						this.mem.setUint32(addr, 0, true);
+						return;
+					}
+					this.mem.setFloat64(addr, v, true);
+					return;
+				}
+
+				if (v === undefined) {
+					this.mem.setFloat64(addr, 0, true);
+					return;
+				}
+
+				let id = this._ids.get(v);
+				if (id === undefined) {
+					id = this._idPool.pop();
+					if (id === undefined) {
+						id = this._values.length;
+					}
+					this._values[id] = v;
+					this._goRefCounts[id] = 0;
+					this._ids.set(v, id);
+				}
+				this._goRefCounts[id]++;
+				let typeFlag = 0;
+				switch (typeof v) {
+					case "object":
+						if (v !== null) {
+							typeFlag = 1;
+						}
+						break;
+					case "string":
+						typeFlag = 2;
+						break;
+					case "symbol":
+						typeFlag = 3;
+						break;
+					case "function":
+						typeFlag = 4;
+						break;
+				}
+				this.mem.setUint32(addr + 4, nanHead | typeFlag, true);
+				this.mem.setUint32(addr, id, true);
+			}
+
+			const loadSlice = (addr) => {
+				const array = getInt64(addr + 0);
+				const len = getInt64(addr + 8);
+				return new Uint8Array(this._inst.exports.mem.buffer, array, len);
+			}
+
+			const loadSliceOfValues = (addr) => {
+				const array = getInt64(addr + 0);
+				const len = getInt64(addr + 8);
+				const a = new Array(len);
+				for (let i = 0; i < len; i++) {
+					a[i] = loadValue(array + i * 8);
+				}
+				return a;
+			}
+
+			const loadString = (addr) => {
+				const saddr = getInt64(addr + 0);
+				const len = getInt64(addr + 8);
+				return decoder.decode(new DataView(this._inst.exports.mem.buffer, saddr, len));
+			}
+
+			const testCallExport = (a, b) => {
+				this._inst.exports.testExport0();
+				return this._inst.exports.testExport(a, b);
+			}
+
+			const timeOrigin = Date.now() - performance.now();
+			this.importObject = {
+				_gotest: {
+					add: (a, b) => a + b,
+					callExport: testCallExport,
+				},
+				gojs: {
+					// Go's SP does not change as long as no Go code is running. Some operations (e.g. calls, getters and setters)
+					// may synchronously trigger a Go event handler. This makes Go code get executed in the middle of the imported
+					// function. A goroutine can switch to a new stack if the current stack is too small (see morestack function).
+					// This changes the SP, thus we have to update the SP used by the imported function.
+
+					// func wasmExit(code int32)
+					"runtime.wasmExit": (sp) => {
+						sp >>>= 0;
+						const code = this.mem.getInt32(sp + 8, true);
+						this.exited = true;
+						delete this._inst;
+						delete this._values;
+						delete this._goRefCounts;
+						delete this._ids;
+						delete this._idPool;
+						this.exit(code);
+					},
+
+					// func wasmWrite(fd uintptr, p unsafe.Pointer, n int32)
+					"runtime.wasmWrite": (sp) => {
+						sp >>>= 0;
+						const fd = getInt64(sp + 8);
+						const p = getInt64(sp + 16);
+						const n = this.mem.getInt32(sp + 24, true);
+						fs.writeSync(fd, new Uint8Array(this._inst.exports.mem.buffer, p, n));
+					},
+
+					// func resetMemoryDataView()
+					"runtime.resetMemoryDataView": (sp) => {
+						sp >>>= 0;
+						this.mem = new DataView(this._inst.exports.mem.buffer);
+					},
+
+					// func nanotime1() int64
+					"runtime.nanotime1": (sp) => {
+						sp >>>= 0;
+						setInt64(sp + 8, (timeOrigin + performance.now()) * 1000000);
+					},
+
+					// func walltime() (sec int64, nsec int32)
+					"runtime.walltime": (sp) => {
+						sp >>>= 0;
+						const msec = (new Date).getTime();
+						setInt64(sp + 8, msec / 1000);
+						this.mem.setInt32(sp + 16, (msec % 1000) * 1000000, true);
+					},
+
+					// func scheduleTimeoutEvent(delay int64) int32
+					"runtime.scheduleTimeoutEvent": (sp) => {
+						sp >>>= 0;
+						const id = this._nextCallbackTimeoutID;
+						this._nextCallbackTimeoutID++;
+						this._scheduledTimeouts.set(id, setTimeout(
+							() => {
+								this._resume();
+								while (this._scheduledTimeouts.has(id)) {
+									// for some reason Go failed to register the timeout event, log and try again
+									// (temporary workaround for https://github.com/golang/go/issues/28975)
+									console.warn("scheduleTimeoutEvent: missed timeout event");
+									this._resume();
+								}
+							},
+							getInt64(sp + 8),
+						));
+						this.mem.setInt32(sp + 16, id, true);
+					},
+
+					// func clearTimeoutEvent(id int32)
+					"runtime.clearTimeoutEvent": (sp) => {
+						sp >>>= 0;
+						const id = this.mem.getInt32(sp + 8, true);
+						clearTimeout(this._scheduledTimeouts.get(id));
+						this._scheduledTimeouts.delete(id);
+					},
+
+					// func getRandomData(r []byte)
+					"runtime.getRandomData": (sp) => {
+						sp >>>= 0;
+						crypto.getRandomValues(loadSlice(sp + 8));
+					},
+
+					// func finalizeRef(v ref)
+					"syscall/js.finalizeRef": (sp) => {
+						sp >>>= 0;
+						const id = this.mem.getUint32(sp + 8, true);
+						this._goRefCounts[id]--;
+						if (this._goRefCounts[id] === 0) {
+							const v = this._values[id];
+							this._values[id] = null;
+							this._ids.delete(v);
+							this._idPool.push(id);
+						}
+					},
+
+					// func stringVal(value string) ref
+					"syscall/js.stringVal": (sp) => {
+						sp >>>= 0;
+						storeValue(sp + 24, loadString(sp + 8));
+					},
+
+					// func valueGet(v ref, p string) ref
+					"syscall/js.valueGet": (sp) => {
+						sp >>>= 0;
+						const result = Reflect.get(loadValue(sp + 8), loadString(sp + 16));
+						sp = this._inst.exports.getsp() >>> 0; // see comment above
+						storeValue(sp + 32, result);
+					},
+
+					// func valueSet(v ref, p string, x ref)
+					"syscall/js.valueSet": (sp) => {
+						sp >>>= 0;
+						Reflect.set(loadValue(sp + 8), loadString(sp + 16), loadValue(sp + 32));
+					},
+
+					// func valueDelete(v ref, p string)
+					"syscall/js.valueDelete": (sp) => {
+						sp >>>= 0;
+						Reflect.deleteProperty(loadValue(sp + 8), loadString(sp + 16));
+					},
+
+					// func valueIndex(v ref, i int) ref
+					"syscall/js.valueIndex": (sp) => {
+						sp >>>= 0;
+						storeValue(sp + 24, Reflect.get(loadValue(sp + 8), getInt64(sp + 16)));
+					},
+
+					// valueSetIndex(v ref, i int, x ref)
+					"syscall/js.valueSetIndex": (sp) => {
+						sp >>>= 0;
+						Reflect.set(loadValue(sp + 8), getInt64(sp + 16), loadValue(sp + 24));
+					},
+
+					// func valueCall(v ref, m string, args []ref) (ref, bool)
+					"syscall/js.valueCall": (sp) => {
+						sp >>>= 0;
+						try {
+							const v = loadValue(sp + 8);
+							const m = Reflect.get(v, loadString(sp + 16));
+							const args = loadSliceOfValues(sp + 32);
+							const result = Reflect.apply(m, v, args);
+							sp = this._inst.exports.getsp() >>> 0; // see comment above
+							storeValue(sp + 56, result);
+							this.mem.setUint8(sp + 64, 1);
+						} catch (err) {
+							sp = this._inst.exports.getsp() >>> 0; // see comment above
+							storeValue(sp + 56, err);
+							this.mem.setUint8(sp + 64, 0);
+						}
+					},
+
+					// func valueInvoke(v ref, args []ref) (ref, bool)
+					"syscall/js.valueInvoke": (sp) => {
+						sp >>>= 0;
+						try {
+							const v = loadValue(sp + 8);
+							const args = loadSliceOfValues(sp + 16);
+							const result = Reflect.apply(v, undefined, args);
+							sp = this._inst.exports.getsp() >>> 0; // see comment above
+							storeValue(sp + 40, result);
+							this.mem.setUint8(sp + 48, 1);
+						} catch (err) {
+							sp = this._inst.exports.getsp() >>> 0; // see comment above
+							storeValue(sp + 40, err);
+							this.mem.setUint8(sp + 48, 0);
+						}
+					},
+
+					// func valueNew(v ref, args []ref) (ref, bool)
+					"syscall/js.valueNew": (sp) => {
+						sp >>>= 0;
+						try {
+							const v = loadValue(sp + 8);
+							const args = loadSliceOfValues(sp + 16);
+							const result = Reflect.construct(v, args);
+							sp = this._inst.exports.getsp() >>> 0; // see comment above
+							storeValue(sp + 40, result);
+							this.mem.setUint8(sp + 48, 1);
+						} catch (err) {
+							sp = this._inst.exports.getsp() >>> 0; // see comment above
+							storeValue(sp + 40, err);
+							this.mem.setUint8(sp + 48, 0);
+						}
+					},
+
+					// func valueLength(v ref) int
+					"syscall/js.valueLength": (sp) => {
+						sp >>>= 0;
+						setInt64(sp + 16, parseInt(loadValue(sp + 8).length));
+					},
+
+					// valuePrepareString(v ref) (ref, int)
+					"syscall/js.valuePrepareString": (sp) => {
+						sp >>>= 0;
+						const str = encoder.encode(String(loadValue(sp + 8)));
+						storeValue(sp + 16, str);
+						setInt64(sp + 24, str.length);
+					},
+
+					// valueLoadString(v ref, b []byte)
+					"syscall/js.valueLoadString": (sp) => {
+						sp >>>= 0;
+						const str = loadValue(sp + 8);
+						loadSlice(sp + 16).set(str);
+					},
+
+					// func valueInstanceOf(v ref, t ref) bool
+					"syscall/js.valueInstanceOf": (sp) => {
+						sp >>>= 0;
+						this.mem.setUint8(sp + 24, (loadValue(sp + 8) instanceof loadValue(sp + 16)) ? 1 : 0);
+					},
+
+					// func copyBytesToGo(dst []byte, src ref) (int, bool)
+					"syscall/js.copyBytesToGo": (sp) => {
+						sp >>>= 0;
+						const dst = loadSlice(sp + 8);
+						const src = loadValue(sp + 32);
+						if (!(src instanceof Uint8Array || src instanceof Uint8ClampedArray)) {
+							this.mem.setUint8(sp + 48, 0);
+							return;
+						}
+						const toCopy = src.subarray(0, dst.length);
+						dst.set(toCopy);
+						setInt64(sp + 40, toCopy.length);
+						this.mem.setUint8(sp + 48, 1);
+					},
+
+					// func copyBytesToJS(dst ref, src []byte) (int, bool)
+					"syscall/js.copyBytesToJS": (sp) => {
+						sp >>>= 0;
+						const dst = loadValue(sp + 8);
+						const src = loadSlice(sp + 16);
+						if (!(dst instanceof Uint8Array || dst instanceof Uint8ClampedArray)) {
+							this.mem.setUint8(sp + 48, 0);
+							return;
+						}
+						const toCopy = src.subarray(0, dst.length);
+						dst.set(toCopy);
+						setInt64(sp + 40, toCopy.length);
+						this.mem.setUint8(sp + 48, 1);
+					},
+
+					"debug": (value) => {
+						console.log(value);
+					},
+				}
+			};
+		}
+
+		async run(instance) {
+			if (!(instance instanceof WebAssembly.Instance)) {
+				throw new Error("Go.run: WebAssembly.Instance expected");
+			}
+			this._inst = instance;
+			this.mem = new DataView(this._inst.exports.mem.buffer);
+			this._values = [ // JS values that Go currently has references to, indexed by reference id
+				NaN,
+				0,
+				null,
+				true,
+				false,
+				globalThis,
+				this,
+			];
+			this._goRefCounts = new Array(this._values.length).fill(Infinity); // number of references that Go has to a JS value, indexed by reference id
+			this._ids = new Map([ // mapping from JS values to reference ids
+				[0, 1],
+				[null, 2],
+				[true, 3],
+				[false, 4],
+				[globalThis, 5],
+				[this, 6],
+			]);
+			this._idPool = [];   // unused ids that have been garbage collected
+			this.exited = false; // whether the Go program has exited
+
+			// Pass command line arguments and environment variables to WebAssembly by writing them to the linear memory.
+			let offset = 4096;
+
+			const strPtr = (str) => {
+				const ptr = offset;
+				const bytes = encoder.encode(str + "\0");
+				new Uint8Array(this.mem.buffer, offset, bytes.length).set(bytes);
+				offset += bytes.length;
+				if (offset % 8 !== 0) {
+					offset += 8 - (offset % 8);
+				}
+				return ptr;
+			};
+
+			const argc = this.argv.length;
+
+			const argvPtrs = [];
+			this.argv.forEach((arg) => {
+				argvPtrs.push(strPtr(arg));
+			});
+			argvPtrs.push(0);
+
+			const keys = Object.keys(this.env).sort();
+			keys.forEach((key) => {
+				argvPtrs.push(strPtr(`${key}=${this.env[key]}`));
+			});
+			argvPtrs.push(0);
+
+			const argv = offset;
+			argvPtrs.forEach((ptr) => {
+				this.mem.setUint32(offset, ptr, true);
+				this.mem.setUint32(offset + 4, 0, true);
+				offset += 8;
+			});
+
+			// The linker guarantees global data starts from at least wasmMinDataAddr.
+			// Keep in sync with cmd/link/internal/ld/data.go:wasmMinDataAddr.
+			const wasmMinDataAddr = 4096 + 8192;
+			if (offset >= wasmMinDataAddr) {
+				throw new Error("total length of command line and environment variables exceeds limit");
+			}
+
+			this._inst.exports.run(argc, argv);
+			if (this.exited) {
+				this._resolveExitPromise();
+			}
+			await this._exitPromise;
+		}
+
+		_resume() {
+			if (this.exited) {
+				throw new Error("Go program has already exited");
+			}
+			this._inst.exports.resume();
+			if (this.exited) {
+				this._resolveExitPromise();
+			}
+		}
+
+		_makeFuncWrapper(id) {
+			const go = this;
+			return function () {
+				const event = { id: id, this: this, args: arguments };
+				go._pendingEvent = event;
+				go._resume();
+				return event.result;
+			};
+		}
+	}
+})();

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

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

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

@@ -11,6 +11,7 @@ import { ExternalLinkIcon } from "lucide-react";
 import React, { lazy, Suspense } from "react";
 import AccessControlIcon from "@/assets/icons/AccessControlIcon";
 import GroupsProvider from "@/contexts/GroupsProvider";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import PoliciesProvider from "@/contexts/PoliciesProvider";
 import { Policy } from "@/interfaces/Policy";
 import PageContainer from "@/layouts/PageContainer";
@@ -19,6 +20,8 @@ const AccessControlTable = lazy(
   () => import("@/modules/access-control/table/AccessControlTable"),
 );
 export default function AccessControlPage() {
+  const { permission } = usePermissions();
+
   const { data: policies, isLoading } = useFetchApi<Policy[]>("/policies");
 
   const { ref: headingRef, portalTarget } =
@@ -30,7 +33,7 @@ export default function AccessControlPage() {
         <div className={"p-default py-6"}>
           <Breadcrumbs>
             <Breadcrumbs.Item
-              href={"/policies"}
+              href={"/access-control"}
               label={"Access Control"}
               icon={<AccessControlIcon size={14} />}
             />
@@ -53,7 +56,10 @@ export default function AccessControlPage() {
           </Paragraph>
         </div>
 
-        <RestrictedAccess page={"Access Control"}>
+        <RestrictedAccess
+          page={"Access Control"}
+          hasAccess={permission.policies.read}
+        >
           <PoliciesProvider>
             <Suspense fallback={<SkeletonTable />}>
               <AccessControlTable

src/app/(dashboard)/control-center/layout.tsx

@@ -0,0 +1,8 @@
+import { globalMetaTitle } from "@utils/meta";
+import type { Metadata } from "next";
+import BlankLayout from "@/layouts/BlankLayout";
+
+export const metadata: Metadata = {
+  title: `Control Center - ${globalMetaTitle}`,
+};
+export default BlankLayout;

src/app/(dashboard)/dns/nameservers/page.tsx

@@ -10,6 +10,7 @@ import useFetchApi from "@utils/api";
 import { ExternalLinkIcon, ServerIcon } from "lucide-react";
 import React, { lazy, Suspense } from "react";
 import DNSIcon from "@/assets/icons/DNSIcon";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import { NameserverGroup } from "@/interfaces/Nameserver";
 import PageContainer from "@/layouts/PageContainer";
 
@@ -18,6 +19,8 @@ const NameserverGroupTable = lazy(
 );
 
 export default function NameServers() {
+  const { permission } = usePermissions();
+
   const { data: nameserverGroups, isLoading } =
     useFetchApi<NameserverGroup[]>("/dns/nameservers");
 
@@ -29,7 +32,7 @@ export default function NameServers() {
       <div className={"p-default py-6"}>
         <Breadcrumbs>
           <Breadcrumbs.Item
-            href={"/dns"}
+            href={"/dns/nameservers"}
             label={"DNS"}
             icon={<DNSIcon size={13} />}
           />
@@ -57,7 +60,10 @@ export default function NameServers() {
         </Paragraph>
       </div>
 
-      <RestrictedAccess page={"Nameservers"}>
+      <RestrictedAccess
+        page={"Nameservers"}
+        hasAccess={permission.nameservers.read}
+      >
         <Suspense fallback={<SkeletonTable />}>
           <NameserverGroupTable
             nameserverGroups={nameserverGroups}

src/app/(dashboard)/dns/settings/page.tsx

@@ -17,6 +17,7 @@ import React from "react";
 import Skeleton from "react-loading-skeleton";
 import { useSWRConfig } from "swr";
 import DNSIcon from "@/assets/icons/DNSIcon";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import { useHasChanges } from "@/hooks/useHasChanges";
 import { Group } from "@/interfaces/Group";
 import { NameserverSettings } from "@/interfaces/NameserverSettings";
@@ -25,6 +26,8 @@ import useGroupHelper from "@/modules/groups/useGroupHelper";
 import { useGroupIdsToGroups } from "@/modules/groups/useGroupIdsToGroups";
 
 export default function NameServerSettings() {
+  const { permission } = usePermissions();
+
   const { data: settings, isLoading } =
     useFetchApi<NameserverSettings>("/dns/settings");
 
@@ -61,7 +64,7 @@ export default function NameServerSettings() {
           </InlineLink>
           in our documentation.
         </Paragraph>
-        <RestrictedAccess page={"DNS Settings"}>
+        <RestrictedAccess page={"DNS Settings"} hasAccess={permission.dns.read}>
           {!isLoading && initialDNSGroups !== undefined ? (
             <SettingDisabledManagementGroups initialGroups={initialDNSGroups} />
           ) : (
@@ -86,6 +89,7 @@ const SettingDisabledManagementGroups = ({
 }) => {
   const settingRequest = useApiCall<NameserverSettings>("/dns/settings");
   const { mutate } = useSWRConfig();
+  const { permission } = usePermissions();
 
   const [selectedGroups, setSelectedGroups, { save: saveGroups }] =
     useGroupHelper({
@@ -124,6 +128,7 @@ const SettingDisabledManagementGroups = ({
           dataCy={"dns-groups-selector"}
           onChange={setSelectedGroups}
           values={selectedGroups}
+          disabled={!permission.dns.update}
         />
       </div>
       <div
@@ -135,7 +140,7 @@ const SettingDisabledManagementGroups = ({
           variant={"primary"}
           size={"sm"}
           onClick={saveSettings}
-          disabled={!hasChanges}
+          disabled={!hasChanges || !permission.dns.update}
           data-cy={"save-changes"}
         >
           Save Changes

src/app/(dashboard)/events/audit/layout.tsx

@@ -0,0 +1,8 @@
+import { globalMetaTitle } from "@utils/meta";
+import type { Metadata } from "next";
+import BlankLayout from "@/layouts/BlankLayout";
+
+export const metadata: Metadata = {
+  title: `Audit Events - Activity - ${globalMetaTitle}`,
+};
+export default BlankLayout;

src/app/(dashboard)/events/audit/page.tsx

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

src/app/(dashboard)/group/layout.tsx

@@ -0,0 +1,8 @@
+import { globalMetaTitle } from "@utils/meta";
+import type { Metadata } from "next";
+import BlankLayout from "@/layouts/BlankLayout";
+
+export const metadata: Metadata = {
+  title: `Group - ${globalMetaTitle}`,
+};
+export default BlankLayout;

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

@@ -0,0 +1,315 @@
+"use client";
+
+import Breadcrumbs from "@components/Breadcrumbs";
+import FullTooltip from "@components/FullTooltip";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@components/Tabs";
+import FullScreenLoading from "@components/ui/FullScreenLoading";
+import { GroupBadgeIcon } from "@components/ui/GroupBadgeIcon";
+import { PageNotFound } from "@components/ui/PageNotFound";
+import { RestrictedAccess } from "@components/ui/RestrictedAccess";
+import useRedirect from "@hooks/useRedirect";
+import useFetchApi from "@utils/api";
+import { cn, singularize } from "@utils/helpers";
+import { FolderGit2Icon, Layers3Icon, PencilIcon } from "lucide-react";
+import { useSearchParams } from "next/navigation";
+import React, { useState } from "react";
+import AccessControlIcon from "@/assets/icons/AccessControlIcon";
+import DNSIcon from "@/assets/icons/DNSIcon";
+import NetworkRoutesIcon from "@/assets/icons/NetworkRoutesIcon";
+import PeerIcon from "@/assets/icons/PeerIcon";
+import SetupKeysIcon from "@/assets/icons/SetupKeysIcon";
+import TeamIcon from "@/assets/icons/TeamIcon";
+import { GroupProvider, useGroupContext } from "@/contexts/GroupProvider";
+import { usePermissions } from "@/contexts/PermissionsProvider";
+import RoutesProvider from "@/contexts/RoutesProvider";
+import { Group, GROUP_TOOLTIP_TEXT } from "@/interfaces/Group";
+import PageContainer from "@/layouts/PageContainer";
+import { GroupNameserversSection } from "@/modules/groups/details/GroupNameserversSection";
+import { GroupNetworkRoutesSection } from "@/modules/groups/details/GroupNetworkRoutesSection";
+import { GroupPeersSection } from "@/modules/groups/details/GroupPeersSection";
+import { GroupPoliciesSection } from "@/modules/groups/details/GroupPoliciesSection";
+import { GroupResourcesSection } from "@/modules/groups/details/GroupResourcesSection";
+import { GroupSetupKeysSection } from "@/modules/groups/details/GroupSetupKeysSection";
+import { GroupUsersSection } from "@/modules/groups/details/GroupUsersSection";
+import useGroupDetails from "@/modules/groups/details/useGroupDetails";
+
+export default function GroupPage() {
+  const queryParameter = useSearchParams();
+  const { isRestricted } = usePermissions();
+  const groupId = queryParameter.get("id");
+  const {
+    data: group,
+    isLoading,
+    error,
+  } = useFetchApi<Group>(`/groups/${groupId}`, true);
+
+  useRedirect("/groups", false, !groupId || isRestricted);
+
+  if (isRestricted) {
+    return (
+      <PageContainer>
+        <RestrictedAccess page={"Group Information"} />
+      </PageContainer>
+    );
+  }
+
+  if (error)
+    return (
+      <PageNotFound
+        title={error?.message}
+        description={
+          "The group you are attempting to access cannot be found. It may have been deleted, or you may not have permission to view it. Please verify the URL or return to the dashboard."
+        }
+      />
+    );
+
+  return group && !isLoading ? (
+    <PageContainer>
+      <RoutesProvider>
+        <GroupProvider group={group} isDetailPage={true}>
+          <div className={"p-default py-6 pb-0 w-full mb-[6px]"}>
+            <Breadcrumbs>
+              <Breadcrumbs.Item
+                href={"/groups"}
+                label={"Groups"}
+                icon={<FolderGit2Icon size={14} />}
+              />
+              <Breadcrumbs.Item label={group.name} active />
+            </Breadcrumbs>
+            <GroupDetailsName />
+          </div>
+          <GroupOverviewTabs group={group} />
+        </GroupProvider>
+      </RoutesProvider>
+    </PageContainer>
+  ) : (
+    <FullScreenLoading />
+  );
+}
+
+const GroupDetailsName = () => {
+  const { group, isJWTGroup, isAllowedToRename, openGroupRenameModal } =
+    useGroupContext();
+  const { permission } = usePermissions();
+
+  return (
+    <div className={"w-full"}>
+      <h1 className={"flex items-center gap-3 w-full whitespace-nowrap"}>
+        <GroupBadgeIcon id={group?.id} issued={group?.issued} size={20} />
+        {group.name}
+        {group.name !== "All" && permission?.groups?.update && (
+          <div>
+            <FullTooltip
+              content={
+                <div className={"text-xs max-w-xs"}>
+                  {isJWTGroup
+                    ? GROUP_TOOLTIP_TEXT.RENAME.JWT
+                    : GROUP_TOOLTIP_TEXT.RENAME.INTEGRATION}
+                </div>
+              }
+              interactive={false}
+              disabled={isAllowedToRename}
+              className={"w-full block"}
+            >
+              <div
+                className={cn(
+                  "flex h-8 w-8 items-center justify-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 rounded-md cursor-pointer",
+                  !isAllowedToRename &&
+                    "opacity-40 cursor-not-allowed pointer-events-none",
+                )}
+                onClick={openGroupRenameModal}
+              >
+                <PencilIcon size={16} />
+              </div>
+            </FullTooltip>
+          </div>
+        )}
+      </h1>
+    </div>
+  );
+};
+
+const validAllGroupTabs = [
+  "policies",
+  "resources",
+  "network-routes",
+  "nameservers",
+];
+const validOtherGroupTabs = ["users", "peers", "setup-keys"];
+
+const GroupOverviewTabs = ({ group }: { group: Group }) => {
+  const searchParams = useSearchParams();
+
+  const getInitialTab = () => {
+    const isAllGroup = group.name === "All";
+    const tabParam = searchParams.get("tab");
+    const validTabs = isAllGroup
+      ? validAllGroupTabs
+      : [...validAllGroupTabs, ...validOtherGroupTabs];
+    if (tabParam === null) return isAllGroup ? "policies" : "users";
+    if (isAllGroup) {
+      return validTabs.includes(tabParam) ? tabParam : "policies";
+    }
+    return validTabs.includes(tabParam) ? tabParam : "users";
+  };
+
+  const [tab, setTab] = useState(getInitialTab());
+  const { groupDetails, isLoading } = useGroupDetails(group?.id || "");
+
+  const peersCount = groupDetails?.peers_count || 0;
+  const usersCount = groupDetails?.users?.length || 0;
+  const policiesCount = groupDetails?.policies?.length || 0;
+  const resourcesCount = groupDetails?.resources_count || 0;
+  const routesCount = groupDetails?.routes?.length || 0;
+  const nameserversCount = groupDetails?.nameservers?.length || 0;
+  const setupKeysCount = groupDetails?.setupKeys?.length || 0;
+
+  return (
+    <Tabs
+      defaultValue={tab}
+      onValueChange={(v) => setTab(v)}
+      value={tab}
+      className={"pt-2 pb-0 mb-0"}
+    >
+      <TabsList justify={"start"} className={"px-8"}>
+        {group.name !== "All" && (
+          <TabsTrigger
+            value={"users"}
+            className={groupDetails === null ? "animate-pulse" : ""}
+          >
+            <TeamIcon
+              size={12}
+              className={
+                "fill-nb-gray-500 group-data-[state=active]/trigger:fill-netbird transition-all"
+              }
+            />
+            {singularize("Users", usersCount)}
+          </TabsTrigger>
+        )}
+
+        {group.name !== "All" && (
+          <TabsTrigger
+            value={"peers"}
+            className={groupDetails === null ? "animate-pulse" : ""}
+          >
+            <PeerIcon
+              size={12}
+              className={
+                "fill-nb-gray-500 group-data-[state=active]/trigger:fill-netbird transition-all"
+              }
+            />
+            {singularize("Peers", peersCount)}
+          </TabsTrigger>
+        )}
+
+        <TabsTrigger
+          value={"policies"}
+          className={groupDetails === null ? "animate-pulse" : ""}
+        >
+          <AccessControlIcon
+            size={12}
+            className={
+              "fill-nb-gray-500 group-data-[state=active]/trigger:fill-netbird transition-all"
+            }
+          />
+          {singularize("Policies", policiesCount)}
+        </TabsTrigger>
+
+        <TabsTrigger
+          value={"resources"}
+          className={groupDetails === null ? "animate-pulse" : ""}
+        >
+          <Layers3Icon size={14} />
+          {singularize("Resources", resourcesCount)}
+        </TabsTrigger>
+
+        <TabsTrigger
+          value={"network-routes"}
+          className={groupDetails === null ? "animate-pulse" : ""}
+        >
+          <NetworkRoutesIcon
+            size={12}
+            className={
+              "fill-nb-gray-500 group-data-[state=active]/trigger:fill-netbird transition-all"
+            }
+          />
+          {singularize("Network Routes", routesCount)}
+        </TabsTrigger>
+
+        <TabsTrigger
+          value={"nameservers"}
+          className={groupDetails === null ? "animate-pulse" : ""}
+        >
+          <DNSIcon
+            size={12}
+            className={
+              "fill-nb-gray-500 group-data-[state=active]/trigger:fill-netbird transition-all"
+            }
+          />
+          {singularize("Nameservers", nameserversCount)}
+        </TabsTrigger>
+
+        {group.name !== "All" && (
+          <TabsTrigger
+            value={"setup-keys"}
+            className={groupDetails === null ? "animate-pulse" : ""}
+          >
+            <SetupKeysIcon
+              size={12}
+              className={
+                "fill-nb-gray-500 group-data-[state=active]/trigger:fill-netbird transition-all"
+              }
+            />
+            {singularize("Setup Keys", setupKeysCount)}
+          </TabsTrigger>
+        )}
+      </TabsList>
+
+      <TabsContent value={"users"} className={"pb-8"}>
+        <GroupUsersSection users={groupDetails?.users} isLoading={isLoading} />
+      </TabsContent>
+
+      <TabsContent value={"peers"} className={"pb-8"}>
+        <GroupPeersSection
+          peers={groupDetails?.peersOfGroup}
+          isLoading={isLoading}
+        />
+      </TabsContent>
+
+      <TabsContent value={"policies"} className={"pb-8"}>
+        <GroupPoliciesSection
+          policies={groupDetails?.policies}
+          isLoading={isLoading}
+        />
+      </TabsContent>
+
+      <TabsContent value={"resources"} className={"pb-8"}>
+        <GroupResourcesSection
+          resources={groupDetails?.networkResources}
+          isLoading={isLoading}
+        />
+      </TabsContent>
+
+      <TabsContent value={"network-routes"} className={"pb-8"}>
+        <GroupNetworkRoutesSection
+          routes={groupDetails?.routes}
+          isLoading={isLoading}
+        />
+      </TabsContent>
+
+      <TabsContent value={"nameservers"} className={"pb-8"}>
+        <GroupNameserversSection
+          nameserverGroups={groupDetails?.nameservers}
+          isLoading={isLoading}
+        />
+      </TabsContent>
+
+      <TabsContent value={"setup-keys"} className={"pb-8"}>
+        <GroupSetupKeysSection
+          setupKeys={groupDetails?.setupKeys}
+          isLoading={isLoading}
+        />
+      </TabsContent>
+    </Tabs>
+  );
+};

src/app/(dashboard)/groups/layout.tsx

@@ -0,0 +1,8 @@
+import { globalMetaTitle } from "@utils/meta";
+import type { Metadata } from "next";
+import BlankLayout from "@/layouts/BlankLayout";
+
+export const metadata: Metadata = {
+  title: `Groups - ${globalMetaTitle}`,
+};
+export default BlankLayout;

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

@@ -0,0 +1,56 @@
+"use client";
+
+import Paragraph from "@components/Paragraph";
+import SkeletonTable from "@components/skeletons/SkeletonTable";
+import { RestrictedAccess } from "@components/ui/RestrictedAccess";
+import { usePortalElement } from "@hooks/usePortalElement";
+import { ExternalLinkIcon, FolderGit2Icon } from "lucide-react";
+import React, { lazy, Suspense } from "react";
+import Breadcrumbs from "@/components/Breadcrumbs";
+import InlineLink from "@/components/InlineLink";
+import { usePermissions } from "@/contexts/PermissionsProvider";
+import PageContainer from "@/layouts/PageContainer";
+
+const GroupsTable = lazy(() => import("@/modules/groups/table/GroupsTable"));
+
+export default function GroupsPage() {
+  const { permission } = usePermissions();
+  const { ref: headingRef, portalTarget } =
+    usePortalElement<HTMLHeadingElement>();
+
+  return (
+    <PageContainer>
+      <div className={"p-default py-6"}>
+        <Breadcrumbs>
+          <Breadcrumbs.Item
+            href={"/groups"}
+            label={"Groups"}
+            icon={<FolderGit2Icon size={14} />}
+            active
+          />
+        </Breadcrumbs>
+        <h1 ref={headingRef}>Groups</h1>
+        <Paragraph>
+          Here is the overview of the groups of your organization. You can
+          delete the unused ones.
+        </Paragraph>
+        <Paragraph>
+          Learn more about{" "}
+          <InlineLink
+            href={"https://docs.netbird.io/how-to/manage-network-access"}
+            target={"_blank"}
+          >
+            Groups
+            <ExternalLinkIcon size={12} />
+          </InlineLink>
+          in our documentation.
+        </Paragraph>
+      </div>
+      <RestrictedAccess hasAccess={permission.groups.read} page={"Groups"}>
+        <Suspense fallback={<SkeletonTable />}>
+          <GroupsTable headingTarget={portalTarget} />
+        </Suspense>
+      </RestrictedAccess>
+    </PageContainer>
+  );
+}

src/app/(dashboard)/network-routes/page.tsx

@@ -7,20 +7,23 @@ import SkeletonTable from "@components/skeletons/SkeletonTable";
 import { RestrictedAccess } from "@components/ui/RestrictedAccess";
 import { usePortalElement } from "@hooks/usePortalElement";
 import useFetchApi from "@utils/api";
-import { ExternalLinkIcon } from "lucide-react";
+import { ArrowUpRightIcon, ExternalLinkIcon } from "lucide-react";
 import React, { lazy, Suspense } from "react";
 import NetworkRoutesIcon from "@/assets/icons/NetworkRoutesIcon";
 import PeersProvider from "@/contexts/PeersProvider";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import RoutesProvider from "@/contexts/RoutesProvider";
 import { Route } from "@/interfaces/Route";
 import PageContainer from "@/layouts/PageContainer";
 import useGroupedRoutes from "@/modules/route-group/useGroupedRoutes";
+import { Callout } from "@components/Callout";
 
 const NetworkRoutesTable = lazy(
   () => import("@/modules/route-group/NetworkRoutesTable"),
 );
 
 export default function NetworkRoutes() {
+  const { permission } = usePermissions();
   const { data: routes, isLoading } = useFetchApi<Route[]>("/routes");
   const groupedRoutes = useGroupedRoutes({ routes });
 
@@ -57,9 +60,20 @@ export default function NetworkRoutes() {
               </InlineLink>
               in our documentation.
             </Paragraph>
+
+            <Callout className={"max-w-xl mt-3"} variant={"warning"}>
+              <span>
+                We recommend using the new Networks concept to easier visualise
+                and manage access to your resources.{" "}
+                <InlineLink href={"/networks"}>
+                  Go to Networks
+                  <ArrowUpRightIcon size={14} />
+                </InlineLink>
+              </span>
+            </Callout>
           </div>
 
-          <RestrictedAccess>
+          <RestrictedAccess hasAccess={permission.routes.read}>
             <Suspense fallback={<SkeletonTable />}>
               <NetworkRoutesTable
                 isLoading={isLoading}

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

@@ -1,7 +1,15 @@
 "use client";
 
 import Breadcrumbs from "@components/Breadcrumbs";
+import Button from "@components/Button";
 import Card from "@components/Card";
+import {
+  DropdownMenu,
+  DropdownMenuContent,
+  DropdownMenuItem,
+  DropdownMenuSeparator,
+  DropdownMenuTrigger,
+} from "@components/DropdownMenu";
 import FullTooltip from "@components/FullTooltip";
 import InlineLink from "@components/InlineLink";
 import Separator from "@components/Separator";
@@ -12,21 +20,25 @@ import { cn } from "@utils/helpers";
 import {
   ArrowUpRightIcon,
   HelpCircle,
+  MoreVertical,
   PencilLineIcon,
   ServerIcon,
   ShieldCheckIcon,
   ShieldXIcon,
+  Trash2,
 } from "lucide-react";
-import { useSearchParams } from "next/navigation";
+import { useRouter, useSearchParams } from "next/navigation";
 import React, { useMemo, useState } from "react";
 import { useSWRConfig } from "swr";
 import NetworkRoutesIcon from "@/assets/icons/NetworkRoutesIcon";
-import { useLoggedInUser } from "@/contexts/UsersProvider";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import { Network } from "@/interfaces/Network";
 import PageContainer from "@/layouts/PageContainer";
 import { NetworkInformationSquare } from "@/modules/networks/misc/NetworkInformationSquare";
-import NetworkModal from "@/modules/networks/NetworkModal";
-import { NetworkProvider } from "@/modules/networks/NetworkProvider";
+import {
+  NetworkProvider,
+  useNetworksContext,
+} from "@/modules/networks/NetworkProvider";
 import { ResourcesSection } from "@/modules/networks/resources/ResourcesSection";
 import { NetworkRoutingPeersSection } from "@/modules/networks/routing-peers/NetworkRoutingPeersSection";
 
@@ -48,7 +60,8 @@ export default function NetworkDetailPage() {
 }
 
 function NetworkOverview({ network }: Readonly<{ network: Network }>) {
-  const { isUser } = useLoggedInUser();
+  const { permission } = usePermissions();
+
   const [networkModal, setNetworkModal] = useState(false);
   const { mutate } = useSWRConfig();
 
@@ -64,7 +77,7 @@ function NetworkOverview({ network }: Readonly<{ network: Network }>) {
             <Breadcrumbs.Item
               href={"/networks"}
               label={"Networks"}
-              disabled={isUser}
+              disabled={!permission.networks.read}
               icon={<NetworkRoutesIcon size={13} />}
             />
             <Breadcrumbs.Item
@@ -76,33 +89,24 @@ function NetworkOverview({ network }: Readonly<{ network: Network }>) {
 
           <div className={"flex justify-between max-w-6xl"}>
             <div
-              className={cn(
-                "flex items-center",
-                !network.description && "gap-2",
-              )}
+              className={"w-full lg:w-1/2 flex justify-between items-center"}
             >
-              <NetworkInformationSquare
-                name={network.name}
-                active={isActive}
-                size={"lg"}
-                description={network.description}
-              />
-              <button
-                className={
-                  "flex items-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md cursor-pointer"
-                }
-                onClick={() => setNetworkModal(true)}
+              <div
+                className={cn(
+                  "flex items-center w-full",
+                  !network.description && "gap-2",
+                )}
               >
-                <PencilLineIcon size={18} />
-              </button>
-              <NetworkModal
-                open={networkModal}
-                setOpen={setNetworkModal}
-                onUpdated={() => {
-                  mutate(`/networks/${network.id}`);
-                }}
-                network={network}
-              />
+                <NetworkInformationSquare
+                  name={network.name}
+                  active={isActive}
+                  size={"lg"}
+                  description={network.description}
+                />
+              </div>
+              <NetworkProvider network={network}>
+                <NetworkActions />
+              </NetworkProvider>
             </div>
           </div>
 
@@ -121,6 +125,56 @@ function NetworkOverview({ network }: Readonly<{ network: Network }>) {
   );
 }
 
+function NetworkActions() {
+  const { permission } = usePermissions();
+  const { deleteNetwork, openEditNetworkModal, network } = useNetworksContext();
+  const router = useRouter();
+
+  if (!network) return;
+
+  return (
+    <DropdownMenu modal={false}>
+      <DropdownMenuTrigger
+        asChild={true}
+        onClick={(e) => {
+          e.stopPropagation();
+          e.preventDefault();
+        }}
+      >
+        <Button variant={"secondary"} className={"!px-3"}>
+          <MoreVertical size={16} className={"shrink-0"} />
+        </Button>
+      </DropdownMenuTrigger>
+      <DropdownMenuContent className="w-auto" align="end">
+        <DropdownMenuItem
+          onClick={() => openEditNetworkModal(network)}
+          disabled={!permission.networks.update}
+        >
+          <div className={"flex gap-3 items-center"}>
+            <PencilLineIcon size={14} className={"shrink-0"} />
+            Rename
+          </div>
+        </DropdownMenuItem>
+
+        <DropdownMenuSeparator />
+
+        <DropdownMenuItem
+          onClick={() =>
+            deleteNetwork(network).then(() => router.push("/networks"))
+          }
+          variant={"danger"}
+          disabled={!permission.networks.delete}
+        >
+          <div className={"flex gap-3 items-center"}>
+            <Trash2 size={14} className={"shrink-0"} />
+            Delete
+          </div>
+        </DropdownMenuItem>
+      </DropdownMenuContent>
+    </DropdownMenu>
+  );
+}
+
 function NetworkInformationCard({ network }: Readonly<{ network: Network }>) {
   const isHighlyAvailable = !!(
     network?.routing_peers_count && network?.routing_peers_count >= 2
@@ -151,7 +205,7 @@ function NetworkInformationCard({ network }: Readonly<{ network: Network }>) {
   const policyCount = network.policies?.length ?? 0;
 
   return (
-    <Card>
+    <Card className={"w-full lg:w-1/2"}>
       <Card.List>
         <Card.ListItem
           tooltip={false}

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

@@ -10,12 +10,14 @@ import useFetchApi from "@utils/api";
 import { ExternalLinkIcon } from "lucide-react";
 import React, { Suspense } from "react";
 import NetworkRoutesIcon from "@/assets/icons/NetworkRoutesIcon";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import { Network } from "@/interfaces/Network";
 import PageContainer from "@/layouts/PageContainer";
 import NetworksTable from "@/modules/networks/table/NetworksTable";
 
 export default function Networks() {
   const { data: networks, isLoading } = useFetchApi<Network[]>("/networks");
+  const { permission } = usePermissions();
   const { ref: headingRef, portalTarget } =
     usePortalElement<HTMLHeadingElement>();
 
@@ -31,8 +33,8 @@ export default function Networks() {
         </Breadcrumbs>
         <h1 ref={headingRef}>Networks</h1>
         <Paragraph>
-          Networks allow you to access internal resources in LANs and VPCs without
-          installing NetBird on every machine.
+          Networks allow you to access internal resources in LANs and VPCs
+          without installing NetBird on every machine.
         </Paragraph>
         <Paragraph>
           Learn more about
@@ -47,7 +49,7 @@ export default function Networks() {
         </Paragraph>
       </div>
 
-      <RestrictedAccess>
+      <RestrictedAccess hasAccess={permission.networks.read}>
         <Suspense fallback={<SkeletonTable />}>
           <NetworksTable
             data={networks}

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

@@ -9,18 +9,19 @@ import { ExternalLinkIcon } from "lucide-react";
 import React, { lazy, Suspense } from "react";
 import PeerIcon from "@/assets/icons/PeerIcon";
 import PeersProvider, { usePeers } from "@/contexts/PeersProvider";
-import { useLoggedInUser, useUsers } from "@/contexts/UsersProvider";
+import { usePermissions } from "@/contexts/PermissionsProvider";
+import { useUsers } from "@/contexts/UsersProvider";
 import PageContainer from "@/layouts/PageContainer";
 import { SetupModalContent } from "@/modules/setup-netbird-modal/SetupModal";
 
 const PeersTable = lazy(() => import("@/modules/peers/PeersTable"));
 
 export default function Peers() {
-  const { permission } = useLoggedInUser();
+  const { isRestricted } = usePermissions();
 
   return (
     <PageContainer>
-      {permission.dashboard_view === "blocked" ? (
+      {isRestricted ? (
         <PeersBlockedView />
       ) : (
         <PeersProvider>
@@ -104,7 +105,7 @@ function PeersBlockedView() {
       <div className={"px-3 pt-1 pb-8 max-w-3xl w-full"}>
         <div
           className={
-            "rounded-md border border-nb-gray-900/70 grid w-full bg-nb-gray-930/40 stepper-bg-variant"
+            "rounded-md border border-nb-gray-900/70 grid w-full bg-nb-gray-930/40"
           }
         >
           <SetupModalContent header={false} footer={false} />

src/app/(dashboard)/posture-checks/page.tsx

@@ -11,6 +11,7 @@ import { ExternalLinkIcon, ShieldCheck } from "lucide-react";
 import React, { lazy, Suspense } from "react";
 import AccessControlIcon from "@/assets/icons/AccessControlIcon";
 import GroupsProvider from "@/contexts/GroupsProvider";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import PoliciesProvider from "@/contexts/PoliciesProvider";
 import { PostureCheck } from "@/interfaces/PostureCheck";
 import PageContainer from "@/layouts/PageContainer";
@@ -19,6 +20,7 @@ const PostureCheckTable = lazy(
   () => import("@/modules/posture-checks/table/PostureCheckTable"),
 );
 export default function PostureChecksPage() {
+  const { permission } = usePermissions();
   const { data: postureChecks, isLoading } =
     useFetchApi<PostureCheck[]>("/posture-checks");
 
@@ -59,7 +61,10 @@ export default function PostureChecksPage() {
           </Paragraph>
         </div>
 
-        <RestrictedAccess page={"Posture Checks"}>
+        <RestrictedAccess
+          page={"Posture Checks"}
+          hasAccess={permission.policies.read}
+        >
           <PoliciesProvider>
             <Suspense fallback={<SkeletonTable />}>
               <PostureCheckTable

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

@@ -4,27 +4,39 @@ import { RestrictedAccess } from "@components/ui/RestrictedAccess";
 import { VerticalTabs } from "@components/VerticalTabs";
 import {
   AlertOctagonIcon,
+  FingerprintIcon,
   FolderGit2Icon,
   LockIcon,
+  MonitorSmartphoneIcon,
   NetworkIcon,
   ShieldIcon,
 } from "lucide-react";
 import { useSearchParams } from "next/navigation";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import { useLoggedInUser } from "@/contexts/UsersProvider";
 import PageContainer from "@/layouts/PageContainer";
 import { useAccount } from "@/modules/account/useAccount";
 import AuthenticationTab from "@/modules/settings/AuthenticationTab";
+import ClientSettingsTab from "@/modules/settings/ClientSettingsTab";
 import DangerZoneTab from "@/modules/settings/DangerZoneTab";
-import GroupsTab from "@/modules/settings/GroupsTab";
+import IdentityProvidersTab from "@/modules/settings/IdentityProvidersTab";
 import NetworkSettingsTab from "@/modules/settings/NetworkSettingsTab";
 import PermissionsTab from "@/modules/settings/PermissionsTab";
+import GroupsSettings from "@/modules/settings/GroupsSettings";
 
 export default function NetBirdSettings() {
   const queryParams = useSearchParams();
   const queryTab = queryParams.get("tab");
-  const [tab, setTab] = useState(queryTab || "authentication");
-  const { isOwner } = useLoggedInUser();
+  const { permission } = usePermissions();
+
+  const initialTab = useMemo(() => {
+    if (permission.settings.read) return "authentication";
+    return "authentication";
+  }, [permission]);
+
+  const [tab, setTab] = useState(queryTab ?? initialTab);
+
   const account = useAccount();
 
   useEffect(() => {
@@ -37,33 +49,52 @@ export default function NetBirdSettings() {
     <PageContainer>
       <VerticalTabs value={tab} onChange={setTab}>
         <VerticalTabs.List>
-          <VerticalTabs.Trigger value="authentication">
-            <ShieldIcon size={14} />
-            Authentication
-          </VerticalTabs.Trigger>
-          <VerticalTabs.Trigger value="groups">
-            <FolderGit2Icon size={14} />
-            Groups
-          </VerticalTabs.Trigger>
-          <VerticalTabs.Trigger value="permissions">
-            <LockIcon size={14} />
-            Permissions
-          </VerticalTabs.Trigger>
-          <VerticalTabs.Trigger value="networks">
-            <NetworkIcon size={14} />
-            Networks
-          </VerticalTabs.Trigger>
-          <VerticalTabs.Trigger value="danger-zone" disabled={!isOwner}>
-            <AlertOctagonIcon size={14} />
-            Danger zone
-          </VerticalTabs.Trigger>
+          {permission.settings.read && (
+            <>
+              <VerticalTabs.Trigger value="authentication">
+                <ShieldIcon size={14} />
+                Authentication
+              </VerticalTabs.Trigger>
+              {account?.settings?.embedded_idp_enabled &&
+                permission.identity_providers.read && (
+                  <VerticalTabs.Trigger value="identity-providers">
+                    <FingerprintIcon size={14} />
+                    Identity Providers
+                  </VerticalTabs.Trigger>
+                )}
+              <VerticalTabs.Trigger value="groups">
+                <FolderGit2Icon size={14} />
+                Groups
+              </VerticalTabs.Trigger>
+              <VerticalTabs.Trigger value="permissions">
+                <LockIcon size={14} />
+                Permissions
+              </VerticalTabs.Trigger>
+              <VerticalTabs.Trigger value="networks">
+                <NetworkIcon size={14} />
+                Networks
+              </VerticalTabs.Trigger>
+              <VerticalTabs.Trigger value="clients">
+                <MonitorSmartphoneIcon size={14} />
+                Clients
+              </VerticalTabs.Trigger>
+            </>
+          )}
+
+          <DangerZoneTabTrigger />
         </VerticalTabs.List>
-        <RestrictedAccess page={"Settings"}>
+        <RestrictedAccess
+          page={"Settings"}
+          hasAccess={permission.settings.read}
+        >
           <div className={"border-l border-nb-gray-930 w-full"}>
             {account && <AuthenticationTab account={account} />}
+            {account?.settings?.embedded_idp_enabled &&
+              permission.identity_providers.read && <IdentityProvidersTab />}
             {account && <PermissionsTab account={account} />}
-            {account && <GroupsTab account={account} />}
+            {account && <GroupsSettings account={account} />}
             {account && <NetworkSettingsTab account={account} />}
+            {account && <ClientSettingsTab account={account} />}
             {account && <DangerZoneTab account={account} />}
           </div>
         </RestrictedAccess>
@@ -71,3 +102,16 @@ export default function NetBirdSettings() {
     </PageContainer>
   );
 }
+
+const DangerZoneTabTrigger = () => {
+  const { isOwner } = useLoggedInUser();
+
+  return (
+    isOwner && (
+      <VerticalTabs.Trigger value="danger-zone" disabled={!isOwner}>
+        <AlertOctagonIcon size={14} />
+        Danger zone
+      </VerticalTabs.Trigger>
+    )
+  );
+};

src/app/(dashboard)/setup-keys/page.tsx

@@ -11,6 +11,7 @@ import { ExternalLinkIcon } from "lucide-react";
 import React, { lazy, Suspense, useMemo } from "react";
 import SetupKeysIcon from "@/assets/icons/SetupKeysIcon";
 import { useGroups } from "@/contexts/GroupsProvider";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import { Group } from "@/interfaces/Group";
 import { SetupKey } from "@/interfaces/SetupKey";
 import PageContainer from "@/layouts/PageContainer";
@@ -21,6 +22,7 @@ const SetupKeysTable = lazy(
 
 export default function SetupKeys() {
   const { data: setupKeys, isLoading } = useFetchApi<SetupKey[]>("/setup-keys");
+  const { permission } = usePermissions();
   const { groups } = useGroups();
 
   const setupKeysWithGroups = useMemo(() => {
@@ -71,7 +73,10 @@ export default function SetupKeys() {
           in our documentation.
         </Paragraph>
       </div>
-      <RestrictedAccess page={"Setup Keys"}>
+      <RestrictedAccess
+        page={"Setup Keys"}
+        hasAccess={permission.setup_keys.read}
+      >
         <Suspense fallback={<SkeletonTable />}>
           <SetupKeysTable
             headingTarget={portalTarget}

src/app/(dashboard)/team/service-users/page.tsx

@@ -11,6 +11,7 @@ import useFetchApi from "@utils/api";
 import { ExternalLinkIcon } from "lucide-react";
 import React, { lazy, Suspense } from "react";
 import TeamIcon from "@/assets/icons/TeamIcon";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import { User } from "@/interfaces/User";
 import PageContainer from "@/layouts/PageContainer";
 
@@ -19,6 +20,7 @@ const ServiceUsersTable = lazy(
 );
 
 export default function ServiceUsers() {
+  const { permission } = usePermissions();
   const { data: users, isLoading } = useFetchApi<User[]>(
     "/users?service_user=true",
   );
@@ -59,7 +61,10 @@ export default function ServiceUsers() {
           in our documentation.
         </Paragraph>
       </div>
-      <RestrictedAccess page={"Service Users"}>
+      <RestrictedAccess
+        page={"Service Users"}
+        hasAccess={permission.users.read}
+      >
         <Suspense fallback={<SkeletonTable />}>
           <ServiceUsersTable
             users={users}

src/app/(dashboard)/team/user/page.tsx

@@ -9,17 +9,28 @@ import { notify } from "@components/Notification";
 import Paragraph from "@components/Paragraph";
 import { PeerGroupSelector } from "@components/PeerGroupSelector";
 import Separator from "@components/Separator";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@components/Tabs";
 import FullScreenLoading from "@components/ui/FullScreenLoading";
+import { RestrictedAccess } from "@components/ui/RestrictedAccess";
 import useRedirect from "@hooks/useRedirect";
 import { IconCirclePlus, IconSettings2 } from "@tabler/icons-react";
 import useFetchApi, { useApiCall } from "@utils/api";
 import { generateColorFromString } from "@utils/helpers";
 import dayjs from "dayjs";
-import { Ban, GalleryHorizontalEnd, History, Mail, User2 } from "lucide-react";
+import {
+  Ban,
+  GalleryHorizontalEnd,
+  History,
+  KeyRoundIcon,
+  Mail,
+  MonitorSmartphoneIcon,
+  User2,
+} from "lucide-react";
 import { useRouter, useSearchParams } from "next/navigation";
 import React, { useMemo, useState } from "react";
 import { useSWRConfig } from "swr";
 import TeamIcon from "@/assets/icons/TeamIcon";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import { useLoggedInUser } from "@/contexts/UsersProvider";
 import { useHasChanges } from "@/hooks/useHasChanges";
 import { Group } from "@/interfaces/Group";
@@ -31,11 +42,13 @@ import useGroupHelper from "@/modules/groups/useGroupHelper";
 import { useGroupIdsToGroups } from "@/modules/groups/useGroupIdsToGroups";
 import UserBlockCell from "@/modules/users/table-cells/UserBlockCell";
 import UserStatusCell from "@/modules/users/table-cells/UserStatusCell";
+import { UserPeersSection } from "@/modules/users/UserPeersSection";
 import { UserRoleSelector } from "@/modules/users/UserRoleSelector";
 
 export default function UserPage() {
   const queryParameter = useSearchParams();
   const userId = queryParameter.get("id");
+  const { permission } = usePermissions();
   const isServiceUser = queryParameter.get("service_user") === "true";
   const { data: users, isLoading } = useFetchApi<User[]>(
     `/users?service_user=${isServiceUser}`,
@@ -50,6 +63,14 @@ export default function UserPage() {
 
   const userGroups = useGroupIdsToGroups(user?.auto_groups);
 
+  if (!permission.users.read) {
+    return (
+      <PageContainer>
+        <RestrictedAccess page={"User Information"} />
+      </PageContainer>
+    );
+  }
+
   if (!isOwnerOrAdmin && user && !isLoading) {
     return <UserOverview user={user} initialGroups={[]} />;
   }
@@ -69,9 +90,11 @@ type Props = {
 function UserOverview({ user, initialGroups }: Readonly<Props>) {
   const router = useRouter();
   const userRequest = useApiCall<User>("/users");
+  const isServiceUser = !!user?.is_service_user;
   const { mutate } = useSWRConfig();
   const { loggedInUser, isOwnerOrAdmin, isUser } = useLoggedInUser();
   const isLoggedInUser = loggedInUser ? loggedInUser?.id === user.id : false;
+  const { permission } = usePermissions();
 
   const [selectedGroups, setSelectedGroups, { save: saveGroups }] =
     useGroupHelper({
@@ -79,7 +102,6 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
     });
 
   const [role, setRole] = useState(user.role || Role.User);
-
   const { hasChanges, updateRef: updateChangesRef } = useHasChanges([
     role,
     selectedGroups,
@@ -102,13 +124,24 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
           `/${user.id}`,
         )
         .then(() => {
-          mutate(`/users?service_user=${user.is_service_user}`);
+          mutate(`/users?service_user=${isServiceUser}`);
           updateChangesRef([role, selectedGroups]);
         }),
       loadingMessage: "Saving changes...",
     });
   };
 
+  const isProfilePage = !!user?.is_current && !isServiceUser;
+  const canViewTokens = permission?.pats?.read;
+  const canViewPeers = permission?.peers?.read;
+
+  const showAccessTokens = (user?.is_current || isServiceUser) && canViewTokens;
+  const showPeers = !isServiceUser && canViewPeers;
+  const showTabs = isProfilePage && showPeers && showAccessTokens;
+  const showSeparator = !showTabs;
+
+  const [tab, setTab] = useState(isServiceUser ? "access-tokens" : "peers");
+
   return (
     <PageContainer>
       <div className={"p-default py-6 mb-4"}>
@@ -116,11 +149,11 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
           <Breadcrumbs.Item
             href={"/team"}
             label={"Team"}
-            disabled={isUser}
+            disabled={!permission.users.read}
             icon={<TeamIcon size={13} />}
           />
 
-          {user.is_service_user ? (
+          {isServiceUser ? (
             <Breadcrumbs.Item
               href={"/team/service-users"}
               label={"Service Users"}
@@ -130,7 +163,7 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
             <Breadcrumbs.Item
               href={"/team/users"}
               label={"Users"}
-              disabled={isUser}
+              disabled={!permission.users.read}
               icon={<User2 size={16} />}
             />
           )}
@@ -146,7 +179,7 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
                   "w-10 h-10 rounded-full relative flex items-center justify-center text-white uppercase text-md font-medium bg-nb-gray-900"
                 }
                 style={
-                  user.is_service_user
+                  isServiceUser
                     ? {
                         color: "white",
                       }
@@ -159,13 +192,13 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
                       }
                 }
               >
-                {user.is_service_user ? (
+                {isServiceUser ? (
                   <IconSettings2 size={16} />
                 ) : (
                   user?.name?.charAt(0) || user?.id?.charAt(0)
                 )}
               </div>
-              <h1 className={"flex items-center gap-3"}>
+              <h1 className={"flex items-center gap-3"} title={user?.id}>
                 {user.name || user.id}
               </h1>
             </div>
@@ -176,7 +209,7 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
                 variant={"default"}
                 className={"w-full"}
                 onClick={() => {
-                  user.is_service_user
+                  isServiceUser
                     ? router.push("/team/service-users")
                     : router.push("/team/users");
                 }}
@@ -187,7 +220,7 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
               <Button
                 variant={"primary"}
                 className={"w-full"}
-                disabled={!hasChanges}
+                disabled={!hasChanges || !permission.users.update}
                 onClick={save}
                 data-cy={"save-changes"}
               >
@@ -200,7 +233,7 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
         <div className={"flex gap-10 w-full mt-8 max-w-6xl items-start"}>
           <UserInformationCard user={user} />
           <div className={"flex flex-col gap-8 w-1/2 "}>
-            {!user.is_service_user && isOwnerOrAdmin && (
+            {!isServiceUser && isOwnerOrAdmin && (
               <div>
                 <Label>Auto-assigned groups</Label>
                 <HelpText>
@@ -226,13 +259,9 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
                 <UserRoleSelector
                   value={role}
                   onChange={setRole}
-                  hideOwner={user.is_service_user}
+                  hideOwner={isServiceUser}
                   currentUser={user}
-                  disabled={
-                    isLoggedInUser ||
-                    !isOwnerOrAdmin ||
-                    user.role === Role.Owner
-                  }
+                  disabled={isLoggedInUser || !permission.users.update}
                 />
               </div>
             </div>
@@ -240,46 +269,75 @@ function UserOverview({ user, initialGroups }: Readonly<Props>) {
         </div>
       </div>
 
-      {(user.is_current || user.is_service_user) && (
-        <>
-          <Separator />
-          <div className={"px-8 py-6"}>
-            <div className={"max-w-6xl"}>
-              <div className={"flex justify-between items-center"}>
-                <div>
-                  <h2>Access Tokens</h2>
-                  <Paragraph>
-                    Access tokens give access to NetBird API.
-                  </Paragraph>
-                </div>
-                <div className={"inline-flex gap-4 justify-end"}>
+      {showSeparator && <Separator />}
+
+      <Tabs
+        defaultValue={tab}
+        onValueChange={setTab}
+        value={tab}
+        className={"pb-0 mb-0"}
+      >
+        <TabsList justify={"start"} className={"px-8"} hidden={!showTabs}>
+          {showPeers && (
+            <TabsTrigger value={"peers"}>
+              <MonitorSmartphoneIcon size={16} />
+              Peers
+            </TabsTrigger>
+          )}
+          {showAccessTokens && (
+            <TabsTrigger value={"access-tokens"}>
+              <KeyRoundIcon size={16} />
+              Access Tokens
+            </TabsTrigger>
+          )}
+        </TabsList>
+        {showPeers && (
+          <TabsContent value={"peers"} className={"pb-8"}>
+            <UserPeersSection user={user} />
+          </TabsContent>
+        )}
+        {showAccessTokens && (
+          <TabsContent value={"access-tokens"} className={"pb-8"}>
+            <div className={"px-8"}>
+              <div className={"max-w-6xl"}>
+                <div className={"flex justify-between items-center"}>
                   <div>
-                    <CreateAccessTokenModal user={user}>
-                      <Button
-                        variant={"primary"}
-                        data-cy={"access-token-open-modal"}
-                      >
-                        <IconCirclePlus size={16} />
-                        Create Access Token
-                      </Button>
-                    </CreateAccessTokenModal>
+                    <h2>Access Tokens</h2>
+                    <Paragraph>
+                      Access tokens give access to NetBird API.
+                    </Paragraph>
+                  </div>
+                  <div className={"inline-flex gap-4 justify-end"}>
+                    <div>
+                      <CreateAccessTokenModal user={user}>
+                        <Button
+                          variant={"primary"}
+                          data-cy={"access-token-open-modal"}
+                          disabled={!permission.pats.create}
+                        >
+                          <IconCirclePlus size={16} />
+                          Create Access Token
+                        </Button>
+                      </CreateAccessTokenModal>
+                    </div>
                   </div>
                 </div>
+                <AccessTokensTable user={user} />
               </div>
-              <AccessTokensTable user={user} />
             </div>
-          </div>
-        </>
-      )}
+          </TabsContent>
+        )}
+      </Tabs>
     </PageContainer>
   );
 }
 
-function UserInformationCard({ user }: { user: User }) {
+function UserInformationCard({ user }: Readonly<{ user: User }>) {
   const isServiceUser = user.is_service_user || false;
   const neverLoggedIn = dayjs(user.last_login).isBefore(
     dayjs().subtract(1000, "years"),
   );
+  const isPendingApproval = user?.pending_approval;
 
   return (
     <Card>
@@ -319,18 +377,20 @@ function UserInformationCard({ user }: { user: User }) {
 
         {!isServiceUser && (
           <>
-            {!user.is_current && user.role != Role.Owner && (
-              <Card.ListItem
-                tooltip={false}
-                label={
-                  <>
-                    <Ban size={16} />
-                    Block User
-                  </>
-                }
-                value={<UserBlockCell user={user} isUserPage={true} />}
-              />
-            )}
+            {!user.is_current &&
+              user.role != Role.Owner &&
+              !isPendingApproval && (
+                <Card.ListItem
+                  tooltip={false}
+                  label={
+                    <>
+                      <Ban size={16} />
+                      Block User
+                    </>
+                  }
+                  value={<UserBlockCell user={user} isUserPage={true} />}
+                />
+              )}
 
             <Card.ListItem
               label={

src/app/(dashboard)/team/users/page.tsx

@@ -11,6 +11,7 @@ import { ExternalLinkIcon, User2 } from "lucide-react";
 import React, { lazy, Suspense } from "react";
 import TeamIcon from "@/assets/icons/TeamIcon";
 import { useGroups } from "@/contexts/GroupsProvider";
+import { usePermissions } from "@/contexts/PermissionsProvider";
 import { User } from "@/interfaces/User";
 import PageContainer from "@/layouts/PageContainer";
 
@@ -18,6 +19,7 @@ const UsersTable = lazy(() => import("@/modules/users/UsersTable"));
 
 export default function TeamUsers() {
   const { isLoading: isGroupsLoading } = useGroups();
+  const { permission } = usePermissions();
   const { data: users, isLoading } = useFetchApi<User[]>(
     "/users?service_user=false",
   );
@@ -58,7 +60,7 @@ export default function TeamUsers() {
           in our documentation.
         </Paragraph>
       </div>
-      <RestrictedAccess page={"Users"}>
+      <RestrictedAccess page={"Users"} hasAccess={permission.users.read}>
         <Suspense fallback={<SkeletonTable />}>
           <UsersTable
             users={users}

src/app/(remote-access)/layout.tsx

@@ -0,0 +1,9 @@
+"use client";
+
+import UsersProvider from "@/contexts/UsersProvider";
+
+export default function Layout({ children }: { children: React.ReactNode }) {
+  return (
+      <UsersProvider>{children}</UsersProvider>
+  );
+}

src/app/(remote-access)/peer/rdp/page.tsx

@@ -0,0 +1,219 @@
+"use client";
+
+import { notify } from "@components/Notification";
+import FullScreenLoading from "@components/ui/FullScreenLoading";
+import { IconCircleX } from "@tabler/icons-react";
+import useFetchApi from "@utils/api";
+import { Loader2Icon } from "lucide-react";
+import React, { useCallback, useEffect, useRef, useState } from "react";
+import type { Peer } from "@/interfaces/Peer";
+import { RDPCertificateModal } from "@/modules/remote-access/rdp/RDPCertificateModal";
+import { RDPCredentialsModal } from "@/modules/remote-access/rdp/RDPCredentialsModal";
+import { useRDPQueryParams } from "@/modules/remote-access/rdp/useRDPQueryParams";
+import {
+  RDPCredentials,
+  RDPStatus,
+  useRemoteDesktop,
+} from "@/modules/remote-access/rdp/useRemoteDesktop";
+import {
+  NetBirdStatus,
+  useNetBirdClient,
+} from "@/modules/remote-access/useNetBirdClient";
+import { cn } from "@utils/helpers";
+import { isNetbirdSSHProtocolSupported } from "@utils/version";
+
+export default function RDPPage() {
+  const { peerId } = useRDPQueryParams();
+
+  const {
+    data: peer,
+    isLoading,
+    error,
+  } = useFetchApi<Peer>(`/peers/${peerId}`, true, false, !!peerId);
+
+  return (
+    <div className={"w-screen h-screen overflow-hidden fixed inset-0"}>
+      {peerId && peer && !isLoading ? (
+        <RDPSession key={peer.id} peer={peer} />
+      ) : (
+        <FullScreenLoading />
+      )}
+    </div>
+  );
+}
+
+type Props = {
+  peer: Peer;
+};
+
+function RDPSession({ peer }: Props) {
+  const client = useNetBirdClient();
+  const [isNetBirdConnecting, setIsNetBirdConnecting] = useState(false);
+  const rdp = useRemoteDesktop(client);
+  const [credentialsModal, setCredentialsModal] = useState(true);
+  const [credentials, setCredentials] = useState<RDPCredentials | null>(null);
+  const connected = useRef(false);
+
+  useEffect(() => {
+    document.title = `${peer.name} - ${peer.ip} - RDP`;
+  }, [peer.ip, peer.name, connected, rdp]);
+
+  const sendErrorNotification = (title: string, message: string) => {
+    notify({
+      title: title,
+      description: message,
+      icon: <IconCircleX size={24} />,
+      backgroundColor: "bg-red-500",
+      duration: 10000,
+    });
+  };
+
+  const reset = useCallback(async () => {
+    setCredentials(null);
+    connected.current = false;
+    setCredentialsModal(true);
+    rdp.session?.disconnect();
+    await client.disconnect();
+  }, [client, rdp]);
+
+  /**
+   * Establishes a connection to the peer
+   */
+  const connect = async (rdpCredentials: RDPCredentials) => {
+    if (!peer?.id) return;
+    if (client.status === NetBirdStatus.DISCONNECTED) {
+      try {
+        setCredentials(rdpCredentials);
+        setIsNetBirdConnecting(true);
+        const protocol = isNetbirdSSHProtocolSupported(peer.version)
+          ? "netbird-ssh"
+          : "tcp";
+        await client.connectTemporary(peer.id, [
+          `${protocol}/${rdpCredentials.port}`,
+        ]);
+        setIsNetBirdConnecting(false);
+      } catch (error) {
+        sendErrorNotification(
+          "NetBird Connection Error",
+          (error as Error).message,
+        );
+        setIsNetBirdConnecting(false);
+      }
+    }
+  };
+
+  const startSession = useCallback(async () => {
+    if (!credentials) return;
+    try {
+      const result = await rdp.connect({
+        hostname: peer.ip,
+        port: credentials.port,
+        username: credentials.username,
+        password: credentials.password,
+        domain: credentials.domain,
+        width: window.innerWidth,
+        height: window.innerHeight,
+      });
+      if (result === RDPStatus.CONNECTED) {
+        connected.current = true;
+      } else {
+      }
+    } catch (error) {
+      sendErrorNotification("RDP Connection Error", (error as Error).message);
+      setCredentialsModal(true);
+      await reset();
+    }
+  }, [credentials, peer.ip, rdp, reset]);
+
+  /**
+   * Establish RDP session when NetBird connection is ready
+   */
+  useEffect(() => {
+    if (
+      client.status === NetBirdStatus.CONNECTED &&
+      rdp.status === RDPStatus.DISCONNECTED &&
+      credentials &&
+      !connected.current &&
+      !isNetBirdConnecting
+    ) {
+      startSession().catch(console.error);
+    }
+  }, [
+    client.status,
+    credentials,
+    peer.ip,
+    rdp,
+    startSession,
+    isNetBirdConnecting,
+  ]);
+
+  /**
+   * Display notifications for RDP and NetBird client errors
+   */
+  useEffect(() => {
+    if (rdp.error) {
+      sendErrorNotification("RDP Error", rdp.error);
+    }
+    if (client.error) {
+      sendErrorNotification("NetBird Client Error", client.error);
+    }
+  }, [rdp, client]);
+
+  /**
+   * Close credentials modal when RDP is connected
+   */
+  useEffect(() => {
+    if (rdp.status === RDPStatus.CONNECTED) {
+      setCredentialsModal(false);
+    }
+  }, [rdp.status]);
+
+  const isLoading =
+    client.status === NetBirdStatus.CONNECTING ||
+    rdp.status === RDPStatus.CONNECTING ||
+    rdp.isResizing ||
+    isNetBirdConnecting;
+
+  return (
+    <>
+      {/* Credentials Modal */}
+      <RDPCredentialsModal
+        open={credentialsModal}
+        peer={peer}
+        onConnect={connect}
+        loading={isLoading}
+      />
+
+      {/* Certificate Modal */}
+      <RDPCertificateModal
+        open={!!rdp.pendingCertificate}
+        certificateInfo={rdp.pendingCertificate}
+        onAccept={rdp.acceptCertificatePrompt}
+        onReject={async () => {
+          rdp.rejectCertificatePrompt();
+          await reset();
+        }}
+      />
+
+      {rdp.isResizing && (
+        <div
+          className={
+            "fixed w-screen h-screen z-50 backdrop-blur bg-black/50 flex items-center justify-center"
+          }
+        >
+          <Loader2Icon size={20} className={"animate-spin"} />
+        </div>
+      )}
+
+      {/* RDP Canvas  */}
+      <canvas
+        ref={rdp.canvasRef}
+        className={cn(
+          rdp.status === RDPStatus.CONNECTED ? "block" : "hidden",
+          "w-full h-full select-none bg-nb-gray-950",
+        )}
+        style={{ imageRendering: "pixelated" }}
+      />
+    </>
+  );
+}

src/app/(remote-access)/peer/ssh/page.tsx

@@ -0,0 +1,246 @@
+"use client";
+
+import { PageNotFound } from "@components/ui/PageNotFound";
+import useFetchApi, { ErrorResponse } from "@utils/api";
+import { CircleXIcon, InfoIcon, Loader2Icon } from "lucide-react";
+import React, { useEffect, useRef } from "react";
+import type { Peer } from "@/interfaces/Peer";
+import { Terminal } from "@/modules/remote-access/ssh/Terminal";
+import { SSHStatus, useSSH } from "@/modules/remote-access/ssh/useSSH";
+import { useSSHQueryParams } from "@/modules/remote-access/ssh/useSSHQueryParams";
+import {
+  NetBirdStatus,
+  useNetBirdClient,
+} from "@/modules/remote-access/useNetBirdClient";
+import {
+  isNativeSSHSupported,
+  isNetbirdSSHProtocolSupported,
+} from "@utils/version";
+
+export default function SSHPage() {
+  const { peerId, username, port } = useSSHQueryParams();
+
+  const {
+    data: peer,
+    isLoading,
+    error,
+  } = useFetchApi<Peer>(`/peers/${peerId}`, true, false, !!peerId);
+
+  if (error) {
+    return (
+      <div className={"w-screen h-screen overflow-hidden"}>
+        <ErrorMessage
+          error={{
+            message:
+              "This peer may have been deleted, or you may not have permission to view it.",
+            code: error.code,
+          }}
+        />
+      </div>
+    );
+  }
+
+  return (
+    <div className={"w-screen h-screen overflow-hidden"}>
+      {peerId && peer && !isLoading && username && port ? (
+        <SSHTerminal
+          key={peer.id}
+          peer={peer}
+          username={username}
+          port={port}
+        />
+      ) : (
+        <LoadingMessage message={"Starting ssh session..."} />
+      )}
+    </div>
+  );
+}
+
+type Props = {
+  username: string;
+  port: string;
+  peer: Peer;
+};
+
+function SSHTerminal({ username, port, peer }: Props) {
+  const client = useNetBirdClient();
+  const connected = useRef(false);
+  const sshConnectedOnce = useRef(false);
+
+  const {
+    connect: ssh,
+    disconnect,
+    status,
+    session,
+    error: sshError,
+  } = useSSH(client);
+
+  const isSSHConnecting = status === SSHStatus.CONNECTING;
+  const isSSHConnected = status === SSHStatus.CONNECTED;
+  const isSSHDisconnected = status === SSHStatus.DISCONNECTED;
+  const isClientDisconnected = client.status === NetBirdStatus.DISCONNECTED;
+  const isClientConnecting = client.status === NetBirdStatus.CONNECTING;
+
+  useEffect(() => {
+    document.title = `${username}@${peer.ip} - ${peer.hostname}`;
+  }, [username, peer, client]);
+
+  const handleReconnect = async () => {
+    if (!peer?.id) return;
+    if (isSSHConnected || isSSHConnecting) return;
+    connected.current = false;
+    try {
+      const aclPort = isNativeSSHSupported(peer.version) ? "22022" : port;
+      const protocol = isNetbirdSSHProtocolSupported(peer.version)
+        ? "netbird-ssh"
+        : "tcp";
+      const rules = [`${protocol}/${aclPort}`];
+      await client?.connectTemporary(peer.id, rules);
+      await ssh({
+        hostname: peer.ip,
+        port: Number(port),
+        username,
+      });
+    } catch (error) {
+      console.error("Reconnection failed:", error);
+    }
+  };
+
+  useEffect(() => {
+    if (isSSHConnected || isSSHConnecting) return;
+    if (isClientConnecting || client.status === NetBirdStatus.CONNECTED) return;
+
+    const connect = async () => {
+      if (!peer.id) return;
+      if (connected.current) return;
+      connected.current = true;
+
+      try {
+        const aclPort = isNativeSSHSupported(peer.version) ? "22022" : port;
+        const protocol = isNetbirdSSHProtocolSupported(peer.version)
+          ? "netbird-ssh"
+          : "tcp";
+        const rules = [`${protocol}/${aclPort}`];
+        await client?.connectTemporary(peer.id, rules);
+        const res = await ssh({
+          hostname: peer.ip,
+          port: Number(port),
+          username,
+        });
+        if (res === SSHStatus.CONNECTED) {
+          sshConnectedOnce.current = true;
+        }
+      } catch (error) {
+        console.error("Connection error:", error);
+      }
+    };
+
+    if (isClientDisconnected) connect().catch(console.error);
+  }, [
+    isClientDisconnected,
+    isSSHConnected,
+    isSSHConnecting,
+    isClientConnecting,
+    peer.id,
+    port,
+    ssh,
+    username,
+    client.connectTemporary,
+    client.status,
+  ]);
+
+  if (client.error) {
+    return <ErrorMessage error={{ message: client.error, code: 0 }} />;
+  }
+
+  if (sshError) {
+    return <ErrorMessage error={{ message: sshError, code: 0 }} />;
+  }
+
+  if (isSSHDisconnected && sshConnectedOnce.current) {
+    return (
+      <DisconnectedMessage
+        username={username}
+        peerIp={peer.ip}
+        onReconnect={handleReconnect}
+      />
+    );
+  }
+
+  return (
+    <>
+      {session && <Terminal session={session} onClose={disconnect} />}
+      {!isSSHConnected && (
+        <LoadingMessage message={`Connecting to ${username}@${peer.ip}...`} />
+      )}
+    </>
+  );
+}
+
+type MessageProps = {
+  message?: string;
+  error?: ErrorResponse;
+};
+
+const LoadingMessage = ({ message }: MessageProps) => {
+  return (
+    <div
+      className={
+        "w-full h-full flex items-center justify-center flex-col text-center"
+      }
+    >
+      <div className="text-nb-gray-200 font-normal text-base flex gap-2 items-center justify-center">
+        <Loader2Icon size={16} className={"animate-spin shrink-0"} />
+        {message}
+      </div>
+    </div>
+  );
+};
+
+const ErrorMessage = ({ error }: MessageProps) => {
+  return (
+    <div
+      className={
+        "w-full h-full flex items-center justify-center flex-col text-center"
+      }
+    >
+      <div className="text-nb-gray-200 font-normal text-base flex gap-2 items-center justify-center">
+        <CircleXIcon size={16} className={"shrink-0 text-red-500"} />
+        {error?.message}
+      </div>
+    </div>
+  );
+};
+
+type DisconnectedMessageProps = {
+  username: string;
+  peerIp: string;
+  onReconnect: () => void;
+};
+
+const DisconnectedMessage = ({
+  username,
+  peerIp,
+  onReconnect,
+}: DisconnectedMessageProps) => {
+  return (
+    <div
+      className={
+        "w-full h-full flex items-center justify-center flex-col text-center gap-4"
+      }
+    >
+      <div className="text-nb-gray-200 font-normal text-base flex gap-2 items-center justify-center">
+        <InfoIcon size={16} className={"shrink-0 text-nb-gray-200"} />
+        Disconnected from {username}@{peerIp}
+        <button
+          className={
+            "underline-offset-4 items-center transition-all duration-200 inline-flex texts-inherit gap-1 text-netbird hover:underline font-normal"
+          }
+          onClick={onReconnect}
+        >
+          Reconnect
+        </button>
+      </div>
+    </div>
+  );
+};

src/app/error/page.tsx

@@ -0,0 +1,115 @@
+"use client";
+
+import { useOidc } from "@axa-fr/react-oidc";
+import Button from "@components/Button";
+import Paragraph from "@components/Paragraph";
+import loadConfig from "@utils/config";
+import { ArrowRightIcon, RefreshCw } from "lucide-react";
+import { useRouter, useSearchParams } from "next/navigation";
+import { useEffect, useState } from "react";
+import NetBirdIcon from "@/assets/icons/NetBirdIcon";
+
+const config = loadConfig();
+
+export default function ErrorPage() {
+  const { logout, isAuthenticated } = useOidc();
+  const router = useRouter();
+  const searchParams = useSearchParams();
+  const [error, setError] = useState<{
+    code: number;
+    message: string;
+    type: string;
+  } | null>(null);
+
+  useEffect(() => {
+    // Get error details from URL params
+    const code = searchParams.get("code");
+    const message = searchParams.get("message");
+    const type = searchParams.get("type");
+
+    if (code && message) {
+      setError({
+        code: parseInt(code),
+        message: decodeURIComponent(message),
+        type: type || "error",
+      });
+    }
+  }, [searchParams]);
+
+  const handleLogout = () => {
+    // Use the same logout pattern as OIDCError
+    logout("/", { client_id: config.clientId });
+  };
+
+  const handleRetry = () => {
+    router.push("/");
+  };
+
+  if (!isAuthenticated) {
+    // If not authenticated, redirect to home
+    router.push("/");
+    return null;
+  }
+
+  const isBlockedUser =
+    error?.code === 403 && error?.message?.toLowerCase().includes("blocked");
+  const isPendingApproval =
+    error?.code === 403 &&
+    error?.message?.toLowerCase().includes("pending approval");
+
+  const getTitle = () => {
+    if (isBlockedUser) return "User Account Blocked";
+    if (isPendingApproval) return "User Approval Pending";
+    return "Access Error";
+  };
+
+  const getDescription = () => {
+    if (isBlockedUser) {
+      return "Your access has been blocked by the NetBird account administrator, possibly due to new user approval requirements or security policies. Please contact your administrator to regain access.";
+    }
+    if (isPendingApproval) {
+      return "Your account is pending approval from an administrator. Please wait for approval before accessing the dashboard.";
+    }
+    return "An error occurred while trying to access the dashboard. Please try again or contact your administrator.";
+  };
+
+  return (
+    <div className="flex items-center justify-center flex-col h-screen max-w-xl mx-auto">
+      <div className="bg-nb-gray-930 mb-3 border border-nb-gray-900 h-12 w-12 rounded-md flex items-center justify-center">
+        <NetBirdIcon size={23} />
+      </div>
+
+      <h1 className="text-center mt-2">{getTitle()}</h1>
+
+      <Paragraph className="text-center mt-2 block">
+        {getDescription()}
+      </Paragraph>
+
+      {error && (
+        <div className="bg-nb-gray-930 border border-nb-gray-800 rounded-md p-4 mt-4 max-w-md font-mono mb-2">
+          <div className="text-center text-sm text-netbird">
+            <div>response_message: {error.message}</div>
+          </div>
+        </div>
+      )}
+
+      <Paragraph className="text-center mt-2 text-sm">
+        If you believe this is an error, please contact your administrator.
+      </Paragraph>
+
+      <div className="mt-5 space-y-3">
+        {!isBlockedUser && !isPendingApproval && (
+          <Button variant="default-outline" size="sm" onClick={handleRetry}>
+            <RefreshCw size={16} className="mr-2" />
+            Try Again
+          </Button>
+        )}
+
+        <Button variant="primary" size="sm" onClick={handleLogout}>
+          {isBlockedUser || isPendingApproval ? "Sign Out" : "Logout"}
+          <ArrowRightIcon size={16} />
+        </Button>
+      </div>
+    </div>
+  );
+}

src/app/globals.css

@@ -67,10 +67,110 @@ p {
 }
 
 .stepper-bg-variant .step-circle {
-    @apply !border-[#1d2024];
+    @apply !border-nb-gray-940;
 }
 
 .webkit-scroll{
     -webkit-overflow-scrolling: touch;
     -webkit-transform: translate3d(0, 0, 0);
-}
+}
+
+
+/**
+ * Timescape Root element
+ */
+.timescape {
+    @apply flex items-center gap-[1px] rounded-md py-2 px-3 select-none w-fit cursor-text bg-nb-gray-900;
+}
+
+/**
+ * Date and time input elements
+ */
+.timescape input {
+    @apply cursor-text px-0.5 py-1 bg-transparent h-fit border-0 outline-0 select-none box-content caret-transparent text-nb-gray-200 text-sm placeholder-nb-gray-300;
+    font-variant-numeric: tabular-nums;
+    /* For the calculation of the input width these are important */
+    font-family: inherit;
+    font-size: inherit;
+    line-height: inherit;
+}
+
+.timescape input:focus {
+    @apply bg-nb-gray-700 text-white rounded py-1 px-0.5 border-0 outline-0;
+}
+
+/**
+ * Separator elements
+ */
+.timescape .separator {
+    @apply text-gray-400 m-0 text-[80%] -top-[1px] relative;
+}
+
+
+/**
+ * Fade in animation
+ */
+.animate-fade-in {
+  animation: fadeIn 0.4s ease-in-out;
+}
+
+@keyframes fadeIn {
+    from { opacity: 0; }
+    to { opacity: 1; }
+}
+
+
+.animate-slow-ping {
+    animation: ping 1.6s cubic-bezier(0, 0, 0.2, 1) infinite
+}
+
+@keyframes ping {
+    75%, 100% {
+        transform: scale(2);
+        opacity: 0;
+    }
+}
+
+.animate-slow-pulse {
+    animation: pulse 2.5s cubic-bezier(0.4, 0, 0.6, 1) infinite
+}
+
+
+@keyframes pulse {
+    60% {
+        opacity: 0.5;
+    }
+}
+
+@keyframes bg-scroll {
+    0% {
+        background-position: 0% 100%;
+    }
+    100% {
+        background-position: 0% 0%;
+    }
+}
+
+.animate-bg-scroll {
+    animation: bg-scroll 4s linear infinite;
+}
+.animate-bg-scroll-faster {
+    animation: bg-scroll 1.8s linear infinite;
+}
+
+/**
+ * Terminal (xterm)
+ */
+.xterm {
+    @apply m-0 p-1 box-border h-full w-full;
+}
+
+.xterm-viewport {
+    @apply m-0 p-0 box-border;
+}
+
+
+/* Control Center */
+.react-flow__node-groupNode .selected{
+    @apply border-netbird;
+}

src/app/not-found.tsx

@@ -35,6 +35,7 @@ export default function NotFound() {
 }
 
 const Redirect = ({ url, queryParams }: Props) => {
-  useRedirect("/peers" + (queryParams && `?${queryParams}`));
+  const params = queryParams && `?${queryParams}`;
+  useRedirect(url == "/" ? `/peers${params}` : `${url}${params}`, true);
   return <FullScreenLoading />;
 };

src/app/page.tsx

@@ -36,6 +36,7 @@ export default function Home() {
 }
 
 const Redirect = ({ url, queryParams }: Props) => {
-  useRedirect(url == "/" ? "/peers" : url + (queryParams && `?${queryParams}`));
+  const params = queryParams && `?${queryParams}`;
+  useRedirect(url == "/" ? `/peers${params}` : `${url}${params}`, true);
   return <FullScreenLoading />;
 };

src/app/setup/layout.tsx

@@ -0,0 +1,8 @@
+import { globalMetaTitle } from "@utils/meta";
+import type { Metadata } from "next";
+import BlankLayout from "@/layouts/BlankLayout";
+
+export const metadata: Metadata = {
+  title: `Instance Setup - ${globalMetaTitle}`,
+};
+export default BlankLayout;

src/app/setup/page.tsx

@@ -0,0 +1,7 @@
+"use client";
+
+import InstanceSetupWizard from "@/modules/instance-setup/InstanceSetupWizard";
+
+export default function SetupPage() {
+  return <InstanceSetupWizard />;
+}

src/assets/icons/AuthentikIcon.tsx

@@ -0,0 +1,28 @@
+import { iconProperties, IconProps } from "@/assets/icons/IconProperties";
+
+export default function AuthentikIcon(props: Readonly<IconProps>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="-0.03 59.9 512.03 392.1"
+      {...iconProperties(props)}
+    >
+      <path
+        d="M279.9 141h17.9v51.2h-17.9zm46.6-2.2h17.9v40h-17.9zM65.3 197.3c-24 0-46 13.2-57.4 34.3h30.4c13.5-11.6 33-15 47.1 0h32.2c-12.6-17.1-31.4-34.3-52.3-34.3"
+        fill="#fd4b2d"
+      />
+      <path
+        d="M108.7 262.4C66.8 350-6.6 275.3 38.3 231.5H7.9C-15.9 273 17 329 65.3 327.8c37.4 0 68.2-55.5 68.2-65.3 0-4.3-6-17.6-16-31H85.4c10.7 9.7 20 23.7 23.3 30.9m1.1-2.6"
+        fill="#fd4b2d"
+      />
+      <path
+        d="M512 140.3v231.3c0 44.3-36.1 80.4-80.4 80.4h-34.1v-78.8h-163V452h-34.1c-44.4 0-80.4-36.1-80.4-80.4v-72.8h258.4v-139H253.6V238H119.9v-97.6c0-3.1.2-6.2.5-9.2.4-3.7 1.1-7.3 2-10.8.3-1.1.6-2.3 1-3.4.1-.3.2-.6.3-.8.2-.6.4-1.1.5-1.7.2-.5.4-1.1.6-1.7s.5-1.2.7-1.8.5-1.2.8-1.8c2-4.7 4.4-9.3 7.3-13.6l.1-.1c.7-1.1 1.5-2.1 2.3-3.2.7-.9 1.3-1.7 2-2.6.8-.9 1.6-1.9 2.4-2.8s1.6-1.8 2.4-2.6l.1-.1c.4-.5.9-.9 1.4-1.4 3-2.9 6.2-5.6 9.6-8 .9-.7 1.9-1.3 2.8-1.9 1.1-.7 2.2-1.4 3.3-2 2.1-1.2 4.2-2.4 6.5-3.4.7-.3 1.4-.7 2.1-1 3.1-1.3 6.2-2.5 9.4-3.4 1.2-.4 2.5-.7 3.7-1 .6-.2 1.2-.3 1.8-.4 3.6-.8 7.2-1.3 10.9-1.6l1.6-.1h.8c1.2-.1 2.4-.1 3.7-.1h231.3c1.2 0 2.5 0 3.7.1h.8l1.6.1c3.7.3 7.3.8 10.9 1.6.6.1 1.2.3 1.8.4 1.3.3 2.5.6 3.7 1 3.2.9 6.3 2.1 9.4 3.4.7.3 1.4.6 2.1 1 2.2 1 4.4 2.2 6.5 3.4 1.1.7 2.2 1.3 3.3 2 1 .6 1.9 1.3 2.8 1.9 3.9 2.8 7.6 6 11 9.4.8.8 1.7 1.7 2.4 2.6.8.9 1.6 1.9 2.4 2.8.7.8 1.3 1.7 2 2.6.8 1.1 1.5 2.1 2.3 3.2l.1.1c2.9 4.3 5.3 8.8 7.3 13.6.2.6.5 1.2.8 1.8.2.6.5 1.2.7 1.8.2.5.4 1.1.6 1.7s.4 1.1.5 1.7c.1.3.2.6.3.8.3 1.1.7 2.3 1 3.4.9 3.6 1.6 7.2 2 10.8 0 3.1.2 6.1.2 9.2"
+        fill="#fd4b2d"
+      />
+      <path
+        d="M498.3 95.5H133.5c14.9-22.2 40-35.6 66.7-35.6h231.3c26.9 0 51.9 13.4 66.8 35.6m13.2 35.6H120.4c1.4-12.8 6-25 13.1-35.6h364.8c7.2 10.6 11.7 22.9 13.2 35.6m.5 9.2v26.4H378.3v-6.9H253.6v6.9H119.9v-26.4c0-3.1.2-6.2.5-9.2h391.1c.3 3.1.5 6.1.5 9.2M119.9 166.7h133.7v35.6H119.9zm258.4 0H512v35.6H378.3zm-258.4 35.6h133.7v35.6H119.9zm258.4 0H512v35.6H378.3z"
+        fill="#fd4b2d"
+      />
+    </svg>
+  );
+}

src/assets/icons/ControlCenterIcon.tsx

@@ -0,0 +1,22 @@
+import { iconProperties, IconProps } from "@/assets/icons/IconProperties";
+
+export default function ControlCenterIcon(props: IconProps) {
+  return (
+    <svg
+      aria-hidden="true"
+      xmlns="http://www.w3.org/2000/svg"
+      width="24"
+      height="24"
+      fill="currentColor"
+      viewBox="0 0 24 24"
+      {...iconProperties(props)}
+    >
+      <path d="M5 3a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2H5Zm0 12a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2H5Zm12 0a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2v-2a2 2 0 0 0-2-2h-2Zm0-12a2 2 0 0 0-2 2v2a2 2 0 0 0 2 2h2a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2h-2Z" />
+      <path
+        fillRule="evenodd"
+        d="M10 6.5a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1ZM10 18a1 1 0 0 1 1-1h2a1 1 0 1 1 0 2h-2a1 1 0 0 1-1-1Zm-4-4a1 1 0 0 1-1-1v-2a1 1 0 1 1 2 0v2a1 1 0 0 1-1 1Zm12 0a1 1 0 0 1-1-1v-2a1 1 0 1 1 2 0v2a1 1 0 0 1-1 1Z"
+        clipRule="evenodd"
+      />
+    </svg>
+  );
+}

src/assets/icons/IdentityProviderIcons.tsx

@@ -0,0 +1,30 @@
+import { SSOIdentityProviderType } from "@/interfaces/IdentityProvider";
+import React from "react";
+import GoogleIcon from "@/assets/icons/GoogleIcon";
+import MicrosoftIcon from "@/assets/icons/MicrosoftIcon";
+import EntraIcon from "@/assets/icons/EntraIcon";
+import OktaIcon from "@/assets/icons/OktaIcon";
+import PocketIdIcon from "@/assets/icons/PocketIdIcon";
+import ZitadelIcon from "@/assets/icons/ZitadelIcon";
+import AuthentikIcon from "@/assets/icons/AuthentikIcon";
+import KeycloakIcon from "@/assets/icons/KeycloakIcon";
+import { KeyRound } from "lucide-react";
+
+export const idpIcon = (
+  type: SSOIdentityProviderType,
+  size: number = 16,
+): React.ReactNode => {
+  const icons: Record<SSOIdentityProviderType, React.ReactNode> = {
+    google: <GoogleIcon size={size} />,
+    microsoft: <MicrosoftIcon size={size} />,
+    entra: <EntraIcon size={size} />,
+    okta: <OktaIcon size={size} className="text-nb-gray-300" />,
+    pocketid: <PocketIdIcon size={size} />,
+    zitadel: <ZitadelIcon size={size} />,
+    authentik: <AuthentikIcon size={size} />,
+    keycloak: <KeycloakIcon size={size} />,
+    oidc: <KeyRound size={size} className="text-nb-gray-400" />,
+  };
+
+  return icons[type];
+};

src/assets/icons/JumpcloudIcon.tsx

@@ -0,0 +1,19 @@
+import { iconProperties, IconProps } from "@/assets/icons/IconProperties";
+
+export default function JumpcloudIcon(props: Readonly<IconProps>) {
+  return (
+    <svg
+      width="167"
+      height="82"
+      viewBox="0 0 167 82"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...iconProperties(props)}
+    >
+      <path
+        d="M166.911 58.3592C166.911 64.3815 164.519 70.1571 160.26 74.4155C156.002 78.6739 150.226 81.0662 144.204 81.0662H137.961C137.31 73.4972 129.5 67.0612 118.46 64.0722C121.244 61.3253 123.148 57.8124 123.931 53.9803C124.713 50.1482 124.338 46.17 122.854 42.5515C121.369 38.933 118.842 35.8378 115.594 33.6594C112.345 31.481 108.522 30.3178 104.611 30.3178C100.7 30.3178 96.8772 31.481 93.6289 33.6594C90.3805 35.8378 87.8534 38.933 86.3689 42.5515C84.8843 46.17 84.5094 50.1482 85.2918 53.9803C86.0743 57.8124 87.9786 61.3253 90.7628 64.0722C85.5111 65.3278 80.6301 67.8055 76.5167 71.3037C73.9207 69.8152 71.1411 68.6726 68.2487 67.9049C70.6422 65.5587 72.2829 62.5529 72.9614 59.2707C73.6399 55.9884 73.3255 52.5784 72.0584 49.4755C70.7913 46.3726 68.6288 43.7174 65.8467 41.8484C63.0646 39.9793 59.7888 38.9812 56.4372 38.9812C53.0855 38.9812 49.8098 39.9793 47.0277 41.8484C44.2455 43.7174 42.0831 46.3726 40.816 49.4755C39.5488 52.5784 39.2345 55.9884 39.913 59.2707C40.5915 62.5529 42.2321 65.5587 44.6257 67.9049C35.9237 70.3154 29.5841 75.1364 28.2342 80.9698H21.991C16.0936 80.7777 10.502 78.2999 6.39821 74.0603C2.2944 69.8206 0 64.1513 0 58.2508C0 52.3503 2.2944 46.681 6.39821 42.4413C10.502 38.2016 16.0936 35.7238 21.991 35.5317C24.8814 35.5419 27.7438 36.0981 30.4278 37.1709C32.2478 33.2162 35.1686 29.8695 38.8407 27.5312C42.5128 25.1928 46.7807 23.9618 51.1341 23.9854C51.6885 23.9854 52.2429 23.9854 52.7732 23.9854C53.9093 18.1059 56.8018 12.7093 61.0689 8.50798C65.336 4.30669 70.7769 1.49837 76.6733 0.453829C82.5698 -0.590709 88.6443 0.177651 94.095 2.65746C99.546 5.13728 104.116 9.21191 107.203 14.3434C110.733 13.2708 114.463 13.023 118.104 13.6193C121.746 14.2155 125.202 15.6397 128.206 17.7822C131.21 19.9247 133.682 22.7283 135.432 25.977C137.182 29.2257 138.162 32.8326 138.298 36.52C141.665 35.6031 145.198 35.4762 148.622 36.1492C152.046 36.8222 155.269 38.277 158.038 40.4001C160.808 42.5233 163.049 45.2574 164.588 48.3892C166.127 51.5211 166.922 54.9661 166.911 58.4557V58.3592Z"
+        fill="#4CC2BF"
+      />
+    </svg>
+  );
+}

src/assets/icons/KeycloakIcon.tsx

@@ -0,0 +1,88 @@
+import { iconProperties, IconProps } from "@/assets/icons/IconProperties";
+
+export default function KeycloakIcon(props: Readonly<IconProps>) {
+  return (
+    <svg
+      xmlns="http://www.w3.org/2000/svg"
+      viewBox="0 0 512 512"
+      {...iconProperties(props)}
+    >
+      <g transform="translate(.714 .07)">
+        <path
+          d="M432.9 149.2c-1.4 0-2.7-.7-3.4-2L370.1 44.1c-.7-1.2-2-2-3.5-2H124.2c-1.4 0-2.7.7-3.4 2L58.9 150.9l23.9 34.9c-.7 1.2-6.2 24-5.5 25.2L58.9 360.9l61.9 106.9c.7 1.2 2 2 3.4 2h242.4c1.4 0 2.7-.7 3.5-2l59.4-103.2c.7-1.2 2-2 3.4-2h73.8c2.4 0 4.4-2 4.4-4.4V153.6c0-2.4-2-4.4-4.4-4.4z"
+          fill="#4d4d4d"
+        />
+        <path d="M72.7 245.3 6.4 269.4l-6.6-11.3c-.7-1.2-.7-2.7 0-3.9l30-52z" fill="#e1e1e1" />
+        <path d="M511.3 258.3V309l-43.7-44.5z" fill="#c8c8c8" />
+        <path
+          d="m467.5 264.5 43.7 44.5v49.6c0 2.4-2 4.4-4.4 4.4H456z"
+          fill="#c2c2c2"
+        />
+        <path d="M467.5 264.5 456 362.9h-61.2l-18.5-44.7z" fill="#c7c7c7" />
+        <path d="M511.3 211.2v47l-43.7 6.2z" fill="#cecece" />
+        <path
+          d="M511.3 153.6v57.6l-43.7 53.2-33.1-115.3h72.2c2.4-.1 4.5 1.8 4.6 4.3z"
+          fill="#d3d3d3"
+        />
+        <path d="M394.8 362.9h-32.3l-8.4-12 22.1-32.7z" fill="#c6c6c6" />
+        <path d="m467.5 264.5-121.1-51.2 63.7-64.1h24.4z" fill="#d5d5d5" />
+        <path d="m346.5 213.3 29.8 105 91.2-53.8z" fill="#d0d0d0" />
+        <path d="m353.8 362.9.4-12 8.4 12z" fill="#bfbfbf" />
+        <path d="m410.1 149.2-63.7 64.1-11.4-57.4 24.6-6.8h50.5z" fill="#d9d9d9" />
+        <path d="m346.5 213.3-147 33.9 154.7 103.7z" fill="#d4d4d4" />
+        <path d="m346.5 213.3 7.7 137.6 22.1-32.7z" fill="#d0d0d0" />
+        <path d="m335 155.9-135.5 91.2 147-33.9z" fill="#d9d9d9" />
+        <path d="m199.5 247.2-63.7 115.7H99.6L72.7 245.3z" fill="#d8d8d8" />
+        <path
+          d="m134.3 149.2-61.5 96.1L57.3 155l2.2-3.8c.7-1.2 2-1.9 3.4-1.9z"
+          fill="#e2e2e2"
+        />
+        <path
+          d="M99.6 362.9H62.7c-1.4 0-2.8-.8-3.5-2L6.4 269.4l66.4-24.1z"
+          fill="#d8d8d8"
+        />
+        <path d="M29.9 202.1 57.1 155l15.7 90.3z" fill="#e4e4e4" />
+        <path d="m335 155.9-40.8-6.8H159.4l40.1 98z" fill="#dedede" />
+        <path d="m199.5 247.2-40.1-98h-25.1l-61.5 96.1z" fill="#dedede" />
+        <path d="M324.7 362.9h29.1l.4-12z" fill="#c5c5c5" />
+        <path d="M266.7 362.9h58l29.5-12-154.7-103.7 27.9 115.7z" fill="#d0d0d0" />
+        <path d="m227.4 362.9-27.9-115.7-63.7 115.7z" fill="#d1d1d1" />
+        <path d="m335.4 149.2-.4 6.8 24.6-6.8z" fill="#ddd" />
+        <path d="m335 155.9-3.8-6.8h-37z" fill="#e3e3e3" />
+        <path d="m335 155.9.4-6.8h-4.2z" fill="#e2e2e2" />
+        <path
+          d="m223.9 151-59.7 103.4c-.3.5-.4 1.1-.4 1.7h-41.7l82-142q.75.45 1.2 1.2l18.6 32.3c.5 1.1.5 2.4 0 3.4"
+          fill="#00b8e3"
+        />
+        <path
+          d="M223.8 364.9 205.3 397q-.45.75-1.2 1.2l-82-142.2h41.7c0 .6.1 1.1.4 1.6l59.6 103.2c.8 1.2.9 2.9 0 4.1"
+          fill="#33c6e9"
+        />
+        <path
+          d="m204 114.2-82 141.9-20.6 35.6-19.6-34c-.3-.5-.4-1-.4-1.6s.1-1.2.4-1.7l19.9-34.4 60.4-104.5c.6-1.1 1.8-1.8 3-1.8h37.2c.6 0 1.2.2 1.7.5"
+          fill="#008aaa"
+        />
+        <path
+          d="M204 398.2c-.5.3-1.1.5-1.8.5h-37.1c-1.3 0-2.4-.7-3-1.8l-55.2-95.6-5.5-9.5 20.6-35.6z"
+          fill="#00b8e3"
+        />
+        <path
+          d="m368.9 256.1-82 142q-.75-.45-1.2-1.2L267 364.7c-.5-1-.5-2.3 0-3.3L326.7 258c.3-.5.5-1.2.5-1.8z"
+          fill="#008aaa"
+        />
+        <path
+          d="M409.4 256.1c0 .6-.2 1.3-.5 1.8l-80.3 139.3c-.6 1-1.8 1.7-3 1.6h-37c-.6 0-1.2-.2-1.8-.5L368.9 256l20.6-35.6 19.5 33.8c.3.7.4 1.3.4 1.9"
+          fill="#00b8e3"
+        />
+        <path
+          d="M368.9 256.1h-41.7c0-.6-.2-1.2-.5-1.8L267 151.2c-.6-1.1-.6-2.5 0-3.6l18.6-32.2q.45-.75 1.2-1.2z"
+          fill="#00b8e3"
+        />
+        <path
+          d="m389.4 220.5-20.6 35.6-82-142c.6-.3 1.2-.5 1.8-.5h37.1c1.2 0 2.3.6 3 1.6z"
+          fill="#33c6e9"
+        />
+      </g>
+    </svg>
+  );
+}

src/assets/icons/MicrosoftIcon.tsx

@@ -0,0 +1,16 @@
+import { iconProperties, IconProps } from "@/assets/icons/IconProperties";
+
+export default function MicrosoftIcon(props: Readonly<IconProps>) {
+  return (
+    <svg
+      viewBox="0 0 221 221"
+      xmlns="http://www.w3.org/2000/svg"
+      {...iconProperties(props)}
+    >
+      <path fill="#F1511B" d="M104.868 104.868H0V0h104.868z" />
+      <path fill="#80CC28" d="M220.654 104.868H115.788V0h104.866z" />
+      <path fill="#00ADEF" d="M104.865 220.695H0V115.828h104.865z" />
+      <path fill="#FBBC09" d="M220.654 220.695H115.788V115.828h104.866z" />
+    </svg>
+  );
+}

src/assets/icons/OIDCIcon.tsx

@@ -0,0 +1,27 @@
+import { iconProperties, IconProps } from "@/assets/icons/IconProperties";
+
+export default function OIDCIcon(props: Readonly<IconProps>) {
+  return (
+    <svg
+      width="173"
+      height="174"
+      viewBox="0 0 173 174"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...iconProperties(props)}
+    >
+      <path
+        d="M76.3945 173.48L103.325 154.065L102.072 0L76.3945 20.041V173.48Z"
+        fill="#FF8E00"
+      />
+      <path
+        d="M76.7077 173.48C-24.0221 157.466 -26.8926 69.7689 76.0814 50.7288L76.3945 68.8909C3.35034 81.0694 12.6045 146.598 76.3945 156.257L76.7077 173.48Z"
+        fill="white"
+      />
+      <path
+        d="M103.011 68.2646C115.468 68.3493 126.32 74.0515 137.144 79.8508L121.174 91.7502H172.216L172.529 56.9916L156.558 68.8909C140.397 60.7278 125.542 50.9315 103.011 50.7288V68.2646Z"
+        fill="white"
+      />
+    </svg>
+  );
+}

src/assets/icons/PocketIdIcon.tsx

@@ -0,0 +1,17 @@
+import { iconProperties, IconProps } from "@/assets/icons/IconProperties";
+
+export default function PocketIdIcon(props: Readonly<IconProps>) {
+  return (
+    <svg
+      viewBox="0 0 512 512"
+      xmlns="http://www.w3.org/2000/svg"
+      {...iconProperties(props)}
+    >
+      <circle cx="256" cy="256" r="256" fill="#fff" />
+      <path
+        d="M268.6 102.4c64.4 0 116.8 52.4 116.8 116.7 0 25.3-8 49.4-23 69.6-14.8 19.9-35 34.3-58.4 41.7l-6.5 2-15.5-76.2 4.3-2c14-6.7 23-21.1 23-36.6 0-22.4-18.2-40.6-40.6-40.6S228 195.2 228 217.6c0 15.5 9 29.8 23 36.6l4.2 2-25 153.4h-69.5V102.4z"
+        fill="#191919"
+      />
+    </svg>
+  );
+}

src/assets/icons/ZitadelIcon.tsx

@@ -0,0 +1,32 @@
+import { iconProperties, IconProps } from "@/assets/icons/IconProperties";
+
+export default function ZitadelIcon(props: Readonly<IconProps>) {
+  return (
+    <svg
+      viewBox="0 0 80 79"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...iconProperties(props)}
+    >
+      <defs>
+        <linearGradient
+          id="zitadel-grad"
+          x1="3.86"
+          x2="76.88"
+          y1="47.89"
+          y2="47.89"
+          gradientUnits="userSpaceOnUse"
+        >
+          <stop stopColor="#FF8F00" />
+          <stop offset="1" stopColor="#FE00FF" />
+        </linearGradient>
+      </defs>
+      <path
+        fill="url(#zitadel-grad)"
+        fillRule="evenodd"
+        d="M17.12 39.17l1.42 5.32-6.68 6.68 9.12 2.44 1.43 5.32-19.77-5.3L17.12 39.17zM58.82 22.41l-5.32-1.43-2.44-9.12-6.68 6.68-5.32-1.43 14.47-14.47 5.3 19.77zM52.65 67.11l3.89-3.89 9.12 2.44-2.44-9.12 3.9-3.9 5.29 19.77-19.76-5.3zM36.43 69.54l-1.18-12.07 8.23 2.21-7.05 9.86zM23 23.84l5.02 11.04 6.02-6.02L23 23.84zM69.32 36.2l-12.07-1.18 2.2 8.23 9.87-7.05z"
+        clipRule="evenodd"
+      />
+    </svg>
+  );
+}

src/auth/OIDCProvider.tsx

@@ -7,7 +7,6 @@ import {
 } from "@axa-fr/react-oidc";
 import FullScreenLoading from "@components/ui/FullScreenLoading";
 import { useLocalStorage } from "@hooks/useLocalStorage";
-import { useRedirect } from "@hooks/useRedirect";
 import loadConfig, { buildExtras } from "@utils/config";
 import { usePathname, useRouter, useSearchParams } from "next/navigation";
 import React, { useEffect, useState } from "react";
@@ -48,21 +47,34 @@ export default function OIDCProvider({ children }: Props) {
   const [, setQueryParams] = useLocalStorage("netbird-query-params", params);
 
   useEffect(() => {
-    if (
-      params?.includes("tab") ||
-      params?.includes("search") ||
-      params?.includes("id")
-    ) {
-      setQueryParams(params);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
+    const validParams = [
+      "tab",
+      "search",
+      "id",
+      "invite",
+      "utm_source",
+      "utm_medium",
+      "utm_content",
+      "utm_campaign",
+      "hs_id",
+      "page",
+      "page_size",
+      "user",
+      "port",
+    ];
+
+    try {
+      const urlParams = new URLSearchParams(params);
+      if (validParams.some((param) => urlParams.has(param))) {
+        setQueryParams(params);
+      }
+    } catch (e) {}
   }, []);
 
   const withCustomHistory = () => {
     return {
       replaceState: (url: any) => {
-        router.replace(url);
-        window.dispatchEvent(new Event("popstate"));
+        window?.location?.replace(url);
       },
     };
   };
@@ -91,16 +103,17 @@ export default function OIDCProvider({ children }: Props) {
 
   // We bypass authentication for pages that do not require auth.
   // E.g., when we just want to show installation steps for public.
-  if (path === "/install") return children;
+  // Or the instance setup wizard for first-time setup.
+  if (path === "/install" || path === "/setup") return children;
 
   return mounted && providerConfig ? (
     <OidcProvider
       configuration={providerConfig}
-      //withCustomHistory={withCustomHistory}
+      withCustomHistory={withCustomHistory}
       authenticatingComponent={FullScreenLoading}
       authenticatingErrorComponent={OIDCError}
       loadingComponent={FullScreenLoading}
-      callbackSuccessComponent={CallBackSuccess}
+      callbackSuccessComponent={FullScreenLoading}
       onEvent={onEvent}
       onSessionLost={() => void 0}
       //sessionLostComponent={SessionLost}
@@ -111,11 +124,3 @@ export default function OIDCProvider({ children }: Props) {
     <FullScreenLoading />
   );
 }
-
-const CallBackSuccess = () => {
-  const params = useSearchParams();
-  const errorParam = params.get("error");
-  const currentPath = usePathname();
-  useRedirect(currentPath, true, !errorParam);
-  return <FullScreenLoading />;
-};

src/components/Badge.tsx

@@ -8,6 +8,7 @@ interface Props extends React.HTMLAttributes<HTMLDivElement>, BadgeVariants {
   children: React.ReactNode;
   className?: string;
   useHover?: boolean;
+  disabled?: boolean;
 }
 
 const variants = cva("", {
@@ -31,6 +32,10 @@ const variants = cva("", {
       green: ["bg-green-950 border-green-500 border text-green-400"],
       netbird: ["bg-netbird-950 border-netbird-500 border text-netbird-500"],
     },
+    size: {
+      default: "text-[0.75rem] py-1.5 px-3",
+      xs: "text-[0.6rem] py-[0.3rem] px-2",
+    },
     hover: {
       none: [],
       blue: ["hover:bg-sky-200"],
@@ -41,7 +46,7 @@ const variants = cva("", {
       red: ["hover:bg-red-950/40"],
       gray: ["hover:bg-nb-gray-900"],
       grayer: ["hover:bg-nb-gray-900"],
-      "gray-ghost": ["hover:bg-nb-gray-900"],
+      "gray-ghost": ["hover:bg-nb-gray-800 cursor-pointer"],
       green: ["hover:bg-green-950/50"],
       netbird: ["hover:bg-netbird-950/50"],
     },
@@ -52,15 +57,18 @@ export default function Badge({
   children,
   className,
   variant = "blue",
+  size = "default",
   useHover = false,
+  disabled = false,
   ...props
 }: Readonly<Props>) {
   return (
     <div
       className={cn(
-        "relative z-10 cursor-inherit whitespace-nowrap rounded-md text-[12px] py-1.5 px-3 font-normal flex gap-1.5 items-center justify-center transition-all",
+        "relative z-10 cursor-inherit whitespace-nowrap rounded-md font-normal flex gap-1.5 items-center justify-center transition-all",
+        variants({ variant, hover: useHover ? variant : "none", size }),
+        disabled && "cursor-not-allowed opacity-50 select-none",
         className,
-        variants({ variant, hover: useHover ? variant : "none" }),
       )}
       {...props}
     >

src/components/Button.tsx

@@ -4,12 +4,13 @@ import { cva, VariantProps } from "class-variance-authority";
 import classNames from "classnames";
 import React, { forwardRef } from "react";
 
-type ButtonVariants = VariantProps<typeof buttonVariants>;
+export type ButtonVariants = VariantProps<typeof buttonVariants>;
 
 export interface ButtonProps
   extends React.ButtonHTMLAttributes<HTMLButtonElement>,
     ButtonVariants {
   disabled?: boolean;
+  stopPropagation?: boolean;
 }
 
 export const buttonVariants = cva(
@@ -17,7 +18,7 @@ export const buttonVariants = cva(
     "relative",
     "text-sm focus:z-10 focus:ring-2 font-medium  focus:outline-none whitespace-nowrap shadow-sm",
     "inline-flex gap-2 items-center justify-center transition-colors focus:ring-offset-1",
-    "disabled:opacity-20 disabled:cursor-not-allowed disabled:dark:text-nb-gray-300 dark:ring-offset-neutral-950/50",
+    "disabled:opacity-40 disabled:cursor-not-allowed disabled:dark:text-nb-gray-300 dark:ring-offset-neutral-950/50",
   ],
   {
     variants: {
@@ -27,13 +28,13 @@ export const buttonVariants = cva(
           "dark:focus:ring-zinc-800/50 dark:bg-nb-gray dark:text-gray-400 dark:border-gray-700/30 dark:hover:text-white dark:hover:bg-zinc-800/50",
         ],
         primary: [
-          "dark:focus:ring-netbird-600/50 dark:ring-offset-neutral-950/50 enabled:dark:bg-netbird disabled:dark:bg-nb-gray-920 dark:text-gray-100 enabled:dark:hover:text-white enabled:dark:hover:bg-netbird-500/80",
+          "dark:focus:ring-netbird-600/50 dark:ring-offset-neutral-950/50 enabled:dark:bg-netbird disabled:dark:bg-nb-gray-910 dark:text-gray-100 enabled:dark:hover:text-white enabled:dark:hover:bg-netbird-500/80",
           "enabled:bg-netbird enabled:text-white enabled:focus:ring-netbird-400/50 enabled:hover:bg-netbird-500",
         ],
         secondary: [
           "bg-white hover:text-black focus:ring-zinc-200/50 hover:bg-gray-100 border-gray-200 text-gray-900",
           "dark:ring-offset-neutral-950/50 dark:focus:ring-neutral-500/20  ",
-          "dark:bg-nb-gray-900/30 dark:text-gray-400 dark:border-gray-700/40 dark:hover:text-white dark:hover:bg-zinc-800/50",
+          "dark:bg-nb-gray-920 dark:text-gray-400 dark:border-gray-700/40 dark:hover:text-white dark:hover:bg-nb-gray-910",
         ],
         secondaryLighter: [
           "bg-white hover:text-black focus:ring-zinc-200/50 hover:bg-gray-100 border-gray-200 text-gray-900",
@@ -45,6 +46,11 @@ export const buttonVariants = cva(
           "dark:ring-offset-neutral-950/50 dark:focus:ring-neutral-500/20  ",
           "dark:bg-nb-gray-900  dark:text-gray-400  dark:border-nb-gray-700 dark:hover:bg-nb-gray-900/80",
         ],
+        dropdown: [
+          "bg-white hover:text-black focus:ring-zinc-200/50 hover:bg-gray-100 border-neutral-200 text-gray-900",
+          "dark:ring-offset-neutral-950/50 dark:focus:ring-neutral-500/20  ",
+          "dark:bg-nb-gray-900/40 dark:text-gray-400 dark:border-nb-gray-900 dark:hover:bg-nb-gray-900/50",
+        ],
         dotted: [
           "bg-white hover:text-black focus:ring-zinc-200/50 hover:bg-gray-100 border-gray-200 text-gray-900 border-dashed",
           "dark:ring-offset-neutral-950/50 dark:focus:ring-neutral-500/20  ",
@@ -68,8 +74,8 @@ export const buttonVariants = cva(
           "",
         ],
         "default-outline": [
-          "dark:ring-offset-neutral-950/50 dark:focus:ring-neutral-500/20",
-          "dark:bg-transparent dark:text-nb-gray-400 dark:border-transparent dark:hover:text-white dark:hover:bg-zinc-800/50 dark:hover:border-nb-gray-800/50",
+          "dark:ring-offset-nb-gray-950/50 dark:focus:ring-nb-gray-500/20",
+          "dark:bg-transparent dark:text-nb-gray-400 dark:border-transparent dark:hover:text-white dark:hover:bg-nb-gray-900/30 dark:hover:border-nb-gray-800/50",
         ],
         danger: [
           "", // TODO - add danger button styles for light mode
@@ -103,6 +109,7 @@ const Button = forwardRef(
       rounded = true,
       border = 1,
       size = "md",
+      stopPropagation = true,
       ...props
     }: ButtonProps,
     ref: React.ForwardedRef<HTMLButtonElement>,
@@ -122,7 +129,7 @@ const Button = forwardRef(
           props.className,
         )}
         onClick={(e) => {
-          e.stopPropagation();
+          stopPropagation && e.stopPropagation();
           props.onClick && props.onClick(e);
         }}
       >

src/components/ButtonGroup.tsx

@@ -34,7 +34,7 @@ const ButtonGroupButton = forwardRef(
         border={2}
         rounded={false}
         className={cn(
-          "first:border-l-0 last:border-r-0 border-t-0 border-b-0 h-[41px]",
+          "first:border-l-0 last:border-r-0 border-t-0 border-b-0 h-[40px]",
           "!py-2.5 !px-4",
           className,
         )}

src/components/Callout.tsx

@@ -0,0 +1,39 @@
+import { cn } from "@utils/helpers";
+import { cva, VariantProps } from "class-variance-authority";
+import { InfoIcon } from "lucide-react";
+import * as React from "react";
+
+type CalloutVariants = VariantProps<typeof calloutVariants>;
+
+type Props = {
+  icon?: React.ReactNode;
+  children?: React.ReactNode;
+  className?: string;
+} & CalloutVariants;
+
+export const calloutVariants = cva(
+  ["px-4 py-3.5 rounded-md border text-sm font-normal flex gap-3 font-light"],
+  {
+    variants: {
+      variant: {
+        default: "bg-nb-gray-900/60 border-nb-gray-800/80 text-nb-gray-300",
+        warning: "bg-netbird-500/10 border-netbird-400/20 text-netbird-150",
+        info: "bg-sky-400/10 border-sky-400/20 text-sky-100",
+      },
+    },
+  },
+);
+
+export const Callout = ({
+  children,
+  icon = <InfoIcon size={14} className={"shrink-0 relative top-[3px]"} />,
+  className,
+  variant = "default",
+}: Props) => {
+  return (
+    <div className={cn(calloutVariants({ variant }), className)}>
+      {icon}
+      <div>{children}</div>
+    </div>
+  );
+};

src/components/Card.tsx

@@ -29,6 +29,7 @@ function CardList({ children }: Props) {
 type CardListItemProps = {
   label: React.ReactNode;
   value: React.ReactNode;
+  valueToCopy?: string;
   className?: string;
   copy?: boolean;
   copyText?: string;
@@ -39,6 +40,7 @@ type CardListItemProps = {
 function CardListItem({
   label,
   value,
+  valueToCopy,
   className,
   copy = false,
   copyText,
@@ -57,6 +59,7 @@ function CardListItem({
         <CardTextItem
           label={label}
           value={value}
+          valueToCopy={valueToCopy}
           copy={copy}
           copyText={copyText}
           tooltip={tooltip}
@@ -79,6 +82,7 @@ function CardListItem({
 type CardTextItemProps = {
   label: React.ReactNode;
   value: React.ReactNode;
+  valueToCopy?: string;
   copy?: boolean;
   copyText?: string;
   tooltip?: boolean;
@@ -88,10 +92,11 @@ const CardTextItem = ({
   label,
   value,
   copy = false,
+  valueToCopy,
   copyText,
   tooltip = true,
 }: CardTextItemProps) => {
-  const [, copyToClipBoard] = useCopyToClipboard(value as string);
+  const [, copyToClipBoard] = useCopyToClipboard(valueToCopy ?? `${value}`);
   return (
     <div
       className={cn(

src/components/Command.tsx

@@ -117,7 +117,7 @@ const CommandItem = React.forwardRef<
     ref={ref}
     className={cn(
       "text-xs flex justify-between py-2 px-3 cursor-pointer items-center rounded-md",
-      "bg-transparent dark:aria-selected:bg-nb-gray-800/20",
+      "bg-transparent dark:aria-selected:bg-nb-gray-910 group/command-item",
       className,
     )}
     {...props}

src/components/DatePickerWithRange.tsx

@@ -2,9 +2,11 @@
 
 import Button from "@components/Button";
 import { Popover, PopoverContent, PopoverTrigger } from "@components/Popover";
+import { AbsoluteDateTimeInput } from "@components/ui/AbsoluteDateTimeInput";
 import { Calendar } from "@components/ui/Calendar";
 import { cn } from "@utils/helpers";
 import dayjs from "dayjs";
+import { debounce } from "lodash";
 import { Calendar as CalendarIcon } from "lucide-react";
 import React, { useMemo, useState } from "react";
 import { DateRange } from "react-day-picker";
@@ -28,6 +30,14 @@ const defaultRanges = {
     from: dayjs().subtract(14, "day").startOf("day").toDate(),
     to: dayjs().endOf("day").toDate(),
   },
+  last2Days: {
+    from: dayjs().subtract(2, "day").startOf("day").toDate(),
+    to: dayjs().endOf("day").toDate(),
+  },
+  last7Days: {
+    from: dayjs().subtract(7, "day").startOf("day").toDate(),
+    to: dayjs().endOf("day").toDate(),
+  },
   lastMonth: {
     from: dayjs().subtract(1, "month").startOf("day").toDate(),
     to: dayjs().endOf("day").toDate(),
@@ -47,12 +57,18 @@ const isEqualDateRange = (a: DateRange | undefined, b: DateRange) => {
   return aFromDay === bFromDay && aToDay === bToDay;
 };
 
-export function DatePickerWithRange({ className, value, onChange }: Props) {
+export function DatePickerWithRange({
+  className,
+  value,
+  onChange,
+}: Readonly<Props>) {
   const isActive = useMemo(() => {
     return {
       today: isEqualDateRange(value, defaultRanges.today),
       yesterday: isEqualDateRange(value, defaultRanges.yesterday),
       last14Days: isEqualDateRange(value, defaultRanges.last14Days),
+      last2Days: isEqualDateRange(value, defaultRanges.last2Days),
+      last7Days: isEqualDateRange(value, defaultRanges.last7Days),
       lastMonth: isEqualDateRange(value, defaultRanges.lastMonth),
       allTime: isEqualDateRange(value, defaultRanges.allTime),
     };
@@ -64,6 +80,8 @@ export function DatePickerWithRange({ className, value, onChange }: Props) {
     if (isActive.allTime) return "All Time";
     if (isActive.lastMonth) return "Last Month";
     if (isActive.last14Days) return "Last 14 Days";
+    if (isActive.last2Days) return "Last 2 Days";
+    if (isActive.last7Days) return "Last 7 Days";
     if (isActive.yesterday) return "Yesterday";
     if (isActive.today) return "Today";
 
@@ -76,10 +94,25 @@ export function DatePickerWithRange({ className, value, onChange }: Props) {
   const [calendarOpen, setCalendarOpen] = useState(false);
 
   const updateRangeAndClose = (range: DateRange) => {
-    setCalendarOpen(false);
     onChange?.(range);
   };
 
+  const debouncedOnChange = useMemo(() => {
+    return onChange ? debounce(onChange, 500) : undefined;
+  }, [onChange]);
+
+  const handleOnSelect = (range?: DateRange) => {
+    let from = range?.from
+      ? dayjs(range.from).startOf("day").toDate()
+      : undefined;
+    let to = range?.to ? dayjs(range.to).endOf("day").toDate() : undefined;
+    if (!from && !to) {
+      onChange?.(undefined);
+      return;
+    }
+    onChange?.({ from, to });
+  };
+
   return (
     <div className={cn("grid gap-2", className)}>
       <Popover open={calendarOpen} onOpenChange={setCalendarOpen}>
@@ -93,10 +126,16 @@ export function DatePickerWithRange({ className, value, onChange }: Props) {
             {displayDateValue}
           </Button>
         </PopoverTrigger>
-        <PopoverContent className="w-auto p-0" align="start" sideOffset={10}>
+        <PopoverContent
+          className="w-auto p-0"
+          align="start"
+          side={"right"}
+          sideOffset={10}
+          alignOffset={-100}
+        >
           <div
             className={
-              "px-4 py-3 flex flex-wrap gap-2 max-w-[280px] sm:max-w-none border-b border-nb-gray-800 items-center justify-between w-full"
+              "px-3 py-2 flex flex-wrap gap-2 max-w-[280px] sm:max-w-none border-b border-nb-gray-800 items-center justify-between w-full"
             }
           >
             <div>
@@ -139,23 +178,10 @@ export function DatePickerWithRange({ className, value, onChange }: Props) {
             mode="range"
             defaultMonth={value?.from}
             selected={value}
-            onSelect={(range) => {
-              let from =
-                range && range.from
-                  ? dayjs(range.from).startOf("day").toDate()
-                  : undefined;
-              let to =
-                range && range.to
-                  ? dayjs(range.to).endOf("day").toDate()
-                  : undefined;
-              if (!from && !to) {
-                onChange?.(undefined);
-                return;
-              }
-              onChange?.({ from, to });
-            }}
+            onSelect={handleOnSelect}
             numberOfMonths={2}
           />
+          <AbsoluteDateTimeInput value={value} onChange={debouncedOnChange} />
         </PopoverContent>
       </Popover>
     </div>
@@ -168,7 +194,11 @@ type CalendarButtonProps = {
   active?: boolean;
 };
 
-function CalendarButton({ label, onClick, active }: CalendarButtonProps) {
+function CalendarButton({
+  label,
+  onClick,
+  active,
+}: Readonly<CalendarButtonProps>) {
   return (
     <button
       className={cn(

src/components/DropdownInput.tsx

@@ -8,10 +8,22 @@ type Props = {
   value: string;
   onChange: (value: string) => void;
   placeholder?: string;
-};
+  hideEnterIcon?: boolean;
+  className?: string;
+} & React.InputHTMLAttributes<HTMLInputElement>;
 
 export const DropdownInput = forwardRef<HTMLInputElement, Props>(
-  ({ value, onChange, placeholder = "Search..." }, ref) => {
+  (
+    {
+      value,
+      onChange,
+      placeholder = "Search...",
+      className,
+      hideEnterIcon = false,
+      ...props
+    },
+    ref,
+  ) => {
     return (
       <div className={"relative w-full"}>
         <input
@@ -21,25 +33,31 @@ export const DropdownInput = forwardRef<HTMLInputElement, Props>(
             "border-b-0 border-t-0 border-r-0 border-l-0 border-neutral-200 dark:border-nb-gray-700 items-center",
             "bg-transparent text-sm outline-none focus-visible:outline-none ring-0 focus-visible:ring-0",
             "dark:placeholder:text-nb-gray-400 font-light placeholder:text-neutral-500 pl-10",
+            className,
           )}
           value={value}
           onChange={(e) => onChange(e.target.value)}
           placeholder={placeholder}
+          {...props}
         />
         <div className={"absolute left-0 top-0 h-full flex items-center pl-4"}>
           <div className={"flex items-center"}>
             <SearchIcon size={14} />
           </div>
         </div>
-        <div className={"absolute right-0 top-0 h-full flex items-center pr-4"}>
+        {!hideEnterIcon && (
           <div
-            className={
-              "flex items-center bg-nb-gray-800 py-1 px-1.5 rounded-[4px] border border-nb-gray-500"
-            }
+            className={"absolute right-0 top-0 h-full flex items-center pr-4"}
           >
-            <IconArrowBack size={10} />
+            <div
+              className={
+                "flex items-center bg-nb-gray-800 py-1 px-1.5 rounded-[4px] border border-nb-gray-500"
+              }
+            >
+              <IconArrowBack size={10} />
+            </div>
           </div>
-        </div>
+        )}
       </div>
     );
   },

src/components/DropdownMenu.tsx

@@ -22,13 +22,16 @@ const DropdownMenuSubTrigger = React.forwardRef<
   React.ElementRef<typeof DropdownMenuPrimitive.SubTrigger>,
   React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.SubTrigger> & {
     inset?: boolean;
+    variant?: "default" | "danger";
   }
->(({ className, inset, children, ...props }, ref) => (
+>(({ className, inset, children, variant = "default", ...props }, ref) => (
   <DropdownMenuPrimitive.SubTrigger
     ref={ref}
     className={cn(
-      "flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-gray-100 data-[state=open]:bg-gray-100 dark:focus:bg-gray-800 dark:data-[state=open]:bg-gray-800",
+      "relative flex select-none items-center rounded-md pr-2 pl-3 py-1.5 text-sm outline-none",
+      "transition-colors focus:bg-gray-100 focus:text-gray-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50  cursor-pointer ",
       inset && "pl-8",
+      menuItemVariants({ variant }),
       className,
     )}
     {...props}
@@ -47,7 +50,7 @@ const DropdownMenuSubContent = React.forwardRef<
   <DropdownMenuPrimitive.SubContent
     ref={ref}
     className={cn(
-      "z-50 min-w-[8rem] overflow-hidden rounded-md border border-gray-200 bg-white p-1 text-gray-950 shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-gray-800 dark:bg-gray-950 dark:text-gray-50",
+      "z-50 min-w-[8rem] overflow-hidden rounded-md border border-gray-200 bg-white p-1 text-gray-950 shadow-lg data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-nb-gray-900 dark:bg-nb-gray-940 dark:text-gray-50",
       className,
     )}
     {...props}
@@ -78,7 +81,7 @@ const menuItemVariants = cva("", {
   variants: {
     variant: {
       default:
-        "dark:focus:bg-nb-gray-900 dark:focus:text-gray-50 dark:text-gray-400",
+        "dark:focus:bg-nb-gray-900 dark:focus:text-gray-50 dark:text-nb-gray-300 dark:data-[state=open]:bg-nb-gray-900 dark:data-[state=open]:text-gray-50",
       danger:
         "dark:focus:bg-red-900/20 dark:focus:text-red-500 dark:text-red-500",
     },
@@ -181,7 +184,7 @@ const DropdownMenuSeparator = React.forwardRef<
 >(({ className, ...props }, ref) => (
   <DropdownMenuPrimitive.Separator
     ref={ref}
-    className={cn("-mx-1 my-1 h-px bg-gray-100 dark:bg-gray-800", className)}
+    className={cn("-mx-1 my-1 h-px bg-gray-100 dark:bg-nb-gray-910", className)}
     {...props}
   />
 ));

src/components/FullTooltip.tsx

@@ -3,6 +3,7 @@ import {
   TooltipContent,
   TooltipProvider,
   TooltipTrigger,
+  TooltipVariants,
 } from "@components/Tooltip";
 import { TooltipProps } from "@radix-ui/react-tooltip";
 import { cn } from "@utils/helpers";
@@ -24,7 +25,11 @@ type Props = {
   customOnOpenChange?: React.Dispatch<React.SetStateAction<boolean>>;
   delayDuration?: number;
   skipDelayDuration?: number;
-} & TooltipProps;
+  alignOffset?: number;
+  sideOffset?: number;
+} & TooltipProps &
+  TooltipVariants;
+
 export default function FullTooltip({
   children,
   content,
@@ -41,6 +46,9 @@ export default function FullTooltip({
   customOnOpenChange,
   delayDuration = 1,
   skipDelayDuration = 300,
+  variant = "default",
+  alignOffset = 20,
+  sideOffset,
 }: Props) {
   const [open, setOpen] = useState(!!keepOpen);
 
@@ -66,7 +74,7 @@ export default function FullTooltip({
               <div
                 className={cn(
                   isAction ? "cursor-pointer" : "cursor-default",
-                  "inline-flex  items-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md",
+                  "inline-flex items-center gap-2 dark:text-neutral-300 text-neutral-500 hover:text-neutral-100 transition-all hover:bg-nb-gray-800/60 py-2 px-3 rounded-md",
                   className,
                 )}
               >
@@ -79,9 +87,11 @@ export default function FullTooltip({
         )}
         {!disabled && (
           <TooltipContent
-            alignOffset={20}
+            alignOffset={alignOffset}
+            sideOffset={sideOffset}
             forceMount={true}
             className={contentClassName}
+            variant={variant}
             align={align}
             side={side}
           >

src/components/HoverCard.tsx

@@ -0,0 +1,43 @@
+"use client";
+
+import * as HoverCardPrimitive from "@radix-ui/react-hover-card";
+import { cn } from "@utils/helpers";
+import * as React from "react";
+import { TooltipVariants, tooltipVariants } from "./Tooltip";
+
+const HoverCard = HoverCardPrimitive.Root;
+
+const HoverCardTrigger = HoverCardPrimitive.Trigger;
+
+const HoverCardContent = React.forwardRef<
+  React.ElementRef<typeof HoverCardPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof HoverCardPrimitive.Content> &
+    TooltipVariants
+>(
+  (
+    {
+      className = "px-4 py-2.5",
+      sideOffset = 7,
+      side = "top",
+      variant = "default",
+      ...props
+    },
+    ref,
+  ) => (
+    <HoverCardPrimitive.Portal>
+      <HoverCardPrimitive.Content
+        ref={ref}
+        asChild={true}
+        side={side}
+        sideOffset={sideOffset}
+        className={cn(tooltipVariants({ variant }), className)}
+        {...props}
+      >
+        <div>{props.children}</div>
+      </HoverCardPrimitive.Content>
+    </HoverCardPrimitive.Portal>
+  ),
+);
+HoverCardContent.displayName = HoverCardPrimitive.Content.displayName;
+
+export { HoverCard, HoverCardContent, HoverCardTrigger };

src/components/InlineLink.tsx

@@ -11,26 +11,47 @@ interface Props extends LinkProps, InlineLinkProps {
   target?: "_blank" | "_self" | "_parent" | "_top";
 }
 
-const linkVariants = cva("", {
-  variants: {
-    variant: {
-      default: "text-netbird hover:underline font-normal",
-      faded: "text-nb-gray-400 hover:text-nb-gray-300 hover:underline",
+interface InlineButtonProps
+  extends React.ButtonHTMLAttributes<HTMLButtonElement>,
+    InlineLinkProps {
+  children: React.ReactNode;
+  className?: string;
+  target?: "_blank" | "_self" | "_parent" | "_top";
+}
+
+export const linkVariants = cva(
+  "underline-offset-4 items-center transition-all duration-200 inline-flex texts-inherit gap-1",
+  {
+    variants: {
+      variant: {
+        default: "text-netbird hover:underline font-normal",
+        faded: "text-nb-gray-400 hover:text-nb-gray-300 hover:underline",
+        white: "text-nb-gray-100 hover:text-white hover:underline",
+        dashed:
+          "text-nb-gray-100/90 underline font-normal decoration-dashed hover:text-white",
+      },
     },
   },
-});
+);
 
 export default function InlineLink({ variant = "default", ...props }: Props) {
   return (
-    <Link
-      {...props}
-      className={cn(
-        "underline-offset-4 texts-inherit gap-1 items-center transition-all duration-200 inline-flex",
-        props.className,
-        linkVariants({ variant }),
-      )}
-    >
+    <Link {...props} className={cn(props.className, linkVariants({ variant }))}>
       {props.children}
     </Link>
   );
 }
+
+export function InlineButtonLink({
+  variant = "default",
+  ...props
+}: InlineButtonProps) {
+  return (
+    <button
+      {...props}
+      className={cn(props.className, linkVariants({ variant }))}
+    >
+      {props.children}
+    </button>
+  );
+}

src/components/Input.tsx

@@ -2,8 +2,9 @@ import FullTooltip from "@components/FullTooltip";
 import Paragraph from "@components/Paragraph";
 import { cn } from "@utils/helpers";
 import { cva, VariantProps } from "class-variance-authority";
-import { AlertCircle } from "lucide-react";
+import { AlertCircle, Eye, EyeOff } from "lucide-react";
 import * as React from "react";
+import { useState } from "react";
 
 type InputVariants = VariantProps<typeof inputVariants>;
 
@@ -18,6 +19,7 @@ export interface InputProps
   errorTooltip?: boolean;
   errorTooltipPosition?: "top" | "top-right";
   prefixClassName?: string;
+  showPasswordToggle?: boolean;
 }
 
 const inputVariants = cva("", {
@@ -61,10 +63,29 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
       errorTooltipPosition = "top",
       variant = "default",
       prefixClassName,
+      showPasswordToggle = false,
       ...props
     },
     ref,
   ) => {
+    const [showPassword, setShowPassword] = useState(false);
+    const isPasswordType = type === "password";
+    const inputType = isPasswordType && showPassword ? "text" : type;
+
+    const passwordToggle =
+      isPasswordType && showPasswordToggle ? (
+        <button
+          type="button"
+          onClick={() => setShowPassword(!showPassword)}
+          className={"hover:text-white transition-all"}
+          aria-label={"Toggle password visibility"}
+        >
+          {showPassword ? <EyeOff size={18} /> : <Eye size={18} />}
+        </button>
+      ) : null;
+
+    const suffix = passwordToggle || customSuffix;
+
     return (
       <>
         <div className={cn("flex relative h-[42px]", maxWidthClass)}>
@@ -76,7 +97,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
                 }),
                 "flex h-[42px] w-auto rounded-l-md bg-white px-3 py-2 text-sm ",
                 "border  items-center whitespace-nowrap",
-                props.disabled && "opacity-20",
+                props.disabled && "opacity-40",
                 prefixClassName,
               )}
             >
@@ -87,23 +108,23 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
           <div
             className={cn(
               "absolute left-0 top-0 h-full flex items-center text-xs dark:text-nb-gray-300 pl-3 leading-[0]",
-              props.disabled && "opacity-30",
+              props.disabled && "opacity-40",
             )}
           >
             {icon}
           </div>
 
           <input
-            type={type}
+            type={inputType}
             ref={ref}
             {...props}
             className={cn(
               inputVariants({ variant: error ? "error" : variant }),
-              "flex h-[42px] w-full rounded-md  bg-white px-3 py-2 text-sm file:bg-transparent file:text-sm file:font-medium  focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-20  ",
+              "flex h-[42px] w-full rounded-md  bg-white px-3 py-2 text-sm file:bg-transparent file:text-sm file:font-medium  focus-visible:outline-none disabled:cursor-not-allowed disabled:opacity-40  ",
               "file:border-0",
               "focus-visible:ring-2 focus-visible:ring-offset-2",
               customPrefix && "!border-l-0 !rounded-l-none",
-              customSuffix && "!pr-16",
+              suffix && "!pr-16",
               icon && "!pl-10",
               "border",
               className,
@@ -116,7 +137,7 @@ const Input = React.forwardRef<HTMLInputElement, InputProps>(
               props.disabled && "opacity-30",
             )}
           >
-            {customSuffix}
+            {suffix}
           </div>
           {error && errorTooltip && (
             <div

src/components/Kbd.tsx

@@ -12,6 +12,7 @@ const variants = cva("", {
   variants: {
     variant: {
       default: ["bg-nb-gray-800 border-nb-gray-700 text-nb-gray-300 "],
+      darker: ["bg-nb-gray-930 border-nb-gray-900 text-nb-gray-250 "],
       netbird: ["bg-netbird-100 text-netbird border-netbird "],
     },
     size: {
@@ -30,7 +31,7 @@ export default function Kbd({
   size = "default",
   disabled = false,
   className,
-}: Props) {
+}: Readonly<Props>) {
   return (
     <div
       className={cn(

src/components/Label.tsx

@@ -6,7 +6,7 @@ import { cva, type VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 const labelVariants = cva(
-  "text-sm font-medium tracking-wider leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 mb-1 inline-block dark:text-nb-gray-200 flex items-center gap-2",
+  "text-sm font-medium tracking-wider leading-none peer-disabled:cursor-not-allowed peer-disabled:opacity-70 mb-1.5 inline-block dark:text-nb-gray-200 flex items-center gap-2",
 );
 
 const Label = React.forwardRef<

src/components/ListItem.tsx

@@ -0,0 +1,29 @@
+import * as React from "react";
+import { cn } from "@utils/helpers";
+
+export const ListItem = ({
+  icon,
+  label,
+  value,
+  className,
+}: {
+  icon?: React.ReactNode;
+  label: string;
+  value: string | React.ReactNode;
+  className?: string;
+}) => {
+  return (
+    <div
+      className={cn(
+        "flex justify-between gap-12 border-b border-nb-gray-920 py-2 px-4 last:border-b-0",
+        className,
+      )}
+    >
+      <div className={"flex items-center gap-2 text-nb-gray-100 font-medium"}>
+        {icon}
+        {label}
+      </div>
+      <div className={"text-nb-gray-300"}>{value}</div>
+    </div>
+  );
+};

src/components/NetBirdLogo.tsx

@@ -0,0 +1,42 @@
+import { cn } from "@utils/helpers";
+import Image from "next/image";
+import * as React from "react";
+import NetBirdLogoMark from "@/assets/netbird.svg";
+import NetBirdLogoFull from "@/assets/netbird-full.svg";
+
+type Props = {
+  size?: "default" | "large";
+  mobile?: boolean;
+};
+
+const sizes = {
+  default: {
+    desktop: 22,
+    mobile: 30,
+  },
+  large: {
+    desktop: 24,
+    mobile: 40,
+  },
+};
+
+export const NetBirdLogo = ({ size = "default", mobile = true }: Props) => {
+  return (
+    <>
+      <Image
+        src={NetBirdLogoFull}
+        height={sizes[size].desktop}
+        alt={"NetBird Logo"}
+        className={cn(mobile && "hidden md:block")}
+      />
+      {mobile && (
+        <Image
+          src={NetBirdLogoMark}
+          width={sizes[size].mobile}
+          alt={"NetBird Logo"}
+          className={cn(mobile && "md:hidden ml-4")}
+        />
+      )}
+    </>
+  );
+};

src/components/NoPeersGettingStarted.tsx

@@ -0,0 +1,44 @@
+import InlineLink from "@components/InlineLink";
+import SquareIcon from "@components/SquareIcon";
+import AddPeerButton from "@components/ui/AddPeerButton";
+import GetStartedTest from "@components/ui/GetStartedTest";
+import { ExternalLinkIcon } from "lucide-react";
+import * as React from "react";
+import PeerIcon from "@/assets/icons/PeerIcon";
+
+type Props = {
+  showBackground?: boolean;
+};
+
+export const NoPeersGettingStarted = ({ showBackground = true }) => {
+  return (
+    <GetStartedTest
+      showBackground={showBackground}
+      icon={
+        <SquareIcon
+          icon={<PeerIcon className={"fill-nb-gray-200"} size={20} />}
+          color={"gray"}
+          size={"large"}
+        />
+      }
+      title={"Get Started with NetBird"}
+      description={
+        "It looks like you don't have any connected machines.\n" +
+        "Get started by adding one to your network."
+      }
+      button={<AddPeerButton />}
+      learnMore={
+        <>
+          Learn more in our{" "}
+          <InlineLink
+            href={"https://docs.netbird.io/how-to/getting-started"}
+            target={"_blank"}
+          >
+            Getting Started Guide
+            <ExternalLinkIcon size={12} />
+          </InlineLink>
+        </>
+      }
+    />
+  );
+};

src/components/Notification.tsx

@@ -12,12 +12,15 @@ export interface NotifyProps<T> {
   title: string;
   description: string;
   promise?: Promise<T | ErrorResponse>;
+  loadingTitle?: string;
   loadingMessage?: string;
   duration?: number;
   icon?: React.ReactNode;
   backgroundColor?: string;
   preventSuccessToast?: boolean;
+  errorMessages?: ErrorResponse[];
 }
+
 interface NotificationProps<T> extends NotifyProps<T> {
   t: Toast;
 }
@@ -28,9 +31,11 @@ export default function Notification<T>({
   backgroundColor,
   t,
   promise,
+  loadingTitle,
   loadingMessage,
   duration = 3500,
   preventSuccessToast = false,
+  errorMessages,
 }: NotificationProps<T>) {
   const [error, setError] = useState("");
   const [loading, setLoading] = useState(!!promise);
@@ -51,15 +56,27 @@ export default function Notification<T>({
     if (promise) {
       promise
         .then(() => {
-          if (preventSuccessToast) setPreventSuccess(true);
           setLoading(false);
           closeToast();
+          if (preventSuccessToast) setPreventSuccess(true);
         })
         .catch((e) => {
           const err = e as ErrorResponse;
-          const message = err.message || "Something went wrong...";
+          let message = err.message || "Something went wrong...";
+          message = message.charAt(0).toUpperCase() + message.slice(1);
           const code: number = err.code || 418;
-          setError(`Code ${code}: ${message}`);
+
+          if (errorMessages) {
+            const errorMessage = errorMessages.find(
+              (error) => error.code === code,
+            );
+            if (errorMessage) {
+              setError(errorMessage.message);
+            }
+          } else {
+            setError(`Code ${code}: ${message}`);
+          }
+
           setLoading(false);
           closeToast();
         });
@@ -101,7 +118,9 @@ export default function Notification<T>({
             </div>
             <div className={"flex flex-col text-sm"}>
               <p>
-                <span className={"font-semibold"}>{title}</span>
+                <span className={"font-semibold"}>
+                  {loading ? loadingTitle || title : title}
+                </span>
               </p>
               <p
                 className={"text-xs dark:text-nb-gray-300 text-gray-600 mt-0.5"}

src/components/PeerGroupSelector.tsx

@@ -41,6 +41,15 @@ import type { Group, GroupPeer, GroupResource } from "@/interfaces/Group";
 import { NetworkResource } from "@/interfaces/Network";
 import type { Peer } from "@/interfaces/Peer";
 import { PolicyRuleResource } from "@/interfaces/Policy";
+import { User } from "@/interfaces/User";
+import { HorizontalUsersStack } from "@/modules/users/HorizontalUsersStack";
+import { PeerOperatingSystemIcon } from "@/modules/peers/PeerOperatingSystemIcon";
+
+const groupsSearchPredicate = (item: Group, query: string) => {
+  const lowerCaseQuery = query.toLowerCase();
+  if (item.name.toLowerCase().includes(lowerCaseQuery)) return true;
+  return item?.id?.toLowerCase().includes(lowerCaseQuery) ?? false;
+};
 
 interface MultiSelectProps {
   values: Group[];
@@ -58,9 +67,15 @@ interface MultiSelectProps {
   dataCy?: string;
   showResourceCounter?: boolean;
   showResources?: boolean;
+  showPeers?: boolean;
   resource?: PolicyRuleResource;
   onResourceChange?: (resource?: PolicyRuleResource) => void;
   placeholder?: string;
+  customTrigger?: React.ReactNode;
+  align?: "start" | "end";
+  side?: "top" | "bottom";
+  users?: User[];
+  placeholderForSearch?: string;
 }
 export function PeerGroupSelector({
   onChange,
@@ -78,17 +93,44 @@ export function PeerGroupSelector({
   dataCy = "group-selector-dropdown",
   showResourceCounter = true,
   showResources = false,
+  showPeers = false,
   resource,
   onResourceChange,
   placeholder = "Add or select group(s)...",
+  customTrigger,
+  align = "start",
+  side = "bottom",
+  users,
+  placeholderForSearch = 'Search groups or add new group by pressing "Enter"...',
 }: Readonly<MultiSelectProps>) {
+  const { data: resources, isLoading: isResourcesLoading } = useFetchApi<
+    NetworkResource[]
+  >("/networks/resources");
+
+  const { data: peers, isLoading: isPeersLoading } =
+    useFetchApi<Peer[]>("/peers");
+
   const { groups, dropdownOptions, setDropdownOptions, addDropdownOptions } =
     useGroups();
+
   const searchRef = React.useRef<HTMLInputElement>(null);
-  const [inputRef, { width }] = useElementSize<HTMLButtonElement>();
-  const [search, setSearch] = useState("");
-  const { data: resources, isLoading } = useFetchApi<NetworkResource[]>(
-    "/networks/resources",
+
+  const [inputRef, { width }] = useElementSize<
+    HTMLButtonElement | HTMLSpanElement
+  >();
+
+  const [open, setOpen] = useState(false);
+
+  const sortedDropdownOptions = useSortedDropdownOptions(
+    dropdownOptions,
+    values,
+    open,
+  );
+
+  const [filteredGroups, search, setSearch] = useSearch(
+    sortedDropdownOptions,
+    groupsSearchPredicate,
+    { filter: true, debounce: 150 },
   );
 
   // Update dropdown options when groups change
@@ -129,7 +171,15 @@ export function PeerGroupSelector({
     const groupResources: GroupResource[] | undefined =
       (group?.resources as GroupResource[]) || [];
 
-    if (peer) groupPeers?.push({ id: peer?.id as string, name: peer?.name });
+    if (peer) {
+      const peerInGroup = groupPeers?.find((p) => p?.id === peer?.id);
+      if (!peerInGroup) {
+        groupPeers?.push({
+          id: peer?.id as string,
+          name: peer?.name,
+        });
+      }
+    }
 
     if (!group && !option) {
       addDropdownOptions([
@@ -177,16 +227,6 @@ export function PeerGroupSelector({
     return isSearching && groupDoesNotExist && !isAllGroup;
   }, [search, dropdownOptions]);
 
-  const [open, setOpen] = useState(false);
-
-  const folderIcon = useMemo(() => {
-    return <FolderGit2 size={12} className={"shrink-0"} />;
-  }, []);
-
-  const peerIcon = useMemo(() => {
-    return <MonitorSmartphoneIcon size={14} className={"shrink-0"} />;
-  }, []);
-
   const [slice, setSlice] = useState(10);
 
   const [tab, setTab] = useState("groups");
@@ -207,12 +247,6 @@ export function PeerGroupSelector({
     onChange(union);
   };
 
-  const sortedDropdownOptions = useSortedDropdownOptions(
-    dropdownOptions,
-    values,
-    open,
-  );
-
   // Reset the search input when switching tabs
   useEffect(() => {
     setSearch("");
@@ -221,10 +255,12 @@ export function PeerGroupSelector({
     }, 0);
   }, [tab]);
 
-  const searchPlaceholder =
-    tab === "groups"
-      ? 'Search groups or add new group by pressing "Enter"...'
-      : "Search resource...";
+  const searchPlaceholder = useMemo(() => {
+    if (tab === "groups") return placeholderForSearch;
+    if (tab === "resources") return "Search resource...";
+    if (tab === "peers") return "Search peer...";
+    return "Search...";
+  }, [tab, placeholderForSearch]);
 
   const selectResource = (resource?: NetworkResource) => {
     onResourceChange?.(
@@ -238,6 +274,15 @@ export function PeerGroupSelector({
     onChange([]);
   };
 
+  const selectPeer = (peer?: Peer) => {
+    if (!peer?.id) return;
+    onResourceChange?.({
+      id: peer.id,
+      type: "peer",
+    });
+    onChange([]);
+  };
+
   return (
     <Popover
       open={open}
@@ -251,109 +296,109 @@ export function PeerGroupSelector({
       }}
     >
       <PopoverTrigger asChild>
-        <button
-          className={cn(
-            "min-h-[46px] w-full relative items-center group",
-            "border border-neutral-200 dark:border-nb-gray-700 justify-between py-2 px-3",
-            "rounded-md bg-white text-sm dark:bg-nb-gray-900/40 flex dark:text-neutral-400/70 text-neutral-500 cursor-pointer hover:dark:bg-nb-gray-900/50",
-            "disabled:pointer-events-none disabled:opacity-30 transition-all",
-          )}
-          disabled={disabled}
-          data-cy={dataCy}
-          ref={inputRef}
-        >
-          <div
-            className={
-              "flex items-center gap-2 border-nb-gray-700 flex-wrap h-full"
-            }
+        {customTrigger ? (
+          <div ref={inputRef} className={"w-full"}>
+            {customTrigger}
+          </div>
+        ) : (
+          <button
+            className={cn(
+              "min-h-[46px] w-full relative items-center group",
+              "border border-neutral-200 dark:border-nb-gray-700 justify-between py-2 px-3",
+              "rounded-md bg-white text-sm dark:bg-nb-gray-900/40 flex dark:text-neutral-400/70 text-neutral-500 cursor-pointer hover:dark:bg-nb-gray-900/50",
+              "disabled:pointer-events-none disabled:opacity-30 transition-all",
+            )}
+            disabled={disabled}
+            data-cy={dataCy}
+            ref={inputRef}
           >
-            {resource && showResources && (
-              <ResourceBadge
-                className={"py-[3px]"}
-                resource={resources?.find((r) => r.id === resource.id)}
-                onClick={(e) => {
-                  e.preventDefault();
-                  e.stopPropagation();
-                  selectResource();
-                }}
-                showX={true}
+            <div
+              className={
+                "flex items-center gap-2 border-nb-gray-700 flex-wrap h-full"
+              }
+            >
+              {resource && (
+                <ResourceBadge
+                  className={"py-[3px]"}
+                  resource={resources?.find((r) => r.id === resource.id)}
+                  peer={peers?.find((p) => p.id === resource.id)}
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    selectResource();
+                  }}
+                  showX={true}
+                />
+              )}
+              {values.map((group) => {
+                return (
+                  <div
+                    key={group.name}
+                    className={cn(
+                      showPeerCount
+                        ? "flex gap-x-1 gap-y-2 items-center justify-between w-full"
+                        : "",
+                    )}
+                  >
+                    {showPeerCount ? (
+                      <GroupBadgeWithEditPeers
+                        className={"py-[3px]"}
+                        group={group}
+                        key={group.name}
+                        showNewBadge={true}
+                        onPeerAssignmentChange={onPeerAssignmentChange}
+                        useSave={saveGroupAssignments}
+                      />
+                    ) : (
+                      <GroupBadge
+                        className={"py-[3px]"}
+                        group={group}
+                        key={group.name}
+                        showNewBadge={true}
+                        onClick={(e) => {
+                          e.preventDefault();
+                          e.stopPropagation();
+                          if (disableInlineRemoveGroup) return;
+                          if (peer != undefined && group.name == "All") return; // Prevent removing the "All" group
+                          toggleGroupByName(group.name);
+                        }}
+                        showX={
+                          peer != undefined
+                            ? group.name !== "All"
+                            : !disableInlineRemoveGroup
+                        }
+                      />
+                    )}
+                  </div>
+                );
+              })}
+
+              {values.length == 0 && !resource && (
+                <span className={"pl-1"}>{placeholder}</span>
+              )}
+            </div>
+
+            <div className={"pl-2"} data-cy={"group-selector-open-close"}>
+              <ChevronsUpDown
+                size={18}
+                className={
+                  "shrink-0 group-hover:text-nb-gray-300 transition-all"
+                }
               />
-            )}
-            {values.map((group) => {
-              return (
-                <div
-                  key={group.name}
-                  className={cn(
-                    showPeerCount
-                      ? "flex gap-x-1 gap-y-2 items-center justify-between w-full"
-                      : "",
-                  )}
-                >
-                  {showPeerCount ? (
-                    <GroupBadgeWithEditPeers
-                      className={"py-[3px]"}
-                      group={group}
-                      key={group.name}
-                      showNewBadge={true}
-                      onPeerAssignmentChange={onPeerAssignmentChange}
-                      useSave={saveGroupAssignments}
-                    />
-                  ) : (
-                    <GroupBadge
-                      className={"py-[3px]"}
-                      group={group}
-                      key={group.name}
-                      showNewBadge={true}
-                      onClick={(e) => {
-                        e.preventDefault();
-                        e.stopPropagation();
-                        if (disableInlineRemoveGroup) return;
-                        if (peer != undefined && group.name == "All") return; // Prevent removing the "All" group
-                        toggleGroupByName(group.name);
-                      }}
-                      showX={
-                        peer != undefined
-                          ? group.name !== "All"
-                          : !disableInlineRemoveGroup
-                      }
-                    />
-                  )}
-                </div>
-              );
-            })}
-
-            {values.length == 0 && !resource && (
-              <span className={"pl-1"}>{placeholder}</span>
-            )}
-          </div>
-
-          <div className={"pl-2"} data-cy={"group-selector-open-close"}>
-            <ChevronsUpDown
-              size={18}
-              className={"shrink-0 group-hover:text-nb-gray-300 transition-all"}
-            />
-          </div>
-        </button>
+            </div>
+          </button>
+        )}
       </PopoverTrigger>
       <PopoverContent
         className="w-full p-0 shadow-sm shadow-nb-gray-950"
         style={{
           width: popoverWidth === "auto" ? width : popoverWidth,
         }}
-        align="start"
-        side={"top"}
+        align={align}
+        side={side}
         sideOffset={10}
       >
-        <Command
-          className={"w-full flex"}
-          loop
-          filter={(value, search) => {
-            const formatValue = trim(value.toLowerCase());
-            const formatSearch = trim(search.toLowerCase());
-            if (formatValue.includes(formatSearch)) return 1;
-            return 0;
-          }}
-        >
+        <Command className={"w-full flex"} loop shouldFilter={false}>
           <CommandList className={"w-full"}>
             <div className={"relative"}>
               <CommandInput
@@ -394,13 +439,17 @@ export function PeerGroupSelector({
             </div>
 
             <Tabs defaultValue={"groups"} value={tab} onValueChange={setTab}>
-              {showResources && <TabTriggers searchRef={searchRef} />}
+              <TabTriggers
+                searchRef={searchRef}
+                showPeers={showPeers}
+                showResources={showResources}
+              />
               <TabsContent value={"groups"} className={"p-0 my-0"}>
                 <CommandGroup>
                   <ScrollArea
                     className={cn(
                       "max-h-[195px] flex flex-col gap-1 pl-2 py-2 pr-3",
-                      sortedDropdownOptions.length == 0 && !search && "py-0",
+                      filteredGroups.length == 0 && !search && "py-0",
                     )}
                   >
                     {searchedGroupNotFound && (
@@ -413,8 +462,8 @@ export function PeerGroupSelector({
                         value={search}
                         onClick={(e) => e.preventDefault()}
                       >
-                        <Badge variant={"gray-ghost"}>
-                          {folderIcon}
+                        <Badge variant={"gray-ghost"} className={"h-7"}>
+                          <FolderGit2 size={12} className={"shrink-0"} />
                           {search}
                         </Badge>
                         <div
@@ -428,7 +477,7 @@ export function PeerGroupSelector({
                       </CommandItem>
                     )}
 
-                    {sortedDropdownOptions.slice(0, slice).map((option) => {
+                    {filteredGroups.slice(0, slice).map((option) => {
                       const isSelected =
                         values.find((group) => group.name == option.name) !=
                         undefined;
@@ -470,10 +519,14 @@ export function PeerGroupSelector({
                             onClick={(e) => e.preventDefault()}
                           >
                             <div className={"flex items-center gap-2"}>
-                              <GroupBadge group={option} showNewBadge={true} />
+                              <GroupBadge
+                                group={option}
+                                showNewBadge={true}
+                                className={"h-7"}
+                              />
                             </div>
 
-                            <div className={"flex items-center gap-5"}>
+                            <div className={"flex items-center gap-4"}>
                               {option?.id && showRoutes && (
                                 <AccessControlGroupCount group_id={option.id} />
                               )}
@@ -482,13 +535,19 @@ export function PeerGroupSelector({
                                 <ResourcesCounter group={option} />
                               )}
 
-                              <div
-                                className={
-                                  "text-neutral-500 dark:text-nb-gray-300 font-medium flex items-center gap-2"
-                                }
-                              >
-                                {peerIcon}
-                                {peerCount} Peer(s)
+                              <div className={"flex gap-4 items-center"}>
+                                {!users ? (
+                                  <PeerCounter
+                                    group={option}
+                                    showResourceCounter={showResourceCounter}
+                                  />
+                                ) : (
+                                  <UsersCounter
+                                    group={option}
+                                    users={users}
+                                    selected={isSelected}
+                                  />
+                                )}
                                 <Checkbox checked={isSelected} />
                               </div>
                             </div>
@@ -504,12 +563,23 @@ export function PeerGroupSelector({
                   <ResourcesList
                     search={search}
                     resources={resources}
-                    isLoading={isLoading}
+                    isLoading={isResourcesLoading}
                     value={resource}
                     onChange={selectResource}
                   />
                 </TabsContent>
               )}
+              {showPeers && (
+                <TabsContent value={"peers"} className={"p-0 my-0"}>
+                  <PeersList
+                    search={search}
+                    peers={peers}
+                    isLoading={isPeersLoading}
+                    value={resource}
+                    onChange={selectPeer}
+                  />
+                </TabsContent>
+              )}
             </Tabs>
           </CommandList>
         </Command>
@@ -520,9 +590,15 @@ export function PeerGroupSelector({
 
 const TabTriggers = ({
   searchRef,
+  showResources = false,
+  showPeers = false,
 }: {
   searchRef: React.MutableRefObject<HTMLInputElement | null>;
+  showResources?: boolean;
+  showPeers?: boolean;
 }) => {
+  if (!showResources && !showPeers) return null;
+
   return (
     <TabsList justify={"start"} className={"px-3"}>
       <TabsTrigger
@@ -538,23 +614,102 @@ const TabTriggers = ({
         />
         Groups
       </TabsTrigger>
-      <TabsTrigger
-        value={"resources"}
-        className={"text-[.8rem] font-normal"}
-        onClick={() => searchRef.current?.focus()}
-      >
-        <Layers3Icon
-          className={
-            "text-nb-gray-500 group-data-[state=active]/trigger:text-netbird transition-all"
-          }
-          size={14}
-        />
-        Resource
-      </TabsTrigger>
+
+      {showResources && (
+        <TabsTrigger
+          value={"resources"}
+          className={"text-[.8rem] font-normal"}
+          onClick={() => searchRef.current?.focus()}
+        >
+          <Layers3Icon
+            className={
+              "text-nb-gray-500 group-data-[state=active]/trigger:text-netbird transition-all"
+            }
+            size={14}
+          />
+          Resources
+        </TabsTrigger>
+      )}
+
+      {showPeers && (
+        <TabsTrigger
+          value={"peers"}
+          className={"text-[.8rem] font-normal"}
+          onClick={() => searchRef.current?.focus()}
+        >
+          <MonitorSmartphoneIcon
+            className={
+              "text-nb-gray-500 group-data-[state=active]/trigger:text-netbird transition-all"
+            }
+            size={14}
+          />
+          Peers
+        </TabsTrigger>
+      )}
     </TabsList>
   );
 };
 
+const UsersCounter = ({
+  group,
+  users,
+  selected,
+}: {
+  group: Group;
+  users: User[];
+  selected: boolean;
+}) => {
+  const usersOfGroup =
+    users?.filter((user) => user.auto_groups.includes(group.id as string)) ||
+    [];
+
+  if (usersOfGroup.length === 0)
+    return (
+      <span
+        className={"group-hover/user-stack:text-nb-gray-200 text-nb-gray-300"}
+      >
+        0 User(s)
+      </span>
+    );
+
+  return (
+    <HorizontalUsersStack
+      users={usersOfGroup}
+      max={3}
+      avatarClassName={cn(
+        "border-nb-gray-920",
+        "bg-nb-gray-800 group-hover/user-stack:bg-nb-gray-700",
+        "group-hover/command-item:border-nb-gray-910",
+      )}
+    />
+  );
+};
+
+const PeerCounter = ({
+  group,
+  showResourceCounter,
+}: {
+  group: Group;
+  showResourceCounter?: boolean;
+}) => {
+  const peerCount = group.peers?.length ?? group?.peers_count ?? 0;
+  const resourcesCount = group?.resources_count ?? 0;
+  const hidePeerCounter =
+    showResourceCounter && peerCount === 0 && resourcesCount > 0;
+
+  return (
+    <div
+      className={cn(
+        "text-neutral-500 dark:text-nb-gray-300 font-medium flex items-center gap-2",
+        hidePeerCounter && "hidden",
+      )}
+    >
+      <MonitorSmartphoneIcon size={14} className={"shrink-0"} />
+      {peerCount} Peer(s)
+    </div>
+  );
+};
+
 const ResourcesCounter = ({ group }: { group: Group }) => {
   return group?.resources_count && group.resources_count > 0 ? (
     <div
@@ -641,7 +796,7 @@ const ResourcesList = ({
                   useHover={true}
                   data-cy={"group-badge"}
                   variant={"gray-ghost"}
-                  className={cn("transition-all group whitespace-nowrap")}
+                  className={cn("transition-all group whitespace-nowrap h-7")}
                   onClick={(e) => {
                     e.preventDefault();
                   }}
@@ -677,3 +832,107 @@ const ResourcesList = ({
     </Radio>
   );
 };
+
+const peersSearchPredicate = (item: Peer, query: string) => {
+  const lowerCaseQuery = query.toLowerCase();
+  if (item.name.toLowerCase().includes(lowerCaseQuery)) return true;
+  return item.ip.toLowerCase().includes(lowerCaseQuery);
+};
+
+const PeersList = ({
+  search,
+  peers,
+  isLoading,
+  value,
+  onChange,
+}: {
+  search: string;
+  peers?: Peer[];
+  isLoading: boolean;
+  value?: PolicyRuleResource;
+  onChange: (peer: Peer) => void;
+}) => {
+  const [filteredItems, _, setSearch] = useSearch(
+    peers || [],
+    peersSearchPredicate,
+    { filter: true, debounce: 150 },
+  );
+
+  useEffect(() => {
+    setSearch(search);
+  }, [search, setSearch]);
+
+  if (isLoading) {
+    return (
+      <div className={"max-h-[195px] flex flex-col gap-1 py-2 px-2"}>
+        <Skeleton height={42} className={"rounded-md"} />
+        <Skeleton height={42} className={"rounded-md"} />
+        <Skeleton height={42} className={"rounded-md"} />
+        <Skeleton height={42} className={"rounded-md"} />
+      </div>
+    );
+  }
+
+  if (search != "" && filteredItems.length == 0) {
+    return (
+      <DropdownInfoText className={"mt-5 max-w-sm mx-auto"}>
+        There are no peers matching your search. Please try a different search
+        term.
+      </DropdownInfoText>
+    );
+  }
+
+  if (search == "" && filteredItems.length == 0) {
+    return (
+      <DropdownInfoText className={"mt-5 max-w-sm mx-auto"}>
+        There are no peers available yet. <br />
+        Go to <InlineLink href={"/peers"}>Peers</InlineLink> to add some peers.
+      </DropdownInfoText>
+    );
+  }
+
+  return (
+    <Radio defaultValue={value?.id} name={"peer"} value={value?.id}>
+      <VirtualScrollAreaList
+        items={filteredItems}
+        onSelect={onChange}
+        itemClassName={"dark:aria-selected:bg-nb-gray-800/20"}
+        renderItem={(res) => {
+          if (!res?.id) return;
+
+          return (
+            <Fragment key={res.id}>
+              <div className={"flex items-center gap-2"}>
+                <Badge
+                  useHover={true}
+                  data-cy={"group-badge"}
+                  variant={"gray-ghost"}
+                  className={cn(
+                    "transition-all group whitespace-nowrap h-7 px-2",
+                  )}
+                  onClick={(e) => {
+                    e.preventDefault();
+                  }}
+                >
+                  <PeerOperatingSystemIcon os={res.os} />
+                  <TextWithTooltip text={res?.name || ""} maxChars={20} />
+                </Badge>
+              </div>
+
+              <div className={"flex items-center gap-5"}>
+                <div
+                  className={
+                    "text-neutral-500 dark:text-nb-gray-300 font-medium flex items-center gap-2"
+                  }
+                >
+                  {res.ip}
+                  <RadioItem value={res.id} />
+                </div>
+              </div>
+            </Fragment>
+          );
+        }}
+      />
+    </Radio>
+  );
+};

src/components/PeerSelector.tsx

@@ -4,7 +4,6 @@ import FullTooltip from "@components/FullTooltip";
 import { Popover, PopoverContent, PopoverTrigger } from "@components/Popover";
 import TextWithTooltip from "@components/ui/TextWithTooltip";
 import { VirtualScrollAreaList } from "@components/VirtualScrollAreaList";
-import { getOperatingSystem } from "@hooks/useOperatingSystem";
 import { useSearch } from "@hooks/useSearch";
 import useFetchApi from "@utils/api";
 import { cn } from "@utils/helpers";
@@ -16,7 +15,7 @@ import { memo, useEffect, useState } from "react";
 import { useElementSize } from "@/hooks/useElementSize";
 import { OperatingSystem } from "@/interfaces/OperatingSystem";
 import { Peer } from "@/interfaces/Peer";
-import { OSLogo } from "@/modules/peers/PeerOSCell";
+import { PeerOperatingSystemIcon } from "@/modules/peers/PeerOperatingSystemIcon";
 
 const MapPinIcon = memo(() => <MapPin size={12} />);
 MapPinIcon.displayName = "MapPinIcon";
@@ -172,6 +171,7 @@ export function PeerSelector({
           {filteredItems.length > 0 && (
             <VirtualScrollAreaList
               items={filteredItems}
+              estimatedItemHeight={37}
               onSelect={(item) => {
                 const isSupported = isRoutingPeerSupported(
                   item.version,
@@ -181,7 +181,6 @@ export function PeerSelector({
                 togglePeer(item);
               }}
               renderItem={(option) => {
-                const os = getOperatingSystem(option.os);
                 const isSupported = isRoutingPeerSupported(
                   option.version,
                   option.os,
@@ -209,19 +208,10 @@ export function PeerSelector({
                           : "text-nb-gray-300",
                       )}
                     >
-                      <div
-                        className={cn(
-                          "flex items-center justify-center grayscale brightness-[100%] contrast-[40%]",
-                          "w-4 h-4 shrink-0",
-                          os === OperatingSystem.WINDOWS && "p-[2.5px]",
-                          os === OperatingSystem.APPLE && "p-[2.7px]",
-                          os === OperatingSystem.FREEBSD && "p-[1.5px]",
-                          !isSupported && "opacity-50",
-                        )}
-                      >
-                        <OSLogo os={option.os} />
-                      </div>
-
+                      <PeerOperatingSystemIcon
+                        os={option.os}
+                        className={isSupported ? "" : "opacity-50"}
+                      />
                       <div className={cn(!isSupported && "opacity-50")}>
                         <TextWithTooltip
                           text={option.name}

src/components/Popover.tsx

@@ -2,33 +2,62 @@
 
 import * as PopoverPrimitive from "@radix-ui/react-popover";
 import { cn } from "@utils/helpers";
+import { cva, VariantProps } from "class-variance-authority";
 import * as React from "react";
 
+type PopoverVariants = VariantProps<typeof popoverVariants>;
+
+export const popoverVariants = cva([], {
+  variants: {
+    variant: {
+      lighter: [
+        "rounded-md border border-neutral-200 bg-white px-5 py-3 text-sm text-neutral-950 shadow-md",
+        "dark:border-nb-gray-800 dark:bg-nb-gray-920 dark:text-neutral-50",
+      ],
+      dark: [
+        "rounded-md border border-neutral-200 bg-white px-5 py-3 text-sm text-neutral-950 shadow-md",
+        "dark:border-nb-gray-900 dark:bg-nb-gray-940 dark:text-gray-50",
+      ],
+    },
+  },
+});
+
 const Popover = PopoverPrimitive.Root;
 
 const PopoverTrigger = PopoverPrimitive.Trigger;
 
 const PopoverContent = React.forwardRef<
   React.ElementRef<typeof PopoverPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content>
->(({ className, align = "center", sideOffset = 4, ...props }, ref) => (
-  <PopoverPrimitive.Portal>
-    <PopoverPrimitive.Content
-      ref={ref}
-      align={align}
-      sideOffset={sideOffset}
-      className={cn(
-        "z-50 overflow-hidden",
-        "animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95",
-        "data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
-        "rounded-md border border-neutral-200 bg-white px-5 py-3 text-sm text-neutral-950 shadow-md",
-        "dark:border-nb-gray-800 dark:bg-nb-gray-920 dark:text-neutral-50",
-        className,
-      )}
-      {...props}
-    />
-  </PopoverPrimitive.Portal>
-));
+  React.ComponentPropsWithoutRef<typeof PopoverPrimitive.Content> &
+    PopoverVariants
+>(
+  (
+    {
+      className,
+      align = "center",
+      sideOffset = 4,
+      variant = "lighter",
+      ...props
+    },
+    ref,
+  ) => (
+    <PopoverPrimitive.Portal>
+      <PopoverPrimitive.Content
+        ref={ref}
+        align={align}
+        sideOffset={sideOffset}
+        className={cn(
+          "z-50 overflow-hidden",
+          "animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95",
+          "data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+          popoverVariants({ variant }),
+          className,
+        )}
+        {...props}
+      />
+    </PopoverPrimitive.Portal>
+  ),
+);
 PopoverContent.displayName = PopoverPrimitive.Content.displayName;
 
 export { Popover, PopoverContent, PopoverTrigger };

src/components/PortSelector.tsx

@@ -1,261 +1,332 @@
 import Badge from "@components/Badge";
+import { Callout } from "@components/Callout";
 import { Checkbox } from "@components/Checkbox";
 import { CommandItem } from "@components/Command";
+import { DropdownInfoText } from "@components/DropdownInfoText";
 import { Popover, PopoverContent, PopoverTrigger } from "@components/Popover";
 import { IconArrowBack } from "@tabler/icons-react";
 import { cn } from "@utils/helpers";
 import { Command, CommandGroup, CommandInput, CommandList } from "cmdk";
-import { trim } from "lodash";
+import { orderBy, trim } from "lodash";
 import { ChevronsUpDown, SearchIcon, XIcon } from "lucide-react";
 import * as React from "react";
-import { useMemo, useState } from "react";
+import { useEffect, useMemo, useState } from "react";
 import { useElementSize } from "@/hooks/useElementSize";
+import { PortRange } from "@/interfaces/Policy";
 
 interface MultiSelectProps {
-  values: number[];
-  onChange: React.Dispatch<React.SetStateAction<number[]>>;
+  ports: number[];
+  onPortsChange: React.Dispatch<React.SetStateAction<number[]>>;
+  portRanges?: PortRange[];
+  onPortRangesChange?: React.Dispatch<React.SetStateAction<PortRange[]>>;
   max?: number;
   disabled?: boolean;
   popoverWidth?: "auto" | number;
   showAll?: boolean;
 }
+
+const isValidPort = (p: number) => p >= 1 && p <= 65535;
+
+const parseRange = (value: string): PortRange | undefined => {
+  const parts = value.split("-").map((x) => Number(trim(x)));
+  if (parts.length !== 2) return undefined;
+  const [start, end] = parts;
+  if (!isValidPort(start) || !isValidPort(end) || start >= end)
+    return undefined;
+  return { start, end };
+};
+
+const parsePortInput = (value: string): number | PortRange | undefined => {
+  const trimmed = trim(value);
+  if (/^\d{1,5}-\d{1,5}$/.test(trimmed)) return parseRange(trimmed);
+  const port = Number(trimmed);
+  return isValidPort(port) ? port : undefined;
+};
+
 export function PortSelector({
-  onChange,
-  values,
-  max,
+  onPortsChange,
+  ports,
+  portRanges = [],
+  onPortRangesChange,
   disabled = false,
   popoverWidth = "auto",
   showAll = false,
-}: MultiSelectProps) {
+}: Readonly<MultiSelectProps>) {
   const searchRef = React.useRef<HTMLInputElement>(null);
+  const [open, setOpen] = useState(false);
   const [inputRef, { width }] = useElementSize<HTMLButtonElement>();
   const [search, setSearch] = useState("");
 
-  const toggle = (x: number) => {
-    if (isNaN(Number(x))) return;
-    const port = Number(x);
-    if (port < 1 || port > 65535) return;
+  const [portsInput, setPortsInput] = useState<string[]>(() => {
+    const p = ports.map(String);
+    const pr = portRanges.map((r) => {
+      if (r.start === r.end) return String(r.start);
+      return `${r.start}-${r.end}`;
+    });
+    return orderBy([...p, ...pr], [(x) => Number(x.split("-")[0])], ["asc"]);
+  });
 
-    const isSelected = values.includes(port);
-    if (isSelected) {
-      onChange((previous) => previous.filter((y) => y !== port));
-    } else {
-      onChange((previous) => [...previous, port]);
-      setSearch("");
-    }
+  useEffect(() => {
+    const parsed = portsInput.map(parsePortInput).filter(Boolean);
+    const newPorts: number[] = [];
+    const newRanges: PortRange[] = [];
+    parsed.forEach((entry) => {
+      if (typeof entry === "number") newPorts.push(entry);
+      else if (entry !== undefined) newRanges.push(entry);
+    });
+    onPortsChange(newPorts);
+    onPortRangesChange?.(newRanges);
+  }, [portsInput]);
+
+  const toggle = (value: string) => {
+    if (disabled) return;
+    setPortsInput((prev) =>
+      prev.includes(value) ? prev.filter((e) => e !== value) : [...prev, value],
+    );
+    setSearch("");
   };
 
   const notFound = useMemo(() => {
     const isSearching = search.length > 0;
-    const found =
-      values.filter((item) => item == Number(trim(search))).length == 0;
-    return isSearching && found;
-  }, [search, values]);
-
-  const [open, setOpen] = useState(false);
+    const trimmed = trim(search);
+    return (
+      trimmed &&
+      !portsInput.includes(trimmed) &&
+      parsePortInput(trimmed) &&
+      isSearching
+    );
+  }, [search, portsInput]);
 
   return (
-    <Popover
-      open={open}
-      onOpenChange={(isOpen) => {
-        if (!isOpen) {
-          setTimeout(() => {
-            setSearch("");
-          }, 100);
-        }
-        setOpen(isOpen);
-      }}
-    >
-      <PopoverTrigger asChild>
-        <button
-          className={cn(
-            "min-h-[48px] w-full relative items-center",
-            "border border-neutral-200 dark:border-nb-gray-700 justify-between py-2 px-3",
-            "rounded-md bg-white text-sm dark:bg-nb-gray-900/40 flex dark:text-neutral-400/70 text-neutral-500 cursor-pointer hover:dark:bg-nb-gray-900/50",
-          )}
-          data-cy={"port-selector"}
-          disabled={disabled}
-          ref={inputRef}
-        >
-          <div
-            className={
-              "flex items-center gap-2 border-nb-gray-700 flex-wrap h-full"
-            }
-          >
-            {values.length === 0 && showAll && (
-              <Badge
-                variant={"gray"}
-                className={"uppercase tracking-wider font-medium py-1"}
-              >
-                All
-              </Badge>
-            )}
-
-            {values.map((x) => (
-              <Badge
-                key={x}
-                variant={"gray"}
-                onClick={() => toggle(x)}
-                className={"uppercase tracking-wider font-medium py-1"}
-              >
-                {x}
-                <XIcon
-                  size={12}
-                  className={"cursor-pointer group-hover:text-black"}
-                />
-              </Badge>
-            ))}
-            {values.length == 0 && <span>Select ports...</span>}
-          </div>
-
-          <ChevronsUpDown size={18} className={"shrink-0"} />
-        </button>
-      </PopoverTrigger>
-      <PopoverContent
-        className="w-full p-0 shadow-sm  shadow-nb-gray-950"
-        style={{
-          width: popoverWidth === "auto" ? width : popoverWidth,
+    <>
+      <Popover
+        open={open}
+        onOpenChange={(isOpen) => {
+          if (!isOpen) {
+            setTimeout(() => {
+              setSearch("");
+            }, 100);
+          }
+          setOpen(isOpen);
         }}
-        align="start"
-        side={"top"}
-        sideOffset={10}
       >
-        <Command
-          className={"w-full flex"}
-          loop
-          filter={(value, search) => {
-            const formatValue = trim(value.toLowerCase());
-            const formatSearch = trim(search.toLowerCase());
-            if (formatValue.includes(formatSearch)) return 1;
-            return 0;
-          }}
-        >
-          <CommandList className={"w-full"}>
-            <div className={"relative"}>
-              <CommandInput
-                className={cn(
-                  "min-h-[42px] w-full relative",
-                  "border-b-0 border-t-0 border-r-0 border-l-0 border-neutral-200 dark:border-nb-gray-700 items-center",
-                  "bg-transparent text-sm outline-none focus-visible:outline-none ring-0 focus-visible:ring-0",
-                  "dark:placeholder:text-neutral-500 font-light placeholder:text-neutral-500 pl-10",
-                )}
-                data-cy={"port-input"}
-                typeof={"number"}
-                ref={searchRef}
-                value={search}
-                onValueChange={setSearch}
-                placeholder={'Add new ports by pressing "Enter"...'}
-              />
-              <div
-                className={
-                  "absolute left-0 top-0 h-full flex items-center pl-4"
-                }
-              >
-                <div className={"flex items-center"}>
-                  <SearchIcon size={14} />
-                </div>
-              </div>
-              <div
-                className={
-                  "absolute right-0 top-0 h-full flex items-center pr-4"
-                }
-              >
-                <div
-                  className={
-                    "flex items-center bg-nb-gray-800 py-1 px-1.5 rounded-[4px] border border-nb-gray-500"
-                  }
+        <PopoverTrigger asChild>
+          <button
+            className={cn(
+              "min-h-[48px] w-full relative items-center",
+              "border border-neutral-200 dark:border-nb-gray-700 justify-between py-2 px-3",
+              "rounded-md bg-white text-sm dark:bg-nb-gray-900/40 flex dark:text-neutral-400/70 text-neutral-500 cursor-pointer hover:dark:bg-nb-gray-900/50",
+            )}
+            data-cy={"port-selector"}
+            disabled={disabled}
+            ref={inputRef}
+          >
+            <div
+              className={
+                "flex items-center gap-2 border-nb-gray-700 flex-wrap h-full"
+              }
+            >
+              {portsInput.length === 0 && showAll && (
+                <Badge
+                  variant={"gray"}
+                  className={"uppercase tracking-wider font-medium py-1"}
                 >
-                  <IconArrowBack size={10} />
-                </div>
-              </div>
+                  All
+                </Badge>
+              )}
+
+              {portsInput.map((x) => (
+                <Badge
+                  key={x}
+                  variant={"gray"}
+                  onClick={(e) => {
+                    e.preventDefault();
+                    e.stopPropagation();
+                    toggle(x);
+                  }}
+                  className={"uppercase tracking-wider font-medium py-1"}
+                >
+                  {x}
+                  <XIcon
+                    size={12}
+                    className={"cursor-pointer group-hover:text-black"}
+                  />
+                </Badge>
+              ))}
+              {ports.length == 0 && <span>Select ports...</span>}
             </div>
 
-            <div
-              className={cn(
-                "flex flex-col gap-2",
-                values.length != 0 && "p-2",
-                values.length != 0 && search && "p-2",
-                values.length == 0 && search && "p-2",
-              )}
-            >
-              {notFound && (
+            <ChevronsUpDown size={18} className={"shrink-0"} />
+          </button>
+        </PopoverTrigger>
+        <PopoverContent
+          className="w-full p-0 shadow-sm  shadow-nb-gray-950"
+          style={{
+            width: popoverWidth === "auto" ? width : popoverWidth,
+          }}
+          align="start"
+          side={"top"}
+          sideOffset={10}
+        >
+          <Command
+            className={"w-full flex"}
+            loop
+            filter={(value, search) => {
+              const formatValue = trim(value.toLowerCase());
+              const formatSearch = trim(search.toLowerCase());
+              if (formatValue.includes(formatSearch)) return 1;
+              return 0;
+            }}
+          >
+            <CommandList className={"w-full"}>
+              <div className={"relative"}>
+                <CommandInput
+                  className={cn(
+                    "min-h-[42px] w-full relative",
+                    "border-b-0 border-t-0 border-r-0 border-l-0 border-neutral-200 dark:border-nb-gray-700 items-center",
+                    "bg-transparent text-sm outline-none focus-visible:outline-none ring-0 focus-visible:ring-0",
+                    "dark:placeholder:text-nb-gray-400 font-light placeholder:text-neutral-500 pl-10",
+                  )}
+                  data-cy={"port-input"}
+                  typeof={"number"}
+                  ref={searchRef}
+                  value={search}
+                  onValueChange={setSearch}
+                  placeholder={
+                    'Add a port or a range e.g. 80 or 1-1023 and press "Enter" to add...'
+                  }
+                />
+                <div
+                  className={
+                    "absolute left-0 top-0 h-full flex items-center pl-4"
+                  }
+                >
+                  <div className={"flex items-center"}>
+                    <SearchIcon size={14} />
+                  </div>
+                </div>
+                <div
+                  className={
+                    "absolute right-0 top-0 h-full flex items-center pr-4"
+                  }
+                >
+                  <div
+                    className={
+                      "flex items-center bg-nb-gray-800 py-1 px-1.5 rounded-[4px] border border-nb-gray-500"
+                    }
+                  >
+                    <IconArrowBack size={10} />
+                  </div>
+                </div>
+              </div>
+
+              <div
+                className={cn(
+                  "flex flex-col gap-2",
+                  portsInput.length != 0 && "p-2",
+                  portsInput.length != 0 && search && "p-2",
+                  notFound && "p-2",
+                )}
+              >
+                {!notFound && search && !portsInput.includes(search) && (
+                  <div className={"text-sm"}>
+                    <DropdownInfoText className={"mb-[18px] pt-[4px]"}>
+                      {
+                        "Please add a valid port or port range (e.g. 80, 443, 1-1023)"
+                      }
+                    </DropdownInfoText>
+                  </div>
+                )}
+
+                {notFound && (
+                  <CommandGroup>
+                    <div
+                      className={cn(
+                        "max-h-[180px] overflow-y-auto flex flex-col gap-1",
+                      )}
+                    >
+                      <CommandItem
+                        key={search}
+                        onSelect={() => {
+                          toggle(search);
+                          searchRef.current?.focus();
+                        }}
+                        value={search}
+                        onClick={(e) => e.preventDefault()}
+                      >
+                        <Badge
+                          variant={"gray"}
+                          className={
+                            "uppercase tracking-wider font-medium py-1"
+                          }
+                        >
+                          {search}
+                        </Badge>
+                        <div
+                          className={"text-neutral-500 dark:text-nb-gray-300"}
+                        >
+                          Add this port or range by pressing{" "}
+                          <span className={"font-bold text-netbird"}>
+                            {"'Enter'"}
+                          </span>
+                        </div>
+                      </CommandItem>
+                    </div>
+                  </CommandGroup>
+                )}
+
                 <CommandGroup>
                   <div
                     className={cn(
                       "max-h-[180px] overflow-y-auto flex flex-col gap-1",
                     )}
                   >
-                    <CommandItem
-                      key={search}
-                      onSelect={() => {
-                        toggle(Number(search));
-                        searchRef.current?.focus();
-                      }}
-                      value={search}
-                      onClick={(e) => e.preventDefault()}
-                    >
-                      <Badge
-                        variant={"gray"}
-                        className={"uppercase tracking-wider font-medium py-1"}
-                      >
-                        {search}
-                      </Badge>
-                      <div className={"text-neutral-500 dark:text-nb-gray-300"}>
-                        Add this port by pressing{" "}
-                        <span className={"font-bold text-netbird"}>
-                          {"'Enter'"}
-                        </span>
-                      </div>
-                    </CommandItem>
-                  </div>
-                </CommandGroup>
-              )}
+                    {portsInput.map((option) => {
+                      const isSelected = portsInput.includes(option);
+                      return (
+                        <CommandItem
+                          key={option}
+                          value={option.toString()}
+                          onSelect={() => {
+                            toggle(option);
+                            searchRef.current?.focus();
+                          }}
+                          onClick={(e) => e.preventDefault()}
+                        >
+                          <div className={"flex items-center gap-2"}>
+                            <Badge
+                              variant={"gray"}
+                              className={
+                                "uppercase tracking-wider font-medium py-1"
+                              }
+                            >
+                              {option}
+                            </Badge>
+                          </div>
 
-              <CommandGroup>
-                <div
-                  className={cn(
-                    "max-h-[180px] overflow-y-auto flex flex-col gap-1",
-                  )}
-                >
-                  {values.map((option) => {
-                    const isSelected = values.includes(option);
-                    return (
-                      <CommandItem
-                        key={option}
-                        value={option.toString()}
-                        onSelect={() => {
-                          toggle(option);
-                          searchRef.current?.focus();
-                        }}
-                        onClick={(e) => e.preventDefault()}
-                      >
-                        <div className={"flex items-center gap-2"}>
-                          <Badge
-                            variant={"gray"}
+                          <div
                             className={
-                              "uppercase tracking-wider font-medium py-1"
+                              "text-neutral-500 dark:text-nb-gray-300 font-medium flex items-center gap-2"
                             }
                           >
-                            {option}
-                          </Badge>
-                        </div>
-
-                        <div
-                          className={
-                            "text-neutral-500 dark:text-nb-gray-300 font-medium flex items-center gap-2"
-                          }
-                        >
-                          <Checkbox checked={isSelected} />
-                        </div>
-                      </CommandItem>
-                    );
-                  })}
-                </div>
-              </CommandGroup>
-            </div>
-          </CommandList>
-        </Command>
-      </PopoverContent>
-    </Popover>
+                            <Checkbox checked={isSelected} />
+                          </div>
+                        </CommandItem>
+                      );
+                    })}
+                  </div>
+                </CommandGroup>
+              </div>
+            </CommandList>
+          </Command>
+        </PopoverContent>
+      </Popover>
+      {portRanges?.length > 0 && (
+        <Callout variant={"info"} className={"mt-4"}>
+          Port ranges requires NetBird client{" "}
+          <span className={"text-white font-normal"}>v0.48</span> or higher.
+        </Callout>
+      )}
+    </>
   );
 }

src/components/RadioCard.tsx

@@ -0,0 +1,67 @@
+import * as RadioGroup from "@radix-ui/react-radio-group";
+import { ReactNode } from "react"; // or replace with clsx or similar
+import { cn } from "@/utils/helpers";
+
+type Props = {
+  value: string;
+  title: ReactNode;
+  description: ReactNode;
+  icon?: ReactNode;
+  className?: string;
+};
+
+export const RadioCard = ({
+  value,
+  title,
+  description,
+  className,
+  icon,
+}: Props) => {
+  return (
+    <RadioGroup.Item
+      value={value}
+      className={cn(
+        "peer relative block cursor-pointer rounded-lg border border-nb-gray-900 bg-nb-gray-930/60 px-5 py-3 transition-all focus:outline-none",
+        "data-[state=checked]:border-nb-gray-400 data-[state=checked]:bg-nb-gray-920",
+        "outline-none focus:ring-0 focus:bg-nb-gray-930 focus:border-nb-gray-920",
+        "hover:bg-nb-gray-930",
+        className,
+      )}
+    >
+      <div className="text-nb-gray-100 font-normal text-sm text-left gap-2 flex items-center">
+        {icon}
+        {title}
+      </div>
+      <div className="text-nb-gray-300 text-[0.8rem] text-left">
+        {description}
+      </div>
+    </RadioGroup.Item>
+  );
+};
+
+type RadioCardGroupProps = {
+  value: string;
+  onValueChange: (val: string) => void;
+  children: React.ReactNode;
+  className?: string;
+  "aria-label"?: string;
+};
+
+export const RadioCardGroup = ({
+  value,
+  onValueChange,
+  children,
+  className,
+  "aria-label": ariaLabel = "Options",
+}: RadioCardGroupProps) => {
+  return (
+    <RadioGroup.Root
+      className={cn("flex flex-col gap-2", className)}
+      value={value}
+      onValueChange={onValueChange}
+      aria-label={ariaLabel}
+    >
+      {children}
+    </RadioGroup.Root>
+  );
+};

src/components/SegmentedTabs.tsx

@@ -44,10 +44,12 @@ function Trigger({
   children,
   value,
   disabled = false,
+  className,
 }: {
   children: React.ReactNode;
   value: string;
   disabled?: boolean;
+  className?: string;
 }) {
   const currentValue = useTabContext();
   return (
@@ -60,6 +62,7 @@ function Trigger({
           : disabled
           ? ""
           : "text-nb-gray-400 hover:bg-nb-gray-900/50",
+        className,
       )}
       value={value}
     >

src/components/SidebarItem.tsx

@@ -1,8 +1,9 @@
 "use client";
 
 import * as Collapsible from "@radix-ui/react-collapsible";
+import { cn } from "@utils/helpers";
 import classNames from "classnames";
-import { ChevronDownIcon, ChevronUpIcon } from "lucide-react";
+import { ChevronDownIcon, ChevronUpIcon, DotIcon } from "lucide-react";
 import { usePathname, useRouter } from "next/navigation";
 import React, { useMemo } from "react";
 import { useApplicationContext } from "@/contexts/ApplicationProvider";
@@ -18,7 +19,10 @@ export type SidebarItemProps = {
   href?: string;
   exactPathMatch?: boolean;
   target?: string;
+  labelClassName?: string;
+  visible: boolean;
 };
+
 export default function SidebarItem({
   icon,
   children,
@@ -29,11 +33,14 @@ export default function SidebarItem({
   href = "",
   exactPathMatch = false,
   target = "_self",
-}: SidebarItemProps) {
+  labelClassName,
+  visible,
+}: Readonly<SidebarItemProps>) {
   const [open, setOpen] = React.useState(false);
   const path = usePathname();
   const router = useRouter();
-  const { mobileNavOpen, toggleMobileNav } = useApplicationContext();
+  const { mobileNavOpen, toggleMobileNav, isNavigationCollapsed } =
+    useApplicationContext();
 
   const handleClick = () => {
     const preventRedirect = href
@@ -54,14 +61,15 @@ export default function SidebarItem({
     return href ? (exactPathMatch ? path == href : path.includes(href)) : false;
   }, [path, href, exactPathMatch, collapsible]);
 
+  if (!visible) return;
+
   return (
     <Collapsible.Root open={open} onOpenChange={setOpen}>
       <Collapsible.Trigger asChild>
-        <li className={"px-4 cursor-pointer"}>
+        <li className={"px-4 cursor-pointer list-none"}>
           <button
             className={classNames(
-              "rounded-lg text-[.87rem] w-full ",
-              "font-normal ",
+              "rounded-lg text-[.87rem] w-full relative font-normal",
               className,
               isChild
                 ? "pl-7 pr-2 py-[.45rem] mt-1 mb-0.5"
@@ -71,23 +79,58 @@ export default function SidebarItem({
                 : "text-gray-600 hover:bg-gray-200 dark:text-nb-gray-400 dark:hover:bg-nb-gray-900/50",
             )}
             onClick={handleClick}
+            data-cy={"left-navigation-item"}
           >
+            {isChild && isNavigationCollapsed && !mobileNavOpen && (
+              <div
+                className={
+                  "absolute left-0 top-0 w-full h-full flex items-center justify-center group-hover/navigation:hidden text-[10px]"
+                }
+              >
+                <DotIcon size={14} className={"shrink-0"} />
+              </div>
+            )}
             <div
               className={classNames(
-                "flex w-full items-center shrink-0",
+                "flex w-full items-center shrink-0 ",
                 href == "" ? "disabled pointer-events-none" : "",
               )}
             >
               <span className="peer/icon" data-active={isActive} />
               {icon}
-              <span className="px-4 whitespace-nowrap flex-1 w-full text-left">
+
+              <span
+                className={cn(
+                  "px-4 whitespace-nowrap flex-1 w-full text-left",
+                  labelClassName,
+                  isNavigationCollapsed &&
+                    !mobileNavOpen &&
+                    "opacity-0 group-hover/navigation:opacity-100",
+                )}
+              >
                 {label}
               </span>
               {collapsible &&
                 (open ? (
-                  <ChevronUpIcon className={"shrink-0"} />
+                  <ChevronUpIcon
+                    size={18}
+                    className={cn(
+                      "shrink-0",
+                      isNavigationCollapsed &&
+                        !mobileNavOpen &&
+                        "opacity-0 group-hover/navigation:opacity-100",
+                    )}
+                  />
                 ) : (
-                  <ChevronDownIcon className={"shrink-0"} />
+                  <ChevronDownIcon
+                    size={18}
+                    className={cn(
+                      "shrink-0",
+                      isNavigationCollapsed &&
+                        !mobileNavOpen &&
+                        "opacity-0 group-hover/navigation:opacity-100",
+                    )}
+                  />
                 ))}
             </div>
           </button>

src/components/Steps.tsx

@@ -24,6 +24,8 @@ type StepProps = {
   line?: boolean;
   center?: boolean;
   horizontal?: boolean;
+  disabled?: boolean;
+  className?: string;
 };
 
 const Step = ({
@@ -32,6 +34,8 @@ const Step = ({
   line = true,
   center = false,
   horizontal,
+  disabled = false,
+  className,
 }: StepProps) => {
   return (
     <div
@@ -39,6 +43,8 @@ const Step = ({
         "flex gap-4 items-start  justify-start relative pb-6 -mx-1.5 group px-[2px]",
         center && "items-center",
         horizontal ? "flex-col items-center" : "min-w-full",
+        disabled && "opacity-40 pointer-events-none",
+        className,
       )}
     >
       {line && (
@@ -57,6 +63,7 @@ const Step = ({
           "h-[34px] w-[34px] shrink-0 rounded-full  flex items-center justify-center font-medium text-xs relative z-0 border-4  transition-all",
           "dark:bg-nb-gray-900 dark:text-nb-gray-400 dark:border-nb-gray dark:group-hover:bg-nb-gray-800",
           "bg-nb-gray-100 text-nb-gray-400 border-white group-hover:bg-nb-gray-200 step-circle",
+          "[.stepper-bg-variant]:border-nb-gray-940",
         )}
       >
         {step}

src/components/Tabs.tsx

@@ -39,38 +39,43 @@ const Tabs = React.forwardRef<
 Tabs.displayName = TabsPrimitive.Root.displayName;
 
 type TabListProps = {
+  hidden?: boolean;
   justify?: "start" | "end" | "center" | "between";
 };
 
 const TabsList = React.forwardRef<
   React.ElementRef<typeof TabsPrimitive.List>,
   React.ComponentPropsWithoutRef<typeof TabsPrimitive.List> & TabListProps
->(({ className, justify = "center", ...props }, ref) => (
-  <TabsPrimitive.List
-    ref={ref}
-    className={cn(
-      "flex flex-nowrap text-neutral-500 dark:text-nb-gray-400 w-full relative",
-      className,
-      justify == "center" && "justify-center justify-items-end",
-      justify == "start" && "justify-start",
-      justify == "end" && "justify-end",
-      justify == "between" && "justify-between",
-    )}
-    {...props}
-  >
-    <span
-      className={
-        "absolute left-0 dark:bg-nb-gray-900 bg-nb-gray-100 w-full h-[1px] bottom-0 z-0"
-      }
-    />
-    <ScrollArea>
-      <div className={"relative z-[1] flex flex-nowrap w-full "}>
-        {props.children}
-      </div>
-      <ScrollBar orientation="horizontal" />
-    </ScrollArea>
-  </TabsPrimitive.List>
-));
+>(({ className, justify = "center", hidden = false, ...props }, ref) => {
+  return (
+    !hidden && (
+      <TabsPrimitive.List
+        ref={ref}
+        className={cn(
+          "flex flex-nowrap text-neutral-500 dark:text-nb-gray-400 w-full relative",
+          className,
+          justify == "center" && "justify-center justify-items-end",
+          justify == "start" && "justify-start",
+          justify == "end" && "justify-end",
+          justify == "between" && "justify-between",
+        )}
+        {...props}
+      >
+        <span
+          className={
+            "absolute left-0 dark:bg-nb-gray-900 bg-nb-gray-100 w-full h-[1px] bottom-0 z-0"
+          }
+        />
+        <ScrollArea>
+          <div className={"relative z-[1] flex flex-nowrap w-full "}>
+            {props.children}
+          </div>
+          <ScrollBar orientation="horizontal" />
+        </ScrollArea>
+      </TabsPrimitive.List>
+    )
+  );
+});
 TabsList.displayName = TabsPrimitive.List.displayName;
 
 const TabsTrigger = React.forwardRef<

src/components/Tooltip.tsx

@@ -2,6 +2,7 @@
 
 import * as TooltipPrimitive from "@radix-ui/react-tooltip";
 import { cn } from "@utils/helpers";
+import { cva, VariantProps } from "class-variance-authority";
 import * as React from "react";
 
 const TooltipProvider = TooltipPrimitive.Provider;
@@ -10,25 +11,58 @@ const Tooltip = TooltipPrimitive.Root;
 
 const TooltipTrigger = TooltipPrimitive.Trigger;
 
-export const tooltipClasses =
-  "z-[9999] overflow-hidden rounded-md border border-neutral-200 bg-white  text-sm text-neutral-950 shadow-md animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 dark:border-nb-gray-930 dark:bg-nb-gray-940 dark:text-neutral-50";
+export type TooltipVariants = VariantProps<typeof tooltipVariants>;
+
+export const tooltipVariants = cva(
+  [
+    "z-[9999] overflow-hidden rounded-md border text-sm shadow-md",
+    "animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2",
+  ],
+  {
+    variants: {
+      variant: {
+        default: [
+          "bg-nb-gray-940",
+          "text-neutral-50",
+          "border-neutral-200 border-nb-gray-930",
+        ],
+        lighter: [
+          "bg-nb-gray-920",
+          "text-neutral-50",
+          "border-neutral-200 border-nb-gray-900",
+        ],
+      },
+    },
+  },
+);
 
 const TooltipContent = React.forwardRef<
   React.ElementRef<typeof TooltipPrimitive.Content>,
-  React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content>
->(({ className = "px-4 py-2.5", sideOffset = 7, ...props }, ref) => (
-  <TooltipPrimitive.Portal>
-    <TooltipPrimitive.Content
-      ref={ref}
-      asChild={true}
-      sideOffset={sideOffset}
-      className={cn(tooltipClasses, className)}
-      {...props}
-    >
-      <div>{props.children}</div>
-    </TooltipPrimitive.Content>
-  </TooltipPrimitive.Portal>
-));
+  React.ComponentPropsWithoutRef<typeof TooltipPrimitive.Content> &
+    TooltipVariants
+>(
+  (
+    {
+      className = "px-4 py-2.5",
+      sideOffset = 7,
+      variant = "default",
+      ...props
+    },
+    ref,
+  ) => (
+    <TooltipPrimitive.Portal>
+      <TooltipPrimitive.Content
+        ref={ref}
+        asChild={true}
+        sideOffset={sideOffset}
+        className={cn(tooltipVariants({ variant }), className)}
+        {...props}
+      >
+        <div>{props.children}</div>
+      </TooltipPrimitive.Content>
+    </TooltipPrimitive.Portal>
+  ),
+);
 TooltipContent.displayName = TooltipPrimitive.Content.displayName;
 
 export { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger };

src/components/UserSelector.tsx

@@ -0,0 +1,219 @@
+import { DropdownInfoText } from "@components/DropdownInfoText";
+import { DropdownInput } from "@components/DropdownInput";
+import { Popover, PopoverContent, PopoverTrigger } from "@components/Popover";
+import TextWithTooltip from "@components/ui/TextWithTooltip";
+import { VirtualScrollAreaList } from "@components/VirtualScrollAreaList";
+import { useSearch } from "@hooks/useSearch";
+import { cn } from "@utils/helpers";
+import { ChevronsUpDown, MapPin } from "lucide-react";
+import * as React from "react";
+import { memo, useState } from "react";
+import { useElementSize } from "@/hooks/useElementSize";
+import { User } from "@/interfaces/User";
+import { SmallUserAvatar } from "@/modules/users/SmallUserAvatar";
+
+const MapPinIcon = memo(() => <MapPin size={12} />);
+MapPinIcon.displayName = "MapPinIcon";
+
+interface MultiSelectProps {
+  value?: User;
+  onChange: React.Dispatch<React.SetStateAction<User | undefined>>;
+  excludedPeers?: string[];
+  disabled?: boolean;
+  options?: User[];
+  placeholder?: string;
+}
+
+const searchPredicate = (u: User, query: string) => {
+  const lowerCaseQuery = query.toLowerCase();
+  try {
+    if (u.name.toLowerCase().includes(lowerCaseQuery)) return true;
+    return !!u?.email?.toLowerCase().includes(lowerCaseQuery);
+  } catch (e) {
+    return false;
+  }
+};
+
+export function UserSelector({
+  onChange,
+  value,
+  disabled = false,
+  options = [],
+  placeholder = "Select a user...",
+}: MultiSelectProps) {
+  const [inputRef, { width }] = useElementSize<HTMLButtonElement>();
+
+  const [filteredItems, search, setSearch] = useSearch(
+    options,
+    searchPredicate,
+    { filter: true, debounce: 150 },
+  );
+
+  const toggleUser = (user: User) => {
+    const isSelected = value && value.id == user.id;
+    if (isSelected) {
+      onChange(undefined);
+    } else {
+      onChange(user);
+      setSearch("");
+    }
+    setOpen(false);
+  };
+
+  const [open, setOpen] = useState(false);
+
+  return (
+    <Popover
+      open={open}
+      onOpenChange={(isOpen) => {
+        if (!isOpen) {
+          setTimeout(() => {
+            setSearch("");
+          }, 100);
+        }
+        setOpen(isOpen);
+      }}
+    >
+      <PopoverTrigger asChild>
+        <button
+          className={cn(
+            "min-h-[46px] w-full relative items-center group",
+            "border border-neutral-200 dark:border-nb-gray-700 justify-between py-2 px-3",
+            "rounded-md bg-white text-sm dark:bg-nb-gray-900/40 flex dark:text-neutral-400/70 text-neutral-500 cursor-pointer enabled:hover:dark:bg-nb-gray-900/50",
+            "disabled:opacity-40 disabled:cursor-default",
+          )}
+          disabled={disabled}
+          ref={inputRef}
+        >
+          <div
+            className={
+              "flex items-center w-full gap-2 border-nb-gray-700 flex-wrap h-full"
+            }
+          >
+            {value ? (
+              <UserListItem
+                user={value}
+                className={"bg-nb-gray-800"}
+                variant={"selected"}
+              />
+            ) : (
+              <span>{placeholder}</span>
+            )}
+          </div>
+
+          <ChevronsUpDown size={18} className={"shrink-0"} />
+        </button>
+      </PopoverTrigger>
+      <PopoverContent
+        hideWhenDetached={false}
+        className="w-full p-0 shadow-sm shadow-nb-gray-950"
+        style={{
+          width: width,
+        }}
+        align="start"
+        side={"top"}
+        sideOffset={10}
+      >
+        <div className={"w-full"}>
+          <DropdownInput
+            value={search}
+            onChange={setSearch}
+            hideEnterIcon={true}
+            placeholder={"Search for users by name or email..."}
+          />
+
+          {options.length == 0 && !search && (
+            <div className={"max-w-xs mx-auto"}>
+              <DropdownInfoText>
+                {
+                  "There are no users to select. Invite some users for this tenant before unlinking."
+                }
+              </DropdownInfoText>
+            </div>
+          )}
+
+          {filteredItems.length == 0 && search != "" && (
+            <DropdownInfoText>
+              There are no users matching your search.
+            </DropdownInfoText>
+          )}
+
+          {filteredItems.length > 0 && (
+            <VirtualScrollAreaList
+              items={filteredItems}
+              onSelect={toggleUser}
+              estimatedItemHeight={52}
+              scrollAreaClassName={"pt-0"}
+              renderItem={(option) => {
+                return (
+                  <div>
+                    <UserListItem user={option} className={"bg-nb-gray-800"} />
+                  </div>
+                );
+              }}
+            />
+          )}
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+type UserListItemProps = {
+  user: User;
+  className?: string;
+  variant?: "default" | "selected";
+};
+
+export const UserListItem = ({
+  user,
+  className,
+  variant,
+}: UserListItemProps) => {
+  const isSystemUser = user?.email === "NetBird" || user?.email === "";
+  const maxChars = variant === "selected" ? 30 : 20;
+
+  return (
+    <div className={"flex items-center gap-2 w-full text-left"}>
+      <SmallUserAvatar
+        name={user?.name}
+        email={user?.email}
+        id={user?.id}
+        className={cn(
+          variant === "selected" && "w-5 h-5 text-[9px]",
+          className,
+        )}
+      />
+      <div
+        className={cn(
+          "flex flex-col w-full",
+          variant === "selected" && "flex-row",
+        )}
+      >
+        <span
+          className={cn(
+            "text-nb-gray-200 flex items-center relative gap-1.5 w-full text-xs",
+            variant === "selected" && "text-[0.85rem]",
+          )}
+        >
+          <TextWithTooltip
+            text={isSystemUser ? "System" : user?.name || user?.id}
+            maxChars={maxChars}
+          />
+        </span>
+
+        <span
+          className={cn(
+            "text-nb-gray-350 font-light flex items-center gap-1 text-xs",
+            variant === "selected" && "text-xs pr-3 font-normal",
+          )}
+        >
+          <TextWithTooltip
+            text={user?.email || "NetBird"}
+            maxChars={maxChars}
+          />
+        </span>
+      </div>
+    </div>
+  );
+};

src/components/VirtualScrollAreaList.tsx

@@ -10,17 +10,42 @@ import { Virtuoso, VirtuosoHandle } from "react-virtuoso";
 type Props<T extends { id?: string }> = {
   items: T[];
   onSelect: (item: T) => void;
-  renderItem?: (item: T) => React.ReactNode;
+  renderItem?: (item: T, selected?: boolean) => React.ReactNode;
+  renderHeading?: (item: T) => React.ReactNode;
+  renderBeforeItem?: (item: T) => React.ReactNode;
   itemClassName?: string;
+  itemClassNameWithItem?: (item: T) => string;
+  itemWrapperClassName?: string;
+  scrollAreaClassName?: string;
+  maxHeight?: number;
+  estimatedItemHeight?: number;
+  estimatedHeadingHeight?: number;
+  heightAdjustment?: number;
+  groupKey?: (item: T) => string | undefined;
+  itemKey?: (item: T) => string;
 };
 
 export function VirtualScrollAreaList<T extends { id?: string }>({
   items,
   onSelect,
   renderItem,
+  renderBeforeItem,
+  renderHeading,
   itemClassName,
+  itemClassNameWithItem,
+  itemWrapperClassName,
+  scrollAreaClassName,
+  maxHeight,
+  estimatedItemHeight = 36,
+  estimatedHeadingHeight = 16,
+  heightAdjustment = 8,
+  groupKey,
+  itemKey,
 }: Readonly<Props<T>>) {
   const virtuosoRef = useRef<VirtuosoHandle>(null);
+  const [lastInputMethod, setLastInputMethod] = useState<"mouse" | "keyboard">(
+    "mouse",
+  );
   const [selected, setSelected] = useState(0);
 
   useEffect(() => {
@@ -37,6 +62,7 @@ export function VirtualScrollAreaList<T extends { id?: string }>({
 
   const navigation = useCallback(
     (e: KeyboardEvent) => {
+      setLastInputMethod("keyboard");
       if (items.length === 0) return;
       const length = items.length - 1;
       if (e.code === "ArrowUp" || (e.key === "Tab" && e.shiftKey)) {
@@ -59,39 +85,103 @@ export function VirtualScrollAreaList<T extends { id?: string }>({
   );
 
   useEffect(() => {
+    const handleMouse = () => setLastInputMethod("mouse");
+
     window.addEventListener("keydown", navigation);
+    window.addEventListener("mousemove", handleMouse);
     return () => {
       window.removeEventListener("keydown", navigation);
+      window.removeEventListener("mousemove", handleMouse);
     };
   }, [navigation]);
 
+  const headingCount = useMemo(() => {
+    if (!groupKey) return 0;
+
+    let count = 0;
+    let prev: string | undefined;
+
+    for (const item of items) {
+      const key = groupKey(item);
+      if (key !== prev) {
+        count++;
+        prev = key;
+      }
+    }
+
+    return count;
+  }, [items, groupKey]);
+
   const renderMemoizedItem = useMemo(() => renderItem, [renderItem]);
 
+  const scrollAreaHeight = { maxHeight: maxHeight ?? 195 };
+
+  const virtuosoHeight = {
+    height: Math.min(
+      items.length * estimatedItemHeight +
+        headingCount * estimatedHeadingHeight +
+        +(8 + heightAdjustment),
+      maxHeight ?? 195,
+    ),
+  };
+
+  const fixedItemHeight = useMemo(() => {
+    if (!groupKey) return estimatedItemHeight;
+    if (items.length === 0) return 0;
+    const h = virtuosoHeight.height / items.length;
+    if (isNaN(h)) return estimatedItemHeight;
+    return h;
+  }, [estimatedItemHeight, groupKey, items.length, virtuosoHeight.height]);
+
   return (
     <MemoizedScrollArea
       withoutViewport={true}
-      className={"max-h-[195px] flex flex-col gap-1 py-2"}
+      className={cn("flex flex-col gap-1 pt-2", scrollAreaClassName)}
+      style={scrollAreaHeight}
     >
       <Virtuoso
         ref={virtuosoRef}
         overscan={50}
         data={items}
+        defaultItemHeight={fixedItemHeight}
+        totalCount={items.length}
         computeItemKey={(index) => items[index].id as string}
         context={{ selected, setSelected, onClick: onSelect }}
         itemContent={(index, option, { selected, setSelected, onClick }) => {
+          const group = groupKey?.(option);
+          const prevGroup =
+            index > 0 ? groupKey?.(items[index - 1]) : undefined;
+          const showHeading = group && group !== prevGroup;
+
           return (
-            <VirtualScrollListItemWrapper
-              onMouseEnter={() => setSelected(index)}
-              id={option.id}
-              onClick={() => onClick(option)}
-              ariaSelected={selected === index}
-              className={itemClassName}
-            >
-              {renderMemoizedItem ? renderMemoizedItem(option) : option.id}
-            </VirtualScrollListItemWrapper>
+            <div>
+              {showHeading && renderHeading?.(option)}
+              {renderBeforeItem?.(option)}
+              <VirtualScrollListItemWrapper
+                onMouseEnter={() => {
+                  if (lastInputMethod === "mouse") {
+                    setSelected(index);
+                  }
+                }}
+                id={itemKey ? itemKey(option) : option?.id}
+                onClick={() => onClick(option)}
+                ariaSelected={selected === index}
+                itemClassName={
+                  itemClassNameWithItem
+                    ? itemClassNameWithItem(option)
+                    : itemClassName
+                }
+                className={itemWrapperClassName}
+                isLast={index === items.length - 1}
+              >
+                {renderMemoizedItem
+                  ? renderMemoizedItem(option, selected === index)
+                  : option.id}
+              </VirtualScrollListItemWrapper>
+            </div>
           );
         }}
-        style={{ height: 195 }}
+        style={virtuosoHeight}
         components={{
           Scroller: MemoizedScrollAreaViewport,
         }}
@@ -107,6 +197,8 @@ type ItemWrapperProps = {
   onClick?: () => void;
   ariaSelected?: boolean;
   className?: string;
+  itemClassName?: string;
+  isLast?: boolean;
 };
 
 export const VirtualScrollListItemWrapper = memo(
@@ -117,19 +209,21 @@ export const VirtualScrollListItemWrapper = memo(
     onMouseEnter,
     ariaSelected,
     className,
+    itemClassName,
+    isLast,
   }: ItemWrapperProps) => {
     return (
       <div
         key={id ?? undefined}
-        className={"pr-3 pl-2 webkit-scroll"}
-        onMouseEnter={onMouseEnter}
+        className={cn("pr-3 pl-2 webkit-scroll", isLast && "pb-2", className)}
+        onMouseOver={onMouseEnter}
         onClick={onClick}
       >
         <div
           className={cn(
-            "text-xs flex justify-between py-2 px-3 cursor-pointer items-center rounded-md",
+            "text-xs flex justify-between py-2 px-3 cursor-pointer items-center rounded-md group/list-item",
             "bg-transparent dark:aria-selected:bg-nb-gray-800/50",
-            className,
+            itemClassName,
           )}
           aria-selected={ariaSelected}
           role={"listitem"}

src/components/modal/Modal.tsx

@@ -5,6 +5,7 @@ import { DialogTriggerProps } from "@radix-ui/react-dialog";
 import { cn } from "@utils/helpers";
 import { X } from "lucide-react";
 import * as React from "react";
+import { headerHeight } from "@/layouts/Header";
 
 const Modal = DialogPrimitive.Root;
 
@@ -33,7 +34,7 @@ const ModalOverlay = React.forwardRef<
     className={cn(
       "fixed top-0 left-0 bottom-0 right-0 grid z-50  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 ",
       "mx-auto place-items-start overflow-y-auto md:py-16",
-      "bg-black/30 dark:bg-black/50 backdrop-blur-sm",
+      "bg-black/30 dark:bg-black/40 backdrop-blur-sm",
       className,
     )}
     {...props}
@@ -66,7 +67,7 @@ const ModalContent = React.forwardRef<
         <DialogPrimitive.Content
           ref={ref}
           className={cn(
-            "mx-auto relative top-0 z-[52] grid w-full  border border-neutral-200 bg-white py-6 dark:shadow-lg shadow-sm duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1  data-[state=open]:slide-in-from-left-1 sm:rounded-lg md:w-full dark:border-nb-gray-900 dark:bg-nb-gray",
+            "mx-auto relative top-0 z-[52] grid w-full focus:outline-0 border border-neutral-200 bg-white py-6 dark:shadow-lg shadow-sm duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1  data-[state=open]:slide-in-from-left-1 sm:rounded-lg md:w-full dark:border-nb-gray-900 dark:bg-nb-gray",
             className,
             maxWidthClass,
           )}
@@ -92,6 +93,62 @@ const ModalContent = React.forwardRef<
 );
 ModalContent.displayName = DialogPrimitive.Content.displayName;
 
+const SidebarModalContent = React.forwardRef<
+  React.ElementRef<typeof DialogPrimitive.Content>,
+  React.ComponentPropsWithoutRef<typeof DialogPrimitive.Content> &
+    ModalContentProps
+>(
+  (
+    {
+      className,
+      children,
+      showClose = true,
+      maxWidthClass = "max-w-3xl",
+      ...props
+    },
+    ref,
+  ) => {
+    return (
+      <ModalPortal>
+        <div
+          className={cn(
+            "fixed top-0 left-0 bottom-0 right-0 grid z-50  data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
+          )}
+        >
+          <DialogPrimitive.Content
+            ref={ref}
+            className={cn(
+              "ml-auto mt-auto relative bottom-0 z-[52] grid w-full border border-zinc-700/40 bg-white py-6 dark:shadow-lg shadow-sm duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0  data-[state=closed]:slide-out-to-left-1  data-[state=open]:slide-in-from-left-1 md:w-full dark:border-nb-gray-900 dark:bg-nb-gray",
+              "border-t-0 border-r-0 border-b-0 shadow-2xl",
+              className,
+              maxWidthClass,
+            )}
+            {...props}
+            style={{
+              height: `calc(100vh - ${headerHeight + 100 - 2}px)`,
+            }}
+            onClick={(e) => e.stopPropagation()}
+          >
+            <>
+              {children}
+              {showClose && (
+                <DialogPrimitive.Close
+                  data-cy={"modal-close"}
+                  className="absolute right-4 z-10 top-4 rounded-sm opacity-70 ring-offset-white transition-opacity hover:opacity-100 focus:outline-none focus:ring-2 focus:ring-neutral-950 focus:ring-offset-2 disabled:pointer-events-none data-[state=open]:bg-neutral-100 data-[state=open]:text-neutral-500 dark:ring-offset-neutral-950 dark:focus:ring-neutral-300 dark:data-[state=open]:bg-neutral-800 dark:data-[state=open]:text-neutral-400"
+                >
+                  <X className="h-4 w-4" />
+                  <span className="sr-only">Close</span>
+                </DialogPrimitive.Close>
+              )}
+            </>
+          </DialogPrimitive.Content>
+        </div>
+      </ModalPortal>
+    );
+  },
+);
+SidebarModalContent.displayName = DialogPrimitive.Content.displayName;
+
 type ModalFooterProps = {
   variant?: "setup" | "default";
   separator?: boolean;
@@ -158,4 +215,5 @@ export {
   ModalPortal,
   ModalTitle,
   ModalTrigger,
+  SidebarModalContent,
 };

src/components/modal/ModalHeader.tsx

@@ -25,7 +25,7 @@ export default function ModalHeader({
   center,
 }: Props) {
   return (
-    <div className={cn(className, "min-w-0")}>
+    <div className={cn(className, "min-w-0 relative z-[1]")}>
       <div className={"flex items-start gap-5 min-w-0"}>
         {icon && <SquareIcon color={color} icon={icon} />}
         <div className={cn("min-w-0", center && "text-center")}>

src/components/select/SelectDropdown.tsx

@@ -1,4 +1,4 @@
-import Button from "@components/Button";
+import Button, { ButtonVariants } from "@components/Button";
 import { CommandItem } from "@components/Command";
 import Paragraph from "@components/Paragraph";
 import { Popover, PopoverContent, PopoverTrigger } from "@components/Popover";
@@ -23,6 +23,8 @@ export interface SelectOption {
     width?: number;
     country?: string;
   }>;
+  renderItem?: () => React.ReactNode;
+  searchValue?: string;
 }
 
 interface SelectDropdownProps {
@@ -36,6 +38,12 @@ interface SelectDropdownProps {
   placeholder?: string;
   searchPlaceholder?: string;
   isLoading?: boolean;
+  variant?: ButtonVariants["variant"];
+  className?: string;
+  size?: "xs" | "sm";
+  children?: React.ReactNode;
+  maxHeight?: number;
+  triggerClassName?: string;
 }
 
 export function SelectDropdown({
@@ -49,15 +57,18 @@ export function SelectDropdown({
   placeholder = "Select...",
   searchPlaceholder = "Search...",
   isLoading = false,
-}: SelectDropdownProps) {
+  variant = "input",
+  className,
+  size = "sm",
+  children,
+  maxHeight,
+  triggerClassName,
+}: Readonly<SelectDropdownProps>) {
   const [inputRef, { width }] = useElementSize<HTMLButtonElement>();
 
   const toggle = (selectedValue: string) => {
     const isSelected = value == selectedValue;
-    if (isSelected) {
-    } else {
-      onChange && onChange(selectedValue);
-    }
+    if (!isSelected) onChange?.(selectedValue);
     setTimeout(() => {
       setSearch("");
     }, 100);
@@ -66,18 +77,6 @@ export function SelectDropdown({
 
   const [open, setOpen] = useState(false);
 
-  const [slice, setSlice] = useState(10);
-
-  useEffect(() => {
-    if (open) {
-      setTimeout(() => {
-        setSlice(options.length);
-      }, 100);
-    } else {
-      setSlice(10);
-    }
-  }, [open, options]);
-
   const selected = options.find((o) => o.value === value);
 
   const searchRef = React.useRef<HTMLInputElement>(null);
@@ -87,16 +86,55 @@ export function SelectDropdown({
   const filteredItems = React.useMemo(() => {
     if (isEmpty(debouncedSearch)) return options;
     return options.filter((item) => {
-      const value = `${item.label}${item.value}` || "";
+      const value = item?.searchValue || `${item.label}${item.value}` || "";
       return value.toLowerCase().includes(debouncedSearch.toLowerCase());
     });
   }, [options, debouncedSearch]);
 
+  const Loading = () => {
+    return (
+      <div className={"flex items-center gap-2"}>
+        <Skeleton width={20} />
+        <Skeleton width={100} />
+      </div>
+    );
+  };
+
+  const SelectedItem = () => {
+    return (
+      <div className={"flex items-center gap-2.5"}>
+        {selected?.icon && <selected.icon size={14} width={14} />}
+        <div
+          className={cn(
+            "flex flex-col text-sm font-medium",
+            size === "xs" && "text-xs",
+          )}
+        >
+          <span className={"text-nb-gray-200"}>{selected?.label}</span>
+        </div>
+      </div>
+    );
+  };
+
+  const PlaceholderItem = () => {
+    return (
+      <div className={"flex items-center gap-2.5"}>
+        <div
+          className={cn(
+            "flex flex-col text-sm font-medium",
+            size === "xs" && "text-xs",
+          )}
+        >
+          <span className={"text-nb-gray-200"}>{placeholder}</span>
+        </div>
+      </div>
+    );
+  };
+
   return (
     <Popover
       open={open}
       onOpenChange={(isOpen) => {
-        setSlice(10);
         if (!isOpen) {
           setTimeout(() => {
             setSearch("");
@@ -105,48 +143,33 @@ export function SelectDropdown({
         setOpen(isOpen);
       }}
     >
-      <PopoverTrigger asChild={true} disabled={disabled || isLoading}>
-        <Button
-          variant={"input"}
-          disabled={disabled || isLoading}
-          ref={inputRef}
-          className={"w-full"}
-        >
-          <div className={"w-full flex justify-between items-center gap-2"}>
-            {isLoading ? (
-              <div className={"flex gap-2"}>
-                <Skeleton width={20} />
-                <Skeleton width={100} />
+      <PopoverTrigger
+        asChild={!children}
+        disabled={disabled || isLoading}
+        className={triggerClassName}
+      >
+        {children ? (
+          children
+        ) : (
+          <Button
+            variant={variant}
+            disabled={disabled || isLoading}
+            ref={inputRef}
+            className={cn("w-full focus:outline-none", className)}
+          >
+            <div className={"w-full flex justify-between items-center gap-2"}>
+              {isLoading && <Loading />}
+              {!isLoading && selected && <SelectedItem />}
+              {!isLoading && !selected && <PlaceholderItem />}
+              <div className={"pl-2"}>
+                <ChevronsUpDown size={18} className={"shrink-0"} />
               </div>
-            ) : selected ? (
-              <React.Fragment>
-                <div className={"flex items-center gap-2.5"}>
-                  {selected?.icon && <selected.icon size={14} width={14} />}
-                  <div className={"flex flex-col text-sm font-medium"}>
-                    <span className={"text-nb-gray-200"}>
-                      {selected?.label}
-                    </span>
-                  </div>
-                </div>
-              </React.Fragment>
-            ) : (
-              <React.Fragment>
-                <div className={"flex items-center gap-2.5"}>
-                  <div className={"flex flex-col text-sm font-medium"}>
-                    <span className={"text-nb-gray-200"}>{placeholder}</span>
-                  </div>
-                </div>
-              </React.Fragment>
-            )}
-
-            <div className={"pl-2"}>
-              <ChevronsUpDown size={18} className={"shrink-0"} />
             </div>
-          </div>
-        </Button>
+          </Button>
+        )}
       </PopoverTrigger>
       <PopoverContent
-        className="w-full p-0 shadow-sm  shadow-nb-gray-950"
+        className="w-full p-0 shadow-sm  shadow-nb-gray-950 focus:outline-none"
         style={{
           width: popoverWidth === "auto" ? width : popoverWidth,
         }}
@@ -178,18 +201,22 @@ export function SelectDropdown({
 
             <ScrollArea
               className={cn(
-                "max-h-[380px] overflow-y-auto flex flex-col gap-1 pl-2 pb-2 pr-3",
+                "overflow-y-auto flex flex-col gap-1 pl-2 pr-3",
                 !showSearch && "pt-2",
               )}
+              style={{
+                maxHeight: maxHeight ?? 380,
+              }}
             >
               <CommandGroup>
-                <div className={"grid grid-cols-1 gap-1"}>
+                <div className={"grid grid-cols-1 gap-1 pb-2"}>
                   {filteredItems.map((option) => (
                     <SelectDropdownItem
                       option={option}
                       toggle={toggle}
                       key={option.value}
                       showValue={showValues}
+                      size={size}
                     />
                   ))}
                 </div>
@@ -206,10 +233,12 @@ const SelectDropdownItem = ({
   option,
   toggle,
   showValue = false,
+  size = "sm",
 }: {
   option: SelectOption;
   toggle: (value: string) => void;
   showValue?: boolean;
+  size: "xs" | "sm";
 }) => {
   const value = option.value || "" + option.label || "";
   const elementRef = useRef<HTMLDivElement>(null);
@@ -227,7 +256,7 @@ const SelectDropdownItem = ({
     <div ref={elementRef} className={"transition-all"}>
       {visible ? (
         <CommandItem
-          value={value}
+          value={option?.searchValue ?? value}
           ref={elementRef}
           className={"py-1 px-2"}
           onSelect={() => toggle(option.value)}
@@ -235,13 +264,23 @@ const SelectDropdownItem = ({
         >
           <div className={"flex items-center gap-2.5 p-1"}>
             {option.icon && <option.icon size={14} width={14} />}
-            <div className={"flex flex-col text-sm font-medium"}>
-              <span className={"text-nb-gray-200"}>{option.label}</span>
-            </div>
+            {option?.renderItem && option.renderItem()}
+            {!option?.renderItem && (
+              <div
+                className={cn(
+                  "flex flex-col text-sm font-medium",
+                  size === "xs" && "text-xs",
+                )}
+              >
+                <span className={"text-nb-gray-200"}>{option.label}</span>
+              </div>
+            )}
           </div>
           {showValue && (
             <div className={"flex items-center gap-2.5 p-1"}>
-              <Paragraph className={cn("text-sm text-right")}>
+              <Paragraph
+                className={cn("text-sm text-right", size === "xs" && "text-xs")}
+              >
                 {option.value}
               </Paragraph>
             </div>

src/components/select/SelectDropdownSearchInput.tsx

@@ -1,4 +1,3 @@
-import { IconArrowBack } from "@tabler/icons-react";
 import { cn } from "@utils/helpers";
 import { SearchIcon } from "lucide-react";
 import * as React from "react";
@@ -38,15 +37,9 @@ export const SelectDropdownSearchInput = forwardRef<HTMLInputElement, Props>(
             <SearchIcon size={14} />
           </div>
         </div>
-        <div className={"absolute right-0 top-0 h-full flex items-center pr-4"}>
-          <div
-            className={
-              "flex items-center bg-nb-gray-800 py-1 px-1.5 rounded-[4px] border border-nb-gray-500"
-            }
-          >
-            <IconArrowBack size={10} />
-          </div>
-        </div>
+        <div
+          className={"absolute right-0 top-0 h-full flex items-center pr-4"}
+        ></div>
       </div>
     );
   },

src/components/skeletons/SkeletonTable.tsx

@@ -6,16 +6,26 @@ type Props = {
   withHeader?: boolean;
 };
 
-export default function SkeletonTable({ withHeader = true }: Props) {
+export default function SkeletonTable({ withHeader = true }: Readonly<Props>) {
   return (
     <div className={"w-full"}>
       {withHeader && <SkeletonTableHeader />}
-      <Skeleton
-        height={48}
-        containerClassName={"flex"}
-        className={cn(withHeader && "mt-8")}
-      />
-      <div>
+      <div className={"mt-6 relative -top-1"}>
+        <TableSkeletonRow />
+        <TableSkeletonRow odd />
+        <TableSkeletonRow />
+        <TableSkeletonRow odd />
+        <TableSkeletonRow />
+        <TableSkeletonRow odd />
+      </div>
+    </div>
+  );
+}
+
+export function TableContentSkeleton() {
+  return (
+    <div className={"w-full"}>
+      <div className={"mt-6"}>
         <TableSkeletonRow />
         <TableSkeletonRow odd />
         <TableSkeletonRow />
@@ -31,7 +41,7 @@ type RowProps = {
   odd?: boolean;
 };
 
-export function TableSkeletonRow({ odd = false }: RowProps) {
+export function TableSkeletonRow({ odd = false }: Readonly<RowProps>) {
   return (
     <div
       className={cn(
@@ -58,7 +68,7 @@ export const SkeletonTableHeader = ({
   return (
     <div
       className={cn(
-        "flex gap-x-4 gap-y-6 p-default flex-wrap w-full justify-between",
+        "flex gap-x-4 gap-y-6 p-default flex-wrap w-full justify-between relative -top-1",
         className,
       )}
     >

src/components/table/DataTable.tsx

@@ -1,5 +1,5 @@
 "use client";
-import SkeletonTable from "@components/skeletons/SkeletonTable";
+import { TableContentSkeleton } from "@components/skeletons/SkeletonTable";
 import DataTableGlobalSearch from "@components/table/DataTableGlobalSearch";
 import { DataTableHeadingPortal } from "@components/table/DataTableHeadingPortal";
 import { DataTablePagination } from "@components/table/DataTablePagination";
@@ -40,10 +40,10 @@ import {
 import { FilterFn } from "@tanstack/table-core";
 import { cn, removeAllSpaces } from "@utils/helpers";
 import dayjs from "dayjs";
-import { trim } from "lodash";
+import { isEqual, trim } from "lodash";
 import { usePathname } from "next/navigation";
 import * as React from "react";
-import { useState } from "react";
+import { useEffect, useRef, useState } from "react";
 import { useLocalStorage } from "@/hooks/useLocalStorage";
 
 declare module "@tanstack/table-core" {
@@ -84,7 +84,6 @@ const isWithinRange: FilterFn<any> = (
 ) => {
   const date = dayjs(row.getValue(columnId));
   const [start, end] = value;
-  //If one filter defined and date is null filter it
   if ((start || end) && !date) return false;
   if (start && !end) {
     return date.isAfter(dayjs(start));
@@ -101,7 +100,7 @@ const arrIncludesSomeExact: FilterFn<any> = (
   value: string[],
 ) => {
   const rowValue = row.getValue(columnId);
-  if (!rowValue) return false;
+  if (!rowValue && rowValue !== 0) return false;
   return value.some((val) => val === rowValue);
 };
 
@@ -134,6 +133,7 @@ interface DataTableProps<TData, TValue> {
   getStartedCard?: React.ReactNode;
   placeholders?: TData[];
   renderExpandedRow?: (row: TData) => React.ReactNode;
+  renderRow?: (row: TData, children: React.ReactNode) => React.ReactNode;
   minimal?: boolean;
   className?: string;
   inset?: boolean;
@@ -147,6 +147,8 @@ interface DataTableProps<TData, TValue> {
   showSearchAndFilters?: boolean;
   rightSide?: (table: TanStackTable<TData>) => React.ReactNode;
   manualPagination?: boolean;
+  manualFiltering?: boolean;
+  manualColumnFiltering?: boolean;
   showHeader?: boolean;
   rowSelection?: RowSelectionState;
   setRowSelection?: React.Dispatch<React.SetStateAction<RowSelectionState>>;
@@ -163,14 +165,23 @@ interface DataTableProps<TData, TValue> {
   initialPageSize?: number;
   uniqueKey?: string;
   resetRowSelectionOnSearch?: boolean;
+  pageCount?: number;
+  pagination?: { pageIndex: number; pageSize: number };
+  onPaginationChange?: (pagination: {
+    pageIndex: number;
+    pageSize: number;
+  }) => void;
+  totalRecords?: number;
+  globalFilter?: string;
+  onGlobalFilterChange?: (value: string) => void;
+  columnFilters?: ColumnFiltersState;
+  onColumnFiltersChange?: (filters: ColumnFiltersState) => void;
+  initialFilters?: ColumnFiltersState;
+  initialSearch?: string;
+  onSearchClick?: () => void;
 }
 
-export function DataTable<TData, TValue>(props: DataTableProps<TData, TValue>) {
-  if (props.isLoading) return <SkeletonTable withHeader={!props.minimal} />;
-  return <DataTableContent {...props} />;
-}
-
-export function DataTableContent<TData, TValue>({
+export function DataTable<TData, TValue>({
   columns,
   data,
   children,
@@ -183,6 +194,7 @@ export function DataTableContent<TData, TValue>({
   onRowClick,
   getStartedCard,
   renderExpandedRow,
+  renderRow,
   minimal,
   className,
   tableClassName,
@@ -196,6 +208,8 @@ export function DataTableContent<TData, TValue>({
   searchClassName,
   rightSide,
   manualPagination = false,
+  manualFiltering = false,
+  manualColumnFiltering = false,
   showHeader = true,
   rowSelection,
   setRowSelection,
@@ -212,18 +226,33 @@ export function DataTableContent<TData, TValue>({
   initialPageSize = 10,
   uniqueKey,
   resetRowSelectionOnSearch = true,
-}: DataTableProps<TData, TValue>) {
+  pageCount,
+  pagination,
+  onPaginationChange,
+  totalRecords,
+  globalFilter,
+  onGlobalFilterChange,
+  columnFilters: externalColumnFilters,
+  onColumnFiltersChange: externalOnColumnFiltersChange,
+  initialFilters,
+  initialSearch,
+  onSearchClick,
+}: Readonly<DataTableProps<TData, TValue>>) {
   const path = usePathname();
+  const isInitialRender = useRef(true);
 
-  const [columnFilters, setColumnFilters] = useLocalStorage<ColumnFiltersState>(
-    `netbird-table-columns${uniqueKey ? "/" + (uniqueKey as string) : path}`,
-    [],
-    keepStateInLocalStorage,
-  );
-  const [globalSearch, setGlobalSearch] = useLocalStorage(
+  const [localColumnFilters, setLocalColumnFilters] =
+    useLocalStorage<ColumnFiltersState>(
+      `netbird-table-columns${uniqueKey ? "/" + (uniqueKey as string) : path}`,
+      [],
+      keepStateInLocalStorage && !manualColumnFiltering,
+      initialFilters,
+    );
+  const [localGlobalSearch, setLocalGlobalSearch] = useLocalStorage(
     `netbird-table-search${uniqueKey ? "/" + (uniqueKey as string) : path}`,
-    "",
-    keepStateInLocalStorage,
+    globalFilter || "",
+    keepStateInLocalStorage && !manualFiltering,
+    initialSearch,
   );
 
   const [paginationState, setPaginationState] =
@@ -232,10 +261,10 @@ export function DataTableContent<TData, TValue>({
         uniqueKey ? "/" + (uniqueKey as string) : path
       }`,
       {
-        pageIndex: 0,
-        pageSize: 10,
+        pageIndex: pagination?.pageIndex ?? 0,
+        pageSize: pagination?.pageSize ?? initialPageSize,
       },
-      keepStateInLocalStorage,
+      keepStateInLocalStorage && !manualPagination,
     );
 
   const hasInitialData = !!(data && data.length > 0);
@@ -253,19 +282,30 @@ export function DataTableContent<TData, TValue>({
     autoResetAll: false,
     autoResetExpanded: false,
     manualPagination: manualPagination,
+    manualFiltering: manualFiltering || manualColumnFiltering,
+    pageCount: pageCount,
     state: {
       sorting,
       rowSelection: rowSelection ?? {},
-      columnFilters,
+      columnFilters: manualColumnFiltering
+        ? externalColumnFilters || []
+        : localColumnFilters,
       columnVisibility: columnVisibility,
-      globalFilter: globalSearch,
-      pagination: paginationState,
+      globalFilter: manualFiltering ? globalFilter : localGlobalSearch,
+      pagination: manualPagination
+        ? {
+            pageIndex: pagination?.pageIndex ?? 0,
+            pageSize: pagination?.pageSize ?? initialPageSize,
+          }
+        : paginationState,
     },
     initialState: {
       pagination: {
-        pageIndex: 0,
-        pageSize: initialPageSize || 10,
+        pageIndex: pagination?.pageIndex ?? 0,
+        pageSize: pagination?.pageSize ?? initialPageSize,
       },
+      columnFilters: initialFilters,
+      globalFilter: initialSearch,
     },
     sortingFns: {
       checkbox: checkboxSort,
@@ -273,8 +313,36 @@ export function DataTableContent<TData, TValue>({
     getRowId: useRowId ? (row) => row.id : undefined,
     onRowSelectionChange: setRowSelection,
     onSortingChange: setSorting,
-    onPaginationChange: setPaginationState,
-    onColumnFiltersChange: setColumnFilters,
+    onPaginationChange: (updater) => {
+      if (manualPagination) {
+        if (isInitialRender.current) {
+          isInitialRender.current = false;
+          return;
+        }
+        if (typeof updater === "function") {
+          const newState = updater(pagination!);
+          onPaginationChange?.(newState);
+        } else {
+          onPaginationChange?.(updater);
+        }
+      } else {
+        setPaginationState(updater);
+      }
+    },
+    onColumnFiltersChange: (filters) => {
+      if (manualColumnFiltering) {
+        externalOnColumnFiltersChange?.(filters as ColumnFiltersState);
+      } else {
+        setLocalColumnFilters(filters as ColumnFiltersState);
+      }
+    },
+    onGlobalFilterChange: (value) => {
+      if (manualFiltering) {
+        onGlobalFilterChange?.(value);
+      } else {
+        setLocalGlobalSearch(value);
+      }
+    },
     globalFilterFn: fuzzyFilter,
     onColumnVisibilityChange: setColumnVisibility,
     getCoreRowModel: getCoreRowModel(),
@@ -298,12 +366,53 @@ export function DataTableContent<TData, TValue>({
    */
   const resetFilters = () => {
     table.setPageIndex(0);
-    setColumnFilters([]);
-    setGlobalSearch("");
+    if (manualColumnFiltering) {
+      externalOnColumnFiltersChange?.([]);
+    } else {
+      setLocalColumnFilters([]);
+    }
+    if (manualFiltering) {
+      onGlobalFilterChange?.("");
+    } else {
+      setLocalGlobalSearch("");
+    }
     setRowSelection?.({});
     onFilterReset?.();
+    setSearchKey((prev) => (prev === 0 ? 1 : 0));
   };
 
+  const [searchKey, setSearchKey] = useState(0);
+
+  useEffect(() => {
+    if (manualPagination && pagination) {
+      const currentPagination = table.getState().pagination;
+      if (isEqual(currentPagination, pagination)) return;
+
+      table.setPagination({
+        pageIndex: pagination.pageIndex,
+        pageSize: pagination.pageSize,
+      });
+    }
+  }, [manualPagination, pagination, table]);
+
+  useEffect(() => {
+    if (manualFiltering && globalFilter !== undefined) {
+      const currentGlobalFilter = table.getState().globalFilter;
+      if (currentGlobalFilter !== globalFilter) {
+        table.setGlobalFilter(globalFilter);
+      }
+    }
+  }, [manualFiltering, globalFilter, table]);
+
+  useEffect(() => {
+    if (manualColumnFiltering && externalColumnFilters) {
+      const currentFilters = table.getState().columnFilters;
+      if (!isEqual(currentFilters, externalColumnFilters)) {
+        table.setColumnFilters(externalColumnFilters);
+      }
+    }
+  }, [manualColumnFiltering, externalColumnFilters, table]);
+
   return (
     <div className={cn("relative table-fixed-scroll", className)}>
       {showSearchAndFilters && (
@@ -315,44 +424,48 @@ export function DataTableContent<TData, TValue>({
         >
           <DataTableGlobalSearch
             className={searchClassName}
-            disabled={!hasInitialData}
-            globalSearch={globalSearch}
+            disabled={false} // Never disable the search input
+            key={searchKey}
+            onClick={onSearchClick}
+            isLoading={isLoading}
+            globalSearch={
+              manualFiltering ? globalFilter || "" : localGlobalSearch
+            }
             setGlobalSearch={(val) => {
               table.setPageIndex(0);
-              setGlobalSearch(val);
+              if (manualFiltering) {
+                onGlobalFilterChange?.(val);
+              } else {
+                setLocalGlobalSearch(val);
+              }
               resetRowSelectionOnSearch && setRowSelection?.({});
             }}
             placeholder={searchPlaceholder}
           />
-          {children && children(table)}
+          {children?.(table)}
           {showResetFilterButton && (
             <DataTableResetFilterButton onClick={resetFilters} table={table} />
           )}
           <div className={"flex gap-4 flex-wrap grow"}>
             <div className={"flex gap-4 flex-wrap"}></div>
-            {rightSide && rightSide(table)}
+            {rightSide?.(table)}
           </div>
         </div>
       )}
 
-      {aboveTable && aboveTable(table)}
+      {aboveTable?.(table)}
 
-      {!hasInitialData && !isLoading && (
-        <TableWrapper
-          wrapperComponent={wrapperComponent}
-          wrapperProps={wrapperProps}
-        >
-          {getStartedCard}
-        </TableWrapper>
-      )}
-
-      {hasInitialData && !isLoading && (
-        <TableWrapper
-          wrapperComponent={wrapperComponent}
-          wrapperProps={wrapperProps}
-        >
+      <TableWrapper
+        wrapperComponent={wrapperComponent}
+        wrapperProps={wrapperProps}
+      >
+        {isLoading ? (
+          <TableContentSkeleton />
+        ) : !hasInitialData ? (
+          getStartedCard
+        ) : (
           <TableComponent
-            className={cn("relative mt-8", tableClassName)}
+            className={cn("relative mt-6", tableClassName)}
             minimal={minimal}
           >
             {showHeader && as == "table" && (
@@ -394,94 +507,103 @@ export function DataTableContent<TData, TValue>({
                 )}
               >
                 {table.getRowModel().rows?.length ? (
-                  table.getRowModel().rows.map((row) => (
-                    <AccordionItem
-                      value={row.original.id}
-                      asChild={true}
-                      key={row.original.id}
-                    >
-                      <>
-                        <TableRowComponent
-                          minimal={minimal}
-                          data-row-id={row.original.id}
-                          className={cn(
-                            (onRowClick || renderExpandedRow) &&
-                              "cursor-pointer relative group/accordion",
-                            rowClassName,
-                          )}
-                          data-state={row.getIsSelected() && "selected"}
-                          data-accordion={
-                            accordion?.includes(row.original.id)
-                              ? "opened"
-                              : "closed"
-                          }
-                          onClick={(e) => {
-                            if (renderExpandedRow) {
-                              e.preventDefault();
-                              e.stopPropagation();
-                              setAccordion((prev) => {
-                                if (prev?.includes(row.original.id)) {
-                                  return prev.filter(
-                                    (item) => item !== row.original.id,
-                                  );
-                                } else {
-                                  return [...(prev ?? []), row.original.id];
-                                }
-                              });
+                  table.getRowModel().rows.map((row) => {
+                    const expandedRow = renderExpandedRow?.(row.original);
+                    const rowContent = (
+                      <AccordionItem
+                        value={row.original.id}
+                        asChild={true}
+                        key={row.id}
+                      >
+                        <>
+                          <TableRowComponent
+                            minimal={minimal}
+                            data-row-id={row.original.id}
+                            className={cn(
+                              (onRowClick || renderExpandedRow) &&
+                                "relative group/accordion",
+                              (onRowClick || expandedRow) && "cursor-pointer",
+                              rowClassName,
+                            )}
+                            data-state={row.getIsSelected() && "selected"}
+                            data-accordion={
+                              accordion?.includes(row.original.id)
+                                ? "opened"
+                                : "closed"
                             }
-                          }}
-                        >
-                          <>
-                            {row.getVisibleCells().map((cell) => (
-                              <TableCellComponent
-                                key={cell.id}
-                                className={cn("relative", tableCellClassName)}
-                                minimal={minimal}
-                                inset={inset}
-                                onClick={() => {
-                                  onRowClick && onRowClick(row, cell.column.id);
-                                }}
-                              >
-                                <div
-                                  className={
-                                    "absolute left-0 top-0 w-full h-full z-0"
+                            onClick={(e) => {
+                              if (expandedRow) {
+                                e.preventDefault();
+                                e.stopPropagation();
+                                setAccordion((prev) => {
+                                  if (prev?.includes(row.original.id)) {
+                                    return prev.filter(
+                                      (item) => item !== row.original.id,
+                                    );
+                                  } else {
+                                    return [...(prev ?? []), row.original.id];
                                   }
-                                ></div>
-                                <div className={"relative z-[1]"}>
-                                  {flexRender(
-                                    cell.column.columnDef.cell,
-                                    cell.getContext(),
-                                  )}
-                                </div>
-                              </TableCellComponent>
-                            ))}
-                          </>
-                        </TableRowComponent>
+                                });
+                              }
+                            }}
+                          >
+                            <>
+                              {row.getVisibleCells().map((cell) => (
+                                <TableCellComponent
+                                  key={cell.id}
+                                  className={cn("relative", tableCellClassName)}
+                                  minimal={minimal}
+                                  inset={inset}
+                                  onClick={() => {
+                                    onRowClick &&
+                                      onRowClick(row, cell.column.id);
+                                  }}
+                                >
+                                  <div
+                                    className={
+                                      "absolute left-0 top-0 w-full h-full z-0"
+                                    }
+                                  ></div>
+                                  <div className={"relative z-[1]"}>
+                                    {flexRender(
+                                      cell.column.columnDef.cell,
+                                      cell.getContext(),
+                                    )}
+                                  </div>
+                                </TableCellComponent>
+                              ))}
+                            </>
+                          </TableRowComponent>
 
-                        {renderExpandedRow && (
-                          <AccordionContent asChild={true}>
-                            <TableRowComponent
-                              data-row-id={row.id + "-expanded-row"}
-                              key={row.id + "-expanded-row"}
-                              minimal={minimal}
-                              className={cn(
-                                onRowClick && "cursor-pointer relative",
-                                rowClassName,
-                              )}
-                              data-state={row.getIsSelected() && "selected"}
-                            >
-                              <TableDataUnstyledComponent
-                                className={"w-full"}
-                                colSpan={row.getVisibleCells().length}
+                          {expandedRow && (
+                            <AccordionContent asChild={true}>
+                              <TableRowComponent
+                                data-row-id={row.id + "-expanded-row"}
+                                key={row.id + "-expanded-row"}
+                                minimal={minimal}
+                                className={cn(
+                                  onRowClick && "cursor-pointer relative",
+                                  rowClassName,
+                                )}
+                                data-state={row.getIsSelected() && "selected"}
                               >
-                                {renderExpandedRow(row.original)}
-                              </TableDataUnstyledComponent>
-                            </TableRowComponent>
-                          </AccordionContent>
-                        )}
-                      </>
-                    </AccordionItem>
-                  ))
+                                <TableDataUnstyledComponent
+                                  className={"w-full"}
+                                  colSpan={row.getVisibleCells().length}
+                                >
+                                  {expandedRow}
+                                </TableDataUnstyledComponent>
+                              </TableRowComponent>
+                            </AccordionContent>
+                          )}
+                        </>
+                      </AccordionItem>
+                    );
+
+                    return renderRow
+                      ? renderRow(row.original, rowContent)
+                      : rowContent;
+                  })
                 ) : (
                   <TableRowUnstyledComponent>
                     <TableCellComponent
@@ -495,14 +617,15 @@ export function DataTableContent<TData, TValue>({
               </TableBodyComponent>
             </Accordion>
           </TableComponent>
-        </TableWrapper>
-      )}
+        )}
+      </TableWrapper>
 
       <div className={paginationClassName}>
         <DataTablePagination
           table={table}
           text={text}
           paginationPadding={paginationPaddingClassName}
+          totalRecords={totalRecords}
         />
       </div>
 

src/components/table/DataTableFilter.tsx

@@ -0,0 +1,276 @@
+import Button from "@components/Button";
+import { Checkbox } from "@components/Checkbox";
+import { DropdownInfoText } from "@components/DropdownInfoText";
+import { DropdownInput } from "@components/DropdownInput";
+import { Popover, PopoverContent, PopoverTrigger } from "@components/Popover";
+import { VirtualScrollAreaList } from "@components/VirtualScrollAreaList";
+import { useSearch } from "@hooks/useSearch";
+import { Table } from "@tanstack/react-table";
+import { concat, sortBy, uniqBy } from "lodash";
+import { FilterIcon } from "lucide-react";
+import * as React from "react";
+import { useCallback, useMemo, useState } from "react";
+
+interface Props<TData> {
+  table: Table<TData>;
+  filters: Filter<TData>[];
+  disabled?: boolean;
+}
+
+/**
+ * Filter
+ * @param columnId - Column ID to filter
+ * @param group - Group name for the filter
+ * @param item - Function to render the filter item
+ */
+interface Filter<TData> {
+  columnId: keyof TData | string;
+  group?: string;
+  item: (item: TData, value: string) => string | React.ReactNode;
+  exclude?: string[];
+}
+
+interface FilterItem<TData> {
+  id: string;
+  value: string;
+  showGroupHeading: boolean;
+  columnId: keyof TData | string;
+  group?: string;
+  original: TData;
+  renderItem: () => React.ReactNode;
+}
+
+type SearchPredicate<TData> = (
+  item: FilterItem<TData>,
+  query: string,
+) => boolean;
+
+const searchPredicate: SearchPredicate<any> = (item, query) => {
+  const lowerCaseQuery = query.toLowerCase();
+  let itemValue = String(item?.value || "").toLowerCase();
+  return itemValue.includes(lowerCaseQuery);
+};
+
+/**
+ * @desc Generic filter button. Filters are based on the table data and are displayed in a popover with search functionality.
+ * @param table - Table instance from tanstack/react-table
+ * @param filters - Array of filters to display
+ * @param filters.columnId Id of the column to filter. This column must have a filterFn: "arrIncludesSomeExact" in the column definition of the table.
+ * @param filters.group - Group name for the filter
+ * @param filters.item - Function to render the filter item
+ * @param disabled - Disable the filter button
+ * @returns React.ReactNode
+ * @example
+ * <DataTableFilter table={table} disabled={false}
+ *  filters={[{
+ *    columnId: "name",
+ *    group: "Users",
+ *    item: (item) => item.name,
+ *    }]}
+ *  />
+ */
+export function DataTableFilter<TData>({
+  table,
+  filters,
+  disabled = false,
+}: Readonly<Props<TData>>) {
+  const searchRef = React.useRef<HTMLInputElement>(null);
+  const [open, setOpen] = useState(false);
+
+  const options = useMemo(
+    () =>
+      filters.flatMap((filter) => {
+        const getTableColumnValues = (columnId: string) => {
+          return [
+            ...new Set(
+              table
+                .getPreFilteredRowModel()
+                .rows.map((row) => {
+                  return {
+                    value: row?.getValue(columnId),
+                    original: row.original,
+                  };
+                })
+                .filter((value) => value !== undefined),
+            ),
+          ];
+        };
+
+        // Get unique values from table rows
+        let tableRows = uniqBy(
+          getTableColumnValues(filter.columnId as string),
+          "value",
+        );
+
+        // Filter out excluded values
+        if (filter.exclude) {
+          tableRows = tableRows.filter(
+            (row) => !filter.exclude?.includes(row.value as string),
+          );
+        }
+
+        // Sort values
+        tableRows = sortBy(tableRows, (row) => {
+          return isNaN(Number(row?.value)) ? row?.value : Number(row?.value);
+        });
+
+        const groupCounts: Record<string, number> = {};
+        return tableRows.map((row) => {
+          const groupKey = filter?.group ?? "Ungrouped";
+          groupCounts[groupKey] = (groupCounts[groupKey] || 0) + 1;
+
+          return {
+            id: `${String(filter.columnId)}-${row.value}`,
+            value: row.value,
+            showGroupHeading: groupCounts[groupKey] === 1,
+            columnId: filter.columnId,
+            group: filter?.group,
+            original: row.original,
+            renderItem: () => filter?.item(row.original, String(row.value)),
+          } as FilterItem<TData>;
+        });
+      }),
+    [],
+  );
+
+  const [filteredItems, search, setSearch] = useSearch<FilterItem<TData>>(
+    options,
+    searchPredicate,
+    {
+      filter: true,
+      debounce: 150,
+    },
+  );
+
+  const onOpenChange = (isOpen: boolean) => {
+    if (!isOpen) {
+      setTimeout(() => {
+        setSearch("");
+      }, 100);
+    }
+    setOpen(isOpen);
+  };
+
+  const getCurrentTableFilters = useCallback((columnId: string) => {
+    return table.getColumn(columnId)?.getFilterValue() as string[] | undefined;
+  }, []);
+
+  const onSelect = (item: FilterItem<TData>) => {
+    table.setPageIndex(0);
+
+    const currentFilters = getCurrentTableFilters(item.columnId as string);
+    const column = table.getColumn(item.columnId as string);
+
+    const newFilters = currentFilters?.includes(item.value)
+      ? currentFilters.filter((f) => f !== item.value)
+      : concat(currentFilters ?? [], item.value);
+
+    if (newFilters.length == 0) {
+      column?.setFilterValue(undefined);
+    } else {
+      column?.setFilterValue(newFilters);
+    }
+
+    searchRef.current?.focus();
+  };
+
+  const activeFiltersCount = useMemo(() => {
+    let columnIds = filters.map((filter) => filter.columnId as string);
+    let activeFilters = columnIds.map((columnId) => {
+      return getCurrentTableFilters(columnId);
+    });
+    return activeFilters.flat().filter((filter) => filter !== undefined).length;
+  }, [filters, getCurrentTableFilters]);
+
+  return (
+    <Popover open={open} onOpenChange={onOpenChange}>
+      <PopoverTrigger asChild={true}>
+        <Button variant={"secondary"} disabled={disabled}>
+          <FilterIcon size={15} className={"shrink-0"} />
+          <span>
+            <span className={"text-white"}>
+              {activeFiltersCount > 0 && activeFiltersCount}
+            </span>
+            {activeFiltersCount > 0 ? ` Filter(s)` : "Filter"}
+          </span>
+        </Button>
+      </PopoverTrigger>
+      <PopoverContent
+        hideWhenDetached={false}
+        className="w-full p-0 shadow-sm shadow-nb-gray-950"
+        style={{
+          width: "400px",
+        }}
+        align="start"
+        side={"bottom"}
+        sideOffset={10}
+      >
+        <div className={"w-full"}>
+          <DropdownInput
+            ref={searchRef}
+            value={search}
+            onChange={setSearch}
+            placeholder={"Search filters..."}
+            hideEnterIcon={true}
+          />
+
+          {filteredItems.length == 0 && search != "" && (
+            <DropdownInfoText className={"mb-4"}>
+              There are no filters matching your search.
+            </DropdownInfoText>
+          )}
+
+          <VirtualScrollAreaList
+            items={filteredItems}
+            maxHeight={270}
+            scrollAreaClassName={"pt-0"}
+            renderItem={(option) => {
+              const currentTableFilters = getCurrentTableFilters(
+                option.columnId as string,
+              );
+              const isActive = currentTableFilters?.includes(option.value);
+
+              return (
+                <div
+                  className={
+                    "text-neutral-500 dark:text-nb-gray-300 font-medium flex items-center gap-2 justify-between w-full"
+                  }
+                  key={option.id}
+                >
+                  <div
+                    className={
+                      "flex items-center gap-2 whitespace-nowrap text-xs font-normal tracking-wide"
+                    }
+                  >
+                    <div>{option?.renderItem()}</div>
+                  </div>
+                  <Checkbox checked={isActive} />
+                </div>
+              );
+            }}
+            onSelect={onSelect}
+          />
+        </div>
+      </PopoverContent>
+    </Popover>
+  );
+}
+
+const ListItemHeading = ({
+  children,
+  show = false,
+}: {
+  children: React.ReactNode;
+  show: boolean;
+}) => {
+  if (!show) return null;
+  return (
+    <p
+      className={
+        "!text-nb-gray-400 text-xs uppercase font-medium tracking-wider pb-1 pl-5 mb-.5 mt-4"
+      }
+    >
+      {children}
+    </p>
+  );
+};

src/components/table/DataTableGlobalSearch.tsx

@@ -1,38 +1,74 @@
 import { Input } from "@components/Input";
 import Kbd from "@components/Kbd";
+import { useDebounce } from "@hooks/useDebounce";
 import { Search } from "lucide-react";
-import React from "react";
+import React, { useEffect, useState } from "react";
 import { useHotkeys } from "react-hotkeys-hook";
 
 interface Props extends React.InputHTMLAttributes<HTMLInputElement> {
   setGlobalSearch: (value: string) => void;
   globalSearch?: string;
   className?: string;
+  isLoading?: boolean;
+  onClick?: () => void;
 }
 
 export default function DataTableGlobalSearch({
   setGlobalSearch,
   globalSearch,
   className = "min-w-[300px] max-w-[400px] grow",
+  isLoading,
+  onClick,
   ...props
-}: Props) {
+}: Readonly<Props>) {
   const ref = React.useRef<HTMLInputElement>(null);
+  const [inputValue, setInputValue] = useState(globalSearch || "");
+  const debouncedValue = useDebounce(inputValue, 800);
+
+  // Call setGlobalSearch when debounced value changes
+  useEffect(() => {
+    setGlobalSearch(debouncedValue);
+  }, [debouncedValue]);
+
+  useEffect(() => {
+    if (globalSearch !== undefined && globalSearch !== inputValue) {
+      setInputValue(globalSearch);
+    }
+  }, [globalSearch]);
 
   const handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
-    setGlobalSearch(e.target.value);
+    setInputValue(e.target.value);
   };
 
-  useHotkeys("mod+k", () => ref.current?.focus(), []);
+  useHotkeys(
+    "mod+k",
+    () => {
+      if (onClick) {
+        onClick?.();
+      } else {
+        ref.current?.focus();
+      }
+    },
+    [],
+  );
 
   return (
     <Input
       {...props}
       ref={ref}
+      onFocus={(e) => {
+        if (onClick) {
+          e.preventDefault();
+          e.stopPropagation();
+          onClick?.();
+        }
+      }}
       icon={<Search size={15} />}
-      value={globalSearch}
+      value={inputValue} // Shows immediate updates
       onChange={handleChange}
       maxWidthClass={className}
       customSuffix={<Kbd>⌘ K</Kbd>}
+      disabled={false}
     />
   );
 }

src/components/table/DataTableMultiSelectPopup.tsx

@@ -0,0 +1,89 @@
+import Button from "@components/Button";
+import FullTooltip from "@components/FullTooltip";
+import { IconX } from "@tabler/icons-react";
+import { cn } from "@utils/helpers";
+import { AnimatePresence, motion } from "framer-motion";
+import { MonitorSmartphoneIcon } from "lucide-react";
+import * as React from "react";
+
+type Props<T> = {
+  selectedItems?: T[];
+  label?: string;
+  onCanceled?: () => void;
+  rightSide?: React.ReactNode;
+};
+
+export function DataTableMultiSelectPopup<T>({
+  onCanceled,
+  label = "Peer(s) selected",
+  selectedItems,
+  rightSide,
+}: Props<T>) {
+  const count = selectedItems?.length || 0;
+  return (
+    <AnimatePresence>
+      {count > 0 && (
+        <div
+          className={"fixed -bottom-16 z-50 w-full left-0 pointer-events-none"}
+        >
+          <motion.div
+            exit={{
+              y: 100,
+            }}
+          >
+            <AnimatePresence>
+              <motion.div
+                animate={{ y: 0 }}
+                initial={{ y: 100 }}
+                exit={{ y: 100 }}
+                transition={{
+                  type: "spring",
+                  stiffness: 270,
+                  damping: 25,
+                  duration: 0.35,
+                }}
+                className={cn(
+                  "max-w-xl mx-auto border relative z-[50] bg-nb-gray-800 border-nb-gray-900 shadow-2xl border-b-0 overflow-hidden pointer-events-auto",
+                  "rounded-t-lg",
+                )}
+              >
+                <AnimatePresence mode={"popLayout"}>
+                  <div
+                    className={
+                      "flex gap-2 items-center text-sm px-6 pt-3.5 pb-20 bg-nb-gray-920/90 text-nb-gray-200 justify-between"
+                    }
+                  >
+                    <div className={"flex gap-2 items-center"}>
+                      <MonitorSmartphoneIcon size={16} className={""} />
+                      <span>
+                        <span className={"font-medium text-white"}>
+                          {count}
+                        </span>{" "}
+                        {label}
+                      </span>
+                    </div>
+                    <div className={"flex gap-2 items-center"}>
+                      {rightSide}
+                      <FullTooltip
+                        content={<span className={"text-xs"}>Cancel</span>}
+                      >
+                        <Button
+                          onClick={onCanceled}
+                          variant={"default-outline"}
+                          size={"xs"}
+                          className={"!h-9 !w-9"}
+                        >
+                          <IconX size={16} className={"shrink-0"} />
+                        </Button>
+                      </FullTooltip>
+                    </div>
+                  </div>
+                </AnimatePresence>
+              </motion.div>
+            </AnimatePresence>
+          </motion.div>
+        </div>
+      )}
+    </AnimatePresence>
+  );
+}

src/components/table/DataTablePagination.tsx

@@ -12,65 +12,78 @@ interface DataTablePaginationProps<TData> {
   table: Table<TData>;
   text?: string;
   paginationPadding?: string;
+  totalRecords?: number;
 }
 
 export function DataTablePagination<TData>({
   table,
   text = "rows",
   paginationPadding = "px-8 py-8",
+  totalRecords,
 }: DataTablePaginationProps<TData>) {
-  const allRows = table.getFilteredRowModel().rows.length;
   const rowsPerPage = table.getState().pagination.pageSize;
   const currentPage = table.getState().pagination.pageIndex + 1;
-  const isLastPage = currentPage === table.getPageCount();
-  const showingFrom = (currentPage - 1) * rowsPerPage + 1;
-  const showingTo = isLastPage ? allRows : showingFrom + rowsPerPage - 1;
   const pageCount = table.getPageCount();
 
-  return pageCount > 1 ? (
-    <div className={cn("flex items-center justify-between", paginationPadding)}>
-      <div className="text-nb-gray-400">
-        Showing{" "}
-        <span className={"font-medium text-white"}>
-          {showingFrom} to {showingTo}
-        </span>{" "}
-        of <span className={"font-medium text-white"}>{allRows}</span> {text}
-      </div>
-      <div className={"flex items-center gap-3"}>
-        <div className="flex items-center space-x-2">
-          <ButtonGroup>
-            <ButtonGroup.Button
-              onClick={() => table.setPageIndex(0)}
-              disabled={!table.getCanPreviousPage()}
-            >
-              <ChevronsLeft size={16} />
-            </ButtonGroup.Button>
-            <ButtonGroup.Button
-              onClick={() => table.previousPage()}
-              disabled={!table.getCanPreviousPage()}
-            >
-              <ChevronLeft size={18} />
-            </ButtonGroup.Button>
-            <ButtonGroup.Button>
-              <div>
-                {table.getState().pagination.pageIndex + 1} of {pageCount}
-              </div>
-            </ButtonGroup.Button>
-            <ButtonGroup.Button
-              onClick={() => table.nextPage()}
-              disabled={!table.getCanNextPage()}
-            >
-              <ChevronRight size={18} />
-            </ButtonGroup.Button>
-            <ButtonGroup.Button
-              onClick={() => table.setPageIndex(table.getPageCount() - 1)}
-              disabled={!table.getCanNextPage()}
-            >
-              <ChevronsRight size={18} />
-            </ButtonGroup.Button>
-          </ButtonGroup>
+  const totalRows =
+    totalRecords !== undefined
+      ? totalRecords
+      : table.getFilteredRowModel().rows.length;
+
+  const showingFrom = totalRows === 0 ? 0 : (currentPage - 1) * rowsPerPage + 1;
+  const showingTo = Math.min(currentPage * rowsPerPage, totalRows);
+
+  return (
+    pageCount > 1 && (
+      <div
+        className={cn("flex items-center justify-between", paginationPadding)}
+      >
+        <div className="text-nb-gray-400">
+          Showing{" "}
+          <span className={"font-medium text-white"}>
+            {showingFrom} to {showingTo}
+          </span>{" "}
+          of <span className={"font-medium text-white"}>{totalRows}</span>{" "}
+          {text}
         </div>
+        {pageCount > 1 && (
+          <div className={"flex items-center gap-3"}>
+            <div className="flex items-center space-x-2">
+              <ButtonGroup>
+                <ButtonGroup.Button
+                  onClick={() => table.setPageIndex(0)}
+                  disabled={!table.getCanPreviousPage()}
+                >
+                  <ChevronsLeft size={16} />
+                </ButtonGroup.Button>
+                <ButtonGroup.Button
+                  onClick={() => table.previousPage()}
+                  disabled={!table.getCanPreviousPage()}
+                >
+                  <ChevronLeft size={18} />
+                </ButtonGroup.Button>
+                <ButtonGroup.Button>
+                  <div>
+                    {currentPage} of {pageCount}
+                  </div>
+                </ButtonGroup.Button>
+                <ButtonGroup.Button
+                  onClick={() => table.nextPage()}
+                  disabled={!table.getCanNextPage()}
+                >
+                  <ChevronRight size={18} />
+                </ButtonGroup.Button>
+                <ButtonGroup.Button
+                  onClick={() => table.setPageIndex(table.getPageCount() - 1)}
+                  disabled={!table.getCanNextPage()}
+                >
+                  <ChevronsRight size={18} />
+                </ButtonGroup.Button>
+              </ButtonGroup>
+            </div>
+          </div>
+        )}
       </div>
-    </div>
-  ) : null;
+    )
+  );
 }