@eventcatalog/core 4.0.3 → 4.0.5

package/dist/analytics/analytics.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(analytics_exports);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.0.3";
+var version = "4.0.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-5OGYWSP3.js";
-import "../chunk-K54LSZNF.js";
+} from "../chunk-P4JJRN7P.js";
+import "../chunk-3RHS7TFM.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -140,7 +140,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "4.0.3";
+var version = "4.0.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,9 +1,9 @@
 import {
   log_build_default
-} from "../chunk-UXP5LLH2.js";
-import "../chunk-5OGYWSP3.js";
+} from "../chunk-YGSPS7DC.js";
+import "../chunk-P4JJRN7P.js";
 import "../chunk-DAOXTQVS.js";
-import "../chunk-K54LSZNF.js";
+import "../chunk-3RHS7TFM.js";
 import "../chunk-6QENHZZP.js";
 export {
   log_build_default as default

package/dist/{chunk-K54LSZNF.js → chunk-3RHS7TFM.js}

@@ -1,5 +1,5 @@
 // package.json
-var version = "4.0.3";
+var version = "4.0.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/{chunk-63J5GUOH.js → chunk-KDWSGOTX.js}

@@ -1,6 +1,6 @@
 import {
   logger
-} from "./chunk-2CTETYS7.js";
+} from "./chunk-VENVGFLE.js";
 import {
   cleanup,
   getEventCatalogConfigFile

package/dist/{chunk-5OGYWSP3.js → chunk-P4JJRN7P.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-K54LSZNF.js";
+} from "./chunk-3RHS7TFM.js";
 
 // src/analytics/analytics.js
 import os from "os";

package/dist/{chunk-2CTETYS7.js → chunk-VENVGFLE.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-K54LSZNF.js";
+} from "./chunk-3RHS7TFM.js";
 
 // src/utils/cli-logger.ts
 import pc from "picocolors";

package/dist/{chunk-UXP5LLH2.js → chunk-YGSPS7DC.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-5OGYWSP3.js";
+} from "./chunk-P4JJRN7P.js";
 import {
   countResources,
   serializeCounts

package/dist/constants.cjs

@@ -25,7 +25,7 @@ __export(constants_exports, {
 module.exports = __toCommonJS(constants_exports);
 
 // package.json
-var version = "4.0.3";
+var version = "4.0.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-K54LSZNF.js";
+} from "./chunk-3RHS7TFM.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -144,7 +144,7 @@ var verifyRequiredFieldsAreInCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.0.3";
+var version = "4.0.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -1,16 +1,16 @@
 import {
   log_build_default
-} from "./chunk-UXP5LLH2.js";
+} from "./chunk-YGSPS7DC.js";
 import {
   runMigrations
 } from "./chunk-XUAF2H54.js";
 import "./chunk-CA4U2JP7.js";
 import {
   generate
-} from "./chunk-63J5GUOH.js";
+} from "./chunk-KDWSGOTX.js";
 import {
   logger
-} from "./chunk-2CTETYS7.js";
+} from "./chunk-VENVGFLE.js";
 import {
   resolve_catalog_dependencies_default
 } from "./chunk-LHR4G2UO.js";
