@eventcatalog/core 2.16.1 → 2.16.2

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

@@ -2,10 +2,8 @@ import { ServerIcon } from '@heroicons/react/20/solid';
 import { RectangleGroupIcon } from '@heroicons/react/20/solid';
 import { createColumnHelper } from '@tanstack/react-table';
 import type { CollectionEntry } from 'astro:content';
-import { filterByBadge, filterByName, filterCollectionByName } from '../filters/custom-filters';
+import { filterByName, filterCollectionByName } from '../filters/custom-filters';
 import { buildUrl } from '@utils/url-builder';
-import { Tag } from 'lucide-react';
-import { createBadgesColumn } from './SharedColumns';
 
 const columnHelper = createColumnHelper<CollectionEntry<'domains'>>();
 
@@ -42,6 +40,14 @@ export const columns = () => [
     },
     filterFn: filterByName,
   }),
+  // columnHelper.accessor('data.version', {
+  //   header: () => <span>Version</span>,
+  //   cell: (info) => {
+  //     const service = info.row.original;
+  //     return <div className="text-left font-light">{`v${info.getValue()} ${service.data.latestVersion === service.data.version ? '(latest)': ''}`}</div>
+  //   },
+  //   footer: (info) => info.column.id,
+  // }),
   columnHelper.accessor('data.summary', {
     id: 'summary',
     header: () => 'Summary',
@@ -90,9 +96,9 @@ export const columns = () => [
         </ul>
       );
     },
+    // footer: (info) => info.column.id,
     filterFn: filterCollectionByName('services'),
   }),
