Skip to content

Bugfix/attribute filter #3964

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

Merged
merged 3 commits into from
Dec 30, 2019
Merged

Bugfix/attribute filter #3964

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8a83bfb
filterAttributes fix - it wasn't filtering the attributes in the end …
pkarw Dec 29, 2019
b6c3d7a
Update CHANGELOG.md
pkarw Dec 29, 2019
fc7a6c2
resolve conflicts
andrzejewsky Dec 30, 2019
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
2 changes: 1 addition & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed
- CookieNotification CSR&SSR mismatch fixed - @Fifciu (#3922)

- The attribute filter in `attribute/list` was not filtering the already loaded attributes properly - @pkarw (#3964)

## [1.11.0] - 2019.12.20

Expand Down
11 changes: 3 additions & 8 deletions ...log/helpers/areAttributesAlreadyLoaded.ts → ...dules/catalog/helpers/filterAttributes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import config from 'config'

const areAttributesAlreadyLoaded = ({
export default function filterAttributes ({
filterValues,
filterField,
blacklist,
Expand All @@ -12,27 +12,22 @@ const areAttributesAlreadyLoaded = ({
blacklist: string[],
idsList: any,
codesList: any
}): boolean => {
}) {
return filterValues.filter(fv => {
if (config.entities.product.standardSystemFields.indexOf(fv) >= 0) {
return false
}

if (fv.indexOf('.') >= 0) {
return false
}

if (blacklist !== null && blacklist.includes(fv)) {
return false
}

if (filterField === 'attribute_id') {
return (typeof idsList[fv] === 'undefined' || idsList[fv] === null)
}
if (filterField === 'attribute_code') {
return (typeof codesList[fv] === 'undefined' || codesList[fv] === null)
}
}).length === 0
})
}

export default areAttributesAlreadyLoaded
5 changes: 3 additions & 2 deletions core/modules/catalog/store/attribute/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ import config from 'config'
import { Logger } from '@vue-storefront/core/lib/logger'
import { entityKeyName } from '@vue-storefront/core/lib/store/entities'
import { prefetchCachedAttributes } from '../../helpers/prefetchCachedAttributes'
import areAttributesAlreadyLoaded from './../../helpers/areAttributesAlreadyLoaded'
import createAttributesListQuery from './../../helpers/createAttributesListQuery'
import reduceAttributesLists from './../../helpers/reduceAttributesLists'
import filterAttributes from '../../helpers/filterAttributes'

const actions: ActionTree<AttributeState, RootState> = {
async updateAttributes ({ commit, getters }, { attributes }) {
Expand Down Expand Up @@ -63,7 +63,8 @@ const actions: ActionTree<AttributeState, RootState> = {

await dispatch('loadCachedAttributes', { filterField, filterValues })

if (areAttributesAlreadyLoaded({ filterValues, filterField, blacklist, idsList, codesList })) {
filterValues = filterAttributes({ filterValues, filterField, blacklist, idsList, codesList })
if (filterValues.length === 0) {
Logger.info('Skipping attribute load - attributes already loaded', 'attr', { orgFilterValues, filterField })()
return { items: Object.values(codesList) }
}
Expand Down