@@ -20,7 +20,7 @@ import {
 import {
   watch
 } from "./chunk-O3Y2G6CY.js";
-import "./chunk-5OGYWSP3.js";
+import "./chunk-P4JJRN7P.js";
 import "./chunk-DAOXTQVS.js";
 import {
   catalogToAstro
@@ -28,7 +28,7 @@ import {
 import "./chunk-VC6VUJIX.js";
 import {
   VERSION
-} from "./chunk-K54LSZNF.js";
+} from "./chunk-3RHS7TFM.js";
 import {
   linkCoreNodeModules,
   resolveInstalledCoreNodeModules

package/dist/generate.cjs

@@ -108,7 +108,7 @@ var getEventCatalogConfigFile = async (projectDirectory) => {
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.0.3";
+var version = "4.0.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/generate.js

@@ -1,8 +1,8 @@
 import {
   generate
-} from "./chunk-63J5GUOH.js";
-import "./chunk-2CTETYS7.js";
-import "./chunk-K54LSZNF.js";
+} from "./chunk-KDWSGOTX.js";
+import "./chunk-VENVGFLE.js";
+import "./chunk-3RHS7TFM.js";
 import "./chunk-6QENHZZP.js";
 export {
   generate

package/dist/utils/cli-logger.cjs

@@ -36,7 +36,7 @@ module.exports = __toCommonJS(cli_logger_exports);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "4.0.3";
+var version = "4.0.5";
 
 // src/constants.ts
 var VERSION = version;

package/dist/utils/cli-logger.js

@@ -1,7 +1,7 @@
 import {
   logger
-} from "../chunk-2CTETYS7.js";
-import "../chunk-K54LSZNF.js";
+} from "../chunk-VENVGFLE.js";
+import "../chunk-3RHS7TFM.js";
 export {
   logger
 };

package/eventcatalog/src/components/Tables/Discover/DiscoverTable.tsx

@@ -20,6 +20,7 @@ import { resolveIconUrl } from '@utils/icon';
 import { FilterDropdown, CheckboxItem } from './FilterComponents';
 import { getDiscoverColumns } from './columns';
 import { formatAdrStatus, type AdrStatus } from '@utils/collections/adr-constants';
+import { buildDiscoverFilterSearch, filterKnownValues, parseDiscoverFilterSearch } from './url-filters';
 
 export type CollectionType =
   | 'agents'
@@ -53,6 +54,7 @@ export interface DiscoverTableData {
   hasServices?: boolean;
   hasFlows?: boolean;
   isSubdomain?: boolean;
+  parentDomains?: Array<{ id: string; name: string; version: string }>;
   data: {
     id: string;
     name: string;
@@ -83,6 +85,7 @@ export interface DiscoverTableData {
     model?: any;
     agents?: Array<any>;
     services?: Array<any>;
+    domains?: Array<any>;
     flows?: Array<any>;
     servicesThatWriteToContainer?: Array<any>;
     servicesThatReadFromContainer?: Array<any>;
@@ -161,6 +164,14 @@ const AgentProviderIcon = ({ provider, className }: { provider: string; classNam
   return <img src={providerIconUrls.default} alt="" className={className} loading="lazy" />;
 };
 
+const areStringArraysEqual = (left: string[], right: string[]) =>
+  left.length === right.length && left.every((value, index) => value === right[index]);
+
+const DOMAIN_TYPE_OPTIONS = [
+  { id: 'root', label: 'Root domains' },
+  { id: 'subdomain', label: 'Subdomains' },
+];
+
 export function DiscoverTable<T extends DiscoverTableData>({
   data: initialData,
   collectionType,
@@ -185,34 +196,6 @@ export function DiscoverTable<T extends DiscoverTableData>({
     () => getDiscoverColumns(collectionType, tableConfiguration ?? { columns: {} }),
     [collectionType, tableConfiguration]
   );
-  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
-  const [sorting, setSorting] = useState<SortingState>([]);
-  const [tableFilter, setTableFilter] = useState('');
-  const PAGE_SIZE_OPTIONS = [10, 25, 50, 100];
-  const PAGE_SIZE_STORAGE_KEY = 'eventcatalog-discover-page-size';
-  const [pageSize, setPageSize] = useState<number>(() => {
-    if (typeof window === 'undefined') return 10;
-    const stored = Number(window.localStorage.getItem(PAGE_SIZE_STORAGE_KEY));
-    return PAGE_SIZE_OPTIONS.includes(stored) ? stored : 10;
-  });
-  useEffect(() => {
-    if (typeof window !== 'undefined') {
-      window.localStorage.setItem(PAGE_SIZE_STORAGE_KEY, String(pageSize));
-    }
-  }, [pageSize]);
-  const [showOnlyLatest, setShowOnlyLatest] = useState(true);
-  const [onlyShowDrafts, setOnlyShowDrafts] = useState(false);
-  const [selectedDomains, setSelectedDomains] = useState<string[]>([]);
-  const [selectedOwners, setSelectedOwners] = useState<string[]>([]);
-  const [selectedProducers, setSelectedProducers] = useState<string[]>([]);
-  const [selectedConsumers, setSelectedConsumers] = useState<string[]>([]);
-  const [selectedAgentProviders, setSelectedAgentProviders] = useState<string[]>([]);
-  const [selectedAgentModels, setSelectedAgentModels] = useState<string[]>([]);
-  const [selectedBadges, setSelectedBadges] = useState<string[]>([]);
-  const [selectedProperties, setSelectedProperties] = useState<string[]>([]);
-  const [selectedStatuses, setSelectedStatuses] = useState<string[]>([]);
-  const selectedKind = collectionKinds.find((kind) => kind.id === collectionType);
-
   // Collect unique badges from all items
   const allBadges = useMemo(() => {
     const badgeMap = new Map<string, { content: string; backgroundColor?: string; textColor?: string; count: number }>();
@@ -234,6 +217,179 @@ export function DiscoverTable<T extends DiscoverTableData>({
     });
     return Array.from(badgeMap.values()).sort((a, b) => b.count - a.count);
   }, [initialData]);
+  const statusCounts = useMemo(() => {
+    const counts: Record<string, number> = {};
+    initialData.forEach((item) => {
+      const status = item.data.status;
+      if (status) counts[status] = (counts[status] || 0) + 1;
+    });
+    return counts;
+  }, [initialData]);
+
+  const statusOptions = useMemo(
+    () =>
+      Object.keys(statusCounts)
+        .map((status) => ({
+          id: status,
+          name: formatAdrStatus(status as AdrStatus),
+          count: statusCounts[status],
+        }))
+        .sort((a, b) => a.name.localeCompare(b.name)),
+    [statusCounts]
+  );
+  const [initialUrlFilters] = useState(() =>
+    parseDiscoverFilterSearch(typeof window === 'undefined' ? '' : window.location.search)
+  );
+  const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
+  const [sorting, setSorting] = useState<SortingState>([]);
+  const [tableFilter, setTableFilter] = useState(initialUrlFilters.q);
+  const PAGE_SIZE_OPTIONS = [10, 25, 50, 100];
+  const PAGE_SIZE_STORAGE_KEY = 'eventcatalog-discover-page-size';
+  const [pageSize, setPageSize] = useState<number>(() => {
+    if (typeof window === 'undefined') return 10;
+    const stored = Number(window.localStorage.getItem(PAGE_SIZE_STORAGE_KEY));
+    return PAGE_SIZE_OPTIONS.includes(stored) ? stored : 10;
+  });
+  useEffect(() => {
+    if (typeof window !== 'undefined') {
+      window.localStorage.setItem(PAGE_SIZE_STORAGE_KEY, String(pageSize));
+    }
+  }, [pageSize]);
+  const [showOnlyLatest, setShowOnlyLatest] = useState(initialUrlFilters.showOnlyLatest);
+  const [onlyShowDrafts, setOnlyShowDrafts] = useState(initialUrlFilters.onlyShowDrafts);
+  const [selectedDomains, setSelectedDomains] = useState<string[]>(() =>
+    showDomainsFilter ? filterKnownValues(initialUrlFilters.domains, new Set(domains.map((domain) => domain.id))) : []
+  );
+  const [selectedOwners, setSelectedOwners] = useState<string[]>(() =>
+    showOwnersFilter ? filterKnownValues(initialUrlFilters.owners, new Set(owners.map((owner) => owner.id))) : []
+  );
+  const [selectedProducers, setSelectedProducers] = useState<string[]>(() =>
+    showProducersFilter ? filterKnownValues(initialUrlFilters.producers, new Set(producers.map((producer) => producer.id))) : []
+  );
+  const [selectedConsumers, setSelectedConsumers] = useState<string[]>(() =>
+    showConsumersFilter ? filterKnownValues(initialUrlFilters.consumers, new Set(consumers.map((consumer) => consumer.id))) : []
+  );
+  const [selectedAgentProviders, setSelectedAgentProviders] = useState<string[]>(() =>
+    collectionType === 'agents'
+      ? filterKnownValues(initialUrlFilters.agentProviders, new Set(agentProviders.map((provider) => provider.id)))
+      : []
+  );
+  const [selectedAgentModels, setSelectedAgentModels] = useState<string[]>(() =>
+    collectionType === 'agents'
+      ? filterKnownValues(initialUrlFilters.agentModels, new Set(agentModels.map((model) => model.id)))
+      : []
+  );
+  const [selectedDomainTypes, setSelectedDomainTypes] = useState<string[]>(() =>
+    collectionType === 'domains'
+      ? initialUrlFilters.domainTypes.length > 0
+        ? filterKnownValues(initialUrlFilters.domainTypes, new Set(DOMAIN_TYPE_OPTIONS.map((option) => option.id)))
+        : ['root']
+      : []
+  );
+  const [selectedBadges, setSelectedBadges] = useState<string[]>(() =>
+    filterKnownValues(initialUrlFilters.badges, new Set(allBadges.map((badge) => badge.content)))
+  );
+  const [selectedProperties, setSelectedProperties] = useState<string[]>(() =>
+    filterKnownValues(initialUrlFilters.properties, new Set(propertyOptions.map((property) => property.id)))
+  );
+  const [selectedStatuses, setSelectedStatuses] = useState<string[]>(() =>
+    collectionType === 'adrs'
+      ? filterKnownValues(initialUrlFilters.statuses, new Set(statusOptions.map((status) => status.id)))
+      : []
+  );
+  const selectedKind = collectionKinds.find((kind) => kind.id === collectionType);
+  const knownFilterValues = useMemo(
+    () => ({
+      domains: showDomainsFilter ? new Set(domains.map((domain) => domain.id)) : new Set<string>(),
+      owners: showOwnersFilter ? new Set(owners.map((owner) => owner.id)) : new Set<string>(),
+      producers: showProducersFilter ? new Set(producers.map((producer) => producer.id)) : new Set<string>(),
+      consumers: showConsumersFilter ? new Set(consumers.map((consumer) => consumer.id)) : new Set<string>(),
+      agentProviders: collectionType === 'agents' ? new Set(agentProviders.map((provider) => provider.id)) : new Set<string>(),
+      agentModels: collectionType === 'agents' ? new Set(agentModels.map((model) => model.id)) : new Set<string>(),
+      domainTypes: collectionType === 'domains' ? new Set(DOMAIN_TYPE_OPTIONS.map((option) => option.id)) : new Set<string>(),
+      badges: new Set(allBadges.map((badge) => badge.content)),
+      properties: new Set(propertyOptions.map((property) => property.id)),
+      statuses: collectionType === 'adrs' ? new Set(statusOptions.map((status) => status.id)) : new Set<string>(),
+    }),
+    [
+      agentModels,
+      agentProviders,
+      allBadges,
+      collectionType,
+      consumers,
+      domains,
+      owners,
+      producers,
+      propertyOptions,
+      showConsumersFilter,
+      showDomainsFilter,
+      showOwnersFilter,
+      showProducersFilter,
+      statusOptions,
+    ]
+  );
+  const currentUrlFilters = useMemo(
+    () => ({
+      q: tableFilter,
+      domains: selectedDomains,
+      owners: selectedOwners,
+      producers: selectedProducers,
+      consumers: selectedConsumers,
+      agentProviders: selectedAgentProviders,
+      agentModels: selectedAgentModels,
+      badges: selectedBadges,
+      properties: selectedProperties,
+      statuses: selectedStatuses,
+      domainTypes: selectedDomainTypes,
+      showOnlyLatest,
+      onlyShowDrafts,
+    }),
+    [
+      onlyShowDrafts,
+      selectedAgentModels,
+      selectedAgentProviders,
+      selectedBadges,
+      selectedConsumers,
+      selectedDomainTypes,
+      selectedDomains,
+      selectedOwners,
+      selectedProducers,
+      selectedProperties,
+      selectedStatuses,
+      showOnlyLatest,
+      tableFilter,
+    ]
+  );
+
+  useEffect(() => {
+    const pruneState = (values: string[], knownValues: Set<string>) => {
+      const nextValues = filterKnownValues(values, knownValues);
+      return areStringArraysEqual(values, nextValues) ? values : nextValues;
+    };
+
+    setSelectedDomains((values) => pruneState(values, knownFilterValues.domains));
+    setSelectedOwners((values) => pruneState(values, knownFilterValues.owners));
+    setSelectedProducers((values) => pruneState(values, knownFilterValues.producers));
+    setSelectedConsumers((values) => pruneState(values, knownFilterValues.consumers));
+    setSelectedAgentProviders((values) => pruneState(values, knownFilterValues.agentProviders));
+    setSelectedAgentModels((values) => pruneState(values, knownFilterValues.agentModels));
+    setSelectedDomainTypes((values) => pruneState(values, knownFilterValues.domainTypes));
+    setSelectedBadges((values) => pruneState(values, knownFilterValues.badges));
+    setSelectedProperties((values) => pruneState(values, knownFilterValues.properties));
+    setSelectedStatuses((values) => pruneState(values, knownFilterValues.statuses));
+  }, [knownFilterValues]);
+
+  useEffect(() => {
+    if (typeof window === 'undefined') return;
+
+    const nextSearch = buildDiscoverFilterSearch(currentUrlFilters, window.location.search);
+    const nextUrl = `${window.location.pathname}${nextSearch}${window.location.hash}`;
+    const currentUrl = `${window.location.pathname}${window.location.search}${window.location.hash}`;
+
+    if (nextUrl !== currentUrl) {
+      window.history.replaceState(window.history.state, '', nextUrl);
+    }
+  }, [currentUrlFilters]);
 
   // Filter data based on all filter states
   const filteredData = useMemo(() => {
@@ -264,6 +420,15 @@ export function DiscoverTable<T extends DiscoverTableData>({
         }
       }
 
+      // Domain type filter
+      if (collectionType === 'domains' && selectedDomainTypes.length > 0) {
+        const matchesRoot = selectedDomainTypes.includes('root') && !row.isSubdomain;
+        const matchesSubdomain = selectedDomainTypes.includes('subdomain') && row.isSubdomain;
+        if (!matchesRoot && !matchesSubdomain) {
+          return false;
+        }
+      }
+
       // Owner filter
       if (selectedOwners.length > 0) {
         const itemOwners = row.owners || [];
@@ -403,6 +568,7 @@ export function DiscoverTable<T extends DiscoverTableData>({
     selectedOwners,
     selectedProducers,
     selectedConsumers,
+    selectedDomainTypes,
     selectedAgentProviders,
     selectedAgentModels,
     selectedBadges,
@@ -514,27 +680,18 @@ export function DiscoverTable<T extends DiscoverTableData>({
     return counts;
   }, [initialData]);
 
-  const statusCounts = useMemo(() => {
-    const counts: Record<string, number> = {};
+  const domainTypeCounts = useMemo(() => {
+    const counts: Record<string, number> = { root: 0, subdomain: 0 };
     initialData.forEach((item) => {
-      const status = item.data.status;
-      if (status) counts[status] = (counts[status] || 0) + 1;
+      if (item.isSubdomain) {
+        counts.subdomain++;
+      } else {
+        counts.root++;
+      }
     });
     return counts;
   }, [initialData]);
 
-  const statusOptions = useMemo(
-    () =>
-      Object.keys(statusCounts)
-        .map((status) => ({
-          id: status,
-          name: formatAdrStatus(status as AdrStatus),
-          count: statusCounts[status],
-        }))
-        .sort((a, b) => a.name.localeCompare(b.name)),
-    [statusCounts]
-  );
-
   const toggleDomain = (domainId: string) => {
     setSelectedDomains((prev) => (prev.includes(domainId) ? prev.filter((id) => id !== domainId) : [...prev, domainId]));
   };
@@ -561,6 +718,12 @@ export function DiscoverTable<T extends DiscoverTableData>({
     setSelectedAgentModels((prev) => (prev.includes(modelId) ? prev.filter((id) => id !== modelId) : [...prev, modelId]));
   };
 
+  const toggleDomainType = (domainType: string) => {
+    setSelectedDomainTypes((prev) =>
+      prev.includes(domainType) ? prev.filter((id) => id !== domainType) : [...prev, domainType]
+    );
+  };
+
   const toggleBadge = (badgeContent: string) => {
     setSelectedBadges((prev) => (prev.includes(badgeContent) ? prev.filter((b) => b !== badgeContent) : [...prev, badgeContent]));
   };
@@ -576,7 +739,7 @@ export function DiscoverTable<T extends DiscoverTableData>({
   const navigateToKind = (kindId: CollectionType) => {
     const selectedKind = collectionKinds.find((kind) => kind.id === kindId);
     if (!selectedKind || selectedKind.id === collectionType) return;
-    window.location.href = selectedKind.href;
+    window.location.href = `${selectedKind.href}${buildDiscoverFilterSearch(currentUrlFilters)}`;
   };
 
   const clearAllFilters = () => {
@@ -586,6 +749,7 @@ export function DiscoverTable<T extends DiscoverTableData>({
     setSelectedConsumers([]);
     setSelectedAgentProviders([]);
     setSelectedAgentModels([]);
+    setSelectedDomainTypes(collectionType === 'domains' ? ['root'] : []);
     setSelectedBadges([]);
     setSelectedStatuses([]);
     setSelectedProperties([]);
@@ -602,11 +766,13 @@ export function DiscoverTable<T extends DiscoverTableData>({
     selectedConsumers.length +
     selectedAgentProviders.length +
     selectedAgentModels.length +
+    selectedDomainTypes.length +
     selectedBadges.length +
     selectedStatuses.length +
     selectedProperties.length +
     (!showOnlyLatest ? 1 : 0) +
-    (onlyShowDrafts ? 1 : 0);
+    (onlyShowDrafts ? 1 : 0) +
+    (tableFilter ? 1 : 0);
 
   // Get selected domain names for display
   const selectedDomainNames = selectedDomains.map((id) => domains.find((d) => d.id === id)?.name || id);
@@ -624,6 +790,9 @@ export function DiscoverTable<T extends DiscoverTableData>({
     (id) => agentProviders.find((provider) => provider.id === id)?.name || id
   );
   const selectedAgentModelNames = selectedAgentModels.map((id) => agentModels.find((model) => model.id === id)?.name || id);
+  const selectedDomainTypeNames = selectedDomainTypes.map(
+    (id) => DOMAIN_TYPE_OPTIONS.find((option) => option.id === id)?.label || id
+  );
   const selectedStatusNames = selectedStatuses.map((id) => statusOptions.find((status) => status.id === id)?.name || id);
 
   // Filter producers/consumers to only show those with count > 0
@@ -735,6 +904,33 @@ export function DiscoverTable<T extends DiscoverTableData>({
 
           {/* Catalog Filters Section */}
           <div className="space-y-3">
+            {collectionType === 'domains' && (
+              <div>
+                <label className="block text-xs font-medium text-[rgb(var(--ec-page-text)/0.8)] mb-1.5">
+                  Filter by Domain type
+                </label>
+                <FilterDropdown
+                  label="All domains"
+                  selectedItems={selectedDomainTypeNames}
+                  onClear={() => setSelectedDomainTypes([])}
+                  onRemoveItem={(label) => {
+                    const option = DOMAIN_TYPE_OPTIONS.find((item) => item.label === label);
+                    if (option) toggleDomainType(option.id);
+                  }}
+                >
+                  {DOMAIN_TYPE_OPTIONS.map((option) => (
+                    <CheckboxItem
+                      key={option.id}
+                      label={option.label}
+                      checked={selectedDomainTypes.includes(option.id)}
+                      onChange={() => toggleDomainType(option.id)}
+                      count={domainTypeCounts[option.id] || 0}
+                    />
+                  ))}
+                </FilterDropdown>
+              </div>
+            )}
+
             {collectionType === 'agents' && (filteredAgentProviders.length > 0 || filteredAgentModels.length > 0) && (
               <>
                 {filteredAgentProviders.length > 0 && (

package/eventcatalog/src/components/Tables/Discover/columns.tsx

@@ -19,6 +19,7 @@ import { favoritesStore, toggleFavorite, type FavoriteItem } from '../../../stor
 import type { DiscoverTableData, CollectionType } from './DiscoverTable';
 import type { TableConfiguration } from '@types';
 import { formatAdrDate, isAdrCollection } from '@utils/collections/adr-constants';
+import { CornerDownRight } from 'lucide-react';
 
 const columnHelper = createColumnHelper<DiscoverTableData>();
 
@@ -121,22 +122,48 @@ const ResourceNameCell = ({ item }: { item: DiscoverTableData }) => {
   const { color, Icon } = getColorAndIconForCollection(item.collection);
   const resourceIcon = item.data.icon;
   const resourceIconUrl = isIconPath(resourceIcon) ? resolveIconUrl(resourceIcon) : null;
+  const isDomain = item.collection === 'domains';
+  const subdomains = isDomain ? item.data.domains || [] : [];
 
   return (
-    <a
-      href={buildUrl(`/docs/${item.collection}/${item.data.id}/${item.data.version}`)}
-      className="group inline-flex items-center gap-2.5 hover:text-[rgb(var(--ec-accent))] transition-colors"
-    >
-      {resourceIconUrl ? (
-        <img src={resourceIconUrl} alt="" className="h-5 w-5 flex-shrink-0 rounded-sm object-contain" />
-      ) : (
-        <Icon className={`h-4 w-4 flex-shrink-0 ${getCollectionTextColorClass(color, 'text-[rgb(var(--ec-icon-color))]')}`} />
+    <div className="flex min-w-0 flex-col gap-2">
+      <a
+        href={buildUrl(`/docs/${item.collection}/${item.data.id}/${item.data.version}`)}
+        className="group inline-flex items-center gap-2.5 hover:text-[rgb(var(--ec-accent))] transition-colors"
+      >
+        {resourceIconUrl ? (
+          <img src={resourceIconUrl} alt="" className="h-5 w-5 flex-shrink-0 rounded-sm object-contain" />
+        ) : (
+          <Icon className={`h-4 w-4 flex-shrink-0 ${getCollectionTextColorClass(color, 'text-[rgb(var(--ec-icon-color))]')}`} />
+        )}
+        <span className="text-sm font-semibold text-[rgb(var(--ec-page-text))] group-hover:text-[rgb(var(--ec-accent))]">
+          {item.data.name}
+        </span>
+        {!isLatestVersion && <span className="text-xs text-[rgb(var(--ec-icon-color))]">v{item.data.version}</span>}
+        {item.isSubdomain && (
+          <span className="rounded-full border border-[rgb(var(--ec-page-border))] px-1.5 py-0.5 text-[10px] font-medium text-[rgb(var(--ec-page-text-muted))]">
+            Subdomain
+          </span>
+        )}
+      </a>
+
+      {subdomains.length > 0 && (
+        <div className="flex flex-col gap-1 pl-6">
+          {subdomains.map((domain: any) => (
+            <a
+              key={`${domain.data.id}-${domain.data.version}`}
+              href={buildUrl(`/docs/${domain.collection || 'domains'}/${domain.data.id}/${domain.data.version}`)}
+              className="group/subdomain inline-flex w-fit items-center gap-1.5 text-xs text-[rgb(var(--ec-page-text-muted))] hover:text-[rgb(var(--ec-accent))]"
+            >
+              <CornerDownRight className="h-3.5 w-3.5 flex-shrink-0 text-[rgb(var(--ec-icon-color))] group-hover/subdomain:text-[rgb(var(--ec-accent))]" />
+              <span className="font-medium text-[rgb(var(--ec-page-text))] group-hover/subdomain:text-[rgb(var(--ec-accent))]">
+                {domain.data.name}
+              </span>
+            </a>
+          ))}
+        </div>
       )}
-      <span className="text-sm font-semibold text-[rgb(var(--ec-page-text))] group-hover:text-[rgb(var(--ec-accent))]">
-        {item.data.name}
-      </span>
-      {!isLatestVersion && <span className="text-xs text-[rgb(var(--ec-icon-color))]">v{item.data.version}</span>}
-    </a>
+    </div>
   );
 };
 

package/eventcatalog/src/components/Tables/Discover/url-filters.ts

@@ -0,0 +1,89 @@
+export interface DiscoverFilterQueryState {
+  q: string;
+  domains: string[];
+  owners: string[];
+  producers: string[];
+  consumers: string[];
+  agentProviders: string[];
+  agentModels: string[];
+  domainTypes: string[];
+  badges: string[];
+  properties: string[];
+  statuses: string[];
+  showOnlyLatest: boolean;
+  onlyShowDrafts: boolean;
+}
+
+const FILTER_PARAM_NAMES = [
+  'q',
+  'domain',
+  'owner',
+  'producer',
+  'consumer',
+  'agentProvider',
+  'agentModel',
+  'domainType',
+  'badge',
+  'property',
+  'status',
+  'latest',
+  'drafts',
+];
+
+const uniqueNonEmpty = (values: string[]) => Array.from(new Set(values.map((value) => value.trim()).filter(Boolean)));
+
+const getValues = (params: URLSearchParams, paramName: string) => uniqueNonEmpty(params.getAll(paramName));
+
+const isFalse = (value: string | null) => value === 'false' || value === '0';
+
+const isTrue = (value: string | null) => value === 'true' || value === '1';
+
+export const parseDiscoverFilterSearch = (search: string): DiscoverFilterQueryState => {
+  const params = new URLSearchParams(search);
+
+  return {
+    q: params.get('q')?.trim() ?? '',
+    domains: getValues(params, 'domain'),
+    owners: getValues(params, 'owner'),
+    producers: getValues(params, 'producer'),
+    consumers: getValues(params, 'consumer'),
+    agentProviders: getValues(params, 'agentProvider'),
+    agentModels: getValues(params, 'agentModel'),
+    domainTypes: getValues(params, 'domainType'),
+    badges: getValues(params, 'badge'),
+    properties: getValues(params, 'property'),
+    statuses: getValues(params, 'status'),
+    showOnlyLatest: !isFalse(params.get('latest')),
+    onlyShowDrafts: isTrue(params.get('drafts')),
+  };
+};
+
+export const filterKnownValues = (values: string[], knownValues: Set<string>) => values.filter((value) => knownValues.has(value));
+
+export const buildDiscoverFilterSearch = (filters: DiscoverFilterQueryState, currentSearch = '') => {
+  const params = new URLSearchParams(currentSearch);
+  FILTER_PARAM_NAMES.forEach((paramName) => params.delete(paramName));
+
+  const appendValues = (paramName: string, values: string[]) => {
+    uniqueNonEmpty(values).forEach((value) => params.append(paramName, value));
+  };
+
+  const q = filters.q.trim();
+  if (q) params.set('q', q);
+  appendValues('domain', filters.domains);
+  appendValues('owner', filters.owners);
+  appendValues('producer', filters.producers);
+  appendValues('consumer', filters.consumers);
+  appendValues('agentProvider', filters.agentProviders);
+  appendValues('agentModel', filters.agentModels);
+  appendValues('domainType', filters.domainTypes);
+  appendValues('badge', filters.badges);
+  appendValues('property', filters.properties);
+  appendValues('status', filters.statuses);
+
+  if (!filters.showOnlyLatest) params.set('latest', 'false');
+  if (filters.onlyShowDrafts) params.set('drafts', 'true');
+
+  const search = params.toString();
+  return search ? `?${search}` : '';
+};

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

@@ -93,7 +93,6 @@ const typeConfig: Record<
     propertyOptions: [
       { id: 'hasServices', label: 'Has Services' },
       { id: 'hasOwners', label: 'Has Owners' },
-      { id: 'isSubdomain', label: 'Is Subdomain' },
       { id: 'isDeprecated', label: 'Is Deprecated' },
     ],
   },
@@ -285,6 +284,21 @@ function resolvePointer(pointer: { id: string; version?: string }) {
 const allSubdomainIds = new Set(
   domains.flatMap((d: any) => (d.data?.domains || []).map((sd: any) => sd.data?.id || sd.id)).filter(Boolean)
 );
+const parentDomainsBySubdomainId = domains.reduce((parentsBySubdomain: Map<string, any[]>, domain: any) => {
+  (domain.data?.domains || []).forEach((subdomain: any) => {
+    const subdomainId = subdomain.data?.id || subdomain.id;
+    if (!subdomainId) return;
+
+    const parents = parentsBySubdomain.get(subdomainId) || [];
+    parents.push({
+      id: domain.data.id,
+      name: domain.data.name,
+      version: domain.data.version,
+    });
+    parentsBySubdomain.set(subdomainId, parents);
+  });
+  return parentsBySubdomain;
+}, new Map<string, any[]>());
 
 const isAgentLike = type === 'agents';
 const isServiceLike = type === 'services' || type === 'external-systems';
@@ -314,6 +328,7 @@ const tableData = enrichedData.map((d: any) => ({
   hasServices: type === 'domains' || type === 'systems' ? (d.data?.services || []).length > 0 : false,
   hasFlows: type === 'systems' ? (d.data?.flows || []).length > 0 : false,
   isSubdomain: type === 'domains' ? allSubdomainIds.has(d.data.id) : false,
+  parentDomains: type === 'domains' ? parentDomainsBySubdomainId.get(d.data.id) || [] : undefined,
   // Service-specific properties
   domains: isServiceOrAgentLike ? d.enrichedDomains : undefined,
   hasSpecifications: isServiceLike ? hasSpecifications(d) : false,
@@ -347,6 +362,7 @@ const tableData = enrichedData.map((d: any) => ({
     tools: d.data?.tools ?? [],
     agents: d.data?.agents?.map(mapToItem) ?? [],
     services: d.data?.services?.map(mapToItem) ?? [],
+    domains: d.data?.domains?.map(mapToItem) ?? [],
     flows: d.data?.flows?.map(mapToItem) ?? [],
     servicesThatWriteToContainer: d.data?.servicesThatWriteToContainer?.map(mapToItem) ?? [],
     servicesThatReadFromContainer: d.data?.servicesThatReadFromContainer?.map(mapToItem) ?? [],

package/package.json

@@ -7,7 +7,7 @@
   },
   "license": "SEE LICENSE IN LICENSE",
   "type": "module",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "publishConfig": {
     "access": "public"
   },