@eventcatalog/core 3.7.2 → 3.8.0

package/eventcatalog/src/stores/sidebar-store/state.ts

@@ -7,6 +7,7 @@ import { getFlows } from '@utils/collections/flows';
 import { getUsers } from '@utils/collections/users';
 import { getTeams } from '@utils/collections/teams';
 import { getDiagrams } from '@utils/collections/diagrams';
+import { getDataProducts } from '@utils/collections/data-products';
 import { buildUrl } from '@utils/url-builder';
 import type { NavigationData, NavNode, ChildRef } from './builders/shared';
 import { buildDomainNode } from './builders/domain';
@@ -14,6 +15,7 @@ import { buildServiceNode } from './builders/service';
 import { buildMessageNode } from './builders/message';
 import { buildContainerNode } from './builders/container';
 import { buildFlowNode } from './builders/flow';
+import { buildDataProductNode } from './builders/data-product';
 import config from '@config';
 import { getDesigns } from '@utils/collections/designs';
 import { getChannels } from '@utils/collections/channels';
@@ -31,19 +33,31 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     return memoryCache;
   }
 
-  const [domains, services, { events, commands, queries }, containers, flows, users, teams, designs, channels, diagrams] =
-    await Promise.all([
-      getDomains({ getAllVersions: false, includeServicesInSubdomains: false }),
-      getServices({ getAllVersions: false }),
-      getMessages({ getAllVersions: false }),
-      getContainers({ getAllVersions: false }),
-      getFlows({ getAllVersions: false }),
-      getUsers(),
-      getTeams(),
-      getDesigns(),
-      getChannels({ getAllVersions: false }),
-      getDiagrams({ getAllVersions: false }),
-    ]);
+  const [
+    domains,
+    services,
+    { events, commands, queries },
+    containers,
+    flows,
+    users,
+    teams,
+    designs,
+    channels,
+    diagrams,
+    dataProducts,
+  ] = await Promise.all([
+    getDomains({ getAllVersions: false, includeServicesInSubdomains: false }),
+    getServices({ getAllVersions: false }),
+    getMessages({ getAllVersions: false }),
+    getContainers({ getAllVersions: false }),
+    getFlows({ getAllVersions: false }),
+    getUsers(),
+    getTeams(),
+    getDesigns(),
+    getChannels({ getAllVersions: false }),
+    getDiagrams({ getAllVersions: false }),
+    getDataProducts({ getAllVersions: false }),
+  ]);
 
   // Calculate derived lists to avoid extra fetches
   const allSubDomainIds = new Set(domains.flatMap((d) => (d.data.domains || []).map((sd: any) => sd.data.id)));
@@ -60,6 +74,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     flows,
     containers,
     diagrams,
+    dataProducts,
   };
 
   // Process all domains with their owners first (async)
@@ -166,6 +181,35 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     {} as Record<string, NavNode | string>
   );
 
