nifi-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bbe...@apache.org
Subject nifi-registry git commit: NIFIREG-153 - Inject angular router module into required components
Date Thu, 22 Mar 2018 13:42:13 GMT
Repository: nifi-registry
Updated Branches:
  refs/heads/master 1755d8400 -> f863940b8


NIFIREG-153 - Inject angular router module into required components

This closes #106.

Signed-off-by: Bryan Bende <bbende@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi-registry/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-registry/commit/f863940b
Tree: http://git-wip-us.apache.org/repos/asf/nifi-registry/tree/f863940b
Diff: http://git-wip-us.apache.org/repos/asf/nifi-registry/diff/f863940b

Branch: refs/heads/master
Commit: f863940b86b0adda03b1cbdc2dfb53db9dc8a8f7
Parents: 1755d84
Author: Scott Aslan <scottyaslan@gmail.com>
Authored: Thu Mar 15 11:34:05 2018 -0400
Committer: Bryan Bende <bbende@apache.org>
Committed: Thu Mar 22 09:41:49 2018 -0400

----------------------------------------------------------------------
 .../administration/users/nf-registry-users-administration.js | 5 ++++-
 .../components/page-not-found/nf-registry-page-not-found.js  | 8 ++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f863940b/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.js
----------------------------------------------------------------------
diff --git a/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.js
b/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.js
index 77f9906..db62a5c 100644
--- a/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.js
+++ b/nifi-registry-web-ui/src/main/webapp/components/administration/users/nf-registry-users-administration.js
@@ -35,9 +35,10 @@ var NfRegistryCreateNewGroup = require('nifi-registry/components/administration/
  * @param activatedRoute        The angular activated route module.
  * @param fdsDialogService      The FDS dialog service.
  * @param matDialog             The angular material dialog module.
+ * @param router                The angular router module.
  * @constructor
  */
-function NfRegistryUsersAdministration(nfRegistryApi, nfStorage, nfRegistryService, activatedRoute,
fdsDialogService, matDialog) {
+function NfRegistryUsersAdministration(nfRegistryApi, nfStorage, nfRegistryService, activatedRoute,
fdsDialogService, matDialog, router) {
     // Services
     this.route = activatedRoute;
     this.nfStorage = nfStorage;
@@ -45,6 +46,7 @@ function NfRegistryUsersAdministration(nfRegistryApi, nfStorage, nfRegistryServi
     this.nfRegistryApi = nfRegistryApi;
     this.dialogService = fdsDialogService;
     this.dialog = matDialog;
+    this.router = router;
 };
 
 NfRegistryUsersAdministration.prototype = {
@@ -131,6 +133,7 @@ NfRegistryUsersAdministration.parameters = [
     NfStorage,
     NfRegistryService,
     ngRouter.ActivatedRoute,
+    ngRouter.Router,
     fdsDialogsModule.FdsDialogService,
     ngMaterial.MatDialog
 ];

http://git-wip-us.apache.org/repos/asf/nifi-registry/blob/f863940b/nifi-registry-web-ui/src/main/webapp/components/page-not-found/nf-registry-page-not-found.js
----------------------------------------------------------------------
diff --git a/nifi-registry-web-ui/src/main/webapp/components/page-not-found/nf-registry-page-not-found.js
b/nifi-registry-web-ui/src/main/webapp/components/page-not-found/nf-registry-page-not-found.js
index 28c1447..7ad52b8 100644
--- a/nifi-registry-web-ui/src/main/webapp/components/page-not-found/nf-registry-page-not-found.js
+++ b/nifi-registry-web-ui/src/main/webapp/components/page-not-found/nf-registry-page-not-found.js
@@ -18,17 +18,20 @@ var ngCore = require('@angular/core');
 var NfRegistryService = require('nifi-registry/services/nf-registry.service.js');
 var nfRegistryAnimations = require('nifi-registry/nf-registry.animations.js');
 var fdsDialogsModule = require('@fluid-design-system/dialogs');
+var ngRouter = require('@angular/router');
 
 /**
  * NfLoginComponent constructor.
  *
  * @param nfRegistryService     The nf-registry.service module.
  * @param fdsDialogService      The FDS dialog service.
+ * @param router                The angular router module.
  */
-function NfPageNotFoundComponent(nfRegistryService, fdsDialogService) {
+function NfPageNotFoundComponent(nfRegistryService, fdsDialogService, router) {
     // Services
     this.nfRegistryService = nfRegistryService;
     this.dialogService = fdsDialogService;
+    this.router = router;
 };
 
 NfPageNotFoundComponent.prototype = {
@@ -47,7 +50,7 @@ NfPageNotFoundComponent.prototype = {
         }).afterClosed().subscribe(
             function (accept) {
                 if (accept) {
-                    self.nfRegistryService.router.navigateByUrl(self.nfRegistryService.redirectUrl);
+                    self.router.navigateByUrl(self.nfRegistryService.redirectUrl);
                 }
             });
     }
@@ -66,6 +69,7 @@ NfPageNotFoundComponent.annotations = [
 NfPageNotFoundComponent.parameters = [
     NfRegistryService,
     fdsDialogsModule.FdsDialogService,
+    ngRouter.Router
 ];
 
 module.exports = NfPageNotFoundComponent;


Mime
View raw message