From 340b341b1e60042100a2f067ed7b71afe29b1500 Mon Sep 17 00:00:00 2001
From: Elias Kristoffer Bruvik <70512270+eliasbruvik@users.noreply.github.com>
Date: Tue, 19 Nov 2024 08:28:47 +0100
Subject: [PATCH] FIX-2594 Priority servers (#2599)

---
 Src/WitsmlExplorer.Api/Models/Connection.cs   |   1 +
 Src/WitsmlExplorer.Api/Models/Server.cs       |   2 +
 .../__testUtils__/testUtils.tsx               |   1 +
 .../components/ContentViews/ServerManager.tsx | 104 +++++++++++++++---
 .../ContextMenus/BhaRunContextMenu.tsx        |   3 +
 .../ContextMenus/CopyComponentsToServer.tsx   |   4 +-
 .../ContextMenus/FluidContextMenu.tsx         |   4 +-
 .../ContextMenus/FluidsReportContextMenu.tsx  |   3 +
 .../FormationMarkerContextMenu.tsx            |   3 +
 .../ContextMenus/LogCurveInfoContextMenu.tsx  |   5 +-
 .../ContextMenus/LogObjectContextMenu.tsx     |   3 +
 .../ContextMenus/LogsContextMenu.tsx          |   4 +-
 .../ContextMenus/MessageObjectContextMenu.tsx |   3 +
 .../ContextMenus/MudLogContextMenu.tsx        |   3 +
 .../ContextMenus/ObjectMenuItems.tsx          |   7 +-
 .../ObjectsSidebarContextMenu.tsx             |   4 +-
 .../ContextMenus/RigContextMenu.tsx           |   3 +
 .../ContextMenus/RiskContextMenu.tsx          |   3 +
 .../ContextMenus/TrajectoryContextMenu.tsx    |   3 +
 .../TrajectoryStationContextMenu.tsx          |   4 +-
 .../TubularComponentContextMenu.tsx           |   4 +-
 .../ContextMenus/TubularContextMenu.tsx       |   3 +
 .../ContextMenus/WbGeometryContextMenu.tsx    |   3 +
 .../WbGeometrySectionContextMenu.tsx          |   4 +-
 .../ContextMenus/WellContextMenu.tsx          |   4 +-
 .../ContextMenus/WellboreContextMenu.tsx      |   4 +-
 .../components/Modals/ObjectPickerModal.tsx   |   4 +-
 .../components/Modals/ServerModal.tsx         |  35 +++++-
 .../Modals/ShowLogDataOnServerModal.tsx       |   4 +-
 .../components/Sidebar/FilterPanel.tsx        |  20 +++-
 .../contexts/filter.tsx                       |  12 +-
 .../hooks/useServerFilter.ts                  |  46 ++++++++
 Src/WitsmlExplorer.Frontend/models/server.ts  |   4 +-
 .../tools/localStorageHelpers.tsx             |   1 +
 34 files changed, 281 insertions(+), 34 deletions(-)
 create mode 100644 Src/WitsmlExplorer.Frontend/hooks/useServerFilter.ts

diff --git a/Src/WitsmlExplorer.Api/Models/Connection.cs b/Src/WitsmlExplorer.Api/Models/Connection.cs
index 9fdfb6d4d..8d503154c 100644
--- a/Src/WitsmlExplorer.Api/Models/Connection.cs
+++ b/Src/WitsmlExplorer.Api/Models/Connection.cs
@@ -14,6 +14,7 @@ public Connection(Server server)
             CredentialIds = server.CredentialIds;
             Id = server.Id;
             DepthLogDecimals = server.DepthLogDecimals;
+            IsPriority = server.IsPriority;
         }
 
         [JsonPropertyName("usernames")]
diff --git a/Src/WitsmlExplorer.Api/Models/Server.cs b/Src/WitsmlExplorer.Api/Models/Server.cs
index d71951a6c..401d61a0d 100644
--- a/Src/WitsmlExplorer.Api/Models/Server.cs
+++ b/Src/WitsmlExplorer.Api/Models/Server.cs
@@ -25,6 +25,8 @@ public Server() : base(Guid.NewGuid())
         public IList<string> CredentialIds { get; init; }
         [JsonPropertyName("depthLogDecimals")]
         public int DepthLogDecimals { get; init; }
+        [JsonPropertyName("isPriority")]
+        public bool IsPriority { get; init; }
 
         public override string ToString()
         {
diff --git a/Src/WitsmlExplorer.Frontend/__testUtils__/testUtils.tsx b/Src/WitsmlExplorer.Frontend/__testUtils__/testUtils.tsx
index aab96cc8b..b70398cc2 100644
--- a/Src/WitsmlExplorer.Frontend/__testUtils__/testUtils.tsx
+++ b/Src/WitsmlExplorer.Frontend/__testUtils__/testUtils.tsx
@@ -157,6 +157,7 @@ export function getServer(overrides?: Partial<Server>): Server {
     roles: [],
     credentialIds: [],
     depthLogDecimals: 0,
+    isPriority: false,
     ...overrides
   };
 }
