From 46823449dab5e411b7896942d8a9eb9400a7df25 Mon Sep 17 00:00:00 2001 From: Venkateshwaran Shanmugham Date: Wed, 3 Jun 2026 07:33:55 +0530 Subject: [PATCH] NIFI-15963 Migrate ErrorBanner usages to Banner --- .../context-error-banner.component.html | 2 +- .../context-error-banner.component.ts | 4 +- .../component-access-policies.module.ts | 3 +- .../global-access-policies.module.ts | 3 +- .../pages/cluster/feature/cluster.module.ts | 2 - .../change-version-progress-dialog.html | 5 +-- .../change-version-progress-dialog.ts | 4 +- .../context-error-banner.component.html | 2 +- .../context-error-banner.component.ts | 4 +- ...-configuration-summary-step.component.html | 8 ++-- ...or-configuration-summary-step.component.ts | 4 +- ...onnector-configuration-step.component.html | 4 +- .../connector-configuration-step.component.ts | 4 +- .../error-banner/error-banner.component.html | 44 ------------------- .../error-banner/error-banner.component.scss | 31 ------------- .../error-banner.component.spec.ts | 38 ---------------- .../error-banner/error-banner.component.ts | 40 ----------------- .../libs/shared/src/components/index.ts | 1 - 18 files changed, 21 insertions(+), 182 deletions(-) delete mode 100644 nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.html delete mode 100644 nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.scss delete mode 100644 nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.spec.ts delete mode 100644 nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.ts diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/common/context-error-banner/context-error-banner.component.html b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/common/context-error-banner/context-error-banner.component.html index 20e35b964c4c..948beaed6368 100644 --- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/common/context-error-banner/context-error-banner.component.html +++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/common/context-error-banner/context-error-banner.component.html @@ -17,4 +17,4 @@ ~ under the License. --> - + diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/common/context-error-banner/context-error-banner.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/common/context-error-banner/context-error-banner.component.ts index 0aec083315b6..7fe94d2ecbdc 100644 --- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/common/context-error-banner/context-error-banner.component.ts +++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/common/context-error-banner/context-error-banner.component.ts @@ -25,12 +25,12 @@ import { clearBannerErrors } from '../../../state/error/error.actions'; import { Observable } from 'rxjs'; import { selectBannerErrors } from '../../../state/error/error.selectors'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { ErrorBanner } from '@nifi/shared'; +import { Banner } from '@nifi/shared'; import { ErrorContextKey } from '../../../state/error'; @Component({ selector: 'context-error-banner', - imports: [CommonModule, ErrorBanner], + imports: [CommonModule, Banner], templateUrl: './context-error-banner.component.html', styleUrl: './context-error-banner.component.scss' }) diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.module.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.module.ts index 7b2f4063084e..bfa96a502312 100644 --- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.module.ts +++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.module.ts @@ -29,7 +29,7 @@ import { ComponentAccessPoliciesRoutingModule } from './component-access-policie import { RouterModule } from '@angular/router'; import { PolicyTable } from '../common/policy-table/policy-table.component'; import { MatButtonModule } from '@angular/material/button'; -import { ComponentContext, NifiTooltipDirective, ErrorBanner } from '@nifi/shared'; +import { ComponentContext, NifiTooltipDirective } from '@nifi/shared'; import { ContextErrorBanner } from '../../../../ui/common/context-error-banner/context-error-banner.component'; @NgModule({ @@ -50,7 +50,6 @@ import { ContextErrorBanner } from '../../../../ui/common/context-error-banner/c NifiTooltipDirective, PolicyTable, MatButtonModule, - ErrorBanner, ComponentContext, ContextErrorBanner ] diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.module.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.module.ts index 68162008e27b..a2b032de2e4b 100644 --- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.module.ts +++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.module.ts @@ -26,7 +26,7 @@ import { MatFormFieldModule } from '@angular/material/form-field'; import { ReactiveFormsModule } from '@angular/forms'; import { MatSelectModule } from '@angular/material/select'; import { GlobalAccessPoliciesRoutingModule } from './global-access-policies-routing.module'; -import { NifiTooltipDirective, ErrorBanner } from '@nifi/shared'; +import { NifiTooltipDirective } from '@nifi/shared'; import { PolicyTable } from '../common/policy-table/policy-table.component'; import { MatButtonModule } from '@angular/material/button'; import { ContextErrorBanner } from '../../../../ui/common/context-error-banner/context-error-banner.component'; @@ -48,7 +48,6 @@ import { ContextErrorBanner } from '../../../../ui/common/context-error-banner/c NifiTooltipDirective, PolicyTable, MatButtonModule, - ErrorBanner, ContextErrorBanner ] }) diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/feature/cluster.module.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/feature/cluster.module.ts index 49073179eb53..c97b83956c7f 100644 --- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/feature/cluster.module.ts +++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/feature/cluster.module.ts @@ -27,7 +27,6 @@ import { ClusterRoutingModule } from './cluster-routing.module'; import { RouterModule } from '@angular/router'; import { MatTabsModule } from '@angular/material/tabs'; import { MatIconButton } from '@angular/material/button'; -import { ErrorBanner } from '@nifi/shared'; import { BannerText } from '../../../ui/common/banner-text/banner-text.component'; import { ContextErrorBanner } from '../../../ui/common/context-error-banner/context-error-banner.component'; @@ -43,7 +42,6 @@ import { ContextErrorBanner } from '../../../ui/common/context-error-banner/cont MatTabsModule, MatIconButton, RouterModule, - ErrorBanner, BannerText, ContextErrorBanner ] diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-progress-dialog/change-version-progress-dialog.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-progress-dialog/change-version-progress-dialog.html index 53e77d57008f..b6741429e930 100644 --- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-progress-dialog/change-version-progress-dialog.html +++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-progress-dialog/change-version-progress-dialog.html @@ -18,10 +18,7 @@

