apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx (1)

69-71: Avoid appending a bare “?” to the URL when no query exists.

When searchParams.toString() returns an empty string, url becomes /…?, which produces a trailing question mark in the address bar. It works but looks odd. Guard the append so ?${…} is only added when there are actual params.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/program/partners/[partnerId]/layout.tsx (1)

69-72: Handle empty query strings when pushing the new URL

With no search params, searchParams.toString() is empty, so the generated URL ends with ?. That leaves users on a slightly malformed route (/partners/:id?). Build the query string conditionally before pushing.

Apply this diff:

-    const url = `${pathname.replace(
-      `/partners/${params.partnerId}`,
-      `/partners/${newPartner.id}`,
-    )}?${searchParams.toString()}`;
-
-    router.push(url);
+    const nextPath = pathname.replace(
+      `/partners/${params.partnerId}`,
+      `/partners/${newPartner.id}`,
+    );
+    const queryString = searchParams.toString();
+
+    router.push(queryString ? `${nextPath}?${queryString}` : nextPath);

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

apps/web/ui/partners/groups/group-selector.tsx (1)

12-18: Still dropping null selection events — clearing is impossible.

setSelectedGroupId still only accepts string, and the handler exits when the combobox emits null, so the previous selection sticks and the user can’t clear the field (same issue called out earlier). Please allow null to flow through and handle it upstream.

 type GroupSelectorProps = {
   selectedGroupId: string | null;
-  setSelectedGroupId: (groupId: string) => void;
+  setSelectedGroupId: (groupId: string | null) => void;
   disabled?: boolean;
   variant?: "default" | "header";
 } & Partial<ComboboxProps<false, any>>;
…
-      setSelected={(option) => {
-        if (!option) return;
-        setSelectedGroupId(option.value);
-      }}
+      setSelected={(option) => {
+        setSelectedGroupId(option?.value ?? null);
+      }}

Also applies to: 72-75

apps/web/ui/partners/partner-selector.tsx (3)

89-95: Consider simplifying the icon placeholder condition.

Since selectedOption.icon is always defined when selectedOption exists, the condition could be simplified to !selectedOption for clarity.

Apply this diff:

-      icon={
-        !selectedOption?.icon ? (
-          <div className="size-5 flex-none animate-pulse rounded-full bg-neutral-200" />
-        ) : (
-          selectedOption?.icon
-        )
-      }
+      icon={
+        !selectedOption ? (
+          <div className="size-5 flex-none animate-pulse rounded-full bg-neutral-200" />
+        ) : (
+          selectedOption.icon
+        )
+      }

---

133-137: Consider a more flexible placeholder width.

The fixed w-[120px] width may cause layout shifts if partner names vary significantly in length. Consider using min-w-[120px] or w-32 for more consistent sizing.

Apply this diff:

-      {!selectedOption?.label ? (
-        <div className="h-6 w-[120px] animate-pulse rounded bg-neutral-100" />
+      {!selectedOption?.label ? (
+        <div className="h-6 min-w-[120px] animate-pulse rounded bg-neutral-100" />
       ) : (
         selectedOption.label
       )}

---

9-10: Remove unused Partner type export from partner-selector.tsx
The Partner type (Pick<PartnerProps, "id" | "name">) isn’t referenced anywhere and can be deleted.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro