@eventcatalog/core 5.7.2 → 5.7.5

package/eventcatalog/src/pages/docs/[type]/[id]/[version]/changelog/index.astro

@@ -1,176 +1,12 @@
 ---
-import Footer from '@layouts/Footer.astro';
-import { getChangeLogs } from '@utils/collections/changelogs';
-import { getChangelogResourceBadge } from '@utils/changelog-resource-badge';
-import { render, getEntry } from 'astro:content';
-import mdxComponents from '@components/MDX/components';
-import 'diff2html/bundles/css/diff2html.min.css';
-
-import { buildUrl } from '@utils/url-builder';
-import { getPreviousVersion } from '@utils/collections/util';
-import { getDiffsForCurrentAndPreviousVersion } from '@utils/file-diffs';
-import VerticalSideBarLayout from '@layouts/VerticalSideBarLayout.astro';
-import Badge from '@components/Badge.astro';
-import { ClientRouter } from 'astro:transitions';
-
+import ChangelogPage from './_ChangelogPage.astro';
 import { Page } from './_index.data';
 
 export const prerender = Page.prerender;
 export const getStaticPaths = Page.getStaticPaths;
 
-// Get data
-const props = await Page.getData(Astro);
-if (!props) return Astro.rewrite('/404');
-
-let collectionItem = props;
-const logs = await getChangeLogs(props);
-
-const { data } = props;
-const latestVersion = data.latestVersion;
-
-const renderedLogs = logs.map(async (log) => {
-  const logEntry = await getEntry('changelogs', log.id);
-  const { Content } = await render(logEntry as any);
-  return {
-    Content,
-    ...log,
-  };
-});
-
-const logsToRender = await Promise.all(renderedLogs);
-
-const logListPromise = logsToRender.map(async (log, index) => {
-  const currentLogVersion = log.data.version;
-  const previousLogVersion = log.data.version ? getPreviousVersion(log.data.version, data.versions || []) : '';
-  return {
-    id: log.id,
-    url: buildUrl(`/docs/${props.collection}/${props.data.id}`),
-    isLatest: log.data.version === latestVersion,
-    version: log.data.version,
-    createdAt: log.data.createdAt,
-    badges: log.data.badges || [],
-    Content: log.Content,
-    diffs:
-      currentLogVersion && previousLogVersion
-        ? await getDiffsForCurrentAndPreviousVersion(
-            currentLogVersion,
-            previousLogVersion,
-            collectionItem.data.id,
-            props.allCollectionItems
-          )
-        : [],
-  };
-});
-
-const logList = await Promise.all(logListPromise);
-
-const badges = [getChangelogResourceBadge(props.collection)].filter((badge) => badge != null);
+const changelogOwner = await Page.getData(Astro);
+if (!changelogOwner) return Astro.rewrite('/404');
 ---
 
