@eventcatalog/core 2.20.1 → 2.20.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.20.1";
+var version = "2.20.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/analytics.js

@@ -1,7 +1,7 @@
 import {
   raiseEvent
-} from "../chunk-IXGDS55I.js";
-import "../chunk-P4LJB7KO.js";
+} from "../chunk-IOBMNGC6.js";
+import "../chunk-F4GCNRKV.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.20.1";
+var version = "2.20.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/analytics/log-build.js

@@ -1,8 +1,8 @@
 import {
   log_build_default
-} from "../chunk-IMSJ6ZK2.js";
-import "../chunk-IXGDS55I.js";
-import "../chunk-P4LJB7KO.js";
+} from "../chunk-U2ID5L3C.js";
+import "../chunk-IOBMNGC6.js";
+import "../chunk-F4GCNRKV.js";
 import "../chunk-E7TXTI7G.js";
 export {
   log_build_default as default

package/dist/{chunk-P4LJB7KO.js → chunk-F4GCNRKV.js}

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

package/dist/{chunk-IXGDS55I.js → chunk-IOBMNGC6.js}

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

package/dist/{chunk-IMSJ6ZK2.js → chunk-U2ID5L3C.js}

@@ -1,6 +1,6 @@
 import {
   raiseEvent
-} from "./chunk-IXGDS55I.js";
+} from "./chunk-IOBMNGC6.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.20.1";
+var version = "2.20.2";
 
 // src/constants.ts
 var VERSION = version;

package/dist/constants.js

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

package/dist/eventcatalog.cjs

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

package/dist/eventcatalog.js

@@ -3,14 +3,14 @@ import {
 } from "./chunk-SHCMAL37.js";
 import {
   log_build_default
-} from "./chunk-IMSJ6ZK2.js";
-import "./chunk-IXGDS55I.js";
+} from "./chunk-U2ID5L3C.js";
+import "./chunk-IOBMNGC6.js";
 import {
   catalogToAstro
 } from "./chunk-WF34R5UT.js";
 import {
   VERSION
-} from "./chunk-P4LJB7KO.js";
+} from "./chunk-F4GCNRKV.js";
 import {
   generate
 } from "./chunk-YEQVKHST.js";

package/eventcatalog/src/components/Tables/Table.tsx

