From 9c4b6aff1860a567953050fbf82fbaa6dff184f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89mile=20R=C3=A9?= <emile@probo.com>
Date: Tue, 2 Jun 2026 15:46:42 +0200
Subject: [PATCH] Link cookie policy doc and revamp tracker rows
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Expose the generated cookie policy Document on the CookieBanner
GraphQL type through a nullable policyDocument field and resolver,
and surface a link to it from the banner configuration header next
to the origin and ID. The link is hidden until a banner version is
published and the document exists.

Rework the tracker table rows: drop the Source column in favour of
a tracker Type badge, and move each tracker's description inline
beneath its name (and into the add/edit row inputs) instead of a
separate Description column.

Signed-off-by: Émile Ré <emile@probo.com>
---
 .../CookieBannerConfigLayout.tsx              | 16 +++++-
 .../display/_components/AddCookieRow.tsx      | 20 ++++----
 .../display/_components/CategorySection.tsx   | 35 ++++++-------
 .../display/_components/EditCookieRow.tsx     | 49 ++++++++++---------
 .../api/console/v1/cookie_banner_resolvers.go | 26 ++++++++++
 .../console/v1/graphql/cookie_banner.graphql  |  2 +
 .../api/console/v1/types/cookie_banner.go     |  8 ++-
 7 files changed, 103 insertions(+), 53 deletions(-)

diff --git a/apps/console/src/pages/organizations/cookie-banners/configuration/CookieBannerConfigLayout.tsx b/apps/console/src/pages/organizations/cookie-banners/configuration/CookieBannerConfigLayout.tsx
index 40d2e0e49..c33ee8c13 100644
--- a/apps/console/src/pages/organizations/cookie-banners/configuration/CookieBannerConfigLayout.tsx
+++ b/apps/console/src/pages/organizations/cookie-banners/configuration/CookieBannerConfigLayout.tsx
@@ -29,7 +29,7 @@ import {
   useToast,
 } from "@probo/ui";
 import { type PreloadedQuery, useMutation, usePreloadedQuery } from "react-relay";
-import { Outlet, useParams } from "react-router";
+import { Link, Outlet, useParams } from "react-router";
 import { graphql } from "relay-runtime";
 
 import type { CookieBannerConfigLayoutActivateMutation } from "#/__generated__/core/CookieBannerConfigLayoutActivateMutation.graphql";
@@ -52,6 +52,9 @@ export const cookieBannerConfigLayoutQuery = graphql`
           version
           state
         }
+        policyDocument {
+          id
+        }
       }
     }
   }
@@ -214,6 +217,17 @@ export default function CookieBannerConfigLayout({ queryRef }: CookieBannerConfi
                 <IconSquareBehindSquare2 size={16} />
               </button>
             </span>
+            {banner.policyDocument && (
+              <>
+                <span className="text-border-primary">·</span>
+                <Link
+                  to={`/organizations/${organizationId}/documents/${banner.policyDocument.id}`}
+                  className="font-medium text-txt-primary underline"
+                >
+                  {__("Cookie Policy")}
+                </Link>
+              </>
+            )}
           </span>
         )}
       >
diff --git a/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/AddCookieRow.tsx b/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/AddCookieRow.tsx
index 8343009b6..5730757d7 100644
--- a/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/AddCookieRow.tsx
+++ b/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/AddCookieRow.tsx
@@ -58,10 +58,16 @@ export function AddCookieRow({
   return (
     <Tr>
       <Td className="pr-3">
-        <Input
-          {...register("name")}
-          placeholder={__("Cookie name")}
-        />
+        <div className="flex flex-col gap-2 min-w-0 max-w-xs">
+          <Input
+            {...register("name")}
+            placeholder={__("Cookie name")}
+          />
+          <Input
+            {...register("description")}
+            placeholder={__("Description")}
+          />
+        </div>
       </Td>
       <Td />
       <Td className="pr-3">
@@ -78,12 +84,6 @@ export function AddCookieRow({
           )}
         />
       </Td>
-      <Td className="pr-3">
-        <Input
-          {...register("description")}
-          placeholder={__("Description")}
-        />
-      </Td>
       <Td>
         <div className="flex items-center gap-2">
           <Button
diff --git a/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/CategorySection.tsx b/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/CategorySection.tsx
index 3e4bb9a51..6abb2433a 100644
--- a/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/CategorySection.tsx
+++ b/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/CategorySection.tsx
@@ -13,7 +13,7 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 import { EyeIcon, EyeSlashIcon } from "@phosphor-icons/react";
-import { formatError, type GraphQLError, humanizeSeconds } from "@probo/helpers";
+import { formatError, getTrackerTypeBadge, type GraphQLError, humanizeSeconds } from "@probo/helpers";
 import { useTranslate } from "@probo/i18n";
 import {
   Badge,
@@ -76,10 +76,10 @@ export const categorySectionFragment = graphql`
         node {
           id
           displayName
+          trackerType
           maxAgeSeconds
           description
           excluded
-          source
           ...EditCookieRowFragment
         }
       }
