Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
7 changes: 4 additions & 3 deletions apps/files/src/router/router.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ Router.prototype.replace = (function(this: Router, ...args: Parameters<typeof or
}) as typeof originalReplace

/**
* Ignore duplicated-navigation error but forward real exceptions
* Ignore duplicated- and redirected-navigation errors but forward real exceptions
*
* @param error The thrown error
*/
function ignoreDuplicateNavigation(error: unknown): void {
if (isNavigationFailure(error, NavigationFailureType.duplicated)) {
logger.debug('Ignoring duplicated navigation from vue-router', { error })
if (isNavigationFailure(error, NavigationFailureType.duplicated)
|| isNavigationFailure(error, NavigationFailureType.redirected)) {
logger.debug('Ignoring duplicated/redirected navigation from vue-router', { error })
} else {
throw error
}
Expand Down
7 changes: 4 additions & 3 deletions apps/files_sharing/src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,14 @@ Router.prototype.replace = (function(this: Router, ...args: Parameters<typeof or
}) as typeof originalReplace

/**
* Ignore duplicated-navigation error but forward real exceptions
* Ignore duplicated- and redirected-navigation errors but forward real exceptions
*
* @param error The thrown error
*/
function ignoreDuplicateNavigation(error: unknown): void {
if (isNavigationFailure(error, NavigationFailureType.duplicated)) {
logger.debug('Ignoring duplicated navigation from vue-router', { error })
if (isNavigationFailure(error, NavigationFailureType.duplicated)
|| isNavigationFailure(error, NavigationFailureType.redirected)) {
logger.debug('Ignoring duplicated/redirected navigation from vue-router', { error })
} else {
throw error
}
Expand Down
Loading