Skip to content

disable mapFallback url by default #4092

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 2 commits into from
Feb 17, 2020
Merged

disable mapFallback url by default #4092

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
5a4540f
disable mapFallbackUrl by default
Feb 17, 2020
c3d5dbb
udpate changelog
Feb 17, 2020
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Optimized attributes loading - @andrzejewsky (#3948)
- Improve typescript support for test utils - @resubaka (#4067)
- Removed `product/loadConfigurableAttributes` calls - @andrzejewsky, @gibkigonzo (#3336)
- Disable `mapFallback` url by default - @gibkigonzo(#4092)

## [1.11.1] - 2020.02.05

Expand Down
1 change: 1 addition & 0 deletions config/default.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,7 @@
}
},
"urlModule": {
"enableMapFallbackUrl": false,
"endpoint": "/api/url",
"map_endpoint": "/api/url/map"
}
Expand Down
11 changes: 9 additions & 2 deletions core/modules/url/store/actions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ export const actions: ActionTree<UrlState, any> = {
if (routeData !== null) {
return resolve(parametrizeRouteData(routeData, query, storeCodeInPath))
} else {
dispatch('mapFallbackUrl', { url, params: parsedQuery }).then(mappedFallback => {
const mappingActionName = config.urlModule.enableMapFallbackUrl ? 'mapFallbackUrl' : 'mappingFallback'
dispatch(mappingActionName, { url, params: parsedQuery }).then(mappedFallback => {
const routeData = getFallbackRouteData({ mappedFallback, url })
dispatch('registerMapping', { url, routeData }) // register mapping for further usage
resolve(parametrizeRouteData(routeData, query, storeCodeInPath))
Expand All @@ -75,7 +76,10 @@ export const actions: ActionTree<UrlState, any> = {
* This method could be overriden in custom module to provide custom URL mapping logic
*/
async mappingFallback ({ dispatch }, { url, params }: { url: string, params: any}) {
console.warn('Deprecated action mappingFallback - use mapFallbackUrl instead')
console.warn(`
Deprecated action mappingFallback - use mapFallbackUrl instead.
You can enable mapFallbackUrl by changing 'config.urlModule.enableMapFallbackUrl' to true
`)
const { storeCode, appendStoreCode } = currentStoreView()
const productQuery = new SearchQuery()
url = (removeStoreCodeFromRoute(url.startsWith('/') ? url.slice(1) : url) as string)
Expand Down Expand Up @@ -152,6 +156,9 @@ export const actions: ActionTree<UrlState, any> = {
})
}
)
if (!response.ok) {
return null
}
response = await response.json()
return response
} catch (err) {
Expand Down