apache · rfellows · Feb 6, 2024 · Feb 1, 2024 · Feb 2, 2024 · Feb 2, 2024
diff --git a/...nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/service/bulletin-board.service.ts b/...nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/service/bulletin-board.service.ts
@@ -17,17 +17,13 @@
 
 import { Injectable } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
-import { Client } from '../../../service/client.service';
 import { LoadBulletinBoardRequest } from '../state/bulletin-board';
 
 @Injectable({ providedIn: 'root' })
 export class BulletinBoardService {
     private static readonly API: string = '../nifi-api';
 
-    constructor(
-        private httpClient: HttpClient,
-        private client: Client
-    ) {}
+    constructor(private httpClient: HttpClient) {}
 
     getBulletins(request: LoadBulletinBoardRequest) {
         const params: HttpParams = request as HttpParams;

diff --git a/...tend/src/main/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.actions.ts b/...tend/src/main/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.actions.ts
@@ -34,11 +34,6 @@ export const resetBulletinBoardState = createAction(`${BULLETIN_BOARD_PREFIX} Re
 
 export const clearBulletinBoard = createAction(`${BULLETIN_BOARD_PREFIX} Clear Bulletin Board`);
 
-export const bulletinBoardApiError = createAction(
-    `${BULLETIN_BOARD_PREFIX} Load Bulletin Board Errors`,
-    props<{ error: string }>()
-);
-
 export const setBulletinBoardFilter = createAction(
     `${BULLETIN_BOARD_PREFIX} Set Bulletin Board Filter`,
     props<{ filter: BulletinBoardFilterArgs }>()

diff --git a/...tend/src/main/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.effects.ts b/...tend/src/main/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.effects.ts
@@ -19,27 +19,29 @@ import { Injectable } from '@angular/core';
 import { Actions, concatLatestFrom, createEffect, ofType } from '@ngrx/effects';
 import { Store } from '@ngrx/store';
 import { NiFiState } from '../../../../state';
-import { Router } from '@angular/router';
 import * as BulletinBoardActions from './bulletin-board.actions';
-import { asyncScheduler, from, interval, map, of, switchMap, takeUntil } from 'rxjs';
+import { asyncScheduler, catchError, from, interval, map, of, switchMap, takeUntil } from 'rxjs';
 import { BulletinBoardService } from '../../service/bulletin-board.service';
-import { selectBulletinBoardFilter, selectLastBulletinId } from './bulletin-board.selectors';
+import { selectBulletinBoardFilter, selectLastBulletinId, selectStatus } from './bulletin-board.selectors';
 import { LoadBulletinBoardRequest } from './index';
+import { ErrorHelper } from '../../../../service/error-helper.service';
+import { HttpErrorResponse } from '@angular/common/http';
 
 @Injectable()
 export class BulletinBoardEffects {
     constructor(
         private actions$: Actions,
         private store: Store<NiFiState>,
-        private router: Router,
-        private bulletinBoardService: BulletinBoardService
+        private bulletinBoardService: BulletinBoardService,
+        private errorHelper: ErrorHelper
     ) {}
 
     loadBulletinBoard$ = createEffect(() =>
         this.actions$.pipe(
             ofType(BulletinBoardActions.loadBulletinBoard),
             map((action) => action.request),
-            switchMap((request) =>
+            concatLatestFrom(() => this.store.select(selectStatus)),
+            switchMap(([request, status]) =>
                 from(
                     this.bulletinBoardService.getBulletins(request).pipe(
                         map((response: any) =>
@@ -49,6 +51,9 @@ export class BulletinBoardEffects {
                                     loadedTimestamp: response.bulletinBoard.generated
                                 }
                             })
+                        ),
+                        catchError((errorResponse: HttpErrorResponse) =>
+                            of(this.errorHelper.handleLoadingError(status, errorResponse))
                         )
                     )
                 )

diff --git a/...tend/src/main/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.reducer.ts b/...tend/src/main/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.reducer.ts
@@ -18,7 +18,6 @@
 import { BulletinBoardEvent, BulletinBoardItem, BulletinBoardState } from './index';
 import { createReducer, on } from '@ngrx/store';
 import {
-    bulletinBoardApiError,
     clearBulletinBoard,
     loadBulletinBoard,
     loadBulletinBoardSuccess,
@@ -36,7 +35,6 @@ export const initialBulletinBoardState: BulletinBoardState = {
     autoRefresh: true,
     lastBulletinId: 0,
     status: 'pending',
-    error: null,
     loadedTimestamp: ''
 };
 
@@ -67,17 +65,10 @@ export const bulletinBoardReducer = createReducer(
             bulletinBoardItems: [...state.bulletinBoardItems, ...items],
             lastBulletinId: lastId,
             status: 'success' as const,
-            error: null,
             loadedTimestamp: response.loadedTimestamp
         };
     }),
 
-    on(bulletinBoardApiError, (state, { error }) => ({
-        ...state,
-        error,
-        status: 'error' as const
-    })),
-
     on(resetBulletinBoardState, () => ({ ...initialBulletinBoardState })),
 
     on(clearBulletinBoard, (state) => ({

diff --git a/...nd/src/main/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.selectors.ts b/...nd/src/main/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.selectors.ts
@@ -33,3 +33,5 @@ export const selectBulletinBoardFilter = createSelector(
     selectBulletinBoardState,
     (state: BulletinBoardState) => state.filter
 );
+
+export const selectStatus = createSelector(selectBulletinBoardState, (state: BulletinBoardState) => state.status);
diff --git a/...web/nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/state/bulletin-board/index.ts b/...web/nifi-web-frontend/src/main/nifi/src/app/pages/bulletins/state/bulletin-board/index.ts
@@ -39,8 +39,7 @@ export interface BulletinBoardState {
     autoRefresh: boolean;
     lastBulletinId: number;
     loadedTimestamp: string;
-    error: string | null;
-    status: 'pending' | 'loading' | 'error' | 'success';
+    status: 'pending' | 'loading' | 'success';
 }
 
 export interface LoadBulletinBoardResponse {

diff --git a/...end/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.actions.ts b/...end/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.actions.ts
@@ -28,7 +28,7 @@ export const loadCountersSuccess = createAction(
 );
 
 export const counterListingApiError = createAction(
-    `${COUNTER_PREFIX} Load Counter Listing Errors`,
+    `${COUNTER_PREFIX} Load Counter Listing Error`,
     props<{ error: string }>()
 );
 

diff --git a/...end/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.effects.ts b/...end/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.effects.ts
@@ -16,30 +16,34 @@
  */
 
 import { Injectable } from '@angular/core';
-import { Actions, createEffect, ofType } from '@ngrx/effects';
+import { Actions, concatLatestFrom, createEffect, ofType } from '@ngrx/effects';
 import { NiFiState } from '../../../../state';
 import { Store } from '@ngrx/store';
-import { Router } from '@angular/router';
 import * as CounterListingActions from './counter-listing.actions';
 import { catchError, from, map, of, switchMap, take, tap } from 'rxjs';
 import { CountersService } from '../../service/counters.service';
 import { MatDialog } from '@angular/material/dialog';
 import { YesNoDialog } from '../../../../ui/common/yes-no-dialog/yes-no-dialog.component';
+import * as ErrorActions from '../../../../state/error/error.actions';
+import { ErrorHelper } from '../../../../service/error-helper.service';
+import { HttpErrorResponse } from '@angular/common/http';
+import { selectStatus } from './counter-listing.selectors';
 
 @Injectable()
 export class CounterListingEffects {
     constructor(
         private actions$: Actions,
         private store: Store<NiFiState>,
-        private router: Router,
         private countersService: CountersService,
+        private errorHelper: ErrorHelper,
         private dialog: MatDialog
     ) {}
 
     loadCounters$ = createEffect(() =>
         this.actions$.pipe(
             ofType(CounterListingActions.loadCounters),
-            switchMap(() =>
+            concatLatestFrom(() => this.store.select(selectStatus)),
+            switchMap(([, status]) =>
                 from(this.countersService.getCounters()).pipe(
                     map((response) =>
                         CounterListingActions.loadCountersSuccess({
@@ -49,12 +53,8 @@ export class CounterListingEffects {
                             }
                         })
                     ),
-                    catchError((error) =>
-                        of(
-                            CounterListingActions.counterListingApiError({
-                                error: error.error
-                            })
-                        )
+                    catchError((errorResponse: HttpErrorResponse) =>
+                        of(this.errorHelper.handleLoadingError(status, errorResponse))
                     )
                 )
             )
@@ -98,9 +98,19 @@ export class CounterListingEffects {
                             response
                         })
                     ),
-                    catchError((error) => of(CounterListingActions.counterListingApiError({ error: error.error })))
+                    catchError((errorResponse: HttpErrorResponse) =>
+                        of(CounterListingActions.counterListingApiError({ error: errorResponse.error }))
+                    )
                 )
             )
         )
     );
+
+    counterListingApiError$ = createEffect(() =>
+        this.actions$.pipe(
+            ofType(CounterListingActions.counterListingApiError),
+            map((action) => action.error),
+            switchMap((error) => of(ErrorActions.snackBarError({ error })))
+        )
+    );
 }
diff --git a/...end/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.reducer.ts b/...end/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.reducer.ts
@@ -30,7 +30,6 @@ export const initialState: CounterListingState = {
     counters: [],
     saving: false,
     loadedTimestamp: '',
-    error: null,
     status: 'pending'
 };
 
@@ -44,14 +43,11 @@ export const counterListingReducer = createReducer(
         ...state,
         counters: response.counters,
         loadedTimestamp: response.loadedTimestamp,
-        error: null,
         status: 'success' as const
     })),
-    on(counterListingApiError, (state, { error }) => ({
+    on(counterListingApiError, (state) => ({
         ...state,
-        saving: false,
-        error,
-        status: 'error' as const
+        saving: false
     })),
     on(resetCounterSuccess, (state, { response }) => {
         return produce(state, (draftState) => {

diff --git a/...d/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.selectors.ts b/...d/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.selectors.ts
@@ -25,3 +25,5 @@ export const selectCounterListingState = createSelector(
 );
 
 export const selectCounters = createSelector(selectCounterListingState, (state: CounterListingState) => state.counters);
+
+export const selectStatus = createSelector(selectCounterListingState, (state: CounterListingState) => state.status);
diff --git a/...web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/index.ts b/...web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/index.ts
@@ -27,8 +27,7 @@ export interface CounterListingState {
     counters: CounterEntity[];
     saving: boolean;
     loadedTimestamp: string;
-    error: string | null;
-    status: 'pending' | 'loading' | 'error' | 'success';
+    status: 'pending' | 'loading' | 'success';
 }
 
 export interface LoadCounterListingResponse {

diff --git a/...nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts b/...nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
@@ -85,17 +85,9 @@ export class ControllerServicesEffects {
                             }
                         })
                     ),
-                    catchError((errorResponse: HttpErrorResponse) => {
-                        if (status === 'success') {
-                            if (this.errorHelper.showErrorInContext(errorResponse.status)) {
-                                return of(ErrorActions.snackBarError({ error: errorResponse.error }));
-                            } else {
-                                return of(this.errorHelper.fullScreenError(errorResponse));
-                            }
-                        } else {
-                            return of(this.errorHelper.fullScreenError(errorResponse));
-                        }
-                    })
+                    catchError((errorResponse: HttpErrorResponse) =>
+                        of(this.errorHelper.handleLoadingError(status, errorResponse))
+                    )
                 )
             )
         )

diff --git a/...main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.actions.ts b/...main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.actions.ts
@@ -80,8 +80,13 @@ export const disableFlowAnalysisRuleSuccess = createAction(
     props<{ response: DisableFlowAnalysisRuleSuccess }>()
 );
 
-export const flowAnalysisRuleApiError = createAction(
-    '[Flow Analysis Rules] Load Flow Analysis Rules Error',
+export const flowAnalysisRuleBannerApiError = createAction(
+    '[Flow Analysis Rules] Load Flow Analysis Rule Banner Error',
+    props<{ error: string }>()
+);
+
+export const flowAnalysisRuleSnackbarApiError = createAction(
+    '[Flow Analysis Rules] Load Flow Analysis Rule Snackbar Error',
     props<{ error: string }>()
 );
Original file line number	Diff line number	Diff line change
Expand Up		@@ -25,3 +25,5 @@ export const selectCounterListingState = createSelector(
		);

		export const selectCounters = createSelector(selectCounterListingState, (state: CounterListingState) => state.counters);

		export const selectStatus = createSelector(selectCounterListingState, (state: CounterListingState) => state.status);