-
Notifications
You must be signed in to change notification settings - Fork 2.1k
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.
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
Router manager queue #3540
Router manager queue #3540
Conversation
update slack invitation link
…into feature/router-manager-queue # Conflicts: # core/lib/router-manager.ts
Still in progress |
Cool, looks like a step into right direction! |
I found inconsistencies causing routes to be registered twice. Specifically in Category and Product Vuex actions, they register mappings with |
We have to do one or the other. Without any change there's a mismatch when the page is reloaded on a category or product page and nothing is loaded |
@grimasod could you merge the master branch into this branch also? I started to merge master-> develop and I have multiple conflicts around route manager. And you provided more changes here so I think best way would be to merge master here, test everything with QA and merge into develop as a final solution. What do you say? I'll do CR right after merge if you would let me know that it's done :) |
All tested...
Tested - mappingFallback only runs when the initial page load is a category or product page
Tested - all multistore urls load correctly
Tested - there are the same issues on Category and Products pages as the Develop branch
Tested - no errors reported
Tested - default, IT, DE, all work correctly
Tested - both client and server appear correct, with no duplication
Tested - addRoutes runs once on server and once on client during initial page load. Then once when each new dynamic route is opened for the first time |
@patzick I can try, after we resolve the last issue. I have merged Develop into this branch every day, with all the other changes that have been made there. I also combined the 1.10.3 router changes into this branch, so hopefully this has all the updates already |
@grimasod great, that's why I'd like to do this thru your branch as it contains the most accurate final version :) |
Hey @grimasod thanks for the tests you executed; looking cool; when it will be ready for merge? |
…into feature/router-manager-queue
…into feature/router-manager-queue # Conflicts: # CHANGELOG.md # core/client-entry.ts # core/i18n/package.json # core/lib/multistore.ts # core/lib/router-manager.ts # core/modules/catalog/store/category/actions.ts # core/modules/catalog/store/product/actions.ts # core/modules/url/helpers/index.ts # core/modules/url/router/beforeEach.ts # core/modules/url/store/actions.ts # core/server-entry.ts # docs/package.json # lerna.json # package.json # src/themes/default-amp/package.json # src/themes/default/components/core/blocks/SearchPanel/SearchPanel.vue # src/themes/default/components/core/blocks/SidebarMenu/SidebarMenu.vue # src/themes/default/components/theme/blocks/AsyncSidebar/AsyncSidebar.vue # src/themes/default/package.json # src/themes/default/resource/banners/de_promoted_offers.json # test/unit/package.json
Cool! Thanks! @patzick and @andrzejewsky will take care of CR and tests along with @alinadivante - it’s pretty crucial change |
Ok, I've already started testing this branch :) There is the same problem which I reported here #3579 |
There is a small problem with /page-not-found |
Second problem regarding differences between server side and client side:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Everything here works well, really nice job @grimasod! To not hold this PR anymore, QA issues will be addressed in separate PR. Thanks! :)
@@ -196,9 +195,14 @@ export function adjustMultistoreApiUrl (url: string): string { | |||
} | |||
|
|||
export function localizedDispatcherRoute (routeObj: LocalizedRoute | string, storeCode: string): LocalizedRoute | string { | |||
const appendStoreCodePrefix = config.storeViews[storeCode] ? config.storeViews[storeCode].appendStoreCode : false | |||
const { storeCode: currentStoreCode, appendStoreCode } = currentStoreView() | |||
if (!storeCode || !config.storeViews[storeCode]) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i've fixed tests mostly by adding here || !config.storeViews[storeCode]
. It prevents us from switching to not existing storeView also
Related issues
closes #3454
Short description and why it's useful
Efficiently add routes to Vue Router, with optional priority for theme routes
Screenshots of visual changes before/after (if there are any)
Which environment this relates to
Check your case. In case of any doubts please read about Release Cycle
develop
branch and want to merge it back todevelop
release
branch and want to merge it back torelease
hotfix
ormaster
branch and want to merge it back tohotfix
Upgrade Notes and Changelog
IMPORTANT NOTICE - Remember to update
CHANGELOG.md
with description of your changeContribution and currently important rules acceptance