This is an automated email from the ASF dual-hosted git repository.
bbende 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 d20fa9417d [NIFI-13229] - Include branch when submitting to save
version control endpoint. (#8830)
d20fa9417d is described below
commit d20fa9417dfaddb7394be017256735ae1ef17c02
Author: Rob Fellows <[email protected]>
AuthorDate: Tue May 14 13:11:21 2024 -0400
[NIFI-13229] - Include branch when submitting to save version control
endpoint. (#8830)
---
.../nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts | 6 ++++--
.../nifi-web-frontend/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 {