+  // Get owners for data products
+  const dataProductWithOwners = await Promise.all(
+    dataProducts.map(async (dataProduct) => {
+      const owners = await Promise.all((dataProduct.data.owners || []).map((owner) => getOwner(owner)));
+      return { dataProduct, owners: owners.filter((o) => o !== undefined) };
+    })
+  );
+
+  const dataProductContext = {
+    events,
+    commands,
+    queries,
+    services,
+    containers,
+    channels,
+  };
+
+  const dataProductNodes = dataProductWithOwners.reduce(
+    (acc, { dataProduct, owners }) => {
+      const versionedKey = `data-product:${dataProduct.data.id}:${dataProduct.data.version}`;
+      acc[versionedKey] = buildDataProductNode(dataProduct, owners, dataProductContext);
+      if (dataProduct.data.latestVersion === dataProduct.data.version) {
+        acc[`data-product:${dataProduct.data.id}`] = versionedKey;
+      }
+      return acc;
+    },
+    {} as Record<string, NavNode | string>
+  );
+
   const designNodes = designs.reduce(
     (acc, design) => {
       acc[`design:${design.data.id}`] = {
@@ -285,6 +329,13 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     pages: containers.map((container) => `container:${container.data.id}:${container.data.version}`),
   });
 
+  const dataProductsList = createLeaf(dataProducts, {
+    type: 'item',
+    title: 'Data Products',
+    icon: 'Package',
+    pages: dataProducts.map((dataProduct) => `data-product:${dataProduct.data.id}:${dataProduct.data.version}`),
+  });
+
   const designsList = createLeaf(designs, {
     type: 'item',
     title: 'Designs',
@@ -346,6 +397,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     'list:channels',
     'list:flows',
     'list:containers',
+    'list:data-products',
     'list:designs',
     'list:people',
   ];
@@ -356,6 +408,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     channelList,
     flowsList,
     containersList,
+    dataProductsList,
     designsList,
     peopleList,
   ];
@@ -381,6 +434,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     ...(messagesList ? { 'list:messages': messagesList as NavNode } : {}),
     ...(flowsList ? { 'list:flows': flowsList } : {}),
     ...(containersList ? { 'list:containers': containersList } : {}),
+    ...(dataProductsList ? { 'list:data-products': dataProductsList } : {}),
     ...(designsList ? { 'list:designs': designsList } : {}),
     ...(teamsList ? { 'list:teams': teamsList } : {}),
     ...(usersList ? { 'list:users': usersList } : {}),
@@ -415,6 +469,7 @@ export const getNestedSideBarData = async (): Promise<NavigationData> => {
     ...messageNodes,
     ...channelNodes,
     ...containerNodes,
+    ...dataProductNodes,
     ...flowNodes,
     ...userNodes,
     ...teamNodes,

package/eventcatalog/src/styles/theme.css

@@ -103,6 +103,8 @@
   --ec-badge-design-text: 15 118 110; /* teal-700 */
   --ec-badge-channel-bg: 224 231 255; /* indigo-100 */
   --ec-badge-channel-text: 67 56 202; /* indigo-700 */
+  --ec-badge-data-product-bg: 219 234 254; /* blue-100 */
+  --ec-badge-data-product-text: 30 64 175; /* blue-800 */
   --ec-badge-default-bg: 243 244 246; /* gray-100 */
   --ec-badge-default-text: 75 85 99; /* gray-600 */
 }
@@ -199,6 +201,8 @@
   --ec-badge-design-text: 94 234 212; /* teal-300 */
   --ec-badge-channel-bg: 49 46 129 / 0.3; /* indigo-900/30 */
   --ec-badge-channel-text: 165 180 252; /* indigo-300 */
+  --ec-badge-data-product-bg: 30 64 175 / 0.3; /* blue-800/30 */
+  --ec-badge-data-product-text: 147 197 253; /* blue-300 */
   --ec-badge-default-bg: 63 63 70 / 0.3; /* zinc-700/30 */
   --ec-badge-default-text: 212 212 216; /* zinc-300 */
 }

package/eventcatalog/src/styles/themes/forest.css

@@ -97,6 +97,8 @@
   --ec-badge-design-text: 22 101 52; /* green-800 */
   --ec-badge-channel-bg: 224 231 255; /* indigo-100 */
   --ec-badge-channel-text: 67 56 202; /* indigo-700 */
+  --ec-badge-data-product-bg: 219 234 254; /* blue-100 */
+  --ec-badge-data-product-text: 30 64 175; /* blue-800 */
   --ec-badge-default-bg: 240 253 244; /* green-50 */
   --ec-badge-default-text: 75 85 99; /* gray-600 */
 }
@@ -188,6 +190,8 @@
   --ec-badge-design-text: 134 239 172; /* green-300 */
   --ec-badge-channel-bg: 49 46 129 / 0.3; /* indigo-900/30 */
   --ec-badge-channel-text: 165 180 252; /* indigo-300 */
+  --ec-badge-data-product-bg: 30 64 175 / 0.3; /* blue-800/30 */
+  --ec-badge-data-product-text: 147 197 253; /* blue-300 */
   --ec-badge-default-bg: 55 65 81 / 0.3; /* gray-700/30 */
   --ec-badge-default-text: 209 213 219; /* gray-300 */
 }

package/eventcatalog/src/styles/themes/ocean.css

@@ -97,6 +97,8 @@
   --ec-badge-design-text: 15 118 110; /* teal-700 */
   --ec-badge-channel-bg: 224 231 255; /* indigo-100 */
   --ec-badge-channel-text: 67 56 202; /* indigo-700 */
+  --ec-badge-data-product-bg: 219 234 254; /* blue-100 */
+  --ec-badge-data-product-text: 30 64 175; /* blue-800 */
   --ec-badge-default-bg: 240 253 250; /* teal-50 */
   --ec-badge-default-text: 71 85 105; /* slate-600 */
 }
@@ -193,6 +195,8 @@
   --ec-badge-design-text: 94 234 212; /* teal-300 */
   --ec-badge-channel-bg: 49 46 129 / 0.3; /* indigo-900/30 */
   --ec-badge-channel-text: 165 180 252; /* indigo-300 */
