Skip to content

Enhancement: Extract method for getting filters for column #2405

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
Koc wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Enhancement: Extract method for getting filters for column #2405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 7 additions & 0 deletions src/shared/components/ncTable/mixins/filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,3 +126,10 @@ export const Filters = {
noSearchValue: true,
}),
}

export function getFiltersForColumn(column, viewSetting) {
if (viewSetting?.filter?.length > 0) {
return viewSetting.filter.filter(filter => filter.columnId === column.id)
}
return []
}
6 changes: 3 additions & 3 deletions src/shared/components/ncTable/partials/TableHeader.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
@edit-column="col => $emit('edit-column', col)"
@delete-column="col => $emit('delete-column', col)" />
</div>
<div v-if="getFilterForColumn(col)" class="filter-wrapper">
<div v-if="getFilterForColumn(col).length > 0" class="filter-wrapper">
<FilterLabel v-for="filter in getFilterForColumn(col)"
:id="filter.columnId + filter.operator.id+ filter.value"
:key="filter.columnId + filter.operator.id+ filter.value"
Expand All @@ -47,7 +47,7 @@
import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
import TableHeaderColumnOptions from './TableHeaderColumnOptions.vue'
import FilterLabel from './FilterLabel.vue'
import { getFilterWithId } from '../mixins/filter.js'
import { getFilterWithId, getFiltersForColumn } from '../mixins/filter.js'
import { getColumnWidthStyle } from '../mixins/columnHandler.js'

export default {
Expand Down Expand Up @@ -117,7 +117,7 @@ export default {
this.openedColumnHeaderMenus = Object.assign({}, this.openedColumnHeaderMenus)
},
getFilterForColumn(column) {
return this.localViewSetting?.filter?.filter(item => item.columnId === column.id)
return getFiltersForColumn(column, this.localViewSetting)
},
hasRightHiddenNeighbor(colId) {
return this.localViewSetting?.hiddenColumns?.includes(this.columns[this.columns.indexOf(this.columns.find(col => col.id === colId)) + 1]?.id)
Expand Down
28 changes: 9 additions & 19 deletions src/shared/components/ncTable/sections/CustomTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ import {
import { MetaColumns } from '../mixins/metaColumns.js'
import { translate as t } from '@nextcloud/l10n'
import { useTablesStore } from '../../../../store/store.js'
import { getFiltersForColumn } from '../mixins/filter.js'

export default {
name: 'CustomTable',
Expand Down Expand Up @@ -221,7 +222,7 @@ export default {
}
let filterStatus = null
let searchStatus = true
const filters = this.getFiltersForColumn(column)
const filters = getFiltersForColumn(column, this.viewSetting)
let cell
if (column.id < 0) {
cell = { columnId: column.id }
Expand Down Expand Up @@ -257,15 +258,13 @@ export default {
delete cell.searchStringFound
delete cell.filterFound

// if we should filter
if (filters !== null) {
filters.forEach(fil => {
this.addMagicFieldsValues(fil)
if (filterStatus === null || filterStatus === true) {
filterStatus = column.isFilterFound(cell, fil)
}
})
}
// apply filters (if any)
filters.forEach(fil => {
this.addMagicFieldsValues(fil)
if (filterStatus === null || filterStatus === true) {
filterStatus = column.isFilterFound(cell, fil)
}
})
// if we should search
if (searchString) {
console.debug('look for searchString', searchString)
Expand Down Expand Up @@ -355,15 +354,6 @@ export default {
}
})
},
getFiltersForColumn(column) {
if (this.viewSetting?.filter?.length > 0) {
const columnFilter = this.viewSetting.filter.filter(item => item.columnId === column.id)
if (columnFilter.length > 0) {
return columnFilter
}
}
return null
},
deselectAllRows(elementId, isView) {
if (parseInt(elementId) === parseInt(this.elementId) && isView === this.isView) {
this.selectedRows = []
Expand Down
Loading