[nifi] branch main updated: NIFI-11769 Adding details on Registry Clients and Registrty Client types on UI (#7453)

[mtien]

This is an automated email from the ASF dual-hosted git repository.

mtien pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git


The following commit(s) were added to refs/heads/main by this push:
     new 5f4cc106f1 NIFI-11769 Adding details on Registry Clients and Registrty 
Client types on UI (#7453)
5f4cc106f1 is described below

commit 5f4cc106f1f387a461a339b1c708a68b25043426
Author: simonbence <61191107+simonbe...@users.noreply.github.com>
AuthorDate: Fri Jun 30 20:33:41 2023 +0200

    NIFI-11769 Adding details on Registry Clients and Registrty Client types on 
UI (#7453)
    
    Co-authored-by: Shane Ardell <shane.m.ard...@gmail.com>
    
    Merged #7453 into main.
---
 .../src/main/webapp/js/nf/canvas/nf-settings.js    | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
index 650c84d2ee..fda056e78c 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-settings.js
@@ -2030,6 +2030,22 @@
                 formatter: descriptionFormatter,
                 sortable: true,
                 resizable: true
+            },
+            {
+                id: 'type',
+                name: 'Type',
+                field: 'type',
+                formatter: nfCommon.instanceTypeFormatter,
+                sortable: true,
+                resizable: true
+            },
+            {
+                id: 'bundle',
+                name: 'Bundle',
+                field: 'bundle',
+                formatter: nfCommon.instanceBundleFormatter,
+                sortable: true,
+                resizable: true
             }
         ];
 
@@ -2661,7 +2677,7 @@
             var regTypeOptions = [];
             response.flowRegistryClientTypes.forEach(function (type) {
                 regTypeOptions.push({
-                    text: nfCommon.substringAfterLast(type.type, '.'),
+                    text: nfCommon.substringAfterLast(type.type, '.') + ' (' + 
type.bundle.version + ')',
                     value: type.type,
                     description: type.description || ''
                 });
@@ -2999,6 +3015,10 @@
             if (nfCommon.isDefinedAndNotNull(parameterProvidersGrid)) {
                 parameterProvidersGrid.resizeCanvas();
             }
+            var registriesGrid = $('#registries-table').data('gridInstance');
+            if (nfCommon.isDefinedAndNotNull(registriesGrid)) {
+                registriesGrid.resizeCanvas();
+            }
         },
 
         /**