From 7f161e1d123c4a33082ec83827e3b7f86d17bcc8 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Mon, 1 Dec 2025 15:54:39 +0200
Subject: [PATCH 01/33] Add :limited_to_segment_id field to shared_links schema

---
 ...1201154500_add_limited_to_segment_to_shared_links.exs | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs

diff --git a/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs b/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs
new file mode 100644
index 000000000000..43791108c13d
--- /dev/null
+++ b/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs
@@ -0,0 +1,9 @@
+defmodule Plausible.Repo.Migrations.AddLimitedToSegmentToSharedLinks do
+  use Ecto.Migration
+
+  def change do
+    alter table(:shared_links) do
+      add :limited_to_segment_id, :integer, null: true
+    end
+  end
+end

From 924e77ef7bde85c3ff0ac57a29dc1224537477ae Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Tue, 2 Dec 2025 19:16:42 +0200
Subject: [PATCH 02/33] Refactor column name, add FK, index, and on delete
 cascade

---
 .../20251201154500_add_limited_to_segment_to_shared_links.exs  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs b/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs
index 43791108c13d..41c7f599bffe 100644
--- a/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs
+++ b/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs
@@ -3,7 +3,8 @@ defmodule Plausible.Repo.Migrations.AddLimitedToSegmentToSharedLinks do
 
   def change do
     alter table(:shared_links) do
-      add :limited_to_segment_id, :integer, null: true
+      add :segment_id, references(:segments, on_delete: :delete_all)
     end
+    create index(:shared_links, [:segment_id])
   end
 end

From 0fb303516b4bfca9028a48974d0ac0d14ce947ab Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Tue, 2 Dec 2025 19:32:26 +0200
Subject: [PATCH 03/33] Format

---
 .../20251201154500_add_limited_to_segment_to_shared_links.exs    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs b/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs
index 41c7f599bffe..f223735c7416 100644
--- a/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs
+++ b/priv/repo/migrations/20251201154500_add_limited_to_segment_to_shared_links.exs
@@ -5,6 +5,7 @@ defmodule Plausible.Repo.Migrations.AddLimitedToSegmentToSharedLinks do
     alter table(:shared_links) do
       add :segment_id, references(:segments, on_delete: :delete_all)
     end
+
     create index(:shared_links, [:segment_id])
   end
 end

From 26212190c8e4990fc1bd874f2812130f5a0c9218 Mon Sep 17 00:00:00 2001
From: Sanne de Vries <sannedv@protonmail.com>
Date: Tue, 4 Nov 2025 10:14:22 +0100
Subject: [PATCH 04/33] Add static UI for adding a segment to a shared link

- Update password UI to use a toogle switch to emphasize the optional nature of the feature
- Add UI for limiting the link to a segment
- Add toggle_field component for full-width label and toggle switch layout
- Add optional link to the input component, showing below the input, which can be used for documentation links
- Add eye icon to shared links list that indicates limited view
- Add tooltips to icons in the shared links list
---
 lib/plausible_web/components/generic.ex       |  55 +++++++-
 lib/plausible_web/live/components/form.ex     |  23 +++-
 .../live/shared_link_settings.ex              |  24 +++-
 .../live/shared_link_settings/form.ex         | 121 +++++++++++++++++-
 4 files changed, 203 insertions(+), 20 deletions(-)

diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.ex
index a1aac36cdffa..d407702d52b8 100644
--- a/lib/plausible_web/components/generic.ex
+++ b/lib/plausible_web/components/generic.ex
@@ -393,7 +393,7 @@ defmodule PlausibleWeb.Components.Generic do
       ~H"""
       <.link
         class={[
-          "inline-flex items-center gap-x-0.5",
+          "inline-flex items-center gap-x-1",
           @class
         ]}
         href={@href}
@@ -403,7 +403,7 @@ defmodule PlausibleWeb.Components.Generic do
         {@rest}
       >
         {render_slot(@inner_block)}
-        <Heroicons.arrow_top_right_on_square class={["opacity-60", @icon_class]} />
+        <Heroicons.arrow_top_right_on_square class={["stroke-2", @icon_class]} />
       </.link>
       """
     else
@@ -471,6 +471,51 @@ defmodule PlausibleWeb.Components.Generic do
     """
   end
 
+  attr :id, :string, required: true
+  attr :js_active_var, :string, required: true
+  attr :id_suffix, :string, default: ""
+  attr :disabled, :boolean, default: false
+  attr :label, :string, required: true
+  attr :help_text, :string, default: nil
+  attr :help_text_conditional, :boolean, default: false
+  attr :mt?, :boolean, default: true
+
+  attr(:rest, :global)
+
+  def toggle_field(assigns) do
+    help_text_conditional = assigns[:help_text_conditional] || false
+
+    assigns = assign(assigns, help_text_conditional: help_text_conditional)
+
+    ~H"""
+    <div class={["flex items-start justify-between gap-5 w-full", @mt? && "mt-6"]}>
+      <div class="flex-1">
+        <span
+          x-on:click={"#{@js_active_var} = !#{@js_active_var}"}
+          class="text-sm font-medium text-gray-900 dark:text-gray-100 cursor-pointer"
+        >
+          {@label}
+        </span>
+        <p
+          :if={@help_text}
+          class="text-gray-500 dark:text-gray-400 text-sm text-pretty"
+          x-show={if @help_text_conditional, do: @js_active_var, else: "true"}
+          x-cloak={@help_text_conditional}
+        >
+          {@help_text}
+        </p>
+      </div>
+      <PlausibleWeb.Components.Generic.toggle_switch
+        id={@id}
+        id_suffix={@id_suffix}
+        js_active_var={@js_active_var}
+        disabled={@disabled}
+        {@rest}
+      />
+    </div>
+    """
+  end
+
   def settings_tiles(assigns) do
     ~H"""
     <div class="text-gray-900 leading-5 dark:text-gray-100">
@@ -683,9 +728,9 @@ defmodule PlausibleWeb.Components.Generic do
 
     if String.contains?(classes, "text-sm") or
          String.contains?(classes, "text-xs") do
-      ["w-3 h-3"]
+      ["size-3"]
     else
-      ["w-4 h-4"]
+      ["size-4"]
     end
   end
 
