Merge branch 'dev' into feat-code-refactoring

jacobmllr95 · web-flow · commit 03067e44c465 · 2020-09-16T11:59:39.000+02:00
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -2,6 +2,10 @@
   "extends": ["@nuxtjs"],
   "labels": ["Type: Dependencies"],
   "packageRules": [
+    {
+      "packageNames": ["autoprefixer"],
+      "allowedVersions": "<10.0.0"
+    },
     {
       "packageNames": ["bootstrap"],
       "allowedVersions": "<5.0.0"
@@ -14,6 +18,10 @@
       "packageNames": ["highlight.js"],
       "allowedVersions": "<10.0.0"
     },
+    {
+      "packageNames": ["postcss"],
+      "allowedVersions": "<8.0.0"
+    },
     {
       "packageNames": ["prettier"],
       "allowedVersions": "<=1.14.3"
diff --git a/package.json b/package.json
@@ -149,6 +149,7 @@
     "marked": "^1.1.1",
     "node-sass": "^4.14.1",
     "nuxt": "^2.14.5",
+    "postcss": "^7.0.32",
     "postcss-cli": "^7.1.2",
     "prettier": "1.14.3",
     "require-context": "^1.1.0",
diff --git a/src/components/table/README.md b/src/components/table/README.md
@@ -3000,7 +3000,7 @@ your app handles the various inconsistencies with events.
       :current-page="currentPage"
       :per-page="perPage"
       :filter="filter"
-      :filterIncludedFields="filterOn"
+      :filter-included-fields="filterOn"
       :sort-by.sync="sortBy"
       :sort-desc.sync="sortDesc"
       :sort-direction="sortDirection"
diff --git a/src/components/table/helpers/mixin-filtering.js b/src/components/table/helpers/mixin-filtering.js
@@ -49,10 +49,10 @@ export default {
   },
   computed: {
     computedFilterIgnored() {
-      return this.filterIgnoredFields ? concat(this.filterIgnoredFields).filter(identity) : null
+      return concat(this.filterIgnoredFields || []).filter(identity)
     },
     computedFilterIncluded() {
-      return this.filterIncludedFields ? concat(this.filterIncludedFields).filter(identity) : null
+      return concat(this.filterIncludedFields || []).filter(identity)
     },
     computedFilterDebounce() {
       const ms = toInteger(this.filterDebounce, 0)
diff --git a/src/components/table/helpers/sanitize-row.js b/src/components/table/helpers/sanitize-row.js
@@ -31,8 +31,8 @@ const sanitizeRow = (row, ignoreFields, includeFields, fieldsObj = {}) => {
   const allowedKeys = keys(formattedRow).filter(
     key =>
       !IGNORED_FIELD_KEYS[key] &&
-      !(isArray(ignoreFields) && arrayIncludes(ignoreFields, key)) &&
-      !(isArray(includeFields) && !arrayIncludes(includeFields, key))
+      !(isArray(ignoreFields) && ignoreFields.length > 0 && arrayIncludes(ignoreFields, key)) &&
+      !(isArray(includeFields) && includeFields.length > 0 && !arrayIncludes(includeFields, key))
   )
 
   return pick(formattedRow, allowedKeys)
diff --git a/src/components/table/table-filtering.spec.js b/src/components/table/table-filtering.spec.js
@@ -207,6 +207,63 @@ describe('table > filtering', () => {
     wrapper.destroy()
   })
 
+  it('`filter-ignored-fields` prop works', async () => {
+    const wrapper = mount(BTable, {
+      propsData: {
+        fields: testFields,
+        items: testItems,
+        filter: '',
+        filterIgnoredFields: []
+      }
+    })
+
+    expect(wrapper).toBeDefined()
+    await waitNT(wrapper.vm)
+
+    expect(wrapper.findAll('tbody > tr').length).toBe(3)
+
+    // Search for a value in "a" column
+    await wrapper.setProps({ filter: '3' })
+    await waitNT(wrapper.vm)
+    expect(wrapper.findAll('tbody > tr').length).toBe(1)
+
+    // Ignore "a" column from filtering
+    await wrapper.setProps({ filterIgnoredFields: ['a'] })
+    await waitNT(wrapper.vm)
+    expect(wrapper.findAll('tbody > tr').length).toBe(0)
+
+    wrapper.destroy()
+  })
+
+  it('`filter-included-fields` prop works', async () => {
+    const wrapper = mount(BTable, {
+      propsData: {
+        fields: testFields,
+        // Add a extra item with a duplicated value in another field
+        items: [...testItems, { a: 4, b: 'y', c: 'a' }],
+        filter: '',
+        filterIncludedFields: []
+      }
+    })
+
+    expect(wrapper).toBeDefined()
+    await waitNT(wrapper.vm)
+
+    expect(wrapper.findAll('tbody > tr').length).toBe(4)
+
+    // Search for "a"
+    await wrapper.setProps({ filter: 'a' })
+    await waitNT(wrapper.vm)
+    expect(wrapper.findAll('tbody > tr').length).toBe(2)
+
+    // Only include "a" and "b" fields
+    await wrapper.setProps({ filterIncludedFields: ['a', 'b'] })
+    await waitNT(wrapper.vm)
+    expect(wrapper.findAll('tbody > tr').length).toBe(1)
+
+    wrapper.destroy()
+  })
+
   it('should filter for formatted values for keys which are not present in row', async () => {
     const wrapper = mount(BTable, {
       propsData: {
diff --git a/yarn.lock b/yarn.lock
