diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/index.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/index.ts new file mode 100644 index 0000000000..bdd8955a45 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/index.ts @@ -0,0 +1,35 @@ +/* + * 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 { MatDialogConfig } from '@angular/material/dialog'; + +export const SMALL_DIALOG: MatDialogConfig = { + maxWidth: '24rem', + minWidth: 320 +}; +export const MEDIUM_DIALOG: MatDialogConfig = { + maxWidth: 470, + minWidth: 470 +}; +export const LARGE_DIALOG: MatDialogConfig = { + maxWidth: 760, + minWidth: 760 +}; +export const XL_DIALOG: MatDialogConfig = { + maxWidth: 1024, + minWidth: 1024 +}; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts index 950d7cf136..ac37462b31 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts @@ -32,6 +32,7 @@ import { AddTenantToPolicyDialog } from '../../ui/common/add-tenant-to-policy-di import { AddTenantsToPolicyRequest } from './index'; import { selectUserGroups, selectUsers } from '../tenants/tenants.selectors'; import { OverridePolicyDialog } from '../../ui/common/override-policy-dialog/override-policy-dialog.component'; +import { MEDIUM_DIALOG, SMALL_DIALOG } from '../../../../index'; @Injectable() export class AccessPolicyEffects { @@ -172,7 +173,7 @@ export class AccessPolicyEffects { concatLatestFrom(() => this.store.select(selectAccessPolicy).pipe(isDefinedAndNotNull())), tap(([, accessPolicy]) => { const dialogReference = this.dialog.open(OverridePolicyDialog, { - panelClass: 'small-dialog' + ...SMALL_DIALOG }); dialogReference.componentInstance.copyInheritedPolicy @@ -289,10 +290,10 @@ export class AccessPolicyEffects { concatLatestFrom(() => this.store.select(selectAccessPolicy)), tap(([, accessPolicy]) => { const dialogReference = this.dialog.open(AddTenantToPolicyDialog, { + ...MEDIUM_DIALOG, data: { accessPolicy - }, - panelClass: 'medium-dialog' + } }); dialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -350,11 +351,11 @@ export class AccessPolicyEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Update Policy', message: `Remove '${request.tenant.component.identity}' from this policy?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -419,12 +420,12 @@ export class AccessPolicyEffects { ofType(AccessPolicyActions.promptDeleteAccessPolicy), tap(() => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Delete Policy', message: 'Are you sure you want to delete this policy? By doing so, the permissions for this component will revert to the inherited policy if applicable.' - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/override-policy-dialog/override-policy-dialog.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/override-policy-dialog/override-policy-dialog.component.html index 715a7e6933..d30e24beba 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/override-policy-dialog/override-policy-dialog.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/override-policy-dialog/override-policy-dialog.component.html @@ -17,7 +17,7 @@

Override Policy

- +
Do you want to override with a copy of the inherited policy or an empty policy?
Copy diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.effects.ts index dc07acef18..57c8ea5488 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.effects.ts @@ -28,6 +28,7 @@ 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'; +import { SMALL_DIALOG } from '../../../../index'; @Injectable() export class CounterListingEffects { @@ -68,11 +69,11 @@ export class CounterListingEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Reset Counter', message: `Reset counter '${request.counter.name}' to default value?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/state/flow-configuration-history-listing/flow-configuration-history-listing.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/state/flow-configuration-history-listing/flow-configuration-history-listing.effects.ts index 6e62d66fac..60b4780c72 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/state/flow-configuration-history-listing/flow-configuration-history-listing.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/state/flow-configuration-history-listing/flow-configuration-history-listing.effects.ts @@ -34,6 +34,7 @@ import { YesNoDialog } from '../../../../ui/common/yes-no-dialog/yes-no-dialog.c import { isDefinedAndNotNull } from '../../../../state/shared'; import * as ErrorActions from '../../../../state/error/error.actions'; import { selectAbout } from '../../../../state/about/about.selectors'; +import { MEDIUM_DIALOG, SMALL_DIALOG } from '../../../../index'; @Injectable() export class FlowConfigurationHistoryListingEffects { @@ -81,8 +82,8 @@ export class FlowConfigurationHistoryListingEffects { map((action) => action.request), tap((actionEntity) => { this.dialog.open(ActionDetails, { - data: actionEntity, - panelClass: 'medium-dialog' + ...MEDIUM_DIALOG, + data: actionEntity }); }) ), @@ -94,9 +95,7 @@ export class FlowConfigurationHistoryListingEffects { this.actions$.pipe( ofType(HistoryActions.openPurgeHistoryDialog), tap(() => { - const dialogReference = this.dialog.open(PurgeHistory, { - panelClass: 'medium-short-dialog' - }); + const dialogReference = this.dialog.open(PurgeHistory); dialogReference.componentInstance.submitPurgeRequest .pipe( @@ -106,11 +105,11 @@ export class FlowConfigurationHistoryListingEffects { ) .subscribe(([result, about]) => { const yesNoRef = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Confirm History Purge', message: `Are you sure you want to delete all history before '${result.endDate} ${about.timezone}'?` - }, - panelClass: 'small-dialog' + } }); yesNoRef.componentInstance.yes.pipe(take(1)).subscribe(() => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.scss index 79924e5815..e54ff14552 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.scss @@ -23,7 +23,6 @@ .panel-content { position: relative; - height: 350px; overflow-y: auto; } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/purge-history/purge-history.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/purge-history/purge-history.component.html index b6f3d310e6..c1dd80f149 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/purge-history/purge-history.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/purge-history/purge-history.component.html @@ -21,7 +21,7 @@
-
+
Before Date
-
+
Before Time ({{ (about$ | async)?.timezone }}) { const dialogReference = this.dialog.open(CreateControllerService, { + ...LARGE_DIALOG, data: { controllerServiceTypes - }, - panelClass: 'medium-dialog' + } }); dialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -190,11 +191,11 @@ export class ControllerServicesEffects { const serviceId: string = request.id; const editDialogReference = this.dialog.open(EditControllerService, { + ...LARGE_DIALOG, data: { controllerService: request.controllerService }, - id: serviceId, - panelClass: 'large-dialog' + id: serviceId }); editDialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -205,11 +206,11 @@ export class ControllerServicesEffects { const goTo = (commands: string[], destination: string): void => { if (editDialogReference.componentInstance.editControllerServiceForm.dirty) { const saveChangesDialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Controller Service Configuration', message: `Save changes before going to this ${destination}?` - }, - panelClass: 'small-dialog' + } }); saveChangesDialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -380,9 +381,9 @@ export class ControllerServicesEffects { const serviceId: string = request.id; const enableDialogReference = this.dialog.open(EnableControllerService, { + ...XL_DIALOG, data: request, - id: serviceId, - panelClass: 'large-dialog' + id: serviceId }); enableDialogReference.componentInstance.goToReferencingComponent = ( @@ -420,9 +421,9 @@ export class ControllerServicesEffects { const serviceId: string = request.id; const enableDialogReference = this.dialog.open(DisableControllerService, { + ...XL_DIALOG, data: request, - id: serviceId, - panelClass: 'large-dialog' + id: serviceId }); enableDialogReference.componentInstance.goToReferencingComponent = ( @@ -457,11 +458,11 @@ export class ControllerServicesEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Delete Controller Service', message: `Delete controller service ${request.controllerService.component.name}?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { diff --git a/nifi-nar-bundles/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts index 77550447eb..deb393b4b4 100644 --- a/nifi-nar-bundles/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts @@ -99,6 +99,7 @@ import { ImportFromRegistry } from '../../ui/canvas/items/flow/import-from-regis import { selectCurrentUser } from '../../../../state/current-user/current-user.selectors'; import { NoRegistryClientsDialog } from '../../ui/common/no-registry-clients-dialog/no-registry-clients-dialog.component'; import { EditRemoteProcessGroup } from '../../ui/canvas/items/remote-process-group/edit-remote-process-group/edit-remote-process-group.component'; +import { LARGE_DIALOG, MEDIUM_DIALOG, SMALL_DIALOG } from '../../../../index'; import { HttpErrorResponse } from '@angular/common/http'; @Injectable() @@ -263,11 +264,11 @@ export class FlowEffects { tap(([request, processorTypes]) => { this.dialog .open(CreateProcessor, { + ...LARGE_DIALOG, data: { request, processorTypes - }, - panelClass: 'medium-dialog' + } }) .afterClosed() .subscribe(() => { @@ -307,8 +308,8 @@ export class FlowEffects { tap((request) => { this.dialog .open(CreateRemoteProcessGroup, { - data: request, - panelClass: 'large-dialog' + ...LARGE_DIALOG, + data: request }) .afterClosed() .subscribe(() => { @@ -433,8 +434,8 @@ export class FlowEffects { tap((request) => { this.dialog .open(CreateProcessGroup, { - data: request, - panelClass: 'medium-dialog' + ...MEDIUM_DIALOG, + data: request }) .afterClosed() .subscribe(() => { @@ -523,8 +524,8 @@ export class FlowEffects { tap((request) => { this.dialog .open(GroupComponents, { - data: request, - panelClass: 'medium-dialog' + ...MEDIUM_DIALOG, + data: request }) .afterClosed() .subscribe(() => { @@ -611,8 +612,8 @@ export class FlowEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(CreateConnection, { - data: request, - panelClass: 'large-dialog' + ...LARGE_DIALOG, + data: request }); dialogReference.componentInstance.getChildOutputPorts = (groupId: string): Observable => { @@ -667,8 +668,8 @@ export class FlowEffects { tap((request) => { this.dialog .open(CreatePort, { - data: request, - panelClass: 'small-dialog' + ...SMALL_DIALOG, + data: request }) .afterClosed() .subscribe(() => { @@ -756,8 +757,8 @@ export class FlowEffects { if (someRegistries) { const dialogReference = this.dialog.open(ImportFromRegistry, { - data: request, - panelClass: 'medium-dialog' + ...LARGE_DIALOG, + data: request }); dialogReference.componentInstance.getBuckets = ( @@ -796,10 +797,10 @@ export class FlowEffects { } else { this.dialog .open(NoRegistryClientsDialog, { + ...MEDIUM_DIALOG, data: { controllerPermissions: currentUser.controllerPermissions - }, - panelClass: 'medium-dialog' + } }) .afterClosed() .subscribe(() => { @@ -1042,8 +1043,8 @@ export class FlowEffects { tap((request) => { this.dialog .open(EditPort, { - data: request, - panelClass: 'medium-dialog' + ...MEDIUM_DIALOG, + data: request }) .afterClosed() .subscribe(() => { @@ -1106,9 +1107,9 @@ export class FlowEffects { const processorId: string = request.entity.id; const editDialogReference = this.dialog.open(EditProcessor, { + ...LARGE_DIALOG, data: request, - id: processorId, - panelClass: 'large-dialog' + id: processorId }); editDialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -1119,11 +1120,11 @@ export class FlowEffects { const goTo = (commands: string[], destination: string): void => { if (editDialogReference.componentInstance.editProcessorForm.dirty) { const saveChangesDialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Processor Configuration', message: `Save changes before going to this ${destination}?` - }, - panelClass: 'small-dialog' + } }); saveChangesDialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -1226,8 +1227,8 @@ export class FlowEffects { map((action) => action.request), tap((request) => { const editDialogReference = this.dialog.open(EditConnectionComponent, { - data: request, - panelClass: 'large-dialog' + ...LARGE_DIALOG, + data: request }); editDialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -1296,8 +1297,8 @@ export class FlowEffects { ), tap(([request, parameterContexts, currentProcessGroupId]) => { const editDialogReference = this.dialog.open(EditProcessGroup, { - data: request, - panelClass: 'large-dialog' + ...LARGE_DIALOG, + data: request }); editDialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -1367,8 +1368,8 @@ export class FlowEffects { map((action) => action.request), tap((request) => { const editDialogReference = this.dialog.open(EditRemoteProcessGroup, { - data: request, - panelClass: 'large-dialog' + ...LARGE_DIALOG, + data: request }); editDialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -2218,11 +2219,11 @@ export class FlowEffects { ofType(FlowActions.showOkDialog), tap((request) => { this.dialog.open(OkDialog, { + ...MEDIUM_DIALOG, data: { title: request.title, message: request.message - }, - panelClass: 'medium-dialog' + } }); }) ), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts index 7866350688..c792b255eb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts @@ -34,6 +34,7 @@ import { EditRemotePortDialogRequest } from '../flow'; import { ComponentType, isDefinedAndNotNull } from '../../../../state/shared'; import { selectTimeOffset } from '../../../../state/flow-configuration/flow-configuration.selectors'; import { selectAbout } from '../../../../state/about/about.selectors'; +import { MEDIUM_DIALOG } from '../../../../index'; @Injectable() export class ManageRemotePortsEffects { @@ -206,6 +207,7 @@ export class ManageRemotePortsEffects { const portId: string = request.id; const editDialogReference = this.dialog.open(EditRemotePortComponent, { + ...MEDIUM_DIALOG, data: { type: request.port.type, entity: request.port, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts index 37ba8e9180..e013150957 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts @@ -31,6 +31,7 @@ import { YesNoDialog } from '../../../../ui/common/yes-no-dialog/yes-no-dialog.c import { OkDialog } from '../../../../ui/common/ok-dialog/ok-dialog.component'; import { loadConnection, loadProcessGroup } from '../flow/flow.actions'; import { resetQueueState } from './queue.actions'; +import { SMALL_DIALOG } from '../../../../index'; @Injectable() export class QueueEffects { @@ -49,12 +50,12 @@ export class QueueEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Empty Queue', message: 'Are you sure you want to empty this queue? All FlowFiles waiting at the time of the request will be removed.' - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -79,8 +80,7 @@ export class QueueEffects { title: 'Empty Queue', message: 'Waiting for queue to empty...' }, - disableClose: true, - panelClass: 'small-dialog' + disableClose: true }); dialogReference.componentInstance.cancel.pipe(take(1)).subscribe(() => { @@ -114,12 +114,12 @@ export class QueueEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Empty All Queues', message: 'Are you sure you want to empty all queues in this Process Group? All FlowFiles from all connections waiting at the time of the request will be removed.' - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -144,8 +144,7 @@ export class QueueEffects { title: 'Empty All Queues', message: 'Waiting for all queues to empty...' }, - disableClose: true, - panelClass: 'small-dialog' + disableClose: true }); dialogReference.componentInstance.cancel.pipe(take(1)).subscribe(() => { @@ -315,11 +314,11 @@ export class QueueEffects { } const dialogReference = this.dialog.open(OkDialog, { + ...SMALL_DIALOG, data: { title: 'Empty Queue', message - }, - panelClass: 'small-dialog' + } }); dialogReference.afterClosed().subscribe(() => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/import-from-registry/import-from-registry.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/import-from-registry/import-from-registry.component.scss index bba2634bef..35331a0ba2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/import-from-registry/import-from-registry.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/import-from-registry/import-from-registry.component.scss @@ -30,7 +30,6 @@ .listing-table { table { - width: auto; table-layout: unset; .mat-column-version { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.html index 58d09c9cb3..1104364845 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.html @@ -15,8 +15,8 @@ ~ limitations under the License. --> -
-
+
+
Automatically Terminate/Retry Relationships
@@ -29,7 +29,11 @@
@for (relationship of relationships; track relationship; let i = $index) {
-
{{ relationship.name }}
+
+ {{ relationship.name }} +
-
- @if (isRelationshipRetried()) { -
+
+
+ @if (isRelationshipRetried()) {
Number of Retry Attempts @@ -112,7 +116,7 @@ >
-
- } + } +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/no-registry-clients-dialog/no-registry-clients-dialog.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/no-registry-clients-dialog/no-registry-clients-dialog.component.html index 92e84119b9..6ce5bc0cc2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/no-registry-clients-dialog/no-registry-clients-dialog.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/no-registry-clients-dialog/no-registry-clients-dialog.component.html @@ -17,7 +17,7 @@

No Registry clients available

-
+
{{ request.controllerPermissions.canRead ? 'In order to import a flow a Registry Client must be configured in Controller Settings.' diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/edit-remote-port/edit-remote-port.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/edit-remote-port/edit-remote-port.component.scss index b4a795bb96..af5a340beb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/edit-remote-port/edit-remote-port.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/edit-remote-port/edit-remote-port.component.scss @@ -20,7 +20,6 @@ .edit-remote-port-form { @include mat.button-density(-1); - width: 500px; .mat-mdc-form-field { width: 100%; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/login/state/access/access.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/login/state/access/access.effects.ts index 92a2e02251..24dc3937ba 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/login/state/access/access.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/login/state/access/access.effects.ts @@ -24,6 +24,7 @@ import { AuthStorage } from '../../../../service/auth-storage.service'; import { Router } from '@angular/router'; import { MatDialog } from '@angular/material/dialog'; import { OkDialog } from '../../../../ui/common/ok-dialog/ok-dialog.component'; +import { MEDIUM_DIALOG } from '../../../../index'; @Injectable() export class AccessEffects { @@ -89,11 +90,11 @@ export class AccessEffects { map((action) => action.failure), tap((failure) => { this.dialog.open(OkDialog, { + ...MEDIUM_DIALOG, data: { title: 'Login', message: failure - }, - panelClass: 'medium-dialog' + } }); }) ), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts index fbcc2046e9..c32c2a96ae 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts @@ -57,6 +57,7 @@ import { EditParameterDialog } from '../../../../ui/common/edit-parameter-dialog import { OkDialog } from '../../../../ui/common/ok-dialog/ok-dialog.component'; import { ErrorHelper } from '../../../../service/error-helper.service'; import { HttpErrorResponse } from '@angular/common/http'; +import { MEDIUM_DIALOG, SMALL_DIALOG, XL_DIALOG } from '../../../../index'; @Injectable() export class ParameterContextListingEffects { @@ -97,8 +98,8 @@ export class ParameterContextListingEffects { ofType(ParameterContextListingActions.openNewParameterContextDialog), tap(() => { const dialogReference = this.dialog.open(EditParameterContext, { - data: {}, - panelClass: 'large-dialog' + ...XL_DIALOG, + data: {} }); dialogReference.componentInstance.availableParameterContexts$ = @@ -110,8 +111,8 @@ export class ParameterContextListingEffects { ): Observable => { const dialogRequest: EditParameterRequest = { existingParameters }; const newParameterDialogReference = this.dialog.open(EditParameterDialog, { - data: dialogRequest, - panelClass: 'medium-dialog' + ...MEDIUM_DIALOG, + data: dialogRequest }); newParameterDialogReference.componentInstance.saving$ = of(false); @@ -247,10 +248,10 @@ export class ParameterContextListingEffects { const parameterContextId: string = request.parameterContext.id; const editDialogReference = this.dialog.open(EditParameterContext, { + ...XL_DIALOG, data: { parameterContext: request.parameterContext - }, - panelClass: 'edit-parameter-context-dialog' + } }); editDialogReference.componentInstance.updateRequest = this.store.select(selectUpdateRequest); @@ -266,8 +267,8 @@ export class ParameterContextListingEffects { ): Observable => { const dialogRequest: EditParameterRequest = { existingParameters }; const newParameterDialogReference = this.dialog.open(EditParameterDialog, { - data: dialogRequest, - panelClass: 'medium-dialog' + ...MEDIUM_DIALOG, + data: dialogRequest }); newParameterDialogReference.componentInstance.saving$ = of(false); @@ -293,8 +294,8 @@ export class ParameterContextListingEffects { } }; const editParameterDialogReference = this.dialog.open(EditParameterDialog, { - data: dialogRequest, - panelClass: 'medium-dialog' + ...MEDIUM_DIALOG, + data: dialogRequest }); editParameterDialogReference.componentInstance.saving$ = of(false); @@ -480,11 +481,11 @@ export class ParameterContextListingEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Delete Parameter Context', message: `Delete parameter context ${request.parameterContext.component.name}?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -542,11 +543,11 @@ export class ParameterContextListingEffects { ofType(ParameterContextListingActions.showOkDialog), tap((request) => { this.dialog.open(OkDialog, { + ...MEDIUM_DIALOG, data: { title: request.title, message: request.message - }, - panelClass: 'medium-dialog' + } }); }) ), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.html index 1869e48b44..aff9401cb0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.html @@ -16,7 +16,7 @@ -->
-
+
@if (canAddParameters) {
-
+
Parameter
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss index ed0d2a33b8..a4de7a5698 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.scss @@ -20,7 +20,6 @@ .parameter-table { .listing-table { @include mat.table-density(-4); - width: 506px; table { .mat-column-actions { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts index 557846b02c..edca22caf8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts @@ -43,6 +43,7 @@ import { HttpErrorResponse } from '@angular/common/http'; import { isDefinedAndNotNull } from '../../../../state/shared'; import { selectClusterSummary } from '../../../../state/cluster-summary/cluster-summary.selectors'; import { ClusterService } from '../../../../service/cluster.service'; +import { LARGE_DIALOG, MEDIUM_DIALOG } from '../../../../index'; @Injectable() export class ProvenanceEventListingEffects { @@ -92,8 +93,7 @@ export class ProvenanceEventListingEffects { title: 'Provenance', message: 'Searching provenance events...' }, - disableClose: true, - panelClass: 'small-dialog' + disableClose: true }); dialogReference.componentInstance.cancel.pipe(take(1)).subscribe(() => { @@ -276,13 +276,13 @@ export class ProvenanceEventListingEffects { ]), tap(([request, timeOffset, options, currentRequest, about]) => { const dialogReference = this.dialog.open(ProvenanceSearchDialog, { + ...LARGE_DIALOG, data: { timeOffset, clusterNodes: request.clusterNodes, options, currentRequest - }, - panelClass: 'large-dialog' + } }); dialogReference.componentInstance.timezone = about.timezone; @@ -322,10 +322,10 @@ export class ProvenanceEventListingEffects { this.provenanceService.getProvenanceEvent(request.eventId, request.clusterNodeId).subscribe({ next: (response) => { const dialogReference = this.dialog.open(ProvenanceEventDialog, { + ...LARGE_DIALOG, data: { event: response.provenanceEvent - }, - panelClass: 'large-dialog' + } }); dialogReference.componentInstance.contentViewerAvailable = about?.contentViewerUrl != null; @@ -429,11 +429,11 @@ export class ProvenanceEventListingEffects { ofType(ProvenanceEventListingActions.showOkDialog), tap((request) => { this.dialog.open(OkDialog, { + ...MEDIUM_DIALOG, data: { title: request.title, message: request.message - }, - panelClass: 'medium-dialog' + } }); }) ), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts index 830b0ae31a..bd142de4c1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts @@ -34,6 +34,7 @@ import { HttpErrorResponse } from '@angular/common/http'; import * as ErrorActions from '../../../../state/error/error.actions'; import { ErrorHelper } from '../../../../service/error-helper.service'; import { stopPollingQueueListingRequest } from './queue-listing.actions'; +import { LARGE_DIALOG } from '../../../../index'; @Injectable() export class QueueListingEffects { @@ -92,8 +93,7 @@ export class QueueListingEffects { title: 'Queue Listing', message: 'Waiting for queue listing to complete...' }, - disableClose: true, - panelClass: 'small-dialog' + disableClose: true }); dialogReference.componentInstance.cancel.pipe(take(1)).subscribe(() => { @@ -264,8 +264,8 @@ export class QueueListingEffects { filter((about) => about != null), tap(([request, about]) => { const dialogReference = this.dialog.open(FlowFileDialog, { - data: request, - panelClass: 'large-dialog' + ...LARGE_DIALOG, + data: request }); dialogReference.componentInstance.contentViewerAvailable = about?.contentViewerUrl != null; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts index f039f3a91e..ec1ed5f6aa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts @@ -37,6 +37,7 @@ import * as ErrorActions from '../../../../state/error/error.actions'; import { ErrorHelper } from '../../../../service/error-helper.service'; import { selectStatus } from './flow-analysis-rules.selectors'; import { HttpErrorResponse } from '@angular/common/http'; +import { LARGE_DIALOG, SMALL_DIALOG } from '../../../../index'; @Injectable() export class FlowAnalysisRulesEffects { @@ -80,10 +81,10 @@ export class FlowAnalysisRulesEffects { concatLatestFrom(() => this.store.select(selectFlowAnalysisRuleTypes)), tap(([, flowAnalysisRuleTypes]) => { this.dialog.open(CreateFlowAnalysisRule, { + ...LARGE_DIALOG, data: { flowAnalysisRuleTypes - }, - panelClass: 'medium-dialog' + } }); }) ), @@ -156,11 +157,11 @@ export class FlowAnalysisRulesEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Delete Flow Analysis Rule', message: `Delete reporting task ${request.flowAnalysisRule.component.name}?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -221,11 +222,11 @@ export class FlowAnalysisRulesEffects { const ruleId: string = request.id; const editDialogReference = this.dialog.open(EditFlowAnalysisRule, { + ...LARGE_DIALOG, data: { flowAnalysisRule: request.flowAnalysisRule }, - id: ruleId, - panelClass: 'large-dialog' + id: ruleId }); editDialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -236,11 +237,11 @@ export class FlowAnalysisRulesEffects { const goTo = (commands: string[], destination: string): void => { if (editDialogReference.componentInstance.editFlowAnalysisRuleForm.dirty) { const saveChangesDialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Flow Analysis Rule Configuration', message: `Save changes before going to this ${destination}?` - }, - panelClass: 'small-dialog' + } }); saveChangesDialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/general/general.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/general/general.effects.ts index addaf271c9..1da2c817e1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/general/general.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/general/general.effects.ts @@ -28,6 +28,7 @@ import { selectStatus } from './general.selectors'; import { NiFiState } from '../../../../state'; import { Store } from '@ngrx/store'; import { HttpErrorResponse } from '@angular/common/http'; +import { SMALL_DIALOG } from '../../../../index'; @Injectable() export class GeneralEffects { @@ -91,11 +92,11 @@ export class GeneralEffects { ofType(GeneralActions.updateControllerConfigSuccess), tap(() => { this.dialog.open(OkDialog, { + ...SMALL_DIALOG, data: { title: 'Settings', message: 'Settings successfully applied' - }, - panelClass: 'small-dialog' + } }); }) ), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts index 46ad41dfc8..1193e3100a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts @@ -41,6 +41,7 @@ import { DisableControllerService } from '../../../../ui/common/controller-servi import { PropertyTableHelperService } from '../../../../service/property-table-helper.service'; import { HttpErrorResponse } from '@angular/common/http'; import { ErrorHelper } from '../../../../service/error-helper.service'; +import { LARGE_DIALOG, SMALL_DIALOG, XL_DIALOG } from '../../../../index'; @Injectable() export class ManagementControllerServicesEffects { @@ -84,10 +85,10 @@ export class ManagementControllerServicesEffects { concatLatestFrom(() => this.store.select(selectControllerServiceTypes)), tap(([, controllerServiceTypes]) => { const dialogReference = this.dialog.open(CreateControllerService, { + ...LARGE_DIALOG, data: { controllerServiceTypes - }, - panelClass: 'medium-dialog' + } }); dialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -179,11 +180,11 @@ export class ManagementControllerServicesEffects { const serviceId: string = request.id; const editDialogReference = this.dialog.open(EditControllerService, { + ...LARGE_DIALOG, data: { controllerService: request.controllerService }, - id: serviceId, - panelClass: 'large-dialog' + id: serviceId }); editDialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -197,11 +198,11 @@ export class ManagementControllerServicesEffects { const goTo = (commands: string[], destination: string): void => { if (editDialogReference.componentInstance.editControllerServiceForm.dirty) { const saveChangesDialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Controller Service Configuration', message: `Save changes before going to this ${destination}?` - }, - panelClass: 'small-dialog' + } }); saveChangesDialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -353,9 +354,9 @@ export class ManagementControllerServicesEffects { const serviceId: string = request.id; const enableDialogReference = this.dialog.open(EnableControllerService, { + ...XL_DIALOG, data: request, - id: serviceId, - panelClass: 'large-dialog' + id: serviceId }); enableDialogReference.componentInstance.goToReferencingComponent = ( @@ -384,9 +385,9 @@ export class ManagementControllerServicesEffects { const serviceId: string = request.id; const enableDialogReference = this.dialog.open(DisableControllerService, { + ...XL_DIALOG, data: request, - id: serviceId, - panelClass: 'large-dialog' + id: serviceId }); enableDialogReference.componentInstance.goToReferencingComponent = ( @@ -413,11 +414,11 @@ export class ManagementControllerServicesEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Delete Controller Service', message: `Delete controller service ${request.controllerService.component.name}?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts index 5f0bd0d990..e7220fd9a9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts @@ -55,6 +55,7 @@ import { FetchParameterProviderParameters } from '../../ui/parameter-providers/f import * as ErrorActions from '../../../../state/error/error.actions'; import { HttpErrorResponse } from '@angular/common/http'; import { ErrorHelper } from '../../../../service/error-helper.service'; +import { LARGE_DIALOG, SMALL_DIALOG, XL_DIALOG } from '../../../../index'; @Injectable() export class ParameterProvidersEffects { @@ -109,10 +110,10 @@ export class ParameterProvidersEffects { concatLatestFrom(() => this.store.select(selectParameterProviderTypes)), tap(([, parameterProviderTypes]) => { const dialogReference = this.dialog.open(CreateParameterProvider, { + ...LARGE_DIALOG, data: { parameterProviderTypes - }, - panelClass: 'medium-dialog' + } }); dialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -186,11 +187,11 @@ export class ParameterProvidersEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Delete Parameter Provider', message: `Delete parameter provider ${request.parameterProvider.component.name}?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => @@ -256,11 +257,11 @@ export class ParameterProvidersEffects { tap((request) => { const id = request.id; const editDialogReference = this.dialog.open(EditParameterProvider, { + ...LARGE_DIALOG, data: { parameterProvider: request.parameterProvider }, - id, - panelClass: 'large-dialog' + id }); editDialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -269,11 +270,11 @@ export class ParameterProvidersEffects { // confirm navigating away while changes are unsaved if (editDialogReference.componentInstance.editParameterProviderForm.dirty) { const promptSaveDialogRef = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Parameter Provider Configuration', message: `Save changes before going to this ${destination}` - }, - panelClass: 'small-dialog' + } }); promptSaveDialogRef.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -439,7 +440,7 @@ export class ParameterProvidersEffects { map((action) => action.request), tap((request) => { const dialogRef = this.dialog.open(FetchParameterProviderParameters, { - panelClass: 'xl-dialog', + ...XL_DIALOG, data: request }); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts index 6d60690f71..6b9d13f492 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts @@ -35,6 +35,7 @@ import { PropertyTableHelperService } from '../../../../service/property-table-h import * as ErrorActions from '../../../../state/error/error.actions'; import { ErrorHelper } from '../../../../service/error-helper.service'; import { HttpErrorResponse } from '@angular/common/http'; +import { LARGE_DIALOG, MEDIUM_DIALOG, SMALL_DIALOG } from '../../../../index'; @Injectable() export class RegistryClientsEffects { @@ -78,10 +79,10 @@ export class RegistryClientsEffects { concatLatestFrom(() => this.store.select(selectRegistryClientTypes)), tap(([, registryClientTypes]) => { const dialogReference = this.dialog.open(CreateRegistryClient, { + ...MEDIUM_DIALOG, data: { registryClientTypes - }, - panelClass: 'medium-dialog' + } }); dialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -180,9 +181,9 @@ export class RegistryClientsEffects { const registryClientId: string = request.registryClient.id; const editDialogReference = this.dialog.open(EditRegistryClient, { + ...LARGE_DIALOG, data: request, - id: registryClientId, - panelClass: 'large-dialog' + id: registryClientId }); editDialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -195,11 +196,11 @@ export class RegistryClientsEffects { if (editDialogReference.componentInstance.editRegistryClientForm.dirty) { const saveChangesDialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Registry Client Configuration', message: `Save changes before going to this Controller Service?` - }, - panelClass: 'small-dialog' + } }); saveChangesDialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -302,11 +303,11 @@ export class RegistryClientsEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Delete Registry Client', message: `Delete registry client ${request.registryClient.component.name}?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts index bfd2dd0eaa..36e65e0cc8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts @@ -37,6 +37,7 @@ import * as ErrorActions from '../../../../state/error/error.actions'; import { ErrorHelper } from '../../../../service/error-helper.service'; import { selectStatus } from './reporting-tasks.selectors'; import { HttpErrorResponse } from '@angular/common/http'; +import { LARGE_DIALOG, SMALL_DIALOG } from '../../../../index'; @Injectable() export class ReportingTasksEffects { @@ -80,10 +81,10 @@ export class ReportingTasksEffects { concatLatestFrom(() => this.store.select(selectReportingTaskTypes)), tap(([, reportingTaskTypes]) => { this.dialog.open(CreateReportingTask, { + ...LARGE_DIALOG, data: { reportingTaskTypes - }, - panelClass: 'medium-dialog' + } }); }) ), @@ -158,11 +159,11 @@ export class ReportingTasksEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Delete Reporting Task', message: `Delete reporting task ${request.reportingTask.component.name}?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -223,11 +224,11 @@ export class ReportingTasksEffects { const taskId: string = request.id; const editDialogReference = this.dialog.open(EditReportingTask, { + ...LARGE_DIALOG, data: { reportingTask: request.reportingTask }, - id: taskId, - panelClass: 'large-dialog' + id: taskId }); editDialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -238,11 +239,11 @@ export class ReportingTasksEffects { const goTo = (commands: string[], destination: string): void => { if (editDialogReference.componentInstance.editReportingTaskForm.dirty) { const saveChangesDialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Reporting Task Configuration', message: `Save changes before going to this ${destination}?` - }, - panelClass: 'small-dialog' + } }); saveChangesDialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/general/general-form/general-form.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/general/general-form/general-form.component.html index d6ea31caf2..c82aad3130 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/general/general-form/general-form.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/general/general-form/general-form.component.html @@ -37,7 +37,7 @@ color="primary" (click)="apply()" mat-raised-button> - Add + Apply }
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.html index d4c238ef11..bd403b5027 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.html @@ -44,14 +44,16 @@
Referencing Components
-
- +
+
+ +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts index 334fc0355f..0d83201c98 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts @@ -29,6 +29,7 @@ import { selectComponentClusterStatusLatestRequest } from './component-cluster-s import { isDefinedAndNotNull } from '../../../../state/shared'; import { HttpErrorResponse } from '@angular/common/http'; import * as ErrorActions from '../../../../state/error/error.actions'; +import { XL_DIALOG } from '../../../../index'; @Injectable() export class ComponentClusterStatusEffects { @@ -100,7 +101,7 @@ export class ComponentClusterStatusEffects { ), tap(([response, request]) => { const dialogRef = this.dialog.open(ClusterSummaryDialog, { - panelClass: 'xl-dialog', + ...XL_DIALOG, data: request }); dialogRef.componentInstance.componentType = response.componentType; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts index 512a8b9493..9e8207ee47 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts @@ -35,6 +35,7 @@ import { UserAccessPolicies } from '../../ui/user-listing/user-access-policies/u import * as ErrorActions from '../../../../state/error/error.actions'; import { ErrorHelper } from '../../../../service/error-helper.service'; import { HttpErrorResponse } from '@angular/common/http'; +import { LARGE_DIALOG, MEDIUM_DIALOG, SMALL_DIALOG } from '../../../../index'; @Injectable() export class UserListingEffects { @@ -97,8 +98,8 @@ export class UserListingEffects { existingUserGroups }; const dialogReference = this.dialog.open(EditTenantDialog, { - data: editTenantRequest, - panelClass: 'medium-dialog' + ...MEDIUM_DIALOG, + data: editTenantRequest }); dialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -329,8 +330,8 @@ export class UserListingEffects { existingUserGroups }; const dialogReference = this.dialog.open(EditTenantDialog, { - data: editTenantRequest, - panelClass: 'medium-dialog' + ...MEDIUM_DIALOG, + data: editTenantRequest }); dialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -555,8 +556,8 @@ export class UserListingEffects { existingUserGroups }; const dialogReference = this.dialog.open(EditTenantDialog, { - data: editTenantRequest, - panelClass: 'medium-dialog' + ...MEDIUM_DIALOG, + data: editTenantRequest }); dialogReference.componentInstance.saving$ = this.store.select(selectSaving); @@ -654,8 +655,8 @@ export class UserListingEffects { tap((request) => { this.dialog .open(UserAccessPolicies, { - data: request, - panelClass: 'large-dialog' + ...LARGE_DIALOG, + data: request }) .afterClosed() .subscribe((response) => { @@ -679,11 +680,11 @@ export class UserListingEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Delete User Account', message: `Are you sure you want to delete the user account for '${request.user.component.identity}'?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { @@ -720,11 +721,11 @@ export class UserListingEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(YesNoDialog, { + ...SMALL_DIALOG, data: { title: 'Delete User Account', message: `Are you sure you want to delete the user group account for '${request.userGroup.component.identity}'?` - }, - panelClass: 'small-dialog' + } }); dialogReference.componentInstance.yes.pipe(take(1)).subscribe(() => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.scss index 52b37a1d6a..829cb39665 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.scss @@ -24,8 +24,6 @@ .listing-table { table { - width: auto; - td, th { cursor: default; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/property-table-helper.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/property-table-helper.service.ts index d46068ca9f..a75b9aa76d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/property-table-helper.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/property-table-helper.service.ts @@ -38,6 +38,7 @@ import { NiFiState } from '../state'; import { Store } from '@ngrx/store'; import { snackBarError } from '../state/error/error.actions'; import { HttpErrorResponse } from '@angular/common/http'; +import { LARGE_DIALOG, SMALL_DIALOG } from '../index'; @Injectable({ providedIn: 'root' @@ -62,8 +63,8 @@ export class PropertyTableHelperService { return (existingProperties: string[], allowsSensitive: boolean) => { const dialogRequest: NewPropertyDialogRequest = { existingProperties, allowsSensitive }; const newPropertyDialogReference = this.dialog.open(NewPropertyDialog, { - data: dialogRequest, - panelClass: 'small-dialog' + ...SMALL_DIALOG, + data: dialogRequest }); return newPropertyDialogReference.componentInstance.newProperty.pipe( @@ -131,10 +132,10 @@ export class PropertyTableHelperService { switchMap((implementingTypesResponse) => { // show the create controller service dialog with the types that implemented the interface const createServiceDialogReference = this.dialog.open(CreateControllerService, { + ...LARGE_DIALOG, data: { controllerServiceTypes: implementingTypesResponse.controllerServiceTypes - }, - panelClass: 'medium-dialog' + } }); return createServiceDialogReference.componentInstance.createControllerService.pipe( diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts index 3db1769fbd..d1b38b59ce 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts @@ -27,6 +27,7 @@ import { ComponentStateDialog } from '../../ui/common/component-state/component- import { resetComponentState } from './component-state.actions'; import { selectComponentUri } from './component-state.selectors'; import { isDefinedAndNotNull } from '../shared'; +import { LARGE_DIALOG } from '../../index'; @Injectable() export class ComponentStateEffects { @@ -78,7 +79,7 @@ export class ComponentStateEffects { ofType(ComponentStateActions.openComponentStateDialog), tap(() => { const dialogReference = this.dialog.open(ComponentStateDialog, { - panelClass: 'large-dialog' + ...LARGE_DIALOG }); dialogReference.afterClosed().subscribe(() => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts index 6a8c7a5ac5..cf7f73b279 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts @@ -27,6 +27,7 @@ import { MatDialog } from '@angular/material/dialog'; import { ControllerServiceStateService } from '../../service/controller-service-state.service'; import { ControllerServiceEntity, ControllerServiceReferencingComponentEntity, isDefinedAndNotNull } from '../shared'; import { SetEnableRequest, SetEnableStep } from './index'; +import { MEDIUM_DIALOG } from '../../index'; @Injectable() export class ControllerServiceStateEffects { @@ -318,11 +319,11 @@ export class ControllerServiceStateEffects { ofType(ControllerServiceActions.showOkDialog), tap((request) => { this.dialog.open(OkDialog, { + ...MEDIUM_DIALOG, data: { title: request.title, message: request.message - }, - panelClass: 'medium-dialog' + } }); }) ), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.effects.ts index 0f413f4900..dea6e81c2a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.effects.ts @@ -146,8 +146,9 @@ export class StatusHistoryEffects { map((action) => action.request), tap((request) => { const dialogReference = this.dialog.open(StatusHistory, { - data: request, - panelClass: 'large-dialog' + maxHeight: 'unset', + maxWidth: 'unset', + data: request }); dialogReference.afterClosed().subscribe((response) => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts index 08d09c7349..14aa0190b4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts @@ -25,6 +25,7 @@ import * as SystemDiagnosticsActions from './system-diagnostics.actions'; import { catchError, from, map, of, switchMap, tap } from 'rxjs'; import { SystemDiagnosticsRequest } from './index'; import { SystemDiagnosticsDialog } from '../../ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component'; +import { LARGE_DIALOG } from '../../index'; @Injectable() export class SystemDiagnosticsEffects { @@ -98,7 +99,9 @@ export class SystemDiagnosticsEffects { ofType(SystemDiagnosticsActions.openSystemDiagnosticsDialog), tap(() => { this.dialog - .open(SystemDiagnosticsDialog, { panelClass: 'large-dialog' }) + .open(SystemDiagnosticsDialog, { + ...LARGE_DIALOG + }) .afterClosed() .subscribe(() => { this.store.dispatch(SystemDiagnosticsActions.viewSystemDiagnosticsComplete()); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html index efc6f74485..e539286f66 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.html @@ -31,7 +31,7 @@ {{ stateDescription }}
-
+
Displaying {{ filteredEntries }} of {{ totalEntries }}
@@ -48,7 +48,7 @@ }
-
+
@if (disableRequest.currentStep === SetEnableStep.Pending) { -
-
+
+
Service
-
{{ controllerService.component.name }}
+
+ {{ controllerService.component.name }} +
Scope
Service and referencing components
-
+
Referencing Components
-
- +
+
+ +
@@ -50,14 +56,22 @@ } @else { -
-
+
+
Service
-
{{ controllerService.component.name }}
+
+ {{ controllerService.component.name }} +
-
Steps To Disable {{ controllerService.component.name }}
+
+ Steps To Disable {{ controllerService.component.name }} +
Stopping referencing processors and reporting tasks
@@ -113,14 +127,16 @@
-
+
Referencing Components
-
- +
+
+ +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.scss index 1e93c9d13e..01e2fa4418 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.scss @@ -23,10 +23,5 @@ .mdc-dialog__content { padding: 0 16px; font-size: 14px; - - .tab-content { - height: 475px; - overflow-y: auto; - } } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.html index 898c1367b9..b2a7c2b4bb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.html @@ -73,10 +73,14 @@
Referencing Components
-
- +
+
+ +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.html index f65d7a5e19..27cd2f1745 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.html @@ -21,11 +21,15 @@
@if (enableRequest.currentStep === SetEnableStep.Pending) { -
-
-
+
+
+
Service
-
{{ controllerService.component.name }}
+
+ {{ controllerService.component.name }} +
@@ -45,14 +49,16 @@
-
+
Referencing Components
-
- +
+
+ +
@@ -70,14 +76,22 @@ } @else { -
-
+
+
Service
-
{{ controllerService.component.name }}
+
+ {{ controllerService.component.name }} +
-
Steps To Disable {{ controllerService.component.name }}
+
+ Steps To Enable {{ controllerService.component.name }} +
Enabling this controller service
@@ -134,14 +148,16 @@
-
+
Referencing Components
-
- +
+
+ +
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.scss index 3882298328..cb133b8b2b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.scss @@ -23,11 +23,6 @@ .mdc-dialog__content { padding: 0 16px; font-size: 14px; - - .tab-content { - height: 475px; - overflow-y: auto; - } } .mat-mdc-form-field { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss index 87fb21d73e..5e322bbd11 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/extension-creation/extension-creation.component.scss @@ -21,8 +21,6 @@ @include mat.button-density(-1); .listing-table { - width: 740px; - table { .fa.fa-shield { width: 10px; @@ -58,7 +56,6 @@ -webkit-box-orient: vertical; font-size: 14px; line-height: 17px; - width: 740px; height: 50px; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/ok-dialog/ok-dialog.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/ok-dialog/ok-dialog.component.html index 151f28e9f2..6d89b13a19 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/ok-dialog/ok-dialog.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/ok-dialog/ok-dialog.component.html @@ -17,7 +17,7 @@

{{ request.title }}

-
{{ request.message }}
+
{{ request.message }}
 diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.scss index 9fbb08d6d1..2944f98194 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.scss @@ -14,12 +14,3 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - -@use '@angular/material' as mat; - -.property-table { - .listing-table { - @include mat.table-density(-4); - width: 740px; - } -} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html index f352712633..b0ace0faf2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html @@ -14,7 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -
+
@if (statusHistoryState$ | async; as statusHistoryState) {

Status History

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.scss index c691a340dc..165ea615f2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.scss @@ -25,46 +25,22 @@ .status-history { @include mat.button-density(-1); - overflow-y: auto; - .mdc-dialog__content { - padding: 0 16px; - font-size: 14px; - - .dialog-content { - min-height: 523px; - overflow-y: auto; - } - } - - .mdc-dialog__actions { - // give a little room for the grab/resize handle away from the button. - padding: 10px; + .mat-mdc-dialog-content { + max-height: unset; } .mat-mdc-form-field { width: 100%; } - mat-dialog-actions { - margin-top: auto; - } - .status-history-svg { pointer-events: none; } - .component-details { - min-width: 285px; - } - .chart-panel { min-width: 495px; } - - .mat-mdc-dialog-content { - max-height: unset; - } } } @@ -98,6 +74,12 @@ } } +:host ::ng-deep #status-history-chart-container { + height: 372px; + cursor: default; + overflow: hidden; +} + :host ::ng-deep #status-history-chart-control-container { height: 125px; margin-top: 5px; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.scss index 73956e945e..1ee54c759e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.scss @@ -19,17 +19,6 @@ .system-diagnostics { @include mat.button-density(-1); - overflow-y: auto; - - .mdc-dialog__content { - padding: 0 16px; - font-size: 14px; - - .dialog-content { - min-height: 500px; - overflow-y: auto; - } - } .tab-content { position: relative; @@ -55,12 +44,4 @@ padding-bottom: 0.2em; } } - - .mat-mdc-form-field { - width: 100%; - } - - mat-dialog-actions { - margin-top: auto; - } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/yes-no-dialog/yes-no-dialog.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/yes-no-dialog/yes-no-dialog.component.html index 39f92518a7..0fe30bd4ef 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/yes-no-dialog/yes-no-dialog.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/yes-no-dialog/yes-no-dialog.component.html @@ -17,7 +17,7 @@

{{ request.title }}

-
{{ request.message }}
+
{{ request.message }}
 diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_app.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_app.scss index e8d232aece..11af9e93ee 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_app.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_app.scss @@ -52,43 +52,6 @@ border-right: none; } - .small-dialog { - min-width: 320px; - } - - .medium-dialog { - min-width: 470px; - } - - .medium-short-dialog { - max-height: 32%; - max-width: 34%; - min-height: 250px; - min-width: 440px; - font-size: 13px; - } - - .large-dialog { - max-height: 72%; - max-width: 55%; - min-height: 520px; - min-width: 760px; - } - - .xl-dialog { - max-height: 72%; - max-width: 85%; - min-height: 560px; - min-width: 1024px; - } - - .edit-parameter-context-dialog { - max-height: 72%; - max-width: 55%; - min-width: 850px; - min-height: 575px; - } - .tooltip { position: fixed; max-width: 500px; @@ -149,6 +112,19 @@ .refresh-timestamp { font-weight: 500; } + + .flex-2 { + display: flex; + flex: 2; + flex-basis: 100%; + } + + .flex-1a { + display: flex; + flex-direction: column; + flex-basis: 100%; + flex: 1; + } } @mixin colors($material-theme, $canvas-theme) {