Fix pin-details in SPN map not showing up

safing · Jul 11, 2023 · 6e1b55b · 6e1b55b
1 parent 1b83dcf
commit 6e1b55b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/modules/portmaster/src/app/pages/spn/pin-details/pin-details.html b/modules/portmaster/src/app/pages/spn/pin-details/pin-details.html
@@ -90,7 +90,8 @@ <h1 class="flex flex-row items-center gap-2 text-base">
           <div class="flex flex-row items-center gap-2 cursor-pointer" [routerLink]="['/monitor']"
             [queryParams]="{q: 'exit_node:' + pin.pin.ID}" (click)="dialogRef?.close()">
             <pre>{{ exitConnectionCount }}</pre>
-            <svg viewBox="0 0 24 24" class="w-4 h-4" sfng-tooltip="Show exit connections in monitor.">
+            <svg viewBox="0 0 24 24" class="w-4 h-4" sfng-tooltip="Show exit connections in monitor."
+              *ngIf="exitConnectionCount > 0">
               <g fill="none" stroke="currentColor">
                 <path shape-rendering="geometricPrecision" stroke-linecap="round" stroke-linejoin="round"
                   stroke-width="2"

diff --git a/modules/portmaster/src/app/pages/spn/pin-details/pin-details.ts b/modules/portmaster/src/app/pages/spn/pin-details/pin-details.ts
@@ -74,7 +74,12 @@ export class PinDetailsComponent implements OnInit, OnChanges, OnDestroy {
             }
           });
 
-        this.exitConnectionCount = result.exitConnections[0].totalCount;
+        if (result.exitConnections.length) {
+          // we expect only one row to be returned for the above query.
+          this.exitConnectionCount = result.exitConnections[0].totalCount;
+        } else {
+          this.exitConnectionCount = 0;
+        }
 
         this.cdr.markForCheck();
       })

diff --git a/modules/portmaster/src/app/pages/spn/pin-overlay/pin-overlay.ts b/modules/portmaster/src/app/pages/spn/pin-overlay/pin-overlay.ts
@@ -120,6 +120,10 @@ export class PinOverlayComponent implements OnInit {
   }
 
   onDragRelease(event: CdkDragRelease) {
+    if (!this.dragContainer || !this.overlayRef.hostElement || !this.overlayRef.hostElement.parentElement) {
+      return;
+    }
+
     const bbox = this.dragContainer.element.nativeElement.getBoundingClientRect();
     const parent = this.overlayRef.hostElement.parentElement!.getBoundingClientRect();