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.

prevent collision, improve modal effiicency

Steven Tey91ea39482748
diff --git a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default/route.ts b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default/route.ts
index ef0a7ae048..1409c77c11 100644
--- a/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default/route.ts
+++ b/apps/web/app/(ee)/api/groups/[groupIdOrSlug]/default/route.ts
@@ -4,7 +4,7 @@ import { withWorkspace } from "@/lib/auth";
import { DEFAULT_PARTNER_GROUP, GroupSchema } from "@/lib/zod/schemas/groups";
import { RESOURCE_COLORS } from "@/ui/colors";
import { prisma } from "@dub/prisma";
-import { randomValue } from "@dub/utils";
+import { nanoid, randomValue } from "@dub/utils";
import slugify from "@sindresorhus/slugify";
import { waitUntil } from "@vercel/functions";
import { revalidatePath } from "next/cache";
@@ -43,6 +43,10 @@ export const POST = withWorkspace(
}
const updatedGroup = await prisma.$transaction(async (tx) => {
+ const DEFAULT_GROUP_NAME_OLD = "Default Group (old)";
+ const isStandardDefaultGroupName =
+ currentDefaultGroup.name.toLowerCase() ===
+ DEFAULT_PARTNER_GROUP.name.toLowerCase();
// set current default group's slug to a slugified version of its name
// and assign a random color if it doesn't have one
await tx.partnerGroup.update({
@@ -53,14 +57,12 @@ export const POST = withWorkspace(
},
},
data: {
- name:
- currentDefaultGroup.name === DEFAULT_PARTNER_GROUP.name
- ? "Default group (old)"
- : undefined,
- slug:
- currentDefaultGroup.name === DEFAULT_PARTNER_GROUP.name
+ name: isStandardDefaultGroupName ? DEFAULT_GROUP_NAME_OLD : undefined,
+ slug: `${
+ isStandardDefaultGroupName
? "old-default-group"
- : slugify(currentDefaultGroup.name),
+ : slugify(currentDefaultGroup.name)
+ }-${nanoid(4)}`,
color:
currentDefaultGroup.color === DEFAULT_PARTNER_GROUP.color
? randomValue(RESOURCE_COLORS)
@@ -80,6 +82,10 @@ export const POST = withWorkspace(
id: group.id,
},
data: {
+ name:
+ group.name === DEFAULT_GROUP_NAME_OLD
+ ? DEFAULT_PARTNER_GROUP.name
+ : undefined,
slug: DEFAULT_PARTNER_GROUP.slug,
color: DEFAULT_PARTNER_GROUP.color,
},
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx
index 7ee14c81d3..1926a50428 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/groups/groups-table.tsx
@@ -89,6 +89,10 @@ export function GroupsTable() {
const isFiltered = !!searchParams.get("search");
+ const currentDefaultGroup = groups?.find(
+ (g) => g.slug === DEFAULT_PARTNER_GROUP.slug,
+ );
+
const { table, ...tableProps } = useTable({
data: groups
? groups.map((group) => {
@@ -156,7 +160,12 @@ export function GroupsTable() {
id: "menu",
enableHiding: false,
header: () => <EditColumnsButton table={table} />,
- cell: ({ row }) => <RowMenuButton row={row} />,
+ cell: ({ row }) => (
+ <RowMenuButton
+ row={row}
+ currentDefaultGroup={currentDefaultGroup}
+ />
+ ),
},
],
columnPinning: { right: ["menu"] },
@@ -235,7 +244,13 @@ export function GroupsTable() {
);
}
-function RowMenuButton({ row }: { row: Row<GroupExtendedProps> }) {
+function RowMenuButton({
+ row,
+ currentDefaultGroup,
+}: {
+ row: Row<GroupExtendedProps>;
+ currentDefaultGroup: GroupExtendedProps | undefined;
+}) {
const router = useRouter();
const { slug } = useParams();
const [isOpen, setIsOpen] = useState(false);
@@ -312,18 +327,22 @@ function RowMenuButton({ row }: { row: Row<GroupExtendedProps> }) {
});
}}
/>
- {row.original.slug !== DEFAULT_PARTNER_GROUP.slug && (
- <>
- <MenuItem
- icon={Star}
- label="Set as default"
- variant="default"
- onSelect={() => {
- setIsOpen(false);
- openConfirmSetDefaultGroupModal(row.original);
- }}
- disabledTooltip={permissionsError || undefined}
- />
+ {currentDefaultGroup &&
+ row.original.slug !== DEFAULT_PARTNER_GROUP.slug && (
+ <>
+ <MenuItem
+ icon={Star}
+ label="Set as default"
+ variant="default"
+ onSelect={() => {
+ setIsOpen(false);
+ openConfirmSetDefaultGroupModal({
+ currentDefaultGroup,
+ newDefaultGroup: row.original,
+ });
+ }}
+ disabledTooltip={permissionsError || undefined}
+ />
<MenuItem
icon={Trash}
label="Delete group"
diff --git a/apps/web/ui/modals/confirm-set-default-group-modal.tsx b/apps/web/ui/modals/confirm-set-default-group-modal.tsx
index 607d947dc1..a8a31db7b2 100644
--- a/apps/web/ui/modals/confirm-set-default-group-modal.tsx
+++ b/apps/web/ui/modals/confirm-set-default-group-modal.tsx
@@ -2,9 +2,7 @@
import { mutatePrefix } from "@/lib/swr/mutate";
import { useApiMutation } from "@/lib/swr/use-api-mutation";
-import useGroup from "@/lib/swr/use-group";
import { GroupExtendedProps } from "@/lib/types";
-import { DEFAULT_PARTNER_GROUP } from "@/lib/zod/schemas/groups";
import { GroupColorCircle } from "@/ui/partners/groups/group-color-circle";
import { MarkdownDescription } from "@/ui/shared/markdown-description";
import { Button, Modal } from "@dub/ui";
@@ -17,24 +15,22 @@ type GroupForModal = Pick<GroupExtendedProps, "id" | "name" | "color">;
interface ConfirmSetDefaultGroupModalProps {
showModal: boolean;
setShowModal: (show: boolean) => void;
- newGroup: GroupForModal;
+ currentDefaultGroup: GroupForModal;
+ newDefaultGroup: GroupForModal;
}
function ConfirmSetDefaultGroupModal({
showModal,
setShowModal,
- newGroup,
+ currentDefaultGroup,
+ newDefaultGroup,
}: ConfirmSetDefaultGroupModalProps) {
const { makeRequest, isSubmitting } = useApiMutation();
- const { group: currentDefaultGroup } = useGroup({
- groupIdOrSlug: DEFAULT_PARTNER_GROUP.slug,
- });
-
const onSubmit = useCallback(
async (e: React.FormEvent) => {
e.preventDefault();
- await makeRequest(`/api/groups/${newGroup.id}/default`, {
+ await makeRequest(`/api/groups/${newDefaultGroup.id}/default`, {
method: "POST",
onSuccess: async () => {
setShowModal(false);
@@ -43,7 +39,7 @@ function ConfirmSetDefaultGroupModal({
},
});
},
- [makeRequest, newGroup.id, setShowModal],
+ [makeRequest, newDefaultGroup.id, setShowModal],
);
return (
@@ -68,22 +64,22 @@ function ConfirmSetDefaultGroupModal({
<div className="relative flex items-center justify-center gap-4">
<div className="flex items-center gap-2">
<GroupColorCircle
- group={currentDefaultGroup ?? DEFAULT_PARTNER_GROUP}
+ group={currentDefaultGroup}
/>
<span className="text-content-emphasis text-sm font-medium">
- {currentDefaultGroup?.name ?? DEFAULT_PARTNER_GROUP.name}
+ {currentDefaultGroup.name}
</span>
</div>
<ArrowRight className="size-4 text-neutral-400" />
<div className="flex items-center gap-2">
- <GroupColorCircle group={newGroup} />
+ <GroupColorCircle group={newDefaultGroup} />
<span className="text-content-emphasis text-sm font-medium">
- {newGroup.name}
+ {newDefaultGroup.name}
</span>
</div>
</div>
<MarkdownDescription className="text-content-subtle relative mt-3 text-center text-xs">
- {`This will set **"${newGroup.name}"** as the new default group and update your [public landing page](https://dub.co/help/article/program-landing-page) and [application form](https://dub.co/help/article/program-application-form).`}
+ {`This will set **"${newDefaultGroup.name}"** as the new default group and update your [public landing page](https://dub.co/help/article/program-landing-page) and [application form](https://dub.co/help/article/program-application-form).`}
</MarkdownDescription>
</div>
</div>
@@ -112,28 +108,35 @@ function ConfirmSetDefaultGroupModal({
}
export function useConfirmSetDefaultGroupModal() {
- const [newGroup, setNewGroup] = useState<GroupForModal | null>(null);
+ const [state, setState] = useState<{
+ currentDefaultGroup: GroupForModal;
+ newDefaultGroup: GroupForModal;
+ } | null>(null);
const openConfirmSetDefaultGroupModal = useCallback(
- (group: GroupForModal) => {
- setNewGroup(group);
+ ({
+ currentDefaultGroup,
+ newDefaultGroup,
+ }: {
+ currentDefaultGroup: GroupForModal;
+ newDefaultGroup: GroupForModal;
+ }) => {
+ setState({ currentDefaultGroup, newDefaultGroup });
},
[],
);
- const closeConfirmSetDefaultGroupModal = useCallback(
- () => setNewGroup(null),
- [],
- );
+ const closeConfirmSetDefaultGroupModal = useCallback(() => setState(null), []);
return {
openConfirmSetDefaultGroupModal,
closeConfirmSetDefaultGroupModal,
- ConfirmSetDefaultGroupModal: newGroup ? (
+ ConfirmSetDefaultGroupModal: state ? (
<ConfirmSetDefaultGroupModal
showModal
- setShowModal={(show) => !show && setNewGroup(null)}
- newGroup={newGroup}
+ setShowModal={(show) => !show && setState(null)}
+ currentDefaultGroup={state.currentDefaultGroup}
+ newDefaultGroup={state.newDefaultGroup}
/>
) : null,
};