@tuturuuu/ui 0.25.0 → 0.25.3

package/src/components/ui/finance/invoices/pending-columns.tsx

@@ -1,10 +1,10 @@
 'use client';
 
-import type { ColumnDef } from '@tanstack/react-table';
 import { FileText } from '@tuturuuu/icons';
 import type { PendingInvoice } from '@tuturuuu/types/primitives/PendingInvoice';
 import { Avatar, AvatarFallback, AvatarImage } from '@tuturuuu/ui/avatar';
 import { Button } from '@tuturuuu/ui/button';
+import type { ColumnDef } from '@tuturuuu/ui/custom/tables/data-table';
 import { DataTableColumnHeader } from '@tuturuuu/ui/custom/tables/data-table-column-header';
 import { Popover, PopoverContent, PopoverTrigger } from '@tuturuuu/ui/popover';
 import { formatCurrency } from '@tuturuuu/utils/format';

package/src/components/ui/finance/invoices/row-actions.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import { useQueryClient } from '@tanstack/react-query';
-import type { Row } from '@tanstack/react-table';
 import { Ellipsis, Eye } from '@tuturuuu/icons';
 import { deleteInvoice } from '@tuturuuu/internal-api/finance';
 import type { Invoice } from '@tuturuuu/types/primitives/Invoice';
@@ -17,6 +16,7 @@ import {
   AlertDialogTrigger,
 } from '@tuturuuu/ui/alert-dialog';
 import { Button } from '@tuturuuu/ui/button';
+import type { Row } from '@tuturuuu/ui/custom/tables/data-table';
 import {
   DropdownMenu,
   DropdownMenuContent,

package/src/components/ui/finance/transactions/categories/columns.test.tsx

@@ -1,5 +1,5 @@
-import type { ColumnDef } from '@tanstack/react-table';
 import { render, screen, waitFor } from '@testing-library/react';
+import type { ColumnDef } from '@tuturuuu/ui/custom/tables/data-table';
 import { beforeEach, describe, expect, it } from 'vitest';
 import { transactionCategoryColumns } from './columns';
 
@@ -15,8 +15,8 @@ function CategoryAmountCell({ amount }: { amount: number }) {
   });
   const amountColumn = columns.find(
     (column) =>
-      (column as ColumnDef<unknown> & { accessorKey?: string }).accessorKey ===
-      'amount'
+      (column as ColumnDef<Record<string, unknown>> & { accessorKey?: string })
+        .accessorKey === 'amount'
   );
 
   if (typeof amountColumn?.cell !== 'function') return null;
@@ -45,8 +45,8 @@ function CategoryCountCell({ count }: { count: number }) {
   });
   const countColumn = columns.find(
     (column) =>
-      (column as ColumnDef<unknown> & { accessorKey?: string }).accessorKey ===
-      'transaction_count'
+      (column as ColumnDef<Record<string, unknown>> & { accessorKey?: string })
+        .accessorKey === 'transaction_count'
   );
 
   if (typeof countColumn?.cell !== 'function') return null;

package/src/components/ui/finance/transactions/categories/columns.tsx

@@ -1,13 +1,15 @@
 'use client';
 
-import type { ColumnDef } from '@tanstack/react-table';
 import { ArrowDownCircle, ArrowUpCircle } from '@tuturuuu/icons';
 import type { TransactionCategoryWithStats } from '@tuturuuu/types/primitives/TransactionCategory';
 import {
   getIconComponentByKey,
   type PlatformIconKey,
 } from '@tuturuuu/ui/custom/icon-picker';
-import type { ColumnGeneratorOptions } from '@tuturuuu/ui/custom/tables/data-table';
+import type {
+  ColumnDef,
+  ColumnGeneratorOptions,
+} from '@tuturuuu/ui/custom/tables/data-table';
 import { DataTableColumnHeader } from '@tuturuuu/ui/custom/tables/data-table-column-header';
 import { TransactionCategoryRowActions } from '@tuturuuu/ui/finance/transactions/categories/row-actions';
 import { computeAccessibleLabelStyles } from '@tuturuuu/utils/label-colors';

