mirror/fosrl.pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2025-08-30 06:29:23 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

show site link in clients table

Browse source
This commit is contained in:
miloschwartz 2025-02-21 22:20:19 -05:00
parent 1a63669805
commit 9f54f4d81a
No known key found for this signature in database
5 changed files with 48 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/db/schema.ts
View file

@ -118,9 +118,11 @@ export const newts = sqliteTable("newt", {
export const clients = sqliteTable("clients", {
clientId: integer("id").primaryKey({ autoIncrement: true }),
siteId: integer("siteId").references(() => sites.siteId, {
onDelete: "cascade"
}),
siteId: integer("siteId")
.references(() => sites.siteId, {
onDelete: "cascade"
})
.notNull(),
orgId: text("orgId")
.references(() => orgs.orgId, {
onDelete: "cascade"

5
server/routers/client/listClients.ts
View file

@ -42,6 +42,7 @@ function queryClients(orgId: string, accessibleClientIds: number[]) {
clientId: clients.clientId,
orgId: clients.orgId,
siteId: clients.siteId,
siteNiceId: sites.niceId,
name: clients.name,
pubKey: clients.pubKey,
subnet: clients.subnet,
@ -49,10 +50,12 @@ function queryClients(orgId: string, accessibleClientIds: number[]) {
megabytesOut: clients.megabytesOut,
orgName: orgs.name,
type: clients.type,
online: clients.online
online: clients.online,
siteName: sites.name
})
.from(clients)
.leftJoin(orgs, eq(clients.orgId, orgs.orgId))
.innerJoin(sites, eq(clients.siteId, sites.siteId))
.where(
and(
inArray(clients.clientId, accessibleClientIds),