Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [1.11.0-rc.2] - UNRELEASED

### Fixed


## [1.11.0-rc.1] - 2019.10.03

### Added
Expand Down Expand Up @@ -56,6 +61,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Route Manager Queue for adding routes efficiently and with an optional priority - @grimasod (#3540)
- Added tests for cart module actions - @andrzejewsky (#3023)
- Fixed a problem with type changes in the state when extending a store - @resubaka (#3618)
- Added custom page-size parameter for `category-next/loadCategoryProducts` action - @cewald (#3713)

### Fixed

Expand Down
1 change: 1 addition & 0 deletions config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,7 @@
"setupVariantByAttributeCode": true,
"endpoint": "/api/product",
"defaultFilters": ["color", "size", "price", "erin_recommends"],
"systemFilterNames": ["sort", "pagesize"],
"maxFiltersQuerySize": 999,
"routerFiltersSource": "query",
"filterFieldMapping": {
Expand Down
2 changes: 1 addition & 1 deletion core/i18n/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/i18n",
"version": "1.11.0-rc.1",
"version": "1.11.0-rc.2",
"description": "Vue Storefront i18n",
"license": "MIT",
"main": "index.ts",
Expand Down
5 changes: 3 additions & 2 deletions core/modules/catalog-next/helpers/filterHelpers.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import FilterVariant from 'core/modules/catalog-next/types/FilterVariant';
import config from 'config'
import FilterVariant from 'core/modules/catalog-next/types/FilterVariant'

export const getSystemFilterNames: string[] = ['sort']
export const getSystemFilterNames: string[] = config.products.systemFilterNames

/**
* Creates new filtersQuery (based on currentQuery) by modifying specific filter variant.
Expand Down
5 changes: 3 additions & 2 deletions core/modules/catalog-next/store/category/actions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import omit from 'lodash-es/omit'
import config from 'config'

const actions: ActionTree<CategoryState, RootState> = {
async loadCategoryProducts ({ commit, getters, dispatch, rootState }, { route, category } = {}) {
async loadCategoryProducts ({ commit, getters, dispatch, rootState }, { route, category, pageSize = 50 } = {}) {
const searchCategory = category || getters.getCategoryFrom(route.path) || {}
const categoryMappedFilters = getters.getFiltersMap[searchCategory.id]
const areFiltersInQuery = !!Object.keys(route[products.routerFiltersSource]).length
Expand All @@ -36,7 +36,8 @@ const actions: ActionTree<CategoryState, RootState> = {
query: filterQr,
sort: searchQuery.sort,
includeFields: entities.productList.includeFields,
excludeFields: entities.productList.excludeFields
excludeFields: entities.productList.excludeFields,
size: pageSize
})
await dispatch('loadAvailableFiltersFrom', {aggregations, category: searchCategory, filters: searchQuery.filters})
commit(types.CATEGORY_SET_SEARCH_PRODUCTS_STATS, { perPage, start, total })
Expand Down
2 changes: 1 addition & 1 deletion core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/core",
"version": "1.11.0-rc.1",
"version": "1.11.0-rc.2",
"description": "Vue Storefront Core",
"license": "MIT",
"main": "app.js",
Expand Down
6 changes: 6 additions & 0 deletions docs/guide/basics/configuration.md
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,12 @@ This is the `vue-storefront-api` endpoint for rendering product lists.

Here, we have the sort field settings as they're displayed on the Category page.

```json
"systemFilterNames": ["sort", "pagesize"],
```

This is an array of query-fields which won't be treated as filter fields when in URL.

```json
"gallery": {
"mergeConfigurableChildren": true
Expand Down
1 change: 1 addition & 0 deletions docs/guide/cookbook/setup.md
Original file line number Diff line number Diff line change
Expand Up @@ -1131,6 +1131,7 @@ At [`vue-storefront/config/default.json`](https://github.com/DivanteLtd/vue-stor
"setupVariantByAttributeCode": true,
"endpoint": "http://localhost:8080/api/product",
"defaultFilters": ["color", "size", "price", "erin_recommends"],
"systemFilterNames": ["sort", "pagesize"],
"filterFieldMapping": {
"category.name": "category.name.keyword"
},
Expand Down
2 changes: 1 addition & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@vue-storefront/docs",
"private": true,
"version": "1.11.0-rc.1",
"version": "1.11.0-rc.2",
"scripts": {
"docs:dev": "vuepress dev",
"docs:build": "vuepress build",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-storefront",
"version": "1.11.0-rc.1",
"version": "1.11.0-rc.2",
"description": "A Vue.js, PWA eCommerce frontend",
"private": true,
"engines": {
Expand Down
4 changes: 2 additions & 2 deletions packages/cli/boilerplates/module/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
"license": "MIT",
"dependencies": {},
"devDependencies": {
"@vue-storefront/core": "^1.11.0-rc.1",
"@vue-storefront/core": "^1.11.0-rc.2",
"ts-loader": "^6.0.4",
"typescript": "^3.5.2",
"webpack": "^4.35.2",
"webpack-cli": "^3.3.5"
},
"peerDependencies": {
"@vue-storefront/core": "^1.11.0-rc.1"
"@vue-storefront/core": "^1.11.0-rc.2"
}
}
2 changes: 1 addition & 1 deletion src/themes/default-amp/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/theme-default-amp",
"version": "1.11.0-rc.1",
"version": "1.11.0-rc.2",
"description": "Default AMP theme for Vue Storefront",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion src/themes/default/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@vue-storefront/theme-default",
"version": "1.11.0-rc.1",
"version": "1.11.0-rc.2",
"description": "Default theme for Vue Storefront",
"main": "index.js",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion test/unit/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@vue-storefront/unit-tests",
"private": true,
"version": "1.11.0-rc.1"
"version": "1.11.0-rc.2"
}