@eventcatalog/core 2.30.5 → 2.30.7

package/README.md

@@ -34,7 +34,7 @@
 <h4>Features: Documentation for Event Driven Architectures, Integration with any broker, Generator from your OpenAPI and AsyncAPI documents, Docs and Code, Markdown driven, Document Domains/Services/Messages/Schemas and more, Content versioning, Assign Owners, Schemas, OpenAPI, MDX Components and more...</h4>
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-50-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-51-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 [Read the Docs](https://www.eventcatalog.dev/docs/development/getting-started/introduction) | [View Demo](https://demo.eventcatalog.dev)
@@ -261,6 +261,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     </tr>
     <tr>
       <td align="center" valign="top" width="14.28%"><a href="https://www.linkedin.com/in/ruudwelling/"><img src="https://avatars.githubusercontent.com/u/4014179?v=4?s=100" width="100px;" alt="Ruud Welling"/><br /><sub><b>Ruud Welling</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=WellingR" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/vienin"><img src="https://avatars.githubusercontent.com/u/2124283?v=4?s=100" width="100px;" alt="Kevin Pouget"/><br /><sub><b>Kevin Pouget</b></sub></a><br /><a href="https://github.com/event-catalog/eventcatalog/commits?author=vienin" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>

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.30.5";
+var version = "2.30.7";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-K5JCIULJ.js";
-import "../chunk-D7PI5D2P.js";
+} from "../chunk-EFSBN3ZZ.js";
+import "../chunk-SUJLBNZK.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.30.5";
+var version = "2.30.7";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-GRTEQOIT.js";
-import "../chunk-K5JCIULJ.js";
-import "../chunk-D7PI5D2P.js";
+} from "../chunk-HINNLTBH.js";
+import "../chunk-EFSBN3ZZ.js";
+import "../chunk-SUJLBNZK.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-K5JCIULJ.js → chunk-EFSBN3ZZ.js}

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

package/dist/{chunk-GRTEQOIT.js → chunk-HINNLTBH.js}

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

package/dist/{chunk-D7PI5D2P.js → chunk-SUJLBNZK.js}

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

package/dist/constants.cjs

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

package/dist/constants.js

@@ -1,6 +1,6 @@
 import {
   VERSION
-} from "./chunk-D7PI5D2P.js";
+} from "./chunk-SUJLBNZK.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.30.5";
+var version = "2.30.7";
 
 // 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-GRTEQOIT.js";
-import "./chunk-K5JCIULJ.js";
+} from "./chunk-HINNLTBH.js";
+import "./chunk-EFSBN3ZZ.js";
 import {
   catalogToAstro,
   checkAndConvertMdToMdx
 } from "./chunk-7SI5EVOX.js";
 import {
   VERSION
-} from "./chunk-D7PI5D2P.js";
+} from "./chunk-SUJLBNZK.js";
 import {
   isBackstagePluginEnabled
 } from "./chunk-XMDPVKIJ.js";

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

@@ -25,6 +25,7 @@ import CommandNode from './Nodes/Command';
 import ExternalSystemNode from './Nodes/ExternalSystem';
 import AnimatedMessageEdge from './Edges/AnimatedMessageEdge';
 import FlowEdge from './Edges/FlowEdge';
+import CustomNode from './Nodes/Custom';
 
 import type { CollectionEntry } from 'astro:content';
 import { navigate } from 'astro:transitions/client';
@@ -69,6 +70,7 @@ const NodeGraphBuilder = ({
       step: StepNode,
       user: UserNode,
       actor: UserNode,
+      custom: CustomNode,
       externalSystem: ExternalSystemNode,
     }),
     []

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

