filter shared ports correctly

f0ssel · f0ssel · commit 9deb05cef13e · 2024-02-16T19:46:25.000Z
diff --git a/site/src/modules/resources/PortForwardButton.tsx b/site/src/modules/resources/PortForwardButton.tsx
@@ -184,12 +184,15 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
     });
   const getFieldHelpers = getFormHelpers(form, submitError);
 
+  // filter out shared ports that are not from this agent
+  const filteredSharedPorts = sharedPorts.filter(
+    (port) => port.agent_name === agent.name,
+  );
   // we don't want to show listening ports if it's a shared port
   const filteredListeningPorts = listeningPorts?.filter((port) => {
-    for (let i = 0; i < sharedPorts.length; i++) {
+    for (let i = 0; i < filteredSharedPorts.length; i++) {
       if (
-        sharedPorts[i].port === port.port &&
-        sharedPorts[i].agent_name === agent.name
+        filteredSharedPorts[i].port === port.port
       ) {
         return false;
       }
@@ -356,7 +359,7 @@ export const PortForwardPopoverView: FC<PortForwardPopoverViewProps> = ({
           </HelpTooltipText>
           {canSharePorts && (
             <div>
-              {sharedPorts?.map((share) => {
+              {filteredSharedPorts?.map((share) => {
                 const url = portForwardURL(
                   host,
                   share.port,
diff --git a/site/src/modules/resources/PortForwardPopoverView.stories.tsx b/site/src/modules/resources/PortForwardPopoverView.stories.tsx
@@ -84,7 +84,11 @@ export const EnterprisePortSharingControlsAuthenticated: Story = {
   args: {
     listeningPorts: MockListeningPortsResponse.ports,
     storybook: {
-      sharedPortsQueryData: MockSharedPortsResponse,
+      sharedPortsQueryData: {
+        shares: MockSharedPortsResponse.shares.filter((share) => {
+          return share.share_level === "authenticated";
+        }),
+      },
     },
     template: {
       ...MockTemplate,