package/src/components/ui/finance/transactions/categories/row-actions.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import { useMutation, useQueryClient } from '@tanstack/react-query';
-import type { Row } from '@tanstack/react-table';
 import { Ellipsis } from '@tuturuuu/icons';
 import { deleteTransactionCategory } from '@tuturuuu/internal-api/finance';
 import type { TransactionCategory } from '@tuturuuu/types/primitives/TransactionCategory';
@@ -18,6 +17,7 @@ import {
 } from '@tuturuuu/ui/alert-dialog';
 import { Button } from '@tuturuuu/ui/button';
 import ModifiableDialogTrigger from '@tuturuuu/ui/custom/modifiable-dialog-trigger';
+import type { Row } from '@tuturuuu/ui/custom/tables/data-table';
 import {
   DropdownMenu,
   DropdownMenuContent,

package/src/components/ui/finance/transactions/columns.test.tsx

@@ -1,5 +1,5 @@
-import type { ColumnDef } from '@tanstack/react-table';
 import { render, screen, waitFor } from '@testing-library/react';
+import type { ColumnDef } from '@tuturuuu/ui/custom/tables/data-table';
 import { beforeEach, describe, expect, it, vi } from 'vitest';
 import { transactionColumns } from './columns';
 
@@ -23,8 +23,8 @@ function TransactionAmountCell({ amount }: { amount: number }) {
   });
   const amountColumn = columns.find(
     (column) =>
-      (column as ColumnDef<unknown> & { accessorKey?: string }).accessorKey ===
-      'amount'
+      (column as ColumnDef<Record<string, unknown>> & { accessorKey?: string })
+        .accessorKey === 'amount'
   );
 
   if (typeof amountColumn?.cell !== 'function') return null;
@@ -57,8 +57,8 @@ function TransactionColumnCell({
   });
   const column = columns.find(
     (item) =>
-      (item as ColumnDef<unknown> & { accessorKey?: string }).accessorKey ===
-      accessorKey
+      (item as ColumnDef<Record<string, unknown>> & { accessorKey?: string })
+        .accessorKey === accessorKey
   );
 
   if (typeof column?.cell !== 'function') return null;

package/src/components/ui/finance/transactions/columns.tsx

@@ -1,10 +1,12 @@
 'use client';
 
-import type { ColumnDef } from '@tanstack/react-table';
 import { Check, X } from '@tuturuuu/icons';
 import type { Transaction } from '@tuturuuu/types/primitives/Transaction';
 import { Avatar, AvatarFallback, AvatarImage } from '@tuturuuu/ui/avatar';
-import type { ColumnGeneratorOptions } from '@tuturuuu/ui/custom/tables/data-table';
+import type {
+  ColumnDef,
+  ColumnGeneratorOptions,
+} from '@tuturuuu/ui/custom/tables/data-table';
 import { TransactionRowActions } from '@tuturuuu/ui/finance/transactions/row-actions';
 import { formatCurrency } from '@tuturuuu/utils/format';
 import moment from 'moment';

package/src/components/ui/finance/transactions/row-actions.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import { useQueryClient } from '@tanstack/react-query';
-import type { Row } from '@tanstack/react-table';
 import { Ellipsis, Eye } from '@tuturuuu/icons';
 import { deleteTransaction as deleteTransactionWithInternalApi } from '@tuturuuu/internal-api/finance';
 import type { Transaction } from '@tuturuuu/types/primitives/Transaction';
@@ -18,6 +17,7 @@ import {
 } from '@tuturuuu/ui/alert-dialog';
 import { Button } from '@tuturuuu/ui/button';
 import ModifiableDialogTrigger from '@tuturuuu/ui/custom/modifiable-dialog-trigger';
