Browse Source

Merge branch 'main' of https://github.com/fosrl/pangolin

Owen Schwartz 8 months ago
parent
commit
ff47ba0b77
2 changed files with 2 additions and 7 deletions
  1. 1 7
      server/routers/site/listSites.ts
  2. 1 0
      src/app/[orgId]/sites/page.tsx

+ 1 - 7
server/routers/site/listSites.ts

@@ -1,11 +1,6 @@
 import { ActionsEnum, checkUserActionPermission } from "@server/auth/actions";
 import { ActionsEnum, checkUserActionPermission } from "@server/auth/actions";
 import { db } from "@server/db";
 import { db } from "@server/db";
-import {
-    orgs,
-    roleSites,
-    sites,
-    userSites,
-} from "@server/db/schema";
+import { orgs, roleSites, sites, userSites } from "@server/db/schema";
 import HttpCode from "@server/types/HttpCode";
 import HttpCode from "@server/types/HttpCode";
 import response from "@server/utils/response";
 import response from "@server/utils/response";
 import { and, eq, inArray, or, sql } from "drizzle-orm";
 import { and, eq, inArray, or, sql } from "drizzle-orm";
@@ -38,7 +33,6 @@ function querySites(orgId: string, accessibleSiteIds: number[]) {
         .select({
         .select({
             siteId: sites.siteId,
             siteId: sites.siteId,
             name: sites.name,
             name: sites.name,
-            subdomain: sites.subdomain,
             pubKey: sites.pubKey,
             pubKey: sites.pubKey,
             subnet: sites.subnet,
             subnet: sites.subnet,
             megabytesIn: sites.megabytesIn,
             megabytesIn: sites.megabytesIn,

+ 1 - 0
src/app/[orgId]/sites/page.tsx

@@ -16,6 +16,7 @@ export default async function Page({ params }: SitesPageProps) {
         );
         );
         sites = res.data.data.sites;
         sites = res.data.data.sites;
     } catch (e) {
     } catch (e) {
+        console.error("Error fetching sites", e);
     }
     }
 
 
     return (
     return (