-
Notifications
You must be signed in to change notification settings - Fork 8.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
--------- **Commit 1:** [state] add configurable warning level based on url length * Original sha: 55db90d * Authored by spalger <[email protected]> on 2016-04-04T21:57:45Z **Commit 2:** [state] add a hard length limit that will start throwing errors * Original sha: 64699aa * Authored by spalger <[email protected]> on 2016-04-04T22:14:06Z **Commit 3:** Merge branch 'master' of github.com:elastic/kibana into implement/betterWarningForUrlLength * Original sha: 4c70d69 * Authored by spalger <[email protected]> on 2016-04-06T07:05:47Z **Commit 4:** [dashboard] cleanup quietly to prevent error * Original sha: 1dace5c * Authored by spalger <[email protected]> on 2016-04-06T08:50:55Z **Commit 5:** [errorview] add url overflow display * Original sha: 8b4ebf5 * Authored by spalger <[email protected]> on 2016-04-06T08:51:47Z **Commit 6:** [errorview] persist the overflow url so that refresh works * Original sha: e308db9 * Authored by spalger <[email protected]> on 2016-04-06T09:05:13Z **Commit 7:** Merge branch 'master' of github.com:elastic/kibana into implement/betterWarningForUrlLength * Original sha: 121e4f2 * Authored by spalger <[email protected]> on 2016-04-15T18:49:12Z **Commit 8:** [config] remove url limit config, it should adapt automatically * Original sha: 281b38b * Authored by spalger <[email protected]> on 2016-04-15T23:38:05Z **Commit 9:** [chrome] rework url overflow detection The previous version of this pr relied on the State service to catch times when the URL would grow out of control. While overflows will commonly occur in the State service, this didn't handle urls that were navigated to using a link. They worked because the state service would eventually be called, but the failure was unexpected and required interaction to trigger. This new approach does the checking at a higher level, in the chrome. We also removed the `url:limit` configuration value in favor of browser detection (I was not able to find or come up with a way to quietly and quickly feature detect this). The new limits are 2000 characters for IE and 25000 for all other browsers. * Original sha: 116521c * Authored by spalger <[email protected]> on 2016-04-15T23:40:18Z **Commit 10:** Merge branch 'master' of github.com:elastic/kibana into implement/betterWarningForUrlLength * Original sha: aa030d7 * Authored by spalger <[email protected]> on 2016-04-26T16:51:22Z **Commit 11:** [ui/config] remove unused default * Original sha: b333c51 * Authored by spalger <[email protected]> on 2016-04-26T16:52:29Z **Commit 12:** Merge branch 'master' of github.com:elastic/kibana into implement/betterWarningForUrlLength * Original sha: 133d7e5 * Authored by spalger <[email protected]> on 2016-04-27T23:17:44Z **Commit 13:** [urlOverflow] assign magic numbers to variables * Original sha: 8b97881 * Authored by spalger <[email protected]> on 2016-04-27T23:24:17Z
- Loading branch information
Showing
8 changed files
with
160 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
<div class="app-container error-url-overflow-app"> | ||
<h3> | ||
<i aria-hidden="true" class="fa fa-warning text-danger"></i> Woah there! | ||
</h3> | ||
<p> | ||
That's a big URL you have there. I have some unfortunate news: Your browser doesn't play nice with Kibana's bacon-double-cheese-burger-with-extra-fries sized URL. To keep you from running into problems Kibana limits URLs in your browser to {{controller.limit}} characters for your safety. | ||
</p> | ||
|
||
<h3>Ok, how do I fix this?</h3> | ||
<p>This usually only happens with big, complex dashboards, so you have some options:</p> | ||
<ol> | ||
<li>Remove some stuff from your dashboard. This will reduce the length of the URL and keep IE in a good place.</li> | ||
<li>Don't use IE. Every other supported browser we know of doesn't have this limit.</li> | ||
</ol> | ||
<br> | ||
<br> | ||
<p><small>Foot note: Party size candy bars are tiny. Party size sub sandwiches are massive. Really makes you think.</small></p> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,30 @@ | ||
import uiRoutes from 'ui/routes'; | ||
import uiModules from 'ui/modules'; | ||
import KbnUrlProvider from 'ui/url'; | ||
|
||
import './error_url_overflow.less'; | ||
import template from './error_url_overflow.html'; | ||
import { UrlOverflowServiceProvider } from './url_overflow_service'; | ||
|
||
export * from './url_overflow_service'; | ||
|
||
uiRoutes | ||
.when('/error/url-overflow', { | ||
template, | ||
controllerAs: 'controller', | ||
controller: class OverflowController { | ||
constructor(Private, config, $scope) { | ||
const kbnUrl = Private(KbnUrlProvider); | ||
const urlOverflow = Private(UrlOverflowServiceProvider); | ||
|
||
if (!urlOverflow.get()) { | ||
kbnUrl.redirectPath('/'); | ||
return; | ||
} | ||
|
||
this.url = urlOverflow.get(); | ||
this.limit = urlOverflow.failLength(); | ||
$scope.$on('$destroy', () => urlOverflow.clear()); | ||
} | ||
} | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
.error-url-overflow-app { | ||
padding: 25px; | ||
|
||
pre { | ||
white-space: pre-wrap; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
const URL_MAX_IE = 2000; | ||
const URL_MAX_OTHERS = 25000; | ||
const IE_REGEX = /(;MSIE |Edge\/\d)/; | ||
|
||
export class UrlOverflowService { | ||
constructor() { | ||
const key = 'error/url-overflow/url'; | ||
const store = window.sessionStorage || { | ||
getItem() {}, | ||
setItem() {}, | ||
removeItem() {}, | ||
}; | ||
|
||
// FIXME: Couldn't find a way to test for browser compatibility without | ||
// complex redirect and cookie based "feature-detection" page, so going | ||
// with user-agent detection for now. | ||
this._ieLike = IE_REGEX.test(window.navigator.userAgent); | ||
|
||
this._val = store.getItem(key); | ||
this._sync = () => { | ||
if (this._val == null) store.removeItem(key); | ||
else store.setItem(key, this._val); | ||
}; | ||
} | ||
|
||
failLength() { | ||
return this._ieLike ? URL_MAX_IE : URL_MAX_OTHERS; | ||
} | ||
|
||
set(v) { | ||
this._val = v; | ||
this._sync(); | ||
} | ||
|
||
get() { | ||
return this._val; | ||
} | ||
|
||
check(absUrl) { | ||
if (!this.get()) { | ||
const urlLength = absUrl.length; | ||
const remaining = this.failLength() - urlLength; | ||
|
||
if (remaining > 0) { | ||
return remaining; | ||
} | ||
|
||
this.set(absUrl); | ||
} | ||
|
||
throw new Error(` | ||
The URL has gotten too big and kibana can no longer | ||
continue. Please refresh to return to your previous state. | ||
`); | ||
} | ||
|
||
clear() { | ||
this._val = undefined; | ||
this._sync(); | ||
} | ||
} | ||
|
||
export function UrlOverflowServiceProvider() { | ||
return new UrlOverflowService(); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters