You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by GitBox <gi...@apache.org> on 2019/01/16 06:03:58 UTC
[ignite] Diff for: [GitHub] AlexDel closed pull request #5829: IGNITE-10890.
Web Console: Get rid of legacy ui router events.
diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js
index 94f97042f84f..823ebecaaa71 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -191,7 +191,6 @@ export default angular.module('ignite-console', [
'ui.grid.saveState',
'ui.grid.selection',
'ui.router',
- 'ui.router.state.events',
'ui.carousel',
// Base modules.
'ignite-console.core',
diff --git a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
index d841cb524666..ddac3bffa18a 100644
--- a/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
+++ b/modules/web-console/frontend/app/components/page-queries/components/queries-notebook/controller.ts
@@ -278,13 +278,11 @@ export class NotebookCtrl {
paragraph.cancelRefresh($interval);
};
- const _stopTopologyRefresh = () => {
+ this._stopTopologyRefresh = () => {
if ($scope.notebook && $scope.notebook.paragraphs)
$scope.notebook.paragraphs.forEach((paragraph) => _tryStopRefresh(paragraph));
};
- $scope.$on('$stateChangeStart', _stopTopologyRefresh);
-
$scope.caches = [];
$scope.pageSizesOptions = [
@@ -1995,6 +1993,8 @@ export class NotebookCtrl {
}
$onDestroy() {
+ this._stopTopologyRefresh();
+
if (this.refresh$)
this.refresh$.unsubscribe();
}
diff --git a/modules/web-console/frontend/app/vendor.js b/modules/web-console/frontend/app/vendor.js
index e9fc8e956706..502c1bd4cb69 100644
--- a/modules/web-console/frontend/app/vendor.js
+++ b/modules/web-console/frontend/app/vendor.js
@@ -25,7 +25,6 @@ import 'angular-strap/dist/angular-strap.tpl';
import 'angular-messages';
import '@uirouter/angularjs';
-import '@uirouter/angularjs/lib/legacy/stateEvents';
import 'resize-observer-polyfill';
diff --git a/modules/web-console/frontend/package.json b/modules/web-console/frontend/package.json
index aa6e037530e0..334ead55be28 100644
--- a/modules/web-console/frontend/package.json
+++ b/modules/web-console/frontend/package.json
@@ -31,7 +31,6 @@
"@uirouter/angularjs": "1.0.20",
"@uirouter/core": "5.0.19",
"@uirouter/rx": "0.5.0",
- "@uirouter/visualizer": "4.0.2",
"angular": "1.7.4",
"angular-acl": "0.1.10",
"angular-animate": "1.7.4",
With regards,
Apache Git Services