From 1e1c4462431776716b731bb59abe022be2ff70bb Mon Sep 17 00:00:00 2001
From: s9514171 <s9514171@gmail.com>
Date: Tue, 25 May 2021 10:26:11 +0000
Subject: [PATCH] NIFI-8628 - Variable Registry - Variable count doesn't reset
 when opening the variable dialog

Signed-off-by: Pierre Villard <pierre.villard.fr@gmail.com>

This closes #5097.
---
 .../src/main/webapp/js/nf/canvas/nf-variable-registry.js       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
index abc07e43cb..3b5d930836 100644
--- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
+++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-variable-registry.js
@@ -995,6 +995,8 @@
             url: '../nifi-api/process-groups/' + encodeURIComponent(processGroupId) + '/variable-registry',
             dataType: 'json'
         }).done(function (response) {
+            variablesCount = 0;
+
             $('#process-group-variable-registry').text(getScopeLabel(processGroupId));
             $('#variable-registry-process-group-id').text(processGroupId).data('revision', response.processGroupRevision);
 
@@ -1567,6 +1569,7 @@
 
         var variableGrid = $('#variable-registry-table').data('gridInstance');
         var variableData = variableGrid.getData();
+        variableGrid.setSelectedRows([]);
         variableData.setItems([]);
 
         var affectedProcessorContainer = $('#variable-registry-affected-processors');