@eventcatalog/core 3.29.2 → 3.30.0

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

@@ -246,15 +246,15 @@ export const Table = <T extends TCollectionTypes>({
 
   return (
     <div>
-      <div className="rounded-lg border border-[rgb(var(--ec-page-border))] overflow-hidden">
-        <table className="min-w-full divide-y divide-[rgb(var(--ec-page-border))]">
-          <thead className="bg-[rgb(var(--ec-content-hover))] sticky top-0 z-10">
+      <div className="overflow-hidden rounded-xl border border-[rgb(var(--ec-page-border)/0.72)] dark:border-white/10 bg-[rgb(var(--ec-dropdown-bg)/0.66)]">
+        <table className="min-w-full divide-y divide-[rgb(var(--ec-page-border)/0.62)] dark:divide-white/10">
+          <thead className="sticky top-0 z-10 bg-[rgb(var(--ec-content-hover)/0.45)]">
             {table.getHeaderGroups().map((headerGroup, index) => (
               <tr key={`${headerGroup}-${index}`}>
                 {headerGroup.headers.map((header) => (
                   <th
                     key={`${header.id}`}
-                    className="px-4 py-3 text-left text-xs font-semibold text-[rgb(var(--ec-page-text-muted))] uppercase tracking-wider"
+                    className="px-4 py-2.5 text-left text-[11px] font-medium text-[rgb(var(--ec-page-text-muted))] uppercase tracking-wider"
                   >
                     <div className="flex flex-col gap-2">
                       <div>{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}</div>
@@ -269,10 +269,13 @@ export const Table = <T extends TCollectionTypes>({
             ))}
           </thead>
 
-          <tbody className="bg-[rgb(var(--ec-card-bg,var(--ec-page-bg)))] divide-y divide-[rgb(var(--ec-page-border))]">
+          <tbody className="divide-y divide-[rgb(var(--ec-page-border)/0.5)] dark:divide-white/8">
             {hasResults ? (
               table.getRowModel().rows.map((row, index) => (
-                <tr key={`${row.id}-${index}`} className="hover:bg-[rgb(var(--ec-content-hover))] transition-colors">
+                <tr
+                  key={`${row.id}-${index}`}
+                  className="group bg-transparent transition-colors hover:bg-[rgb(var(--ec-content-hover)/0.38)]"
+                >
                   {row.getVisibleCells().map((cell) => (
                     <td
                       key={cell.id}
@@ -299,8 +302,8 @@ export const Table = <T extends TCollectionTypes>({
       </div>
 
       {/* Pagination */}
-      <div className="flex items-center justify-between px-1 py-4">
-        <div className="text-sm text-[rgb(var(--ec-page-text-muted))]">
+      <div className="flex items-center justify-between border-t border-[rgb(var(--ec-page-border))] px-1 py-3">
+        <div className="text-xs text-[rgb(var(--ec-page-text-muted))]">
           {totalResults > 0 && (
             <span>
               Showing <span className="font-medium text-[rgb(var(--ec-page-text))]">{table.getRowModel().rows.length}</span> of{' '}
@@ -309,9 +312,9 @@ export const Table = <T extends TCollectionTypes>({
           )}
         </div>
         <div className="flex items-center gap-2">
-          <div className="flex items-center rounded-lg border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-card-bg,var(--ec-page-bg)))]">
+          <div className="flex items-center rounded-lg border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-page-bg)/0.35)]">
             <button
-              className="p-2 text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] hover:bg-[rgb(var(--ec-content-hover))] disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent transition-colors rounded-l-lg"
+              className="p-1.5 text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] hover:bg-[rgb(var(--ec-content-hover))] disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent transition-colors rounded-l-lg"
               onClick={() => table.setPageIndex(0)}
               disabled={!table.getCanPreviousPage()}
               title="First page"
@@ -319,20 +322,20 @@ export const Table = <T extends TCollectionTypes>({
               <ChevronsLeft className="w-4 h-4" />
             </button>
             <button
-              className="p-2 text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] hover:bg-[rgb(var(--ec-content-hover))] disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent transition-colors border-l border-[rgb(var(--ec-page-border))]"
+              className="p-1.5 text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] hover:bg-[rgb(var(--ec-content-hover))] disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent transition-colors border-l border-[rgb(var(--ec-page-border))]"
               onClick={() => table.previousPage()}
               disabled={!table.getCanPreviousPage()}
               title="Previous page"
             >
               <ChevronLeft className="w-4 h-4" />
             </button>
-            <span className="px-3 py-2 text-sm text-[rgb(var(--ec-page-text-muted))] border-l border-r border-[rgb(var(--ec-page-border))] min-w-[100px] text-center">
-              Page{' '}
-              <span className="font-medium text-[rgb(var(--ec-page-text))]">{table.getState().pagination.pageIndex + 1}</span> of{' '}
-              <span className="font-medium text-[rgb(var(--ec-page-text))]">{table.getPageCount() || 1}</span>
+            <span className="min-w-[72px] px-3 py-1.5 text-center text-xs tabular-nums text-[rgb(var(--ec-page-text-muted))] border-l border-r border-[rgb(var(--ec-page-border))]">
+              <span className="font-medium text-[rgb(var(--ec-page-text))]">{table.getState().pagination.pageIndex + 1}</span>
+              {' / '}
+              <span>{table.getPageCount() || 1}</span>
             </span>
             <button
-              className="p-2 text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] hover:bg-[rgb(var(--ec-content-hover))] disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent transition-colors border-r border-[rgb(var(--ec-page-border))]"
+              className="p-1.5 text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] hover:bg-[rgb(var(--ec-content-hover))] disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent transition-colors border-r border-[rgb(var(--ec-page-border))]"
               onClick={() => table.nextPage()}
               disabled={!table.getCanNextPage()}
               title="Next page"
@@ -340,7 +343,7 @@ export const Table = <T extends TCollectionTypes>({
               <ChevronRight className="w-4 h-4" />
             </button>
             <button
-              className="p-2 text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] hover:bg-[rgb(var(--ec-content-hover))] disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent transition-colors rounded-r-lg"
+              className="p-1.5 text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] hover:bg-[rgb(var(--ec-content-hover))] disabled:opacity-40 disabled:cursor-not-allowed disabled:hover:bg-transparent transition-colors rounded-r-lg"
               onClick={() => table.setPageIndex(table.getPageCount() - 1)}
               disabled={!table.getCanNextPage()}
               title="Last page"
@@ -353,7 +356,7 @@ export const Table = <T extends TCollectionTypes>({
             onChange={(e) => {
               table.setPageSize(Number(e.target.value));
             }}
-            className="px-3 py-2 text-sm text-[rgb(var(--ec-page-text-muted))] bg-[rgb(var(--ec-card-bg,var(--ec-page-bg)))] border border-[rgb(var(--ec-page-border))] rounded-lg hover:border-[rgb(var(--ec-icon-color))] focus:outline-hidden focus:ring-2 focus:ring-[rgb(var(--ec-accent)/0.2)] transition-colors"
+            className="rounded-lg border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-page-bg)/0.35)] px-3 py-1.5 text-xs text-[rgb(var(--ec-page-text-muted))] hover:border-[rgb(var(--ec-icon-color))] focus:outline-hidden focus:ring-2 focus:ring-[rgb(var(--ec-accent)/0.2)] transition-colors"
           >
             {[10, 20, 30, 40, 50].map((pageSize) => (
               <option key={pageSize} value={pageSize}>

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

@@ -4,17 +4,69 @@ import { filterByName, filterCollectionByName } from '../filters/custom-filters'
 import { buildUrl } from '@utils/url-builder';
 import type { TData } from '../Table';
 import type { CollectionUserTypes } from '@types';
-import type { CollectionEntry } from 'astro:content';
-import { ServerIcon, BoltIcon, ChatBubbleLeftIcon, MagnifyingGlassIcon } from '@heroicons/react/24/solid';
-import { Users } from 'lucide-react';
 import type { TableConfiguration } from '@types';
+import { getColorAndIconForCollection } from '@utils/collections/icons';
 const columnHelper = createColumnHelper<TData<CollectionUserTypes>>();
 
-const getMessageIconAndColor = (collection: string) => {
-  if (collection === 'events') return { Icon: BoltIcon, color: 'orange' };
-  if (collection === 'commands') return { Icon: ChatBubbleLeftIcon, color: 'blue' };
-  if (collection === 'queries') return { Icon: MagnifyingGlassIcon, color: 'green' };
-  return { Icon: ChatBubbleLeftIcon, color: 'gray' };
+const colorClasses: Record<string, string> = {
+  orange: 'text-orange-500',
+  blue: 'text-blue-500',
+  green: 'text-green-500',
+  pink: 'text-pink-500',
+  yellow: 'text-yellow-500',
+  teal: 'text-teal-500',
+  purple: 'text-purple-500',
+  red: 'text-red-500',
+  gray: 'text-gray-500',
+  cyan: 'text-cyan-500',
+};
+
+const CollectionListCell = ({
+  items,
+  emptyText,
+}: {
+  items: Array<{ collection: string; data: { id: string; name: string; version?: string } }> | undefined;
+  emptyText: string;
+}) => {
+  const [isExpanded, setIsExpanded] = useState(false);
+
+  if (!items || items.length === 0) {
+    return <span className="text-xs text-[rgb(var(--ec-icon-color))]">{emptyText}</span>;
+  }
+
+  const visibleItems = isExpanded ? items : items.slice(0, 4);
+  const hiddenCount = items.length - 4;
+
+  return (
+    <div className="flex flex-col gap-1">
+      {visibleItems.map((item, index) => {
+        const { color, Icon } = getColorAndIconForCollection(item.collection);
+        const href = buildUrl(`/docs/${item.collection}/${item.data.id}${item.data.version ? `/${item.data.version}` : ''}`);
+
+        return (
+          <a
+            key={`${item.data.id}-${index}`}
+            href={href}
+            className="group inline-flex items-center gap-1.5 text-[0.8rem] text-[rgb(var(--ec-icon-color))] transition-colors hover:text-[rgb(var(--ec-accent))]"
+          >
+            <Icon className={`h-3.5 w-3.5 flex-shrink-0 ${colorClasses[color] || 'text-[rgb(var(--ec-icon-color))]'}`} />
+            <span className="max-w-[140px] truncate" title={item.data.name}>
+              {item.data.name}
+            </span>
+            {item.data.version && <span className="text-xs text-[rgb(var(--ec-icon-color))]">v{item.data.version}</span>}
+          </a>
+        );
+      })}
+      {hiddenCount > 0 && (
+        <button
+          onClick={() => setIsExpanded(!isExpanded)}
+          className="text-xs text-[rgb(var(--ec-accent))] hover:underline text-left"
+        >
+          {isExpanded ? 'Show less' : `+${hiddenCount} more`}
+        </button>
+      )}
+    </div>
+  );
 };
 
 export const columns = (tableConfiguration: TableConfiguration) => [
@@ -24,15 +76,11 @@ export const columns = (tableConfiguration: TableConfiguration) => [
     cell: (info) => {
       const team = info.row.original;
       return (
-        <a href={buildUrl(`/docs/${team.collection}/${team.data.id}`)} className="group inline-flex items-center">
-          <span className="inline-flex items-center rounded-md border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-card-bg,var(--ec-page-bg)))] hover:border-pink-400 dark:hover:border-pink-500 hover:bg-pink-50 dark:hover:bg-pink-500/10 transition-colors">
-            <span className="flex items-center justify-center w-6 h-6 bg-pink-500 rounded-l-md">
-              <Users className="h-3 w-3 text-white" />
-            </span>
-            <span className="px-2 py-1 text-xs text-[rgb(var(--ec-page-text))] group-hover:text-[rgb(var(--ec-page-text))]">
-              {team.data.name}
-            </span>
-          </span>
+        <a
+          href={buildUrl(`/docs/${team.collection}/${team.data.id}`)}
+          className="group inline-flex items-center text-sm font-semibold text-[rgb(var(--ec-page-text))] transition-colors hover:text-[rgb(var(--ec-accent))]"
+        >
+          <span>{team.data.name}</span>
         </a>
       );
     },
@@ -56,57 +104,14 @@ export const columns = (tableConfiguration: TableConfiguration) => [
       meta: {
         showFilter: false,
       },
-      cell: (info) => {
-        const messages = info.getValue() as Array<
-          CollectionEntry<'events'> | CollectionEntry<'commands'> | CollectionEntry<'queries'>
-        >;
-        const [isExpanded, setIsExpanded] = useState(false);
-
-        if (messages?.length === 0 || !messages)
-          return (
-            <span className="inline-flex items-center px-2 py-1 text-xs text-[rgb(var(--ec-icon-color))] bg-[rgb(var(--ec-content-hover))] rounded-md border border-[rgb(var(--ec-page-border))]">
-              No messages
-            </span>
-          );
-
-        const visibleItems = isExpanded ? messages : messages.slice(0, 4);
-        const hiddenCount = messages.length - 4;
-
-        return (
-          <div className="flex flex-col gap-1.5">
-            {visibleItems.map((message, index: number) => {
-              const { Icon, color } = getMessageIconAndColor(message.collection);
-              return (
-                <a
-                  key={`${message.data.id}-${index}`}
-                  href={buildUrl(`/docs/${message.collection}/${message.data.id}/${message.data.version}`)}
-                  className="group inline-flex items-center"
-                >
-                  <span
-                    className={`inline-flex items-center rounded-md border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-card-bg,var(--ec-page-bg)))] hover:border-${color}-400 dark:hover:border-${color}-500 hover:bg-${color}-50 dark:hover:bg-${color}-500/10 transition-colors`}
-                  >
-                    <span className={`flex items-center justify-center w-6 h-6 bg-${color}-500 rounded-l-md`}>
-                      <Icon className="h-3 w-3 text-white" />
-                    </span>
-                    <span className="px-2 py-1 text-xs text-[rgb(var(--ec-page-text))] group-hover:text-[rgb(var(--ec-page-text))]">
-                      {message.data.name}
-                      <span className="text-[rgb(var(--ec-icon-color))] ml-1">v{message.data.version}</span>
-                    </span>
-                  </span>
-                </a>
-              );
-            })}
-            {hiddenCount > 0 && (
-              <button
-                onClick={() => setIsExpanded(!isExpanded)}
-                className="text-xs text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] text-left"
-              >
-                {isExpanded ? 'Show less' : `+${hiddenCount} more`}
-              </button>
-            )}
-          </div>
-        );
-      },
+      cell: (info) => (
+        <CollectionListCell
+          items={
+            info.getValue() as Array<{ collection: string; data: { id: string; name: string; version?: string } }> | undefined
+          }
+          emptyText="No messages"
+        />
+      ),
     }
   ),
 
@@ -117,70 +122,13 @@ export const columns = (tableConfiguration: TableConfiguration) => [
       filterVariant: 'collection',
       collectionFilterKey: 'ownedServices',
     },
-    cell: (info) => {
-      const services = info.getValue();
-      const [isExpanded, setIsExpanded] = useState(false);
-
-      if (services?.length === 0 || !services)
-        return (
-          <span className="inline-flex items-center px-2 py-1 text-xs text-[rgb(var(--ec-icon-color))] bg-[rgb(var(--ec-content-hover))] rounded-md border border-[rgb(var(--ec-page-border))]">
-            No services
-          </span>
-        );
-
-      const visibleItems = isExpanded ? services : services.slice(0, 4);
-      const hiddenCount = services.length - 4;
-
-      return (
-        <div className="flex flex-col gap-1.5">
-          {visibleItems.map((service: CollectionEntry<'services'>, index: number) => (
-            <a
-              key={`${service.data.id}-${index}`}
-              href={buildUrl(`/docs/${service.collection}/${service.data.id}/${service.data.version}`)}
-              className="group inline-flex items-center"
-            >
-              <span className="inline-flex items-center rounded-md border border-[rgb(var(--ec-page-border))] bg-[rgb(var(--ec-card-bg,var(--ec-page-bg)))] hover:border-pink-400 dark:hover:border-pink-500 hover:bg-pink-50 dark:hover:bg-pink-500/10 transition-colors">
-                <span className="flex items-center justify-center w-6 h-6 bg-pink-500 rounded-l-md">
-                  <ServerIcon className="h-3 w-3 text-white" />
-                </span>
-                <span className="px-2 py-1 text-xs text-[rgb(var(--ec-page-text))] group-hover:text-[rgb(var(--ec-page-text))]">
-                  {service.data.name}
-                  <span className="text-[rgb(var(--ec-icon-color))] ml-1">v{service.data.version}</span>
-                </span>
-              </span>
-            </a>
-          ))}
-          {hiddenCount > 0 && (
-            <button
-              onClick={() => setIsExpanded(!isExpanded)}
-              className="text-xs text-[rgb(var(--ec-icon-color))] hover:text-[rgb(var(--ec-page-text))] text-left"
-            >
-              {isExpanded ? 'Show less' : `+${hiddenCount} more`}
-            </button>
-          )}
-        </div>
-      );
-    },
+    cell: (info) => (
+      <CollectionListCell
+        items={info.getValue() as Array<{ collection: string; data: { id: string; name: string; version?: string } }> | undefined}
+        emptyText="No services"
+      />
+    ),
     footer: (info) => info.column.id,
     filterFn: filterCollectionByName('ownedServices'),
   }),
-
-  columnHelper.accessor('data.name', {
-    header: () => <span>{tableConfiguration.columns?.actions?.label || 'Actions'}</span>,
-    cell: (info) => {
-      const item = info.row.original;
-      return (
-        <a
-          className="inline-flex items-center px-2.5 py-1 text-xs font-medium text-[rgb(var(--ec-page-text-muted))] bg-[rgb(var(--ec-content-hover))] border border-[rgb(var(--ec-page-border))] rounded-md hover:bg-[rgb(var(--ec-content-hover))] hover:text-[rgb(var(--ec-page-text))] transition-colors whitespace-nowrap"
-          href={buildUrl(`/docs/${item.collection}/${item.data.id}`)}
-        >
-          View team
-        </a>
-      );
-    },
-    id: 'actions',
-    meta: {
-      showFilter: false,
-    },
-  }),
 ];