From d20fa9417dfaddb7394be017256735ae1ef17c02 Mon Sep 17 00:00:00 2001
From: Rob Fellows <rob.fellows@gmail.com>
Date: Tue, 14 May 2024 13:11:21 -0400
Subject: [PATCH] [NIFI-13229] - Include branch when submitting to save version
 control endpoint. (#8830)

---
 .../src/app/pages/flow-designer/state/flow/flow.effects.ts  | 6 ++++--
 .../src/main/nifi/src/app/state/shared/index.ts             | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
index 5ef0b2d05b..cf01191cd1 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
@@ -3265,7 +3265,8 @@ export class FlowEffects {
                                                 flowId: saveRequest.existingFlowId,
                                                 bucketId: saveRequest.bucket,
                                                 registryId: saveRequest.registry,
-                                                comments: saveRequest.comments || ''
+                                                comments: saveRequest.comments || '',
+                                                branch: saveRequest.branch
                                             },
                                             processGroupId: saveRequest.processGroupId,
                                             processGroupRevision: saveRequest.revision
@@ -3282,7 +3283,8 @@ export class FlowEffects {
                                                 registryId: saveRequest.registry,
                                                 flowName: saveRequest.flowName,
                                                 description: saveRequest.flowDescription || '',
-                                                comments: saveRequest.comments || ''
+                                                comments: saveRequest.comments || '',
+                                                branch: saveRequest.branch
                                             },
                                             processGroupId: saveRequest.processGroupId,
                                             processGroupRevision: saveRequest.revision
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/shared/index.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/shared/index.ts
index 15645f8c1f..969f97b7ad 100644
--- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/shared/index.ts
+++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/shared/index.ts
@@ -588,6 +588,7 @@ export interface VersionedFlow {
     description: string;
     comments: string;
     action: string;
+    branch?: string;
 }
 
 export interface SparseVersionedFlow {
@@ -598,6 +599,7 @@ export interface SparseVersionedFlow {
     flowId?: string;
     flowName?: string;
     description?: string;
+    branch?: string;
 }
 
 export interface VersionedFlowSnapshotMetadataEntity {