From eb7c5586342e03f988e3bfb2d91751ca2f237add Mon Sep 17 00:00:00 2001 From: Michael Quigley Date: Wed, 5 Feb 2025 13:52:11 -0500 Subject: [PATCH] limited data plumbing (#649) --- controller/overview.go | 2 ++ ui/src/model/graph.ts | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/controller/overview.go b/controller/overview.go index f0639a314..00de1de4f 100644 --- a/controller/overview.go +++ b/controller/overview.go @@ -42,6 +42,7 @@ func (h *overviewHandler) Handle(_ metadata.OverviewParams, principal *rest_mode Description: env.Description, Host: env.Host, ZID: env.ZId, + Limited: accountLimited, CreatedAt: env.CreatedAt.UnixMilli(), UpdatedAt: env.UpdatedAt.UnixMilli(), }, @@ -74,6 +75,7 @@ func (h *overviewHandler) Handle(_ metadata.OverviewParams, principal *rest_mode FrontendEndpoint: feEndpoint, BackendProxyEndpoint: beProxyEndpoint, Reserved: shr.Reserved, + Limited: accountLimited, CreatedAt: shr.CreatedAt.UnixMilli(), UpdatedAt: shr.UpdatedAt.UnixMilli(), } diff --git a/ui/src/model/graph.ts b/ui/src/model/graph.ts index 733aed6a8..40c8906e3 100644 --- a/ui/src/model/graph.ts +++ b/ui/src/model/graph.ts @@ -32,7 +32,7 @@ export const mergeGraph = (oldVov: Graph, u: User, limited: boolean, newOv: Over data: { label: env.environment?.description, envZId: env.environment?.zId!, - limited: !!limited, + limited: limited, empty: true }, type: "environment", @@ -48,7 +48,7 @@ export const mergeGraph = (oldVov: Graph, u: User, limited: boolean, newOv: Over if(env.shares) { envNode.data.empty = false; env.shares.forEach(shr => { - let shrLabel = shr.token!; + let shrLabel = shr.shareToken!; if(shr.backendProxyEndpoint !== "") { shrLabel = shr.backendProxyEndpoint!; } @@ -58,7 +58,7 @@ export const mergeGraph = (oldVov: Graph, u: User, limited: boolean, newOv: Over label: shrLabel, shareToken: shr.shareToken!, envZId: env.environment?.zId!, - limited: !!limited, + limited: limited, accessed: false, }, type: "share",