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.

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

223-bug-sur-les-filtres-features #226

Merged
merged 2 commits into from
May 24, 2023
Merged

223-bug-sur-les-filtres-features #226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c35789f
fix
hrenaud May 24, 2023
6be95e7
add extensions Review and manage your GitHub pull requests and issues…
hrenaud May 24, 2023
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
3 changes: 2 additions & 1 deletion .devcontainer/devcontainer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
"yzhang.markdown-all-in-one",
"adam-bender.commit-message-editor",
"mhutchie.git-graph",
"unifiedjs.vscode-mdx"
"unifiedjs.vscode-mdx",
"GitHub.vscode-pull-request-github"
]
}
},
Expand Down
111 changes: 79 additions & 32 deletions src/components/filters-bar.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,19 @@ function FiltersBar({
// console.log(`selectedFilters`, selectedFilters)
// console.log(type, propertyToMatch)

// reset
if (type === 'reset') {
// console.log(`RESET`)
// fill w/ default/reset value
setSelectedFilters([{ propertyToMatch: allItemsLabel, type: `reset` }])
// send reseted list outside of the component
resetList()
return
}
// console.log(type, propertyToMatch, selectedFilters)
if (filterType === FiltersBar.SEARCH_TYPE_OR || forceOR) {
if (propertyToMatch === allItemsLabel) {
// fill w/ default/reset value
setSelectedFilters([{ propertyToMatch: allItemsLabel, type: `reset` }])
// send reseted list outside of the component
resetList()
if (type === 'reset') {
// done upper in code
} else {
setSelectedFilters([{ propertyToMatch: propertyToMatch, type: type }])
// filter list
Expand All @@ -78,11 +85,7 @@ function FiltersBar({
// console.log(type, propertyToMatch, selectedFilters)
// reset
if (type === 'reset') {
// console.log(`RESET`)
// fill w/ default/reset value
setSelectedFilters([{ propertyToMatch: allItemsLabel, type: `reset` }])
// send reseted list outside of the component
resetList()
// done upper in code
} else {
// console.log(`FILTER`)
// rm reset filter
Expand All @@ -92,41 +95,85 @@ function FiltersBar({
}
// add new filter only
let hasFilter = false
tmpFilters.map(filter => {
let hasTypeFilter = false
tmpFilters.forEach(filter => {
if (
filter?.type === type &&
filter?.propertyToMatch === propertyToMatch &&
hasFilter !== true
) {
hasFilter = true
}
if (filter?.type === type && hasTypeFilter !== true) {
hasTypeFilter = true
}
})
// console.log(`hasFilter`, hasFilter)
if (!hasFilter) {
// add to setSelectedFilters listened by buttons
tmpFilters.push({ propertyToMatch: propertyToMatch, type: type })
setSelectedFilters(tmpFilters)
// trics to refresh bt
forceUpdate()
// filter list
const tmpList = []
// console.log(`current`, type, propertyToMatch)
fullList.map(item => {
// console.log(`item`, _.get(item, type))
selectedFilters.map(selected => {
if (_.get(item, type) === selected.propertyToMatch) {
tmpList.push(item)
}
})
})
// send filtered list outside of the component
filteredList(tmpList)
if (hasTypeFilter && !hasFilter) {
// console.log(`rm and replace`)
removeFilter(tmpFilters, propertyToMatch, type)
addFilter(tmpFilters, propertyToMatch, type)
// return
} else if (hasTypeFilter && hasFilter) {
// console.log(`rm filter`)
// removeFilter(tmpFilters, propertyToMatch, type)
} else if (!hasFilter) {
// console.log(`add`)
addFilter(tmpFilters, propertyToMatch, type)
}
}
console.log(type, propertyToMatch, selectedFilters)
// console.log(type, propertyToMatch, selectedFilters)
}
}

const addFilter = (tmpFilters = [], propertyToMatch, type) => {
// add to setSelectedFilters listened by buttons
// console.log(`addFilter`)
tmpFilters.push({ propertyToMatch: propertyToMatch, type: type })
setSelectedFilters(tmpFilters)
updateFilter()
}

const removeFilter = (tmpFilters = [], propertyToMatch, type) => {
// console.log(`removeFilter`)
let posExact = -1
let posType = -1
tmpFilters.forEach((item, index) => {
if (item.type === type) {
posType = index
}
if (item.propertyToMatch === propertyToMatch && item.type === type) {
posExact = index
posType = -1
}
})
if (posType !== -1) tmpFilters = _.pullAt(tmpFilters, [posType])
if (posExact !== -1) tmpFilters = _.pullAt(tmpFilters, [posExact])
setSelectedFilters(tmpFilters)
updateFilter()
}

const updateFilter = () => {
// console.log(`removeFilter`)
// trics to refresh bt
forceUpdate()
// filter list
const tmpList = []
// console.log(`current`, type, propertyToMatch)
fullList.forEach(item => {
let count = 0
selectedFilters.forEach(selected => {
// console.log(`item.${selected.type}`, _.get(item, selected.type))
if (_.get(item, selected.type) === selected.propertyToMatch) {
count = count + 1
}
})
if (selectedFilters.length === count) tmpList.push(item)
})
// send filtered list outside of the component
filteredList(tmpList)
}

// select method

const filterSelect = event => {
Expand Down Expand Up @@ -215,7 +262,7 @@ function FiltersBar({
// value={object.type}
value={JSON.stringify(val)}
label={`${key} (${value})`}
textContent={`${key} (${value})`}
// textContent={`${key} (${value})`}
selected={getBtState(object.type, key) || null}
>{`${key} (${value})`}</option>
)
Expand Down