Skip to content
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.

Sign up for GitHub

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

chore: update dependencies #1449

Merged
merged 5 commits into from
Jan 18, 2025
Merged

chore: update dependencies #1449

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d453df
chore: update dependencies
mfts Jan 18, 2025
4d455ec
fix: redis locker
mfts Jan 18, 2025
a1eacca
feat: remove trial on selector
mfts Jan 18, 2025
bea591c
chore: add trigger max duration
mfts Jan 18, 2025
3026224
chore: remove "no useragent info"
mfts Jan 18, 2025
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
6 changes: 0 additions & 6 deletions components/sidebar/team-switcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,6 @@ export function TeamSwitcher({

if (!activeTeam) return null;

const plan = activeTeam.plan?.split("+")[0];
const isTrial = activeTeam.plan?.includes("trial");

return (
<SidebarMenu>
<SidebarMenuItem>
Expand All @@ -62,9 +59,6 @@ export function TeamSwitcher({
</Avatar>
<div className="grid flex-1 text-left text-sm leading-tight">
<span className="truncate">{activeTeam.name}</span>
<span className="truncate text-xs font-semibold capitalize">
{isTrial ? "Data Room Trial" : null}
</span>
</div>
<ChevronsUpDown className="ml-auto" />
</SidebarMenuButton>
Expand Down
2 changes: 1 addition & 1 deletion components/visitors/dataroom-visitor-useragent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export function DataroomVisitorUserAgent({ viewId }: { viewId: string }) {
const { userAgent, error } = useDataroomVisitorUserAgent(viewId);

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

if (!userAgent) {
Expand Down
6 changes: 1 addition & 5 deletions components/visitors/visitor-useragent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,7 @@ export default function VisitorUserAgent({ viewId }: { viewId: string }) {
const { userAgent, error } = useVisitorUserAgent(viewId);

if (error) {
return (
<div className="pb-0.5 pl-1.5 text-muted-foreground md:pb-1 md:pl-2">
No useragent info
</div>
);
return null;
}

if (!userAgent) {
Expand Down
9 changes: 6 additions & 3 deletions lib/files/tus-redis-locker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,14 @@ class RedisLock implements Lock {
private timeout: number = 1000 * 30, // default: 30 seconds
) {}

async lock(requestRelease: RequestRelease): Promise<void> {
async lock(
signal: AbortSignal,
requestRelease: RequestRelease,
): Promise<void> {
const abortController = new AbortController();
const lock = await Promise.race([
this.waitTimeout(abortController.signal),
this.acquireLock(this.id, requestRelease, abortController.signal),
this.waitTimeout(signal),
this.acquireLock(this.id, requestRelease, signal),
]);

abortController.abort();
Expand Down
Loading
Loading