pangolin_mirror/pangolin
1
0
Fork 0
mirror of https://github.com/fosrl/pangolin.git synced 2026-03-04 17:56:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

small fixes to invite user workflow

Browse Source
This commit is contained in:
Milo Schwartz
2024-11-14 00:13:37 -05:00
parent ba3505a385
commit 8e64b5e0e9
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/routers/user/acceptInvite.ts
View File

@@ -89,7 +89,7 @@ export async function acceptInvite(
); );
} }
if (existingUser[0].email !== existingInvite[0].email) { if (req.user && req.user.email !== existingInvite[0].email) {
return next( return next(
createHttpError( createHttpError(
HttpCode.BAD_REQUEST, HttpCode.BAD_REQUEST,

2
src/app/[orgId]/settings/layout.tsx
View File

@@ -69,7 +69,7 @@ export default async function SettingsLayout(props: SettingsLayoutProps) {
); );
const orgUser = await getOrgUser(); const orgUser = await getOrgUser();
if (!orgUser.data.data.isAdmin || !orgUser.data.data.isOwner) { if (!orgUser.data.data.isAdmin && !orgUser.data.data.isOwner) {
throw new Error("User is not an admin or owner"); throw new Error("User is not an admin or owner");
} }
} catch { } catch {

6
src/app/[orgId]/settings/resources/[resourceId]/connectivity/page.tsx
View File

@@ -308,13 +308,13 @@ export default function ReverseProxyTargets(props: {
cell: ({ row }) => ( cell: ({ row }) => (
<> <>
<div className="flex items-center justify-end space-x-2"> <div className="flex items-center justify-end space-x-2">
<Dot {/* <Dot
className={ className={
row.original.new || row.original.updated row.original.new || row.original.updated
? "opacity-100" ? "opacity-100"
: "opacity-0" : "opacity-0"
} }
/> /> */}
<Button <Button
variant="outline" variant="outline"
@@ -494,7 +494,7 @@ export default function ReverseProxyTargets(props: {
</Form> </Form>
</div> </div>
<div className="rounded-md border mt-4"> <div className="rounded-md mt-4">
<Table> <Table>
<TableHeader> <TableHeader>
{table.getHeaderGroups().map((headerGroup) => ( {table.getHeaderGroups().map((headerGroup) => (

1
src/app/invite/page.tsx
View File

@@ -49,6 +49,7 @@ export default async function InvitePage(props: {
) )
.catch((e) => { .catch((e) => {
console.error(e); console.error(e);
error = formatAxiosError(e);
}); });
if (res && res.status === 200) { if (res && res.status === 200) {