fix: undefined query should match all items (#73)

* fix: undefined query should match all items * make condition more explicit
geprog · Jun 15, 2022 · df1dcb0 · df1dcb0
1 parent a2aff9c
commit df1dcb0
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 3 deletions.
diff --git a/src/useFind.ts b/src/useFind.ts
@@ -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;
     }
 
@@ -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;

diff --git a/test/useFind.test.ts b/test/useFind.test.ts
@@ -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);
 
@@ -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
@@ -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);