PR touchups.
parent
be33e55d09
commit
fea0d1d142
|
@ -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)}>
|
||||
|
|
|
@ -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])
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -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> {
|
||||
|
|
Loading…
Reference in New Issue