From 6f5fda54e5f0510f7fc34c8860b942d33db13d1c Mon Sep 17 00:00:00 2001 From: Adam Kocsis Date: Thu, 3 Mar 2022 23:45:35 +0100 Subject: [PATCH] [NIFI-9746] NiFi Registy Bucket Side Nav no longer fails to open (#5831) - all ViewCild queries are decorated with {static: true} which is needed because of new angular version none of these ViewChild under *ng directives so they are available during init with static:true Merged #5831 into main. --- .../users/dialogs/add-user/nf-registry-add-user.js | 2 +- .../create-new-group/nf-registry-create-new-group.js | 2 +- .../nf-registry-add-policy-to-bucket.js | 6 +++--- .../dialogs/create-bucket/nf-registry-create-bucket.js | 4 ++-- .../edit-bucket-policy/nf-registry-edit-bucket-policy.js | 6 +++--- .../nifi-registry-web-ui/src/main/webapp/nf-registry.js | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user/nf-registry-add-user.js b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user/nf-registry-add-user.js index 9b16d90e3c..dbd3c0c000 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user/nf-registry-add-user.js +++ b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/add-user/nf-registry-add-user.js @@ -92,7 +92,7 @@ NfRegistryAddUser.annotations = [ new Component({ templateUrl: './nf-registry-add-user.html', queries: { - newUserInput: new ViewChild('newUserInput') + newUserInput: new ViewChild('newUserInput', { static: true }) } }) ]; diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/create-new-group/nf-registry-create-new-group.js b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/create-new-group/nf-registry-create-new-group.js index f6a7c84841..13a9d471b8 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/create-new-group/nf-registry-create-new-group.js +++ b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/users/dialogs/create-new-group/nf-registry-create-new-group.js @@ -93,7 +93,7 @@ NfRegistryCreateNewGroup.annotations = [ new Component({ templateUrl: './nf-registry-create-new-group.html', queries: { - createNewGroupInput: new ViewChild('createNewGroupInput') + createNewGroupInput: new ViewChild('createNewGroupInput', { static: true }) } }) ]; diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/add-policy-to-bucket/nf-registry-add-policy-to-bucket.js b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/add-policy-to-bucket/nf-registry-add-policy-to-bucket.js index e6f42dd1c7..117fb238e1 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/add-policy-to-bucket/nf-registry-add-policy-to-bucket.js +++ b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/add-policy-to-bucket/nf-registry-add-policy-to-bucket.js @@ -421,9 +421,9 @@ NfRegistryAddPolicyToBucket.annotations = [ new Component({ templateUrl: './nf-registry-add-policy-to-bucket.html', queries: { - readCheckbox: new ViewChild('readCheckbox'), - writeCheckbox: new ViewChild('writeCheckbox'), - deleteCheckbox: new ViewChild('deleteCheckbox') + readCheckbox: new ViewChild('readCheckbox', { static: true }), + writeCheckbox: new ViewChild('writeCheckbox', { static: true }), + deleteCheckbox: new ViewChild('deleteCheckbox', { static: true }) } }) ]; diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/create-bucket/nf-registry-create-bucket.js b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/create-bucket/nf-registry-create-bucket.js index 0a0d2a1d4a..78e14f5072 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/create-bucket/nf-registry-create-bucket.js +++ b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/create-bucket/nf-registry-create-bucket.js @@ -88,8 +88,8 @@ NfRegistryCreateBucket.annotations = [ new Component({ templateUrl: './nf-registry-create-bucket.html', queries: { - newBucketName: new ViewChild('newBucketName'), - newBucketDescription: new ViewChild('newBucketDescription') + newBucketName: new ViewChild('newBucketName', { static: true }), + newBucketDescription: new ViewChild('newBucketDescription', { static: true }) } }) ]; diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/edit-bucket-policy/nf-registry-edit-bucket-policy.js b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/edit-bucket-policy/nf-registry-edit-bucket-policy.js index e0c3cca06e..8c51e6bb58 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/edit-bucket-policy/nf-registry-edit-bucket-policy.js +++ b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/components/administration/workflow/dialogs/edit-bucket-policy/nf-registry-edit-bucket-policy.js @@ -379,9 +379,9 @@ NfRegistryEditBucketPolicy.annotations = [ new Component({ templateUrl: './nf-registry-edit-bucket-policy.html', queries: { - readCheckbox: new ViewChild('readCheckbox'), - writeCheckbox: new ViewChild('writeCheckbox'), - deleteCheckbox: new ViewChild('deleteCheckbox') + readCheckbox: new ViewChild('readCheckbox', { static: true }), + writeCheckbox: new ViewChild('writeCheckbox', { static: true }), + deleteCheckbox: new ViewChild('deleteCheckbox', { static: true }) } }) ]; diff --git a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/nf-registry.js b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/nf-registry.js index 13093276f0..a79cb624c4 100644 --- a/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/nf-registry.js +++ b/nifi-registry/nifi-registry-core/nifi-registry-web-ui/src/main/webapp/nf-registry.js @@ -107,7 +107,7 @@ NfRegistry.annotations = [ selector: 'nf-registry-app', templateUrl: './nf-registry.html', queries: { - sidenav: new ViewChild('sidenav') + sidenav: new ViewChild('sidenav', { static: true }) }, animations: [nfRegistryAnimations.flyInOutAnimation] })