@@ -0,0 +1,161 @@
+import { Handle } from '@xyflow/react';
+import * as Icons from '@heroicons/react/24/solid';
+import type { ComponentType } from 'react';
+import * as ContextMenu from '@radix-ui/react-context-menu';
+import * as Tooltip from '@radix-ui/react-tooltip';
+
+type MenuItem = {
+  label: string;
+  url?: string;
+};
+
+interface Data {
+  title: string;
+  label: string;
+  bgColor: string;
+  color: string;
+  mode: 'simple' | 'full';
+  step: { id: string; title: string; summary: string; name: string; actor: { name: string } };
+  showTarget?: boolean;
+  showSource?: boolean;
+  custom: {
+    icon?: string;
+    type?: string;
+    title?: string;
+    summary?: string;
+    url?: string;
+    color?: string;
+    properties?: Record<string, string>;
+    menu?: MenuItem[];
+    height?: number;
+  };
+}
+
+function classNames(...classes: any) {
+  return classes.filter(Boolean).join(' ');
+}
+
+export default function UserNode({ data, sourcePosition, targetPosition }: any) {
+  const { mode, step, custom: customProps } = data as Data;
+
+  console.log('step', customProps);
+
+  const {
+    color = 'blue',
+    title = 'Custom',
+    icon = 'UserIcon',
+    type = 'custom',
+    summary = '',
+    url = '',
+    properties = {},
+    menu = [],
+    height = 5,
+  } = customProps;
+
+  const IconComponent: ComponentType<{ className?: string }> | undefined = Icons[icon as keyof typeof Icons];
+
+  const { actor: { name } = {} } = step;
+
+  const isLongType = type && type.length > 10;
+  const displayType = isLongType ? `${type.substring(0, 10)}...` : type;
+
+  return (
+    <ContextMenu.Root>
+      <ContextMenu.Trigger>
+        <div
+          className={classNames(`w-full rounded-md border flex justify-start  bg-white text-black border-${color}-400`)}
+          style={{ minHeight: mode === 'full' ? `${height}em` : '2em' }}
+        >
+          <div
+            className={classNames(
+              `bg-gradient-to-b from-${color}-400 to-${color}-600 relative flex items-center w-5 justify-center rounded-l-sm text-orange-100-500`,
+              `border-r-[1px] border-${color}`
+            )}
+          >
+            <IconComponent className="w-4 h-4 opacity-90 text-white absolute top-1 " />
+            {mode === 'full' && (
+              <Tooltip.Provider>
+                <Tooltip.Root>
+                  <Tooltip.Trigger asChild>
+                    <span className="rotate -rotate-90 w-1/2 text-center absolute bottom-1 text-[9px] text-white font-bold uppercase tracking-[3px]  ">
+                      {displayType}
+                    </span>
+                  </Tooltip.Trigger>
+                  {isLongType && (
+                    <Tooltip.Portal>
+                      <Tooltip.Content
+                        className="bg-slate-800 text-white rounded px-2 py-1 text-xs shadow-md z-50"
+                        side="right"
+                        sideOffset={5}
+                      >
+                        {type}
+                        <Tooltip.Arrow className="fill-slate-800" />
+                      </Tooltip.Content>
+                    </Tooltip.Portal>
+                  )}
+                </Tooltip.Root>
+              </Tooltip.Provider>
+            )}
+          </div>
+          <div className="p-1 min-w-60 max-w-[min-content]">
+            {targetPosition && <Handle type="target" position={targetPosition} />}
+            {sourcePosition && <Handle type="source" position={sourcePosition} />}
+
+            {(!summary || mode !== 'full') && (
+              <div className="h-full ">
+                <span className="text-sm font-bold block pb-0.5 block w-full">{title}</span>
+              </div>
+            )}
+
+            {summary && mode === 'full' && (
+              <div>
+                <div className={classNames(mode === 'full' ? `border-b border-gray-200` : '')}>
+                  <span className="text-xs font-bold block pb-0.5">{title}</span>
+                </div>
+                {mode === 'full' && (
+                  <div className="divide-y divide-gray-200 ">
+                    <div className="leading-3 py-1">
+                      <span className="text-[8px] font-light">{summary}</span>
+                    </div>
+                    {properties && (
+                      <div className="grid grid-cols-2 gap-x-4 py-1">
+                        {Object.entries(properties).map(([key, value]) => (
+                          <span key={key} className="text-xs" style={{ fontSize: '0.2em' }}>
+                            {key}:{' '}
+                            {typeof value === 'string' && value.startsWith('http') ? (
+                              <a href={value} target="_blank" rel="noopener noreferrer" className="text-blue-500 underline">
+                                {value}
+                              </a>
+                            ) : (
+                              value
+                            )}
+                          </span>
+                        ))}
+                      </div>
+                    )}
+                  </div>
+                )}
+              </div>
+            )}
+          </div>
+        </div>
+      </ContextMenu.Trigger>
+      {menu?.length > 0 && (
+        <ContextMenu.Portal>
+          <ContextMenu.Content className="min-w-[220px] bg-white rounded-md p-1 shadow-md border border-gray-200">
+            {menu?.map((item) => {
+              return (
+                <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={item.url}>{item.label}</a>
+                </ContextMenu.Item>
+              );
+            })}
+          </ContextMenu.Content>
+        </ContextMenu.Portal>
+      )}
+    </ContextMenu.Root>
+  );
+}