@@ -793,7 +838,7 @@ defmodule PlausibleWeb.Components.Generic do
     <td
       class={[
         @height,
-        "text-sm px-6 py-4 first:pl-0 last:pr-0 whitespace-nowrap",
+        "text-sm px-6 py-4 first:pl-0 last:pr-0 whitespace-nowrap overflow-visible",
         @truncate && "truncate",
         @max_width,
         @actions && "flex text-right justify-end",
diff --git a/lib/plausible_web/live/components/form.ex b/lib/plausible_web/live/components/form.ex
index 04d463ac22bb..8b46b1f2e8b7 100644
--- a/lib/plausible_web/live/components/form.ex
+++ b/lib/plausible_web/live/components/form.ex
@@ -54,6 +54,7 @@ defmodule PlausibleWeb.Live.Components.Form do
   attr(:max_one_error, :boolean, default: false)
   slot(:help_content)
   slot(:inner_block)
+  slot(:link)
 
   def input(%{field: %Phoenix.HTML.FormField{} = field} = assigns) do
     errors = if Phoenix.Component.used_input?(field), do: field.errors, else: []
@@ -74,8 +75,14 @@ defmodule PlausibleWeb.Live.Components.Form do
 
   def input(%{type: "select"} = assigns) do
     ~H"""
-    <div class={@mt? && "mt-4"}>
-      <.label for={@id} class={if @help_text, do: "mb-0.5", else: "mb-1.5"}>{@label}</.label>
+    <div class={@mt? && "mt-6"}>
+      <.label
+        :if={@label != nil and @label != ""}
+        for={@id}
+        class={if @help_text, do: "mb-0.5", else: "mb-1.5"}
+      >
+        {@label}
+      </.label>
 
       <p :if={@help_text} class="text-gray-500 dark:text-gray-400 mb-2 text-sm">
         {@help_text}
@@ -84,6 +91,9 @@ defmodule PlausibleWeb.Live.Components.Form do
         <option :if={@prompt} value="">{@prompt}</option>
         {Phoenix.HTML.Form.options_for_select(@options, @value)}
       </select>
+      <div :if={@link != [] && Enum.empty?(@errors)} class="mt-1">
+        {render_slot(@link)}
+      </div>
       <.error :for={msg <- @errors}>{msg}</.error>
     </div>
     """
@@ -138,7 +148,7 @@ defmodule PlausibleWeb.Live.Components.Form do
 
         <span
           :if={@help_text || @help_content != []}
-          class="text-gray-500 dark:text-gray-400 mb-2 text-sm"
+          class="text-gray-500 dark:text-gray-400 mb-2 text-sm text-pretty"
         >
           {@help_text}
           {render_slot(@help_content)}
@@ -150,7 +160,7 @@ defmodule PlausibleWeb.Live.Components.Form do
 
   def input(%{type: "textarea"} = assigns) do
     ~H"""
-    <div class={@mt? && "mt-4"}>
+    <div class={@mt? && "mt-6"}>
       <.label class="mb-1.5" for={@id}>{@label}</.label>
       <textarea
         id={@id}
@@ -176,7 +186,7 @@ defmodule PlausibleWeb.Live.Components.Form do
     assigns = assign(assigns, :errors, errors)
 
     ~H"""
-    <div class={@mt? && "mt-4"}>
+    <div class={@mt? && "mt-6"}>
       <.label
         :if={@label != nil and @label != ""}
         for={@id}
@@ -196,6 +206,9 @@ defmodule PlausibleWeb.Live.Components.Form do
         {@rest}
       />
       {render_slot(@inner_block)}
+      <div :if={@link != [] && Enum.empty?(@errors)} class="mt-0.5">
+        {render_slot(@link)}
+      </div>
       <.error :for={msg <- @errors}>
         {msg}
       </.error>
diff --git a/lib/plausible_web/live/shared_link_settings.ex b/lib/plausible_web/live/shared_link_settings.ex
index 3b923fc56598..f1e04acb6785 100644
--- a/lib/plausible_web/live/shared_link_settings.ex
+++ b/lib/plausible_web/live/shared_link_settings.ex
@@ -119,9 +119,27 @@ defmodule PlausibleWeb.Live.SharedLinkSettings do
               </:thead>
               <:tbody :let={link}>
                 <.td truncate hide_on_mobile>
-                  {link.name}
-                  <Heroicons.lock_closed :if={link.password_hash} class="feather ml-2 mb-0.5" />
-                  <Heroicons.lock_open :if={!link.password_hash} class="feather ml-2 mb-0.5" />
+                  <div class="flex items-center">
+                    {link.name}
+                    <.tooltip :if={link.password_hash} enabled?={true} centered?={true}>
+                      <:tooltip_content>
+                        Password protected
+                      </:tooltip_content>
+                      <Heroicons.lock_closed class="feather ml-2 mb-0.5" />
+                    </.tooltip>
+                    <.tooltip :if={!link.password_hash} enabled?={true} centered?={true}>
+                      <:tooltip_content>
+                        No password protection
+                      </:tooltip_content>
+                      <Heroicons.lock_open class="feather ml-2 mb-0.5" />
+                    </.tooltip>
+                    <.tooltip enabled?={true} centered?={true}>
+                      <:tooltip_content>
+                        Limited view
+                      </:tooltip_content>
+                      <Heroicons.eye_slash class="feather ml-1" />
+                    </.tooltip>
+                  </div>
                 </.td>
                 <.td>
                   <.input_with_clipboard
diff --git a/lib/plausible_web/live/shared_link_settings/form.ex b/lib/plausible_web/live/shared_link_settings/form.ex
index e4ff0effc53a..e1a46339dac9 100644
--- a/lib/plausible_web/live/shared_link_settings/form.ex
+++ b/lib/plausible_web/live/shared_link_settings/form.ex
@@ -43,6 +43,46 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
 
       <.input field={f[:name]} label="Name" required="required" autocomplete="off" />
 
+      <div
+        x-data="{ limitViewEnabled: false }"
+        x-effect="
+          const select = document.getElementById('segment_id');
+          if (select && !limitViewEnabled) {
+            select.value = '';
+          }
+        "
+        class="flex flex-col gap-y-2"
+      >
+        <PlausibleWeb.Components.Generic.toggle_field
+          id="limit-view"
+          id_suffix=""
+          js_active_var="limitViewEnabled"
+          label="Limit view"
+          help_text="Filter your dashboard to show only a segment."
+        />
+        <div x-show="limitViewEnabled" x-cloak>
+          <.input
+            name="segment_id"
+            id="segment_id"
+            type="select"
+            value=""
+            options={[{"Filter by segment", ""}]}
+            prompt="Filter by segment"
+            mt?={false}
+          >
+            <:link>
+              <PlausibleWeb.Components.Generic.unstyled_link
+                href="https://plausible.io/docs/filters-segments#how-to-save-a-segment"
+                new_tab
+                class="text-xs text-indigo-600 dark:text-indigo-400"
+              >
+                Learn about segments
+              </PlausibleWeb.Components.Generic.unstyled_link>
+            </:link>
+          </.input>
+        </div>
+      </div>
+
       <.button type="submit" class="w-full">
         Update shared link
       </.button>
@@ -55,13 +95,80 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
     <.form :let={f} for={@form} phx-submit="save-shared-link" phx-target={@myself}>
       <.title>New shared link</.title>
       <.input field={f[:name]} label="Name" required="required" autocomplete="off" />
-      <.input
-        field={f[:password]}
-        label="Password (optional)"
-        help_text="Store the password securely, as it can't be viewed again."
-        type="password"
-        autocomplete="new-password"
-      />
+
+      <div
+        x-data="{ passwordProtectEnabled: false }"
+        x-effect={"
+          const input = document.getElementById('#{f[:password].id}');
+          if (input) {
+            if (passwordProtectEnabled) {
+              setTimeout(() => input.focus(), 50);
+            } else {
+              input.value = '';
+            }
+          }
+        "}
+        class="flex flex-col gap-y-2"
+      >
+        <PlausibleWeb.Components.Generic.toggle_field
+          id="password-protect"
+          id_suffix=""
+          js_active_var="passwordProtectEnabled"
+          label="Password protect"
+          help_text="Keep this password safe. You won't be able to see it again."
+          help_text_conditional={true}
+        />
+        <div x-show="passwordProtectEnabled" x-cloak>
+          <.input
+            field={f[:password]}
+            type="password"
+            placeholder="Enter password"
+            autocomplete="new-password"
+            mt?={false}
+          />
+        </div>
+      </div>
+
+      <div
+        x-data="{ limitViewEnabled: false }"
+        x-effect="
+          const select = document.getElementById('segment_id');
+          if (select && !limitViewEnabled) {
+            select.value = '';
+          }
+        "
+        class="flex flex-col gap-y-2"
+      >
+        <PlausibleWeb.Components.Generic.toggle_field
+          id="limit-view"
+          id_suffix=""
+          js_active_var="limitViewEnabled"
+          label="Limit view"
+          help_text="Filter your dashboard to show only a segment."
+        />
+        <div x-show="limitViewEnabled" x-cloak>
+          <.input
+            name="segment_id"
+            id="segment_id"
+            type="select"
+            value=""
+            options={[{"Filter by segment", ""}]}
+            prompt="Filter by segment"
+            mt?={false}
+          >
+            <:link>
+              <PlausibleWeb.Components.Generic.unstyled_link
+                href="https://plausible.io/docs/filters-segments#how-to-save-a-segment"
+                new_tab
+                class="text-xs text-indigo-600 dark:text-indigo-400"
+              >
+                Learn about segments
+              </PlausibleWeb.Components.Generic.unstyled_link>
+            </:link>
+          </.input>
+        </div>
+      </div>
+
       <.button type="submit" class="w-full">
         Create shared link
       </.button>

From 4a027b8df120a4dcedace9212b7c4bc237d7ca8a Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Tue, 2 Dec 2025 11:39:04 +0200
Subject: [PATCH 05/33] Allow creating and editing shared links with limited
 views

---
 assets/js/dashboard.tsx                       |  2 +
 .../filtering/segments-context.test.tsx       |  7 +-
 .../dashboard/filtering/segments-context.tsx  | 16 +++-
 assets/js/dashboard/nav-menu/filter-menu.tsx  | 12 ++-
 assets/test-utils/app-context-providers.tsx   |  2 +-
 lib/plausible/segments/segments.ex            | 57 ++++++++++++
 lib/plausible/site/shared_link.ex             |  4 +-
 lib/plausible/sites.ex                        |  4 +-
 lib/plausible_web/components/generic.ex       |  4 +-
 .../controllers/stats_controller.ex           | 28 +++++-
 .../live/shared_link_settings.ex              |  7 +-
 .../live/shared_link_settings/form.ex         | 92 +++++++++----------
 lib/plausible_web/router.ex                   |  1 +
 .../templates/stats/stats.html.heex           |  1 +
 14 files changed, 173 insertions(+), 64 deletions(-)

diff --git a/assets/js/dashboard.tsx b/assets/js/dashboard.tsx
index c4451df210d9..75ae1f985859 100644
--- a/assets/js/dashboard.tsx
+++ b/assets/js/dashboard.tsx
@@ -19,6 +19,7 @@ import {
   SomethingWentWrongMessage
 } from './dashboard/error/something-went-wrong'
 import {
+  parseLimitedToSegmentId,
   parsePreloadedSegments,
   SegmentsContextProvider
 } from './dashboard/filtering/segments-context'
@@ -83,6 +84,7 @@ if (container && container.dataset) {
               }
             >
               <SegmentsContextProvider
+                limitedToSegmentId={parseLimitedToSegmentId(container.dataset)}
                 preloadedSegments={parsePreloadedSegments(container.dataset)}
               >
                 <RouterProvider router={router} />
diff --git a/assets/js/dashboard/filtering/segments-context.test.tsx b/assets/js/dashboard/filtering/segments-context.test.tsx
index 01889aa5d396..2dac28a7c289 100644
--- a/assets/js/dashboard/filtering/segments-context.test.tsx
+++ b/assets/js/dashboard/filtering/segments-context.test.tsx
@@ -35,6 +35,7 @@ describe('SegmentsContext functions', () => {
   test('deleteOne works', () => {
     render(
       <SegmentsContextProvider
+        limitedToSegmentId={null}
         preloadedSegments={[segmentOpenSource, segmentAPAC]}
       >
         <TestComponent />
@@ -51,7 +52,10 @@ describe('SegmentsContext functions', () => {
 
   test('addOne adds to head of list', async () => {
     render(
-      <SegmentsContextProvider preloadedSegments={[segmentAPAC]}>
+      <SegmentsContextProvider
+        limitedToSegmentId={null}
+        preloadedSegments={[segmentAPAC]}
+      >
         <TestComponent />
       </SegmentsContextProvider>
     )
@@ -68,6 +72,7 @@ describe('SegmentsContext functions', () => {
   test('updateOne works: updated segment is at head of list', () => {
     render(
       <SegmentsContextProvider
+        limitedToSegmentId={null}
         preloadedSegments={[segmentOpenSource, segmentAPAC]}
       >
         <TestComponent />
diff --git a/assets/js/dashboard/filtering/segments-context.tsx b/assets/js/dashboard/filtering/segments-context.tsx
index cbc15233e303..7c771d09a986 100644
--- a/assets/js/dashboard/filtering/segments-context.tsx
+++ b/assets/js/dashboard/filtering/segments-context.tsx
@@ -17,17 +17,23 @@ export function parsePreloadedSegments(dataset: DOMStringMap): SavedSegments {
   return JSON.parse(dataset.segments!).map(handleSegmentResponse)
 }
 
+export function parseLimitedToSegmentId(dataset: DOMStringMap): number | null {
+  return JSON.parse(dataset.limitedToSegmentId!)
+}
+
 type ChangeSegmentState = (
   segment: (SavedSegment | SavedSegmentPublic) & { segment_data: SegmentData }
 ) => void
 
 const initialValue: {
   segments: SavedSegments
+  limitedToSegmentId: number | null
   updateOne: ChangeSegmentState
   addOne: ChangeSegmentState
   removeOne: ChangeSegmentState
 } = {
   segments: [],
+  limitedToSegmentId: null,
   updateOne: () => {},
   addOne: () => {},
   removeOne: () => {}
@@ -41,9 +47,11 @@ export const useSegmentsContext = () => {
 
 export const SegmentsContextProvider = ({
   preloadedSegments,
+  limitedToSegmentId,
   children
 }: {
   preloadedSegments: SavedSegments
+  limitedToSegmentId: number | null
   children: ReactNode
 }) => {
   const [segments, setSegments] = useState(preloadedSegments)
@@ -73,7 +81,13 @@ export const SegmentsContextProvider = ({
 
   return (
     <SegmentsContext.Provider
-      value={{ segments, removeOne, updateOne, addOne }}
+      value={{
+        segments,
+        limitedToSegmentId: limitedToSegmentId ?? null,
+        removeOne,
+        updateOne,
+        addOne
+      }}
     >
       {children}
     </SegmentsContext.Provider>
diff --git a/assets/js/dashboard/nav-menu/filter-menu.tsx b/assets/js/dashboard/nav-menu/filter-menu.tsx
index 12fa7c999737..f0340a740c3d 100644
--- a/assets/js/dashboard/nav-menu/filter-menu.tsx
+++ b/assets/js/dashboard/nav-menu/filter-menu.tsx
@@ -11,6 +11,7 @@ import { popover, BlurMenuButtonOnEscape } from '../components/popover'
 import classNames from 'classnames'
 import { AppNavigationLink } from '../navigation/use-app-navigate'
 import { SearchableSegmentsSection } from './segments/searchable-segments-section'
+import { useSegmentsContext } from '../filtering/segments-context'
 
 export function getFilterListItems({
   propsAvailable
@@ -49,6 +50,7 @@ const FilterMenuItems = ({ closeDropdown }: { closeDropdown: () => void }) => {
   const columns = useMemo(() => getFilterListItems(site), [site])
   const buttonRef = useRef<HTMLButtonElement>(null)
   const panelRef = useRef<HTMLDivElement>(null)
+  const { limitedToSegmentId } = useSegmentsContext()
 
   return (
     <>
@@ -107,10 +109,12 @@ const FilterMenuItems = ({ closeDropdown }: { closeDropdown: () => void }) => {
               </div>
             ))}
           </div>
-          <SearchableSegmentsSection
-            closeList={closeDropdown}
-            tooltipContainerRef={panelRef}
-          />
+          {limitedToSegmentId === null && (
+            <SearchableSegmentsSection
+              closeList={closeDropdown}
+              tooltipContainerRef={panelRef}
+            />
+          )}
         </Popover.Panel>
       </Transition>
     </>
diff --git a/assets/test-utils/app-context-providers.tsx b/assets/test-utils/app-context-providers.tsx
index 17f4bf4b3bfd..4f4e9c7282a7 100644
--- a/assets/test-utils/app-context-providers.tsx
+++ b/assets/test-utils/app-context-providers.tsx
@@ -78,7 +78,7 @@ export const TestContextProviders = ({
           }
         }
       >
-        <SegmentsContextProvider preloadedSegments={preloaded?.segments ?? []}>
+        <SegmentsContextProvider limitedToSegmentId={null} preloadedSegments={preloaded?.segments ?? []}>
           <MemoryRouter
             basename={getRouterBasepath(site)}
             initialEntries={defaultInitialEntries}
diff --git a/lib/plausible/segments/segments.ex b/lib/plausible/segments/segments.ex
index 290364fe4422..133b57845fd7 100644
--- a/lib/plausible/segments/segments.ex
+++ b/lib/plausible/segments/segments.ex
@@ -70,6 +70,63 @@ defmodule Plausible.Segments do
     {:ok, Repo.all(query)}
   end
 
+  def search_by_name(%Plausible.Site{} = site, name, opts) do
+    type = Keyword.fetch!(opts, :type)
+    fields = Keyword.get(opts, :fields, [:id, :name])
+
+    name_empty? = is_nil(name) or (is_binary(name) and String.trim(name) == "")
+
+    base_query =
+      from(segment in Segment,
+        where: segment.site_id == ^site.id,
+        where: segment.type == ^type,
+        limit: 20
+      )
+
+    query =
+      if name_empty? do
+        from([segment] in base_query,
+          select: ^fields,
+          order_by: [desc: segment.updated_at]
+        )
+      else
+        from([segment] in base_query,
+          select: %{
+            id: segment.id,
+            name: segment.name,
+            match_rank:
+              fragment(
+                "CASE
+                WHEN lower(?) = lower(?) THEN 0                    -- exact match
+                WHEN lower(?) LIKE lower(?) || '%' THEN 1          -- starts with
+                WHEN lower(?) LIKE '% ' || lower(?) || '%' THEN 2  -- after a space
+                WHEN lower(?) LIKE ? THEN 3                        -- anywhere
+              END AS match_rank",
+                segment.name,
+                ^name,
+                segment.name,
+                ^name,
+                segment.name,
+                ^name,
+                segment.name,
+                ^"%name%"
+              ),
+            pos:
+              fragment(
+                "position(lower(?) IN lower(?)) AS pos",
+                segment.name,
+                ^name
+              ),
+            len_diff: fragment("abs(length(?) - length(?)) AS len_diff", segment.name, ^name)
+          },
+          where: fragment("? ilike ?", segment.name, ^"%#{name}%"),
+          order_by: fragment("match_rank asc, pos asc, len_diff asc, updated_at desc")
+        )
+      end
+
+    {:ok, Repo.all(query)}
+  end
+
   @spec get_one(pos_integer(), Plausible.Site.t(), atom(), pos_integer() | nil) ::
           {:ok, Segment.t()}
           | error_not_enough_permissions()
diff --git a/lib/plausible/site/shared_link.ex b/lib/plausible/site/shared_link.ex
index fdc8109a5962..5d8774369100 100644
--- a/lib/plausible/site/shared_link.ex
+++ b/lib/plausible/site/shared_link.ex
@@ -10,17 +10,19 @@ defmodule Plausible.Site.SharedLink do
     field :slug, :string
     field :password_hash, :string
     field :password, :string, virtual: true
+    belongs_to :segment, Plausible.Segments.Segment
 
     timestamps()
   end
 
   def changeset(link, attrs \\ %{}, opts \\ []) do
     link
-    |> cast(attrs, [:slug, :password, :name])
+    |> cast(attrs, [:slug, :password, :name, :segment_id])
     |> validate_required([:slug, :name])
     |> validate_special_name(opts)
     |> unique_constraint(:slug)
     |> unique_constraint(:name, name: :shared_links_site_id_name_index)
+    |> foreign_key_constraint(:segment_id)
     |> hash_password()
   end
 
diff --git a/lib/plausible/sites.ex b/lib/plausible/sites.ex
index f0f04d1f5d9e..98b0ffb709f1 100644
--- a/lib/plausible/sites.ex
+++ b/lib/plausible/sites.ex
@@ -415,6 +415,8 @@ defmodule Plausible.Sites do
 
   def create_shared_link(site, name, opts \\ []) do
     password = Keyword.get(opts, :password)
+    segment_id = Keyword.get(opts, :segment_id)
+
     site = Plausible.Repo.preload(site, :team)
     skip_feature_check? = Keyword.get(opts, :skip_feature_check?, false)
 
@@ -423,7 +425,7 @@ defmodule Plausible.Sites do
     else
       %SharedLink{site_id: site.id, slug: Nanoid.generate()}
       |> SharedLink.changeset(
-        %{name: name, password: password},
+        %{name: name, password: password, segment_id: segment_id},
         Keyword.take(opts, [:skip_special_name_check?])
       )
       |> Repo.insert()
diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.ex
index d407702d52b8..d273bd992d16 100644
--- a/lib/plausible_web/components/generic.ex
+++ b/lib/plausible_web/components/generic.ex
@@ -838,7 +838,9 @@ defmodule PlausibleWeb.Components.Generic do
     <td
       class={[
         @height,
-        "text-sm px-6 py-4 first:pl-0 last:pr-0 whitespace-nowrap overflow-visible",
+        "text-sm px-6 py-4 first:pl-0 last:pr-0 whitespace-nowrap",
+         # allow tooltips overflow cells vertically
+        "overflow-visible",
         @truncate && "truncate",
         @max_width,
         @actions && "flex text-right justify-end",
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index 07dc1412b10c..17ba012bdc03 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -100,7 +100,8 @@ defmodule PlausibleWeb.StatsController do
           hide_footer?: if(ce?() || demo, do: false, else: site_role != :public),
           consolidated_view?: consolidated_view?,
           consolidated_view_available?: consolidated_view_available?,
-          team_identifier: team_identifier
+          team_identifier: team_identifier,
+          limited_to_segment_id: nil
         )
 
       !stats_start_date && can_see_stats? ->
@@ -396,12 +397,28 @@ defmodule PlausibleWeb.StatsController do
       not Teams.locked?(shared_link.site.team) ->
         current_user = conn.assigns[:current_user]
         site_role = get_fallback_site_role(conn)
-        shared_link = Plausible.Repo.preload(shared_link, site: :owners)
+        shared_link = Plausible.Repo.preload(shared_link, site: [:owners], segment: [])
         stats_start_date = Plausible.Sites.stats_start_date(shared_link.site)
 
         flags = get_flags(current_user, shared_link.site)
-
-        {:ok, segments} = Plausible.Segments.get_all_for_site(shared_link.site, site_role)
+        limited_to_segment_id = shared_link.segment && shared_link.segment.id
+
+        segments =
+          if is_nil(limited_to_segment_id) do
+            {:ok, segments} = Plausible.Segments.get_all_for_site(shared_link.site, site_role)
+            segments
+          else
+            shared_link.segment
+            |> Map.take([
+              :id,
+              :name,
+              :type,
+              :inserted_at,
+              :updated_at,
+              :segment_data
+            ])
+            |> List.wrap()
+          end
 
         embedded? = conn.params["embed"] == "true"
 
@@ -435,7 +452,8 @@ defmodule PlausibleWeb.StatsController do
           # no shared links for consolidated views
           consolidated_view?: false,
           consolidated_view_available?: false,
-          team_identifier: team_identifier
+          team_identifier: team_identifier,
+          limited_to_segment_id: limited_to_segment_id
         )
     end
   end
diff --git a/lib/plausible_web/live/shared_link_settings.ex b/lib/plausible_web/live/shared_link_settings.ex
index f1e04acb6785..0b37c1c063a3 100644
--- a/lib/plausible_web/live/shared_link_settings.ex
+++ b/lib/plausible_web/live/shared_link_settings.ex
@@ -133,7 +133,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings do
                       </:tooltip_content>
                       <Heroicons.lock_open class="feather ml-2 mb-0.5" />
                     </.tooltip>
-                    <.tooltip enabled?={true} centered?={true}>
+                    <.tooltip :if={link.segment_id} enabled?={true} centered?={true}>
                       <:tooltip_content>
                         Limited view
                       </:tooltip_content>
@@ -176,7 +176,10 @@ defmodule PlausibleWeb.Live.SharedLinkSettings do
   end
 
   def handle_event("edit-shared-link", %{"slug" => slug}, socket) do
-    shared_link = Plausible.Repo.get_by(Plausible.Site.SharedLink, slug: slug)
+    shared_link =
+      Plausible.Site.SharedLink
+      |> Plausible.Repo.get_by(slug: slug)
+      |> Plausible.Repo.preload(:segment)
 
     socket =
       socket |> assign(form_shared_link: shared_link) |> Modal.open("shared-links-form-modal")
diff --git a/lib/plausible_web/live/shared_link_settings/form.ex b/lib/plausible_web/live/shared_link_settings/form.ex
index e1a46339dac9..3ca0890b43e2 100644
--- a/lib/plausible_web/live/shared_link_settings/form.ex
+++ b/lib/plausible_web/live/shared_link_settings/form.ex
@@ -6,6 +6,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
   use Plausible
 
   alias Plausible.Sites
+  alias PlausibleWeb.Live.Components.ComboBox
 
   def update(assigns, socket) do
     form =
@@ -44,11 +45,13 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
       <.input field={f[:name]} label="Name" required="required" autocomplete="off" />
 
       <div
-        x-data="{ limitViewEnabled: false }"
+        x-data={"{ limitViewEnabled: #{not is_nil(f[:segment_id].value)} }"}
         x-effect="
-          const select = document.getElementById('segment_id');
-          if (select && !limitViewEnabled) {
-            select.value = '';
+          const input = document.getElementById('submit-segment_id');
+          if (input) {
+            if (!limitViewEnabled) {
+              input.value = '';
+            }
           }
         "
         class="flex flex-col gap-y-2"
@@ -61,25 +64,21 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
           help_text="Filter your dashboard to show only a segment."
         />
         <div x-show="limitViewEnabled" x-cloak>
-          <.input
-            name="segment_id"
+          <.live_component
             id="segment_id"
-            type="select"
-            value=""
-            options={[{"Filter by segment", ""}]}
-            prompt="Filter by segment"
-            mt?={false}
-          >
-            <:link>
-              <PlausibleWeb.Components.Generic.unstyled_link
-                href="https://plausible.io/docs/filters-segments#how-to-save-a-segment"
-                new_tab
-                class="text-xs text-indigo-600 dark:text-indigo-400"
-              >
-                Learn about segments
-              </PlausibleWeb.Components.Generic.unstyled_link>
-            </:link>
-          </.input>
+            submit_name="shared_link[segment_id]"
+            module={ComboBox}
+            suggest_fun={
+              fn input, _ ->
+                {:ok, segments} = Plausible.Segments.search_by_name(assigns.site, input, type: :site)
+                Enum.map(segments, &{&1.id, &1.name})
+              end
+            }
+            selected={
+              @shared_link.segment_id &&
+                {@shared_link.limited_to_segment.id, @shared_link.limited_to_segment.name}
+            }
+          />
         </div>
       </div>
 
@@ -130,11 +129,13 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
       </div>
 
       <div
-        x-data="{ limitViewEnabled: false }"
+        x-data={"{ limitViewEnabled: #{not is_nil(f[:segment_id].value)} }"}
         x-effect="
-          const select = document.getElementById('segment_id');
-          if (select && !limitViewEnabled) {
-            select.value = '';
+          const input = document.getElementById('submit-segment_id');
+          if (input) {
+            if (!limitViewEnabled) {
+              input.value = '';
+            }
           }
         "
         class="flex flex-col gap-y-2"
@@ -147,28 +148,20 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
           help_text="Filter your dashboard to show only a segment."
         />
         <div x-show="limitViewEnabled" x-cloak>
-          <.input
-            name="segment_id"
+          <.live_component
             id="segment_id"
-            type="select"
-            value=""
-            options={[{"Filter by segment", ""}]}
-            prompt="Filter by segment"
-            mt?={false}
-          >
-            <:link>
-              <PlausibleWeb.Components.Generic.unstyled_link
-                href="https://plausible.io/docs/filters-segments#how-to-save-a-segment"
-                new_tab
-                class="text-xs text-indigo-600 dark:text-indigo-400"
-              >
-                Learn about segments
-              </PlausibleWeb.Components.Generic.unstyled_link>
-            </:link>
-          </.input>
+            submit_name="shared_link[segment_id]"
+            module={ComboBox}
+            suggest_fun={
+              fn input, _ ->
+                {:ok, segments} = Plausible.Segments.search_by_name(assigns.site, input, type: :site)
+                Enum.map(segments, &{&1.id, &1.name})
+              end
+            }
+            selected={nil}
+          />
         </div>
       </div>
-
       <.button type="submit" class="w-full">
         Create shared link
       </.button>
@@ -182,7 +175,8 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
         %{assigns: %{shared_link: nil}} = socket
       ) do
     case Sites.create_shared_link(socket.assigns.site, shared_link_params["name"],
-           password: shared_link_params["password"]
+           password: shared_link_params["password"],
+           segment_id: shared_link_params["segment_id"]
          ) do
       {:ok, shared_link} ->
         socket = socket.assigns.on_save_shared_link.(shared_link, socket)
@@ -205,7 +199,11 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
         %{"shared_link" => shared_link_params},
         %{assigns: %{shared_link: %Plausible.Site.SharedLink{} = shared_link}} = socket
       ) do
-    changeset = Plausible.Site.SharedLink.changeset(shared_link, shared_link_params)
+    changeset =
+      Plausible.Site.SharedLink.changeset(
+        shared_link,
+        shared_link_params
+      )
 
     case Plausible.Repo.update(changeset) do
       {:ok, updated_shared_link} ->
diff --git a/lib/plausible_web/router.ex b/lib/plausible_web/router.ex
index a5046072e320..02e1beacf9e2 100644
--- a/lib/plausible_web/router.ex
+++ b/lib/plausible_web/router.ex
@@ -306,6 +306,7 @@ defmodule PlausibleWeb.Router do
       post "/", SegmentsController, :create
       patch "/:segment_id", SegmentsController, :update
       delete "/:segment_id", SegmentsController, :delete
+      get "/:segment_id/shared-links", SegmentsController, :get_related_shared_links
     end
   end
 
diff --git a/lib/plausible_web/templates/stats/stats.html.heex b/lib/plausible_web/templates/stats/stats.html.heex
index d473e6b5be41..04d1e8d36e6b 100644
--- a/lib/plausible_web/templates/stats/stats.html.heex
+++ b/lib/plausible_web/templates/stats/stats.html.heex
@@ -52,6 +52,7 @@
     data-is-consolidated-view={Jason.encode!(@consolidated_view?)}
     data-consolidated-view-available={Jason.encode!(@consolidated_view_available?)}
     data-team-identifier={@team_identifier}
+    data-limited-to-segment-id={Jason.encode!(@limited_to_segment_id)}
   >
   </div>
   <div id="modal_root"></div>

From 1adcfd645a0878c1016e0b5eb2ec1ce410f5df57 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Wed, 3 Dec 2025 13:34:17 +0200
Subject: [PATCH 06/33] Clarify search function arg names

---
 .../dashboard/nav-menu/filter-pills-list.tsx  |  4 ++--
 .../segments/searchable-segments-section.tsx  | 22 +++----------------
 assets/js/dashboard/stats/graph/line-graph.js |  4 ++--
 assets/js/dashboard/stats/locations/map.tsx   |  2 +-
 .../js/dashboard/stats/modals/filter-modal.js |  4 ++--
 5 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/assets/js/dashboard/nav-menu/filter-pills-list.tsx b/assets/js/dashboard/nav-menu/filter-pills-list.tsx
index 6ca03290aa0a..7828ba2b7d3a 100644
--- a/assets/js/dashboard/nav-menu/filter-pills-list.tsx
+++ b/assets/js/dashboard/nav-menu/filter-pills-list.tsx
@@ -88,8 +88,8 @@ export const AppliedFilterPillsList = React.forwardRef<
             )
 
             navigate({
-              search: (search) => ({
-                ...search,
+              search: (searchRecord) => ({
+                ...searchRecord,
                 filters: newFilters,
                 labels: cleanLabels(newFilters, query.labels)
               })
diff --git a/assets/js/dashboard/nav-menu/segments/searchable-segments-section.tsx b/assets/js/dashboard/nav-menu/segments/searchable-segments-section.tsx
index ce5aea8b2b0e..aa4824e96f97 100644
--- a/assets/js/dashboard/nav-menu/segments/searchable-segments-section.tsx
+++ b/assets/js/dashboard/nav-menu/segments/searchable-segments-section.tsx
@@ -2,14 +2,12 @@ import React, { RefObject } from 'react'
 import { useQueryContext } from '../../query-context'
 import { useSiteContext } from '../../site-context'
 import {
-  formatSegmentIdAsLabelKey,
-  isSegmentFilter,
   SavedSegmentPublic,
   SavedSegment,
   SEGMENT_TYPE_LABELS,
-  isListableSegment
+  isListableSegment,
+  getSearchToSetSegmentFilter
 } from '../../filtering/segments'
-import { cleanLabels } from '../../util/filters'
 import classNames from 'classnames'
 import { Tooltip } from '../../util/tooltip'
 import { SegmentAuthorship } from '../../segments/segment-authorship'
@@ -170,26 +168,12 @@ const SegmentLink = ({
 }: Pick<SavedSegment, 'id' | 'name'> & {
   closeList: () => void
 }) => {
-  const { query } = useQueryContext()
-
   return (
     <AppNavigationLink
       className={linkClassName}
       key={id}
       onClick={closeList}
-      search={(search) => {
-        const otherFilters = query.filters.filter((f) => !isSegmentFilter(f))
-
-        const updatedFilters = [['is', 'segment', [id]], ...otherFilters]
-
-        return {
-          ...search,
-          filters: updatedFilters,
-          labels: cleanLabels(updatedFilters, query.labels, 'segment', {
-            [formatSegmentIdAsLabelKey(id)]: name
-          })
-        }
-      }}
+      search={getSearchToSetSegmentFilter({ id, name })}
     >
       <div className="truncate">{name}</div>
     </AppNavigationLink>
diff --git a/assets/js/dashboard/stats/graph/line-graph.js b/assets/js/dashboard/stats/graph/line-graph.js
index ef45b2fa4acd..4b10e734091d 100644
--- a/assets/js/dashboard/stats/graph/line-graph.js
+++ b/assets/js/dashboard/stats/graph/line-graph.js
@@ -247,11 +247,11 @@ class LineGraph extends React.Component {
 
     if (this.props.graphData.interval === 'month') {
       this.props.navigate({
-        search: (search) => ({ ...search, period: 'month', date })
+        search: (searchRecord) => ({ ...searchRecord, period: 'month', date })
       })
     } else if (this.props.graphData.interval === 'day') {
       this.props.navigate({
-        search: (search) => ({ ...search, period: 'day', date })
+        search: (searchRecord) => ({ ...searchRecord, period: 'day', date })
       })
     }
   }
diff --git a/assets/js/dashboard/stats/locations/map.tsx b/assets/js/dashboard/stats/locations/map.tsx
index 2e4960da426d..524a28a17eba 100644
--- a/assets/js/dashboard/stats/locations/map.tsx
+++ b/assets/js/dashboard/stats/locations/map.tsx
@@ -106,7 +106,7 @@ const WorldMap = ({
           [country.code]: country.name
         })
         onCountrySelect()
-        navigate({ search: (search) => ({ ...search, filters, labels }) })
+        navigate({ search: (searchRecord) => ({ ...searchRecord, filters, labels }) })
       }
     },
     [navigate, query, dataByCountryCode, onCountrySelect]
diff --git a/assets/js/dashboard/stats/modals/filter-modal.js b/assets/js/dashboard/stats/modals/filter-modal.js
index 84052e87c4cc..be4c5443f3c2 100644
--- a/assets/js/dashboard/stats/modals/filter-modal.js
+++ b/assets/js/dashboard/stats/modals/filter-modal.js
@@ -111,8 +111,8 @@ class FilterModal extends React.Component {
   selectFiltersAndCloseModal(filters) {
     this.props.navigate({
       path: rootRoute.path,
-      search: (search) => ({
-        ...search,
+      search: (searchRecord) => ({
+        ...searchRecord,
         filters: filters,
         labels: cleanLabels(filters, this.state.labelState)
       }),

From 32652d53b21b45bdd1c38e2da05cc8920e31cf12 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Wed, 3 Dec 2025 13:41:11 +0200
Subject: [PATCH 07/33] Unify function to set segment filter

---
 .../js/dashboard/filtering/segments.test.ts   | 64 +++++++++++++++++--
 assets/js/dashboard/filtering/segments.ts     | 18 ++++--
 .../segments/routeless-segment-modals.tsx     | 10 ++-
 3 files changed, 79 insertions(+), 13 deletions(-)

diff --git a/assets/js/dashboard/filtering/segments.test.ts b/assets/js/dashboard/filtering/segments.test.ts
index a52eac22fdb7..3bf524319c5b 100644
--- a/assets/js/dashboard/filtering/segments.test.ts
+++ b/assets/js/dashboard/filtering/segments.test.ts
@@ -1,7 +1,7 @@
 import { remapToApiFilters } from '../util/filters'
 import {
   formatSegmentIdAsLabelKey,
-  getSearchToApplySingleSegmentFilter,
+  getSearchToSetSegmentFilter,
   getSegmentNamePlaceholder,
   isSegmentIdLabelKey,
   parseApiSegmentData,
@@ -64,9 +64,57 @@ describe(`${parseApiSegmentData.name}`, () => {
   })
 })
 
-describe(`${getSearchToApplySingleSegmentFilter.name}`, () => {
-  test('generated search function applies single segment correctly', () => {
-    const searchFunction = getSearchToApplySingleSegmentFilter({
+describe(`${getSearchToSetSegmentFilter.name}`, () => {
+  test('generated search function omits other filters segment correctly', () => {
+    const searchFunction = getSearchToSetSegmentFilter(
+      {
+        name: 'APAC',
+        id: 500
+      },
+      { omitAllOtherFilters: true }
+    )
+    const existingSearch = {
+      date: '2025-02-10',
+      filters: [
+        ['is', 'country', ['US']],
+        ['is', 'page', ['/blog']]
+      ],
+      labels: { US: 'United States' }
+    }
+    expect(searchFunction(existingSearch)).toEqual({
+      date: '2025-02-10',
+      filters: [['is', 'segment', [500]]],
+      labels: { 'segment-500': 'APAC' }
+    })
+  })
+
+  test('generated search function replaces existing segment filter correctly', () => {
+    const searchFunction = getSearchToSetSegmentFilter({
+      name: 'APAC',
+      id: 500
+    })
+    const existingSearch = {
+      date: '2025-02-10',
+      filters: [
+        ['is', 'segment', [100]],
+        ['is', 'country', ['US']],
+        ['is', 'page', ['/blog']]
+      ],
+      labels: { US: 'United States', 'segment-100': 'Scandinavia' }
+    }
+    expect(searchFunction(existingSearch)).toEqual({
+      date: '2025-02-10',
+      filters: [
+        ['is', 'segment', [500]],
+        ['is', 'country', ['US']],
+        ['is', 'page', ['/blog']]
+      ],
+      labels: { US: 'United States', 'segment-500': 'APAC' }
+    })
+  })
+
+  test('generated search function sets new segment filter correctly', () => {
+    const searchFunction = getSearchToSetSegmentFilter({
       name: 'APAC',
       id: 500
     })
@@ -80,8 +128,12 @@ describe(`${getSearchToApplySingleSegmentFilter.name}`, () => {
     }
     expect(searchFunction(existingSearch)).toEqual({
       date: '2025-02-10',
-      filters: [['is', 'segment', [500]]],
-      labels: { 'segment-500': 'APAC' }
+      filters: [
+        ['is', 'segment', [500]],
+        ['is', 'country', ['US']],
+        ['is', 'page', ['/blog']]
+      ],
+      labels: { US: 'United States', 'segment-500': 'APAC' }
     })
   })
 })
diff --git a/assets/js/dashboard/filtering/segments.ts b/assets/js/dashboard/filtering/segments.ts
index e3e6aa0cb85c..23a3e0904639 100644
--- a/assets/js/dashboard/filtering/segments.ts
+++ b/assets/js/dashboard/filtering/segments.ts
@@ -105,12 +105,22 @@ export const parseApiSegmentData = ({
   ...rest
 })
 
-export function getSearchToApplySingleSegmentFilter(
-  segment: Pick<SavedSegment, 'id' | 'name'>
+export function getSearchToSetSegmentFilter(
+  segment: Pick<SavedSegment, 'id' | 'name'>,
+  options: { omitAllOtherFilters?: boolean } = {}
 ): Required<AppNavigationTarget>['search'] {
   return (search) => {
-    const filters = [['is', 'segment', [segment.id]]]
-    const labels = cleanLabels(filters, {}, 'segment', {
+    const otherFilters = (
+      (Array.isArray(search.filters) ? search.filters : []) as Filter[]
+    ).filter((f) => !isSegmentFilter(f))
+    const currentLabels = search.labels ?? {}
+
+    const filters = [
+      ['is', 'segment', [segment.id]],
+      ...(options.omitAllOtherFilters ? [] : otherFilters)
+    ]
+
+    const labels = cleanLabels(filters, currentLabels, 'segment', {
       [formatSegmentIdAsLabelKey(segment.id)]: segment.name
     })
     return {
diff --git a/assets/js/dashboard/segments/routeless-segment-modals.tsx b/assets/js/dashboard/segments/routeless-segment-modals.tsx
index 024a9d4b8ff8..6541b5d93ab8 100644
--- a/assets/js/dashboard/segments/routeless-segment-modals.tsx
+++ b/assets/js/dashboard/segments/routeless-segment-modals.tsx
@@ -5,7 +5,7 @@ import {
   UpdateSegmentModal
 } from './segment-modals'
 import {
-  getSearchToApplySingleSegmentFilter,
+  getSearchToSetSegmentFilter,
   getSegmentNamePlaceholder,
   handleSegmentResponse,
   SavedSegment,
@@ -67,7 +67,9 @@ export const RoutelessSegmentModals = () => {
       updateOne(segment)
       queryClient.invalidateQueries({ queryKey: ['segments'] })
       navigate({
-        search: getSearchToApplySingleSegmentFilter(segment),
+        search: getSearchToSetSegmentFilter(segment, {
+          omitAllOtherFilters: true
+        }),
         state: {
           expandedSegment: null
         }
@@ -104,7 +106,9 @@ export const RoutelessSegmentModals = () => {
       addOne(segment)
       queryClient.invalidateQueries({ queryKey: ['segments'] })
       navigate({
-        search: getSearchToApplySingleSegmentFilter(segment),
+        search: getSearchToSetSegmentFilter(segment, {
+          omitAllOtherFilters: true
+        }),
         state: {
           expandedSegment: null
         }

From befc3b7202cb732e3ba1fb32f29d3873efac3159 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Wed, 3 Dec 2025 13:50:24 +0200
Subject: [PATCH 08/33] Enforce limited view segment on dashboard

---
 assets/js/dashboard.tsx                       | 16 +++--
 .../filtering/segments-context.test.tsx       |  6 +-
 .../dashboard/filtering/segments-context.tsx  | 20 ++++--
 assets/js/dashboard/nav-menu/filter-menu.tsx  |  4 +-
 .../dashboard/navigation/use-app-navigate.tsx | 19 +++++-
 .../dashboard/util/url-search-params.test.ts  | 61 +++++++----------
 assets/js/dashboard/util/url-search-params.ts | 66 ++++++++++++++++---
 assets/test-utils/app-context-providers.tsx   |  2 +-
 8 files changed, 131 insertions(+), 63 deletions(-)

diff --git a/assets/js/dashboard.tsx b/assets/js/dashboard.tsx
index 75ae1f985859..b0871d687397 100644
--- a/assets/js/dashboard.tsx
+++ b/assets/js/dashboard.tsx
@@ -7,7 +7,7 @@ import { createAppRouter } from './dashboard/router'
 import ErrorBoundary from './dashboard/error/error-boundary'
 import * as api from './dashboard/api'
 import * as timer from './dashboard/util/realtime-update-timer'
-import { redirectForLegacyParams } from './dashboard/util/url-search-params'
+import { maybeDoFERedirect } from './dashboard/util/url-search-params'
 import SiteContextProvider, {
   parseSiteFromDataset
 } from './dashboard/site-context'
@@ -19,6 +19,7 @@ import {
   SomethingWentWrongMessage
 } from './dashboard/error/something-went-wrong'
 import {
+  getLimitedToSegment,
   parseLimitedToSegmentId,
   parsePreloadedSegments,
   SegmentsContextProvider
@@ -40,8 +41,15 @@ if (container && container.dataset) {
       api.setSharedLinkAuth(sharedLinkAuth)
     }
 
+    const limitedToSegmentId = parseLimitedToSegmentId(container.dataset)
+    const preloadedSegments = parsePreloadedSegments(container.dataset)
+    const limitedToSegment = getLimitedToSegment(
+      limitedToSegmentId,
+      preloadedSegments
+    )
+
     try {
-      redirectForLegacyParams(window.location, window.history)
+      maybeDoFERedirect(window.location, window.history, limitedToSegment)
     } catch (e) {
       console.error('Error redirecting in a backwards compatible way', e)
     }
@@ -84,8 +92,8 @@ if (container && container.dataset) {
               }
             >
               <SegmentsContextProvider
-                limitedToSegmentId={parseLimitedToSegmentId(container.dataset)}
-                preloadedSegments={parsePreloadedSegments(container.dataset)}
+                limitedToSegment={limitedToSegment}
+                preloadedSegments={preloadedSegments}
               >
                 <RouterProvider router={router} />
               </SegmentsContextProvider>
diff --git a/assets/js/dashboard/filtering/segments-context.test.tsx b/assets/js/dashboard/filtering/segments-context.test.tsx
index 2dac28a7c289..3925e6d39b6c 100644
--- a/assets/js/dashboard/filtering/segments-context.test.tsx
+++ b/assets/js/dashboard/filtering/segments-context.test.tsx
@@ -35,7 +35,7 @@ describe('SegmentsContext functions', () => {
   test('deleteOne works', () => {
     render(
       <SegmentsContextProvider
-        limitedToSegmentId={null}
+        limitedToSegment={null}
         preloadedSegments={[segmentOpenSource, segmentAPAC]}
       >
         <TestComponent />
@@ -53,7 +53,7 @@ describe('SegmentsContext functions', () => {
   test('addOne adds to head of list', async () => {
     render(
       <SegmentsContextProvider
-        limitedToSegmentId={null}
+        limitedToSegment={null}
         preloadedSegments={[segmentAPAC]}
       >
         <TestComponent />
@@ -72,7 +72,7 @@ describe('SegmentsContext functions', () => {
   test('updateOne works: updated segment is at head of list', () => {
     render(
       <SegmentsContextProvider
-        limitedToSegmentId={null}
+        limitedToSegment={null}
         preloadedSegments={[segmentOpenSource, segmentAPAC]}
       >
         <TestComponent />
diff --git a/assets/js/dashboard/filtering/segments-context.tsx b/assets/js/dashboard/filtering/segments-context.tsx
index 7c771d09a986..aacebb4bdac8 100644
--- a/assets/js/dashboard/filtering/segments-context.tsx
+++ b/assets/js/dashboard/filtering/segments-context.tsx
@@ -21,19 +21,29 @@ export function parseLimitedToSegmentId(dataset: DOMStringMap): number | null {
   return JSON.parse(dataset.limitedToSegmentId!)
 }
 
+export function getLimitedToSegment(
+  limitedToSegmentId: number | null,
+  preloadedSegments: SavedSegments
+): Pick<SavedSegment, 'id' | 'name'> | null {
+  if (limitedToSegmentId !== null) {
+    return preloadedSegments.find((s) => s.id === limitedToSegmentId) ?? null
+  }
+  return null
+}
+
 type ChangeSegmentState = (
   segment: (SavedSegment | SavedSegmentPublic) & { segment_data: SegmentData }
 ) => void
 
 const initialValue: {
   segments: SavedSegments
-  limitedToSegmentId: number | null
+  limitedToSegment: Pick<SavedSegment, 'id' | 'name'> | null
   updateOne: ChangeSegmentState
   addOne: ChangeSegmentState
   removeOne: ChangeSegmentState
 } = {
   segments: [],
-  limitedToSegmentId: null,
+  limitedToSegment: null,
   updateOne: () => {},
   addOne: () => {},
   removeOne: () => {}
@@ -47,11 +57,11 @@ export const useSegmentsContext = () => {
 
 export const SegmentsContextProvider = ({
   preloadedSegments,
-  limitedToSegmentId,
+  limitedToSegment,
   children
 }: {
   preloadedSegments: SavedSegments
-  limitedToSegmentId: number | null
+  limitedToSegment: Pick<SavedSegment, 'id' | 'name'> | null
   children: ReactNode
 }) => {
   const [segments, setSegments] = useState(preloadedSegments)
@@ -83,7 +93,7 @@ export const SegmentsContextProvider = ({
     <SegmentsContext.Provider
       value={{
         segments,
-        limitedToSegmentId: limitedToSegmentId ?? null,
+        limitedToSegment,
         removeOne,
         updateOne,
         addOne
diff --git a/assets/js/dashboard/nav-menu/filter-menu.tsx b/assets/js/dashboard/nav-menu/filter-menu.tsx
index f0340a740c3d..ba1c6178a71c 100644
--- a/assets/js/dashboard/nav-menu/filter-menu.tsx
+++ b/assets/js/dashboard/nav-menu/filter-menu.tsx
@@ -50,7 +50,7 @@ const FilterMenuItems = ({ closeDropdown }: { closeDropdown: () => void }) => {
   const columns = useMemo(() => getFilterListItems(site), [site])
   const buttonRef = useRef<HTMLButtonElement>(null)
   const panelRef = useRef<HTMLDivElement>(null)
-  const { limitedToSegmentId } = useSegmentsContext()
+  const { limitedToSegment } = useSegmentsContext()
 
   return (
     <>
@@ -109,7 +109,7 @@ const FilterMenuItems = ({ closeDropdown }: { closeDropdown: () => void }) => {
               </div>
             ))}
           </div>
-          {limitedToSegmentId === null && (
+          {limitedToSegment === null && (
             <SearchableSegmentsSection
               closeList={closeDropdown}
               tooltipContainerRef={panelRef}
diff --git a/assets/js/dashboard/navigation/use-app-navigate.tsx b/assets/js/dashboard/navigation/use-app-navigate.tsx
index fa2fe9257fe7..7efb8d0f1c89 100644
--- a/assets/js/dashboard/navigation/use-app-navigate.tsx
+++ b/assets/js/dashboard/navigation/use-app-navigate.tsx
@@ -9,6 +9,8 @@ import {
   LinkProps
 } from 'react-router-dom'
 import { parseSearch, stringifySearch } from '../util/url-search-params'
+import { useSegmentsContext } from '../filtering/segments-context'
+import { getSearchToSetSegmentFilter } from '../filtering/segments'
 
 export type AppNavigationTarget = {
   /**
@@ -44,11 +46,24 @@ const getNavigateToOptions = (
 
 export const useGetNavigateOptions = () => {
   const location = useLocation()
+  const { limitedToSegment } = useSegmentsContext()
+
   const getToOptions = useCallback(
     ({ path, params, search }: AppNavigationTarget) => {
-      return getNavigateToOptions(location.search, { path, params, search })
+      const wrappedSearch: typeof search = (searchRecord) => {
+        const updatedSearchRecord =
+          typeof search === 'function' ? search(searchRecord) : searchRecord
+        return limitedToSegment
+          ? getSearchToSetSegmentFilter(limitedToSegment)(updatedSearchRecord)
+          : updatedSearchRecord
+      }
+      return getNavigateToOptions(location.search, {
+        path,
+        params,
+        search: wrappedSearch
+      })
     },
-    [location.search]
+    [location.search, limitedToSegment]
   )
   return getToOptions
 }
diff --git a/assets/js/dashboard/util/url-search-params.test.ts b/assets/js/dashboard/util/url-search-params.test.ts
index 9ac792d768b0..78775bf01593 100644
--- a/assets/js/dashboard/util/url-search-params.test.ts
+++ b/assets/js/dashboard/util/url-search-params.test.ts
@@ -1,8 +1,9 @@
 import { Filter } from '../query'
 import {
   encodeURIComponentPermissive,
+  getSearchWithEnforcedSegment,
   isSearchEntryDefined,
-  getRedirectTarget,
+  maybeGetLatestReadableSearch,
   parseFilter,
   parseLabelsEntry,
   parseSearch,
@@ -206,57 +207,45 @@ describe(`${stringifySearch.name}`, () => {
   })
 })
 
-describe(`${getRedirectTarget.name}`, () => {
+describe(`${maybeGetLatestReadableSearch.name}`, () => {
   it.each([
     [''],
     ['?auth=_Y6YOjUl2beUJF_XzG1hk&theme=light&background=%23ee00ee'],
     ['?keybindHint=Escape&with_imported=true'],
     ['?f=is,page,/blog/:category/:article-name&date=2024-10-10&period=day'],
     ['?f=is,country,US&l=US,United%20States']
-  ])('for modern search %p returns null', (search) => {
-    expect(
-      getRedirectTarget({
-        pathname: '/example.com%2Fdeep%2Fpath',
-        search
-      } as Location)
-    ).toBeNull()
+  ])('for modern search string %p returns null', (search) => {
+    expect(maybeGetLatestReadableSearch(search)).toBeNull()
   })
 
-  it('returns updated URL for jsonurl style filters (v2), and running the updated value through the function again returns null (no redirect loop)', () => {
-    const pathname = '/'
+  it('returns updated search string for jsonurl style filters (v2), and running the updated value through the function again returns null (no redirect loop)', () => {
     const search =
       '?filters=((is,exit_page,(/plausible.io)),(is,source,(Brave)),(is,city,(993800)))&labels=(993800:Johannesburg)'
     const expectedUpdatedSearch =
       '?f=is,exit_page,/plausible.io&f=is,source,Brave&f=is,city,993800&l=993800,Johannesburg&r=v2'
-    expect(
-      getRedirectTarget({
-        pathname,
-        search
-      } as Location)
-    ).toEqual(`${pathname}${expectedUpdatedSearch}`)
-    expect(
-      getRedirectTarget({
-        pathname,
-        search: expectedUpdatedSearch
-      } as Location)
-    ).toBeNull()
+    expect(maybeGetLatestReadableSearch(search)).toEqual(expectedUpdatedSearch)
+    expect(maybeGetLatestReadableSearch(expectedUpdatedSearch)).toBeNull()
   })
 
-  it('returns updated URL for page=... style filters (v1), and running the updated value through the function again returns null (no redirect loop)', () => {
-    const pathname = '/'
+  it('returns updated search string for page=... style filters (v1), and running the updated value through the function again returns null (no redirect loop)', () => {
     const search = '?page=/docs'
     const expectedUpdatedSearch = '?f=is,page,/docs&r=v1'
+    expect(maybeGetLatestReadableSearch(search)).toEqual(expectedUpdatedSearch)
+    expect(maybeGetLatestReadableSearch(expectedUpdatedSearch)).toBeNull()
+  })
+})
+
+describe(`${getSearchWithEnforcedSegment.name}`, () => {
+  it('adds enforced segment appropriately, and running the updated value through the function again returns the same value', () => {
+    const segment = { id: 100, name: 'Eastern Europe' }
+    const search = '?auth=foo&embed=true'
+    const expectedUpdatedSearch =
+      '?f=is,segment,100&l=s-100,Eastern%20Europe&auth=foo&embed=true'
+    expect(getSearchWithEnforcedSegment(search, segment)).toEqual(
+      expectedUpdatedSearch
+    )
     expect(
-      getRedirectTarget({
-        pathname,
-        search
-      } as Location)
-    ).toEqual(`${pathname}${expectedUpdatedSearch}`)
-    expect(
-      getRedirectTarget({
-        pathname,
-        search: expectedUpdatedSearch
-      } as Location)
-    ).toBeNull()
+      getSearchWithEnforcedSegment(expectedUpdatedSearch, segment)
+    ).toEqual(expectedUpdatedSearch)
   })
 })
diff --git a/assets/js/dashboard/util/url-search-params.ts b/assets/js/dashboard/util/url-search-params.ts
index 730d8effdb89..16a43ba217fd 100644
--- a/assets/js/dashboard/util/url-search-params.ts
+++ b/assets/js/dashboard/util/url-search-params.ts
@@ -1,3 +1,7 @@
+import {
+  getSearchToSetSegmentFilter,
+  SavedSegment
+} from '../filtering/segments'
 import { Filter, FilterClauseLabels } from '../query'
 import { v1 } from './url-search-params-v1'
 import { v2 } from './url-search-params-v2'
@@ -230,8 +234,10 @@ function isAlreadyRedirected(searchParams: URLSearchParams) {
   The purpose of this function is to redirect users from one of the previous versions to the current version, 
   so previous dashboard links still work.
 */
-export function getRedirectTarget(windowLocation: Location): null | string {
-  const searchParams = new URLSearchParams(windowLocation.search)
+export function maybeGetLatestReadableSearch(
+  searchString: string
+): null | string {
+  const searchParams = new URLSearchParams(searchString)
   if (isAlreadyRedirected(searchParams)) {
     return null
   }
@@ -242,27 +248,67 @@ export function getRedirectTarget(windowLocation: Location): null | string {
 
   const isV2 = v2.isV2(searchParams)
   if (isV2) {
-    return `${windowLocation.pathname}${stringifySearch({ ...v2.parseSearch(windowLocation.search), [REDIRECTED_SEARCH_PARAM_NAME]: 'v2' })}`
+    return stringifySearch({
+      ...v2.parseSearch(searchString),
+      [REDIRECTED_SEARCH_PARAM_NAME]: 'v2'
+    })
   }
 
-  const searchRecord = v2.parseSearch(windowLocation.search)
+  const searchRecord = v2.parseSearch(searchString)
   const isV1 = v1.isV1(searchRecord)
 
   if (!isV1) {
     return null
   }
 
-  return `${windowLocation.pathname}${stringifySearch({ ...v1.parseSearchRecord(searchRecord), [REDIRECTED_SEARCH_PARAM_NAME]: 'v1' })}`
+  return stringifySearch({
+    ...v1.parseSearchRecord(searchRecord),
+    [REDIRECTED_SEARCH_PARAM_NAME]: 'v1'
+  })
+}
+
+/**
+ * It's possible to set a particular segment to be always applied on the data on dashboards accessed with a shared link.
+ * This function ensures that the particular segment filter is set to the URL string on initial page load.
+ * Other functions ensure that it can't be removed.
+ */
+export function getSearchWithEnforcedSegment(
+  searchString: string,
+  enforcedSegment: Pick<SavedSegment, 'id' | 'name'>
+): string {
+  const searchRecord = parseSearch(searchString)
+  return stringifySearch(
+    getSearchToSetSegmentFilter(enforcedSegment)(searchRecord)
+  )
 }
 
 /** Called once before React app mounts. If legacy url search params are present, does a redirect to new format. */
-export function redirectForLegacyParams(
+export function maybeDoFERedirect(
   windowLocation: Location,
-  windowHistory: History
+  windowHistory: History,
+  enforcedSegment: Pick<SavedSegment, 'id' | 'name'> | null
 ) {
-  const redirectTargetURL = getRedirectTarget(windowLocation)
-  if (redirectTargetURL === null) {
+  const originalSearchString = windowLocation.search
+
+  let updatedSearchString = maybeGetLatestReadableSearch(originalSearchString)
+
+  if (enforcedSegment) {
+    updatedSearchString = getSearchWithEnforcedSegment(
+      updatedSearchString ?? originalSearchString,
+      enforcedSegment
+    )
+  }
+
+  if (
+    updatedSearchString === null ||
+    updatedSearchString === originalSearchString
+  ) {
     return
   }
-  windowHistory.pushState({}, '', redirectTargetURL)
+
+  windowHistory.pushState(
+    {},
+    '',
+    `${windowLocation.pathname}${updatedSearchString}`
+  )
 }
diff --git a/assets/test-utils/app-context-providers.tsx b/assets/test-utils/app-context-providers.tsx
index 4f4e9c7282a7..80c9915976cb 100644
--- a/assets/test-utils/app-context-providers.tsx
+++ b/assets/test-utils/app-context-providers.tsx
@@ -78,7 +78,7 @@ export const TestContextProviders = ({
           }
         }
       >
-        <SegmentsContextProvider limitedToSegmentId={null} preloadedSegments={preloaded?.segments ?? []}>
+        <SegmentsContextProvider limitedToSegment={null} preloadedSegments={preloaded?.segments ?? []}>
           <MemoryRouter
             basename={getRouterBasepath(site)}
             initialEntries={defaultInitialEntries}

From d2e406bb8332920c166caa79ef32880b68a67d80 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Wed, 3 Dec 2025 14:07:41 +0200
Subject: [PATCH 09/33] Clarify type

---
 assets/js/dashboard/navigation/use-app-navigate.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/dashboard/navigation/use-app-navigate.tsx b/assets/js/dashboard/navigation/use-app-navigate.tsx
index 7efb8d0f1c89..bb5c75cc3e8e 100644
--- a/assets/js/dashboard/navigation/use-app-navigate.tsx
+++ b/assets/js/dashboard/navigation/use-app-navigate.tsx
@@ -26,7 +26,7 @@ export type AppNavigationTarget = {
    * - `(s) => s` preserves current search value,
    * - `(s) => ({ ...s, calendar: !s.calendar })` toggles the value for calendar search parameter,
    * - `() => ({ page: 5 })` sets the search to `?page=5`,
-   * - `undefined` empties the search
+   * - `undefined` empties the search, except for the enforced segment 
    */
   search?: (search: Record<string, unknown>) => Record<string, unknown>
 }

From 973dd7680dc1420d7bb42b40ce0783fa628bdde5 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 4 Dec 2025 16:06:24 +0200
Subject: [PATCH 10/33] WIP

---
 assets/js/dashboard/stats/locations/map.tsx   |  4 +-
 assets/test-utils/app-context-providers.tsx   |  5 ++-
 lib/plausible_web/components/generic.ex       | 24 ++++++------
 .../controllers/api/stats_controller.ex       | 37 +++++++++++++++++++
 .../plugs/authorize_site_access.ex            |  2 +-
 5 files changed, 58 insertions(+), 14 deletions(-)

diff --git a/assets/js/dashboard/stats/locations/map.tsx b/assets/js/dashboard/stats/locations/map.tsx
index 524a28a17eba..8129ac985339 100644
--- a/assets/js/dashboard/stats/locations/map.tsx
+++ b/assets/js/dashboard/stats/locations/map.tsx
@@ -106,7 +106,9 @@ const WorldMap = ({
           [country.code]: country.name
         })
         onCountrySelect()
-        navigate({ search: (searchRecord) => ({ ...searchRecord, filters, labels }) })
+        navigate({
+          search: (searchRecord) => ({ ...searchRecord, filters, labels })
+        })
       }
     },
     [navigate, query, dataByCountryCode, onCountrySelect]
diff --git a/assets/test-utils/app-context-providers.tsx b/assets/test-utils/app-context-providers.tsx
index 80c9915976cb..0efed2db6cb9 100644
--- a/assets/test-utils/app-context-providers.tsx
+++ b/assets/test-utils/app-context-providers.tsx
@@ -78,7 +78,10 @@ export const TestContextProviders = ({
           }
         }
       >
-        <SegmentsContextProvider limitedToSegment={null} preloadedSegments={preloaded?.segments ?? []}>
+        <SegmentsContextProvider
+          limitedToSegment={null}
+          preloadedSegments={preloaded?.segments ?? []}
+        >
           <MemoryRouter
             basename={getRouterBasepath(site)}
             initialEntries={defaultInitialEntries}
diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.ex
index d273bd992d16..f81899c33ce1 100644
--- a/lib/plausible_web/components/generic.ex
+++ b/lib/plausible_web/components/generic.ex
@@ -836,17 +836,19 @@ defmodule PlausibleWeb.Components.Generic do
 
     ~H"""
     <td
-      class={[
-        @height,
-        "text-sm px-6 py-4 first:pl-0 last:pr-0 whitespace-nowrap",
-         # allow tooltips overflow cells vertically
-        "overflow-visible",
-        @truncate && "truncate",
-        @max_width,
-        @actions && "flex text-right justify-end",
-        @hide_on_mobile && "hidden md:table-cell",
-        @class
-      ]}
+      class={
+        [
+          @height,
+          "text-sm px-6 py-4 first:pl-0 last:pr-0 whitespace-nowrap",
+          # allow tooltips overflow cells vertically
+          "overflow-visible",
+          @truncate && "truncate",
+          @max_width,
+          @actions && "flex text-right justify-end",
+          @hide_on_mobile && "hidden md:table-cell",
+          @class
+        ]
+      }
       {@rest}
     >
       <div :if={@actions} class="flex gap-1">
diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex
index b24c15a54b5d..631cea484f79 100644
--- a/lib/plausible_web/controllers/api/stats_controller.ex
+++ b/lib/plausible_web/controllers/api/stats_controller.ex
@@ -14,6 +14,7 @@ defmodule PlausibleWeb.Api.StatsController do
   @not_set "(not set)"
 
   plug(:date_validation_plug)
+  plug(:validate_required_filters_plug when action not in [:current_visitors])
 
   @doc """
   Returns a time-series based on given parameters.
@@ -1599,6 +1600,42 @@ defmodule PlausibleWeb.Api.StatsController do
     end
   end
 
+  defp validate_required_filters_plug(conn, _opts) do
+    if conn.assigns.shared_link && conn.assigns.shared_link.segment_id do
+      segment_id = conn.assigns.shared_link.segment_id
+
+      case ensure_expected_segment_filter_present(conn.params, segment_id) do
+        :ok ->
+          conn
+
+        :error ->
+          bad_request(
+            conn,
+            "The first filter must be for the segment with id #{segment_id}"
+          )
+      end
+    else
+      conn
+    end
+  end
+
+  defp ensure_expected_segment_filter_present(
+         %{"filters" => filters} = _params,
+         expected_segment_id
+       ) do
+    case JSON.decode!(filters) do
+      [["is", "segment", [segment_id]] | _other_filters] when segment_id == expected_segment_id ->
+        :ok
+
+      _ ->
+        :error
+    end
+  end
+
+  defp ensure_expected_segment_filter_present(_params, _expected_segment_id) do
+    :error
+  end
+
   defp parse_date_params(params) do
     params
     |> Map.take(["from", "to", "date"])
diff --git a/lib/plausible_web/plugs/authorize_site_access.ex b/lib/plausible_web/plugs/authorize_site_access.ex
index fa22353baa85..4827b4087a67 100644
--- a/lib/plausible_web/plugs/authorize_site_access.ex
+++ b/lib/plausible_web/plugs/authorize_site_access.ex
@@ -118,7 +118,7 @@ defmodule PlausibleWeb.Plugs.AuthorizeSiteAccess do
             team: [:owners, subscription: Teams.last_subscription_query()]
           ])
 
-        conn = merge_assigns(conn, site: site, site_role: role)
+        conn = merge_assigns(conn, site: site, site_role: role, shared_link: shared_link)
 
         # Switch current team if user is a team member in it
         conn =

From cb667687ed51ebe58c920e03414a4773a8287f16 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 4 Dec 2025 17:35:14 +0200
Subject: [PATCH 11/33] Disable clear filter button for limited view segment

---
 assets/js/dashboard/filtering/segments.ts     | 39 +++++++++--
 .../dashboard/nav-menu/filter-pills-list.tsx  | 66 +++++++++++--------
 .../dashboard/navigation/use-app-navigate.tsx |  2 +-
 .../js/dashboard/segments/segment-modals.tsx  | 49 +++++++-------
 4 files changed, 100 insertions(+), 56 deletions(-)

diff --git a/assets/js/dashboard/filtering/segments.ts b/assets/js/dashboard/filtering/segments.ts
index 23a3e0904639..57449b7c7d23 100644
--- a/assets/js/dashboard/filtering/segments.ts
+++ b/assets/js/dashboard/filtering/segments.ts
@@ -105,15 +105,33 @@ export const parseApiSegmentData = ({
   ...rest
 })
 
+export function getSearchToRemoveSegmentFilter(): Required<AppNavigationTarget>['search'] {
+  return (searchRecord) => {
+    const updatedFilters = (
+      (Array.isArray(searchRecord.filters)
+        ? searchRecord.filters
+        : []) as Filter[]
+    ).filter((f) => !isSegmentFilter(f))
+    const currentLabels = searchRecord.labels ?? {}
+    return {
+      ...searchRecord,
+      filters: updatedFilters,
+      labels: cleanLabels(updatedFilters, currentLabels)
+    }
+  }
+}
+
 export function getSearchToSetSegmentFilter(
   segment: Pick<SavedSegment, 'id' | 'name'>,
   options: { omitAllOtherFilters?: boolean } = {}
 ): Required<AppNavigationTarget>['search'] {
-  return (search) => {
+  return (searchRecord) => {
     const otherFilters = (
-      (Array.isArray(search.filters) ? search.filters : []) as Filter[]
+      (Array.isArray(searchRecord.filters)
+        ? searchRecord.filters
+        : []) as Filter[]
     ).filter((f) => !isSegmentFilter(f))
-    const currentLabels = search.labels ?? {}
+    const currentLabels = searchRecord.labels ?? {}
 
     const filters = [
       ['is', 'segment', [segment.id]],
@@ -124,7 +142,7 @@ export function getSearchToSetSegmentFilter(
       [formatSegmentIdAsLabelKey(segment.id)]: segment.name
     })
     return {
-      ...search,
+      ...searchRecord,
       filters,
       labels
     }
@@ -187,6 +205,19 @@ export function canSeeSegmentDetails({ user }: { user: UserContextValue }) {
   return user.loggedIn && user.role !== Role.public
 }
 
+export function canRemoveFilter(
+  filter: Filter,
+  limitedToSegment: Pick<SavedSegment, 'id' | 'name'> | null
+) {
+  if (isSegmentFilter(filter) && limitedToSegment) {
+    const [_operation, _dimension, clauses] = filter
+    return (
+      clauses.length === 1 && String(limitedToSegment.id) === String(clauses[1])
+    )
+  }
+  return true
+}
+
 export function findAppliedSegmentFilter({ filters }: { filters: Filter[] }) {
   const segmentFilter = filters.find(isSegmentFilter)
   if (!segmentFilter) {
diff --git a/assets/js/dashboard/nav-menu/filter-pills-list.tsx b/assets/js/dashboard/nav-menu/filter-pills-list.tsx
index 7828ba2b7d3a..8c9b10ed1bd3 100644
--- a/assets/js/dashboard/nav-menu/filter-pills-list.tsx
+++ b/assets/js/dashboard/nav-menu/filter-pills-list.tsx
@@ -10,6 +10,8 @@ import { styledFilterText, plainFilterText } from '../util/filter-text'
 import { useAppNavigate } from '../navigation/use-app-navigate'
 import classNames from 'classnames'
 import { filterRoute } from '../router'
+import { canRemoveFilter } from '../filtering/segments'
+import { useSegmentsContext } from '../filtering/segments-context'
 
 export const PILL_X_GAP_PX = 16
 export const PILL_Y_GAP_PX = 8
@@ -48,6 +50,7 @@ export const AppliedFilterPillsList = React.forwardRef<
   AppliedFilterPillsListProps
 >(({ className, style, slice, direction, pillClassName }, ref) => {
   const { query } = useQueryContext()
+  const { limitedToSegment } = useSegmentsContext()
   const navigate = useAppNavigate()
 
   const renderableFilters =
@@ -67,36 +70,45 @@ export const AppliedFilterPillsList = React.forwardRef<
 
   return (
     <FilterPillsList
-      pills={renderableFilters.map((filter, index) => ({
-        className: classNames(isInvisible(index) && 'invisible', pillClassName),
-        plainText: plainFilterText(query, filter),
-        children: styledFilterText(query, filter),
-        interactive: {
-          navigationTarget: {
-            path: filterRoute.path,
-            search: (s) => s,
-            params: {
-              field:
-                FILTER_GROUP_TO_MODAL_TYPE[
-                  filter[1].startsWith(EVENT_PROPS_PREFIX) ? 'props' : filter[1]
-                ]
-            }
-          },
-          onRemoveClick: () => {
-            const newFilters = query.filters.filter(
-              (_, i) => i !== index + indexAdjustment
-            )
+      pills={renderableFilters.map((filter, index) => {
+        return {
+          className: classNames(
+            isInvisible(index) && 'invisible',
+            pillClassName
+          ),
+          plainText: plainFilterText(query, filter),
+          children: styledFilterText(query, filter),
+          interactive: {
+            navigationTarget: {
+              path: filterRoute.path,
+              search: (s) => s,
+              params: {
+                field:
+                  FILTER_GROUP_TO_MODAL_TYPE[
+                    filter[1].startsWith(EVENT_PROPS_PREFIX)
+                      ? 'props'
+                      : filter[1]
+                  ]
+              }
+            },
+            onRemoveClick: canRemoveFilter(filter, limitedToSegment)
+              ? () => {
+                  const newFilters = query.filters.filter(
+                    (_, i) => i !== index + indexAdjustment
+                  )
 
-            navigate({
-              search: (searchRecord) => ({
-                ...searchRecord,
-                filters: newFilters,
-                labels: cleanLabels(newFilters, query.labels)
-              })
-            })
+                  navigate({
+                    search: (searchRecord) => ({
+                      ...searchRecord,
+                      filters: newFilters,
+                      labels: cleanLabels(newFilters, query.labels)
+                    })
+                  })
+                }
+              : undefined
           }
         }
-      }))}
+      })}
       className={className}
       style={style}
       ref={ref}
diff --git a/assets/js/dashboard/navigation/use-app-navigate.tsx b/assets/js/dashboard/navigation/use-app-navigate.tsx
index bb5c75cc3e8e..1569dbedcf67 100644
--- a/assets/js/dashboard/navigation/use-app-navigate.tsx
+++ b/assets/js/dashboard/navigation/use-app-navigate.tsx
@@ -26,7 +26,7 @@ export type AppNavigationTarget = {
    * - `(s) => s` preserves current search value,
    * - `(s) => ({ ...s, calendar: !s.calendar })` toggles the value for calendar search parameter,
    * - `() => ({ page: 5 })` sets the search to `?page=5`,
-   * - `undefined` empties the search, except for the enforced segment 
+   * - `undefined` empties the search, except for the enforced segment
    */
   search?: (search: Record<string, unknown>) => Record<string, unknown>
 }
diff --git a/assets/js/dashboard/segments/segment-modals.tsx b/assets/js/dashboard/segments/segment-modals.tsx
index 75a03e94b890..dd9f8d83d34f 100644
--- a/assets/js/dashboard/segments/segment-modals.tsx
+++ b/assets/js/dashboard/segments/segment-modals.tsx
@@ -1,17 +1,19 @@
 import React, { ReactNode, useCallback, useState } from 'react'
 import ModalWithRouting from '../stats/modals/modal'
 import {
+  canRemoveFilter,
   canSeeSegmentDetails,
+  getSearchToRemoveSegmentFilter,
   isListableSegment,
-  isSegmentFilter,
   SavedSegment,
   SEGMENT_TYPE_LABELS,
   SegmentData,
   SegmentType
 } from '../filtering/segments'
-import { useQueryContext } from '../query-context'
-import { AppNavigationLink } from '../navigation/use-app-navigate'
-import { cleanLabels } from '../util/filters'
+import {
+  AppNavigationLink,
+  useAppNavigate
+} from '../navigation/use-app-navigate'
 import { plainFilterText, styledFilterText } from '../util/filter-text'
 import { rootRoute } from '../router'
 import { FilterPillsList } from '../nav-menu/filter-pills-list'
@@ -498,8 +500,8 @@ const hasSiteSegmentPermission = (user: UserContextValue) => {
 export const SegmentModal = ({ id }: { id: SavedSegment['id'] }) => {
   const site = useSiteContext()
   const user = useUserContext()
-  const { query } = useQueryContext()
-  const { segments } = useSegmentsContext()
+  const { segments, limitedToSegment } = useSegmentsContext()
+  const navigate = useAppNavigate()
 
   const segment = segments
     .filter((s) => isListableSegment({ segment: s, site, user }))
@@ -519,6 +521,11 @@ export const SegmentModal = ({ id }: { id: SavedSegment['id'] }) => {
 
   const data = !error ? segment : null
 
+  const enableClearButton = canRemoveFilter(
+    ['is', 'segment', [id]],
+    limitedToSegment
+  )
+
   return (
     <ModalWithRouting maxWidth="460px">
       <div className="dark:text-gray-100 mb-8">
@@ -562,27 +569,21 @@ export const SegmentModal = ({ id }: { id: SavedSegment['id'] }) => {
                   Edit segment
                 </AppNavigationLink>
 
-                <AppNavigationLink
+                <button
+                  disabled={!enableClearButton}
                   className={removeFilterButtonClassname}
-                  path={rootRoute.path}
-                  search={(s) => {
-                    const nonSegmentFilters = query.filters.filter(
-                      (f) => !isSegmentFilter(f)
-                    )
-                    return {
-                      ...s,
-                      filters: nonSegmentFilters,
-                      labels: cleanLabels(
-                        nonSegmentFilters,
-                        query.labels,
-                        'segment',
-                        {}
-                      )
-                    }
-                  }}
+                  onClick={
+                    enableClearButton
+                      ? () =>
+                          navigate({
+                            path: rootRoute.path,
+                            search: getSearchToRemoveSegmentFilter()
+                          })
+                      : () => {}
+                  }
                 >
                   Remove filter
-                </AppNavigationLink>
+                </button>
               </ButtonsRow>
             </div>
           </>

From 5ec4cac6dceb6c637335577d3d295f80cd3b4bf2 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 4 Dec 2025 18:37:55 +0200
Subject: [PATCH 12/33] Load related shared links WIP

---
 .../js/dashboard/segments/segment-modals.tsx  | 62 ++++++++++++++++++-
 lib/plausible/segments/segments.ex            | 18 ++++++
 .../api/internal/segments_controller.ex       | 24 +++++++
 3 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/assets/js/dashboard/segments/segment-modals.tsx b/assets/js/dashboard/segments/segment-modals.tsx
index dd9f8d83d34f..15d2acf21007 100644
--- a/assets/js/dashboard/segments/segment-modals.tsx
+++ b/assets/js/dashboard/segments/segment-modals.tsx
@@ -20,8 +20,8 @@ import { FilterPillsList } from '../nav-menu/filter-pills-list'
 import classNames from 'classnames'
 import { SegmentAuthorship } from './segment-authorship'
 import { ExclamationTriangleIcon } from '@heroicons/react/24/outline'
-import { MutationStatus } from '@tanstack/react-query'
-import { ApiError } from '../api'
+import { MutationStatus, useQuery } from '@tanstack/react-query'
+import { ApiError, get } from '../api'
 import { ErrorPanel } from '../components/error-panel'
 import { useSegmentsContext } from '../filtering/segments-context'
 import { useSiteContext } from '../site-context'
@@ -167,6 +167,7 @@ export const DeleteSegmentModal = ({
       {!!segment.segment_data && (
         <FiltersInSegment segment_data={segment.segment_data} />
       )}
+      <RelatedSharedLinks segment={segment} />
 
       <ButtonsRow>
         <button
@@ -201,6 +202,57 @@ export const DeleteSegmentModal = ({
   )
 }
 
+const RelatedSharedLinks = ({
+  segment
+}: {
+  segment: Pick<SavedSegment, 'id'>
+}) => {
+  const site = useSiteContext()
+  const getRelatedSharedLinks = useQuery({
+    queryKey: [segment.id],
+    queryFn: async () => {
+      const response: string[] = await get(
+        `/api/${encodeURIComponent(site.domain)}/segments/${segment.id}/shared-links`
+      )
+      return response
+    }
+  })
+
+  return (
+    <div className="mt-4">
+      {getRelatedSharedLinks.status === 'pending' &&
+        'Loading shared links limited to this segment'}
+      {getRelatedSharedLinks.status !== 'pending' && (
+        <>
+          <SecondaryTitle>Shared links</SecondaryTitle>
+          <div className="mt-2">
+            {getRelatedSharedLinks.status === 'error' &&
+              'Error loading shared links limited to this segment'}
+
+            {getRelatedSharedLinks.status === 'success' &&
+              !getRelatedSharedLinks.data.length &&
+              'No shared links limited to this segment'}
+
+            {getRelatedSharedLinks.status === 'success' &&
+              !!getRelatedSharedLinks.data.length && (
+                <FilterPillsList
+                  className="flex-wrap"
+                  direction="horizontal"
+                  pills={getRelatedSharedLinks.data.map((name) => ({
+                    className: 'dark:!shadow-gray-950/60',
+                    plainText: name,
+                    children: name,
+                    interactive: false
+                  }))}
+                />
+              )}
+          </div>
+        </>
+      )}
+    </div>
+  )
+}
+
 const FormTitle = ({ children }: { children?: ReactNode }) => (
   <h1 className="text-lg font-medium text-gray-900 dark:text-gray-100 leading-7 mb-8">
     {children}
@@ -456,7 +508,7 @@ export const UpdateSegmentModal = ({
 const FiltersInSegment = ({ segment_data }: { segment_data: SegmentData }) => {
   return (
     <>
-      <h2 className="font-bold dark:text-gray-100">Filters in segment</h2>
+      <SecondaryTitle>Filters in segment</SecondaryTitle>
       <div className="mt-2">
         <FilterPillsList
           className="flex-wrap"
@@ -473,6 +525,10 @@ const FiltersInSegment = ({ segment_data }: { segment_data: SegmentData }) => {
   )
 }
 
+const SecondaryTitle = ({ children }: { children: ReactNode }) => (
+  <h2 className="font-bold dark:text-gray-100">{children}</h2>
+)
+
 const Placeholder = ({
   children,
   placeholder
diff --git a/lib/plausible/segments/segments.ex b/lib/plausible/segments/segments.ex
index 133b57845fd7..872aafd9d24d 100644
--- a/lib/plausible/segments/segments.ex
+++ b/lib/plausible/segments/segments.ex
@@ -338,6 +338,24 @@ defmodule Plausible.Segments do
     end
   end
 
+  def get_related_shared_links(
+        %Plausible.Site{} = site,
+        site_role,
+        segment_id
+      ) do
+    if site_role in roles_with_personal_segments() do
+      {:ok, Repo.all(
+        from(shared_link in Plausible.Site.SharedLink,
+          select: [:name],
+          where: shared_link.segment_id == ^segment_id,
+          where: shared_link.site_id == ^site.id
+        )
+      )}
+    else
+      {:error, :not_enough_permissions}
+    end
+  end
+
   @spec do_get_one(pos_integer(), pos_integer(), pos_integer() | nil) ::
           Segment.t() | nil
   defp do_get_one(user_id, site_id, segment_id)
diff --git a/lib/plausible_web/controllers/api/internal/segments_controller.ex b/lib/plausible_web/controllers/api/internal/segments_controller.ex
index c7962ba6b8d0..e832dc102146 100644
--- a/lib/plausible_web/controllers/api/internal/segments_controller.ex
+++ b/lib/plausible_web/controllers/api/internal/segments_controller.ex
@@ -100,6 +100,30 @@ defmodule PlausibleWeb.Api.Internal.SegmentsController do
 
   def delete(%Plug.Conn{} = conn, _params), do: invalid_request(conn)
 
+  def get_related_shared_links(
+        %Plug.Conn{
+          assigns: %{
+            site: site,
+            current_user: %{id: _user_id},
+            site_role: site_role
+          }
+        } =
+          conn,
+        %{} = params
+      ) do
+    segment_id = normalize_segment_id_param(params["segment_id"])
+
+    case Segments.get_related_shared_links(site, site_role, segment_id) do
+      {:error, :not_enough_permissions} ->
+        H.not_enough_permissions(conn, "Not enough permissions to get related shared links")
+
+      {:ok, shared_links} ->
+        json(conn, shared_links |> Enum.map(& &1.name))
+    end
+  end
+
+  def get_related_shared_links(%Plug.Conn{} = conn, _params), do: invalid_request(conn)
+
   @spec normalize_segment_id_param(any()) :: nil | pos_integer()
   defp normalize_segment_id_param(input) do
     case Integer.parse(input) do

From 8ba440c2e588966afcb90f17f29d8560c46614ad Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 4 Dec 2025 19:14:42 +0200
Subject: [PATCH 13/33] Add warning about shared links WIP

---
 .../js/dashboard/segments/segment-modals.tsx  | 131 ++++++++++--------
 1 file changed, 76 insertions(+), 55 deletions(-)

diff --git a/assets/js/dashboard/segments/segment-modals.tsx b/assets/js/dashboard/segments/segment-modals.tsx
index 15d2acf21007..3eb6770d2636 100644
--- a/assets/js/dashboard/segments/segment-modals.tsx
+++ b/assets/js/dashboard/segments/segment-modals.tsx
@@ -45,7 +45,8 @@ const primaryNeutralButtonClassName = 'button !px-3'
 
 const primaryNegativeButtonClassName = classNames(
   'button !px-3.5',
-  'items-center !bg-red-500 dark:!bg-red-500 hover:!bg-red-600 dark:hover:!bg-red-700 whitespace-nowrap'
+  'items-center !bg-red-500 dark:!bg-red-500 hover:!bg-red-600 dark:hover:!bg-red-700 whitespace-nowrap',
+  'disabled:!bg-red-400'
 )
 
 const secondaryButtonClassName = classNames(
@@ -108,7 +109,7 @@ export const CreateSegmentModal = ({
 
   return (
     <SegmentActionModal onClose={onClose}>
-      <FormTitle>Create segment</FormTitle>
+      <FormTitle className="mb-8">Create segment</FormTitle>
       <SegmentNameInput
         value={name}
         onChange={setName}
@@ -158,23 +159,63 @@ export const DeleteSegmentModal = ({
   onSave: (input: Pick<SavedSegment, 'id'>) => void
   segment: SavedSegment & { segment_data?: SegmentData }
 } & ApiRequestProps) => {
+  const site = useSiteContext()
+  const [confirmedDeleteSharedLinks, setConfirmedDeleteSharedLinks] =
+    useState(false)
+  const getRelatedSharedLinks = useQuery({
+    queryKey: [segment.id],
+    queryFn: async () => {
+      const response: string[] = await get(
+        `/api/${encodeURIComponent(site.domain)}/segments/${segment.id}/shared-links`
+      )
+      return response
+    }
+  })
+
+  const deleteDisabled =
+    status === 'pending' ||
+    getRelatedSharedLinks.status !== 'success' ||
+    (!!getRelatedSharedLinks.data?.length && confirmedDeleteSharedLinks)
+
   return (
     <SegmentActionModal onClose={onClose}>
-      <FormTitle>
+      <FormTitle className="mb-2">
         Delete {SEGMENT_TYPE_LABELS[segment.type].toLowerCase()}
         <span className="break-all">{` "${segment.name}"?`}</span>
       </FormTitle>
+      {getRelatedSharedLinks.status === 'pending' && (
+        <div className="loading">
+          <div />
+        </div>
+      )}
+      {!!getRelatedSharedLinks.data?.length && (
+        <ErrorPanel errorMessage="This segment is used in shared links. To delete it, you also need to delete the shared links."></ErrorPanel>
+      )}
       {!!segment.segment_data && (
         <FiltersInSegment segment_data={segment.segment_data} />
       )}
-      <RelatedSharedLinks segment={segment} />
-
+      {!!getRelatedSharedLinks.data?.length && (
+        <>
+          <RelatedSharedLinks sharedLinks={getRelatedSharedLinks.data} />
+          <input
+            id="confirm-delete-shared-links"
+            type="checkbox"
+            checked={confirmedDeleteSharedLinks}
+            onChange={(e) =>
+              setConfirmedDeleteSharedLinks(e.currentTarget.checked)
+            }
+          ></input>
+          <label htmlFor="confirm-delete-shared-links">
+            Yes, delete the associated shared links
+          </label>
+        </>
+      )}
       <ButtonsRow>
         <button
           className={primaryNegativeButtonClassName}
-          disabled={status === 'pending'}
+          disabled={deleteDisabled}
           onClick={
-            status === 'pending'
+            deleteDisabled
               ? () => {}
               : () => {
                   onSave({ id: segment.id })
@@ -202,59 +243,39 @@ export const DeleteSegmentModal = ({
   )
 }
 
-const RelatedSharedLinks = ({
-  segment
-}: {
-  segment: Pick<SavedSegment, 'id'>
-}) => {
-  const site = useSiteContext()
-  const getRelatedSharedLinks = useQuery({
-    queryKey: [segment.id],
-    queryFn: async () => {
-      const response: string[] = await get(
-        `/api/${encodeURIComponent(site.domain)}/segments/${segment.id}/shared-links`
-      )
-      return response
-    }
-  })
-
+const RelatedSharedLinks = ({ sharedLinks }: { sharedLinks: string[] }) => {
   return (
     <div className="mt-4">
-      {getRelatedSharedLinks.status === 'pending' &&
-        'Loading shared links limited to this segment'}
-      {getRelatedSharedLinks.status !== 'pending' && (
-        <>
-          <SecondaryTitle>Shared links</SecondaryTitle>
-          <div className="mt-2">
-            {getRelatedSharedLinks.status === 'error' &&
-              'Error loading shared links limited to this segment'}
-
-            {getRelatedSharedLinks.status === 'success' &&
-              !getRelatedSharedLinks.data.length &&
-              'No shared links limited to this segment'}
-
-            {getRelatedSharedLinks.status === 'success' &&
-              !!getRelatedSharedLinks.data.length && (
-                <FilterPillsList
-                  className="flex-wrap"
-                  direction="horizontal"
-                  pills={getRelatedSharedLinks.data.map((name) => ({
-                    className: 'dark:!shadow-gray-950/60',
-                    plainText: name,
-                    children: name,
-                    interactive: false
-                  }))}
-                />
-              )}
-          </div>
-        </>
-      )}
+      <SecondaryTitle>Shared links</SecondaryTitle>
+      <div className="mt-2">
+        <FilterPillsList
+          className="flex-wrap"
+          direction="horizontal"
+          pills={sharedLinks.map((name) => ({
+            className: 'dark:!shadow-gray-950/60',
+            plainText: name,
+            children: name,
+            interactive: false
+          }))}
+        />
+      </div>
     </div>
   )
 }
 
-const FormTitle = ({ children }: { children?: ReactNode }) => (
-  <h1 className="text-lg font-medium text-gray-900 dark:text-gray-100 leading-7 mb-8">
+const FormTitle = ({
+  className,
+  children
+}: {
+  className?: string
+  children?: ReactNode
+}) => (
+  <h1
+    className={classNames(
+      'text-lg font-medium text-gray-900 dark:text-gray-100 leading-7',
+      className
+    )}
+  >
     {children}
   </h1>
 )
@@ -467,7 +488,7 @@ export const UpdateSegmentModal = ({
 
   return (
     <SegmentActionModal onClose={onClose}>
-      <FormTitle>Update segment</FormTitle>
+      <FormTitle className="mb-8">Update segment</FormTitle>
       <SegmentNameInput
         value={name}
         onChange={setName}

From 2f36339f92bbaa6c4b186d7c1fde50ae210aa696 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Mon, 8 Dec 2025 20:38:33 +0200
Subject: [PATCH 14/33] Finalize delete modal

---
 .../js/dashboard/components/error-panel.tsx   |  4 +-
 .../js/dashboard/segments/segment-modals.tsx  | 80 ++++++++++++-------
 2 files changed, 55 insertions(+), 29 deletions(-)

diff --git a/assets/js/dashboard/components/error-panel.tsx b/assets/js/dashboard/components/error-panel.tsx
index f010aacc603e..1ad5c68e8264 100644
--- a/assets/js/dashboard/components/error-panel.tsx
+++ b/assets/js/dashboard/components/error-panel.tsx
@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { ReactNode } from 'react'
 import classNames from 'classnames'
 import {
   ArrowPathIcon,
@@ -12,7 +12,7 @@ export const ErrorPanel = ({
   onClose,
   onRetry
 }: {
-  errorMessage: string
+  errorMessage: ReactNode
   className?: string
   onClose?: () => void
   onRetry?: () => void
diff --git a/assets/js/dashboard/segments/segment-modals.tsx b/assets/js/dashboard/segments/segment-modals.tsx
index 3eb6770d2636..798e6794ea7f 100644
--- a/assets/js/dashboard/segments/segment-modals.tsx
+++ b/assets/js/dashboard/segments/segment-modals.tsx
@@ -46,7 +46,7 @@ const primaryNeutralButtonClassName = 'button !px-3'
 const primaryNegativeButtonClassName = classNames(
   'button !px-3.5',
   'items-center !bg-red-500 dark:!bg-red-500 hover:!bg-red-600 dark:hover:!bg-red-700 whitespace-nowrap',
-  'disabled:!bg-red-400'
+  'disabled:!bg-red-400 disabled:cursor-not-allowed'
 )
 
 const secondaryButtonClassName = classNames(
@@ -147,6 +147,12 @@ export const CreateSegmentModal = ({
   )
 }
 
+function getLinksDeleteNotice(links: string[]) {
+  return links.length === 1
+    ? 'This segment is used in a shared link. To delete it, you also need to delete the shared link.'
+    : `This segment is used in ${links.length} shared links. To delete it, you also need to delete the shared links.`
+}
+
 export const DeleteSegmentModal = ({
   onClose,
   onSave,
@@ -160,9 +166,9 @@ export const DeleteSegmentModal = ({
   segment: SavedSegment & { segment_data?: SegmentData }
 } & ApiRequestProps) => {
   const site = useSiteContext()
-  const [confirmedDeleteSharedLinks, setConfirmedDeleteSharedLinks] =
-    useState(false)
-  const getRelatedSharedLinks = useQuery({
+  const [confirmed, setConfirmed] = useState(false)
+
+  const linksQuery = useQuery({
     queryKey: [segment.id],
     queryFn: async () => {
       const response: string[] = await get(
@@ -174,40 +180,60 @@ export const DeleteSegmentModal = ({
 
   const deleteDisabled =
     status === 'pending' ||
-    getRelatedSharedLinks.status !== 'success' ||
-    (!!getRelatedSharedLinks.data?.length && confirmedDeleteSharedLinks)
+    linksQuery.status !== 'success' ||
+    (!!linksQuery.data?.length && !confirmed)
 
   return (
     <SegmentActionModal onClose={onClose}>
-      <FormTitle className="mb-2">
+      <FormTitle className="mb-4">
         Delete {SEGMENT_TYPE_LABELS[segment.type].toLowerCase()}
         <span className="break-all">{` "${segment.name}"?`}</span>
       </FormTitle>
-      {getRelatedSharedLinks.status === 'pending' && (
-        <div className="loading">
+      {linksQuery.status === 'pending' && (
+        <div className="loading sm">
           <div />
         </div>
       )}
-      {!!getRelatedSharedLinks.data?.length && (
-        <ErrorPanel errorMessage="This segment is used in shared links. To delete it, you also need to delete the shared links."></ErrorPanel>
+      {linksQuery.status === 'success' && !!linksQuery.data?.length && (
+        <ErrorPanel
+          errorMessage={
+            <span className="break-normal">
+              {getLinksDeleteNotice(linksQuery.data)}
+            </span>
+          }
+        />
+      )}
+      {linksQuery.status === 'error' && (
+        <ErrorPanel
+          errorMessage="Error loading related shared links"
+          onRetry={linksQuery.refetch}
+        />
       )}
       {!!segment.segment_data && (
-        <FiltersInSegment segment_data={segment.segment_data} />
+        <div className="mt-4">
+          <FiltersInSegment segment_data={segment.segment_data} />
+        </div>
       )}
-      {!!getRelatedSharedLinks.data?.length && (
+      {!!linksQuery.data?.length && (
         <>
-          <RelatedSharedLinks sharedLinks={getRelatedSharedLinks.data} />
-          <input
-            id="confirm-delete-shared-links"
-            type="checkbox"
-            checked={confirmedDeleteSharedLinks}
-            onChange={(e) =>
-              setConfirmedDeleteSharedLinks(e.currentTarget.checked)
-            }
-          ></input>
-          <label htmlFor="confirm-delete-shared-links">
-            Yes, delete the associated shared links
-          </label>
+          <div className="mt-4">
+            <RelatedSharedLinks sharedLinks={linksQuery.data} />
+          </div>
+          <div className="mt-4">
+            <label
+              className="text-sm block font-medium dark:text-gray-100 font-normal gap-x-2 flex flex-inline items-center justify-start"
+              htmlFor="confirm-delete-shared-links"
+            >
+              <input
+                className="block size-5 rounded-sm dark:bg-gray-600 border-gray-300 dark:border-gray-600 text-indigo-600"
+                id="confirm-delete-shared-links"
+                type="checkbox"
+                checked={confirmed}
+                onChange={(e) => setConfirmed(e.currentTarget.checked)}
+              />
+              Yes, delete the associated shared links
+            </label>
+          </div>
         </>
       )}
       <ButtonsRow>
@@ -245,7 +271,7 @@ export const DeleteSegmentModal = ({
 
 const RelatedSharedLinks = ({ sharedLinks }: { sharedLinks: string[] }) => {
   return (
-    <div className="mt-4">
+    <>
       <SecondaryTitle>Shared links</SecondaryTitle>
       <div className="mt-2">
         <FilterPillsList
@@ -259,7 +285,7 @@ const RelatedSharedLinks = ({ sharedLinks }: { sharedLinks: string[] }) => {
           }))}
         />
       </div>
-    </div>
+    </>
   )
 }
 

From 889476d9f926984b8d41c166d0dfb51f2bc5dc8b Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Mon, 8 Dec 2025 20:40:35 +0200
Subject: [PATCH 15/33] Unify shared link password protection checks

---
 lib/plausible_web/live/shared_link_settings.ex | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/lib/plausible_web/live/shared_link_settings.ex b/lib/plausible_web/live/shared_link_settings.ex
index 0b37c1c063a3..857d57d8d833 100644
--- a/lib/plausible_web/live/shared_link_settings.ex
+++ b/lib/plausible_web/live/shared_link_settings.ex
@@ -121,13 +121,21 @@ defmodule PlausibleWeb.Live.SharedLinkSettings do
                 <.td truncate hide_on_mobile>
                   <div class="flex items-center">
                     {link.name}
-                    <.tooltip :if={link.password_hash} enabled?={true} centered?={true}>
+                    <.tooltip
+                      :if={Plausible.Site.SharedLink.password_protected?(link)}
+                      enabled?={true}
+                      centered?={true}
+                    >
                       <:tooltip_content>
                         Password protected
                       </:tooltip_content>
                       <Heroicons.lock_closed class="feather ml-2 mb-0.5" />
                     </.tooltip>
-                    <.tooltip :if={!link.password_hash} enabled?={true} centered?={true}>
+                    <.tooltip
+                      :if={!Plausible.Site.SharedLink.password_protected?(link)}
+                      enabled?={true}
+                      centered?={true}
+                    >
                       <:tooltip_content>
                         No password protection
                       </:tooltip_content>

From aa55aaff89eb580b90f780eaed2680b4d8c6f00b Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Mon, 8 Dec 2025 20:57:45 +0200
Subject: [PATCH 16/33] WIP

---
 lib/plausible/segments/segments.ex            |  23 ++-
 .../segments_controller_test.exs              | 156 ++++++++++++++++++
 2 files changed, 172 insertions(+), 7 deletions(-)

diff --git a/lib/plausible/segments/segments.ex b/lib/plausible/segments/segments.ex
index 872aafd9d24d..6bae72ccbdd4 100644
--- a/lib/plausible/segments/segments.ex
+++ b/lib/plausible/segments/segments.ex
@@ -344,18 +344,27 @@ defmodule Plausible.Segments do
         segment_id
       ) do
     if site_role in roles_with_personal_segments() do
-      {:ok, Repo.all(
-        from(shared_link in Plausible.Site.SharedLink,
-          select: [:name],
-          where: shared_link.segment_id == ^segment_id,
-          where: shared_link.site_id == ^site.id
-        )
-      )}
+      {:ok,
+       Repo.all(
+         from(shared_link in Plausible.Site.SharedLink,
+           select: [:name],
+           where: shared_link.segment_id == ^segment_id,
+           where: shared_link.site_id == ^site.id
+         )
+       )}
     else
       {:error, :not_enough_permissions}
     end
   end
 
+  def get_related_shared_links(
+        %Plausible.Site{} = site,
+        site_role,
+        nil
+      ) do
+    {:error, :segment_not_found}
+  end
+
   @spec do_get_one(pos_integer(), pos_integer(), pos_integer() | nil) ::
           Segment.t() | nil
   defp do_get_one(user_id, site_id, segment_id)
diff --git a/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs b/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs
index 47658b8c8182..409ed40e353b 100644
--- a/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs
+++ b/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs
@@ -501,6 +501,162 @@ defmodule PlausibleWeb.Api.Internal.SegmentsControllerTest do
     end
   end
 
+  describe "GET /api/:domain/segments/:segment_id/shared-links" do
+    setup [:create_user, :create_site, :log_in]
+
+    for %{role: role} <- [
+          %{role: :viewer},
+          %{role: :editor}
+        ] do
+      test "#{role} can get related shared links for a segment", %{
+        conn: conn,
+        user: user,
+        site: site
+      } do
+        add_guest(site, user: user, role: unquote(role))
+
+        segment = insert(:segment, site: site, name: "Test Segment", type: :personal, owner: user)
+
+        insert(:shared_link, site: site, name: "Shared Link 1", segment_id: segment.id)
+        insert(:shared_link, site: site, name: "Shared Link 2", segment_id: segment.id)
+
+        # Create a shared link for a different segment to ensure filtering works
+        other_segment = insert(:segment, site: site, name: "Other Segment", type: :personal)
+        insert(:shared_link, site: site, name: "Other Shared Link", segment_id: other_segment.id)
+
+        # Create a shared link with no segment
+        insert(:shared_link, site: site, name: "No Segment Link", segment_id: nil)
+
+        response =
+          get(conn, "/api/#{site.domain}/segments/#{segment.id}/shared-links")
+          |> json_response(200)
+
+        assert is_list(response)
+        assert length(response) == 2
+        assert "Shared Link 1" in response
+        assert "Shared Link 2" in response
+        refute "Other Shared Link" in response
+        refute "No Segment Link" in response
+      end
+
+      test "#{role} gets empty list when no shared links are related to the segment", %{
+        conn: conn,
+        user: user,
+        site: site
+      } do
+        add_guest(site, user: user, role: unquote(role))
+
+        segment = insert(:segment, site: site, name: "Test Segment", type: :personal, owner: user)
+
+        response =
+          get(conn, "/api/#{site.domain}/segments/#{segment.id}/shared-links")
+          |> json_response(200)
+
+        assert response == []
+      end
+
+      test "#{role} only gets shared links for the correct site", %{
+        conn: conn,
+        user: user,
+        site: site
+      } do
+        add_guest(site, user: user, role: unquote(role))
+
+        other_site = insert(:site)
+        segment = insert(:segment, site: site, name: "Test Segment", type: :personal, owner: user)
+
+        # Create shared link for this site and segment
+        insert(:shared_link, site: site, name: "Correct Site Link", segment_id: segment.id)
+
+        # Create shared link for other site with same segment ID (different site)
+        # This shouldn't appear in results
+        other_site_segment = insert(:segment, site: other_site, name: "Other Site Segment")
+
+        insert(:shared_link,
+          site: other_site,
+          name: "Other Site Link",
+          segment_id: other_site_segment.id
+        )
+
+        response =
+          get(conn, "/api/#{site.domain}/segments/#{segment.id}/shared-links")
+          |> json_response(200)
+
+        assert response == ["Correct Site Link"]
+      end
+
+      test "#{role} gets empty list when segment_id does not exist", %{
+        conn: conn,
+        user: user,
+        site: site
+      } do
+        add_guest(site, user: user, role: unquote(role))
+
+        non_existent_segment_id = 999_999
+
+        response =
+          get(conn, "/api/#{site.domain}/segments/#{non_existent_segment_id}/shared-links")
+          |> json_response(200)
+
+        assert response == []
+      end
+    end
+
+    test "owner can get related shared links for a segment", %{
+      conn: conn,
+      user: user,
+      site: site
+    } do
+      # Owner is the user from create_site, no need to add_guest
+      segment = insert(:segment, site: site, name: "Test Segment", type: :personal, owner: user)
+
+      insert(:shared_link, site: site, name: "Shared Link 1", segment_id: segment.id)
+      insert(:shared_link, site: site, name: "Shared Link 2", segment_id: segment.id)
+
+      response =
+        get(conn, "/api/#{site.domain}/segments/#{segment.id}/shared-links")
+        |> json_response(200)
+
+      assert is_list(response)
+      assert length(response) == 2
+      assert "Shared Link 1" in response
+      assert "Shared Link 2" in response
+    end
+
+    test "returns shared links in correct format (array of names)", %{
+      conn: conn,
+      user: user,
+      site: site
+    } do
+      add_guest(site, user: user, role: :editor)
+
+      segment = insert(:segment, site: site, name: "Test Segment", type: :personal, owner: user)
+
+      insert(:shared_link, site: site, name: "First Link", segment_id: segment.id)
+      insert(:shared_link, site: site, name: "Second Link", segment_id: segment.id)
+      insert(:shared_link, site: site, name: "Third Link", segment_id: segment.id)
+
+      response =
+        get(conn, "/api/#{site.domain}/segments/#{segment.id}/shared-links")
+        |> json_response(200)
+
+      assert ["First Link", "Second Link", "Third Link"] == response
+    end
+
+    test "handles invalid segment_id parameter gracefully", %{conn: conn, user: user, site: site} do
+      add_guest(site, user: user, role: :editor)
+
+      # The normalize_segment_id_param returns nil for invalid input
+      # The query with nil segment_id would match records where segment_id IS NULL
+      # but since this test doesn't create any shared links, we expect an empty list
+      conn = get(conn, "/api/#{site.domain}/segments/invalid/shared-links")
+
+      response = json_response(conn, 200)
+
+      assert response == []
+    end
+  end
+
   defp verify_segment_in_db(segment) do
     uncomparable_keys = [:__meta__, :site]
 

From c9cfd004dc57d926e8b306935afeeba60a2e3967 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Mon, 8 Dec 2025 21:47:38 +0200
Subject: [PATCH 17/33] Give random name for shared links in tests

---
 test/support/factory.ex | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 55366971b684..5396ee4475d2 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -232,9 +232,12 @@ defmodule Plausible.Factory do
   end
 
   def shared_link_factory do
+    slug = Nanoid.generate()
+    name = "Link - #{slug}"
+
     %Plausible.Site.SharedLink{
-      name: "Link name",
-      slug: Nanoid.generate()
+      name: name,
+      slug: slug
     }
   end
 

From e2a8144a1df08534e3de2a7cccc8b826060eb3f0 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Mon, 8 Dec 2025 21:48:48 +0200
Subject: [PATCH 18/33] Add tests for related shared links endpoint

---
 lib/plausible/segments/segments.ex            |  16 +-
 .../api/internal/segments_controller.ex       |   3 +
 .../segments_controller_test.exs              | 197 +++++++++---------
 3 files changed, 110 insertions(+), 106 deletions(-)

diff --git a/lib/plausible/segments/segments.ex b/lib/plausible/segments/segments.ex
index 6bae72ccbdd4..2c344ececf7a 100644
--- a/lib/plausible/segments/segments.ex
+++ b/lib/plausible/segments/segments.ex
@@ -338,6 +338,14 @@ defmodule Plausible.Segments do
     end
   end
 
+  def get_related_shared_links(
+        _site,
+        _site_role,
+        nil
+      ) do
+    {:error, :segment_not_found}
+  end
+
   def get_related_shared_links(
         %Plausible.Site{} = site,
         site_role,
@@ -357,14 +365,6 @@ defmodule Plausible.Segments do
     end
   end
 
-  def get_related_shared_links(
-        %Plausible.Site{} = site,
-        site_role,
-        nil
-      ) do
-    {:error, :segment_not_found}
-  end
-
   @spec do_get_one(pos_integer(), pos_integer(), pos_integer() | nil) ::
           Segment.t() | nil
   defp do_get_one(user_id, site_id, segment_id)
diff --git a/lib/plausible_web/controllers/api/internal/segments_controller.ex b/lib/plausible_web/controllers/api/internal/segments_controller.ex
index e832dc102146..21d873a66a91 100644
--- a/lib/plausible_web/controllers/api/internal/segments_controller.ex
+++ b/lib/plausible_web/controllers/api/internal/segments_controller.ex
@@ -117,6 +117,9 @@ defmodule PlausibleWeb.Api.Internal.SegmentsController do
       {:error, :not_enough_permissions} ->
         H.not_enough_permissions(conn, "Not enough permissions to get related shared links")
 
+      {:error, :segment_not_found} ->
+        segment_not_found(conn, params["segment_id"])
+
       {:ok, shared_links} ->
         json(conn, shared_links |> Enum.map(& &1.name))
     end
diff --git a/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs b/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs
index 409ed40e353b..f4c859b7dc33 100644
--- a/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs
+++ b/test/plausible_web/controllers/api/internal_controller/segments_controller_test.exs
@@ -469,6 +469,63 @@ defmodule PlausibleWeb.Api.Internal.SegmentsControllerTest do
       end
     end
 
+    test "deleting a segment deletes the shared links linked to it", %{
+      conn: conn,
+      site: site,
+      user: user
+    } do
+      segment =
+        insert(:segment,
+          site: site,
+          owner: user,
+          name: "any",
+          type: :personal,
+          segment_data: %{"filters" => [["is", "event:goal", ["Signup"]]]}
+        )
+
+      other_segment =
+        insert(:segment,
+          site: site,
+          owner: user,
+          name: "other",
+          type: :site,
+          segment_data: %{"filters" => [["is", "event:goal", ["Signup"]]]}
+        )
+
+      shared_links_with_segments =
+        insert_list(3, :shared_link,
+          site: site,
+          segment_id: segment.id
+        )
+
+      shared_link_with_other_segment =
+        insert(:shared_link, site: site, name: "Gamma", segment_id: other_segment.id)
+
+      shared_link_with_no_segment = insert(:shared_link, site: site, name: "Delta")
+
+      response =
+        delete(conn, "/api/#{site.domain}/segments/#{segment.id}")
+        |> json_response(200)
+
+      assert %{
+               "owner_id" => user.id,
+               "owner_name" => user.name,
+               "id" => segment.id,
+               "name" => segment.name,
+               "segment_data" => segment.segment_data,
+               "type" => "#{segment.type}",
+               "inserted_at" => Calendar.strftime(segment.inserted_at, "%Y-%m-%dT%H:%M:%S"),
+               "updated_at" => Calendar.strftime(segment.updated_at, "%Y-%m-%dT%H:%M:%S")
+             } == response
+
+      assert Repo.reload(shared_link_with_other_segment)
+      assert Repo.reload(shared_link_with_no_segment)
+
+      for link <- shared_links_with_segments do
+        refute Repo.reload(link)
+      end
+    end
+
     test "site owner can delete a site segment owned by someone else, even if it contains a non-existing goal",
          %{conn: conn, site: site} do
       other_user = add_guest(site, role: :editor)
@@ -506,16 +563,18 @@ defmodule PlausibleWeb.Api.Internal.SegmentsControllerTest do
 
     for %{role: role} <- [
           %{role: :viewer},
-          %{role: :editor}
+          %{role: :editor},
+          %{role: :admin},
+          %{role: :billing},
+          %{role: :owner}
         ] do
       test "#{role} can get related shared links for a segment", %{
         conn: conn,
-        user: user,
         site: site
       } do
-        add_guest(site, user: user, role: unquote(role))
+        user = add_member(site.team, role: unquote(role))
 
-        segment = insert(:segment, site: site, name: "Test Segment", type: :personal, owner: user)
+        segment = insert(:segment, site: site, name: "Test Segment", type: :site, owner: user)
 
         insert(:shared_link, site: site, name: "Shared Link 1", segment_id: segment.id)
         insert(:shared_link, site: site, name: "Shared Link 2", segment_id: segment.id)
@@ -531,129 +590,71 @@ defmodule PlausibleWeb.Api.Internal.SegmentsControllerTest do
           get(conn, "/api/#{site.domain}/segments/#{segment.id}/shared-links")
           |> json_response(200)
 
-        assert is_list(response)
-        assert length(response) == 2
-        assert "Shared Link 1" in response
-        assert "Shared Link 2" in response
-        refute "Other Shared Link" in response
-        refute "No Segment Link" in response
-      end
-
-      test "#{role} gets empty list when no shared links are related to the segment", %{
-        conn: conn,
-        user: user,
-        site: site
-      } do
-        add_guest(site, user: user, role: unquote(role))
-
-        segment = insert(:segment, site: site, name: "Test Segment", type: :personal, owner: user)
-
-        response =
-          get(conn, "/api/#{site.domain}/segments/#{segment.id}/shared-links")
-          |> json_response(200)
-
-        assert response == []
-      end
-
-      test "#{role} only gets shared links for the correct site", %{
-        conn: conn,
-        user: user,
-        site: site
-      } do
-        add_guest(site, user: user, role: unquote(role))
-
-        other_site = insert(:site)
-        segment = insert(:segment, site: site, name: "Test Segment", type: :personal, owner: user)
-
-        # Create shared link for this site and segment
-        insert(:shared_link, site: site, name: "Correct Site Link", segment_id: segment.id)
-
-        # Create shared link for other site with same segment ID (different site)
-        # This shouldn't appear in results
-        other_site_segment = insert(:segment, site: other_site, name: "Other Site Segment")
-
-        insert(:shared_link,
-          site: other_site,
-          name: "Other Site Link",
-          segment_id: other_site_segment.id
-        )
-
-        response =
-          get(conn, "/api/#{site.domain}/segments/#{segment.id}/shared-links")
-          |> json_response(200)
-
-        assert response == ["Correct Site Link"]
-      end
-
-      test "#{role} gets empty list when segment_id does not exist", %{
-        conn: conn,
-        user: user,
-        site: site
-      } do
-        add_guest(site, user: user, role: unquote(role))
-
-        non_existent_segment_id = 999_999
-
-        response =
-          get(conn, "/api/#{site.domain}/segments/#{non_existent_segment_id}/shared-links")
-          |> json_response(200)
-
-        assert response == []
+        assert response == ["Shared Link 1", "Shared Link 2"]
       end
     end
 
-    test "owner can get related shared links for a segment", %{
+    test "returns empty list when no shared links are related to the segment", %{
       conn: conn,
       user: user,
       site: site
     } do
-      # Owner is the user from create_site, no need to add_guest
       segment = insert(:segment, site: site, name: "Test Segment", type: :personal, owner: user)
 
-      insert(:shared_link, site: site, name: "Shared Link 1", segment_id: segment.id)
-      insert(:shared_link, site: site, name: "Shared Link 2", segment_id: segment.id)
-
       response =
         get(conn, "/api/#{site.domain}/segments/#{segment.id}/shared-links")
         |> json_response(200)
 
-      assert is_list(response)
-      assert length(response) == 2
-      assert "Shared Link 1" in response
-      assert "Shared Link 2" in response
+      assert response == []
     end
 
-    test "returns shared links in correct format (array of names)", %{
+    test "returns empty list when giving a segment ID that doesn't exist", %{
       conn: conn,
-      user: user,
       site: site
     } do
-      add_guest(site, user: user, role: :editor)
+      response =
+        get(conn, "/api/#{site.domain}/segments/9999999/shared-links")
+        |> json_response(200)
 
-      segment = insert(:segment, site: site, name: "Test Segment", type: :personal, owner: user)
+      assert response == []
+    end
 
-      insert(:shared_link, site: site, name: "First Link", segment_id: segment.id)
-      insert(:shared_link, site: site, name: "Second Link", segment_id: segment.id)
-      insert(:shared_link, site: site, name: "Third Link", segment_id: segment.id)
+    test "returns empty list when requesting with the segment_id of another site", %{
+      conn: conn,
+      site: site
+    } do
+      other_site = new_site()
+      other_site_segment = insert(:segment, site: other_site, name: "Test Segment")
+
+      insert(:shared_link,
+        site: other_site,
+        name: "Link",
+        segment_id: other_site_segment.id
+      )
 
       response =
-        get(conn, "/api/#{site.domain}/segments/#{segment.id}/shared-links")
+        get(conn, "/api/#{site.domain}/segments/#{other_site_segment.id}/shared-links")
         |> json_response(200)
 
-      assert ["First Link", "Second Link", "Third Link"] == response
+      assert response == []
     end
 
-    test "handles invalid segment_id parameter gracefully", %{conn: conn, user: user, site: site} do
-      add_guest(site, user: user, role: :editor)
-
-      # The normalize_segment_id_param returns nil for invalid input
-      # The query with nil segment_id would match records where segment_id IS NULL
-      # but since this test doesn't create any shared links, we expect an empty list
+    test "returns 404 for invalid segment_id", %{conn: conn, site: site} do
       conn = get(conn, "/api/#{site.domain}/segments/invalid/shared-links")
 
-      response = json_response(conn, 200)
+      assert %{"error" => "Segment not found with ID \"invalid\""} ==
+               json_response(conn, 404)
+    end
 
-      assert response == []
+    test "returns 403 when looking at a public site", %{conn: conn} do
+      public_site = new_site(public: true)
+      segment = insert(:segment, site: public_site, name: "segment", type: :site)
+
+      conn =
+        get(conn, "/api/#{public_site.domain}/segments/#{segment.id}/shared-links")
+
+      assert %{"error" => "Not enough permissions to get related shared links"} ==
+               json_response(conn, 403)
     end
   end
 

From 21591f4e9a78ce9e3c33b52986479966cf125e63 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Tue, 9 Dec 2025 10:14:20 +0200
Subject: [PATCH 19/33] Split components and remove nesting

---
 .../dashboard/nav-menu/filter-pills-list.tsx  | 65 +++++++++----------
 .../js/dashboard/segments/segment-modals.tsx  | 43 ++++++++----
 2 files changed, 61 insertions(+), 47 deletions(-)

diff --git a/assets/js/dashboard/nav-menu/filter-pills-list.tsx b/assets/js/dashboard/nav-menu/filter-pills-list.tsx
index 8c9b10ed1bd3..307eae994ea2 100644
--- a/assets/js/dashboard/nav-menu/filter-pills-list.tsx
+++ b/assets/js/dashboard/nav-menu/filter-pills-list.tsx
@@ -70,45 +70,38 @@ export const AppliedFilterPillsList = React.forwardRef<
 
   return (
     <FilterPillsList
-      pills={renderableFilters.map((filter, index) => {
-        return {
-          className: classNames(
-            isInvisible(index) && 'invisible',
-            pillClassName
-          ),
-          plainText: plainFilterText(query, filter),
-          children: styledFilterText(query, filter),
-          interactive: {
-            navigationTarget: {
-              path: filterRoute.path,
-              search: (s) => s,
-              params: {
-                field:
-                  FILTER_GROUP_TO_MODAL_TYPE[
-                    filter[1].startsWith(EVENT_PROPS_PREFIX)
-                      ? 'props'
-                      : filter[1]
-                  ]
-              }
-            },
-            onRemoveClick: canRemoveFilter(filter, limitedToSegment)
-              ? () => {
-                  const newFilters = query.filters.filter(
-                    (_, i) => i !== index + indexAdjustment
-                  )
+      pills={renderableFilters.map((filter, index) => ({
+        className: classNames(isInvisible(index) && 'invisible', pillClassName),
+        plainText: plainFilterText(query, filter),
+        children: styledFilterText(query, filter),
+        interactive: {
+          navigationTarget: {
+            path: filterRoute.path,
+            search: (s) => s,
+            params: {
+              field:
+                FILTER_GROUP_TO_MODAL_TYPE[
+                  filter[1].startsWith(EVENT_PROPS_PREFIX) ? 'props' : filter[1]
+                ]
+            }
+          },
+          onRemoveClick: canRemoveFilter(filter, limitedToSegment)
+            ? () => {
+                const newFilters = query.filters.filter(
+                  (_, i) => i !== index + indexAdjustment
+                )
 
-                  navigate({
-                    search: (searchRecord) => ({
-                      ...searchRecord,
-                      filters: newFilters,
-                      labels: cleanLabels(newFilters, query.labels)
-                    })
+                navigate({
+                  search: (searchRecord) => ({
+                    ...searchRecord,
+                    filters: newFilters,
+                    labels: cleanLabels(newFilters, query.labels)
                   })
-                }
-              : undefined
-          }
+                })
+              }
+            : undefined
         }
-      })}
+      }))}
       className={className}
       style={style}
       ref={ref}
diff --git a/assets/js/dashboard/segments/segment-modals.tsx b/assets/js/dashboard/segments/segment-modals.tsx
index 798e6794ea7f..e7b31269f897 100644
--- a/assets/js/dashboard/segments/segment-modals.tsx
+++ b/assets/js/dashboard/segments/segment-modals.tsx
@@ -220,19 +220,13 @@ export const DeleteSegmentModal = ({
             <RelatedSharedLinks sharedLinks={linksQuery.data} />
           </div>
           <div className="mt-4">
-            <label
-              className="text-sm block font-medium dark:text-gray-100 font-normal gap-x-2 flex flex-inline items-center justify-start"
-              htmlFor="confirm-delete-shared-links"
+            <Checkbox
+              id="confirm"
+              checked={confirmed}
+              onChange={(e) => setConfirmed(e.currentTarget.checked)}
             >
-              <input
-                className="block size-5 rounded-sm dark:bg-gray-600 border-gray-300 dark:border-gray-600 text-indigo-600"
-                id="confirm-delete-shared-links"
-                type="checkbox"
-                checked={confirmed}
-                onChange={(e) => setConfirmed(e.currentTarget.checked)}
-              />
               Yes, delete the associated shared links
-            </label>
+            </Checkbox>
           </div>
         </>
       )}
@@ -576,6 +570,33 @@ const SecondaryTitle = ({ children }: { children: ReactNode }) => (
   <h2 className="font-bold dark:text-gray-100">{children}</h2>
 )
 
+/** Keep this component styled the same as checkboxes in PlausibleWeb.Live.Installation.Instructions */
+const Checkbox = ({
+  id,
+  checked,
+  onChange,
+  children
+}: React.DetailedHTMLProps<
+  React.InputHTMLAttributes<HTMLInputElement>,
+  HTMLInputElement
+>) => {
+  return (
+    <label
+      className="text-sm block font-medium dark:text-gray-100 font-normal gap-x-2 flex flex-inline items-center justify-start"
+      htmlFor={id}
+    >
+      <input
+        className="block size-5 rounded-sm dark:bg-gray-600 border-gray-300 dark:border-gray-600 text-indigo-600"
+        id={id}
+        type="checkbox"
+        checked={checked}
+        onChange={onChange}
+      />
+      {children}
+    </label>
+  )
+}
+
 const Placeholder = ({
   children,
   placeholder

From b537bb2f476f86a11ddcb9a0a6da0e579c13f615 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Tue, 9 Dec 2025 10:14:55 +0200
Subject: [PATCH 20/33] Change limited view copy

---
 lib/plausible_web/live/shared_link_settings.ex      | 2 +-
 lib/plausible_web/live/shared_link_settings/form.ex | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/plausible_web/live/shared_link_settings.ex b/lib/plausible_web/live/shared_link_settings.ex
index 857d57d8d833..97839539d0c9 100644
--- a/lib/plausible_web/live/shared_link_settings.ex
+++ b/lib/plausible_web/live/shared_link_settings.ex
@@ -143,7 +143,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings do
                     </.tooltip>
                     <.tooltip :if={link.segment_id} enabled?={true} centered?={true}>
                       <:tooltip_content>
-                        Limited view
+                        Limited to segment of data
                       </:tooltip_content>
                       <Heroicons.eye_slash class="feather ml-1" />
                     </.tooltip>
diff --git a/lib/plausible_web/live/shared_link_settings/form.ex b/lib/plausible_web/live/shared_link_settings/form.ex
index 3ca0890b43e2..4c778665aa6c 100644
--- a/lib/plausible_web/live/shared_link_settings/form.ex
+++ b/lib/plausible_web/live/shared_link_settings/form.ex
@@ -60,8 +60,8 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
           id="limit-view"
           id_suffix=""
           js_active_var="limitViewEnabled"
-          label="Limit view"
-          help_text="Filter your dashboard to show only a segment."
+          label="Limit to segment"
+          help_text="Restrict this link to a segment of the data."
         />
         <div x-show="limitViewEnabled" x-cloak>
           <.live_component
@@ -144,8 +144,8 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
           id="limit-view"
           id_suffix=""
           js_active_var="limitViewEnabled"
-          label="Limit view"
-          help_text="Filter your dashboard to show only a segment."
+          label="Limit to segment"
+          help_text="Restrict this link to a segment of the data."
         />
         <div x-show="limitViewEnabled" x-cloak>
           <.live_component

From 283b6b6d9a37c8fd5a12754a1d3d7276a71d366c Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Tue, 9 Dec 2025 11:30:28 +0200
Subject: [PATCH 21/33] Fix search ranking, make segment search input DRYer,
 add search test

---
 lib/plausible/segments/segments.ex            |  22 +--
 .../live/shared_link_settings/form.ex         |  19 +--
 test/plausible/segments/segments_test.exs     | 150 ++++++++++++++++++
 3 files changed, 168 insertions(+), 23 deletions(-)

diff --git a/lib/plausible/segments/segments.ex b/lib/plausible/segments/segments.ex
index 2c344ececf7a..57628c2b8d69 100644
--- a/lib/plausible/segments/segments.ex
+++ b/lib/plausible/segments/segments.ex
@@ -70,9 +70,9 @@ defmodule Plausible.Segments do
     {:ok, Repo.all(query)}
   end
 
-  def search_by_name(%Plausible.Site{} = site, name, opts) do
-    type = Keyword.fetch!(opts, :type)
-    fields = Keyword.get(opts, :fields, [:id, :name])
+  def search_by_name(%Plausible.Site{} = site, name) do
+    type = :site
+    fields = [:id, :name]
 
     name_empty? = is_nil(name) or (is_binary(name) and String.trim(name) == "")
 
@@ -97,11 +97,11 @@ defmodule Plausible.Segments do
             match_rank:
               fragment(
                 "CASE
-                WHEN lower(?) = lower(?) THEN 0                    -- exact match
-                WHEN lower(?) LIKE lower(?) || '%' THEN 1          -- starts with
-                WHEN lower(?) LIKE '% ' || lower(?) || '%' THEN 2  -- after a space
-                WHEN lower(?) LIKE ? THEN 3                        -- anywhere
-              END AS match_rank",
+                  WHEN lower(?) = lower(?) THEN 0                    -- exact match
+                  WHEN lower(?) LIKE lower(?) || '%' THEN 1          -- starts with
+                  WHEN lower(?) LIKE '% ' || lower(?) || '%' THEN 2  -- after a space
+                  WHEN lower(?) ILIKE ? THEN 3                        -- anywhere
+                END AS match_rank",
                 segment.name,
                 ^name,
                 segment.name,
@@ -109,13 +109,13 @@ defmodule Plausible.Segments do
                 segment.name,
                 ^name,
                 segment.name,
-                ^"%name%"
+                ^"%#{name}%"
               ),
             pos:
               fragment(
                 "position(lower(?) IN lower(?)) AS pos",
-                segment.name,
-                ^name
+                ^name,
+                segment.name
               ),
             len_diff: fragment("abs(length(?) - length(?)) AS len_diff", segment.name, ^name)
           },
diff --git a/lib/plausible_web/live/shared_link_settings/form.ex b/lib/plausible_web/live/shared_link_settings/form.ex
index 4c778665aa6c..5fa534aad286 100644
--- a/lib/plausible_web/live/shared_link_settings/form.ex
+++ b/lib/plausible_web/live/shared_link_settings/form.ex
@@ -68,12 +68,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
             id="segment_id"
             submit_name="shared_link[segment_id]"
             module={ComboBox}
-            suggest_fun={
-              fn input, _ ->
-                {:ok, segments} = Plausible.Segments.search_by_name(assigns.site, input, type: :site)
-                Enum.map(segments, &{&1.id, &1.name})
-              end
-            }
+            suggest_fun={fn input, _ -> get_segment_suggestions(assigns.site, input) end}
             selected={
               @shared_link.segment_id &&
                 {@shared_link.limited_to_segment.id, @shared_link.limited_to_segment.name}
@@ -152,12 +147,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
             id="segment_id"
             submit_name="shared_link[segment_id]"
             module={ComboBox}
-            suggest_fun={
-              fn input, _ ->
-                {:ok, segments} = Plausible.Segments.search_by_name(assigns.site, input, type: :site)
-                Enum.map(segments, &{&1.id, &1.name})
-              end
-            }
+            suggest_fun={fn input, _ -> get_segment_suggestions(assigns.site, input) end}
             selected={nil}
           />
         </div>
@@ -169,6 +159,11 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
     """
   end
 
+  defp get_segment_suggestions(site, input) do
+    {:ok, segments} = Plausible.Segments.search_by_name(site, input)
+    Enum.map(segments, &{&1.id, &1.name})
+  end
+
   def handle_event(
         "save-shared-link",
         %{"shared_link" => shared_link_params},
diff --git a/test/plausible/segments/segments_test.exs b/test/plausible/segments/segments_test.exs
index 4fc53ac01bbd..52bd61f2d36e 100644
--- a/test/plausible/segments/segments_test.exs
+++ b/test/plausible/segments/segments_test.exs
@@ -1,4 +1,154 @@
 defmodule Plausible.SegmentsTest do
   use ExUnit.Case
+  use Plausible.DataCase, async: true
   doctest Plausible.Segments, import: true
+  alias Plausible.Segments.Segment
+
+  setup [:create_user, :create_site]
+
+  describe("searching segments by name") do
+    for input <- [nil, "", " ", "\n", " \t"] do
+      test "empty search input #{inspect(input)} yields site segments ordered by updated_at",
+           %{
+             site: site
+           } do
+        other_site = new_site()
+
+        segment_scandinavia =
+          insert(:segment,
+            name: "Scandinavia",
+            site: site,
+            type: :site,
+            updated_at: "2025-12-01T12:00:00"
+          )
+
+        segment_apac =
+          insert(:segment,
+            name: "APAC",
+            site: site,
+            type: :site,
+            updated_at: "2025-12-01T10:00:00"
+          )
+
+        _segment_other_site = insert(:segment, name: "any", site: other_site, type: :site)
+        _segment_personal = insert(:segment, name: "My segment", site: site, type: :personal)
+
+        assert {:ok,
+                [
+                  list_all_result(segment_scandinavia),
+                  list_all_result(segment_apac)
+                ]} ==
+                 Plausible.Segments.search_by_name(site, unquote(input))
+      end
+    end
+
+    for input <- ["", "emea"] do
+      test "search input #{inspect(input)} returns a maximum of 20 segments", %{site: site} do
+        insert_list(100, :segment,
+          name: "EMEA",
+          site: site,
+          type: :site
+        )
+
+        assert {:ok, segments} = Plausible.Segments.search_by_name(site, unquote(input))
+
+        assert 20 == length(segments)
+      end
+    end
+
+    test "search input \"A\" yields correctly ranked segments", %{
+      site: site
+    } do
+      segment_scandinavia =
+        insert(:segment,
+          name: "Scandinavia",
+          site: site,
+          type: :site,
+          updated_at: "2025-12-01T12:00:00"
+        )
+
+      segment_scandinavia_latest =
+        insert(:segment,
+          name: segment_scandinavia.name,
+          site: site,
+          type: :site,
+          updated_at: "2025-12-01T13:00:00"
+        )
+
+      segment_scandinavia_longer_name =
+        insert(:segment,
+          name: "#{segment_scandinavia.name} (but longer)",
+          site: site,
+          type: :site,
+          updated_at: "2025-12-01T12:00:00"
+        )
+
+      segment_a =
+        insert(:segment,
+          name: "A",
+          site: site,
+          type: :site,
+          updated_at: "2025-12-01T10:00:00"
+        )
+
+      segment_apac =
+        insert(:segment,
+          name: "APAC",
+          site: site,
+          type: :site,
+          updated_at: "2025-12-01T10:00:00"
+        )
+
+      segment_apac_copy =
+        insert(:segment,
+          name: "Copy of APAC",
+          site: site,
+          type: :site,
+          updated_at: "2025-12-01T10:00:00"
+        )
+
+      _segment_personal = insert(:segment, name: "My segment", site: site, type: :personal)
+
+      assert_matches {:ok,
+                      [
+                        # ranked here because it exactly matches input
+                        %{
+                          name: ^segment_a.name,
+                          id: ^segment_a.id
+                        },
+                        # ranked here because it starts with the input
+                        %{
+                          name: ^segment_apac.name,
+                          id: ^segment_apac.id
+                        },
+                        # ranked here because it has a substring starting with a space and the input
+                        %{
+                          name: ^segment_apac_copy.name,
+                          id: ^segment_apac_copy.id
+                        },
+                        # ranked over next one (that has the same name) because it's been updated more lately
+                        %{
+                          name: ^segment_scandinavia_latest.name,
+                          id: ^segment_scandinavia_latest.id
+                        },
+                        # ranked over next one because it has a shorter name
+                        %{
+                          name: ^segment_scandinavia.name,
+                          id: ^segment_scandinavia.id
+                        },
+                        %{
+                          name: ^segment_scandinavia_longer_name.name,
+                          id: ^segment_scandinavia_longer_name.id
+                        }
+                      ]} =
+                       Plausible.Segments.search_by_name(site, "A")
+    end
+
+    defp list_all_result(segment) do
+      Plausible.Repo.load(Segment, %{
+        name: segment.name,
+        id: segment.id
+      })
+    end
+  end
 end

From 219d8f674bd62868a110eca5e63f78a70e5cbc80 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Tue, 9 Dec 2025 11:42:50 +0200
Subject: [PATCH 22/33] Fix url search params test

---
 assets/js/dashboard/util/url-search-params.test.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/js/dashboard/util/url-search-params.test.ts b/assets/js/dashboard/util/url-search-params.test.ts
index 78775bf01593..45dd46d71859 100644
--- a/assets/js/dashboard/util/url-search-params.test.ts
+++ b/assets/js/dashboard/util/url-search-params.test.ts
@@ -240,7 +240,7 @@ describe(`${getSearchWithEnforcedSegment.name}`, () => {
     const segment = { id: 100, name: 'Eastern Europe' }
     const search = '?auth=foo&embed=true'
     const expectedUpdatedSearch =
-      '?f=is,segment,100&l=s-100,Eastern%20Europe&auth=foo&embed=true'
+      '?f=is,segment,100&l=segment-100,Eastern%20Europe&auth=foo&embed=true'
     expect(getSearchWithEnforcedSegment(search, segment)).toEqual(
       expectedUpdatedSearch
     )

From aee220e84d75e7390f52450e8d9547dc7c765cce Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Tue, 9 Dec 2025 11:42:58 +0200
Subject: [PATCH 23/33] Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de5252c4bb0f..fbc071948052 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+- Shared Links can now be limited to a particular segment of the data
+
 ### Removed
 
 ### Changed

From 2f68df843384ef1fe6300bcc7a70de4de4a68b2c Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Tue, 9 Dec 2025 13:26:45 +0200
Subject: [PATCH 24/33] Fix invalid accessor

---
 lib/plausible_web/live/shared_link_settings/form.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plausible_web/live/shared_link_settings/form.ex b/lib/plausible_web/live/shared_link_settings/form.ex
index 5fa534aad286..66a4fead4d54 100644
--- a/lib/plausible_web/live/shared_link_settings/form.ex
+++ b/lib/plausible_web/live/shared_link_settings/form.ex
@@ -71,7 +71,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
             suggest_fun={fn input, _ -> get_segment_suggestions(assigns.site, input) end}
             selected={
               @shared_link.segment_id &&
-                {@shared_link.limited_to_segment.id, @shared_link.limited_to_segment.name}
+                {@shared_link.segment.id, @shared_link.segment.name}
             }
           />
         </div>

From ad25e4a8240655d8b3b44e65d773f8a671a066dd Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Mon, 15 Dec 2025 12:22:12 +0200
Subject: [PATCH 25/33] Format

---
 assets/js/dashboard/util/url-search-params.test.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/assets/js/dashboard/util/url-search-params.test.ts b/assets/js/dashboard/util/url-search-params.test.ts
index ba9f8cbd66a6..6f99dfa4c143 100644
--- a/assets/js/dashboard/util/url-search-params.test.ts
+++ b/assets/js/dashboard/util/url-search-params.test.ts
@@ -230,7 +230,10 @@ describe(`${maybeGetLatestReadableSearch.name}`, () => {
   it.each([
     ['?page=/docs', '?f=is,page,/docs&r=v1'],
     ['?page=%C3%AA&embed=true', '?f=is,page,%C3%AA&embed=true&r=v1'],
-    ['?page=/|/foo&goal=~Signup&source=!Facebook|Instagram', '?f=is,page,/,/foo&f=contains,goal,Signup&f=is_not,source,Facebook,Instagram&r=v1']
+    [
+      '?page=/|/foo&goal=~Signup&source=!Facebook|Instagram',
+      '?f=is,page,/,/foo&f=contains,goal,Signup&f=is_not,source,Facebook,Instagram&r=v1'
+    ]
   ])(
     'returns updated search string v1 style filter %s, and running the updated value through the function again returns null (no redirect loop)',
     (searchString, expectedSearchString) => {

From a8ff7f69a95770cf7338316ccd88cb08033be606 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 18 Dec 2025 00:23:05 +0200
Subject: [PATCH 26/33] Add test for stuffing limited view segment

---
 .../controllers/stats_controller_test.exs     | 36 ++++++++++++++++---
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/test/plausible_web/controllers/stats_controller_test.exs b/test/plausible_web/controllers/stats_controller_test.exs
index eb9fe48401a4..788ad54f98fd 100644
--- a/test/plausible_web/controllers/stats_controller_test.exs
+++ b/test/plausible_web/controllers/stats_controller_test.exs
@@ -1330,9 +1330,10 @@ defmodule PlausibleWeb.StatsControllerTest do
       assert response(conn, 200) =~ "Enter password"
     end
 
-    test "logs anonymous user in straight away if the link is not password-protected", %{
-      conn: conn
-    } do
+    test "if the shared link is not protected with a password, passes user immediately to dashboard",
+         %{
+           conn: conn
+         } do
       site = new_site(domain: "test-site.com")
       link = insert(:shared_link, site: site)
 
@@ -1344,7 +1345,34 @@ defmodule PlausibleWeb.StatsControllerTest do
       assert text_of_attr(resp, @react_container, "data-current-user-role") == "public"
     end
 
-    test "footer and header are shown when accessing public dashboard", %{
+    test "if the shared link is limited to a segment, only that segment is stuffed into data-segments",
+         %{
+           conn: conn
+         } do
+      site = new_site(domain: "test-site.com")
+      emea_site_segment = insert(:segment, name: "EMEA", site: site, type: :site)
+      apac_site_segment = insert(:segment, name: "APAC", site: site, type: :site)
+      link = insert(:shared_link, site: site, segment: emea_site_segment)
+
+      conn = get(conn, "/share/test-site.com/?auth=#{link.slug}")
+      resp = html_response(conn, 200)
+      assert resp =~ "stats-react-container"
+
+      assert text_of_attr(resp, @react_container, "data-limited-to-segment-id") ==
+               "#{emea_site_segment.id}"
+
+      assert text_of_attr(resp, @react_container, "data-segments") ==
+               emea_site_segment
+               |> Map.take([:id, :name, :type, :inserted_at, :updated_at, :segment_data])
+               |> List.wrap()
+               |> JSON.encode!()
+
+      refute resp =~ apac_site_segment.name
+
+      assert text_of_attr(resp, @react_container, "data-current-user-role") == "public"
+    end
+
+    test "footer and header are shown when accessing shared link dashboard", %{
       conn: conn
     } do
       site = new_site(domain: "test-site.com")

From ea458fafb17023795ca255febb59161b19515e04 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 18 Dec 2025 00:30:04 +0200
Subject: [PATCH 27/33] Simplify preload syntax

---
 lib/plausible_web/controllers/stats_controller.ex | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index a896ffce9446..45d9c3c2db05 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -406,7 +406,7 @@ defmodule PlausibleWeb.StatsController do
       not Teams.locked?(shared_link.site.team) ->
         current_user = conn.assigns[:current_user]
         site_role = get_fallback_site_role(conn)
-        shared_link = Plausible.Repo.preload(shared_link, site: [:owners], segment: [])
+        shared_link = Plausible.Repo.preload(shared_link, :segment, site: [:owners])
         stats_start_date = Plausible.Sites.stats_start_date(shared_link.site)
 
         flags = get_flags(current_user, shared_link.site)

From 88a80a1ba78f1db742b89f821f6ce6666ef05bde Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 18 Dec 2025 01:27:33 +0200
Subject: [PATCH 28/33] Add tests for validating internal stats API requests

---
 .../controllers/api/stats_controller.ex       | 31 ++++++-----
 .../stats_controller/authorization_test.exs   | 55 +++++++++++++++++++
 2 files changed, 71 insertions(+), 15 deletions(-)

diff --git a/lib/plausible_web/controllers/api/stats_controller.ex b/lib/plausible_web/controllers/api/stats_controller.ex
index 2636d80db32c..ed3b7f930fe6 100644
--- a/lib/plausible_web/controllers/api/stats_controller.ex
+++ b/lib/plausible_web/controllers/api/stats_controller.ex
@@ -1616,25 +1616,26 @@ defmodule PlausibleWeb.Api.StatsController do
     end
   end
 
-  defp validate_required_filters_plug(conn, _opts) do
-    if conn.assigns.shared_link && conn.assigns.shared_link.segment_id do
-      segment_id = conn.assigns.shared_link.segment_id
-
-      case ensure_expected_segment_filter_present(conn.params, segment_id) do
-        :ok ->
-          conn
+  defp validate_required_filters_plug(
+         %Plug.Conn{assigns: %{shared_link: %Plausible.Site.SharedLink{segment_id: segment_id}}} =
+           conn,
+         _opts
+       )
+       when is_integer(segment_id) do
+    case ensure_expected_segment_filter_present(conn.params, segment_id) do
+      :ok ->
+        conn
 
-        :error ->
-          bad_request(
-            conn,
-            "The first filter must be for the segment with id #{segment_id}"
-          )
-      end
-    else
-      conn
+      :error ->
+        bad_request(
+          conn,
+          "The first filter must be for the segment with id #{segment_id}"
+        )
     end
   end
 
+  defp validate_required_filters_plug(conn, _opts), do: conn
+
   defp ensure_expected_segment_filter_present(
          %{"filters" => filters} = _params,
          expected_segment_id
diff --git a/test/plausible_web/controllers/api/stats_controller/authorization_test.exs b/test/plausible_web/controllers/api/stats_controller/authorization_test.exs
index 7457658b759f..9c0917f3d1f9 100644
--- a/test/plausible_web/controllers/api/stats_controller/authorization_test.exs
+++ b/test/plausible_web/controllers/api/stats_controller/authorization_test.exs
@@ -107,6 +107,61 @@ defmodule PlausibleWeb.Api.StatsController.AuthorizationTest do
     end
   end
 
+  describe "Filter validation for limited view shared links" do
+    test "returns 400 for limited view shared link if there are no filters", %{conn: conn} do
+      site = new_site()
+
+      segment = insert(:segment, site: site, type: :site, name: "Scandinavia")
+
+      link =
+        insert(:shared_link, site: site, segment: segment)
+
+      conn = get(conn, "/api/stats/#{site.domain}/top-stats?auth=#{link.slug}")
+
+      assert json_response(conn, 400) == %{
+               "error" => "The first filter must be for the segment with id #{segment.id}"
+             }
+    end
+
+    test "returns 400 for limited view shared link if the segment filter is not for the right segment",
+         %{conn: conn} do
+      site = new_site()
+
+      segment = insert(:segment, site: site, type: :site, name: "Scandinavia")
+
+      link =
+        insert(:shared_link, site: site, segment: segment)
+
+      conn =
+        get(
+          conn,
+          "/api/stats/#{site.domain}/top-stats?auth=#{link.slug}&filters=#{JSON.encode!([["is", "segment", [segment.id + 1]]])}"
+        )
+
+      assert json_response(conn, 400) == %{
+               "error" => "The first filter must be for the segment with id #{segment.id}"
+             }
+    end
+
+    test "returns 200 for limited view shared link if the required segment is present, permits other filters to be applied",
+         %{conn: conn} do
+      site = new_site()
+
+      segment = insert(:segment, site: site, type: :site, name: "Scandinavia")
+
+      link =
+        insert(:shared_link, site: site, segment: segment)
+
+      conn =
+        get(
+          conn,
+          "/api/stats/#{site.domain}/top-stats?auth=#{link.slug}&filters=#{JSON.encode!([["is", "segment", [segment.id]], ["is", "event:page", ["/docs"]]])}"
+        )
+
+      assert json_response(conn, 200)
+    end
+  end
+
   describe "API authorization - as logged in user" do
     setup [:create_user, :log_in]
 

From 288ca80fcd25e0d9a1f647ffac29846dcc20d1c1 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 18 Dec 2025 02:06:11 +0200
Subject: [PATCH 29/33] Remove id_suffix default values

---
 lib/plausible_web/live/shared_link_settings/form.ex | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/lib/plausible_web/live/shared_link_settings/form.ex b/lib/plausible_web/live/shared_link_settings/form.ex
index 66a4fead4d54..f5cd30f82bd1 100644
--- a/lib/plausible_web/live/shared_link_settings/form.ex
+++ b/lib/plausible_web/live/shared_link_settings/form.ex
@@ -58,7 +58,6 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
       >
         <PlausibleWeb.Components.Generic.toggle_field
           id="limit-view"
-          id_suffix=""
           js_active_var="limitViewEnabled"
           label="Limit to segment"
           help_text="Restrict this link to a segment of the data."
@@ -106,7 +105,6 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
       >
         <PlausibleWeb.Components.Generic.toggle_field
           id="password-protect"
-          id_suffix=""
           js_active_var="passwordProtectEnabled"
           label="Password protect"
           help_text="Keep this password safe. You won't be able to see it again."
@@ -137,7 +135,6 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
       >
         <PlausibleWeb.Components.Generic.toggle_field
           id="limit-view"
-          id_suffix=""
           js_active_var="limitViewEnabled"
           label="Limit to segment"
           help_text="Restrict this link to a segment of the data."

From 78601ce9747ea4a5327d5584c262d3f1fe29fba3 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 18 Dec 2025 02:23:34 +0200
Subject: [PATCH 30/33] Implement limited_to_segment?/1

---
 lib/plausible/site/shared_link.ex                 | 5 +++++
 lib/plausible_web/controllers/stats_controller.ex | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/lib/plausible/site/shared_link.ex b/lib/plausible/site/shared_link.ex
index b10c61f4b53e..ba540c712822 100644
--- a/lib/plausible/site/shared_link.ex
+++ b/lib/plausible/site/shared_link.ex
@@ -50,4 +50,9 @@ defmodule Plausible.Site.SharedLink do
 
   def password_protected?(%__MODULE__{password_hash: hash}) when not is_nil(hash), do: true
   def password_protected?(%__MODULE__{}), do: false
+
+  def limited_to_segment?(%__MODULE__{segment_id: segment_id}) when is_integer(segment_id),
+    do: true
+
+  def limited_to_segment?(%__MODULE__{}), do: false
 end
diff --git a/lib/plausible_web/controllers/stats_controller.ex b/lib/plausible_web/controllers/stats_controller.ex
index 45d9c3c2db05..a69c15d3f1e3 100644
--- a/lib/plausible_web/controllers/stats_controller.ex
+++ b/lib/plausible_web/controllers/stats_controller.ex
@@ -410,7 +410,13 @@ defmodule PlausibleWeb.StatsController do
         stats_start_date = Plausible.Sites.stats_start_date(shared_link.site)
 
         flags = get_flags(current_user, shared_link.site)
-        limited_to_segment_id = shared_link.segment && shared_link.segment.id
+
+        limited_to_segment_id =
+          if Plausible.Site.SharedLink.limited_to_segment?(shared_link) do
+            shared_link.segment.id
+          else
+            nil
+          end
 
         segments =
           if is_nil(limited_to_segment_id) do

From 8c32794fc85e6b55c9ad21b45c64b3dbf7dbfcd4 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 18 Dec 2025 02:29:36 +0200
Subject: [PATCH 31/33] Refactor search_by_name

---
 lib/plausible/segments/segments.ex | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/lib/plausible/segments/segments.ex b/lib/plausible/segments/segments.ex
index 57628c2b8d69..0072c1002f24 100644
--- a/lib/plausible/segments/segments.ex
+++ b/lib/plausible/segments/segments.ex
@@ -70,11 +70,11 @@ defmodule Plausible.Segments do
     {:ok, Repo.all(query)}
   end
 
-  def search_by_name(%Plausible.Site{} = site, name) do
+  def search_by_name(%Plausible.Site{} = site, input) do
     type = :site
     fields = [:id, :name]
 
-    name_empty? = is_nil(name) or (is_binary(name) and String.trim(name) == "")
+    input_empty? = is_nil(input) or (is_binary(input) and String.trim(input) == "")
 
     base_query =
       from(segment in Segment,
@@ -84,7 +84,7 @@ defmodule Plausible.Segments do
       )
 
     query =
-      if name_empty? do
+      if input_empty? do
         from([segment] in base_query,
           select: ^fields,
           order_by: [desc: segment.updated_at]
@@ -103,23 +103,23 @@ defmodule Plausible.Segments do
                   WHEN lower(?) ILIKE ? THEN 3                        -- anywhere
                 END AS match_rank",
                 segment.name,
-                ^name,
+                ^input,
                 segment.name,
-                ^name,
+                ^input,
                 segment.name,
-                ^name,
+                ^input,
                 segment.name,
-                ^"%#{name}%"
+                ^"%#{input}%"
               ),
             pos:
               fragment(
                 "position(lower(?) IN lower(?)) AS pos",
-                ^name,
+                ^input,
                 segment.name
               ),
-            len_diff: fragment("abs(length(?) - length(?)) AS len_diff", segment.name, ^name)
+            len_diff: fragment("abs(length(?) - length(?)) AS len_diff", segment.name, ^input)
           },
-          where: fragment("? ilike ?", segment.name, ^"%#{name}%"),
+          where: fragment("? ilike ?", segment.name, ^"%#{input}%"),
           order_by: fragment("match_rank asc, pos asc, len_diff asc, updated_at desc")
         )
       end

From 84e6a071b0e699de757bd742300fbdbce4220cb0 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Thu, 18 Dec 2025 09:51:53 +0200
Subject: [PATCH 32/33] Clarify toggle components

---
 lib/plausible_web/components/generic.ex       | 29 ++++++++++++++-----
 .../live/shared_link_settings/form.ex         |  2 +-
 2 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/lib/plausible_web/components/generic.ex b/lib/plausible_web/components/generic.ex
index f81899c33ce1..696195bdcaf6 100644
--- a/lib/plausible_web/components/generic.ex
+++ b/lib/plausible_web/components/generic.ex
@@ -444,6 +444,18 @@ defmodule PlausibleWeb.Components.Generic do
 
   attr(:rest, :global)
 
+  @doc """
+   Renders toggle input.
+   Needs `:js_active_var` that controls toggle state.
+   Set this outside this component with `x-data="{ <variable name>: <initial state> }"`.
+
+   ### Examples
+   ```
+    <div x-data="{ showGoals: false }>
+      <.toggle_switch id="show_goals" js_active_var="showGoals" />
+    </div>
+  ```
+  """
   def toggle_switch(assigns) do
     ~H"""
     <button
@@ -477,16 +489,19 @@ defmodule PlausibleWeb.Components.Generic do
   attr :disabled, :boolean, default: false
   attr :label, :string, required: true
   attr :help_text, :string, default: nil
-  attr :help_text_conditional, :boolean, default: false
+  attr :show_help_text_only_when_active?, :boolean, default: false
   attr :mt?, :boolean, default: true
 
   attr(:rest, :global)
 
+  @doc """
+   Renders toggle input with a label. Clicking the label also toggles the toggle.
+   Needs `:js_active_var` that controls toggle state.
+   Set this outside this component with `x-data="{ <variable name>: <initial state> }"`
+   Can be configured to always show a description of the field / help text `:help_text`,
+   or only show the help text when the toggle is activated `:show_help_text_only_when_active?`.
+  """
   def toggle_field(assigns) do
-    help_text_conditional = assigns[:help_text_conditional] || false
-
-    assigns = assign(assigns, help_text_conditional: help_text_conditional)
-
     ~H"""
     <div class={["flex items-start justify-between gap-5 w-full", @mt? && "mt-6"]}>
       <div class="flex-1">
@@ -499,8 +514,8 @@ defmodule PlausibleWeb.Components.Generic do
         <p
           :if={@help_text}
           class="text-gray-500 dark:text-gray-400 text-sm text-pretty"
-          x-show={if @help_text_conditional, do: @js_active_var, else: "true"}
-          x-cloak={@help_text_conditional}
+          x-show={if @show_help_text_only_when_active?, do: @js_active_var, else: "true"}
+          x-cloak={@show_help_text_only_when_active?}
         >
           {@help_text}
         </p>
diff --git a/lib/plausible_web/live/shared_link_settings/form.ex b/lib/plausible_web/live/shared_link_settings/form.ex
index f5cd30f82bd1..643195424501 100644
--- a/lib/plausible_web/live/shared_link_settings/form.ex
+++ b/lib/plausible_web/live/shared_link_settings/form.ex
@@ -108,7 +108,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
           js_active_var="passwordProtectEnabled"
           label="Password protect"
           help_text="Keep this password safe. You won't be able to see it again."
-          help_text_conditional={true}
+          show_help_text_only_when_active?={true}
         />
         <div x-show="passwordProtectEnabled" x-cloak>
           <.input

From 85b587f3dfb9dd4f3567dbb5b0bcfa4f82032683 Mon Sep 17 00:00:00 2001
From: Artur Pata <artur.pata@gmail.com>
Date: Mon, 22 Dec 2025 17:04:13 +0200
Subject: [PATCH 33/33] Add tests for Shared Link form, remove unused slot

---
 lib/plausible_web/live/components/form.ex     |  7 --
 .../live/shared_link_settings/form.ex         | 15 ++++
 .../live/shared_link_settings/form_test.exs   | 88 ++++++++++++++++++-
 3 files changed, 101 insertions(+), 9 deletions(-)

diff --git a/lib/plausible_web/live/components/form.ex b/lib/plausible_web/live/components/form.ex
index 8b46b1f2e8b7..0a637312d0e0 100644
--- a/lib/plausible_web/live/components/form.ex
+++ b/lib/plausible_web/live/components/form.ex
@@ -54,7 +54,6 @@ defmodule PlausibleWeb.Live.Components.Form do
   attr(:max_one_error, :boolean, default: false)
   slot(:help_content)
   slot(:inner_block)
-  slot(:link)
 
   def input(%{field: %Phoenix.HTML.FormField{} = field} = assigns) do
     errors = if Phoenix.Component.used_input?(field), do: field.errors, else: []
@@ -91,9 +90,6 @@ defmodule PlausibleWeb.Live.Components.Form do
         <option :if={@prompt} value="">{@prompt}</option>
         {Phoenix.HTML.Form.options_for_select(@options, @value)}
       </select>
-      <div :if={@link != [] && Enum.empty?(@errors)} class="mt-1">
-        {render_slot(@link)}
-      </div>
       <.error :for={msg <- @errors}>{msg}</.error>
     </div>
     """
@@ -206,9 +202,6 @@ defmodule PlausibleWeb.Live.Components.Form do
         {@rest}
       />
       {render_slot(@inner_block)}
-      <div :if={@link != [] && Enum.empty?(@errors)} class="mt-0.5">
-        {render_slot(@link)}
-      </div>
       <.error :for={msg <- @errors}>
         {msg}
       </.error>
diff --git a/lib/plausible_web/live/shared_link_settings/form.ex b/lib/plausible_web/live/shared_link_settings/form.ex
index 643195424501..0adf0c1c4316 100644
--- a/lib/plausible_web/live/shared_link_settings/form.ex
+++ b/lib/plausible_web/live/shared_link_settings/form.ex
@@ -73,6 +73,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
                 {@shared_link.segment.id, @shared_link.segment.name}
             }
           />
+          <.learn_more />
         </div>
       </div>
 
@@ -147,6 +148,7 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
             suggest_fun={fn input, _ -> get_segment_suggestions(assigns.site, input) end}
             selected={nil}
           />
+          <.learn_more />
         </div>
       </div>
       <.button type="submit" class="w-full">
@@ -156,6 +158,19 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.Form do
     """
   end
 
+  defp learn_more(assigns),
+    do: ~H"""
+    <div class="mt-1">
+      <PlausibleWeb.Components.Generic.unstyled_link
+        href="https://plausible.io/docs/filters-segments#how-to-save-a-segment"
+        new_tab
+        class="text-xs text-indigo-600 dark:text-indigo-400"
+      >
+        Learn about segments
+      </PlausibleWeb.Components.Generic.unstyled_link>
+    </div>
+    """
+
   defp get_segment_suggestions(site, input) do
     {:ok, segments} = Plausible.Segments.search_by_name(site, input)
     Enum.map(segments, &{&1.id, &1.name})
diff --git a/test/plausible_web/live/shared_link_settings/form_test.exs b/test/plausible_web/live/shared_link_settings/form_test.exs
index e6e889c99cfb..04b5a8063d9c 100644
--- a/test/plausible_web/live/shared_link_settings/form_test.exs
+++ b/test/plausible_web/live/shared_link_settings/form_test.exs
@@ -20,9 +20,19 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.FormTest do
       html = render(lv)
 
       assert html =~ "New shared link"
+      assert html =~ "Password protect"
+      assert html =~ "Limit to segment"
+      assert element_exists?(html, ~s|button[role="switch"]#password-protect-|)
+      assert element_exists?(html, ~s|button[role="switch"]#limit-view-|)
       assert element_exists?(html, ~s|input[name="shared_link[name]"]|)
       assert element_exists?(html, ~s|input[name="shared_link[password]"][type="password"]|)
+      assert element_exists?(html, ~s|input[name="shared_link[segment_id]"]|)
       assert element_exists?(html, ~s|button[type="submit"]|)
+
+      assert element_exists?(
+               html,
+               ~s|a[href="https://plausible.io/docs/filters-segments#how-to-save-a-segment"]|
+             )
     end
 
     test "renders error on empty submission", %{conn: conn, session: session} do
@@ -56,6 +66,31 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.FormTest do
       refute shared_link.password_hash
     end
 
+    test "creates a shared link limited to segment", %{conn: conn, site: site, session: session} do
+      segment = insert(:segment, type: :site, site: site, name: "Scandinavia")
+      lv = get_liveview(conn, session)
+
+      lv |> element("button#add-shared-link-button") |> render_click()
+
+      lv
+      |> find_form()
+      |> render_submit(%{shared_link: %{name: "Limited to Scandinavia", segment_id: segment.id}})
+
+      html = render(lv)
+      assert html =~ "Limited to Scandinavia"
+      assert html =~ "Shared link saved"
+
+      shared_link =
+        Plausible.Repo.get_by(Plausible.Site.SharedLink,
+          name: "Limited to Scandinavia",
+          site_id: site.id,
+          segment_id: segment.id
+        )
+
+      assert shared_link
+      refute shared_link.password_hash
+    end
+
     test "creates a shared link with password", %{conn: conn, site: site, session: session} do
       lv = get_liveview(conn, session)
       refute render(lv) =~ "Protected Link"
@@ -77,12 +112,50 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.FormTest do
       assert shared_link.password_hash
     end
 
-    test "renders form fields for editing a shared link", %{
+    test "renders form fields for editing a shared link (not limited to segment, not protected)",
+         %{
+           conn: conn,
+           site: site,
+           session: session
+         } do
+      shared_link = insert(:shared_link, site: site, name: "Existing Link")
+
+      lv = get_liveview(conn, session)
+
+      lv
+      |> element(~s/button[phx-click="edit-shared-link"][phx-value-slug="#{shared_link.slug}"]/)
+      |> render_click()
+
+      html = render(lv)
+      assert html =~ "Edit shared link"
+      assert element_exists?(html, ~s|input[name="shared_link[name]"]|)
+      assert html =~ ~s|value="#{shared_link.name}"|
+      refute html =~ "Password protect"
+      assert html =~ "Limit to segment"
+      refute element_exists?(html, ~s|button#password-protect-[role="switch"]|)
+      refute element_exists?(html, ~s|input[name="shared_link[password]"][type="password"]|)
+      assert element_exists?(html, ~s|input[name="shared_link[segment_id]"][value=""]|)
+
+      assert element_exists?(
+               html,
+               ~s|a[href="https://plausible.io/docs/filters-segments#how-to-save-a-segment"]|
+             )
+    end
+
+    test "renders form fields for editing a shared link (limited to segment, protected)", %{
       conn: conn,
       site: site,
       session: session
     } do
-      shared_link = insert(:shared_link, site: site, name: "Existing Link")
+      segment = insert(:segment, type: :site, site: site, name: "Scandinavia")
+
+      shared_link =
+        insert(:shared_link,
+          site: site,
+          name: "Existing Link",
+          segment: segment,
+          password: "secret123"
+        )
 
       lv = get_liveview(conn, session)
 
@@ -94,6 +167,17 @@ defmodule PlausibleWeb.Live.SharedLinkSettings.FormTest do
       assert html =~ "Edit shared link"
       assert element_exists?(html, ~s|input[name="shared_link[name]"]|)
       assert html =~ ~s|value="#{shared_link.name}"|
+      refute html =~ "Password protect"
+      assert html =~ "Limit to segment"
+      assert element_exists?(html, ~s|input[name="shared_link[segment_id]"]|)
+      refute element_exists?(html, ~s|input[name="shared_link[password]"][type="password"]|)
+
+      assert element_exists?(
+               html,
+               ~s|input[name="shared_link[segment_id]"][value="#{segment.id}"]|
+             )
+
+      assert html =~ ~s|value="#{segment.name}"|
     end
 
     test "updates a shared link name", %{conn: conn, site: site, session: session} do