NIFI-14489 Allow for custom named Process Groups when importing flows from registry

Signed-off-by: Maciej Bukalo <[email protected]>

Author: buczi

nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-api/src/main/java/org/apache/nifi/web/api/ProcessGroupResource.java

@@ -1047,6 +1047,11 @@ public Response createProcessGroup(
             // If there are any Parameter Providers referenced by Parameter Contexts, resolve these to point to the appropriate Parameter Provider, if we are able to.
             unresolvedParameterProviders.addAll(serviceFacade.resolveParameterProviders(flowSnapshot, NiFiUserUtils.getNiFiUser()));
 
+            // If Process Group name was provided in the request, prioritize it over the name from version control
+            if (requestProcessGroupEntity.getComponent().getName() != null) {
+                flowSnapshot.getFlowContents().setName(requestProcessGroupEntity.getComponent().getName());
+            }
+
             // Step 6: Update contents of the ProcessGroupDTO passed in to include the components that need to be added.
             requestProcessGroupEntity.setVersionedFlowSnapshot(flowSnapshot);
         }

nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/import-from-registry/import-from-registry.component.html

@@ -102,6 +102,13 @@ <h2 mat-dialog-title>Import From Registry</h2>
                         >No flows available</mat-error
                     >
                 </mat-form-field>
+                <div class="mb-5">
+                    <mat-form-field>
+                        <mat-label>Custom Versioned Flow Name</mat-label>
+                        <input matInput formControlName="customFlowName" type="text" />
+                        <mat-hint>Name of the created Process Group. If none provided, then the name is taken from versioned flow.</mat-hint>
+                    </mat-form-field>
+                </div>
                 <div class="mb-5">
                     <mat-checkbox formControlName="keepParameterContexts">
                         Keep existing Parameter Contexts

nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/import-from-registry/import-from-registry.component.ts

@@ -33,7 +33,7 @@ import { selectSaving } from '../../../../../state/flow/flow.selectors';
 import { AsyncPipe, NgForOf, NgIf } from '@angular/common';
 import { MatButtonModule } from '@angular/material/button';
 import { MatFormFieldModule } from '@angular/material/form-field';
-import { MatInputModule } from '@angular/material/input';
+import { MatHint, MatInputModule } from '@angular/material/input';
 import { MatOptionModule } from '@angular/material/core';
 import { MatSelectModule } from '@angular/material/select';
 import { NifiSpinnerDirective } from '../../../../../../../ui/common/spinner/nifi-spinner.directive';
@@ -67,6 +67,7 @@ import { ContextErrorBanner } from '../../../../../../../ui/common/context-error
         MatDialogModule,
         MatFormFieldModule,
         MatInputModule,
+        MatHint,
         NgIf,
         NifiSpinnerDirective,
         ReactiveFormsModule,
@@ -159,6 +160,7 @@ export class ImportFromRegistry extends CloseOnEscapeDialog implements OnInit {
 
         const initialRegistry = this.registryClientOptions.length > 0 ? this.registryClientOptions[0].value : null;
         this.importFromRegistryForm = this.formBuilder.group({
+            customFlowName: new FormControl(null),
             registry: new FormControl(initialRegistry, Validators.required),
             branch: new FormControl(null),
             bucket: new FormControl(null, Validators.required),
@@ -397,6 +399,7 @@ export class ImportFromRegistry extends CloseOnEscapeDialog implements OnInit {
                 }),
                 disconnectedNodeAcknowledged: this.clusterConnectionService.isDisconnectionAcknowledged(),
                 component: {
+                    name: this.importFromRegistryForm.get('customFlowName')?.value,
                     position: {
                         x: this.dialogRequest.request.position.x,
                         y: this.dialogRequest.request.position.y