Commit c6e9ffb1 by David Kaltschmidt

Use url params for explore state

- putting state in the path components led to 400 on reload
- use `/explore?state=JSON` instead
parent a1f0dffe
...@@ -73,8 +73,7 @@ func (hs *HTTPServer) registerRoutes() { ...@@ -73,8 +73,7 @@ func (hs *HTTPServer) registerRoutes() {
r.Get("/dashboards/", reqSignedIn, Index) r.Get("/dashboards/", reqSignedIn, Index)
r.Get("/dashboards/*", reqSignedIn, Index) r.Get("/dashboards/*", reqSignedIn, Index)
r.Get("/explore/", reqEditorRole, Index) r.Get("/explore", reqEditorRole, Index)
r.Get("/explore/*", reqEditorRole, Index)
r.Get("/playlists/", reqSignedIn, Index) r.Get("/playlists/", reqSignedIn, Index)
r.Get("/playlists/*", reqSignedIn, Index) r.Get("/playlists/*", reqSignedIn, Index)
......
...@@ -67,7 +67,7 @@ interface IExploreState { ...@@ -67,7 +67,7 @@ interface IExploreState {
export class Explore extends React.Component<any, IExploreState> { export class Explore extends React.Component<any, IExploreState> {
constructor(props) { constructor(props) {
super(props); super(props);
const { datasource, queries, range } = parseInitialState(props.routeParams.initial); const { datasource, queries, range } = parseInitialState(props.routeParams.state);
this.state = { this.state = {
datasource: null, datasource: null,
datasourceError: null, datasourceError: null,
......
...@@ -191,7 +191,7 @@ export class KeybindingSrv { ...@@ -191,7 +191,7 @@ export class KeybindingSrv {
range, range,
}; };
const exploreState = encodePathComponent(JSON.stringify(state)); const exploreState = encodePathComponent(JSON.stringify(state));
this.$location.url(`/explore/${exploreState}`); this.$location.url(`/explore?state=${exploreState}`);
} }
} }
}); });
......
...@@ -332,7 +332,7 @@ class MetricsPanelCtrl extends PanelCtrl { ...@@ -332,7 +332,7 @@ class MetricsPanelCtrl extends PanelCtrl {
range, range,
}; };
const exploreState = encodePathComponent(JSON.stringify(state)); const exploreState = encodePathComponent(JSON.stringify(state));
this.$location.url(`/explore/${exploreState}`); this.$location.url(`/explore?state=${exploreState}`);
} }
addQuery(target) { addQuery(target) {
......
...@@ -112,7 +112,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) { ...@@ -112,7 +112,7 @@ export function setupAngularRoutes($routeProvider, $locationProvider) {
controller: 'FolderDashboardsCtrl', controller: 'FolderDashboardsCtrl',
controllerAs: 'ctrl', controllerAs: 'ctrl',
}) })
.when('/explore/:initial?', { .when('/explore', {
template: '<react-container />', template: '<react-container />',
resolve: { resolve: {
roles: () => ['Editor', 'Admin'], roles: () => ['Editor', 'Admin'],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment