@eventcatalog/core 3.41.4 → 3.43.0

package/eventcatalog/src/layouts/VerticalSideBarLayout.astro

@@ -11,6 +11,7 @@ import {
   TableProperties,
   BotMessageSquare,
   BookOpen,
+  BookText,
   FileText,
   SquareDashedMousePointerIcon,
   FileCode,
@@ -61,15 +62,16 @@ import { getEvents } from '@utils/collections/events';
 import { getServices } from '@utils/collections/services';
 import { getAgents } from '@utils/collections/agents';
 import { getFlows } from '@utils/collections/flows';
+import { getAdrs } from '@utils/collections/adrs';
+import { getContainers } from '@utils/collections/containers';
+import { getDataProducts } from '@utils/collections/data-products';
 import { isCollectionVisibleInCatalog } from '@eventcatalog';
 import { buildUrl } from '@utils/url-builder';
 import { getQueries } from '@utils/collections/queries';
-import { hasLandingPageForDocs } from '@utils/pages';
 import { filterSidebarItems } from '@utils/sidebar-visibility';
 
 import { isEmbedEnabled, isCustomStylesEnabled, isEventCatalogScaleEnabled, isCustomDocsEnabled, isSSR } from '@utils/feature';
 
-const catalogHasDefaultLandingPageForDocs = await hasLandingPageForDocs();
 const customDocs = await getCollection('customPages');
 
 let events: any[] = [];
@@ -77,20 +79,24 @@ let commands: any[] = [];
 let queries: any[] = [];
 let services: any[] = [];
 let agents: any[] = [];
+let adrs: any[] = [];
 let domains: any[] = [];
 let flows: any[] = [];
-
-if (!catalogHasDefaultLandingPageForDocs) {
-  [events, commands, queries, services, agents, domains, flows] = await Promise.all([
-    getEvents({ getAllVersions: false, hydrateServices: false }),
-    getCommands({ getAllVersions: false, hydrateServices: false }),
-    getQueries({ getAllVersions: false, hydrateServices: false }),
-    getServices({ getAllVersions: false }),
-    getAgents({ getAllVersions: false }),
-    getDomains({ getAllVersions: false }),
-    getFlows({ getAllVersions: false }),
-  ]);
-}
+let containers: any[] = [];
+let dataProducts: any[] = [];
+
+[events, commands, queries, services, agents, adrs, domains, flows, containers, dataProducts] = await Promise.all([
+  getEvents({ getAllVersions: false, hydrateServices: false }),
+  getCommands({ getAllVersions: false, hydrateServices: false }),
+  getQueries({ getAllVersions: false, hydrateServices: false }),
+  getServices({ getAllVersions: false }),
+  getAgents({ getAllVersions: false }),
+  getAdrs({ getAllVersions: false }),
+  getDomains({ getAllVersions: false }),
+  getFlows({ getAllVersions: false }),
+  getContainers({ getAllVersions: false }),
+  getDataProducts({ getAllVersions: false }),
+]);
 
 // Try and load any custom styles if they exist
 if (isCustomStylesEnabled()) {
@@ -203,8 +209,47 @@ const premiumFeatures: Array<{
   isPremium?: boolean;
 }> = [];
 
+const internalServices = services.filter((service) => !service.data.externalSystem);
+const externalSystems = services.filter((service) => service.data.externalSystem);
+
 const browseItems = filterSidebarItems(
   [
+    {
+      id: '/discover/agents',
+      aliases: ['/discover'],
+      label: 'Agents',
+      icon: BotMessageSquare,
+      href: buildUrl('/discover/agents'),
+      current: currentPath === buildUrl('/discover/agents'),
+      visible: agents.length > 0,
+    },
+    {
+      id: '/discover/adrs',
+      aliases: ['/discover'],
+      label: 'Decision Records',
+      icon: BookText,
+      href: buildUrl('/discover/adrs'),
+      current: currentPath === buildUrl('/discover/adrs'),
+      visible: adrs.length > 0,
+    },
+    {
+      id: '/discover/data-products',
+      aliases: ['/discover'],
+      label: 'Data Products',
+      icon: CubeIcon,
+      href: buildUrl('/discover/data-products'),
+      current: currentPath === buildUrl('/discover/data-products'),
+      visible: dataProducts.length > 0,
+    },
+    {
+      id: '/discover/containers',
+      aliases: ['/discover'],
+      label: 'Data Stores',
+      icon: Database,
+      href: buildUrl('/discover/containers'),
+      current: currentPath === buildUrl('/discover/containers'),
+      visible: containers.length > 0,
+    },
     {
       id: '/discover/domains',
       aliases: ['/discover'],
@@ -212,6 +257,7 @@ const browseItems = filterSidebarItems(
       icon: RectangleGroupIcon,
       href: buildUrl('/discover/domains'),
       current: currentPath === buildUrl('/discover/domains'),
+      visible: domains.length > 0,
     },
     {
       id: '/discover/services',
@@ -220,6 +266,7 @@ const browseItems = filterSidebarItems(
       icon: ServerIcon,
       href: buildUrl('/discover/services'),
       current: currentPath === buildUrl('/discover/services'),
+      visible: internalServices.length > 0,
     },
     {
       id: '/discover/external-systems',
@@ -228,6 +275,7 @@ const browseItems = filterSidebarItems(
       icon: GlobeAltIcon,
       href: buildUrl('/discover/external-systems'),
       current: currentPath === buildUrl('/discover/external-systems'),
+      visible: externalSystems.length > 0,
     },
     {
       id: '/discover/events',
@@ -236,6 +284,7 @@ const browseItems = filterSidebarItems(
       icon: BoltIcon,
       href: buildUrl('/discover/events'),
       current: currentPath === buildUrl('/discover/events'),
+      visible: events.length > 0,
     },
     {
       id: '/discover/commands',
@@ -244,6 +293,7 @@ const browseItems = filterSidebarItems(
       icon: ChatBubbleLeftIcon,
       href: buildUrl('/discover/commands'),
       current: currentPath === buildUrl('/discover/commands'),
+      visible: commands.length > 0,
     },
     {
       id: '/discover/queries',
@@ -252,6 +302,7 @@ const browseItems = filterSidebarItems(
       icon: MagnifyingGlassIcon,
       href: buildUrl('/discover/queries'),
       current: currentPath === buildUrl('/discover/queries'),
+      visible: queries.length > 0,
     },
     {
       id: '/discover/flows',
@@ -260,34 +311,13 @@ const browseItems = filterSidebarItems(
       icon: QueueListIcon,
       href: buildUrl('/discover/flows'),
       current: currentPath === buildUrl('/discover/flows'),
-    },
-    {
-      id: '/discover/containers',
-      aliases: ['/discover'],
-      label: 'Data Stores',
-      icon: Database,
-      href: buildUrl('/discover/containers'),
-      current: currentPath === buildUrl('/discover/containers'),
-    },
-    {
-      id: '/discover/data-products',
-      aliases: ['/discover'],
-      label: 'Data Products',
-      icon: CubeIcon,
-      href: buildUrl('/discover/data-products'),
-      current: currentPath === buildUrl('/discover/data-products'),
-    },
-    {
-      id: '/discover/agents',
-      aliases: ['/discover'],
-      label: 'Agents',
-      icon: BotMessageSquare,
-      href: buildUrl('/discover/agents'),
-      current: currentPath === buildUrl('/discover/agents'),
+      visible: flows.length > 0,
     },
   ],
   userSideBarConfiguration
-);
+)
+  .filter((item) => item.visible !== false)
+  .sort((a, b) => a.label.localeCompare(b.label));
 
 const organizationItems = filterSidebarItems(
   [
@@ -329,15 +359,25 @@ const currentNavigationItem = [...navigationItems, ...studioNavigationItem, ...p
 const { title, description, showNestedSideBar = true, showHeader = true } = Astro.props;
 
 const canPageBeEmbedded = isEmbedEnabled();
+const verticalNavAutoCollapsePaths = [buildUrl('/discover', true), buildUrl('/docs', true)];
 ---
 
 <BaseLayout title={`EventCatalog | ${title}`} description={description} ogTitle={title}>
   <Fragment slot="head">
-    <script is:inline>
+    <script is:inline define:vars={{ verticalNavAutoCollapsePaths }}>
       (() => {
+        const verticalNavStorageKey = 'eventcatalog-vertical-nav-collapsed';
+        const routeShouldAutoCollapseVerticalNav = (pathname) =>
+          verticalNavAutoCollapsePaths.some((path) => pathname === path || pathname.startsWith(`${path}/`));
+
         try {
-          const savedState = localStorage.getItem('eventcatalog-vertical-nav-collapsed');
-          const isCollapsed = savedState === null ? true : savedState === 'true';
+          const shouldAutoCollapse = routeShouldAutoCollapseVerticalNav(window.location.pathname);
+          if (shouldAutoCollapse) {
+            localStorage.setItem(verticalNavStorageKey, 'true');
+          }
+
+          const savedState = localStorage.getItem(verticalNavStorageKey);
+          const isCollapsed = shouldAutoCollapse ? true : savedState === null ? true : savedState === 'true';
           document.documentElement.setAttribute('data-vertical-nav-collapsed', isCollapsed ? 'true' : 'false');
         } catch (error) {
           document.documentElement.setAttribute('data-vertical-nav-collapsed', 'true');
@@ -737,6 +777,7 @@ const canPageBeEmbedded = isEmbedEnabled();
     navigationItems,
     currentNavigationItem,
     canPageBeEmbedded,
+    verticalNavAutoCollapsePaths,
   }}
 >
   const VERTICAL_NAV_STORAGE_KEY = 'eventcatalog-vertical-nav-collapsed';
@@ -817,7 +858,21 @@ const canPageBeEmbedded = isEmbedEnabled();
     });
   };
 
+  const routeShouldAutoCollapseVerticalNav = (pathname) =>
+    verticalNavAutoCollapsePaths.some((path) => pathname === path || pathname.startsWith(`${path}/`));
+
+  const persistVerticalNavCollapsedState = (collapsed) => {
+    try {
+      localStorage.setItem(VERTICAL_NAV_STORAGE_KEY, String(collapsed));
+    } catch (error) {}
+  };
+
   const getPersistedVerticalNavCollapsedState = () => {
+    if (routeShouldAutoCollapseVerticalNav(window.location.pathname)) {
+      persistVerticalNavCollapsedState(true);
+      return true;
+    }
+
     try {
       const savedState = localStorage.getItem(VERTICAL_NAV_STORAGE_KEY);
       return savedState === null ? true : savedState === 'true';
@@ -948,10 +1003,7 @@ const canPageBeEmbedded = isEmbedEnabled();
         const nextState = !isCollapsed;
 
         setVerticalNavCollapsedState(nextState);
-
-        try {
-          localStorage.setItem(VERTICAL_NAV_STORAGE_KEY, String(nextState));
-        } catch (error) {}
+        persistVerticalNavCollapsedState(nextState);
       };
     }
   });

package/eventcatalog/src/pages/.well-known/api-catalog.ts

@@ -0,0 +1,191 @@
+import type { APIRoute } from 'astro';
+import yaml from 'js-yaml';
+import { getServices, getSpecificationsForService } from '@utils/collections/services';
+import { getDomains, getSpecificationsForDomain } from '@utils/collections/domains';
+import type { ProcessedSpecification } from '@utils/collections/util';
+import { buildUrl } from '@utils/url-builder';
+import { readResourceFile } from '@utils/resource-files';
+import { isEventCatalogMCPEnabled } from '@utils/feature';
+
+const RFC_9727_PROFILE = 'https://www.rfc-editor.org/info/rfc9727';
+const LINKSET_CONTENT_TYPE = `application/linkset+json; profile="${RFC_9727_PROFILE}"`;
+
+type LinkTarget = {
+  href: string;
+  type?: string;
+  title?: string;
+};
+
+type ApiCatalogEntry = {
+  anchor: string;
+  'service-desc': LinkTarget[];
+  'service-doc'?: LinkTarget[];
+};
+
+type ApiCatalogResource = Awaited<ReturnType<typeof getServices>>[number] | Awaited<ReturnType<typeof getDomains>>[number];
+
+const absoluteUrl = (request: Request, pathOrUrl: string) => new URL(pathOrUrl, request.url).toString();
+
+const getSpecificationMediaType = (specification: ProcessedSpecification) => {
+  const extension = specification.filename.split('.').pop()?.toLowerCase();
+
+  if (specification.type === 'graphql') return 'application/graphql';
+  if (extension === 'json') return 'application/json';
+  if (extension === 'yaml' || extension === 'yml') return 'application/yaml';
+
+  return 'text/plain';
+};
+
+const getSpecificationIdentifier = (specification: ProcessedSpecification) => {
+  return `${specification.type}-${Buffer.from(specification.path).toString('base64url')}`;
+};
+
+const parseSpecification = (rawSpecification: string, path: string): unknown => {
+  if (path.endsWith('.json')) {
+    return JSON.parse(rawSpecification);
+  }
+
+  return yaml.load(rawSpecification);
+};
+
+const toHttpUrl = (value: unknown): string | undefined => {
+  if (typeof value !== 'string' || value.trim() === '') return undefined;
+  if (!/^https?:\/\//i.test(value)) return undefined;
+
+  try {
+    const url = new URL(value);
+    if (url.protocol === 'http:' || url.protocol === 'https:') {
+      return url.toString();
+    }
+  } catch {
+    return undefined;
+  }
+
+  return undefined;
+};
+
+const getSpecificationsForResource = (resource: ApiCatalogResource) => {
+  if (resource.collection === 'domains') {
+    return getSpecificationsForDomain(resource);
+  }
+
+  return getSpecificationsForService(resource);
+};
+
+const getEndpointFromSpecification = (request: Request, resource: ApiCatalogResource) => {
+  const specifications = getSpecificationsForResource(resource);
+
+  for (const specification of specifications) {
+    if (specification.type !== 'openapi' && specification.type !== 'asyncapi') continue;
+
+    const rawSpecification = readResourceFile(resource, specification.path);
+    if (!rawSpecification) continue;
+
+    try {
+      const parsedSpecification = parseSpecification(rawSpecification, specification.path) as any;
+
+      if (specification.type === 'openapi') {
+        const serverUrl = parsedSpecification?.servers?.find((server: any) => typeof server?.url === 'string')?.url;
+        const endpoint = toHttpUrl(serverUrl);
+        if (endpoint) return endpoint;
+      }
+
+      if (specification.type === 'asyncapi') {
+        const servers = Object.values(parsedSpecification?.servers ?? {}) as any[];
+        const serverUrl = servers.find((server) => typeof server?.url === 'string')?.url;
+        const endpoint = toHttpUrl(serverUrl);
+        if (endpoint) return endpoint;
+      }
+    } catch {
+      // Invalid or unsupported specifications should not prevent catalog discovery.
+    }
+  }
+};
+
+const getResourceDocumentationUrl = (request: Request, resource: ApiCatalogResource) => {
+  return absoluteUrl(request, buildUrl(`/docs/${resource.collection}/${resource.data.id}/${resource.data.version}`, true));
+};
+
+const getResourceMarkdownUrl = (request: Request, resource: ApiCatalogResource) => {
+  return absoluteUrl(request, buildUrl(`/docs/${resource.collection}/${resource.data.id}/${resource.data.version}.md`, true));
+};
+
+const toApiCatalogEntry = (request: Request, resource: ApiCatalogResource): ApiCatalogEntry | null => {
+  const specifications = getSpecificationsForResource(resource);
+  if (specifications.length === 0) return null;
+
+  const resourceDocumentationUrl = getResourceDocumentationUrl(request, resource);
+  const resourceMarkdownUrl = getResourceMarkdownUrl(request, resource);
+
+  return {
+    anchor: getEndpointFromSpecification(request, resource) ?? resourceDocumentationUrl,
+    'service-desc': specifications.map((specification) => ({
+      href: absoluteUrl(
+        request,
+        buildUrl(
+          `/api-catalog/specifications/${resource.collection}/${resource.data.id}/${resource.data.version}/${getSpecificationIdentifier(specification)}`,
+          true
+        )
+      ),
+      type: getSpecificationMediaType(specification),
+      title: `${resource.data.name || resource.data.id} ${specification.name}`,
+    })),
+    'service-doc': [
+      {
+        href: resourceMarkdownUrl,
+        type: 'text/markdown',
+        title: `${resource.data.name || resource.data.id} documentation`,
+      },
+      {
+        href: resourceDocumentationUrl,
+        type: 'text/html',
+        title: `${resource.data.name || resource.data.id} documentation`,
+      },
+    ],
+  };
+};
+
+const getMcpCatalogEntry = (request: Request): ApiCatalogEntry | null => {
+  if (!isEventCatalogMCPEnabled()) return null;
+
+  const mcpUrl = absoluteUrl(request, buildUrl('/docs/mcp', true));
+
+  return {
+    anchor: mcpUrl,
+    'service-desc': [
+      {
+        href: mcpUrl,
+        type: 'application/json',
+        title: 'EventCatalog MCP Server',
+      },
+    ],
+  };
+};
+
+export const GET: APIRoute = async ({ request }) => {
+  const [services, domains] = await Promise.all([getServices({ getAllVersions: true }), getDomains({ getAllVersions: true })]);
+  const resources = [...services, ...domains];
+  const linkset = resources
+    .map((resource) => toApiCatalogEntry(request, resource))
+    .filter((entry): entry is ApiCatalogEntry => entry !== null);
+
+  const mcpEntry = getMcpCatalogEntry(request);
+  if (mcpEntry) {
+    linkset.push(mcpEntry);
+  }
+
+  return new Response(JSON.stringify({ linkset }, null, 2), {
+    headers: {
+      'Content-Type': LINKSET_CONTENT_TYPE,
+    },
+  });
+};
+
+export const HEAD: APIRoute = async ({ request }) => {
+  return new Response(null, {
+    headers: {
+      'Content-Type': LINKSET_CONTENT_TYPE,
+      Link: `<${absoluteUrl(request, buildUrl('/.well-known/api-catalog', true))}>; rel="api-catalog"`,
+    },
+  });
+};

package/eventcatalog/src/pages/api-catalog/specifications/[collection]/[id]/[version]/[specification].ts

@@ -0,0 +1,109 @@
+import type { APIRoute } from 'astro';
+import { getCollection } from 'astro:content';
+import { getSpecificationsForDomain } from '@utils/collections/domains';
+import { getSpecificationsForService } from '@utils/collections/services';
+import type { ProcessedSpecification } from '@utils/collections/util';
+import { readResourceFile } from '@utils/resource-files';
+
+type SupportedCollection = 'domains' | 'services';
+
+const isSupportedCollection = (collection: string | undefined): collection is SupportedCollection => {
+  return collection === 'domains' || collection === 'services';
+};
+
+const getSpecificationMediaType = (specification: ProcessedSpecification) => {
+  const extension = specification.filename.split('.').pop()?.toLowerCase();
+
+  if (specification.type === 'graphql') return 'application/graphql';
+  if (extension === 'json') return 'application/json';
+  if (extension === 'yaml' || extension === 'yml') return 'application/yaml';
+
+  return 'text/plain';
+};
+
+const getSpecificationIdentifier = (specification: ProcessedSpecification) => {
+  return `${specification.type}-${Buffer.from(specification.path).toString('base64url')}`;
+};
+
+const getSpecificationsForResource = (
+  resource:
+    | Awaited<ReturnType<typeof getCollection<'services'>>>[number]
+    | Awaited<ReturnType<typeof getCollection<'domains'>>>[number]
+) => {
+  if (resource.collection === 'domains') {
+    return getSpecificationsForDomain(resource);
+  }
+
+  return getSpecificationsForService(resource);
+};
+
+export async function getStaticPaths() {
+  const [services, domains] = await Promise.all([getCollection('services'), getCollection('domains')]);
+  const resources = [...services, ...domains].filter((resource) => resource.data.hidden !== true);
+
+  return resources.flatMap((resource) =>
+    getSpecificationsForResource(resource).map((specification) => ({
+      params: {
+        collection: resource.collection,
+        id: resource.data.id,
+        version: resource.data.version,
+        specification: getSpecificationIdentifier(specification),
+      },
+      props: {
+        rawSpecification: readResourceFile(resource, specification.path),
+        contentType: getSpecificationMediaType(specification),
+      },
+    }))
+  );
+}
+
+export const GET: APIRoute = async ({ params, props }) => {
+  if (props.rawSpecification) {
+    return new Response(props.rawSpecification, {
+      headers: { 'Content-Type': props.contentType ?? 'text/plain' },
+    });
+  }
+
+  const { collection, id, version, specification } = params;
+
+  if (!isSupportedCollection(collection) || !id || !version || !specification) {
+    return new Response(JSON.stringify({ error: 'Missing or invalid collection, id, version, or specification parameter' }), {
+      status: 400,
+      headers: { 'Content-Type': 'application/json' },
+    });
+  }
+
+  const resources = await getCollection(collection);
+  const resource = resources.find((item) => item.data.id === id && item.data.version === version && item.data.hidden !== true);
+
+  if (!resource) {
+    return new Response(JSON.stringify({ error: 'Resource not found' }), {
+      status: 404,
+      headers: { 'Content-Type': 'application/json' },
+    });
+  }
+
+  const spec = getSpecificationsForResource(resource).find(
+    (item) => getSpecificationIdentifier(item) === specification || item.type === specification
+  );
+
+  if (!spec) {
+    return new Response(JSON.stringify({ error: 'Specification not found' }), {
+      status: 404,
+      headers: { 'Content-Type': 'application/json' },
+    });
+  }
+
+  const rawSpecification = readResourceFile(resource, spec.path);
+
+  if (!rawSpecification) {
+    return new Response(JSON.stringify({ error: 'Specification file could not be read' }), {
+      status: 404,
+      headers: { 'Content-Type': 'application/json' },
+    });
+  }
+
+  return new Response(rawSpecification, {
+    headers: { 'Content-Type': getSpecificationMediaType(spec) },
+  });
+};

package/eventcatalog/src/pages/discover/[type]/_index.data.ts

@@ -11,6 +11,7 @@ export class Page extends HybridPage {
   static async getStaticPaths(): Promise<Array<{ params: any; props: any }>> {
     const { getFlows } = await import('@utils/collections/flows');
     const { getAgents } = await import('@utils/collections/agents');
+    const { getAdrs } = await import('@utils/collections/adrs');
     const { getServices } = await import('@utils/collections/services');
     const { getDataProducts } = await import('@utils/collections/data-products');
 
@@ -20,6 +21,7 @@ export class Page extends HybridPage {
     const loaders = {
       ...pageDataLoader,
       agents: getAgents,
+      adrs: getAdrs,
       flows: getFlows,
       services: getInternalServices,
       'external-systems': getExternalServices,
@@ -29,6 +31,7 @@ export class Page extends HybridPage {
     const itemTypes = [
       'events',
       'agents',
+      'adrs',
       'commands',
       'queries',
       'domains',
@@ -60,6 +63,7 @@ export class Page extends HybridPage {
 
     const { getFlows } = await import('@utils/collections/flows');
     const { getAgents } = await import('@utils/collections/agents');
+    const { getAdrs } = await import('@utils/collections/adrs');
     const { getServices } = await import('@utils/collections/services');
     const { getDataProducts } = await import('@utils/collections/data-products');
 
@@ -69,6 +73,7 @@ export class Page extends HybridPage {
     const loaders = {
       ...pageDataLoader,
       agents: getAgents,
+      adrs: getAdrs,
       flows: getFlows,
       services: getInternalServices,
       'external-systems': getExternalServices,

package/eventcatalog/src/pages/discover/[type]/index.astro

@@ -1,6 +1,7 @@
 ---
 import { getCommands } from '@utils/collections/commands';
 import { getAgents } from '@utils/collections/agents';
+import { createAdrStatusBadge, getAdrs } from '@utils/collections/adrs';
 import { getDomains, getDomainsForAgent, getDomainsForService } from '@utils/collections/domains';
 import { getEvents } from '@utils/collections/events';
 import { getServices } from '@utils/collections/services';
@@ -24,6 +25,7 @@ const events = await getEvents();
 const queries = await getQueries();
 const commands = await getCommands();
 const agents = await getAgents();
+const adrs = await getAdrs();
 const services = await getServices();
 const domains = await getDomains({ getAllVersions: false });
 const containers = await getContainers();
@@ -108,6 +110,15 @@ const typeConfig: Record<
       { id: 'isDeprecated', label: 'Is Deprecated' },
     ],
   },
+  adrs: {
+    label: 'Decision Records',
+    description: 'Browse the decision records across your catalog and inspect their status and scope.',
+    propertyOptions: [
+      { id: 'hasOwners', label: 'Has Owners' },
+      { id: 'hasAppliesTo', label: 'Applies To Resources' },
+      { id: 'hasDecisionMakers', label: 'Has Decision Makers' },
+    ],
+  },
   'external-systems': {
     label: 'External Systems',
     description: 'Explore the external systems connected to your architecture and the contracts around them.',
@@ -200,6 +211,7 @@ function hasSpecifications(service: any): boolean {
 // Build lookup maps for all collections (for resolving data product inputs/outputs)
 const allCollections = [
   ...agents.map((a) => ({ ...a, collection: 'agents' })),
+  ...adrs.map((adr) => ({ ...adr, collection: 'adrs' })),
   ...services.map((s) => ({ ...s, collection: 'services' })),
   ...containers.map((c) => ({ ...c, collection: 'containers' })),
   ...channels.map((c) => ({ ...c, collection: 'channels' })),
@@ -266,6 +278,8 @@ const tableData = enrichedData.map((d: any) => ({
   hasDataDependencies: isServiceOrAgentLike ? (d.data?.writesTo || []).length > 0 || (d.data?.readsFrom || []).length > 0 : false,
   hasModel: type === 'agents' ? !!d.data?.model : false,
   hasTools: type === 'agents' ? (d.data?.tools || []).length > 0 : false,
+  hasAppliesTo: type === 'adrs' ? (d.data?.appliesTo || []).length > 0 : false,
+  hasDecisionMakers: type === 'adrs' ? (d.data?.decisionMakers || []).length > 0 : false,
   // Data-product-specific properties
   hasInputs: type === 'data-products' ? (d.data?.inputs || []).length > 0 : false,
   hasOutputs: type === 'data-products' ? (d.data?.outputs || []).length > 0 : false,
@@ -279,6 +293,9 @@ const tableData = enrichedData.map((d: any) => ({
     latestVersion: d.data?.latestVersion,
     draft: d.data?.draft,
     badges: d.data?.badges,
+    status: d.data?.status,
+    date: d.data?.date,
+    statusBadge: d.data?.status ? createAdrStatusBadge(d.data.status) : undefined,
     producers: d.data?.producers?.map(mapToItem) ?? [],
     consumers: d.data?.consumers?.map(mapToItem) ?? [],
     receives: d.data?.receives?.map(mapToItem) ?? [],

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/_index.data.ts

@@ -14,6 +14,7 @@ export class Page extends HybridPage {
 
     const itemTypes: PageTypes[] = [
       'agents',
+      'adrs',
       'events',
       'commands',
       'queries',