github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[5.x] Rename VisualizeConstants from _URL to _PATH. (#10407)

Browse source 
Backports PR #10404

**Commit 1:**
Rename VisualizeConstants from _URL to _PATH.

* Original sha: 91dfe1ad06
* Authored by CJ Cenizal <cj@cenizal.com> on 2017-02-16T17:33:41Z
This commit is contained in:
jasper 2017-02-16 13:12:25 -05:00 • committed by CJ Cenizal
parent 170e3c2ba0
commit d7c639fa0b
4 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/core_plugins/kibana/public/visualize/editor/editor.js
View file

@ -21,7 +21,7 @@ import { DashboardConstants } from 'plugins/kibana/dashboard/dashboard_constants
import { VisualizeConstants } from '../visualize_constants';
uiRoutes
.when(VisualizeConstants.CREATE_URL, {
.when(VisualizeConstants.CREATE_PATH, {
template: editorTemplate,
resolve: {
savedVis: function (savedVisualizations, courier, $route, Private) {
@ -38,7 +38,7 @@ uiRoutes
}
}
})
.when(`${VisualizeConstants.EDIT_URL}/:id`, {
.when(`${VisualizeConstants.EDIT_PATH}/:id`, {
template: editorTemplate,
resolve: {
savedVis: function (savedVisualizations, courier, $route) {
@ -312,7 +312,7 @@ function VisEditor($scope, $route, timefilter, AppState, $window, kbnUrl, courie
} else if (savedVis.id === $route.current.params.id) {
docTitle.change(savedVis.lastSavedTitle);
} else {
kbnUrl.change(`${VisualizeConstants.EDIT_URL}/{{id}}`, { id: savedVis.id });
kbnUrl.change(`${VisualizeConstants.EDIT_PATH}/{{id}}`, { id: savedVis.id });
}
}
}, notify.fatal);

2
src/core_plugins/kibana/public/visualize/index.js
View file

@ -26,7 +26,7 @@ uiRoutes
.defaults(/visualize/, {
requireDefaultIndex: true
})
.when(VisualizeConstants.LANDING_PAGE_URL, {
.when(VisualizeConstants.LANDING_PAGE_PATH, {
template: visualizeListingTemplate,
controller: VisualizeListingController,
controllerAs: 'listingController',

10
src/core_plugins/kibana/public/visualize/visualize_constants.js
View file

@ -1,7 +1,7 @@
export const VisualizeConstants = {
LANDING_PAGE_URL: '/visualize',
WIZARD_STEP_1_PAGE_URL: '/visualize/new',
WIZARD_STEP_2_PAGE_URL: '/visualize/new/configure',
CREATE_URL: '/visualize/create',
EDIT_URL: '/visualize/edit',
LANDING_PAGE_PATH: '/visualize',
WIZARD_STEP_1_PAGE_PATH: '/visualize/new',
WIZARD_STEP_2_PAGE_PATH: '/visualize/new/configure',
CREATE_PATH: '/visualize/create',
EDIT_PATH: '/visualize/edit',
};

20
src/core_plugins/kibana/public/visualize/wizard/wizard.js
View file

@ -18,10 +18,10 @@ const module = uiModules.get('app/visualize', ['kibana/courier']);
// Redirect old route to new route.
routes.when('/visualize/step/1', {
redirectTo: VisualizeConstants.WIZARD_STEP_1_PAGE_URL,
redirectTo: VisualizeConstants.WIZARD_STEP_1_PAGE_PATH,
});
routes.when(VisualizeConstants.WIZARD_STEP_1_PAGE_URL, {
routes.when(VisualizeConstants.WIZARD_STEP_1_PAGE_PATH, {
template: visualizeWizardStep1Template,
controller: 'VisualizeWizardStep1',
});
@ -37,8 +37,8 @@ module.controller('VisualizeWizardStep1', function ($scope, $route, kbnUrl, time
$scope.visTypeUrl = function (visType) {
const baseUrl =
visType.requiresSearch
? `#${VisualizeConstants.WIZARD_STEP_2_PAGE_URL}?`
: `#${VisualizeConstants.CREATE_URL}?`;
? `#${VisualizeConstants.WIZARD_STEP_2_PAGE_PATH}?`
: `#${VisualizeConstants.CREATE_PATH}?`;
const params = [`type=${encodeURIComponent(visType.name)}`];
@ -58,10 +58,10 @@ module.controller('VisualizeWizardStep1', function ($scope, $route, kbnUrl, time
// NOTE: Accessing this route directly means the user has entered into the wizard UX without
// selecting a Visualization type in step 1. So we want to redirect them to step 1, not step 2.
routes.when('/visualize/step/2', {
redirectTo: VisualizeConstants.WIZARD_STEP_1_PAGE_URL,
redirectTo: VisualizeConstants.WIZARD_STEP_1_PAGE_PATH,
});
routes.when(VisualizeConstants.WIZARD_STEP_2_PAGE_URL, {
routes.when(VisualizeConstants.WIZARD_STEP_2_PAGE_PATH, {
template: visualizeWizardStep2Template,
controller: 'VisualizeWizardStep2',
resolve: {
@ -79,7 +79,7 @@ module.controller('VisualizeWizardStep2', function ($route, $scope, timefilter,
$scope.step2WithSearchUrl = function (hit) {
if (addToDashMode) {
return kbnUrl.eval(
`#${VisualizeConstants.CREATE_URL}` +
`#${VisualizeConstants.CREATE_PATH}` +
`?type={{type}}&savedSearchId={{id}}` +
`&${DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM}`,
{ type: type, id: hit.id }
@ -87,7 +87,7 @@ module.controller('VisualizeWizardStep2', function ($route, $scope, timefilter,
}
return kbnUrl.eval(
`#${VisualizeConstants.CREATE_URL}?type={{type}}&savedSearchId={{id}}`,
`#${VisualizeConstants.CREATE_PATH}?type={{type}}&savedSearchId={{id}}`,
{ type: type, id: hit.id }
);
};
@ -103,11 +103,11 @@ module.controller('VisualizeWizardStep2', function ($route, $scope, timefilter,
if (!pattern) return;
if (addToDashMode) {
return `#${VisualizeConstants.CREATE_URL}` +
return `#${VisualizeConstants.CREATE_PATH}` +
`?${DashboardConstants.ADD_VISUALIZATION_TO_DASHBOARD_MODE_PARAM}` +
`&type=${type}&indexPattern=${pattern}`;
}
return `#${VisualizeConstants.CREATE_URL}?type=${type}&indexPattern=${pattern}`;
return `#${VisualizeConstants.CREATE_PATH}?type=${type}&indexPattern=${pattern}`;
};
});