+import type { Row } from '@tuturuuu/ui/custom/tables/data-table';
 import {
   DropdownMenu,
   DropdownMenuContent,

package/src/components/ui/finance/wallets/columns.tsx

@@ -1,6 +1,5 @@
 'use client';
 
-import type { ColumnDef } from '@tanstack/react-table';
 import {
   BookOpen,
   Check,
@@ -14,7 +13,10 @@ import {
 } from '@tuturuuu/icons';
 import type { Wallet } from '@tuturuuu/types/primitives/Wallet';
 import { Badge } from '@tuturuuu/ui/badge';
-import type { ColumnGeneratorOptions } from '@tuturuuu/ui/custom/tables/data-table';
+import type {
+  ColumnDef,
+  ColumnGeneratorOptions,
+} from '@tuturuuu/ui/custom/tables/data-table';
 import { DataTableColumnHeader } from '@tuturuuu/ui/custom/tables/data-table-column-header';
 import { WalletRowActions } from '@tuturuuu/ui/finance/wallets/row-actions';
 import type { ExchangeRate } from '@tuturuuu/utils/exchange-rates';

package/src/components/ui/finance/wallets/row-actions.tsx

@@ -1,7 +1,6 @@
 'use client';
 
 import { useQueryClient } from '@tanstack/react-query';
-import type { Row } from '@tanstack/react-table';
 import { Ellipsis, Eye } from '@tuturuuu/icons';
 import { deleteWallet as deleteWalletWithInternalApi } from '@tuturuuu/internal-api/finance';
 import type { Wallet } from '@tuturuuu/types/primitives/Wallet';
@@ -18,6 +17,7 @@ import {
 } from '@tuturuuu/ui/alert-dialog';
 import { Button } from '@tuturuuu/ui/button';
 import ModifiableDialogTrigger from '@tuturuuu/ui/custom/modifiable-dialog-trigger';
+import type { Row } from '@tuturuuu/ui/custom/tables/data-table';
 import {
   DropdownMenu,
   DropdownMenuContent,

package/src/hooks/use-notifications.ts

@@ -75,6 +75,7 @@ interface NotificationsPage {
 }
 
 interface UseNotificationsOptions {
+  cacheScope?: string;
   wsId?: string;
   limit?: number;
   offset?: number;
@@ -210,6 +211,7 @@ export function dedupeNotifications(
  * @param wsId - If provided, filters to specific workspace. If omitted, fetches all notifications across all workspaces.
  */
 export function useNotifications({
+  cacheScope,
   wsId,
   limit = 20,
   offset = 0,
@@ -226,6 +228,7 @@ export function useNotifications({
       unreadOnly,
       readOnly,
       type,
+      ...(cacheScope ? [cacheScope] : []),
     ],
     queryFn: async () => {
       const params = new URLSearchParams({
@@ -263,12 +266,14 @@ export function useNotifications({
  * Hook to fetch notifications with infinite scroll support
  */
 export function useInfiniteNotifications({
+  cacheScope,
   wsId,
   unreadOnly = false,
   readOnly = false,
   pageSize = 20,
   enabled = true,
 }: {
+  cacheScope?: string;
   wsId?: string;
   unreadOnly?: boolean;
   readOnly?: boolean;
@@ -282,6 +287,7 @@ export function useInfiniteNotifications({
       wsId || 'all',
       unreadOnly,
       readOnly,
+      ...(cacheScope ? [cacheScope] : []),
     ],
     queryFn: async ({ pageParam = 0 }) => {
       const params = new URLSearchParams({
@@ -317,9 +323,17 @@ export function useInfiniteNotifications({
  * Hook to get unread notification count.
  * If wsId is provided, scopes to that workspace. Otherwise returns total unread count.
  */
-export function useUnreadCount(wsId?: string, options?: { enabled?: boolean }) {
+export function useUnreadCount(
+  wsId?: string,
+  options?: { cacheScope?: string; enabled?: boolean }
+) {
   return useQuery({
-    queryKey: ['notifications', 'unread-count', wsId || 'all'],
+    queryKey: [
+      'notifications',
+      'unread-count',
+      wsId || 'all',
+      ...(options?.cacheScope ? [options.cacheScope] : []),
+    ],
     queryFn: async () => {
       const params = wsId ? `?wsId=${wsId}` : '';
       const response = await fetch(