NIFI-13100:

- Updating API response error handling for canvas based actions.
apache · Apr 25, 2024 · 43041f8 · 43041f8
1 parent 335f08e
commit 43041f8
Show file tree

Hide file tree

Showing 20 changed files with 286 additions and 211 deletions.
diff --git a/.../src/main/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts b/.../src/main/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts
@@ -322,7 +322,8 @@ export class DraggableBehavior {
             },
             restoreOnFailure: {
                 position: d.position
-            }
+            },
+            errorStrategy: 'snackbar'
         };
     }
 
@@ -361,7 +362,8 @@ export class DraggableBehavior {
             },
             restoreOnFailure: {
                 bends: connection.bends
-            }
+            },
+            errorStrategy: 'snackbar'
         };
     }
 

diff --git a/...frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts b/...frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
@@ -599,7 +599,8 @@ export class CanvasContextMenu implements ContextMenuDefinitionProvider {
                                 id: d.id,
                                 uri: d.uri,
                                 type: d.type,
-                                revision: this.client.getRevision(d)
+                                revision: this.client.getRevision(d),
+                                errorStrategy: 'snackbar'
                             });
                         });
                         this.store.dispatch(
@@ -640,7 +641,8 @@ export class CanvasContextMenu implements ContextMenuDefinitionProvider {
                                 id: d.id,
                                 uri: d.uri,
                                 type: d.type,
-                                revision: this.client.getRevision(d)
+                                revision: this.client.getRevision(d),
+                                errorStrategy: 'snackbar'
                             });
                         });
                         this.store.dispatch(
@@ -710,7 +712,8 @@ export class CanvasContextMenu implements ContextMenuDefinitionProvider {
                                 id: d.id,
                                 uri: d.uri,
                                 type: d.type,
-                                revision: this.client.getRevision(d)
+                                revision: this.client.getRevision(d),
+                                errorStrategy: 'snackbar'
                             });
                         });
                         this.store.dispatch(
@@ -741,7 +744,8 @@ export class CanvasContextMenu implements ContextMenuDefinitionProvider {
                                 id: d.id,
                                 uri: d.uri,
                                 type: d.type,
-                                revision: this.client.getRevision(d)
+                                revision: this.client.getRevision(d),
+                                errorStrategy: 'snackbar'
                             });
                         });
                         this.store.dispatch(
@@ -768,7 +772,8 @@ export class CanvasContextMenu implements ContextMenuDefinitionProvider {
                             id: d.id,
                             uri: d.uri,
                             type: d.type,
-                            revision: this.client.getRevision(d)
+                            revision: this.client.getRevision(d),
+                            errorStrategy: 'snackbar'
                         });
                     });
 
@@ -796,7 +801,8 @@ export class CanvasContextMenu implements ContextMenuDefinitionProvider {
                             id: d.id,
                             uri: d.uri,
                             type: d.type,
-                            revision: this.client.getRevision(d)
+                            revision: this.client.getRevision(d),
+                            errorStrategy: 'snackbar'
                         });
                     });
                     this.store.dispatch(

diff --git a/...d/src/main/nifi/src/app/pages/flow-designer/service/manager/connection-manager.service.ts b/...d/src/main/nifi/src/app/pages/flow-designer/service/manager/connection-manager.service.ts
@@ -356,7 +356,8 @@ export class ConnectionManager {
                 disconnectedNodeAcknowledged: this.clusterConnectionService.isDisconnectionAcknowledged(),
                 component: connection
             },
-            restoreOnFailure: restoreOnFailure
+            restoreOnFailure: restoreOnFailure,
+            errorStrategy: 'snackbar'
         };
 
         // updateConnection is not needed here because we don't need any
@@ -2012,7 +2013,8 @@ export class ConnectionManager {
                                     type: ComponentType.Connection,
                                     uri: connectionData.uri,
                                     previousDestination: connectionData.component.destination,
-                                    payload
+                                    payload,
+                                    errorStrategy: 'snackbar'
                                 }
                             })
                         );

diff --git a/...ontend/src/main/nifi/src/app/pages/flow-designer/service/manager/label-manager.service.ts b/...ontend/src/main/nifi/src/app/pages/flow-designer/service/manager/label-manager.service.ts
@@ -348,7 +348,7 @@ export class LabelManager {
                     different = true;
                 }
 
-                // only save the updated bends if necessary
+                // only save the updated dimensions if necessary
                 if (different) {
                     const updateLabel: UpdateComponentRequest = {
                         id: labelData.id,
@@ -368,7 +368,8 @@ export class LabelManager {
                                 width: widthSet ? labelData.component.width : LabelManager.INITIAL_WIDTH,
                                 height: heightSet ? labelData.component.height : LabelManager.INITIAL_HEIGHT
                             }
-                        }
+                        },
+                        errorStrategy: 'snackbar'
                     };
 
                     self.store.dispatch(

diff --git a/...eb/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.actions.ts b/...eb/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.actions.ts
@@ -153,10 +153,6 @@ export const loadChildProcessGroupSuccess = createAction(
     props<{ response: ComponentEntity }>()
 );
 
-export const flowApiError = createAction(`${CANVAS_PREFIX} Flow Api Error`, props<{ error: string }>());
-
-export const clearFlowApiError = createAction(`${CANVAS_PREFIX} Clear Flow Api Error`);
-
 export const startProcessGroupPolling = createAction(`${CANVAS_PREFIX} Start Process Group Polling`);
 
 export const stopProcessGroupPolling = createAction(`${CANVAS_PREFIX} Stop Process Group Polling`);
@@ -766,11 +762,6 @@ export const saveToFlowRegistrySuccess = createAction(
     props<{ response: VersionControlInformationEntity }>()
 );
 
-export const flowVersionBannerError = createAction(
-    `${CANVAS_PREFIX} Flow Version Banner Error`,
-    props<{ error: string }>()
-);
-
 export const stopVersionControlRequest = createAction(
     `${CANVAS_PREFIX} Stop Version Control Request`,
     props<{ request: ConfirmStopVersionControlRequest }>()
@@ -788,6 +779,8 @@ export const stopVersionControlSuccess = createAction(
 
 export const flowSnackbarError = createAction(`${CANVAS_PREFIX} Flow Snackbar Error`, props<{ error: string }>());
 
+export const flowBannerError = createAction(`${CANVAS_PREFIX} Flow Banner Error`, props<{ error: string }>());
+
 export const openShowLocalChangesDialogRequest = createAction(
     `${CANVAS_PREFIX} Open Show Local Changes Dialog Request`,
     props<{ request: OpenLocalChangesDialogRequest }>()