@eventcatalog/core 2.34.1 → 2.34.2

package/dist/analytics/analytics.cjs

@@ -37,7 +37,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.34.1";
+var version = "2.34.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-GUCQ43OT.js";
-import "../chunk-XOPHTY4E.js";
+} from "../chunk-FGG5ZU6C.js";
+import "../chunk-G6O5VE2Y.js";
 export {
   raiseEvent
 };

package/dist/analytics/log-build.cjs

@@ -106,7 +106,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.34.1";
+var version = "2.34.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-VU6QMU5H.js";
-import "../chunk-GUCQ43OT.js";
-import "../chunk-XOPHTY4E.js";
+} from "../chunk-QMNCFJE7.js";
+import "../chunk-FGG5ZU6C.js";
+import "../chunk-G6O5VE2Y.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-GUCQ43OT.js → chunk-FGG5ZU6C.js}

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-XOPHTY4E.js";
+} from "./chunk-G6O5VE2Y.js";
 
 // src/analytics/analytics.js
 import axios from "axios";

package/dist/{chunk-XOPHTY4E.js → chunk-G6O5VE2Y.js}

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

package/dist/{chunk-VU6QMU5H.js → chunk-QMNCFJE7.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-GUCQ43OT.js";
+} from "./chunk-FGG5ZU6C.js";
 import {
   getEventCatalogConfigFile,
   verifyRequiredFieldsAreInCatalogConfigFile

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-XOPHTY4E.js";
+} from "./chunk-G6O5VE2Y.js";
 export {
   VERSION
 };

package/dist/eventcatalog.cjs

@@ -157,7 +157,7 @@ var import_axios = __toESM(require("axios"), 1);
 var import_os = __toESM(require("os"), 1);
 
 // package.json
-var version = "2.34.1";
+var version = "2.34.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/eventcatalog.js