@@ -136,10 +136,10 @@ const createPatternMutation = graphql`
         node {
           id
           displayName
+          trackerType
           maxAgeSeconds
           description
           excluded
-          source
           ...EditCookieRowFragment
         }
       }
@@ -759,9 +759,8 @@ export function CategorySection({ categoryKey, connectionId }: CategorySectionPr
         <Thead>
           <Tr>
             <Th>{__("Name")}</Th>
-            <Th>{__("Source")}</Th>
+            <Th>{__("Type")}</Th>
             <Th>{__("Duration")}</Th>
-            <Th>{__("Description")}</Th>
             <Th className="w-20" />
           </Tr>
         </Thead>
@@ -780,26 +779,24 @@ export function CategorySection({ categoryKey, connectionId }: CategorySectionPr
               : (
                   <Tr key={pattern.id} className={pattern.excluded ? "opacity-80" : undefined}>
                     <Td>
-                      <code className="text-sm font-mono">{pattern.displayName}</code>
+                      <div className="flex flex-col min-w-0 max-w-xs">
+                        <code className="text-sm font-mono">{pattern.displayName}</code>
+                        {pattern.description && (
+                          <span className="text-xs text-txt-tertiary wrap-break-word line-clamp-1">
+                            {pattern.description}
+                          </span>
+                        )}
+                      </div>
                     </Td>
                     <Td>
-                      <Badge
-                        variant={pattern.source === "SCRIPT" ? "info" : "neutral"}
-                        title={
-                          pattern.source === "SCRIPT"
-                            ? __("Set by a script at runtime")
-                            : __("Already present when the page was loaded")
-                        }
-                      >
-                        {pattern.source === "SCRIPT" ? __("Script") : __("Pre-existing")}
-                      </Badge>
+                      {(() => {
+                        const typeBadge = getTrackerTypeBadge(pattern.trackerType, __);
+                        return <Badge variant={typeBadge.variant}>{typeBadge.label}</Badge>;
+                      })()}
                     </Td>
                     <Td className="text-sm text-muted-foreground">
                       {humanizeSeconds(pattern.maxAgeSeconds ?? null)}
                     </Td>
-                    <Td className="text-sm text-muted-foreground">
-                      {pattern.description}
-                    </Td>
                     <Td>
                       <div className="flex items-center gap-1">
                         <button
diff --git a/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/EditCookieRow.tsx b/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/EditCookieRow.tsx
index 6a0b029c5..cef2ce72d 100644
--- a/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/EditCookieRow.tsx
+++ b/apps/console/src/pages/organizations/cookie-banners/configuration/display/_components/EditCookieRow.tsx
@@ -12,9 +12,9 @@
 // OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 // PERFORMANCE OF THIS SOFTWARE.
 
-import { fromMaxAgeSeconds, toMaxAgeSeconds } from "@probo/helpers";
+import { fromMaxAgeSeconds, getTrackerTypeBadge, toMaxAgeSeconds } from "@probo/helpers";
 import { useTranslate } from "@probo/i18n";
-import { Button, DurationInput, Input, Td, Toggle, Tr } from "@probo/ui";
+import { Badge, Button, DurationInput, Input, Td, Toggle, Tr } from "@probo/ui";
 import { Controller, useForm } from "react-hook-form";
 import { useFragment } from "react-relay";
 import { graphql } from "relay-runtime";
@@ -26,6 +26,7 @@ import type { CookieEntry } from "./CategorySection";
 export const editCookieRowFragment = graphql`
   fragment EditCookieRowFragment on TrackerPattern {
     displayName
+    trackerType
     maxAgeSeconds
     description
     excluded
@@ -72,26 +73,36 @@ export function EditCookieRow({
     });
   };
 