diff --git a/Src/WitsmlExplorer.Frontend/components/ContentViews/ServerManager.tsx b/Src/WitsmlExplorer.Frontend/components/ContentViews/ServerManager.tsx
index 008f9e478..3f37c1d89 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContentViews/ServerManager.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContentViews/ServerManager.tsx
@@ -1,6 +1,7 @@
 import { useIsAuthenticated } from "@azure/msal-react";
 import {
   ButtonProps,
+  Switch,
   Table,
   TextField,
   Typography
@@ -14,23 +15,31 @@ import UserCredentialsModal, {
 } from "components/Modals/UserCredentialsModal";
 import ProgressSpinner from "components/ProgressSpinner";
 import { Button } from "components/StyledComponents/Button";
+import { CommonPanelContainer } from "components/StyledComponents/Container";
 import { useConnectedServer } from "contexts/connectedServerContext";
-import { getSearchRegex } from "contexts/filter";
+import { FilterContext } from "contexts/filter";
 import { useLoggedInUsernames } from "contexts/loggedInUsernamesContext";
 import { LoggedInUsernamesActionType } from "contexts/loggedInUsernamesReducer";
+import { UserTheme } from "contexts/operationStateReducer";
 import OperationType from "contexts/operationType";
-import { useGetServers } from "hooks/query/useGetServers";
+import { getServersQueryKey, useGetServers } from "hooks/query/useGetServers";
 import { useOperationState } from "hooks/useOperationState";
-import { Server, emptyServer } from "models/server";
+import { useServerFilter } from "hooks/useServerFilter";
+import { emptyServer, Server } from "models/server";
 import { adminRole, getUserAppRoles, msalEnabled } from "msal/MsalAuthProvider";
-import React, { ChangeEvent, useEffect, useState } from "react";
+import React, { ChangeEvent, useContext, useEffect, useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { getWellsViewPath } from "routes/utils/pathBuilder";
 import AuthorizationService from "services/authorizationService";
 import NotificationService from "services/notificationService";
+import ServerService from "services/serverService";
 import styled from "styled-components";
 import { Colors } from "styles/Colors";
 import Icon from "styles/Icons";
+import {
+  setLocalStorageItem,
+  STORAGE_FILTER_PRIORITYSERVERS_KEY
+} from "tools/localStorageHelpers";
 
 const NEW_SERVER_ID = "1";
 
@@ -42,18 +51,16 @@ const ServerManager = (): React.ReactElement => {
     placeholderData: []
   });
   const {
-    operationState: { colors },
+    operationState: { colors, theme },
     dispatchOperation
   } = useOperationState();
   const editDisabled = msalEnabled && !getUserAppRoles().includes(adminRole);
   const navigate = useNavigate();
   const { connectedServer, setConnectedServer } = useConnectedServer();
   const { dispatchLoggedInUsernames } = useLoggedInUsernames();
-  const [filter, setFilter] = useState<string>("");
-  const searchRegex = getSearchRegex(filter);
-  const filteredServers = servers?.filter(
-    (s) => !filter || searchRegex.test(s.name) || searchRegex.test(s.url)
-  );
+  const [filterByName, setFilterByName] = useState<string>("");
+  const { selectedFilter, updateSelectedFilter } = useContext(FilterContext);
+  const filteredServers = useServerFilter(servers, filterByName);
 
   useEffect(() => {
     if (isError) {
@@ -100,6 +107,36 @@ const ServerManager = (): React.ReactElement => {
     });
   };
 
+  const togglePriority = async (server: Server) => {
+    try {
+      // Optimistically update the query cache to avoid full rerenders and to keep the scroll position.
+      queryClient.setQueryData(getServersQueryKey(), (oldServers: Server[]) =>
+        oldServers?.map((s) =>
+          s.id === server.id ? { ...s, isPriority: !s.isPriority } : s
+        )
+      );
+
+      const freshServer = await ServerService.updateServer({
+        ...server,
+        isPriority: !server.isPriority
+      });
+      if (freshServer) {
+        AuthorizationService.onServerStateChange(freshServer);
+      }
+    } catch (error) {
+      // Roll back on failure
+      queryClient.setQueryData(getServersQueryKey(), (oldServers: Server[]) =>
+        oldServers?.map((s) => (s.id === server.id ? server : s))
+      );
+
+      NotificationService.Instance.alertDispatcher.dispatch({
+        serverUrl: null,
+        message: `Unable to update priority: ${error.message}`,
+        isSuccess: false
+      });
+    }
+  };
+
   const CellStyle = {
     color: colors.interactive.primaryResting,
     padding: "0.3rem",
@@ -144,11 +181,34 @@ const ServerManager = (): React.ReactElement => {
           </Typography>
           <StyledTextField
             id="serverSearch"
-            value={filter}
+            value={filterByName}
             onChange={(e: ChangeEvent<HTMLInputElement>) =>
-              setFilter(e.target.value)
+              setFilterByName(e.target.value)
             }
           />
+          <CommonPanelContainer>
+            <Switch
+              checked={selectedFilter.filterPriorityServers}
+              onChange={() => {
+                setLocalStorageItem<boolean>(
+                  STORAGE_FILTER_PRIORITYSERVERS_KEY,
+                  !selectedFilter.filterPriorityServers
+                );
+                updateSelectedFilter({
+                  filterPriorityServers: !selectedFilter.filterPriorityServers
+                });
+              }}
+              size={theme === UserTheme.Compact ? "small" : "default"}
+            />
+            <Typography
+              style={{
+                color: colors.infographic.primaryMossGreen,
+                whiteSpace: "nowrap"
+              }}
+            >
+              Only show priority servers
+            </Typography>
+          </CommonPanelContainer>
         </div>
         <Button
           variant="outlined"
@@ -169,6 +229,7 @@ const ServerManager = (): React.ReactElement => {
             <Table.Cell style={CellHeaderStyle}>Username</Table.Cell>
             <Table.Cell style={CellHeaderStyle} />
             <Table.Cell style={CellHeaderStyle}>Status</Table.Cell>
+            <Table.Cell style={CellHeaderStyle}>Priority</Table.Cell>
             <Table.Cell style={CellHeaderStyle}></Table.Cell>
             <Table.Cell style={CellHeaderStyle}></Table.Cell>
           </Table.Row>
@@ -214,6 +275,23 @@ const ServerManager = (): React.ReactElement => {
                     }
                   />
                 </Table.Cell>
+                <Table.Cell style={CellStyle}>
+                  <Button
+                    variant="ghost"
+                    disabled={editDisabled || isError}
+                    onClick={() => togglePriority(server)}
+                  >
+                    <Icon
+                      name={
+                        server.isPriority
+                          ? "favoriteFilled"
+                          : "favoriteOutlined"
+                      }
+                      size={24}
+                      color={colors.text.staticIconsTertiary}
+                    />
+                  </Button>
+                </Table.Cell>
                 <Table.Cell style={CellStyle}>
                   <Button variant="ghost" onClick={() => onEditItem(server)}>
                     <Icon
@@ -226,7 +304,7 @@ const ServerManager = (): React.ReactElement => {
                 <Table.Cell style={CellStyle}>
                   <Button
                     data-testid="deleteServerButton"
-                    disabled={editDisabled}
+                    disabled={editDisabled || isError}
                     variant="ghost"
                     onClick={() =>
                       showDeleteServerModal(
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/BhaRunContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/BhaRunContextMenu.tsx
index a1b76305f..bae392fdc 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/BhaRunContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/BhaRunContextMenu.tsx
@@ -12,6 +12,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import BhaRun from "models/bhaRun";
 import { ObjectType } from "models/objectType";
 import React from "react";
@@ -24,6 +25,7 @@ const BhaRunContextMenu = (
   const { dispatchOperation } = useOperationState();
   const openInQueryView = useOpenInQueryView();
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { connectedServer } = useConnectedServer();
   const queryClient = useQueryClient();
 
@@ -35,6 +37,7 @@ const BhaRunContextMenu = (
           ObjectType.BhaRun,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/CopyComponentsToServer.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/CopyComponentsToServer.tsx
index f6f584beb..5daf6fa2c 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/CopyComponentsToServer.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/CopyComponentsToServer.tsx
@@ -9,6 +9,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import OperationType from "contexts/operationType";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import LogCurveInfo from "models/logCurveInfo";
 import ObjectOnWellbore from "models/objectOnWellbore";
@@ -37,6 +38,7 @@ export const CopyComponentsToServerMenuItem = (
   } = props;
   const { connectedServer } = useConnectedServer();
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { dispatchOperation } = useOperationState();
   const menuComponents = menuItemText("copy", componentType, componentsToCopy);
   const menuText =
@@ -87,7 +89,7 @@ export const CopyComponentsToServerMenuItem = (
       label={menuText}
       disabled={componentsToCopy.length < 1 || disableMenuItem}
     >
-      {servers?.map(
+      {filteredServers?.map(
         (server: Server) =>
           server.id !== connectedServer?.id && (
             <MenuItem
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/FluidContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/FluidContextMenu.tsx
index 739e86bc2..209505131 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/FluidContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/FluidContextMenu.tsx
@@ -17,6 +17,7 @@ import { useClipboardComponentReferencesOfType } from "components/ContextMenus/U
 import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import Fluid from "models/fluid";
 import FluidsReport from "models/fluidsReport";
@@ -40,6 +41,7 @@ const FluidContextMenu = (props: FluidContextMenuProps): React.ReactElement => {
   );
   const { connectedServer } = useConnectedServer();
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
 
   const toDelete = createComponentReferences(
     checkedFluids.map((fluid) => fluid.uid),
@@ -111,7 +113,7 @@ const FluidContextMenu = (props: FluidContextMenuProps): React.ReactElement => {
           </Typography>
         </MenuItem>,
         <NestedMenuItem key={"showOnServer"} label={"Show on server"}>
-          {servers.map((server: Server) => (
+          {filteredServers.map((server: Server) => (
             <MenuItem
               key={server.name}
               onClick={() =>
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/FluidsReportContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/FluidsReportContextMenu.tsx
index 37a3f0065..1a5e2ff53 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/FluidsReportContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/FluidsReportContextMenu.tsx
@@ -17,6 +17,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import FluidsReport from "models/fluidsReport";
 import { ObjectType } from "models/objectType";
@@ -28,6 +29,7 @@ const FluidsReportContextMenu = (
 ): React.ReactElement => {
   const { checkedObjects } = props;
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { dispatchOperation } = useOperationState();
   const openInQueryView = useOpenInQueryView();
   const fluidReferences = useClipboardComponentReferencesOfType(
@@ -66,6 +68,7 @@ const FluidsReportContextMenu = (
           ObjectType.FluidsReport,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/FormationMarkerContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/FormationMarkerContextMenu.tsx
index 1b80500ff..f776d7694 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/FormationMarkerContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/FormationMarkerContextMenu.tsx
@@ -12,6 +12,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import FormationMarker from "models/formationMarker";
 import { ObjectType } from "models/objectType";
 import React from "react";
@@ -26,6 +27,7 @@ const FormationMarkerContextMenu = (
   const { connectedServer } = useConnectedServer();
   const queryClient = useQueryClient();
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
 
   const extraMenuItems = (): React.ReactElement[] => {
     return [
@@ -55,6 +57,7 @@ const FormationMarkerContextMenu = (
           ObjectType.FormationMarker,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogCurveInfoContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogCurveInfoContextMenu.tsx
index 6bcc33487..20bd66b4e 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogCurveInfoContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogCurveInfoContextMenu.tsx
@@ -36,6 +36,7 @@ import {
   HideModalAction
 } from "contexts/operationStateReducer";
 import OperationType from "contexts/operationType";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import { IndexCurve } from "models/indexCurve";
 import { createComponentReferences } from "models/jobs/componentReferences";
@@ -82,6 +83,8 @@ const LogCurveInfoContextMenu = (
     isMultiLog = false
   } = props;
 
+  const filteredServers = useServerFilter(servers);
+
   const onlyPrioritizedCurvesAreChecked = checkedLogCurveInfoRows.every(
     (row, index) =>
       prioritizedLocalCurves.includes(row.mnemonic) ||
@@ -374,7 +377,7 @@ const LogCurveInfoContextMenu = (
           label={"Show on server"}
           disabled={isMultiLog}
         >
-          {servers.map((server: Server) => (
+          {filteredServers.map((server: Server) => (
             <MenuItem
               key={server.name}
               onClick={() =>
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogObjectContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogObjectContextMenu.tsx
index c043826c7..13a8508eb 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogObjectContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogObjectContextMenu.tsx
@@ -41,6 +41,7 @@ import OperationType from "contexts/operationType";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import CheckLogHeaderJob from "models/jobs/checkLogHeaderJob";
 import CompareLogDataJob from "models/jobs/compareLogData";
@@ -74,6 +75,7 @@ const LogObjectContextMenu = (
     useClipboardComponentReferencesOfType(ComponentType.Mnemonic);
   const { connectedServer } = useConnectedServer();
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const queryClient = useQueryClient();
   const navigate = useNavigate();
 
@@ -479,6 +481,7 @@ const LogObjectContextMenu = (
           ObjectType.Log,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogsContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogsContextMenu.tsx
index 7cd2e3e23..67bbfc671 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogsContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/LogsContextMenu.tsx
@@ -29,6 +29,7 @@ import {
   HideModalAction
 } from "contexts/operationStateReducer";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
+import { useServerFilter } from "hooks/useServerFilter";
 import { IndexCurve } from "models/indexCurve";
 import { toWellboreReference } from "models/jobs/wellboreReference";
 import LogObject from "models/logObject";
@@ -54,6 +55,7 @@ const LogsContextMenu = (props: LogsContextMenuProps): React.ReactElement => {
   const openInQueryView = useOpenInQueryView();
   const { connectedServer } = useConnectedServer();
   const queryClient = useQueryClient();
+  const filteredServers = useServerFilter(servers);
 
   const onClickNewLog = () => {
     const newLog: LogObject = {
@@ -121,7 +123,7 @@ const LogsContextMenu = (props: LogsContextMenuProps): React.ReactElement => {
           </Typography>
         </MenuItem>,
         <NestedMenuItem key={"showOnServer"} label={"Show on server"}>
-          {servers.map((server: Server) => (
+          {filteredServers.map((server: Server) => (
             <MenuItem
               key={server.name}
               onClick={() =>
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/MessageObjectContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/MessageObjectContextMenu.tsx
index 4ece3dbc9..e808c0d39 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/MessageObjectContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/MessageObjectContextMenu.tsx
@@ -22,6 +22,7 @@ import OperationType from "contexts/operationType";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import MessageObject from "models/messageObject";
 import ObjectOnWellbore from "models/objectOnWellbore";
 import { ObjectType } from "models/objectType";
@@ -38,6 +39,7 @@ const MessageObjectContextMenu = (
   const { connectedServer } = useConnectedServer();
   const queryClient = useQueryClient();
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
 
   const onClickCompare = () => {
     dispatchOperation({ type: OperationType.HideContextMenu });
@@ -105,6 +107,7 @@ const MessageObjectContextMenu = (
           ObjectType.Message,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/MudLogContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/MudLogContextMenu.tsx
index 6dfd6a3d8..f5fbb5de9 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/MudLogContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/MudLogContextMenu.tsx
@@ -17,6 +17,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import MudLog from "models/mudLog";
 import { ObjectType } from "models/objectType";
@@ -28,6 +29,7 @@ const MudLogContextMenu = (
 ): React.ReactElement => {
   const { checkedObjects } = props;
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const geologyIntervalReferences = useClipboardComponentReferencesOfType(
     ComponentType.GeologyInterval
   );
@@ -87,6 +89,7 @@ const MudLogContextMenu = (
           ObjectType.MudLog,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/ObjectMenuItems.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/ObjectMenuItems.tsx
index 331066948..2d423883c 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/ObjectMenuItems.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/ObjectMenuItems.tsx
@@ -30,8 +30,8 @@ import { Server } from "models/server";
 import React from "react";
 import { colors } from "styles/Colors";
 import { v4 as uuid } from "uuid";
-import DuplicateObjectModal from "../Modals/DuplicateObjectModal";
 import OperationType from "../../contexts/operationType";
+import DuplicateObjectModal from "../Modals/DuplicateObjectModal";
 
 export interface ObjectContextMenuProps {
   checkedObjects: ObjectOnWellbore[];
@@ -42,6 +42,7 @@ export const ObjectMenuItems = (
   objectType: ObjectType,
   selectedServer: Server,
   servers: Server[],
+  filteredServers: Server[],
   dispatchOperation: DispatchOperation,
   queryClient: QueryClient,
   openInQueryView: OpenInQueryView,
@@ -116,7 +117,7 @@ export const ObjectMenuItems = (
       label={`${menuItemText("copy", objectType, checkedObjects)} to server`}
       disabled={checkedObjects.length === 0}
     >
-      {servers.map(
+      {filteredServers.map(
         (server: Server) =>
           server.id !== selectedServer.id && (
             <MenuItem
@@ -175,7 +176,7 @@ export const ObjectMenuItems = (
       label={"Show on server"}
       disabled={checkedObjects.length !== 1}
     >
-      {servers.map((server: Server) => (
+      {filteredServers.map((server: Server) => (
         <MenuItem
           key={server.name}
           onClick={() =>
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/ObjectsSidebarContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/ObjectsSidebarContextMenu.tsx
index 84331d19d..ac52a2a3c 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/ObjectsSidebarContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/ObjectsSidebarContextMenu.tsx
@@ -22,6 +22,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { toWellboreReference } from "models/jobs/wellboreReference";
 import ObjectOnWellbore from "models/objectOnWellbore";
 import { ObjectType } from "models/objectType";
@@ -42,6 +43,7 @@ const ObjectsSidebarContextMenu = (
   const { wellbore, objectType } = props;
   const { dispatchOperation } = useOperationState();
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const objectReferences = useClipboardReferencesOfType(objectType);
   const openInQueryView = useOpenInQueryView();
   const { connectedServer } = useConnectedServer();
@@ -110,7 +112,7 @@ const ObjectsSidebarContextMenu = (
           </Typography>
         </MenuItem>,
         <NestedMenuItem key={"showOnServer"} label={"Show on server"}>
-          {servers.map((server: Server) => (
+          {filteredServers.map((server: Server) => (
             <MenuItem
               key={server.name}
               onClick={() =>
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/RigContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/RigContextMenu.tsx
index 5c47e3753..2553032ce 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/RigContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/RigContextMenu.tsx
@@ -13,6 +13,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ObjectType } from "models/objectType";
 import Rig from "models/rig";
 import React from "react";
@@ -25,6 +26,7 @@ const RigContextMenu = (props: ObjectContextMenuProps): React.ReactElement => {
   const { connectedServer } = useConnectedServer();
   const queryClient = useQueryClient();
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
 
   const extraMenuItems = (): React.ReactElement[] => {
     return [
@@ -59,6 +61,7 @@ const RigContextMenu = (props: ObjectContextMenuProps): React.ReactElement => {
           ObjectType.Rig,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/RiskContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/RiskContextMenu.tsx
index 913a80f88..55adb877f 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/RiskContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/RiskContextMenu.tsx
@@ -12,6 +12,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ObjectType } from "models/objectType";
 import RiskObject from "models/riskObject";
 import React from "react";
@@ -22,6 +23,7 @@ const RiskObjectContextMenu = (
 ): React.ReactElement => {
   const { checkedObjects } = props;
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { dispatchOperation } = useOperationState();
   const openInQueryView = useOpenInQueryView();
   const { connectedServer } = useConnectedServer();
@@ -55,6 +57,7 @@ const RiskObjectContextMenu = (
           ObjectType.Risk,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/TrajectoryContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/TrajectoryContextMenu.tsx
index 7d8f7e336..40902acaa 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/TrajectoryContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/TrajectoryContextMenu.tsx
@@ -17,6 +17,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import { ObjectType } from "models/objectType";
 import Trajectory from "models/trajectory";
@@ -28,6 +29,7 @@ const TrajectoryContextMenu = (
 ): React.ReactElement => {
   const { checkedObjects } = props;
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { dispatchOperation } = useOperationState();
   const trajectoryStationReferences = useClipboardComponentReferencesOfType(
     ComponentType.TrajectoryStation
@@ -87,6 +89,7 @@ const TrajectoryContextMenu = (
           ObjectType.Trajectory,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/TrajectoryStationContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/TrajectoryStationContextMenu.tsx
index bf0fd29ba..baf57ec5f 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/TrajectoryStationContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/TrajectoryStationContextMenu.tsx
@@ -22,6 +22,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import OperationType from "contexts/operationType";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import { createComponentReferences } from "models/jobs/componentReferences";
 import ObjectReference from "models/jobs/objectReference";
@@ -45,6 +46,7 @@ const TrajectoryStationContextMenu = (
   const { checkedTrajectoryStations, trajectory } = props;
   const { dispatchOperation } = useOperationState();
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { connectedServer } = useConnectedServer();
   const trajectoryStationReferences = useClipboardComponentReferencesOfType(
     ComponentType.TrajectoryStation
@@ -161,7 +163,7 @@ const TrajectoryStationContextMenu = (
           </Typography>
         </MenuItem>,
         <NestedMenuItem key={"showOnServer"} label={"Show on server"}>
-          {servers.map((server: Server) => (
+          {filteredServers.map((server: Server) => (
             <MenuItem
               key={server.name}
               onClick={() =>
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/TubularComponentContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/TubularComponentContextMenu.tsx
index 8952d31dc..59f8f4ba1 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/TubularComponentContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/TubularComponentContextMenu.tsx
@@ -24,6 +24,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import OperationType from "contexts/operationType";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import { createComponentReferences } from "models/jobs/componentReferences";
 import ObjectReference from "models/jobs/objectReference";
@@ -46,6 +47,7 @@ const TubularComponentContextMenu = (
 ): React.ReactElement => {
   const { checkedTubularComponents, tubular } = props;
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { dispatchOperation } = useOperationState();
   const tubularComponentReferences = useClipboardComponentReferencesOfType(
     ComponentType.TubularComponent
@@ -184,7 +186,7 @@ const TubularComponentContextMenu = (
           </Typography>
         </MenuItem>,
         <NestedMenuItem key={"showOnServer"} label={"Show on server"}>
-          {servers.map((server: Server) => (
+          {filteredServers.map((server: Server) => (
             <MenuItem
               key={server.name}
               onClick={() =>
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/TubularContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/TubularContextMenu.tsx
index 3451b8d7f..8cc7806b2 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/TubularContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/TubularContextMenu.tsx
@@ -17,6 +17,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import { ObjectType } from "models/objectType";
 import Tubular from "models/tubular";
@@ -28,6 +29,7 @@ const TubularContextMenu = (
 ): React.ReactElement => {
   const { checkedObjects } = props;
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { dispatchOperation } = useOperationState();
   const tubularComponentReferences = useClipboardComponentReferencesOfType(
     ComponentType.TubularComponent
@@ -87,6 +89,7 @@ const TubularContextMenu = (
           ObjectType.Tubular,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/WbGeometryContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/WbGeometryContextMenu.tsx
index 5b8e11987..4d3d1985a 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/WbGeometryContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/WbGeometryContextMenu.tsx
@@ -17,6 +17,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import { ObjectType } from "models/objectType";
 import WbGeometryObject from "models/wbGeometry";
@@ -28,6 +29,7 @@ const WbGeometryObjectContextMenu = (
 ): React.ReactElement => {
   const { checkedObjects } = props;
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { dispatchOperation } = useOperationState();
   const wbGeometrySectionReferences = useClipboardComponentReferencesOfType(
     ComponentType.WbGeometrySection
@@ -87,6 +89,7 @@ const WbGeometryObjectContextMenu = (
           ObjectType.WbGeometry,
           connectedServer,
           servers,
+          filteredServers,
           dispatchOperation,
           queryClient,
           openInQueryView,
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/WbGeometrySectionContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/WbGeometrySectionContextMenu.tsx
index f0db1151e..c07fb0cc6 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/WbGeometrySectionContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/WbGeometrySectionContextMenu.tsx
@@ -21,6 +21,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import OperationType from "contexts/operationType";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { ComponentType } from "models/componentType";
 import { createComponentReferences } from "models/jobs/componentReferences";
 import ObjectReference from "models/jobs/objectReference";
@@ -47,6 +48,7 @@ const WbGeometrySectionContextMenu = (
   );
   const { dispatchOperation } = useOperationState();
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { connectedServer } = useConnectedServer();
 
   const onClickProperties = async () => {
@@ -159,7 +161,7 @@ const WbGeometrySectionContextMenu = (
           </Typography>
         </MenuItem>,
         <NestedMenuItem key={"showOnServer"} label={"Show on server"}>
-          {servers.map((server: Server) => (
+          {filteredServers.map((server: Server) => (
             <MenuItem
               key={server.name}
               onClick={() =>
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/WellContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/WellContextMenu.tsx
index 752edd04f..8a06ee641 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/WellContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/WellContextMenu.tsx
@@ -38,6 +38,7 @@ import {
   refreshWellsQuery
 } from "hooks/query/queryRefreshHelpers";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
+import { useServerFilter } from "hooks/useServerFilter";
 import { DeleteWellJob } from "models/jobs/deleteJobs";
 import { Server } from "models/server";
 import Well from "models/well";
@@ -63,6 +64,7 @@ const WellContextMenu = (props: WellContextMenuProps): React.ReactElement => {
   const { connectedServer } = useConnectedServer();
   const openInQueryView = useOpenInQueryView();
   const queryClient = useQueryClient();
+  const filteredServers = useServerFilter(servers);
 
   const onClickNewWell = () => {
     const newWell: Well = {
@@ -232,7 +234,7 @@ const WellContextMenu = (props: WellContextMenuProps): React.ReactElement => {
           <Typography color={"primary"}>Delete empty mnemonics</Typography>
         </MenuItem>,
         <NestedMenuItem key={"showOnServer"} label={"Show on server"}>
-          {servers.map((server: Server) => (
+          {filteredServers.map((server: Server) => (
             <MenuItem
               key={server.name}
               onClick={() => onClickShowOnServer(server)}
diff --git a/Src/WitsmlExplorer.Frontend/components/ContextMenus/WellboreContextMenu.tsx b/Src/WitsmlExplorer.Frontend/components/ContextMenus/WellboreContextMenu.tsx
index 830bc6672..85c1d9c19 100644
--- a/Src/WitsmlExplorer.Frontend/components/ContextMenus/WellboreContextMenu.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/ContextMenus/WellboreContextMenu.tsx
@@ -37,6 +37,7 @@ import { refreshWellboreQuery } from "hooks/query/queryRefreshHelpers";
 import { useGetCapObjects } from "hooks/query/useGetCapObjects";
 import { useOpenInQueryView } from "hooks/useOpenInQueryView";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import { IndexCurve } from "models/indexCurve";
 import { DeleteWellboreJob } from "models/jobs/deleteJobs";
 import { toWellboreReference } from "models/jobs/wellboreReference";
@@ -69,6 +70,7 @@ const WellboreContextMenu = (
   const { capObjects } = useGetCapObjects(connectedServer, {
     placeholderData: Object.entries(ObjectType)
   });
+  const filteredServers = useServerFilter(servers);
 
   const onClickNewWellbore = () => {
     const newWellbore: Wellbore = {
@@ -252,7 +254,7 @@ const WellboreContextMenu = (
           <Typography color={"primary"}>Delete empty mnemonics</Typography>
         </MenuItem>,
         <NestedMenuItem key={"showOnServer"} label={"Show on server"}>
-          {servers.map((server: Server) => (
+          {filteredServers.map((server: Server) => (
             <MenuItem
               key={server.name}
               onClick={() => onClickShowOnServer(server)}
diff --git a/Src/WitsmlExplorer.Frontend/components/Modals/ObjectPickerModal.tsx b/Src/WitsmlExplorer.Frontend/components/Modals/ObjectPickerModal.tsx
index 3b67c7cea..c5e31d276 100644
--- a/Src/WitsmlExplorer.Frontend/components/Modals/ObjectPickerModal.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/Modals/ObjectPickerModal.tsx
@@ -10,6 +10,7 @@ import { Checkbox } from "components/StyledComponents/Checkbox";
 import OperationType from "contexts/operationType";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter";
 import MaxLength from "models/maxLength";
 import ObjectOnWellbore from "models/objectOnWellbore";
 import { ObjectType } from "models/objectType";
@@ -40,6 +41,7 @@ const ObjectPickerModal = ({
   includeCompareAllLogIndexesOption
 }: ObjectPickerProps): React.ReactElement => {
   const { servers } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const {
     operationState: { colors },
     dispatchOperation
@@ -137,7 +139,7 @@ const ObjectPickerModal = ({
           <Autocomplete
             id="server"
             label={`Compare to server ${targetServer?.name ?? ""}`}
-            options={servers}
+            options={filteredServers}
             optionLabel={(server: Server) => server.name}
             onOptionsChange={({ selectedItems }) => {
               setTargetServer(selectedItems[0]);
diff --git a/Src/WitsmlExplorer.Frontend/components/Modals/ServerModal.tsx b/Src/WitsmlExplorer.Frontend/components/Modals/ServerModal.tsx
index 497a0ecd8..2f3ae69d9 100644
--- a/Src/WitsmlExplorer.Frontend/components/Modals/ServerModal.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/Modals/ServerModal.tsx
@@ -1,4 +1,10 @@
-import { Icon, Label, TextField, Tooltip } from "@equinor/eds-core-react";
+import {
+  Icon,
+  Label,
+  Switch,
+  TextField,
+  Tooltip
+} from "@equinor/eds-core-react";
 import { QueryClient, useQueryClient } from "@tanstack/react-query";
 import ModalDialog, {
   ControlButtonPosition,
@@ -11,7 +17,8 @@ import { Button } from "components/StyledComponents/Button";
 import { useConnectedServer } from "contexts/connectedServerContext";
 import {
   DisplayModalAction,
-  HideModalAction
+  HideModalAction,
+  UserTheme
 } from "contexts/operationStateReducer";
 import OperationType from "contexts/operationType";
 import { refreshServersQuery } from "hooks/query/queryRefreshHelpers";
@@ -39,7 +46,7 @@ export interface ServerModalProps {
 const ServerModal = (props: ServerModalProps): React.ReactElement => {
   const queryClient = useQueryClient();
   const { operationState, dispatchOperation } = useOperationState();
-  const { colors } = operationState;
+  const { colors, theme } = operationState;
   const [server, setServer] = useState<Server>(props.server);
   const [connectionVerified, setConnectionVerified] = useState<boolean>(false);
   const [displayUrlError, setDisplayUrlError] = useState<boolean>(false);
@@ -268,6 +275,28 @@ const ServerModal = (props: ServerModalProps): React.ReactElement => {
               }
               disabled={props.editDisabled}
             />
+            <div style={{ display: "flex", flexDirection: "row" }}>
+              <Label label="Priority" style={labelStyle} htmlFor="isPriority" />
+              <Tooltip title="Marking a server as a priority allows you to filter and only display these servers throughout the application.">
+                <Icon
+                  name="infoCircle"
+                  color={colors.interactive.primaryResting}
+                  size={18}
+                />
+              </Tooltip>
+            </div>
+            <Switch
+              id="isPriority"
+              style={{ maxWidth: "fit-content" }}
+              checked={server.isPriority}
+              onChange={() =>
+                setServer({
+                  ...server,
+                  isPriority: !server.isPriority
+                })
+              }
+              size={theme === UserTheme.Compact ? "small" : "default"}
+            />
             <ButtonWrapper>
               {connectionVerified && (
                 <Icons
diff --git a/Src/WitsmlExplorer.Frontend/components/Modals/ShowLogDataOnServerModal.tsx b/Src/WitsmlExplorer.Frontend/components/Modals/ShowLogDataOnServerModal.tsx
index 58771191b..09e6e43b0 100644
--- a/Src/WitsmlExplorer.Frontend/components/Modals/ShowLogDataOnServerModal.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/Modals/ShowLogDataOnServerModal.tsx
@@ -10,6 +10,7 @@ import { useConnectedServer } from "contexts/connectedServerContext";
 import OperationType from "contexts/operationType";
 import { useGetServers } from "hooks/query/useGetServers";
 import { useOperationState } from "hooks/useOperationState";
+import { useServerFilter } from "hooks/useServerFilter.ts";
 import { Server } from "models/server";
 import { ChangeEvent, CSSProperties, useState } from "react";
 import { useParams, useSearchParams } from "react-router-dom";
@@ -51,6 +52,7 @@ export function ShowLogDataOnServerModal() {
   );
   const [selectedServer, setSelectedServer] = useState<Server>(null);
   const { servers, isFetching } = useGetServers();
+  const filteredServers = useServerFilter(servers);
   const { connectedServer } = useConnectedServer();
 
   const onChangeServer = async (event: any) => {
@@ -140,7 +142,7 @@ export function ShowLogDataOnServerModal() {
             id={"selectServerToShow"}
             label="Select a server"
             initialSelectedOptions={[]}
-            options={servers
+            options={filteredServers
               .filter((server) => server.id !== connectedServer.id)
               .map((server) => server.name)}
             onOptionsChange={onChangeServer}
diff --git a/Src/WitsmlExplorer.Frontend/components/Sidebar/FilterPanel.tsx b/Src/WitsmlExplorer.Frontend/components/Sidebar/FilterPanel.tsx
index e6b30be61..e8ee803cb 100644
--- a/Src/WitsmlExplorer.Frontend/components/Sidebar/FilterPanel.tsx
+++ b/Src/WitsmlExplorer.Frontend/components/Sidebar/FilterPanel.tsx
@@ -21,7 +21,8 @@ import {
   STORAGE_FILTER_INACTIVE_TIME_CURVES_KEY,
   STORAGE_FILTER_INACTIVE_TIME_CURVES_VALUE_KEY,
   STORAGE_FILTER_ISACTIVE_KEY,
-  STORAGE_FILTER_OBJECTGROWING_KEY
+  STORAGE_FILTER_OBJECTGROWING_KEY,
+  STORAGE_FILTER_PRIORITYSERVERS_KEY
 } from "tools/localStorageHelpers";
 
 const FilterPanel = (): React.ReactElement => {
@@ -56,6 +57,14 @@ const FilterPanel = (): React.ReactElement => {
     updateSelectedFilter({ isActive: e.target.checked });
   };
 
+  const onChangePriorityServers = (e: ChangeEvent<HTMLInputElement>) => {
+    setLocalStorageItem<boolean>(
+      STORAGE_FILTER_PRIORITYSERVERS_KEY,
+      e.target.checked
+    );
+    updateSelectedFilter({ filterPriorityServers: e.target.checked });
+  };
+
   const onChangeObjectGrowing = (e: ChangeEvent<HTMLInputElement>) => {
     setLocalStorageItem<boolean>(
       STORAGE_FILTER_OBJECTGROWING_KEY,
@@ -92,6 +101,15 @@ const FilterPanel = (): React.ReactElement => {
     <EdsProvider density="compact">
       <Container colors={colors}>
         <InnerContainer>
+          <Checkbox
+            id="filter-serverPriority"
+            value={"Only show priority servers"}
+            color={"primary"}
+            checked={selectedFilter.filterPriorityServers}
+            onChange={onChangePriorityServers}
+            label={"Only show priority servers"}
+            colors={colors}
+          />
           <Checkbox
             id="filter-isActive"
             value={"Hide inactive Wells / Wellbores"}
diff --git a/Src/WitsmlExplorer.Frontend/contexts/filter.tsx b/Src/WitsmlExplorer.Frontend/contexts/filter.tsx
index 6176df3c9..72e4f5324 100644
--- a/Src/WitsmlExplorer.Frontend/contexts/filter.tsx
+++ b/Src/WitsmlExplorer.Frontend/contexts/filter.tsx
@@ -7,6 +7,7 @@ import {
   STORAGE_FILTER_HIDDENOBJECTS_KEY,
   STORAGE_FILTER_ISACTIVE_KEY,
   STORAGE_FILTER_OBJECTGROWING_KEY,
+  STORAGE_FILTER_PRIORITYSERVERS_KEY,
   getLocalStorageItem
 } from "tools/localStorageHelpers";
 
@@ -18,6 +19,7 @@ export interface Filter {
   searchResults?: ObjectSearchResult[];
   wellboreSearchResults?: Wellbore[];
   objectVisibilityStatus: Record<ObjectType, VisibilityStatus>;
+  filterPriorityServers: boolean;
 }
 
 export enum VisibilityStatus {
@@ -149,7 +151,8 @@ export const EMPTY_FILTER: Filter = {
   filterType: WellFilterType.Well,
   searchResults: [],
   wellboreSearchResults: [],
-  objectVisibilityStatus: allVisibleObjects
+  objectVisibilityStatus: allVisibleObjects,
+  filterPriorityServers: false
 };
 
 interface FilterContextProps {
@@ -260,5 +263,12 @@ const getLocalStorageFilter = (): Partial<Filter> => {
     localStorageFilter["objectGrowing"] = objectGrowing;
   }
 
+  const filterPriorityServers = getLocalStorageItem<boolean>(
+    STORAGE_FILTER_PRIORITYSERVERS_KEY
+  );
+  if (filterPriorityServers !== null) {
+    localStorageFilter["filterPriorityServers"] = filterPriorityServers;
+  }
+
   return localStorageFilter;
 };
diff --git a/Src/WitsmlExplorer.Frontend/hooks/useServerFilter.ts b/Src/WitsmlExplorer.Frontend/hooks/useServerFilter.ts
new file mode 100644
index 000000000..5311acff4
--- /dev/null
+++ b/Src/WitsmlExplorer.Frontend/hooks/useServerFilter.ts
@@ -0,0 +1,46 @@
+import { Server } from "models/server";
+import { useContext, useMemo } from "react";
+import { Filter, FilterContext, getSearchRegex } from "../contexts/filter";
+
+const filterServersByPriority = (servers: Server[]): Server[] => {
+  return servers.filter((server) => server.isPriority);
+};
+
+const filterServersByName = (servers: Server[], filterByName: string) => {
+  const searchRegex = getSearchRegex(filterByName);
+  return servers.filter(
+    (server) => searchRegex.test(server.name) || searchRegex.test(server.url)
+  );
+};
+
+export const filterServers = (
+  servers: Server[],
+  filter: Filter,
+  filterByName?: string
+): Server[] => {
+  let filteredServers: Server[] = servers;
+
+  if ((filter || filterByName) && servers?.length > 0) {
+    if (filter.filterPriorityServers) {
+      filteredServers = filterServersByPriority(servers);
+    }
+    if (filterByName) {
+      filteredServers = filterServersByName(servers, filterByName);
+    }
+  }
+
+  return filteredServers;
+};
+
+export const useServerFilter = (
+  servers: Server[],
+  filterByName?: string
+): Server[] => {
+  const { selectedFilter } = useContext(FilterContext);
+
+  const filteredServers = useMemo(() => {
+    return filterServers(servers, selectedFilter, filterByName);
+  }, [servers, selectedFilter.filterPriorityServers, filterByName]);
+
+  return filteredServers;
+};
diff --git a/Src/WitsmlExplorer.Frontend/models/server.ts b/Src/WitsmlExplorer.Frontend/models/server.ts
index c703f1edc..945644d15 100644
--- a/Src/WitsmlExplorer.Frontend/models/server.ts
+++ b/Src/WitsmlExplorer.Frontend/models/server.ts
@@ -8,6 +8,7 @@ export interface Server {
   currentUsername?: string;
   usernames?: string[];
   depthLogDecimals: number;
+  isPriority: boolean;
 }
 
 export function emptyServer(): Server {
@@ -20,6 +21,7 @@ export function emptyServer(): Server {
     credentialIds: [],
     currentUsername: undefined,
     usernames: [],
-    depthLogDecimals: 0
+    depthLogDecimals: 0,
+    isPriority: false
   };
 }
diff --git a/Src/WitsmlExplorer.Frontend/tools/localStorageHelpers.tsx b/Src/WitsmlExplorer.Frontend/tools/localStorageHelpers.tsx
index 911dd401f..01423dd9e 100644
--- a/Src/WitsmlExplorer.Frontend/tools/localStorageHelpers.tsx
+++ b/Src/WitsmlExplorer.Frontend/tools/localStorageHelpers.tsx
@@ -5,6 +5,7 @@ export const STORAGE_HOTKEYS_ENABLED_KEY = "hotKeysEnabled";
 export const STORAGE_FILTER_HIDDENOBJECTS_KEY = "hiddenObjects";
 export const STORAGE_FILTER_ISACTIVE_KEY = "filterIsActive";
 export const STORAGE_FILTER_OBJECTGROWING_KEY = "filterObjectGrowing";
+export const STORAGE_FILTER_PRIORITYSERVERS_KEY = "filterPriorityServers";
 export const STORAGE_FILTER_INACTIVE_TIME_CURVES_KEY =
   "filterHideInactiveCurves";
 export const STORAGE_FILTER_INACTIVE_TIME_CURVES_VALUE_KEY =