Skip to content

chore: improvements #1419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion components/links/link-sheet/link-options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ export const LinkOptions = ({
const allowAdvancedLinkControls = limits
? limits?.advancedLinkControlsOnPro
: false;
const allowWatermarkOnBusiness = limits?.watermarkOnBusiness ?? false;

const [openUpgradeModal, setOpenUpgradeModal] = useState<boolean>(false);
const [trigger, setTrigger] = useState<string>("");
Expand Down Expand Up @@ -136,7 +137,7 @@ export const LinkOptions = ({
/>
<WatermarkSection
{...{ data, setData }}
isAllowed={isTrial || isDatarooms}
isAllowed={isTrial || isDatarooms || allowWatermarkOnBusiness}
handleUpgradeStateChange={handleUpgradeStateChange}
/>
<AgreementSection
Expand Down
17 changes: 17 additions & 0 deletions components/visitors/dataroom-visitor-useragent.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { useDataroomVisitorUserAgent } from "@/lib/swr/use-dataroom-stats";

import VisitorUserAgentBase from "./visitor-useragent-base";

export function DataroomVisitorUserAgent({ viewId }: { viewId: string }) {
const { userAgent, error } = useDataroomVisitorUserAgent(viewId);

if (error) {
return <div>No useragent info</div>;
}

if (!userAgent) {
return <div>Loading...</div>;
}

return <VisitorUserAgentBase userAgent={userAgent} />;
}
6 changes: 6 additions & 0 deletions components/visitors/dataroom-visitors-table.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import { BadgeTooltip } from "@/components/ui/tooltip";
import { useDataroomVisits } from "@/lib/swr/use-dataroom";
import { durationFormat, timeAgo } from "@/lib/utils";

import { DataroomVisitorUserAgent } from "./dataroom-visitor-useragent";
import DataroomVisitHistory from "./dataroom-visitors-history";
import { VisitorAvatar } from "./visitor-avatar";

Expand Down Expand Up @@ -155,6 +156,11 @@ export default function DataroomVisitorsTable({

<CollapsibleContent asChild>
<>
<TableRow>
<TableCell colSpan={3}>
<DataroomVisitorUserAgent viewId={view.id} />
</TableCell>
</TableRow>
<TableRow key={view.id}>
<TableCell>
<div className="flex items-center gap-x-4 overflow-visible">
Expand Down
52 changes: 52 additions & 0 deletions components/visitors/visitor-useragent-base.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
import { COUNTRIES } from "@/lib/constants";

import UAIcon from "../user-agent-icon";

export default function VisitorUserAgentBase({
userAgent,
}: {
userAgent: {
device: string;
browser: string;
os: string;
country?: string;
city?: string;
};
}) {
const { device, browser, os, country, city } = userAgent;

return (
<div>
<div className="pb-0.5 pl-0.5 md:pb-1 md:pl-1">
{city && country ? (
<div className="flex items-center">
<div className="flex items-center gap-x-1 px-1">
<img
alt={country}
src={`https://flag.vercel.app/m/${country}.svg`}
className="h-3 w-4"
/>
<span>{city},</span>
<span>{COUNTRIES[country]}</span>
</div>
</div>
) : null}
</div>
<div className="pb-0.5 pl-0.5 md:pb-1 md:pl-1">
<div className="flex items-center">
<div className="flex items-center gap-x-1 px-1">
<UAIcon display={device} type="devices" className="size-4" />{" "}
{device},
</div>
<div className="flex items-center gap-x-1 px-1">
<UAIcon display={browser} type="browsers" className="size-4" />{" "}
{browser},
</div>
<div className="flex items-center gap-x-1 px-1">
<UAIcon display={os} type="os" className="size-4" /> {os}
</div>
</div>
</div>
</div>
);
}
46 changes: 4 additions & 42 deletions components/visitors/visitor-useragent.tsx
Original file line number Diff line number Diff line change
@@ -1,55 +1,17 @@
import ErrorPage from "next/error";

import { COUNTRIES } from "@/lib/constants";
import { useVisitorUserAgent } from "@/lib/swr/use-stats";

import UAIcon from "../user-agent-icon";
import VisitorUserAgentBase from "./visitor-useragent-base";

export default function VisitorUserAgent({ viewId }: { viewId: string }) {
const { userAgent, error } = useVisitorUserAgent(viewId);

if (error && error.status === 404) {
return <ErrorPage statusCode={404} />;
if (error) {
return <div>No useragent info</div>;
}

if (!userAgent) {
return <div>Loading...</div>;
}

const { device, browser, os, country, city } = userAgent;

return (
<div>
<div className="pb-0.5 pl-0.5 md:pb-1 md:pl-1">
{city && country ? (
<div className="flex items-center">
<div className="flex items-center gap-x-1 px-1">
<img
alt={country}
src={`https://flag.vercel.app/m/${country}.svg`}
className="h-3 w-4"
/>
<span>{city},</span>
<span>{COUNTRIES[country]}</span>
</div>
</div>
) : null}
</div>
<div className="pb-0.5 pl-0.5 md:pb-1 md:pl-1">
<div className="flex items-center">
<div className="flex items-center gap-x-1 px-1">
<UAIcon display={device} type="devices" className="size-4" />{" "}
{device},
</div>
<div className="flex items-center gap-x-1 px-1">
<UAIcon display={browser} type="browsers" className="size-4" />{" "}
{browser},
</div>
<div className="flex items-center gap-x-1 px-1">
<UAIcon display={os} type="os" className="size-4" /> {os}
</div>
</div>
</div>
</div>
);
return <VisitorUserAgentBase userAgent={userAgent} />;
}
1 change: 1 addition & 0 deletions ee/limits/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ export type TPlanLimits = {
customDomainOnPro: boolean;
customDomainInDataroom: boolean;
advancedLinkControlsOnPro: boolean | null;
watermarkOnBusiness?: boolean | null;
};

export const FREE_PLAN_LIMITS = {
Expand Down
1 change: 1 addition & 0 deletions ee/limits/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ const configSchema = z.object({
customDomainOnPro: z.boolean(),
customDomainInDataroom: z.boolean(),
advancedLinkControlsOnPro: z.boolean().nullish(),
watermarkOnBusiness: z.boolean().nullish(),
});

export async function getLimits({
Expand Down
1 change: 1 addition & 0 deletions ee/limits/swr-handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ export type LimitProps = {
customDomainOnPro: boolean;
customDomainInDataroom: boolean;
advancedLinkControlsOnPro: boolean | undefined | null;
watermarkOnBusiness: boolean | undefined | null;
usage: {
documents: number;
links: number;
Expand Down
30 changes: 30 additions & 0 deletions lib/swr/use-dataroom-stats.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { useRouter } from "next/router";
import { useTeam } from "@/context/team-context";
import { View } from "@prisma/client";
import useSWR from "swr";
import useSWRImmutable from "swr/immutable";

import { fetcher } from "@/lib/utils";

Expand Down Expand Up @@ -79,3 +80,32 @@ export function useDataroomStats({
// error,
// };
// }

export function useDataroomVisitorUserAgent(viewId: string) {
const router = useRouter();
const teamInfo = useTeam();
const teamId = teamInfo?.currentTeam?.id;

const { id: dataroomId } = router.query as {
id: string;
};

const { data: userAgent, error } = useSWRImmutable<{
country: string;
city: string;
os: string;
browser: string;
device: string;
}>(
dataroomId &&
viewId &&
`/api/teams/${teamId}/datarooms/${dataroomId}/views/${viewId}/user-agent`,
fetcher,
);

return {
userAgent,
loading: !error && !userAgent,
error,
};
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,97 @@
import { NextApiRequest, NextApiResponse } from "next";

import { authOptions } from "@/pages/api/auth/[...nextauth]";
import { getServerSession } from "next-auth/next";

import { errorhandler } from "@/lib/errorHandler";
import prisma from "@/lib/prisma";
import { getViewUserAgent } from "@/lib/tinybird";
import { CustomUser } from "@/lib/types";

export default async function handle(
req: NextApiRequest,
res: NextApiResponse,
) {
if (req.method === "GET") {
// GET /api/teams/:teamId/datarooms/:id/views/:viewId/user-agent
const session = await getServerSession(req, res, authOptions);
if (!session) {
return res.status(401).end("Unauthorized");
}

const {
teamId,
id: dataroomId,
viewId,
} = req.query as {
teamId: string;
id: string;
viewId: string;
};

const userId = (session.user as CustomUser).id;

try {
const team = await prisma.team.findUnique({
where: {
id: teamId,
users: {
some: {
userId: userId,
},
},
},
select: {
id: true,
plan: true,
},
});

if (!team) {
return res.status(401).end("Unauthorized");
}

if (team.plan.includes("free")) {
return res.status(403).end("Forbidden");
}

const view = await prisma.view.findMany({
where: {
dataroomId: dataroomId,
dataroomViewId: viewId,
},
select: {
id: true,
documentId: true,
},
take: 1,
});

if (!view || !view[0].documentId) {
return res.status(404).end("Not Found");
}

const userAgent = await getViewUserAgent({
documentId: view[0].documentId,
viewId: view[0].id,
since: 0,
});

const userAgentData = userAgent.data[0];
// Include country and city for business and datarooms plans
if (team.plan.includes("business") || team.plan.includes("datarooms")) {
return res.status(200).json(userAgentData);
} else {
// For other plans, exclude country and city
const { country, city, ...remainingResponse } = userAgentData;
return res.status(200).json(remainingResponse);
}
} catch (error) {
errorhandler(error, res);
}
} else {
// We only allow GET and POST requests
res.setHeader("Allow", ["GET"]);
return res.status(405).end(`Method ${req.method} Not Allowed`);
}
}
Loading