Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

fix(quick-access): not able to get item from quick access because of pagination (#5056)

dev-rbcad9588f2023
diff --git a/apps/web/src/lib/core/context/quickAccess/GraphqlQuickAccessSource.tsx b/apps/web/src/lib/core/context/quickAccess/GraphqlQuickAccessSource.tsx
index e1f5f8981d..b279ecf019 100644
--- a/apps/web/src/lib/core/context/quickAccess/GraphqlQuickAccessSource.tsx
+++ b/apps/web/src/lib/core/context/quickAccess/GraphqlQuickAccessSource.tsx
@@ -51,7 +51,6 @@ import type {
} from './types';
const QUICK_ACCESS_LIMIT = 500;
-const DEFAULT_SEARCH_PAGE_SIZE = 50;
const CACHE_REFRESH_DEBOUNCE_MS = 250;
const NIL_UUID = '00000000-0000-0000-0000-000000000000';
@@ -279,7 +278,6 @@ export function createGraphqlQuickAccessValue(): QuickAccessContextValue {
buckets,
searchTerm: activeSearchTerm,
enabled: listEnabled,
- pageSize: DEFAULT_SEARCH_PAGE_SIZE,
selectedItems,
localItems,
instructionsId: () => instructionsIdQuery.data ?? undefined,
diff --git a/apps/web/src/lib/core/context/quickAccess/record-selection-list.test.ts b/apps/web/src/lib/core/context/quickAccess/record-selection-list.test.ts
index 119ad174c4..98b329b25d 100644
--- a/apps/web/src/lib/core/context/quickAccess/record-selection-list.test.ts
+++ b/apps/web/src/lib/core/context/quickAccess/record-selection-list.test.ts
@@ -44,7 +44,7 @@ function runInRoot(run: () => Promise<void>): Promise<void> {
}
describe('createRecordSelectionQuickAccessItems', () => {
- it('filters, sorts, searches, counts, and paginates locally', async () => {
+ it('filters, sorts, searches, and counts locally', async () => {
await runInRoot(async () => {
const [searchTerm, setSearchTerm] = createSignal('');
const selected = [
@@ -73,7 +73,6 @@ describe('createRecordSelectionQuickAccessItems', () => {
buckets: [],
searchTerm,
enabled: () => true,
- pageSize: 2,
selectedItems: () => selected,
localItems: () => local,
instructionsId: () => undefined,
@@ -82,9 +81,14 @@ describe('createRecordSelectionQuickAccessItems', () => {
onItems: () => undefined,
});
- expect(list.items().map((item) => item.id)).toEqual(['b', 'a']);
+ expect(list.items().map((item) => item.id)).toEqual([
+ 'b',
+ 'a',
+ 'c',
+ 'person',
+ ]);
expect(list.totalCount()).toBe(4);
- expect(list.hasMore()).toBe(true);
+ expect(list.hasMore()).toBe(false);
await list.loadMore();
expect(list.items().map((item) => item.id)).toEqual([
'b',
@@ -92,7 +96,6 @@ describe('createRecordSelectionQuickAccessItems', () => {
'c',
'person',
]);
- expect(list.hasMore()).toBe(false);
setSearchTerm('charlie');
await Promise.resolve();
@@ -102,13 +105,12 @@ describe('createRecordSelectionQuickAccessItems', () => {
});
});
- it('applies bucket filtering before counts and visible slicing', async () => {
+ it('applies bucket filtering before counting items', async () => {
await runInRoot(async () => {
const list = createRecordSelectionQuickAccessItems({
buckets: ['document'],
searchTerm: () => '',
enabled: () => true,
- pageSize: 1,
selectedItems: () => [
entity('doc-a', 'document', 'A', 1),
entity('email-a', 'email', 'Email', 2),
@@ -121,9 +123,9 @@ describe('createRecordSelectionQuickAccessItems', () => {
onItems: () => undefined,
});
- expect(list.items().map((item) => item.id)).toEqual(['doc-b']);
+ expect(list.items().map((item) => item.id)).toEqual(['doc-b', 'doc-a']);
expect(list.totalCount()).toBe(2);
- expect(list.hasMore()).toBe(true);
+ expect(list.hasMore()).toBe(false);
await list.loadMore();
expect(list.items().map((item) => item.id)).toEqual(['doc-b', 'doc-a']);
});
diff --git a/apps/web/src/lib/core/context/quickAccess/record-selection-list.ts b/apps/web/src/lib/core/context/quickAccess/record-selection-list.ts
index eceafb10b5..80e0eb6d4d 100644
--- a/apps/web/src/lib/core/context/quickAccess/record-selection-list.ts
+++ b/apps/web/src/lib/core/context/quickAccess/record-selection-list.ts
@@ -1,9 +1,4 @@
-import {
- type Accessor,
- createComputed,
- createMemo,
- createSignal,
-} from 'solid-js';
+import { type Accessor, createMemo } from 'solid-js';
import { searchQuickAccessEntities } from './entity-search';
import type {
Bucket,
@@ -40,12 +35,11 @@ function addItem(
}
}
-/** Creates a locally filtered and paginated Quick Access record list. */
+/** Creates a locally filtered Quick Access record list. */
export function createRecordSelectionQuickAccessItems(options: {
buckets: Bucket[];
searchTerm: Accessor<string>;
enabled: Accessor<boolean>;
- pageSize: number;
selectedItems: Accessor<EntityItem[]>;
localItems: Accessor<QuickAccessItem[]>;
instructionsId: Accessor<string | undefined>;
@@ -61,14 +55,6 @@ export function createRecordSelectionQuickAccessItems(options: {
(bucket !== 'crm_company' || options.crmEnabled())
)
);
- const [visibleLimit, setVisibleLimit] = createSignal(options.pageSize);
-
- createComputed(() => {
- options.searchTerm();
- options.enabled();
- entityBuckets();
- setVisibleLimit(options.pageSize);
- });
const allItems = createMemo<QuickAccessItem[]>(() => {
if (!options.enabled()) return [];
@@ -115,19 +101,12 @@ export function createRecordSelectionQuickAccessItems(options: {
return result;
});
- const items = createMemo(() => allItems().slice(0, visibleLimit()));
- const hasMore = createMemo(() => visibleLimit() < allItems().length);
-
return {
- items,
+ items: allItems,
totalCount: () => allItems().length,
- hasMore,
+ hasMore: () => false,
isLoadingMore: () => false,
- loadMore: async () => {
- setVisibleLimit((limit) =>
- Math.min(limit + options.pageSize, allItems().length)
- );
- },
+ loadMore: async () => undefined,
entityBuckets,
};
}