@eventcatalog/core 2.7.13 → 2.7.15

package/.github/ISSUE_TEMPLATE/bug.yml

@@ -1,6 +1,6 @@
 name: Bug Report 🐞
 description: Create a bug report
-labels: ["🐛 bug"]
+labels: ["bug"]
 body:
 - type: markdown
   attributes:

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @eventcatalog/core
 
+## 2.7.15
+
+### Patch Changes
+
+- 7e63592: fix(core): user ownership on resources within a team
+
+## 2.7.14
+
+### Patch Changes
+
+- c45ebd0: feat(core): added new steps component
+
 ## 2.7.13
 
 ### Patch Changes

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eventcatalog/core",
   "type": "module",
-  "version": "2.7.13",
+  "version": "2.7.15",
   "publishConfig": {
     "access": "public"
   },

package/src/components/MDX/Steps/Step.astro

@@ -0,0 +1,25 @@
+---
+const { title } = Astro.props;
+---
+
+<li class="mb-8 ml-6 w-full xl:max-w-[50%]">
+  <div class="flex items-center mb-4">
+    <span class="step-number absolute flex items-center justify-center w-6 h-6 bg-purple-500/70 rounded-md -left-3 text-white">
+      <div></div>
+    </span>
+    <h3 class="font-semibold text-lg ml-0">{title}</h3>
+  </div>
+  <p class="text-gray-500 text-sm ml-4"><slot /></p>
+</li>
+
+<script>
+  document.addEventListener('DOMContentLoaded', () => {
+    document.querySelectorAll('li[data-step]').forEach((li) => {
+      const stepNumber = li.getAttribute('data-step');
+      const stepSpan = li.querySelector('.step-number div');
+      if (stepSpan) {
+        stepSpan.textContent = stepNumber;
+      }
+    });
+  });
+</script>

package/src/components/MDX/Steps/Steps.astro

@@ -0,0 +1,27 @@
+---
+const { title } = Astro.props;
+const html = await Astro.slots.render('default');
+
+function splitByLi(html: string) {
+  // Use regex to match <li> tags and their contents, including nested tags
+  const liRegex = /<li[\s\S]*?<\/li>/g;
+
+  // Find all matches
+  const matches = html.match(liRegex) || [];
+
+  // Add data-step attribute to each li
+  return matches.map((li: string, index: number) => {
+    // Replace the opening <li tag with <li data-step="index+1"
+    return li.replace(/<li/, `<li data-step="${index + 1}"`);
+  });
+}
+
+const data = splitByLi(html);
+---
+
+<div class="bg-white text-gray-800 py-10 pb-0 font-sans not-prose">
+  {title && <h2 class="text-2xl font-bold text-gray-800 mb-6">{title}</h2>}
+  <ol class="relative border-l border-gray-200 ml-3">
+    {data.map((item: any) => <Fragment set:html={item} />)}
+  </ol>
+</div>

package/src/components/MDX/components.tsx

@@ -6,6 +6,8 @@ import AccordionGroup from '@components/MDX/Accordion/AccordionGroup.astro';
 import Flow from '@components/MDX/Flow/Flow.astro';
 import Tiles from '@components/MDX/Tiles/Tiles.astro';
 import Tile from '@components/MDX/Tiles/Tile.astro';
+import Steps from '@components/MDX/Steps/Steps.astro';
+import Step from '@components/MDX/Steps/Step.astro';
 import Admonition from '@components/MDX/Admonition';
 import OpenAPI from '@components/MDX/OpenAPI/OpenAPI.astro';
 import AsyncAPI from '@components/MDX/AsyncAPI/AsyncAPI.astro';
@@ -21,8 +23,10 @@ const components = (props: any) => {
     Flow,
     OpenAPI,
     AsyncAPI,
-    Tiles,
     Tile,
+    Tiles,
+    Step,
+    Steps,
     Admonition: (mdxProp: any) => <Admonition {...mdxProp} {...props} />,
     File: (mdxProp: any) => File({ ...props, ...mdxProp }),
     NodeGraph: (mdxProp: any) => NodeGraphPortal({ ...props.data, ...mdxProp }),

package/src/utils/users.ts

@@ -27,25 +27,27 @@ export const getUsers = async (): Promise<User[]> => {
   });
 
   return users.map((user) => {
+    const associatedTeams = teams.filter((team) => {
+      return team.data.members?.some((member) => member.slug === user.data.id);
+    });
+
     const ownedDomains = domains.filter((domain) => {
       return domain.data.owners?.find((owner) => owner.slug === user.data.id);
     });
 
-    const ownedServices = services.filter((service) => {
-      return service.data.owners?.find((owner) => owner.slug === user.data.id);
-    });
+    const isOwnedByUserOrAssociatedTeam = () => {
+      const associatedTeamsSlug: string[] = associatedTeams.map((team) => team.slug);
 
-    const ownedEvents = events.filter((event) => {
-      return event.data.owners?.find((owner) => owner.slug === user.data.id);
-    });
+      return ({ data }: { data: { owners?: Array<{ slug: string }> } }) => {
+        return data.owners?.some((owner) => owner.slug === user.data.id || associatedTeamsSlug.includes(owner.slug));
+      };
+    };
 
-    const ownedCommands = commands.filter((command) => {
-      return command.data.owners?.find((owner) => owner.slug === user.data.id);
-    });
+    const ownedServices = services.filter(isOwnedByUserOrAssociatedTeam());
 
-    const associatedTeams = teams.filter((team) => {
-      return team.data.members?.find((member) => member.slug === user.data.id);
-    });
+    const ownedEvents = events.filter(isOwnedByUserOrAssociatedTeam());
+
+    const ownedCommands = commands.filter(isOwnedByUserOrAssociatedTeam());
 
     return {
       ...user,