You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2019/02/26 02:36:28 UTC
[ignite] branch master updated: IGNITE-10890 Web Console: Removed
legacy UI router events.
This is an automated email from the ASF dual-hosted git repository.
akuznetsov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 52983ce IGNITE-10890 Web Console: Removed legacy UI router events.
52983ce is described below
commit 52983ceeff7886a63aef54df64f63772d962928b
Author: Alexander Kalinin <ve...@yandex.ru>
AuthorDate: Tue Feb 26 09:35:53 2019 +0700
IGNITE-10890 Web Console: Removed legacy UI router events.
---
modules/web-console/frontend/app/app.js | 17 ++++++++---------
.../components/queries-notebook/controller.ts | 6 ++----
modules/web-console/frontend/app/vendor.js | 1 -
modules/web-console/frontend/package.json | 1 -
4 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/modules/web-console/frontend/app/app.js b/modules/web-console/frontend/app/app.js
index c54a832..64e0152 100644
--- a/modules/web-console/frontend/app/app.js
+++ b/modules/web-console/frontend/app/app.js
@@ -176,7 +176,6 @@ export default angular
'ui.grid.saveState',
'ui.grid.selection',
'ui.router',
- 'ui.router.state.events',
'ui.carousel',
// Base modules.
'ignite-console.core',
@@ -371,11 +370,11 @@ export default angular
}
])
.run(['$rootScope', '$http', '$state', 'IgniteMessages', 'User', 'IgniteNotebookData',
- /**
- * @param {ng.IRootScopeService} $root
- * @param {ng.IHttpService} $http
- * @param {ReturnType<typeof import('./services/Messages.service').default>} Messages
- */
+ /**
+ * @param {ng.IRootScopeService} $root
+ * @param {ng.IHttpService} $http
+ * @param {ReturnType<typeof import('./services/Messages.service').default>} Messages
+ */
($root, $http, $state, Messages, User, Notebook) => { // eslint-disable-line no-shadow
$root.revertIdentity = () => {
$http.get('/api/v1/admin/revert/identity')
@@ -387,8 +386,8 @@ export default angular
}
])
.run(['IgniteIcon',
- /**
- * @param {import('./components/ignite-icon/service').default} IgniteIcon
- */
+ /**
+ * @param {import('./components/ignite-icon/service').default} IgniteIcon
+ */
(IgniteIcon) => IgniteIcon.registerIcons(icons)
]);
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 83e9723..7a96a91 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
@@ -18,7 +18,7 @@
import _ from 'lodash';
import {nonEmpty, nonNil} from 'app/utils/lodashMixins';
import id8 from 'app/utils/id8';
-import {timer, merge, defer, of, EMPTY} from 'rxjs';
+import {timer, merge, defer, of, EMPTY, from} from 'rxjs';
import {tap, switchMap, exhaustMap, take, pluck, distinctUntilChanged, filter, map, catchError} from 'rxjs/operators';
import {CSV} from 'app/services/CSV';
@@ -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 = [
diff --git a/modules/web-console/frontend/app/vendor.js b/modules/web-console/frontend/app/vendor.js
index d02b2ccf..1c6e9ab 100644
--- a/modules/web-console/frontend/app/vendor.js
+++ b/modules/web-console/frontend/app/vendor.js
@@ -26,7 +26,6 @@ import 'angular1-async-filter';
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 c6ecdaf..998e51f 100644
--- a/modules/web-console/frontend/package.json
+++ b/modules/web-console/frontend/package.json
@@ -30,7 +30,6 @@
"@uirouter/angularjs": "1.0.20",
"@uirouter/core": "5.0.19",
"@uirouter/rx": "0.5.0",
- "@uirouter/visualizer": "4.0.2",
"angular": "1.7.6",
"angular-acl": "0.1.10",
"angular-animate": "1.7.6",