@@ -6,15 +6,15 @@ import {
 } from "./chunk-UKJ7F5WR.js";
 import {
   log_build_default
-} from "./chunk-VU6QMU5H.js";
-import "./chunk-GUCQ43OT.js";
+} from "./chunk-QMNCFJE7.js";
+import "./chunk-FGG5ZU6C.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
 } from "./chunk-7SI5EVOX.js";
 import {
   VERSION
-} from "./chunk-XOPHTY4E.js";
+} from "./chunk-G6O5VE2Y.js";
 import {
   isBackstagePluginEnabled,
   isEventCatalogScaleEnabled,

package/eventcatalog/src/components/MDX/NodeGraph/NodeGraph.tsx

@@ -17,6 +17,7 @@ import '@xyflow/react/dist/style.css';
 
 // Nodes and edges
 import ServiceNode from './Nodes/Service';
+import FlowNode from './Nodes/Flow';
 import EventNode from './Nodes/Event';
 import QueryNode from './Nodes/Query';
 import UserNode from './Nodes/User';
@@ -63,6 +64,7 @@ const NodeGraphBuilder = ({
   const nodeTypes = useMemo(
     () => ({
       services: ServiceNode,
+      flows: FlowNode,
       events: EventNode,
       channels: ChannelNode,
       queries: QueryNode,
@@ -240,6 +242,7 @@ const NodeGraphBuilder = ({
     const colorClasses = {
       events: 'bg-orange-600',
       services: 'bg-pink-600',
+      flows: 'bg-teal-600',
       commands: 'bg-blue-600',
       queries: 'bg-green-600',
       channels: 'bg-gray-600',

package/eventcatalog/src/components/MDX/NodeGraph/Nodes/Flow.tsx

@@ -0,0 +1,107 @@
+import type { CollectionEntry } from 'astro:content';
+import { Handle } from '@xyflow/react';
+import * as ContextMenu from '@radix-ui/react-context-menu';
+import { buildUrl } from '@utils/url-builder';
+import { getIcon } from '@utils/badges';
+
+interface Data {
+  label: string;
+  bgColor: string;
+  color: string;
+  mode: 'simple' | 'full';
+  flow: CollectionEntry<'flows'>;
+  showTarget?: boolean;
+  showSource?: boolean;
+}
+
+function classNames(...classes: any) {
+  return classes.filter(Boolean).join(' ');
+}
+
+export default function FlowNode({ data, sourcePosition, targetPosition }: any) {
+  const { mode, flow } = data as Data;
+
+  const { id, version, owners = [], name, styles } = flow.data;
+  const { node: { color = 'teal', label } = {}, icon = 'QueueListIcon' } = styles || {};
+
+  const Icon = getIcon(icon);
+  const nodeLabel = label || flow?.data?.sidebar?.badge || 'Flow';
+  const fontSize = nodeLabel.length > 10 ? '7px' : '9px';
+
+  return (
+    <ContextMenu.Root>
+      <ContextMenu.Trigger>
+        <div className={classNames(`w-full rounded-md border flex justify-start  bg-white text-black border-${color}-400`)}>
+          <div
+            className={classNames(
+              `bg-gradient-to-b from-${color}-500 to-${color}-700 relative flex items-center w-5 justify-center rounded-l-sm text-${color}-100`,
+              `border-r-[1px] border-${color}-500`
+            )}
+          >
+            {Icon && <Icon className="w-4 h-4 opacity-90 text-white absolute top-1 " />}
+            {mode === 'full' && (
+              <span
+                className={`rotate -rotate-90 w-1/2 text-center absolute bottom-1 text-[${fontSize}] text-white font-bold uppercase tracking-[3px] `}
+              >
+                {nodeLabel}
+              </span>
+            )}
+          </div>
+          <div className="p-1 min-w-60 max-w-[min-content]">
+            {targetPosition && <Handle type="target" position={targetPosition} />}
+            {sourcePosition && <Handle type="source" position={sourcePosition} />}
+            <div className={classNames(mode === 'full' ? `border-b border-gray-200` : '')}>
+              <span className="text-xs font-bold block pt-0.5 pb-0.5">{name}</span>
+              <div className="flex justify-between">
+                <span className="text-[10px] font-light block pt-0.5 pb-0.5 ">v{version}</span>
+                {mode === 'simple' && (
+                  <span className="text-[10px] text-gray-500 font-light block pt-0.5 pb-0.5 ">{nodeLabel}</span>
+                )}
+              </div>
+            </div>
+            {mode === 'full' && (
+              <div className="divide-y divide-gray-200 ">
+                <div className="leading-3 py-1">
+                  <span className="text-[8px] font-light">{flow.data.summary}</span>
+                </div>
+
+                <div className="grid grid-cols-2 gap-x-4 py-1">
+                  <span className="text-xs" style={{ fontSize: '0.2em' }}>
+                    Owners: {owners.length}
+                  </span>
+                </div>
+              </div>
+            )}
+          </div>
+        </div>
+      </ContextMenu.Trigger>
+      <ContextMenu.Portal>
+        <ContextMenu.Content className="min-w-[220px] bg-white rounded-md p-1 shadow-md border border-gray-200">
+          <ContextMenu.Item
+            asChild
+            className="text-sm px-2 py-1.5 outline-none cursor-pointer hover:bg-orange-100 rounded-sm flex items-center"
+          >
+            <a href={buildUrl(`/docs/flows/${id}/${version}`)}>Read documentation</a>
+          </ContextMenu.Item>
+          <ContextMenu.Item
+            asChild
+            className="text-sm px-2 py-1.5 outline-none cursor-pointer hover:bg-orange-100 rounded-sm flex items-center"
+          >
+            <a href={buildUrl(`/visualiser/flows/${id}/${version}`)}>View in visualiser</a>
+          </ContextMenu.Item>
+          <ContextMenu.Separator className="h-[1px] bg-gray-200 m-1" />
+          <ContextMenu.Item asChild>
+            <a
+              href={buildUrl(`/docs/flows/${id}/${version}/changelog`)}
+              className="text-sm px-2 py-1.5 outline-none cursor-pointer hover:bg-orange-100 rounded-sm flex items-center"
+              target="_blank"
+              rel="noopener noreferrer"
+            >
+              Read changelog
+            </a>
+          </ContextMenu.Item>
+        </ContextMenu.Content>
+      </ContextMenu.Portal>
+    </ContextMenu.Root>
+  );
+}

package/eventcatalog/src/content.config.ts

@@ -170,6 +170,7 @@ const flows = defineCollection({
             summary: z.string().optional(),
             message: pointer.optional(),
             service: pointer.optional(),
+            flow: pointer.optional(),
             actor: z
               .object({
                 name: z.string(),
@@ -206,15 +207,12 @@ const flows = defineCollection({
             next_steps: z.array(flowStep).optional(),
           })
           .refine((data) => {
-            if (!data.message && !data.service && !data.actor) return true;
             // Cant have both next_steps and next_steps
             if (data.next_step && data.next_steps) return false;
-            // Either message or service or actor must be present, but not all
-            return (
-              (data.message && !data.service && !data.actor) ||
-              (!data.message && data.service) ||
-              (data.actor && !data.message && !data.service)
-            );
+
+            // Either one or non types can be present
+            const typesUsed = [data.message, data.service, data.flow, data.actor, data.custom].filter((v) => v).length;
+            return typesUsed === 0 || typesUsed === 1;
           })
       ),
     })

package/eventcatalog/src/utils/node-graphs/flows-node-graph.ts

@@ -25,6 +25,16 @@ const getServiceNode = (step: any, services: CollectionEntry<'services'>[]) => {
   };
 };
 
+const getFlowNode = (step: any, flows: CollectionEntry<'flows'>[]) => {
+  const flowsForVersion = getItemsFromCollectionByIdAndSemverOrLatest(flows, step.flow.id, step.flow.version);
+  const flow = flowsForVersion?.[0];
+  return {
+    ...step,
+    type: flow ? flow.collection : 'step',
+    flow,
+  };
+};
+
 const getMessageNode = (step: any, messages: CollectionEntry<'events' | 'commands' | 'queries'>[]) => {
   const messagesForVersion = getItemsFromCollectionByIdAndSemverOrLatest(messages, step.message.id, step.message.version);
   const message = messagesForVersion[0];
@@ -63,6 +73,7 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
   //  Hydrate the steps with information they may need.
   const hydratedSteps = steps.map((step: any) => {
     if (step.service) return getServiceNode(step, services);
+    if (step.flow) return getFlowNode(step, flows);
     if (step.message) return getMessageNode(step, messages);
     if (step.actor) return { ...step, type: 'actor', actor: step.actor };
     if (step.custom) return { ...step, type: 'custom', custom: step.custom };
@@ -87,6 +98,7 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
     } as NodeType;
 
     if (step.service) node.data.service = step.service;
+    if (step.flow) node.data.flow = step.flow;
     if (step.message) node.data.message = step.message;
     if (step.actor) node.data.actor = step.actor;
     if (step.externalSystem) node.data.externalSystem = step.externalSystem;

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.34.1",
+  "version": "2.34.2",
   "publishConfig": {
     "access": "public"
   },