+  const typeBadge = getTrackerTypeBadge(cookie.trackerType, __);
+
   return (
     <Tr>
       <Td className="pr-3">
-        <div className="flex items-center gap-2">
-          <Controller
-            name="excluded"
-            control={control}
-            render={({ field }) => (
-              <Toggle
-                size="sm"
-                checked={!field.value}
-                onChange={checked => field.onChange(!checked)}
-                title={__("Include this cookie in the banner")}
-              />
-            )}
+        <div className="flex flex-col gap-2 min-w-0 max-w-xs">
+          <div className="flex items-center gap-2">
+            <Controller
+              name="excluded"
+              control={control}
+              render={({ field }) => (
+                <Toggle
+                  size="sm"
+                  checked={!field.value}
+                  onChange={checked => field.onChange(!checked)}
+                  title={__("Include this cookie in the banner")}
+                />
+              )}
+            />
+            <code className="text-sm font-mono">{cookie.displayName}</code>
+          </div>
+          <Input
+            {...register("description")}
+            placeholder={__("Description")}
           />
-          <code className="text-sm font-mono">{cookie.displayName}</code>
         </div>
       </Td>
-      <Td />
+      <Td>
+        <Badge variant={typeBadge.variant}>{typeBadge.label}</Badge>
+      </Td>
       <Td className="pr-3">
         <Controller
           name="duration"
@@ -106,12 +117,6 @@ export function EditCookieRow({
           )}
         />
       </Td>
-      <Td className="pr-3">
-        <Input
-          {...register("description")}
-          placeholder={__("Description")}
-        />
-      </Td>
       <Td>
         <div className="flex items-center gap-2">
           <Button
diff --git a/pkg/server/api/console/v1/cookie_banner_resolvers.go b/pkg/server/api/console/v1/cookie_banner_resolvers.go
index 486ba0467..d8fef818c 100644
--- a/pkg/server/api/console/v1/cookie_banner_resolvers.go
+++ b/pkg/server/api/console/v1/cookie_banner_resolvers.go
@@ -143,6 +143,32 @@ func (r *cookieBannerResolver) LatestVersion(ctx context.Context, obj *types.Coo
 	}, nil
 }
 
+// PolicyDocument is the resolver for the policyDocument field.
+func (r *cookieBannerResolver) PolicyDocument(ctx context.Context, obj *types.CookieBanner) (*types.Document, error) {
+	if obj.PolicyDocument == nil {
+		return nil, nil
+	}
+
+	if _, err := r.authorize(ctx, obj.ID, probo.ActionDocumentGet); err != nil {
+		return nil, err
+	}
+
+	loaders := dataloader.FromContext(ctx)
+
+	document, err := loaders.Document.Load(ctx, obj.PolicyDocument.ID)
+	if err != nil {
+		if errors.Is(err, coredata.ErrResourceNotFound) || errors.Is(err, dataloadgen.ErrNotFound) {
+			return nil, nil
+		}
+
+		r.logger.ErrorCtx(ctx, "cannot get policy document", log.Error(err))
+
+		return nil, gqlutils.Internal(ctx)
+	}
+
+	return types.NewDocument(document), nil
+}
+
 // ConsentRecords is the resolver for the consentRecords field.
 func (r *cookieBannerResolver) ConsentRecords(ctx context.Context, obj *types.CookieBanner, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.CookieConsentRecordOrderBy, filter *types.CookieConsentRecordFilter) (*types.CookieConsentRecordConnection, error) {
 	scope, err := r.authorize(ctx, obj.ID, probo.ActionCookieConsentRecordList)
diff --git a/pkg/server/api/console/v1/graphql/cookie_banner.graphql b/pkg/server/api/console/v1/graphql/cookie_banner.graphql
index bab67e6f6..1bc17728d 100644
--- a/pkg/server/api/console/v1/graphql/cookie_banner.graphql
+++ b/pkg/server/api/console/v1/graphql/cookie_banner.graphql
@@ -153,6 +153,8 @@ type CookieBanner implements Node {
 
     latestVersion: CookieBannerVersion @goField(forceResolver: true)
 
+    policyDocument: Document @goField(forceResolver: true)
+
     consentRecords(
         first: Int
         after: CursorKey
diff --git a/pkg/server/api/console/v1/types/cookie_banner.go b/pkg/server/api/console/v1/types/cookie_banner.go
index fcb514f62..fe8a7e764 100644
--- a/pkg/server/api/console/v1/types/cookie_banner.go
+++ b/pkg/server/api/console/v1/types/cookie_banner.go
@@ -61,7 +61,7 @@ func NewCookieBannerEdge(b *coredata.CookieBanner, orderBy coredata.CookieBanner
 }
 
 func NewCookieBanner(b *coredata.CookieBanner) *CookieBanner {
-	return &CookieBanner{
+	banner := &CookieBanner{
 		ID: b.ID,
 		Organization: &Organization{
 			ID: b.OrganizationID,
@@ -77,6 +77,12 @@ func NewCookieBanner(b *coredata.CookieBanner) *CookieBanner {
 		CreatedAt:         b.CreatedAt,
 		UpdatedAt:         b.UpdatedAt,
 	}
+
+	if b.PolicyDocumentID != nil {
+		banner.PolicyDocument = &Document{ID: *b.PolicyDocumentID}
+	}
+
+	return banner
 }
 
 func NewCookieBannerTranslation(t *coredata.CookieBannerTranslation) *CookieBannerTranslation {