-  createBadgesColumn(columnHelper),
   columnHelper.accessor('data.name', {
     header: () => <span />,
     cell: (info) => {

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

@@ -1,9 +1,10 @@
+import { ServerIcon } from '@heroicons/react/20/solid';
+import { RectangleGroupIcon } from '@heroicons/react/20/solid';
 import { createColumnHelper } from '@tanstack/react-table';
 import type { CollectionEntry } from 'astro:content';
-import { filterByName } from '../filters/custom-filters';
+import { filterByName, filterCollectionByName } from '../filters/custom-filters';
 import { buildUrl } from '@utils/url-builder';
 import { QueueListIcon } from '@heroicons/react/24/solid';
-import { createBadgesColumn } from './SharedColumns';
 
 const columnHelper = createColumnHelper<CollectionEntry<'flows'>>();
 
@@ -60,7 +61,6 @@ export const columns = () => [
       className: 'max-w-md',
     },
   }),
-  createBadgesColumn(columnHelper),
   columnHelper.accessor('data.name', {
     header: () => <span />,
     cell: (info) => {

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

@@ -3,9 +3,8 @@ import { createColumnHelper } from '@tanstack/react-table';
 import type { CollectionMessageTypes } from '@types';
 import type { CollectionEntry } from 'astro:content';
 import { useMemo } from 'react';
-import { filterByName, filterCollectionByName, filterByBadge } from '../filters/custom-filters';
+import { filterByName, filterCollectionByName } from '../filters/custom-filters';
 import { buildUrl } from '@utils/url-builder';
-import { createBadgesColumn } from './SharedColumns';
 
 const columnHelper = createColumnHelper<CollectionEntry<CollectionMessageTypes>>();
 
@@ -56,7 +55,6 @@ export const columns = () => [
     },
     filterFn: filterByName,
   }),
-
   columnHelper.accessor('data.summary', {
     id: 'summary',
     header: () => 'Summary',
@@ -64,7 +62,7 @@ export const columns = () => [
     footer: (info) => info.column.id,
     meta: {
       showFilter: false,
-      className: 'max-w-[200px]',
+      className: 'max-w-md',
     },
   }),
 
@@ -147,7 +145,6 @@ export const columns = () => [
     footer: (info) => info.column.id,
     filterFn: filterCollectionByName('consumers'),
   }),
-  createBadgesColumn(columnHelper),
   columnHelper.accessor('data.name', {
     header: () => <span />,
     cell: (info) => {

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

@@ -5,7 +5,6 @@ import { useMemo, useState } from 'react';
 import { filterByName, filterCollectionByName } from '../filters/custom-filters';
 import { buildUrl } from '@utils/url-builder';
 import { getColorAndIconForMessageType } from './MessageTableColumns';
-import { createBadgesColumn } from './SharedColumns';
 
 const columnHelper = createColumnHelper<CollectionEntry<'services'>>();
 
@@ -41,6 +40,14 @@ export const columns = () => [
     },
     filterFn: filterByName,
   }),
+  // columnHelper.accessor('data.version', {
+  //   header: () => <span>Version</span>,
+  //   cell: (info) => {
+  //     const service = info.row.original;
+  //     return <div className="text-left">{`v${info.getValue()} ${service.data.latestVersion === service.data.version ? '(latest)': ''}`}</div>
+  //   },
+  //   footer: (info) => info.column.id,
+  // }),
   columnHelper.accessor('data.summary', {
     id: 'summary',
     header: () => 'Summary',
@@ -168,7 +175,6 @@ export const columns = () => [
     },
     filterFn: filterCollectionByName('sends'),
   }),
-  createBadgesColumn(columnHelper),
   columnHelper.accessor('data.name', {
     header: () => <span />,
     cell: (info) => {

package/eventcatalog/src/components/Tables/filters/custom-filters.ts

@@ -12,8 +12,3 @@ export const filterByName = (row: any, key: string, searchValue: string) => {
   const label = `${row?.original?.data.name} (v${row?.original?.data.version})` || '';
   return label.toLowerCase().includes(searchValue.toLowerCase());
 };
-
-export const filterByBadge = (row: any, key: string, searchValue: string) => {
-  const badges = row?.original?.data?.badges || [];
-  return badges.some((badge: any) => badge.content.toLowerCase().includes(searchValue.toLowerCase()));
-};

package/eventcatalog/src/layouts/DiscoverLayout.astro

@@ -100,7 +100,7 @@ const tabs = [
     </div>
 
     <!-- Table -->
-    <div class="pb-20 ml-6 md:pr-10">
+    <div class="pb-20 ml-6">
       <div>
         <div class="sm:flex sm:items-center py-4 pb-4" id="discover-title">
           <div class="sm:flex-auto space-y-2">

package/package.json

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

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

@@ -1,44 +0,0 @@
-import { createColumnHelper } from '@tanstack/react-table';
-import { Tag } from 'lucide-react';
-import { filterByBadge } from '../filters/custom-filters';
-export const createBadgesColumn = <T extends { data: { badges?: any[] } }>(
-  columnHelper: ReturnType<typeof createColumnHelper<T>>
-) => {
-  return columnHelper.accessor((row) => row.data.badges, {
-    id: 'badges',
-    header: () => <span>Badges</span>,
-    cell: (info) => {
-      const item = info.row.original;
-      const badges = item.data.badges || [];
-
-      if (badges?.length === 0 || !badges)
-        return <div className="font-light text-sm text-gray-400/60 text-left italic">No badges documented</div>;
-
-      return (
-        <ul>
-          {badges.map((badge: any, index: number) => {
-            return (
-              <li key={`${badge.id}-${index}`} className="py-1 group font-light ">
-                <div 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-${badge.backgroundColor}-500 h-full rounded-tl rounded-bl p-1`}>
-                        {badge.icon && <badge.icon className="h-4 w-4 text-white" />}
-                        {!badge.icon && <Tag className="h-4 w-4 text-white" />}
-                      </span>
-                      <span className="leading-none px-2 group-hover:underline ">{badge.content}</span>
-                    </span>
-                  </div>
-                </div>
-              </li>
-            );
-          })}
-        </ul>
-      );
-    },
-    meta: {
-      filterVariant: 'badges',
-    },
-    filterFn: filterByBadge,
-  });
-};