Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Move risk filters above the history tabs.

Kiran K638f53e57774
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/layout.tsx
index 4630fdfb23..36ee4b5cdf 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/layout.tsx
@@ -5,6 +5,7 @@ import { PageContent } from "@/ui/layout/page-content";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
import { usePathname } from "next/navigation";
import { ReactNode } from "react";
+import { ResolvedRiskEventsFilters } from "./resolved-risk-events-table";
import { RiskHistoryNav } from "./risk-history-nav";
export default function RiskHistoryLayout({
@@ -15,17 +16,23 @@ export default function RiskHistoryLayout({
const { slug } = useWorkspace();
const pathname = usePathname();
- const title = pathname.endsWith("/expired")
- ? "Expired risk events"
- : "Resolved risk events";
+ const isExpired = pathname.endsWith("/expired");
return (
- <PageContent title={title} titleBackHref={`/${slug}/program/risks`}>
+ <PageContent
+ title={isExpired ? "Expired risk events" : "Resolved risk events"}
+ titleBackHref={`/${slug}/program/risks`}
+ >
<PageWidthWrapper>
- <div className="border-border-subtle overflow-hidden rounded-xl border bg-neutral-100">
- <RiskHistoryNav />
- <div className="border-border-subtle -mx-px -mb-px rounded-xl border bg-white p-4">
- {children}
+ <div className="flex flex-col gap-4 pb-10">
+ <ResolvedRiskEventsFilters
+ status={isExpired ? "expired" : "resolved"}
+ />
+ <div className="border-border-subtle overflow-hidden rounded-xl border bg-neutral-100">
+ <RiskHistoryNav />
+ <div className="border-border-subtle -mx-px -mb-px overflow-hidden rounded-xl border bg-white">
+ {children}
+ </div>
</div>
</div>
</PageWidthWrapper>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/resolved-risk-events-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/resolved-risk-events-table.tsx
index 38ffe497bc..e07273345e 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/resolved-risk-events-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/(archive)/resolved-risk-events-table.tsx
@@ -271,7 +271,7 @@ export function ResolvedRiskEventsTable({ status }: { status: StatusTab }) {
}
return (
- <div className="flex flex-col gap-4">
+ <>
{detailsSheetState.groupId && currentFraudGroup && (
<RiskReviewSheet
isOpen={detailsSheetState.open}
@@ -298,12 +298,11 @@ export function ResolvedRiskEventsTable({ status }: { status: StatusTab }) {
/>
)}
- <ResolvedRiskEventsFilters status={status} />
-
{fraudGroups?.length !== 0 ? (
<Table {...tableProps} table={table} />
) : (
<AnimatedEmptyState
+ className="border-none"
title={emptyState.title}
description={emptyState.description}
cardContent={() => (
@@ -314,11 +313,11 @@ export function ResolvedRiskEventsTable({ status }: { status: StatusTab }) {
)}
/>
)}
- </div>
+ </>
);
}
-function ResolvedRiskEventsFilters({ status }: { status: StatusTab }) {
+export function ResolvedRiskEventsFilters({ status }: { status: StatusTab }) {
const {
filters,
activeFilters,
@@ -333,7 +332,7 @@ function ResolvedRiskEventsFilters({ status }: { status: StatusTab }) {
return (
<div>
- <div className="flex flex-col gap-3 md:flex-row md:items-center md:justify-between">
+ <div className="flex w-full flex-col items-center gap-2 min-[550px]:flex-row min-[550px]:items-center">
<Filter.Select
className="w-full md:w-fit"
filters={filters}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/risk-center-menu.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/risk-center-menu.tsx
index 99243bf058..1fcceb9f8f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/risk-center-menu.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/risk-center-menu.tsx
@@ -36,7 +36,7 @@ export function RiskCenterMenu() {
<Button
onClick={() => setOpenPopover(!openPopover)}
variant="secondary"
- className="h-8 w-auto px-1.5 sm:h-9"
+ className="h-10 w-auto px-1.5"
icon={<ThreeDots className="h-5 w-5 text-neutral-500" />}
/>
</Popover>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/risk-events-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/risk-events-table.tsx
index c7dabcb0ce..a0d2a5edf1 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/risk-events-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/risks/risk-events-table.tsx
@@ -44,6 +44,7 @@ import { Row } from "@tanstack/react-table";
import { Command } from "cmdk";
import { addDays, differenceInDays } from "date-fns";
import { useEffect, useMemo, useRef, useState } from "react";
+import { RiskCenterMenu } from "./risk-center-menu";
import { useFraudGroupFilters } from "./use-fraud-group-filters";
export function RiskEventsTable() {
@@ -469,6 +470,9 @@ function PendingFraudFilters() {
onSearchChange={setSearch}
onSelectedFilterChange={setSelectedFilter}
/>
+ <div className="flex justify-end">
+ <RiskCenterMenu />
+ </div>
</div>
<AnimatedSizeContainer height>
<div>