[nifi] branch main updated: NIFI-11846 - Change version should not show keep existing parameter context

[exceptionfactory]

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

exceptionfactory 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 969679e43b NIFI-11846 - Change version should not show keep existing 
parameter context
969679e43b is described below

commit 969679e43b82af0b9d217c3b971b751b4ded3eb2
Author: Pierre Villard <pierre.villard...@gmail.com>
AuthorDate: Mon Jul 24 15:16:30 2023 +0200

    NIFI-11846 - Change version should not show keep existing parameter context
    
    This closes #7517
    
    Signed-off-by: David Handermann <exceptionfact...@apache.org>
---
 .../webapp/WEB-INF/partials/canvas/import-flow-version-dialog.jsp | 4 ++--
 .../nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js   | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/import-flow-version-dialog.jsp
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/import-flow-version-dialog.jsp
index 1bb1eec152..b3513b4062 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/import-flow-version-dialog.jsp
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/WEB-INF/partials/canvas/import-flow-version-dialog.jsp
@@ -45,7 +45,7 @@
                 <div id="import-flow-version-label"></div>
             </div>
         </div>
-        <div class="setting keep-parameter-context">
+        <div id="keep-parameter-context-container" class="setting 
keep-parameter-context">
             <div id="keepExistingParameterContext" class="nf-checkbox 
checkbox-checked"></div>
             <div class="nf-checkbox-label">Keep Existing Parameter 
Contexts</div>
             <div class="fa fa-question-circle" alt="Info" title="When not 
selected, only directly associated Parameter Contexts will be copied, inherited 
Contexts with no direct assignment to a Process Group are ignored."></div>
@@ -70,4 +70,4 @@
             </div>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
index 7c37ec7252..9588722569 100644
--- 
a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
+++ 
b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-ui/src/main/webapp/js/nf/canvas/nf-flow-version.js
@@ -175,6 +175,8 @@
 
         $('#import-flow-version-container').hide();
         $('#import-flow-version-label').text('');
+
+        $('#keep-parameter-context-container').hide();
     };
 
     /**
@@ -782,6 +784,9 @@
             }]
         }).show();
 
+        // show the checkbox to keep existing parameter context
+        $('#keep-parameter-context-container').show();
+
         loadRegistries($('#import-flow-version-dialog'), registryCombo, 
bucketCombo, flowCombo, selectBucketImportVersion, function (bucketEntity) {
             return true;
         }).done(function () {
@@ -1925,6 +1930,9 @@
                         $('#import-flow-version-container').show();
                         
$('#import-flow-version-label').text(versionControlInformation.version);
 
+                        // hide the checkbox to keep existing parameter context
+                        $('#keep-parameter-context-container').hide();
+
                         // record the versionControlInformation
                         
$('#import-flow-version-process-group-id').data('versionControlInformation', 
versionControlInformation).data('revision', 
groupVersionControlInformation.processGroupRevision).text(processGroupId);