fix(VDataTable): group-by column should be included in search (#10591)

closes #10392 Co-authored-by: Andrew Henry <AMajesticPotatoe@gmail.com>
vuetifyjs · Feb 18, 2020 · a40e8d3 · a40e8d3
1 parent 065e93c
commit a40e8d3
Show file tree

Hide file tree

Showing 3 changed files with 369 additions and 4 deletions.
diff --git a/packages/vuetify/src/components/VDataTable/VDataTable.ts b/packages/vuetify/src/components/VDataTable/VDataTable.ts
@@ -138,10 +138,10 @@ export default VDataIterator.extend({
       }, {})
     },
     headersWithCustomFilters (): DataTableHeader[] {
-      return this.computedHeaders.filter(header => header.filter && (!header.hasOwnProperty('filterable') || header.filterable === true))
+      return this.headers.filter(header => header.filter && (!header.hasOwnProperty('filterable') || header.filterable === true))
     },
     headersWithoutCustomFilters (): DataTableHeader[] {
-      return this.computedHeaders.filter(header => !header.filter && (!header.hasOwnProperty('filterable') || header.filterable === true))
+      return this.headers.filter(header => !header.filter && (!header.hasOwnProperty('filterable') || header.filterable === true))
     },
     sanitizedHeaderProps (): Record<string, any> {
       return camelizeObjectKeys(this.headerProps)

diff --git a/packages/vuetify/src/components/VDataTable/__tests__/VDataTable.spec.ts b/packages/vuetify/src/components/VDataTable/__tests__/VDataTable.spec.ts
@@ -673,6 +673,47 @@ describe('VDataTable.ts', () => {
     expect(input).toHaveBeenNthCalledWith(2, [])
   })
 
+  // https://github.com/vuetifyjs/vuetify/issues/10392
+  it('should search group-by column', async () => {
+    const headers = [
+      {
+        text: 'Name',
+        value: 'name',
+      },
+      {
+        text: 'ID',
+        value: 'id',
+      },
+    ]
+
+    const items = [
+      {
+        name: 'Assistance',
+        id: 1,
+      },
+      {
+        name: 'Candidat',
+        id: 2,
+      },
+    ]
+
+    const wrapper = mountFunction({
+      propsData: {
+        headers,
+        items,
+        itemKey: 'id',
+        groupBy: 'name',
+      },
+    })
+
+    expect(wrapper.html()).toMatchSnapshot()
+
+    wrapper.setProps({ search: 'candidat' })
+    await wrapper.vm.$nextTick()
+
+    expect(wrapper.html()).toMatchSnapshot()
+  })
+
   // https://github.com/vuetifyjs/vuetify/issues/10289
   it('should render item slot when using group-by function', async () => {
     const wrapper = mountFunction({