Skip to content
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.

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

fix: undefined query should match all items #73

Merged
merged 2 commits into from
Jun 15, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions src/useFind.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ function loadServiceEventHandlers<
): () => void {
const onCreated = (createdItem: M): void => {
// ignore items not matching the query or when no params are set
if (!params.value || !sift(params.value.query)(createdItem)) {
if (!params.value || (params.value.query !== undefined && !sift(params.value.query)(createdItem))) {
return;
}

Expand All @@ -34,7 +34,7 @@ function loadServiceEventHandlers<

const onItemChanged = (changedItem: M): void => {
// ignore items not matching the query or when no params are set
if (!params.value || !sift(params.value.query)(changedItem)) {
if (!params.value || (params.value.query !== undefined && !sift(params.value.query)(changedItem))) {
// remove item from the list if they have been on it before
data.value = data.value.filter((item) => getId(item) !== getId(changedItem));
return;
Expand Down
64 changes: 63 additions & 1 deletion test/useFind.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,35 @@ describe('Find composition', () => {
expect(findComposition && findComposition.data.value).toContainEqual(additionalTestModel);
});

it('should listen to "create" events when query is undefined', async () => {
expect.assertions(2);

// given
const emitter = eventHelper();
const feathersMock = {
service: () => ({
find: jest.fn(() => []),
on: emitter.on,
off: jest.fn(),
}),
on: jest.fn(),
off: jest.fn(),
} as unknown as Application;
const useFind = useFindOriginal(feathersMock);
let findComposition = null as UseFind<TestModel> | null;
mountComposition(() => {
findComposition = useFind('testModels', ref({ query: undefined }));
});
await nextTick();

// when
emitter.emit('created', additionalTestModel);

// then
expect(findComposition).toBeTruthy();
expect(findComposition && findComposition.data.value).toContainEqual(additionalTestModel);
});

it('should ignore "create" events when query is not matching', () => {
expect.assertions(2);

Expand Down Expand Up @@ -716,7 +745,7 @@ describe('Find composition', () => {
expect(findComposition && findComposition.data.value.length).toBe(0);
});

it('should listen to "patch" & "update" events and add item from list when query is matching now', async () => {
it('should listen to "patch" & "update" events and add item to list when query is matching now', async () => {
expect.assertions(4);

// given
Expand Down Expand Up @@ -749,6 +778,39 @@ describe('Find composition', () => {
expect(findComposition && findComposition.data.value).toStrictEqual([changedTestModel]);
});

it('should listen to "patch" & "update" events and add item to list when query is undefined', async () => {
expect.assertions(4);

// given
const emitter = eventHelper();
const feathersMock = {
service: () => ({
find: jest.fn(() => []),
on: emitter.on,
off: jest.fn(),
}),
on: jest.fn(),
off: jest.fn(),
} as unknown as Application;
const useFind = useFindOriginal(feathersMock);
let findComposition = null as UseFind<TestModel> | null;
mountComposition(() => {
findComposition = useFind('testModels', ref({ query: undefined }));
});

// before then to ensure that the previous loading procedure is completed
await nextTick();
expect(findComposition && findComposition.isLoading.value).toBeFalsy();
expect(findComposition && findComposition.data.value.length).toBe(0);

// when
emitter.emit('updated', changedTestModel);

// then
expect(findComposition).toBeTruthy();
expect(findComposition && findComposition.data.value).toStrictEqual([changedTestModel]);
});

it('should listen to "remove" events', async () => {
expect.assertions(2);

Expand Down