@@ -28,6 +28,7 @@ declare module '@tanstack/react-table' {
       | 'receives'
       | 'services'
       | 'ownedCommands'
+      | 'ownedQueries'
       | 'ownedEvents'
       | 'ownedServices'
       | 'associatedTeams';
@@ -112,7 +113,7 @@ export type TData<T extends TCollectionTypes> = {
     ownedEvents: any;
     ownedServices: any;
     associatedTeams: any;
-
+    ownedQueries: any;
     // Teams
     members: any;
   };

package/eventcatalog/src/components/Tables/columns/TeamsTableColumns.tsx

@@ -38,13 +38,10 @@ export const columns = () => [
             href={buildUrl(`/docs/${messageRaw.collection}/${messageRaw.data.id}`)}
             className={`group-hover:text-pink-500 flex space-x-1 items-center`}
           >
-            <div className={`flex items-center border border-gray-300 shadow-sm rounded-md group-hover:border-pink-400`}>
+            <div className={`flex items-center  rounded-md group-hover:border-pink-400`}>
               <span className="flex items-center">
-                <span className={`bg-pink-500 group-hover:bg-pink-600 h-full rounded-tl rounded-bl p-1`}>
-                  {!messageRaw.data.avatarUrl && <Users className="h-4 w-4 text-white" />}
-                </span>
-                <span className="leading-none px-2 group-hover:underline group-hover:text-primary font-light">
-                  {messageRaw.data.name}
+                <span className="flex flex-col leading-none px-2 group-hover:underline group-hover:text-primary font-light">
+                  <span className="font-semibold">{messageRaw.data.name}</span>
                 </span>
               </span>
             </div>
@@ -59,21 +56,56 @@ export const columns = () => [
     filterFn: filterByName,
   }),
 
-  columnHelper.accessor('data.members', {
-    header: () => <span>Team members</span>,
+  columnHelper.accessor('data.ownedEvents', {
+    header: () => <span>Owned events</span>,
     meta: {
-      // filterVariant: 'collection',
-      showFilter: false,
+      filterVariant: 'collection',
+      collectionFilterKey: 'ownedEvents',
     },
     cell: (info) => {
-      const members = info.getValue();
-      if (members?.length === 0 || !members)
-        return <div className="font-light text-sm text-gray-400/60 text-left italic">Team has no members</div>;
+      const events = info.getValue();
+      if (events?.length === 0 || !events)
+        return <div className="font-light text-sm text-gray-400/80 text-left italic">Team owns no events</div>;
 
-      return <div>{members.length}</div>;
+      const isExpandable = events?.length > 10;
+      const isOpen = isExpandable ? events?.length < 10 : true;
+      const [isExpanded, setIsExpanded] = useState(isOpen);
+
+      return (
+        <div>
+          {isExpandable && (
+            <button onClick={() => setIsExpanded(!isExpanded)} className="mb-2 text-sm text-gray-600 hover:text-gray-900">
+              {isExpanded ? '▼' : '▶'} {events.length} event{events.length !== 1 ? 's' : ''}
+            </button>
+          )}
+          {isExpanded && (
+            <ul>
+              {events.map((event: CollectionEntry<'events'>, index: number) => (
+                <li key={`${event.data.id}-${index}`} className="py-1 group font-light ">
+                  <a
+                    href={buildUrl(`/docs/${event.collection}/${event.data.id}/${event.data.version}`)}
+                    className="group-hover:text-primary flex space-x-1 items-center "
+                  >
+                    <div className={`flex items-center border border-gray-300 shadow-sm rounded-md`}>
+                      <span className="flex items-center">
+                        <span className={`bg-orange-500 h-full rounded-tl rounded-bl p-1`}>
+                          <BoltIcon className="h-4 w-4 text-white" />
+                        </span>
+                        <span className="leading-none px-2 group-hover:underline ">
+                          {event.data.name} (v{event.data.version})
+                        </span>
+                      </span>
+                    </div>
+                  </a>
+                </li>
+              ))}
+            </ul>
+          )}
+        </div>
+      );
     },
     footer: (info) => info.column.id,
-    filterFn: filterByName,
+    filterFn: filterCollectionByName('ownedEvents'),
   }),
 
   columnHelper.accessor('data.ownedCommands', {
@@ -85,7 +117,7 @@ export const columns = () => [
     cell: (info) => {
       const commands = info.getValue();
       if (commands?.length === 0 || !commands)
-        return <div className="font-light text-sm text-gray-400/60 text-left italic">User owns no commands</div>;
+        return <div className="font-light text-sm text-gray-400/60 text-left italic">Team owns no commands</div>;
 
       const isExpandable = commands?.length > 10;
       const isOpen = isExpandable ? commands?.length < 10 : true;
@@ -129,43 +161,44 @@ export const columns = () => [
     footer: (info) => info.column.id,
     filterFn: filterCollectionByName('ownedCommands'),
   }),
-  columnHelper.accessor('data.ownedEvents', {
-    header: () => <span>Owned Events</span>,
+
+  columnHelper.accessor('data.ownedQueries', {
+    header: () => <span>Owned queries</span>,
     meta: {
       filterVariant: 'collection',
-      collectionFilterKey: 'ownedEvents',
+      collectionFilterKey: 'ownedQueries',
     },
     cell: (info) => {
-      const events = info.getValue();
-      if (events?.length === 0 || !events)
-        return <div className="font-light text-sm text-gray-400/80 text-left italic">User owns no events</div>;
+      const queries = info.getValue();
+      if (queries?.length === 0 || !queries)
+        return <div className="font-light text-sm text-gray-400/60 text-left italic">Team owns no queries</div>;
 
-      const isExpandable = events?.length > 10;
-      const isOpen = isExpandable ? events?.length < 10 : true;
+      const isExpandable = queries?.length > 10;
+      const isOpen = isExpandable ? queries?.length < 10 : true;
       const [isExpanded, setIsExpanded] = useState(isOpen);
 
       return (
         <div>
           {isExpandable && (
             <button onClick={() => setIsExpanded(!isExpanded)} className="mb-2 text-sm text-gray-600 hover:text-gray-900">
-              {isExpanded ? '▼' : '▶'} {events.length} event{events.length !== 1 ? 's' : ''}
+              {isExpanded ? '▼' : '▶'} {queries.length} query{queries.length !== 1 ? 's' : ''}
             </button>
           )}
           {isExpanded && (
             <ul>
-              {events.map((event: CollectionEntry<'events'>, index: number) => (
-                <li key={`${event.data.id}-${index}`} className="py-1 group font-light ">
+              {queries.map((query: CollectionEntry<'queries'>, index: number) => (
+                <li key={`${query.data.id}-${index}`} className="py-1 group font-light ">
                   <a
-                    href={buildUrl(`/docs/${event.collection}/${event.data.id}/${event.data.version}`)}
+                    href={buildUrl(`/docs/${query.collection}/${query.data.id}/${query.data.version}`)}
                     className="group-hover:text-primary flex space-x-1 items-center "
                   >
                     <div className={`flex items-center border border-gray-300 shadow-sm rounded-md`}>
                       <span className="flex items-center">
-                        <span className={`bg-orange-500 h-full rounded-tl rounded-bl p-1`}>
-                          <BoltIcon className="h-4 w-4 text-white" />
+                        <span className={`bg-blue-500 h-full rounded-tl rounded-bl p-1`}>
+                          <ChatBubbleLeftIcon className="h-4 w-4 text-white" />
                         </span>
                         <span className="leading-none px-2 group-hover:underline ">
-                          {event.data.name} (v{event.data.version})
+                          {query.data.name} (v{query.data.version})
                         </span>
                       </span>
                     </div>
@@ -176,10 +209,13 @@ export const columns = () => [
           )}
         </div>
       );
+
+      // return commands.length;
     },
     footer: (info) => info.column.id,
-    filterFn: filterCollectionByName('ownedEvents'),
+    filterFn: filterCollectionByName('ownedCommands'),
   }),
+
   columnHelper.accessor('data.ownedServices', {
     header: () => <span>Owned Services</span>,
     meta: {
@@ -189,7 +225,7 @@ export const columns = () => [
     cell: (info) => {
       const services = info.getValue();
       if (services?.length === 0 || !services)
-        return <div className="font-light text-sm text-gray-400/80 text-left italic">User owns no services</div>;
+        return <div className="font-light text-sm text-gray-400/80 text-left italic">Team owns no services</div>;
 
       const isExpandable = services?.length > 10;
       const isOpen = isExpandable ? services?.length < 10 : true;

package/eventcatalog/src/components/Tables/columns/UserTableColumns.tsx

@@ -6,7 +6,7 @@ import type { TData } from '../Table';
 import type { CollectionUserTypes } from '@types';
 import { User, Users } from 'lucide-react';
 import type { CollectionEntry } from 'astro:content';
-import { ServerIcon, BoltIcon, ChatBubbleLeftIcon } from '@heroicons/react/24/solid';
+import { ServerIcon, BoltIcon, ChatBubbleLeftIcon, MagnifyingGlassIcon } from '@heroicons/react/24/solid';
 
 const columnHelper = createColumnHelper<TData<CollectionUserTypes>>();
 
@@ -23,19 +23,10 @@ export const columns = () => [
             href={buildUrl(`/docs/${messageRaw.collection}/${messageRaw.data.id}`)}
             className={`group-hover:text-gray-500 flex space-x-1 items-center`}
           >
-            <div className={`flex items-center border border-gray-300 shadow-sm rounded-md group-hover:border-gray-400`}>
+            <div className={`flex items-center  rounded-md group-hover:border-gray-400`}>
               <span className="flex items-center">
-                {!messageRaw.data.avatarUrl && (
-                  <span className={`bg-gray-300 group-hover:bg-gray-600 h-full rounded-tl rounded-bl p-1`}>
-                    <User className="h-4 w-4 text-white" />
-                  </span>
-                )}
-                {messageRaw.data.avatarUrl && (
-                  <img src={messageRaw.data.avatarUrl} alt={messageRaw.data.name} className="h-12 w-12 rounded-md p-0.5" />
-                )}
-
-                <span className="leading-none px-2 group-hover:underline group-hover:text-primary font-light">
-                  {messageRaw.data.name}
+                <span className="flex flex-col leading-none px-2 group-hover:underline group-hover:text-primary font-light">
+                  <span className="font-semibold">{messageRaw.data.name}</span>
                 </span>
               </span>
             </div>
@@ -50,16 +41,56 @@ export const columns = () => [
     filterFn: filterByName,
   }),
 
-  columnHelper.accessor('data.role', {
-    id: 'role',
-    header: () => 'Role',
-    cell: (info) => <span className="font-light ">{info.renderValue()}</span>,
-    footer: (info) => info.column.id,
+  columnHelper.accessor('data.ownedEvents', {
+    header: () => <span>Owned events</span>,
     meta: {
-      showFilter: false,
-      className: 'max-w-[200px]',
+      filterVariant: 'collection',
+      collectionFilterKey: 'ownedEvents',
     },
-    filterFn: filterCollectionByName('role'),
+    cell: (info) => {
+      const events = info.getValue();
+      if (events?.length === 0 || !events)
+        return <div className="font-light text-sm text-gray-400/80 text-left italic">User owns no events</div>;
+
+      const isExpandable = events?.length > 10;
+      const isOpen = isExpandable ? events?.length < 10 : true;
+      const [isExpanded, setIsExpanded] = useState(isOpen);
+
+      return (
+        <div>
+          {isExpandable && (
+            <button onClick={() => setIsExpanded(!isExpanded)} className="mb-2 text-sm text-gray-600 hover:text-gray-900">
+              {isExpanded ? '▼' : '▶'} {events.length} event{events.length !== 1 ? 's' : ''}
+            </button>
+          )}
+          {isExpanded && (
+            <ul>
+              {events.map((event: CollectionEntry<'events'>, index: number) => (
+                <li key={`${event.data.id}-${index}`} className="py-1 group font-light ">
+                  <a
+                    href={buildUrl(`/docs/${event.collection}/${event.data.id}/${event.data.version}`)}
+                    className="group-hover:text-primary flex space-x-1 items-center "
+                  >
+                    <div className={`flex items-center border border-gray-300 shadow-sm rounded-md`}>
+                      <span className="flex items-center">
+                        <span className={`bg-orange-500 h-full rounded-tl rounded-bl p-1`}>
+                          <BoltIcon className="h-4 w-4 text-white" />
+                        </span>
+                        <span className="leading-none px-2 group-hover:underline ">
+                          {event.data.name} (v{event.data.version})
+                        </span>
+                      </span>
+                    </div>
+                  </a>
+                </li>
+              ))}
+            </ul>
+          )}
+        </div>
+      );
+    },
+    footer: (info) => info.column.id,
+    filterFn: filterCollectionByName('ownedEvents'),
   }),
 
   columnHelper.accessor('data.ownedCommands', {
@@ -115,43 +146,44 @@ export const columns = () => [
     footer: (info) => info.column.id,
     filterFn: filterCollectionByName('ownedCommands'),
   }),
-  columnHelper.accessor('data.ownedEvents', {
-    header: () => <span>Owned Events</span>,
+
+  columnHelper.accessor('data.ownedQueries', {
+    header: () => <span>Owned queries</span>,
     meta: {
       filterVariant: 'collection',
-      collectionFilterKey: 'ownedEvents',
+      collectionFilterKey: 'ownedQueries',
     },
     cell: (info) => {
-      const events = info.getValue();
-      if (events?.length === 0 || !events)
-        return <div className="font-light text-sm text-gray-400/80 text-left italic">User owns no events</div>;
+      const queries = info.getValue();
+      if (queries?.length === 0 || !queries)
+        return <div className="font-light text-sm text-gray-400/60 text-left italic">User owns no queries</div>;
 
-      const isExpandable = events?.length > 10;
-      const isOpen = isExpandable ? events?.length < 10 : true;
+      const isExpandable = queries?.length > 10;
+      const isOpen = isExpandable ? queries?.length < 10 : true;
       const [isExpanded, setIsExpanded] = useState(isOpen);
 
       return (
         <div>
           {isExpandable && (
             <button onClick={() => setIsExpanded(!isExpanded)} className="mb-2 text-sm text-gray-600 hover:text-gray-900">
-              {isExpanded ? '▼' : '▶'} {events.length} event{events.length !== 1 ? 's' : ''}
+              {isExpanded ? '▼' : '▶'} {queries.length} query{queries.length !== 1 ? 's' : ''}
             </button>
           )}
           {isExpanded && (
             <ul>
-              {events.map((event: CollectionEntry<'events'>, index: number) => (
-                <li key={`${event.data.id}-${index}`} className="py-1 group font-light ">
+              {queries.map((query: CollectionEntry<'queries'>, index: number) => (
+                <li key={`${query.data.id}-${index}`} className="py-1 group font-light ">
                   <a
-                    href={buildUrl(`/docs/${event.collection}/${event.data.id}/${event.data.version}`)}
+                    href={buildUrl(`/docs/${query.collection}/${query.data.id}/${query.data.version}`)}
                     className="group-hover:text-primary flex space-x-1 items-center "
                   >
-                    <div className={`flex items-center border border-gray-300 shadow-sm rounded-md`}>
+                    <div className={`flex items-center border border-gray-300 shadow-sm rounded-md h-full`}>
                       <span className="flex items-center">
-                        <span className={`bg-orange-500 h-full rounded-tl rounded-bl p-1`}>
-                          <BoltIcon className="h-4 w-4 text-white" />
+                        <span className={`bg-green-500 flex rounded-tl rounded-bl p-1 h-full`}>
+                          <MagnifyingGlassIcon className="h-4 w-4 text-white" />
                         </span>
                         <span className="leading-none px-2 group-hover:underline ">
-                          {event.data.name} (v{event.data.version})
+                          {query.data.name} (v{query.data.version})
                         </span>
                       </span>
                     </div>
@@ -162,10 +194,13 @@ export const columns = () => [
           )}
         </div>
       );
+
+      // return commands.length;
     },
     footer: (info) => info.column.id,
-    filterFn: filterCollectionByName('ownedEvents'),
+    filterFn: filterCollectionByName('ownedCommands'),
   }),
+
   columnHelper.accessor('data.ownedServices', {
     header: () => <span>Owned Services</span>,
     meta: {

package/eventcatalog/src/content/config.ts

@@ -267,6 +267,7 @@ const users = defineCollection({
     ownedServices: z.array(reference('services')).optional(),
     ownedEvents: z.array(reference('events')).optional(),
     ownedCommands: z.array(reference('commands')).optional(),
+    ownedQueries: z.array(reference('queries')).optional(),
     associatedTeams: z.array(reference('teams')).optional(),
   }),
 });
@@ -283,6 +284,7 @@ const teams = defineCollection({
     msTeamsDirectMessageUrl: z.string().optional(),
     members: z.array(reference('users')).optional(),
     ownedCommands: z.array(reference('commands')).optional(),
+    ownedQueries: z.array(reference('queries')).optional(),
     ownedDomains: z.array(reference('domains')).optional(),
     ownedServices: z.array(reference('services')).optional(),
     ownedEvents: z.array(reference('events')).optional(),

package/eventcatalog/src/pages/directory/[type]/index.astro

@@ -46,6 +46,7 @@ function mapToItem(i: any) {
       ({
         collection: d.collection,
         data: {
+          // @ts-ignore
           id: d.data.id,
           name: d.data.name,
           // @ts-ignore
@@ -57,6 +58,8 @@ function mapToItem(i: any) {
           // @ts-ignore
           ownedCommands: d.data?.ownedCommands?.map(mapToItem) ?? [],
           // @ts-ignore
+          ownedQueries: d.data?.ownedQueries?.map(mapToItem) ?? [],
+          // @ts-ignore
           ownedEvents: d.data?.ownedEvents?.map(mapToItem) ?? [],
           // @ts-ignore
           ownedServices: d.data?.ownedServices?.map(mapToItem) ?? [],

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

@@ -37,6 +37,7 @@ const domains = props.data.ownedDomains as CollectionEntry<'domains'>[];
 const services = props.data.ownedServices as CollectionEntry<'services'>[];
 const events = props.data.ownedEvents as CollectionEntry<'events'>[];
 const commands = props.data.ownedCommands as CollectionEntry<'commands'>[];
+const queries = props.data.ownedQueries as CollectionEntry<'queries'>[];
 
 const membersList = members.map((o) => ({
   label: o.data.name,
@@ -68,6 +69,13 @@ const ownedEventsList = [...events, ...commands].map((p) => ({
   collection: p.collection,
   tag: `v${p.data.version}`,
 }));
+
+const ownedQueriesList = queries.map((p) => ({
+  label: `${p.data.name}`,
+  href: buildUrl(`/docs/${p.collection}/${p.data.id}/${p.data.version}`),
+  collection: p.collection,
+  tag: `v${p.data.version}`,
+}));
 ---
 
 <VerticalSideBarLayout title={`Team | ${props.data.name}`} description={props.data.summary}>
@@ -153,6 +161,13 @@ const ownedEventsList = [...events, ...commands].map((p) => ({
           emptyMessage={`This team does not own any messages .`}
           client:load
         />
+        <PillListFlat
+          color="purple"
+          title={`Owned queries (${ownedQueriesList.length})`}
+          pills={ownedQueriesList}
+          emptyMessage={`This team does not own any queries .`}
+          client:load
+        />
         <OwnersList
           title={`Team members (${membersList.length})`}
           owners={membersList}

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

@@ -33,6 +33,7 @@ const domains = props.data.ownedDomains as CollectionEntry<'domains'>[];
 const services = props.data.ownedServices as CollectionEntry<'services'>[];
 const events = props.data.ownedEvents as CollectionEntry<'events'>[];
 const commands = props.data.ownedCommands as CollectionEntry<'commands'>[];
+const queries = props.data.ownedQueries as CollectionEntry<'queries'>[];
 const teams = props.data.associatedTeams as CollectionEntry<'teams'>[];
 
 const ownedDomainsList = domains.map((p) => ({
@@ -49,7 +50,7 @@ const ownedServicesList = services.map((p) => ({
   tag: `v${p.data.version}`,
 }));
 
-const ownedMessageList = [...events, ...commands].map((p) => ({
+const ownedMessageList = [...events, ...commands, ...queries].map((p) => ({
   label: `${p.data.name}`,
   badge: p.collection,
   color: p.collection === 'events' ? 'orange' : 'blue',

package/eventcatalog/src/utils/teams.ts

@@ -23,7 +23,7 @@ export const getTeams = async (): Promise<Team[]> => {
   // What do they own?
   const events = await getCollection('events');
   const commands = await getCollection('commands');
-
+  const queries = await getCollection('queries');
   cachedTeams = teams.map((team) => {
     const ownedDomains = domains.filter((domain) => {
       return domain.data.owners?.find((owner) => owner.id === team.data.id);
@@ -41,6 +41,10 @@ export const getTeams = async (): Promise<Team[]> => {
       return command.data.owners?.find((owner) => owner.id === team.data.id);
     });
 
+    const ownedQueries = queries.filter((query) => {
+      return query.data.owners?.find((owner) => owner.id === team.data.id);
+    });
+
     return {
       ...team,
       data: {
@@ -48,6 +52,7 @@ export const getTeams = async (): Promise<Team[]> => {
         ownedDomains,
         ownedServices,
         ownedCommands,
+        ownedQueries,
         ownedEvents,
       },
       catalog: {

package/eventcatalog/src/utils/users.ts

@@ -1,3 +1,4 @@
+import type { CollectionTypes } from '@types';
 import { getCollection } from 'astro:content';
 import type { CollectionEntry } from 'astro:content';
 import path from 'path';
@@ -12,15 +13,10 @@ export const getUsers = async (): Promise<User[]> => {
 
   // What do they own?
   const domains = await getCollection('domains');
-
-  // What do they own?
   const services = await getCollection('services');
-
-  // What do they own?
   const events = await getCollection('events');
-
-  // What do they own?
   const commands = await getCollection('commands');
+  const queries = await getCollection('queries');
 
   const teams = await getCollection('teams', (team) => {
     return team.data.hidden !== true;
@@ -35,19 +31,18 @@ export const getUsers = async (): Promise<User[]> => {
       return domain.data.owners?.find((owner) => owner.id === user.data.id);
     });
 
-    const isOwnedByUserOrAssociatedTeam = () => {
-      const associatedTeamsSlug: string[] = associatedTeams.map((team) => team.id);
-
-      return ({ data }: { data: { owners?: Array<{ slug: string }> } }) => {
-        return data.owners?.some((owner) => owner.slug === user.data.id || associatedTeamsSlug.includes(owner.slug));
-      };
+    const isOwnedByUserOrAssociatedTeam = (item: CollectionEntry<CollectionTypes>) => {
+      const associatedTeamsSlug: string[] = associatedTeams.map((team) => team.slug);
+      return item.data.owners?.some((owner) => owner.id === user.data.id || associatedTeamsSlug.includes(owner.id));
     };
 
-    const ownedServices = services.filter(() => isOwnedByUserOrAssociatedTeam());
+    const ownedServices = services.filter(isOwnedByUserOrAssociatedTeam);
+
+    const ownedEvents = events.filter(isOwnedByUserOrAssociatedTeam);
 
-    const ownedEvents = events.filter(() => isOwnedByUserOrAssociatedTeam());
+    const ownedCommands = commands.filter(isOwnedByUserOrAssociatedTeam);
 
-    const ownedCommands = commands.filter(() => isOwnedByUserOrAssociatedTeam());
+    const ownedQueries = queries.filter(isOwnedByUserOrAssociatedTeam);
 
     return {
       ...user,
@@ -57,6 +52,7 @@ export const getUsers = async (): Promise<User[]> => {
         ownedServices,
         ownedEvents,
         ownedCommands,
+        ownedQueries,
         associatedTeams,
       },
       catalog: {

package/package.json

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