-<VerticalSideBarLayout title="ChangeLog">
-  <main class="w-full md:pt-4 px-8 overflow-y-auto h-full max-w-[95%]">
-    <nav aria-label="Breadcrumb" class="flex">
-      <ol role="list" class="flex items-center space-x-2">
-        <li>
-          <div>
-            <a
-              href={buildUrl(`/docs/${props.collection}/${props.data.id}/${props.data.version}`)}
-              class="text-sm font-medium text-[rgb(var(--ec-page-text-muted))] hover:text-[rgb(var(--ec-page-text))]"
-            >
-              {props.data.name}
-            </a>
-          </div>
-        </li>
-        <li>
-          <div class="flex items-center">
-            <svg
-              fill="currentColor"
-              viewBox="0 0 20 20"
-              aria-hidden="true"
-              class="h-5 w-5 flex-shrink-0 text-[rgb(var(--ec-page-border))]"
-            >
-              <path d="M5.555 17.776l8-16 .894.448-8 16-.894-.448z"></path>
-            </svg>
-            <a
-              href={buildUrl(`/docs/${props.collection}/${props.data.id}/${props.data.version}`)}
-              class="text-sm font-medium text-[rgb(var(--ec-page-text-muted))] hover:text-[rgb(var(--ec-page-text))]"
-            >
-              Changelog
-            </a>
-          </div>
-        </li>
-      </ol>
-    </nav>
-    <div class="border-b border-[rgb(var(--ec-page-border))] flex justify-between items-start py-4 w-full">
-      <div>
-        <h2 class="text-2xl md:text-4xl font-bold text-[rgb(var(--ec-page-text))]">{props.data.name} (Changelog)</h2>
-        <h2 class="text-lg pt-2 text-[rgb(var(--ec-page-text-muted))] font-light">{props.data.summary}</h2>
-        {
-          badges.length > 0 && (
-            <div class="flex flex-wrap py-2 pt-4">
-              {badges.map((badge) => (
-                <Badge badge={badge} className="mr-2 px-2 py-1 rounded-md" />
-              ))}
-            </div>
-          )
-        }
-      </div>
-    </div>
-    {
-      logList.length === 0 && (
-        <div class="py-4 text-[rgb(var(--ec-page-text-muted))] prose prose-md">
-          <p>No changelogs found.</p>
-        </div>
-      )
-    }
-    <div class="flow-root py-8 w-full">
-      <ul role="list" class="-mb-8">
-        {
-          logList.map((log, index) => (
-            <li>
-              <div class="relative pb-8">
-                {index !== logList.length - 1 ? (
-                  <span aria-hidden="true" class="absolute left-6 top-4 -ml-px h-full w-0.5 bg-[rgb(var(--ec-page-border))]" />
-                ) : null}
-                <div class="relative flex space-x-3">
-                  <div>
-                    <a
-                      href={buildUrl(`${log.url}/${log.version}`)}
-                      class="bg-primary hover:bg-primary/80 text-white flex h-8 w-14 items-center justify-center rounded-full ring-8 ring-[rgb(var(--ec-page-bg))]"
-                    >
-                      {log.version}
-                    </a>
-                  </div>
-                </div>
-                <div class="pl-[70px] py-2 -mt-10">
-                  {log.createdAt && (
-                    <div class="pb-2">
-                      <h3 class="text-2xl text-[rgb(var(--ec-page-text))] font-bold">
-                        <span>
-                          {log.createdAt.toISOString().split('T')[0]} {`${log.isLatest ? '(latest)' : ''}`}
-                        </span>
-                      </h3>
-                    </div>
-                  )}
-                  {log.badges && (
-                    <div class="flex flex-wrap">
-                      {log.badges.filter(Boolean).map((badge: any) => (
-                        <Badge badge={badge} className="mr-2 px-2 py-1 rounded-md" />
-                      ))}
-                    </div>
-                  )}
-                  <div class="prose prose-md max-w-none! py-2">
-                    <log.Content components={mdxComponents(props)} />
-                  </div>
-                  {log.diffs && log.diffs.map((diff) => <div class="bg-white rounded-lg p-2 my-2" set:html={diff} />)}
-                </div>
-              </div>
-            </li>
-          ))
-        }
-      </ul>
-    </div>
-    <Footer />
-  </main>
-  <ClientRouter />
-</VerticalSideBarLayout>
+<ChangelogPage changelogOwner={changelogOwner} />

package/eventcatalog/src/pages/docs/services/[id]/[version]/changelog/index.astro

@@ -0,0 +1,14 @@
+---
+// Services need their own Changelog route: /docs/services/[id]/[docType]/[docId] outranks
+// the generic /docs/[type]/[id]/[version]/changelog route and would catch these URLs.
+import ChangelogPage from '../../../../[type]/[id]/[version]/changelog/_ChangelogPage.astro';
+import { ServicePage } from '../../../../[type]/[id]/[version]/changelog/_index.data';
+
+export const prerender = ServicePage.prerender;
+export const getStaticPaths = ServicePage.getStaticPaths;
+
+const changelogOwner = await ServicePage.getData(Astro);
+if (!changelogOwner) return Astro.rewrite('/404');
+---
+
+<ChangelogPage changelogOwner={changelogOwner} />

package/eventcatalog/src/pages/docs/services/[id]/changelog/index.astro

@@ -2,11 +2,11 @@
 import LatestVersionRedirect from '@components/LatestVersionRedirect.astro';
 import { isChangelogEnabled, isSSR } from '@utils/feature';
 import { buildUrl } from '@utils/url-builder';
-import { Page as VersionedPage } from '../../../[type]/[id]/[version]/changelog/_index.data';
-import { getLatestServicePaths, getLatestServiceVersion } from '../../_latest-version-route';
+import { getLatestServiceChangelogPaths } from '../../../[type]/[id]/[version]/changelog/_index.data';
+import { getLatestServiceVersion } from '../../_latest-version-route';
 
 export const prerender = !isSSR();
-export const getStaticPaths = async () => getLatestServicePaths(await VersionedPage.getStaticPaths());
+export const getStaticPaths = getLatestServiceChangelogPaths;
 
 const { id } = Astro.params;
 const version = Astro.props.redirectVersion ?? (id ? await getLatestServiceVersion(id) : undefined);

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

@@ -85,13 +85,13 @@ export const getNodesAndEdgesForChannelChain = ({
     }
   }
 
-  // Connect the last channel to the target
+  // Connect the last channel to the target, which accepts a command or query (it handles them) and consumes an event
   edges.push(
     createEdge({
       id: generatedIdForEdge(channelChain[channelChain.length - 1], target),
       source: generateIdForNode(channelChain[channelChain.length - 1]),
       target: generateIdForNode(target),
-      label: 'consumes',
+      label: ['commands', 'queries'].includes(source.collection) ? 'accepts' : 'consumes',
       data: { customColor: getColorFromString(source.data.id) },
     })
   );