Skip to content

Fix merge records page accumulating duplicate morph items #17705

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rdelassus wants to merge 4 commits into
base: main
Choose a base branch
from
+117 −12
Open

Fix merge records page accumulating duplicate morph items #17705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b45955d
Fix merge records IDs accumulation in command menu
Feb 4, 2026
0718e56
Merge branch 'main' into codex/fix-merge-records-duplicate-tabs
rdelassus Feb 4, 2026
d7b53a5
Merge branch 'main' into codex/fix-merge-records-duplicate-tabs
rdelassus Feb 4, 2026
19cefb7
Merge branch 'main' into codex/fix-merge-records-duplicate-tabs
rdelassus Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
113 changes: 113 additions & 0 deletions ...ules/command-menu/hooks/__tests__/useCommandMenuUpdateNavigationMorphItemsByPage.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,113 @@
import { useCommandMenuUpdateNavigationMorphItemsByPage } from '@/command-menu/hooks/useCommandMenuUpdateNavigationMorphItemsByPage';
import { commandMenuNavigationMorphItemsByPageState } from '@/command-menu/states/commandMenuNavigationMorphItemsByPageState';
import { renderHook } from '@testing-library/react';
import { act } from 'react';
import { RecoilRoot, useRecoilValue } from 'recoil';

const pageId = 'merge-page-id';
const objectMetadataId = 'company-metadata-id';

const Wrapper = ({
children,
initialRecordIds,
}: {
children: React.ReactNode;
initialRecordIds: string[];
}) => (
<RecoilRoot
initializeState={({ set }) => {
set(
commandMenuNavigationMorphItemsByPageState,
new Map([
[
pageId,
initialRecordIds.map((recordId) => ({
objectMetadataId,
recordId,
})),
],
]),
);
}}
>
{children}
</RecoilRoot>
);

const renderHooks = (initialRecordIds: string[]) =>
renderHook(
() => {
const { updateCommandMenuNavigationMorphItemsByPage } =
useCommandMenuUpdateNavigationMorphItemsByPage();
const commandMenuNavigationMorphItemsByPage = useRecoilValue(
commandMenuNavigationMorphItemsByPageState,
);

return {
updateCommandMenuNavigationMorphItemsByPage,
commandMenuNavigationMorphItemsByPage,
};
},
{
wrapper: ({ children }) => (
<Wrapper initialRecordIds={initialRecordIds}>{children}</Wrapper>
),
},
);

describe('useCommandMenuUpdateNavigationMorphItemsByPage', () => {
it('should replace existing items for a page instead of appending', async () => {
const { result } = renderHooks(['record-1', 'record-2']);

await act(async () => {
await result.current.updateCommandMenuNavigationMorphItemsByPage({
pageId,
objectMetadataId,
objectRecordIds: ['record-2', 'record-1'],
});
});

expect(
result.current.commandMenuNavigationMorphItemsByPage.get(pageId),
).toEqual([
{
objectMetadataId,
recordId: 'record-2',
},
{
objectMetadataId,
recordId: 'record-1',
},
]);
});

it('should keep only the latest payload when called twice for the same page', async () => {
const { result } = renderHooks([]);

await act(async () => {
await result.current.updateCommandMenuNavigationMorphItemsByPage({
pageId,
objectMetadataId,
objectRecordIds: ['record-1', 'record-2'],
});
await result.current.updateCommandMenuNavigationMorphItemsByPage({
pageId,
objectMetadataId,
objectRecordIds: ['record-2', 'record-1'],
});
});

expect(
result.current.commandMenuNavigationMorphItemsByPage.get(pageId),
).toEqual([
{
objectMetadataId,
recordId: 'record-2',
},
{
objectMetadataId,
recordId: 'record-1',
},
]);
});
});
16 changes: 4 additions & 12 deletions ...y-front/src/modules/command-menu/hooks/useCommandMenuUpdateNavigationMorphItemsByPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { commandMenuNavigationMorphItemsByPageState } from '@/command-menu/states/commandMenuNavigationMorphItemsByPageState';
import { isNonEmptyArray } from '@sniptt/guards';
import { useRecoilCallback } from 'recoil';

type UpdateNavigationMorphItemsByPageParams = {
Expand All @@ -20,17 +19,10 @@ export const useCommandMenuUpdateNavigationMorphItemsByPage = () => {
.getLoadable(commandMenuNavigationMorphItemsByPageState)
.getValue();

const currentMorphItemsForPage = currentMorphItems.get(pageId);

const newMorphItems = [
...(isNonEmptyArray(currentMorphItemsForPage)
? currentMorphItemsForPage
: []),
...objectRecordIds.map((recordId) => ({
objectMetadataId,
recordId,
})),
];
const newMorphItems = objectRecordIds.map((recordId) => ({
objectMetadataId,
recordId,
}));

const newMorphItemsMap = new Map(currentMorphItems);
newMorphItemsMap.set(pageId, newMorphItems);
Expand Down