+  --ec-badge-data-product-bg: 30 64 175 / 0.3; /* blue-800/30 */
+  --ec-badge-data-product-text: 147 197 253; /* blue-300 */
   --ec-badge-default-bg: 51 65 85 / 0.3; /* slate-700/30 */
   --ec-badge-default-text: 203 213 225; /* slate-300 */
 }

package/eventcatalog/src/styles/themes/sapphire.css

@@ -97,6 +97,8 @@
   --ec-badge-design-text: 37 99 235; /* blue-600 */
   --ec-badge-channel-bg: 224 231 255; /* indigo-100 */
   --ec-badge-channel-text: 67 56 202; /* indigo-700 */
+  --ec-badge-data-product-bg: 219 234 254; /* blue-100 */
+  --ec-badge-data-product-text: 30 64 175; /* blue-800 */
   --ec-badge-default-bg: 239 246 255; /* blue-50 */
   --ec-badge-default-text: 71 85 105; /* slate-600 */
 }
@@ -188,6 +190,8 @@
   --ec-badge-design-text: 147 197 253; /* blue-300 */
   --ec-badge-channel-bg: 49 46 129 / 0.3; /* indigo-900/30 */
   --ec-badge-channel-text: 165 180 252; /* indigo-300 */
+  --ec-badge-data-product-bg: 30 64 175 / 0.3; /* blue-800/30 */
+  --ec-badge-data-product-text: 147 197 253; /* blue-300 */
   --ec-badge-default-bg: 51 65 85 / 0.3; /* slate-700/30 */
   --ec-badge-default-text: 203 213 225; /* slate-300 */
 }

package/eventcatalog/src/styles/themes/sunset.css

@@ -97,6 +97,8 @@
   --ec-badge-design-text: 234 88 12; /* orange-600 */
   --ec-badge-channel-bg: 224 231 255; /* indigo-100 */
   --ec-badge-channel-text: 67 56 202; /* indigo-700 */
+  --ec-badge-data-product-bg: 219 234 254; /* blue-100 */
+  --ec-badge-data-product-text: 30 64 175; /* blue-800 */
   --ec-badge-default-bg: 255 247 237; /* orange-50 */
   --ec-badge-default-text: 82 82 82; /* neutral-600 */
 }
@@ -188,6 +190,8 @@
   --ec-badge-design-text: 253 186 116; /* orange-300 */
   --ec-badge-channel-bg: 49 46 129 / 0.3; /* indigo-900/30 */
   --ec-badge-channel-text: 165 180 252; /* indigo-300 */
+  --ec-badge-data-product-bg: 30 64 175 / 0.3; /* blue-800/30 */
+  --ec-badge-data-product-text: 147 197 253; /* blue-300 */
   --ec-badge-default-bg: 64 64 64 / 0.3; /* neutral-700/30 */
   --ec-badge-default-text: 212 212 212; /* neutral-300 */
 }

package/eventcatalog/src/types/index.ts

@@ -8,7 +8,8 @@ export type CollectionTypes =
   | 'channels'
   | 'entities'
   | 'containers'
-  | 'diagrams';
+  | 'diagrams'
+  | 'data-products';
 export type CollectionMessageTypes = 'commands' | 'events' | 'queries';
 export type CollectionUserTypes = 'users';
 export type PageTypes =
@@ -21,7 +22,8 @@ export type PageTypes =
   | 'flows'
   | 'entities'
   | 'containers'