Change Flow Version

@if (flowUpdateRequest$ | async; as versionChangeRequest) { @if (versionChangeRequest.request.complete && versionChangeRequest.request.failureReason) { - + } }
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-progress-dialog/change-version-progress-dialog.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-progress-dialog/change-version-progress-dialog.ts index 0da3259cce33..d66b88979c46 100644 --- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-progress-dialog/change-version-progress-dialog.ts +++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-progress-dialog/change-version-progress-dialog.ts @@ -22,11 +22,11 @@ import { FlowUpdateRequestEntity } from '../../../../../state/flow'; import { Observable, of } from 'rxjs'; import { AsyncPipe } from '@angular/common'; import { MatProgressBar } from '@angular/material/progress-bar'; -import { ErrorBanner } from '@nifi/shared'; +import { Banner } from '@nifi/shared'; @Component({ selector: 'change-version-progress-dialog', - imports: [MatDialogTitle, MatDialogModule, MatButton, AsyncPipe, MatProgressBar, ErrorBanner], + imports: [MatDialogTitle, MatDialogModule, MatButton, AsyncPipe, MatProgressBar, Banner], templateUrl: './change-version-progress-dialog.html', styleUrl: './change-version-progress-dialog.scss' }) diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/context-error-banner/context-error-banner.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/context-error-banner/context-error-banner.component.html index 20e35b964c4c..948beaed6368 100644 --- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/context-error-banner/context-error-banner.component.html +++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/context-error-banner/context-error-banner.component.html @@ -17,4 +17,4 @@ ~ under the License. --> - + diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/context-error-banner/context-error-banner.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/context-error-banner/context-error-banner.component.ts index e9f80964c968..b223896ba9b3 100644 --- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/context-error-banner/context-error-banner.component.ts +++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/context-error-banner/context-error-banner.component.ts @@ -25,12 +25,12 @@ import { clearBannerErrors } from '../../../state/error/error.actions'; import { Observable } from 'rxjs'; import { selectBannerErrors } from '../../../state/error/error.selectors'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { ErrorBanner } from '@nifi/shared'; +import { Banner } from '@nifi/shared'; import { ErrorContextKey } from '../../../state/error'; @Component({ selector: 'context-error-banner', - imports: [CommonModule, ErrorBanner], + imports: [CommonModule, Banner], templateUrl: './context-error-banner.component.html', styleUrl: './context-error-banner.component.scss' }) diff --git a/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-configuration-summary-step/connector-configuration-summary-step.component.html b/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-configuration-summary-step/connector-configuration-summary-step.component.html index f820085d9788..fc5a0a363ca5 100644 --- a/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-configuration-summary-step/connector-configuration-summary-step.component.html +++ b/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-configuration-summary-step/connector-configuration-summary-step.component.html @@ -74,11 +74,11 @@
@if (verifyAllError()) { - - + } @@ -129,11 +129,11 @@ @let generalMessages = getGeneralErrorMessages(stepConfig.configurationStepName); @if (generalMessages.length > 0) { - - + } @for (group of stepConfig.propertyGroupConfigurations; track group.propertyGroupName) { diff --git a/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-configuration-summary-step/connector-configuration-summary-step.component.ts b/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-configuration-summary-step/connector-configuration-summary-step.component.ts index eb89c778d7d0..1f8015a53aea 100644 --- a/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-configuration-summary-step/connector-configuration-summary-step.component.ts +++ b/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-configuration-summary-step/connector-configuration-summary-step.component.ts @@ -23,7 +23,7 @@ import { MatTooltip } from '@angular/material/tooltip'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { NifiSpinnerDirective } from '../../directives/spinner/nifi-spinner.directive'; import { PropertyGroupCard } from '../property-group-card/property-group-card.component'; -import { ErrorBanner } from '../error-banner/error-banner.component'; +import { Banner } from '../banner/banner.component'; import { ConnectorConfiguration, ConnectorPropertyDescriptor, ConfigVerificationResult } from '../../types'; import { hasPropertyValue, @@ -41,7 +41,7 @@ import { NgxSkeletonLoaderModule, NifiSpinnerDirective, PropertyGroupCard, - ErrorBanner + Banner ], templateUrl: './connector-configuration-summary-step.component.html', styleUrl: './connector-configuration-summary-step.component.scss' diff --git a/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-wizard/connector-configuration-step/connector-configuration-step.component.html b/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-wizard/connector-configuration-step/connector-configuration-step.component.html index 1105fea677a2..abfa1f5162f9 100644 --- a/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-wizard/connector-configuration-step/connector-configuration-step.component.html +++ b/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-wizard/connector-configuration-step/connector-configuration-step.component.html @@ -34,12 +34,12 @@ - - + @if (stringListOrphanStripBannerEntries().length > 0) {
diff --git a/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-wizard/connector-configuration-step/connector-configuration-step.component.ts b/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-wizard/connector-configuration-step/connector-configuration-step.component.ts index 35902ab1b046..c25e792e9961 100644 --- a/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-wizard/connector-configuration-step/connector-configuration-step.component.ts +++ b/nifi-frontend/src/main/frontend/libs/shared/src/components/connector-wizard/connector-configuration-step/connector-configuration-step.component.ts @@ -44,7 +44,7 @@ import { UploadService } from '../../../services/upload.service'; import { ConnectorConfigurationService } from '../../../services/connector-configuration.service'; import { ConnectorPropertyInput } from '../../connector-property-input/connector-property-input.component'; import { StringListOrphansStrippedEvent } from '../../connector-property-input/connector-property-input.types'; -import { ErrorBanner } from '../../error-banner/error-banner.component'; +import { Banner } from '../../banner/banner.component'; import { StatusBanner } from '../../status-banner/status-banner.component'; import { StatusBannerDescriptionDirective } from '../../status-banner/status-banner.directives'; import { fromValueReference, toValueReference, SecretReferenceOptions } from '../../../services/value-reference.helper'; @@ -103,7 +103,7 @@ export interface StringListOrphanStripBannerEntry { WizardContextBanner, WizardStepDocumentationPanel, MatProgressSpinner, - ErrorBanner, + Banner, StatusBanner, StatusBannerDescriptionDirective ], diff --git a/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.html b/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.html deleted file mode 100644 index f2a35e7df959..000000000000 --- a/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.html +++ /dev/null @@ -1,44 +0,0 @@ - - -@if (messages && messages.length > 0) { - -} diff --git a/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.scss b/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.scss deleted file mode 100644 index 71ad5e3cd6b0..000000000000 --- a/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.scss +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -@use '@angular/material' as mat; - -.banner-container { - @include mat.button-density(-1); - - .error-banner-message { - word-break: break-word; - } - - ul { - list-style-type: disc; - list-style-position: inside; - } -} diff --git a/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.spec.ts b/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.spec.ts deleted file mode 100644 index a1d0d010e58b..000000000000 --- a/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.spec.ts +++ /dev/null @@ -1,38 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ErrorBanner } from './error-banner.component'; - -describe('ErrorBanner', () => { - let component: ErrorBanner; - let fixture: ComponentFixture; - - beforeEach(() => { - TestBed.configureTestingModule({ - imports: [ErrorBanner] - }); - fixture = TestBed.createComponent(ErrorBanner); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.ts b/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.ts deleted file mode 100644 index 831a907d287a..000000000000 --- a/nifi-frontend/src/main/frontend/libs/shared/src/components/error-banner/error-banner.component.ts +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import { Component, EventEmitter, Input, Output } from '@angular/core'; -import { NgClass } from '@angular/common'; -import { MatButtonModule } from '@angular/material/button'; - -@Component({ - selector: 'error-banner', - imports: [MatButtonModule, NgClass], - templateUrl: './error-banner.component.html', - styleUrls: ['./error-banner.component.scss'], - standalone: true -}) -export class ErrorBanner { - @Input() messages: string[] | null = null; - @Input() showErrorIcon = true; - @Input() showBorder = true; - @Input() allowDismiss = true; - - @Output() dismiss: EventEmitter = new EventEmitter(); - - dismissClicked(): void { - this.dismiss.next(); - } -} diff --git a/nifi-frontend/src/main/frontend/libs/shared/src/components/index.ts b/nifi-frontend/src/main/frontend/libs/shared/src/components/index.ts index bfa603090294..d739d1076c2d 100644 --- a/nifi-frontend/src/main/frontend/libs/shared/src/components/index.ts +++ b/nifi-frontend/src/main/frontend/libs/shared/src/components/index.ts @@ -28,7 +28,6 @@ export * from './codemirror/themes/baseTheme'; export * from './yes-no-dialog/yes-no-dialog.component'; export * from './tooltips/property-hint-tip/property-hint-tip.component'; export * from './tooltips/text-tip/text-tip.component'; -export * from './error-banner/error-banner.component'; export * from './banner/banner.component'; export * from './wizard/wizard.component'; export * from './connector-wizard/connector-wizard.types';