Fix cluster view

This commit is contained in:
JuanCarlos 2019-02-05 11:47:26 +01:00
parent c3ead62b4a
commit 6086cdf9d3

View File

@ -34,7 +34,7 @@ const app = uiModules.get('app/wazuh', ['ngCookies', 'ngMaterial']);
app.config([ app.config([
'$compileProvider', '$compileProvider',
function($compileProvider) { function ($compileProvider) {
$compileProvider.aHrefSanitizationWhitelist( $compileProvider.aHrefSanitizationWhitelist(
/^\s*(https?|ftp|mailto|data|blob):/ /^\s*(https?|ftp|mailto|data|blob):/
); );
@ -43,12 +43,12 @@ app.config([
app.config([ app.config([
'$httpProvider', '$httpProvider',
function($httpProvider) { function ($httpProvider) {
$httpProvider.useApplyAsync(true); $httpProvider.useApplyAsync(true);
} }
]); ]);
app.run(function($rootScope, $route, $location, appState, $window) { app.run(function ($rootScope, $route, $location, appState, $window) {
appState.setNavigation({ status: false }); appState.setNavigation({ status: false });
appState.setNavigation({ appState.setNavigation({
reloaded: false, reloaded: false,
@ -73,7 +73,7 @@ app.run(function($rootScope, $route, $location, appState, $window) {
} }
} else { } else {
if (!navigation.status && navigation.prevLocation) { if (!navigation.status && navigation.prevLocation) {
if (!navigation.discoverSections.includes(navigation.currLocation)) { if (!navigation.discoverSections.includes(navigation.currLocation) && $location.search().tabView !== 'cluster-monitoring') {
appState.setNavigation({ reloaded: true }); appState.setNavigation({ reloaded: true });
$location.search('configSubTab', null); $location.search('configSubTab', null);
$location.search('editingFile', null); $location.search('editingFile', null);
@ -91,7 +91,7 @@ app.run(function($rootScope, $route, $location, appState, $window) {
} else { } else {
$window.history.pushState({ page: 'wazuh#' + navigation.discoverPrevious }, '', 'wazuh#' + navigation.discoverPrevious); $window.history.pushState({ page: 'wazuh#' + navigation.discoverPrevious }, '', 'wazuh#' + navigation.discoverPrevious);
} }
} else { } else if (navigation.currLocation === navigation.discoverSections[0]) {
$window.history.pushState( $window.history.pushState(
{ page: 'wazuh#' + navigation.discoverPrevious }, { page: 'wazuh#' + navigation.discoverPrevious },
'', '',
@ -103,6 +103,17 @@ app.run(function($rootScope, $route, $location, appState, $window) {
'', '',
'/app/wazuh#' + $location.$$url '/app/wazuh#' + $location.$$url
); );
} else if ($location.search().tabView === 'cluster-monitoring') {
$window.history.pushState(
{ page: '/app/wazuh#/manager//' },
'',
'/app/wazuh#/manager//'
);
$window.history.pushState(
{ page: '/app/wazuh#' + $location.$$url },
'',
'/app/wazuh#' + $location.$$url
);
} }
} }
} }