-  | 'diagrams';
+  | 'diagrams'
+  | 'data-products';
 
 export type TableConfiguration = {
   columns: {

package/eventcatalog/src/utils/collections/commands.ts

@@ -1,7 +1,8 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import path from 'path';
-import { createVersionedMap, satisfies } from './util';
+import { createVersionedMap } from './util';
+import { hydrateProducersAndConsumers } from './messages';
 import utils from '@eventcatalog/sdk';
 
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
@@ -35,10 +36,11 @@ export const getCommands = async ({ getAllVersions = true, hydrateServices = tru
   }
 
   // 1. Fetch collections in parallel
-  const [allCommands, allServices, allChannels] = await Promise.all([
+  const [allCommands, allServices, allChannels, allDataProducts] = await Promise.all([
     getCollection('commands'),
     getCollection('services'),
     getCollection('channels'),
+    getCollection('data-products'),
   ]);
 
   // 2. Build optimized maps
@@ -61,33 +63,13 @@ export const getCommands = async ({ getAllVersions = true, hydrateServices = tru
       const latestVersion = commandVersions[0]?.data.version || command.data.version;
       const versions = commandVersions.map((e) => e.data.version);
 
-      // Find Producers (Services that send this command)
-      const producers = allServices
-        .filter((service) =>
-          service.data.sends?.some((item) => {
-            if (item.id !== command.data.id) return false;
-            if (item.version === 'latest' || item.version === undefined) return command.data.version === latestVersion;
-            return satisfies(command.data.version, item.version);
-          })
-        )
-        .map((service) => {
-          if (!hydrateServices) return { id: service.data.id, version: service.data.version };
-          return service;
-        });
-
-      // Find Consumers (Services that receive this command)
-      const consumers = allServices
-        .filter((service) =>
-          service.data.receives?.some((item) => {
-            if (item.id !== command.data.id) return false;
-            if (item.version === 'latest' || item.version === undefined) return command.data.version === latestVersion;
-            return satisfies(command.data.version, item.version);
-          })
-        )
-        .map((service) => {
-          if (!hydrateServices) return { id: service.data.id, version: service.data.version };
-          return service;
-        });
+      // Find producers and consumers (services + data products)
+      const { producers, consumers } = hydrateProducersAndConsumers({
+        message: { data: { ...command.data, latestVersion } },
+        services: allServices,
+        dataProducts: allDataProducts,
+        hydrate: hydrateServices,
+      });
 
       // Find Channels
       const messageChannels = command.data.channels || [];

package/eventcatalog/src/utils/collections/containers.ts

@@ -32,7 +32,11 @@ export const getContainers = async ({ getAllVersions = true }: Props = {}): Prom
   }
 
   // 1. Fetch collections in parallel
-  const [allContainers, allServices] = await Promise.all([getCollection('containers'), getCollection('services')]);
+  const [allContainers, allServices, allDataProducts] = await Promise.all([
+    getCollection('containers'),
+    getCollection('services'),
+    getCollection('data-products'),
+  ]);
 
   // 2. Build optimized maps
   const containerMap = createVersionedMap(allContainers);
@@ -72,6 +76,24 @@ export const getContainers = async ({ getAllVersions = true }: Props = {}): Prom
         });
       });
 
+      // Find Data Products that write to this container (have it in outputs)
+      const dataProductsThatWriteToContainer = allDataProducts.filter((dataProduct) => {
+        return dataProduct.data?.outputs?.some((item) => {
+          if (item.id !== container.data.id) return false;
+          if (item.version === 'latest' || item.version === undefined) return container.data.version === latestVersion;
+          return satisfies(container.data.version, item.version);
+        });
+      });
+
+      // Find Data Products that read from this container (have it in inputs)
+      const dataProductsThatReadFromContainer = allDataProducts.filter((dataProduct) => {
+        return dataProduct.data?.inputs?.some((item) => {
+          if (item.id !== container.data.id) return false;
+          if (item.version === 'latest' || item.version === undefined) return container.data.version === latestVersion;
+          return satisfies(container.data.version, item.version);
+        });
+      });
+
       // Combine references
       const servicesThatReferenceContainer = [...new Set([...servicesThatWriteToContainer, ...servicesThatReadFromContainer])];
 
@@ -91,6 +113,8 @@ export const getContainers = async ({ getAllVersions = true }: Props = {}): Prom
           services: servicesThatReferenceContainer,
           servicesThatWriteToContainer,
           servicesThatReadFromContainer,
+          dataProductsThatWriteToContainer,
+          dataProductsThatReadFromContainer,
         },
         catalog: {
           path: path.join(container.collection, container.id.replace('/index.mdx', '')),

package/eventcatalog/src/utils/collections/data-products.ts

@@ -0,0 +1,85 @@
+import { getCollection } from 'astro:content';
+import type { CollectionEntry } from 'astro:content';
+import path from 'path';
+import { createVersionedMap, satisfies } from './util';
+
+const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
+
+export type DataProduct = CollectionEntry<'data-products'> & {
+  catalog: {
+    path: string;
+    filePath: string;
+    type: string;
+    publicPath: string;
+  };
+};
+
+interface Props {
+  getAllVersions?: boolean;
+}
+
+// cache for build time
+let memoryCache: Record<string, DataProduct[]> = {};
+
+export const getDataProducts = async ({ getAllVersions = true }: Props = {}): Promise<DataProduct[]> => {
+  // console.time('✅ New getEntities');
+  const cacheKey = getAllVersions ? 'allVersions' : 'currentVersions';
+
+  if (memoryCache[cacheKey] && memoryCache[cacheKey].length > 0) {
+    // console.timeEnd('✅ New getEntities');
+    return memoryCache[cacheKey];
+  }
+
+  // 1. Fetch collections in parallel
+  const [allDataProducts, allDomains] = await Promise.all([getCollection('data-products'), getCollection('domains')]);
+
+  // 2. Build optimized maps
+  const dataProductMap = createVersionedMap(allDataProducts);
+
+  // 3. Enrich data products
+  const processedDataProducts = await Promise.all(
+    allDataProducts.map(async (dataProduct) => {
+      // Version info
+      const dataProductVersions = dataProductMap.get(dataProduct.data.id) || [];
+      const latestVersion = dataProductVersions[0]?.data.version || dataProduct.data.version;
+      const versions = dataProductVersions.map((e) => e.data.version);
+
+      // Find Domains that reference this data product
+      const domainsThatReferenceDataProduct = allDomains.filter((domain) =>
+        domain.data['data-products']?.some((item) => {
+          if (item.id !== dataProduct.data.id) return false;
+          if (item.version === 'latest' || item.version === undefined) return dataProduct.data.version === latestVersion;
+          return satisfies(dataProduct.data.version, item.version);
+        })
+      );
+
+      const dataProductFolderName = dataProduct.id.replace('/index.mdx', '');
+
+      return {
+        ...dataProduct,
+        data: {
+          ...dataProduct.data,
+          versions,
+          latestVersion,
+          domains: domainsThatReferenceDataProduct,
+        },
+        catalog: {
+          path: path.join(dataProduct.collection, dataProductFolderName),
+          filePath: path.join(process.cwd(), 'src', 'catalog-files', dataProduct.collection, dataProductFolderName),
+          publicPath: path.join('/generated', dataProduct.collection, dataProductFolderName),
+          type: 'dataProduct',
+        },
+      };
+    })
+  );
+
+  // order them by the name of the data product
+  processedDataProducts.sort((a, b) => {
+    return (a.data.name || a.data.id).localeCompare(b.data.name || b.data.id);
+  });
+
+  memoryCache[cacheKey] = processedDataProducts;
+  // console.timeEnd('✅ New getDataProducts');
+
+  return processedDataProducts as DataProduct[];
+};

package/eventcatalog/src/utils/collections/domains.ts

@@ -80,16 +80,18 @@ export const getDomains = async ({
   }
 
   // 1. Fetch collections (always fetch messages to hydrate domain-level sends/receives)
-  const [allDomains, allServices, allEntities, allFlows, allEvents, allCommands, allQueries, allContainers] = await Promise.all([
-    getCollection('domains'),
-    getCollection('services'),
-    getCollection('entities'),
-    getCollection('flows'),
-    getCollection('events'),
-    getCollection('commands'),
-    getCollection('queries'),
-    getCollection('containers'),
-  ]);
+  const [allDomains, allServices, allEntities, allFlows, allEvents, allCommands, allQueries, allContainers, allDataProducts] =
+    await Promise.all([
+      getCollection('domains'),
+      getCollection('services'),
+      getCollection('entities'),
+      getCollection('flows'),
+      getCollection('events'),
+      getCollection('commands'),
+      getCollection('queries'),
+      getCollection('containers'),
+      getCollection('data-products'),
+    ]);
 
   const allMessages = [...allEvents, ...allCommands, ...allQueries];
   const messageMap = createVersionedMap(allMessages);
@@ -100,6 +102,7 @@ export const getDomains = async ({
   const serviceMap = createVersionedMap(allServices);
   const entityMap = createVersionedMap(allEntities);
   const flowMap = createVersionedMap(allFlows);
+  const dataProductMap = createVersionedMap(allDataProducts);
 
   // 3. Filter the domains we actually want to process/return
   const targetDomains = allDomains.filter((domain: Domain) => {
@@ -137,11 +140,17 @@ export const getDomains = async ({
               .filter((s: any) => !!s);
           }
 
+          // Hydrate data products for the subdomain
+          const subdomainDataProducts = (subDomain.data['data-products'] || [])
+            .map((dp: { id: string; version: string | undefined }) => findInMap(dataProductMap, dp.id, dp.version))
+            .filter((dp: any) => !!dp);
+
           return {
             ...subDomain,
             data: {
               ...subDomain.data,
               services: hydratedServices as any,
+              'data-products': subdomainDataProducts as any,
             },
           };
         });
@@ -158,6 +167,14 @@ export const getDomains = async ({
         .map((flow: { id: string; version: string | undefined }) => findInMap(flowMap, flow.id, flow.version))
         .filter((f): f is CollectionEntry<'flows'> => !!f);
 
+      // Resolve Data Products
+      const dataProductsInDomain = domain.data['data-products'] || [];
+      const dataProducts = dataProductsInDomain
+        .map((dataProduct: { id: string; version: string | undefined }) =>
+          findInMap(dataProductMap, dataProduct.id, dataProduct.version)
+        )
+        .filter((dp): dp is CollectionEntry<'data-products'> => !!dp);
+
       // Resolve Services for Main Domain
       const servicesInDomain = domain.data.services || [];
 
@@ -203,6 +220,7 @@ export const getDomains = async ({
           domains: subDomains as any,
           entities: entities as any,
           flows: flows as any,
+          'data-products': dataProducts as any,
           sends: domainSends as any,
           receives: domainReceives as any,
           latestVersion,

package/eventcatalog/src/utils/collections/events.ts

@@ -1,7 +1,8 @@
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import path from 'path';
-import { createVersionedMap, findInMap, satisfies } from './util';
+import { createVersionedMap } from './util';
+import { hydrateProducersAndConsumers } from './messages';
 import utils from '@eventcatalog/sdk';
 
 const PROJECT_DIR = process.env.PROJECT_DIR || process.cwd();
@@ -35,10 +36,11 @@ export const getEvents = async ({ getAllVersions = true, hydrateServices = true
   }
 
   // 1. Fetch collections in parallel
-  const [allEvents, allServices, allChannels] = await Promise.all([
+  const [allEvents, allServices, allChannels, allDataProducts] = await Promise.all([
     getCollection('events'),
     getCollection('services'),
     getCollection('channels'),
+    getCollection('data-products'),
   ]);
 
   // 2. Build optimized maps
@@ -64,33 +66,13 @@ export const getEvents = async ({ getAllVersions = true, hydrateServices = true
       const latestVersion = eventVersions[0]?.data.version || event.data.version;
       const versions = eventVersions.map((e) => e.data.version);
 
-      // Find Producers (Services that send this event)
-      const producers = allServices
-        .filter((service) =>
-          service.data.sends?.some((item) => {
-            if (item.id !== event.data.id) return false;
-            if (item.version === 'latest' || item.version === undefined) return event.data.version === latestVersion;
-            return satisfies(event.data.version, item.version);
-          })
-        )
-        .map((service) => {
-          if (!hydrateServices) return { id: service.data.id, version: service.data.version };
-          return service;
-        });
-
-      // Find Consumers (Services that receive this event)
-      const consumers = allServices
-        .filter((service) =>
-          service.data.receives?.some((item) => {
-            if (item.id !== event.data.id) return false;
-            if (item.version === 'latest' || item.version === undefined) return event.data.version === latestVersion;
-            return satisfies(event.data.version, item.version);
-          })
-        )
-        .map((service) => {
-          if (!hydrateServices) return { id: service.data.id, version: service.data.version };
-          return service;
-        });
+      // Find producers and consumers (services + data products)
+      const { producers, consumers } = hydrateProducersAndConsumers({
+        message: { data: { ...event.data, latestVersion } },
+        services: allServices,
+        dataProducts: allDataProducts,
+        hydrate: hydrateServices,
+      });
 
       // Find Channels
       const messageChannels = event.data.channels || [];

package/eventcatalog/src/utils/collections/icons.ts

@@ -10,6 +10,7 @@ import {
   ArrowsRightLeftIcon,
   VariableIcon,
   MapIcon,
+  CubeIcon,
 } from '@heroicons/react/24/outline';
 import { BookText, Box, DatabaseIcon } from 'lucide-react';
 
@@ -43,6 +44,8 @@ export const getIconForCollection = (collection: string) => {
       return Box;
     case 'containers':
       return DatabaseIcon;
+    case 'data-products':
+      return CubeIcon;
     default:
       return ServerIcon;
   }
@@ -74,6 +77,8 @@ export const getColorAndIconForCollection = (collection: string) => {
       return { color: 'yellow', Icon: icon };
     case 'services':
       return { color: 'pink', Icon: icon };
+    case 'data-products':
+      return { color: 'cyan', Icon: icon };
     default:
       return { color: 'gray', Icon: icon };
   }