From fea0d1d14297a49abde613f6ff7815573307e96d Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Thu, 9 Mar 2023 12:34:47 -0800
Subject: [PATCH] PR touchups.

---
 .../pages/settings/teams/TeamWebsitesTable.js    | 16 +++++++---------
 db/postgresql/schema.prisma                      |  1 -
 lib/auth.ts                                      |  4 ++--
 queries/admin/teamWebsite.ts                     |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/components/pages/settings/teams/TeamWebsitesTable.js b/components/pages/settings/teams/TeamWebsitesTable.js
index b0d342219..a596204ce 100644
--- a/components/pages/settings/teams/TeamWebsitesTable.js
+++ b/components/pages/settings/teams/TeamWebsitesTable.js
@@ -64,15 +64,13 @@ export default function TeamWebsitesTable({ teamId, data = [], onSave }) {
 
           row.action = (
             <Flexbox flex={1} justifyContent="end" gap={10}>
-              <Link href={`/websites/${websiteId}`}>
-                <a target="_blank">
-                  <Button>
-                    <Icon>
-                      <Icons.External />
-                    </Icon>
-                    <Text>{formatMessage(labels.view)}</Text>
-                  </Button>
-                </a>
+              <Link href={`/websites/${websiteId}`} target="_blank">
+                <Button>
+                  <Icon>
+                    <Icons.External />
+                  </Icon>
+                  <Text>{formatMessage(labels.view)}</Text>
+                </Button>
               </Link>
               {canRemove && (
                 <Button onClick={() => handleRemoveWebsite(teamWebsiteId)}>
diff --git a/db/postgresql/schema.prisma b/db/postgresql/schema.prisma
index 97a0942b3..be3be8f18 100644
--- a/db/postgresql/schema.prisma
+++ b/db/postgresql/schema.prisma
@@ -120,7 +120,6 @@ model TeamWebsite {
 
   team    Team    @relation(fields: [teamId], references: [id])
   website Website @relation(fields: [websiteId], references: [id])
-  userId  String? @db.Uuid
 
   @@index([teamId])
   @@index([websiteId])
diff --git a/lib/auth.ts b/lib/auth.ts
index 9bc84a232..b602c3d23 100644
--- a/lib/auth.ts
+++ b/lib/auth.ts
@@ -4,7 +4,7 @@ import { PERMISSIONS, ROLE_PERMISSIONS, SHARE_TOKEN_HEADER } from 'lib/constants
 import { secret } from 'lib/crypto';
 import { ensureArray, parseSecureToken, parseToken } from 'next-basics';
 import { getTeamUser } from 'queries';
-import { getTeamWebsite, getTeamWebsiteByWebsiteIdUserId } from 'queries/admin/teamWebsite';
+import { getTeamWebsite, getTeamWebsiteByTeamMemberId } from 'queries/admin/teamWebsite';
 import { validate } from 'uuid';
 import { Auth } from './types';
 
@@ -60,7 +60,7 @@ export async function canViewWebsite({ user, shareToken }: Auth, websiteId: stri
     return true;
   }
 
-  const teamWebsite = await getTeamWebsiteByWebsiteIdUserId(websiteId, user.id);
+  const teamWebsite = await getTeamWebsiteByTeamMemberId(websiteId, user.id);
 
   if (teamWebsite) {
     return true;
diff --git a/queries/admin/teamWebsite.ts b/queries/admin/teamWebsite.ts
index bbb0a9ab9..bff1a9ee0 100644
--- a/queries/admin/teamWebsite.ts
+++ b/queries/admin/teamWebsite.ts
@@ -18,7 +18,7 @@ export async function getTeamWebsite(teamWebsiteId: string): Promise<
   });
 }
 
-export async function getTeamWebsiteByWebsiteIdUserId(
+export async function getTeamWebsiteByTeamMemberId(
   websiteId: string,
   userId: string,
 ): Promise<TeamWebsite> {