package/eventcatalog/src/content.config.ts

@@ -159,6 +159,26 @@ const flows = defineCollection({
                 name: z.string(),
               })
               .optional(),
+            custom: z
+              .object({
+                title: z.string(),
+                icon: z.string().optional(),
+                type: z.string().optional(),
+                summary: z.string().optional(),
+                url: z.string().url().optional(),
+                color: z.string().optional(),
+                properties: z.record(z.union([z.string(), z.number()])).optional(),
+                height: z.number().optional(),
+                menu: z
+                  .array(
+                    z.object({
+                      label: z.string(),
+                      url: z.string().url().optional(),
+                    })
+                  )
+                  .optional(),
+              })
+              .optional(),
             externalSystem: z
               .object({
                 name: z.string(),

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

@@ -10,8 +10,10 @@ export const getChangeLogs = async (item: CollectionEntry<CollectionTypes>): Pro
   // Get all logs for collection type and filter by given collection
   const logs = await getCollection('changelogs', (log) => {
     const collectionDirectory = path.dirname(item?.filePath || '');
-    const isRootChangeLog = path.join(collectionDirectory, 'changelog.md') === log.filePath;
-    const isVersionedChangeLog = log.filePath?.includes(path.join(collectionDirectory, 'versioned'));
+    const isRootChangeLog = path.join(collectionDirectory, 'changelog.mdx') === log.filePath;
+    // Ensure the path follows <collectionDirectory>/versioned/<version>/changelog.mdx
+    const versionedPathPattern = new RegExp(`${collectionDirectory}/versioned/[^/]+/changelog\\.mdx$`);
+    const isVersionedChangeLog = versionedPathPattern.test(log.filePath!);
     return log.id.includes(`${collection}/`) && (isRootChangeLog || isVersionedChangeLog);
   });
 
@@ -19,7 +21,7 @@ export const getChangeLogs = async (item: CollectionEntry<CollectionTypes>): Pro
     // Check if there is a version in the url
     const isVersioned = log.id.includes('versioned');
 
-    const parts = log.id.split('/');
+    const parts = log.filePath!.split('/');
     // hack to get the version of the id (url)
     const version = parts[parts.length - 2];
     return {

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

@@ -65,6 +65,7 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
     if (step.service) return getServiceNode(step, services);
     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 };
     if (step.externalSystem) return { ...step, type: 'externalSystem', externalSystem: step.externalSystem };
     return { ...step, type: 'step' };
   });
@@ -89,7 +90,7 @@ export const getNodesAndEdges = async ({ id, defaultFlow, version, mode = 'simpl
     if (step.message) node.data.message = step.message;
     if (step.actor) node.data.actor = step.actor;
     if (step.externalSystem) node.data.externalSystem = step.externalSystem;
-
+    if (step.custom) node.data.custom = step.custom;
     nodes.push(node);
   });
 

package/eventcatalog/tailwind.config.mjs

@@ -38,8 +38,8 @@ export default {
   safelist: [
     { pattern: /border-.*-(200|400|500)/ },
     { pattern: /bg-.*-(100|200|400|500)/ },
-    { pattern: /from-.*-(100|200|300|400|500|700)/ },
-    { pattern: /to-.*-(100|200|300|400|500|700)/ },
+    { pattern: /from-.*-(100|200|300|400|500|600|700)/ },
+    { pattern: /to-.*-(100|200|300|400|500|600|700)/ },
     { pattern: /text-.*-(400|500|800)/ },
     'border-blue-200',
     'border-green-300',

package/package.json

@@ -6,7 +6,7 @@
     "url": "https://github.com/event-catalog/eventcatalog.git"
   },
   "type": "module",
-  "version": "2.30.5",
+  "version": "2.30.7",
   "publishConfig": {
     "access": "public"
   },
@@ -40,6 +40,7 @@
     "@parcel/watcher": "^2.4.1",
     "@radix-ui/react-context-menu": "^2.2.6",
     "@radix-ui/react-dialog": "^1.1.6",
+    "@radix-ui/react-tooltip": "^1.1.8",
     "@scalar/api-reference-react": "^0.4.37",
     "@stoplight/json-schema-viewer": "^4.16.4",
     "@tailwindcss/typography": "^0.5.13",