You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by rf...@apache.org on 2025/09/23 20:49:34 UTC
(nifi) branch main updated: NIFI-15003 Nx, angular, angular material, ngrx package upgrades (#10337)
This is an automated email from the ASF dual-hosted git repository.
rfellows pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new 39427e66d6 NIFI-15003 Nx, angular, angular material, ngrx package upgrades (#10337)
39427e66d6 is described below
commit 39427e66d6f36b17ba4e4adf82ee2231eea1a4f2
Author: Scott Aslan <sc...@users.noreply.github.com>
AuthorDate: Tue Sep 23 16:49:29 2025 -0400
NIFI-15003 Nx, angular, angular material, ngrx package upgrades (#10337)
* NIFI-15003 Nx, angular, angular material, ngrx package upgrades
* update node version in pom
This closes #10337
---
.../src/app/app.component.ts | 10 +-
.../feature/jolt-transform-json-ui.component.ts | 12 +-
.../service/jolt-transform-json-ui.service.ts | 6 +-
...olt-transform-json-processor-details.effects.ts | 8 +-
.../jolt-transform-json-property.effects.ts | 10 +-
.../jolt-transform-json-transform.effects.ts | 8 +-
.../jolt-transform-json-validate.effects.ts | 10 +-
.../apps/nifi-jolt-transform-ui/tsconfig.app.json | 4 +-
.../apps/nifi-registry/src/app/app.component.ts | 10 +-
.../pages/resources/feature/resources.component.ts | 10 +-
.../delete-droplet-dialog.component.ts | 16 +-
.../droplet-table-filter.component.ts | 7 +-
.../ui/droplet-table/droplet-table.component.html | 8 +-
.../ui/droplet-table/droplet-table.component.ts | 13 +-
.../droplet-versions-dialog.component.ts | 25 +-
.../export-droplet-version-dialog.component.html | 16 +-
.../export-droplet-version-dialog.component.ts | 23 +-
.../import-new-droplet-dialog.component.html | 8 +-
.../import-new-droplet-dialog.component.ts | 18 +-
.../import-new-droplet-version-dialog.component.ts | 18 +-
.../src/app/service/buckets.service.ts | 6 +-
.../src/app/service/droplets.service.ts | 6 +-
.../src/app/state/buckets/buckets.effects.ts | 6 +-
.../src/app/state/droplets/droplets.effects.ts | 10 +-
.../context-error-banner.component.ts | 4 +-
.../src/app/ui/header/header.component.ts | 16 +-
.../frontend/apps/nifi-registry/tsconfig.app.json | 3 +-
.../frontend/apps/nifi/src/app/app.component.ts | 18 +-
.../service/access-policy.service.ts | 14 +-
.../state/access-policy/access-policy.effects.ts | 16 +-
.../policy-component/policy-component.effects.ts | 10 +-
.../state/tenants/tenants.effects.ts | 10 +-
.../add-tenant-to-policy-dialog.component.ts | 10 +-
.../override-policy-dialog.component.ts | 6 +-
.../common/policy-table/policy-table.component.ts | 6 +-
.../component-access-policies.component.ts | 12 +-
.../global-access-policies.component.ts | 12 +-
.../bulletins/service/bulletin-board.service.ts | 6 +-
.../state/bulletin-board/bulletin-board.effects.ts | 12 +-
.../bulletin-board-list.component.ts | 8 +-
.../ui/bulletin-board/bulletin-board.component.ts | 6 +-
.../app/pages/cluster/feature/cluster.component.ts | 6 +-
.../app/pages/cluster/service/cluster.service.ts | 6 +-
.../cluster-listing/cluster-listing.effects.ts | 16 +-
.../cluster-content-storage-listing.component.ts | 6 +-
.../cluster-flow-file-storage-listing.component.ts | 6 +-
.../cluster-jvm-listing.component.ts | 6 +-
.../cluster-jvm-table.component.ts | 8 +-
.../cluster-node-detail-dialog.component.ts | 8 +-
.../cluster-node-listing.component.ts | 6 +-
.../cluster-node-table.component.ts | 8 +-
...cluster-provenance-storage-listing.component.ts | 6 +-
.../cluster-system-listing.component.ts | 6 +-
.../cluster-system-table.component.ts | 8 +-
.../cluster-version-listing.component.ts | 6 +-
.../cluster-version-table.component.ts | 8 +-
.../cluster-table-filter.component.ts | 4 +-
.../repository-storage-table.component.ts | 8 +-
.../feature/content-viewer.component.ts | 12 +-
.../service/content-viewer.service.ts | 6 +-
.../state/content/content.effects.ts | 10 +-
.../external-viewer/external-viewer.effects.ts | 8 +-
.../state/viewer-options/viewer-options.effects.ts | 10 +-
.../external-viewer/external-viewer.component.ts | 12 +-
.../ui/hex-viewer/hex-viewer.component.ts | 12 +-
.../ui/image-viewer/image-viewer.component.ts | 6 +-
.../content-viewer/ui/recreate-view.directive.ts | 11 +-
.../pages/counters/feature/counters.component.ts | 4 +-
.../app/pages/counters/service/counters.service.ts | 10 +-
.../counter-listing/counter-listing.effects.ts | 14 +-
.../counter-listing/counter-listing.component.ts | 6 +-
.../counter-table/counter-table.component.ts | 8 +-
.../feature/documentation.component.ts | 16 +-
.../documentation/service/documentation.service.ts | 6 +-
.../additional-details.effects.ts | 10 +-
.../controller-service-definition.effects.ts | 10 +-
.../state/documentation/documentation.effects.ts | 8 +-
.../flow-analysis-rule-definition.effects.ts | 10 +-
.../parameter-provider-definition.effects.ts | 10 +-
.../processor-definition.effects.ts | 10 +-
.../reporting-task-definition.effects.ts | 10 +-
.../additional-details.component.ts | 6 +-
.../attributes-definition.component.ts | 6 +-
.../configurable-extension-definition.component.ts | 6 +-
.../dynamic-properties-definition.component.ts | 6 +-
.../multi-processor-use-case.component.ts | 10 +-
.../properties-definition.component.ts | 6 +-
.../property-definition.component.ts | 10 +-
.../relationships-definition.component.ts | 6 +-
.../resource-considerations.component.ts | 6 +-
.../restrictions-definition.component.ts | 6 +-
.../ui/common/see-also/see-also.component.ts | 10 +-
.../controller-service-definition.component.ts | 6 +-
.../flow-analysis-rule-definition.component.ts | 6 +-
.../ui/overview/overview.component.ts | 6 +-
.../parameter-provider-definition.component.ts | 6 +-
.../processor-definition.component.ts | 6 +-
.../reporting-task-definition.component.ts | 6 +-
.../src/app/pages/error/feature/error.component.ts | 6 +-
.../service/flow-configuration-history.service.ts | 6 +-
.../flow-configuration-history-listing.effects.ts | 16 +-
.../action-details/action-details.component.ts | 6 +-
...flow-configuration-history-listing.component.ts | 10 +-
.../purge-history/purge-history.component.ts | 12 +-
.../feature/flow-designer.component.ts | 4 +-
.../behavior/connectable-behavior.service.ts | 12 +-
.../service/behavior/draggable-behavior.service.ts | 14 +-
.../service/behavior/editable-behavior.service.ts | 10 +-
.../service/behavior/position-behavior.service.ts | 4 +-
.../behavior/quick-select-behavior.service.ts | 8 +-
.../behavior/selectable-behavior.service.ts | 4 +-
.../flow-designer/service/birdseye-view.service.ts | 24 +-
.../service/canvas-actions.service.ts | 18 +-
.../service/canvas-context-menu.service.ts | 18 +-
.../flow-designer/service/canvas-utils.service.ts | 10 +-
.../flow-designer/service/canvas-view.service.ts | 24 +-
.../service/controller-service.service.ts | 14 +-
.../flow-designer/service/copy-paste.service.ts | 14 +-
.../flow-designer/service/flow-analysis.service.ts | 6 +-
.../pages/flow-designer/service/flow.service.ts | 14 +-
.../service/manage-remote-port.service.ts | 12 +-
.../service/manager/connection-manager.service.ts | 22 +-
.../service/manager/funnel-manager.service.ts | 14 +-
.../service/manager/label-manager.service.ts | 24 +-
.../service/manager/port-manager.service.ts | 20 +-
.../manager/process-group-manager.service.ts | 18 +-
.../service/manager/processor-manager.service.ts | 20 +-
.../remote-process-group-manager.service.ts | 20 +-
.../service/parameter-helper.service.ts | 16 +-
.../flow-designer/service/parameter.service.ts | 12 +-
.../pages/flow-designer/service/queue.service.ts | 10 +-
.../flow-designer/service/registry.service.ts | 6 +-
.../pages/flow-designer/service/search.service.ts | 6 +-
.../pages/flow-designer/service/snippet.service.ts | 12 +-
.../controller-services.effects.ts | 28 +-
.../state/flow-analysis/flow-analysis.effects.ts | 16 +-
.../pages/flow-designer/state/flow/flow.effects.ts | 46 +-
.../manage-remote-ports.effects.ts | 18 +-
.../state/parameter/parameter.effects.ts | 20 +-
.../flow-designer/state/queue/queue.effects.ts | 14 +-
.../state/transform/transform.effects.ts | 18 +-
.../flow-designer/ui/canvas/canvas.component.ts | 22 +-
.../change-color-dialog.component.ts | 20 +-
.../ui/canvas/footer/footer.component.ts | 6 +-
.../graph-controls/graph-controls.component.ts | 6 +-
.../birdseye/birdseye.component.ts | 4 +-
.../navigation-control.component.scss | 4 +-
.../navigation-control.component.ts | 12 +-
.../operation-control.component.scss | 4 +-
.../operation-control.component.ts | 18 +-
.../flow-analysis-drawer.component.html | 88 +-
.../flow-analysis-drawer.component.ts | 6 +-
.../violation-details-dialog.component.ts | 12 +-
.../header/flow-status/flow-status.component.ts | 12 +-
.../ui/canvas/header/header.component.ts | 10 +-
.../new-canvas-item/new-canvas-item.component.ts | 12 +-
.../ui/canvas/header/search/search.component.ts | 12 +-
.../create-connection.component.ts | 20 +-
.../edit-connection/edit-connection.component.ts | 17 +-
.../prioritizers/prioritizers.component.ts | 6 +-
.../source-processor/source-processor.component.ts | 6 +-
.../change-version-dialog/change-version-dialog.ts | 14 +-
.../import-from-registry.component.ts | 22 +-
.../local-changes-dialog/local-changes-dialog.ts | 8 +-
.../local-changes-table/local-changes-table.ts | 8 +-
.../save-version-dialog.component.html | 45 +-
.../save-version-dialog.component.ts | 19 +-
.../items/label/edit-label/edit-label.component.ts | 18 +-
.../port/create-port/create-port.component.ts | 12 +-
.../items/port/edit-port/edit-port.component.ts | 20 +-
.../create-process-group.component.ts | 14 +-
.../edit-process-group.component.ts | 17 +-
.../group-components/group-components.component.ts | 16 +-
.../create-processor/create-processor.component.ts | 10 +-
.../edit-processor/edit-processor.component.ts | 19 +-
.../relationship-settings.component.ts | 6 +-
.../create-remote-process-group.component.ts | 12 +-
.../edit-remote-process-group.component.ts | 16 +-
.../ui/common/breadcrumbs/breadcrumbs.component.ts | 6 +-
.../no-registry-clients-dialog.component.ts | 4 +-
.../controller-services.component.ts | 6 +-
.../edit-remote-port/edit-remote-port.component.ts | 18 +-
.../manage-remote-ports.component.ts | 10 +-
.../src/app/pages/login/feature/login.component.ts | 6 +-
.../app/pages/login/state/access/access.effects.ts | 16 +-
.../login/ui/login-form/login-form.component.ts | 10 +-
.../service/parameter-contexts.service.ts | 14 +-
.../parameter-context-listing.effects.ts | 18 +-
.../parameter-context-listing.component.ts | 6 +-
.../parameter-context-table.component.ts | 6 +-
.../parameter-table/parameter-table.component.ts | 12 +-
.../provenance/feature/provenance.component.ts | 4 +-
.../pages/provenance/service/provenance.service.ts | 10 +-
.../provenance/state/lineage/lineage.effects.ts | 16 +-
.../provenance-event-listing.effects.ts | 20 +-
.../provenance-event-listing.component.ts | 6 +-
.../provenance-event-table.component.ts | 8 +-
.../provenance-search-dialog.component.ts | 14 +-
.../src/app/pages/queue/service/queue.service.ts | 12 +-
.../state/queue-listing/queue-listing.effects.ts | 16 +-
.../flowfile-dialog/flowfile-dialog.component.ts | 10 +-
.../flowfile-table/flowfile-table.component.ts | 6 +-
.../ui/queue-listing/queue-listing.component.ts | 6 +-
.../pages/settings/feature/settings.component.ts | 6 +-
.../pages/settings/service/controller.service.ts | 6 +-
.../settings/service/flow-analysis-rule.service.ts | 14 +-
.../management-controller-service.service.ts | 14 +-
.../settings/service/parameter-provider.service.ts | 14 +-
.../settings/service/registry-client.service.ts | 14 +-
.../settings/service/reporting-task.service.ts | 14 +-
.../flow-analysis-rules.effects.ts | 22 +-
.../settings/state/general/general.effects.ts | 14 +-
.../management-controller-services.effects.ts | 22 +-
.../parameter-providers.effects.ts | 22 +-
.../registry-clients/registry-clients.effects.ts | 20 +-
.../reporting-tasks/reporting-tasks.effects.ts | 22 +-
.../create-flow-analysis-rule.component.ts | 12 +-
.../edit-flow-analysis-rule.component.ts | 17 +-
.../flow-analysis-rule-table.component.ts | 6 +-
.../flow-analysis-rules.component.ts | 6 +-
.../general/general-form/general-form.component.ts | 14 +-
.../pages/settings/ui/general/general.component.ts | 6 +-
.../management-controller-services.component.ts | 6 +-
.../edit-parameter-provider.component.ts | 18 +-
...etch-parameter-provider-parameters.component.ts | 18 +-
.../parameter-groups-table.component.ts | 7 +-
.../parameter-providers-table.component.ts | 6 +-
.../parameter-providers.component.ts | 6 +-
.../create-registry-client.component.ts | 12 +-
.../edit-registry-client.component.ts | 17 +-
.../registry-client-table.component.ts | 6 +-
.../registry-clients/registry-clients.component.ts | 6 +-
.../create-reporting-task.component.ts | 12 +-
.../edit-reporting-task.component.ts | 17 +-
.../reporting-task-table.component.ts | 6 +-
.../reporting-tasks/reporting-tasks.component.ts | 6 +-
.../app/pages/summary/feature/summary.component.ts | 6 +-
.../service/component-cluster-status.service.ts | 6 +-
.../service/process-group-status.service.ts | 6 +-
.../component-cluster-status.effects.ts | 14 +-
.../summary-listing/summary-listing.effects.ts | 14 +-
.../cluster-summary-dialog.component.ts | 12 +-
.../port-status-table.component.ts | 8 +-
.../summary-table-filter.component.ts | 4 +-
.../connection-status-listing.component.ts | 6 +-
.../connection-status-table.component.ts | 8 +-
.../input-port-status-listing.component.ts | 6 +-
.../output-port-status-listing.component.ts | 6 +-
.../process-group-status-listing.component.ts | 6 +-
.../process-group-status-table.component.ts | 8 +-
.../processor-status-listing.component.ts | 4 +-
.../processor-status-table.component.ts | 8 +-
...emote-process-group-status-listing.component.ts | 6 +-
.../remote-process-group-status-table.component.ts | 8 +-
.../src/app/pages/users/feature/users.component.ts | 4 +-
.../src/app/pages/users/service/users.service.ts | 14 +-
.../state/user-listing/user-listing.effects.ts | 22 +-
.../user-access-policies.component.ts | 12 +-
.../ui/user-listing/user-listing.component.ts | 6 +-
.../user-table/user-table.component.ts | 8 +-
.../apps/nifi/src/app/service/about.service.ts | 6 +-
.../apps/nifi/src/app/service/auth.service.ts | 6 +-
.../nifi/src/app/service/banner-text.service.ts | 6 +-
.../apps/nifi/src/app/service/client.service.ts | 6 +-
.../src/app/service/cluster-connection.service.ts | 6 +-
.../apps/nifi/src/app/service/cluster.service.ts | 6 +-
.../src/app/service/component-state.service.ts | 8 +-
.../service/controller-service-state.service.ts | 14 +-
.../nifi/src/app/service/current-user.service.ts | 6 +-
.../src/app/service/extension-types.service.ts | 6 +-
.../src/app/service/flow-configuration.service.ts | 6 +-
.../app/service/property-table-helper.service.ts | 18 +-
.../app/service/property-verification.service.ts | 12 +-
.../nifi/src/app/service/status-history.service.ts | 10 +-
.../src/app/service/system-diagnostics.service.ts | 10 +-
.../apps/nifi/src/app/state/about/about.effects.ts | 12 +-
.../app/state/banner-text/banner-text.effects.ts | 10 +-
.../cluster-summary/cluster-summary.effects.ts | 14 +-
.../component-state/component-state.effects.ts | 14 +-
.../controller-service-state.effects.ts | 14 +-
.../app/state/current-user/current-user.effects.ts | 16 +-
.../state/documentation/documentation.effects.ts | 8 +-
.../apps/nifi/src/app/state/error/error.effects.ts | 10 +-
.../extension-types/extension-types.effects.ts | 10 +-
.../flow-configuration.effects.ts | 10 +-
.../login-configuration.effects.ts | 10 +-
.../property-verification.effects.ts | 18 +-
.../state/status-history/status-history.effects.ts | 14 +-
.../system-diagnostics.effects.ts | 14 +-
.../common/about-dialog/about-dialog.component.ts | 8 +-
.../ui/common/advanced-ui/advanced-ui.component.ts | 12 +-
.../ui/common/banner-text/banner-text.component.ts | 6 +-
.../cancel-dialog/cancel-dialog.component.ts | 6 +-
.../change-component-version-dialog.ts | 14 +-
.../component-state/component-state.component.ts | 10 +-
.../context-error-banner.component.ts | 4 +-
.../controller-service-api.component.ts | 6 +-
.../controller-service-references.component.ts | 6 +-
.../controller-service-table.component.ts | 6 +-
.../disable-controller-service.component.ts | 12 +-
.../edit-controller-service.component.ts | 17 +-
.../enable-controller-service.component.ts | 14 +-
.../edit-parameter-dialog.component.ts | 12 +-
.../edit-tenant/edit-tenant-dialog.component.ts | 16 +-
.../extension-creation.component.ts | 6 +-
.../ui/common/navigation/navigation.component.ts | 12 +-
.../new-property-dialog.component.ts | 12 +-
.../app/ui/common/ok-dialog/ok-dialog.component.ts | 8 +-
.../common/page-content/page-content.component.ts | 6 +-
.../edit-parameter-context.component.ts | 15 +-
.../parameter-context-inheritance.component.ts | 10 +-
.../parameter-references.component.ts | 6 +-
.../editors/combo-editor/combo-editor.component.ts | 10 +-
.../editors/nf-editor/nf-editor.component.ts | 10 +-
.../property-table/property-table.component.ts | 8 +-
.../referenced-attributes-dialog.component.ts | 14 +-
.../property-verification.component.ts | 3 +-
.../provenance-event-dialog.component.ts | 10 +-
.../ui/common/spinner/nifi-spinner.directive.ts | 10 +-
.../status-history-chart.component.ts | 7 +-
.../status-history/status-history.component.ts | 17 +-
.../system-diagnostics-dialog.component.ts | 10 +-
.../tabbed-dialog/tabbed-dialog.component.ts | 11 +-
.../property-tip/property-tip.component.ts | 7 +-
.../restrictions-tip/restrictions-tip.component.ts | 6 +-
.../src/main/frontend/apps/nifi/tsconfig.app.json | 4 +-
.../src/app/app.component.ts | 10 +-
.../feature/standard-content-viewer.component.ts | 12 +-
.../service/content-viewer.service.ts | 6 +-
.../apps/standard-content-viewer/tsconfig.app.json | 4 +-
.../apps/update-attribute/src/app/app.component.ts | 10 +-
.../feature/update-attribute.component.ts | 6 +-
.../service/update-attribute.service.ts | 6 +-
.../evaluation-context.effects.ts | 12 +-
.../update-attribute/state/rules/rules.effects.ts | 14 +-
.../ui/action-table/action-table.component.ts | 8 +-
.../condition-table/condition-table.component.ts | 8 +-
.../ui/edit-rule/edit-rule.component.ts | 8 +-
.../ui/rule-listing/rule-listing.component.ts | 14 +-
.../ui/ua-editor/ua-editor.component.ts | 10 +-
.../apps/update-attribute/tsconfig.app.json | 4 +-
.../close-on-escape-dialog.component.ts | 6 +-
.../el-function-tip/el-function-tip.component.ts | 6 +-
.../parameter-tip/parameter-tip.component.ts | 6 +-
.../components/codemirror/codemirror.component.ts | 7 +-
.../editors/text-editor/text-editor.component.ts | 8 +-
.../components/map-table/map-table.component.ts | 8 +-
.../new-map-table-entry-dialog.component.ts | 14 +-
.../components/resizable/resizable.component.ts | 6 +-
.../yes-no-dialog/yes-no-dialog.component.ts | 8 +-
.../shared/src/directives/copy/copy.directive.ts | 12 +-
.../src/directives/nifi-tooltip.directive.ts | 10 +-
.../codemirror-nifi-language.service.ts | 12 +-
.../libs/shared/src/services/el.service.ts | 6 +-
.../src/services/map-table-helper.service.ts | 4 +-
.../shared/src/services/system-tokens.service.ts | 5 +-
.../libs/shared/src/services/theming.service.ts | 5 +-
.../main/frontend/libs/shared/tsconfig.lib.json | 3 +-
.../frontend/libs/shared/tsconfig.lib.prod.json | 3 +-
nifi-frontend/src/main/frontend/nx.json | 57 +-
nifi-frontend/src/main/frontend/package-lock.json | 33946 +++++++++++--------
nifi-frontend/src/main/frontend/package.json | 89 +-
pom.xml | 2 +-
363 files changed, 22194 insertions(+), 15773 deletions(-)
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/app.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/app.component.ts
index e366abd933..d8348f1935 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/app.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/app.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { Storage, ThemingService } from '@nifi/shared';
@Component({
@@ -25,12 +25,12 @@ import { Storage, ThemingService } from '@nifi/shared';
standalone: false
})
export class AppComponent {
+ private storage = inject(Storage);
+ private themingService = inject(ThemingService);
+
title = 'nifi-jolt-transform-json-ui';
- constructor(
- private storage: Storage,
- private themingService: ThemingService
- ) {
+ constructor() {
let theme = this.storage.getItem('theme');
// Initially check if dark mode is enabled on system
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/feature/jolt-transform-json-ui.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/feature/jolt-transform-json-ui.component.ts
index b459a2ffdd..095df5cc5a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/feature/jolt-transform-json-ui.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/feature/jolt-transform-json-ui.component.ts
@@ -16,7 +16,7 @@
*/
import { js_beautify } from 'js-beautify';
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiJoltTransformJsonUiState } from '../../../state';
import {
@@ -99,6 +99,10 @@ const JS_BEAUTIFY_OPTIONS = {
standalone: false
})
export class JoltTransformJsonUi implements OnDestroy {
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<NiFiJoltTransformJsonUiState>>(Store);
+ private mapTableHelperService = inject(MapTableHelperService);
+
private processorId$ = this.store.selectSignal(selectProcessorIdFromRoute);
private revision$ = this.store.selectSignal(selectRevisionFromRoute);
private clientId$ = this.store.selectSignal(selectClientIdFromRoute);
@@ -163,11 +167,7 @@ export class JoltTransformJsonUi implements OnDestroy {
createNew: (existingEntries: string[]) => Observable<MapTableEntry> =
this.mapTableHelperService.createNewEntry('Attribute');
- constructor(
- private formBuilder: FormBuilder,
- private store: Store<NiFiJoltTransformJsonUiState>,
- private mapTableHelperService: MapTableHelperService
- ) {
+ constructor() {
// Select the processor id from the query params and GET processor details
this.store
.select(selectProcessorIdFromRoute)
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/service/jolt-transform-json-ui.service.ts b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/service/jolt-transform-json-ui.service.ts
index ff5690b8f3..f0aa779140 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/service/jolt-transform-json-ui.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/service/jolt-transform-json-ui.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Observable } from 'rxjs';
import { SavePropertiesRequest } from '../state/jolt-transform-json-property';
@@ -23,9 +23,9 @@ import { ValidateJoltSpecRequest } from '../state/jolt-transform-json-validate';
@Injectable({ providedIn: 'root' })
export class JoltTransformJsonUiService {
- private static readonly API: string = 'api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = 'api';
getProcessorDetails(id: string): Observable<any> {
return this.httpClient.get(`${JoltTransformJsonUiService.API}/standard/processor/details?processorId=${id}`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-processor-details/jolt-transform-json-processor-details.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-processor-details/jolt-transform-json-processor-details.effects.ts
index 61ada9f1c6..25e6686b94 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-processor-details/jolt-transform-json-processor-details.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-processor-details/jolt-transform-json-processor-details.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as JoltTransformJsonUiActions from './jolt-transform-json-processor-details.actions';
import { JoltTransformJsonUiService } from '../../service/jolt-transform-json-ui.service';
@@ -26,10 +26,8 @@ import { ProcessorDetails } from './index';
@Injectable()
export class JoltTransformJsonProcessorDetailsEffects {
- constructor(
- private actions$: Actions,
- private joltTransformJsonUiService: JoltTransformJsonUiService
- ) {}
+ private actions$ = inject(Actions);
+ private joltTransformJsonUiService = inject(JoltTransformJsonUiService);
loadProcessorDetails$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-property/jolt-transform-json-property.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-property/jolt-transform-json-property.effects.ts
index 1847ea8785..24ad2b7f34 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-property/jolt-transform-json-property.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-property/jolt-transform-json-property.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as JoltTransformJsonUiActions from './jolt-transform-json-property.actions';
import { JoltTransformJsonUiService } from '../../service/jolt-transform-json-ui.service';
@@ -29,11 +29,9 @@ import { NiFiJoltTransformJsonUiState } from '../../../../state';
@Injectable()
export class JoltTransformJsonPropertyEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiJoltTransformJsonUiState>,
- private joltTransformJsonUiService: JoltTransformJsonUiService
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiJoltTransformJsonUiState>>(Store);
+ private joltTransformJsonUiService = inject(JoltTransformJsonUiService);
saveProperties$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-transform/jolt-transform-json-transform.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-transform/jolt-transform-json-transform.effects.ts
index 04682c677f..7de675ac6f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-transform/jolt-transform-json-transform.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-transform/jolt-transform-json-transform.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as JoltTransformJsonUiActions from './jolt-transform-json-transform.actions';
import { JoltTransformJsonUiService } from '../../service/jolt-transform-json-ui.service';
@@ -26,10 +26,8 @@ import { TransformJoltSpecRequest } from './index';
@Injectable()
export class JoltTransformJsonTransformEffects {
- constructor(
- private actions$: Actions,
- private joltTransformJsonUiService: JoltTransformJsonUiService
- ) {}
+ private actions$ = inject(Actions);
+ private joltTransformJsonUiService = inject(JoltTransformJsonUiService);
transformJoltSpec$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-validate/jolt-transform-json-validate.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-validate/jolt-transform-json-validate.effects.ts
index 635637c1fe..65fced1d8a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-validate/jolt-transform-json-validate.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/src/app/pages/jolt-transform-json-ui/state/jolt-transform-json-validate/jolt-transform-json-validate.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as JoltTransformJsonUiActions from './jolt-transform-json-validate.actions';
import { JoltTransformJsonUiService } from '../../service/jolt-transform-json-ui.service';
@@ -29,11 +29,9 @@ import { resetJoltTransformJsonPropertyState } from '../jolt-transform-json-prop
@Injectable()
export class JoltTransformJsonValidateEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiJoltTransformJsonUiState>,
- private joltTransformJsonUiService: JoltTransformJsonUiService
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiJoltTransformJsonUiState>>(Store);
+ private joltTransformJsonUiService = inject(JoltTransformJsonUiService);
validateJoltSpec$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/tsconfig.app.json b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/tsconfig.app.json
index 8b1485b791..5b02172ec1 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/tsconfig.app.json
+++ b/nifi-frontend/src/main/frontend/apps/nifi-jolt-transform-ui/tsconfig.app.json
@@ -1,9 +1,9 @@
-/* To learn more about this file see: https://angular.io/config/tsconfig. */
{
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/app",
- "types": []
+ "types": [],
+ "moduleResolution": "bundler"
},
"files": ["src/main.ts"],
"include": ["src/**/*.d.ts"]
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/app.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/app.component.ts
index 2ebb7236f7..b63b3b69db 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/app.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/app.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ThemingService, Storage } from '@nifi/shared';
@Component({
@@ -25,12 +25,12 @@ import { ThemingService, Storage } from '@nifi/shared';
standalone: false
})
export class AppComponent {
+ private storage = inject(Storage);
+ private themingService = inject(ThemingService);
+
title = 'nifi-registry';
- constructor(
- private storage: Storage,
- private themingService: ThemingService
- ) {
+ constructor() {
let theme = this.storage.getItem('theme');
// Initially check if dark mode is enabled on system
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/resources.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/resources.component.ts
index 8fd2868a5b..a6688f3bb7 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/resources.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/resources.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import {
selectDropletIdFromRoute,
selectDroplets,
@@ -45,6 +45,9 @@ import { ErrorContextKey } from '../../../state/error';
standalone: false
})
export class ResourcesComponent implements OnInit {
+ private store = inject(Store);
+ private nifiCommon = inject(NiFiCommon);
+
droplets$: Observable<Droplet[]> = this.store.select(selectDroplets).pipe(takeUntilDestroyed());
buckets$: Observable<Bucket[]> = this.store.select(selectBuckets).pipe(takeUntilDestroyed());
buckets: Bucket[] = [];
@@ -77,11 +80,6 @@ export class ResourcesComponent implements OnInit {
dropletsState$ = this.store.select(selectDropletState);
selectedDropletId$ = this.store.select(selectDropletIdFromRoute);
- constructor(
- private store: Store,
- private nifiCommon: NiFiCommon
- ) {}
-
ngOnInit(): void {
this.store.dispatch(loadDroplets());
this.store.dispatch(loadBuckets());
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/delete-droplet-dialog/delete-droplet-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/delete-droplet-dialog/delete-droplet-dialog.component.ts
index c2251d7854..926091609c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/delete-droplet-dialog/delete-droplet-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/delete-droplet-dialog/delete-droplet-dialog.component.ts
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { Component, inject } from '@angular/core';
+
import { CloseOnEscapeDialog } from '@nifi/shared';
import { Store } from '@ngrx/store';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
@@ -32,19 +32,21 @@ interface DeleteDropletDialogData {
@Component({
selector: 'app-delete-droplet-dialog',
- imports: [CommonModule, MatDialogModule, MatButtonModule, ContextErrorBanner],
+ imports: [MatDialogModule, MatButtonModule, ContextErrorBanner],
templateUrl: './delete-droplet-dialog.component.html',
styleUrl: './delete-droplet-dialog.component.scss'
})
export class DeleteDropletDialogComponent extends CloseOnEscapeDialog {
+ data = inject<DeleteDropletDialogData>(MAT_DIALOG_DATA);
+ private store = inject(Store);
+
protected readonly ErrorContextKey = ErrorContextKey;
droplet: Droplet;
- constructor(
- @Inject(MAT_DIALOG_DATA) public data: DeleteDropletDialogData,
- private store: Store
- ) {
+ constructor() {
super();
+ const data = this.data;
+
this.droplet = data.droplet;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table-filter/droplet-table-filter.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table-filter/droplet-table-filter.component.ts
index 8813c5f255..c34c058f99 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table-filter/droplet-table-filter.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table-filter/droplet-table-filter.component.ts
@@ -16,7 +16,6 @@
*/
import { AfterViewInit, Component, DestroyRef, EventEmitter, inject, Input, Output } from '@angular/core';
-import { CommonModule } from '@angular/common';
import { FormBuilder, FormGroup, ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatSelectModule } from '@angular/material/select';
@@ -43,11 +42,13 @@ export interface DropletTableFilterContext extends DropletTableFilterArgs {
@Component({
selector: 'droplet-table-filter',
- imports: [CommonModule, ReactiveFormsModule, MatFormFieldModule, MatSelectModule, MatInputModule, MatButtonModule],
+ imports: [ReactiveFormsModule, MatFormFieldModule, MatSelectModule, MatInputModule, MatButtonModule],
templateUrl: './droplet-table-filter.component.html',
styleUrl: './droplet-table-filter.component.scss'
})
export class DropletTableFilterComponent implements AfterViewInit {
+ private formBuilder = inject(FormBuilder);
+
filterForm: FormGroup;
private _initialFilterColumn = 'name';
private _filterableColumns: DropletTableFilterColumn[] = [];
@@ -94,7 +95,7 @@ export class DropletTableFilterComponent implements AfterViewInit {
@Output() filterChanged: EventEmitter<DropletTableFilterContext> = new EventEmitter<DropletTableFilterContext>();
- constructor(private formBuilder: FormBuilder) {
+ constructor() {
this.filterForm = this.formBuilder.group({
filterTerm: '',
filterColumn: this._initialFilterColumn || 'name',
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table/droplet-table.component.html b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table/droplet-table.component.html
index 6d78cc578e..975a858229 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table/droplet-table.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table/droplet-table.component.html
@@ -126,9 +126,11 @@
(click)="select(row)"
[class.selected]="isSelected(row)"></tr>
</table>
- <div class="py-5" *ngIf="dataSource.data.length === 0 && buckets.length !== 0">
- <p class="text-center">There are no resources to display.</p>
- </div>
+ @if (dataSource.data.length === 0 && buckets.length !== 0) {
+ <div class="py-5">
+ <p class="text-center">There are no resources to display.</p>
+ </div>
+ }
</div>
</div>
</div>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table/droplet-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table/droplet-table.component.ts
index 6c0a14725d..20f39c7292 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table/droplet-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-table/droplet-table.component.ts
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { Component, EventEmitter, Input, OnInit, Output, inject } from '@angular/core';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { Droplet } from 'apps/nifi-registry/src/app/state/droplets';
import { MatSortModule, Sort } from '@angular/material/sort';
@@ -34,11 +33,14 @@ import {
@Component({
selector: 'droplet-table',
- imports: [CommonModule, MatTableModule, MatSortModule, MatMenuModule, MatButtonModule, MatButtonModule],
+ imports: [MatTableModule, MatSortModule, MatMenuModule, MatButtonModule, MatButtonModule],
templateUrl: './droplet-table.component.html',
styleUrl: './droplet-table.component.scss'
})
export class DropletTableComponent implements OnInit {
+ private nifiCommon = inject(NiFiCommon);
+ private store = inject(Store);
+
@Input() buckets: Bucket[] = [];
@Input() dataSource: MatTableDataSource<Droplet> = new MatTableDataSource<Droplet>();
@Input() selectedId: string | null = null;
@@ -59,11 +61,6 @@ export class DropletTableComponent implements OnInit {
direction: 'asc'
};
- constructor(
- private nifiCommon: NiFiCommon,
- private store: Store
- ) {}
-
ngOnInit(): void {
this.sortData(this.sort);
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-versions-dialog/droplet-versions-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-versions-dialog/droplet-versions-dialog.component.ts
index 96a8ae335c..6b9a596ed6 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-versions-dialog/droplet-versions-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/droplet-versions-dialog/droplet-versions-dialog.component.ts
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { Component, inject } from '@angular/core';
import { Droplet } from 'apps/nifi-registry/src/app/state/droplets';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { Store } from '@ngrx/store';
@@ -46,19 +45,15 @@ interface VersionedFlowSnapshotMetadata {
@Component({
selector: 'app-flow-versions-dialog',
- imports: [
- CommonModule,
- MatTableModule,
- MatSortModule,
- MatDialogModule,
- MatMenuModule,
- MatButtonModule,
- ContextErrorBanner
- ],
+ imports: [MatTableModule, MatSortModule, MatDialogModule, MatMenuModule, MatButtonModule, ContextErrorBanner],
templateUrl: './droplet-versions-dialog.component.html',
styleUrl: './droplet-versions-dialog.component.scss'
})
export class DropletVersionsDialogComponent extends CloseOnEscapeDialog {
+ data = inject<Data>(MAT_DIALOG_DATA);
+ private nifiCommon = inject(NiFiCommon);
+ private store = inject(Store);
+
dataSource: MatTableDataSource<VersionedFlowSnapshotMetadata> =
new MatTableDataSource<VersionedFlowSnapshotMetadata>();
@@ -69,12 +64,10 @@ export class DropletVersionsDialogComponent extends CloseOnEscapeDialog {
displayedColumns: string[] = ['version', 'created', 'comments', 'actions'];
timeOffset = 0;
- constructor(
- @Inject(MAT_DIALOG_DATA) public data: Data,
- private nifiCommon: NiFiCommon,
- private store: Store
- ) {
+ constructor() {
super();
+ const data = this.data;
+
this.dataSource.data = data.versions;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/export-droplet-version-dialog/export-droplet-version-dialog.component.html b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/export-droplet-version-dialog/export-droplet-version-dialog.component.html
index 358d529620..ff75765f36 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/export-droplet-version-dialog/export-droplet-version-dialog.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/export-droplet-version-dialog/export-droplet-version-dialog.component.html
@@ -25,12 +25,16 @@ limitations under the License.
<div class="w-full bucket-dropdown-field">
<mat-form-field class="flex w-full">
<mat-select [(value)]="selectedVersion">
- <mat-option
- *ngFor="let snapshotMeta of [].constructor(droplet.versionCount); let i = index"
- [value]="i + 1">
- <span *ngIf="snapshotMeta === i">Latest (Version {{ i + 1 }})</span>
- <span *ngIf="snapshotMeta !== i">Version {{ i + 1 }}</span>
- </mat-option>
+ @for (snapshotMeta of [].constructor(droplet.versionCount); track snapshotMeta; let i = $index) {
+ <mat-option [value]="i + 1">
+ @if (snapshotMeta === i) {
+ <span>Latest (Version {{ i + 1 }})</span>
+ }
+ @if (snapshotMeta !== i) {
+ <span>Version {{ i + 1 }}</span>
+ }
+ </mat-option>
+ }
</mat-select>
</mat-form-field>
</div>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/export-droplet-version-dialog/export-droplet-version-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/export-droplet-version-dialog/export-droplet-version-dialog.component.ts
index 602720fee8..1a97bf1744 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/export-droplet-version-dialog/export-droplet-version-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/export-droplet-version-dialog/export-droplet-version-dialog.component.ts
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { Component, inject } from '@angular/core';
import { MatFormField } from '@angular/material/form-field';
import { MatSelectModule } from '@angular/material/select';
import { MatInputModule } from '@angular/material/input';
@@ -35,27 +34,21 @@ export interface ExportFlowVersionDialogData {
@Component({
selector: 'app-export-flow-version-dialog',
- imports: [
- CommonModule,
- MatFormField,
- MatSelectModule,
- MatInputModule,
- MatDialogModule,
- MatButtonModule,
- ContextErrorBanner
- ],
+ imports: [MatFormField, MatSelectModule, MatInputModule, MatDialogModule, MatButtonModule, ContextErrorBanner],
templateUrl: './export-droplet-version-dialog.component.html',
styleUrl: './export-droplet-version-dialog.component.scss'
})
export class ExportDropletVersionDialogComponent extends CloseOnEscapeDialog {
+ data = inject<ExportFlowVersionDialogData>(MAT_DIALOG_DATA);
+ private store = inject(Store);
+
droplet: Droplet;
selectedVersion: number;
- constructor(
- @Inject(MAT_DIALOG_DATA) public data: ExportFlowVersionDialogData,
- private store: Store
- ) {
+ constructor() {
super();
+ const data = this.data;
+
this.droplet = data.droplet;
this.selectedVersion = this.droplet.versionCount;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-dialog/import-new-droplet-dialog.component.html b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-dialog/import-new-droplet-dialog.component.html
index 4c0983b5db..271f66c3f5 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-dialog/import-new-droplet-dialog.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-dialog/import-new-droplet-dialog.component.html
@@ -73,9 +73,11 @@ limitations under the License.
panelClass="bucket-dropdown-select"
placeholder="Choose a location"
formControlName="bucket">
- <mat-option *ngFor="let bucket of writableBuckets" [value]="bucket.identifier">
- {{ bucket.name }}
- </mat-option>
+ @for (bucket of writableBuckets; track bucket) {
+ <mat-option [value]="bucket.identifier">
+ {{ bucket.name }}
+ </mat-option>
+ }
</mat-select>
</mat-form-field>
</div>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-dialog/import-new-droplet-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-dialog/import-new-droplet-dialog.component.ts
index 303b3c581e..2c45069817 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-dialog/import-new-droplet-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-dialog/import-new-droplet-dialog.component.ts
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-import { Component, ElementRef, Inject, OnInit, ViewChild } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { Component, ElementRef, OnInit, ViewChild, inject } from '@angular/core';
import { CloseOnEscapeDialog, NiFiCommon } from '@nifi/shared';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { FormBuilder, FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
@@ -37,7 +36,6 @@ export interface ImportNewFlowDialogData {
@Component({
selector: 'app-import-new-flow-dialog',
imports: [
- CommonModule,
MatDialogModule,
FormsModule,
ReactiveFormsModule,
@@ -51,6 +49,11 @@ export interface ImportNewFlowDialogData {
styleUrl: './import-new-droplet-dialog.component.scss'
})
export class ImportNewDropletDialogComponent extends CloseOnEscapeDialog implements OnInit {
+ data = inject<ImportNewFlowDialogData>(MAT_DIALOG_DATA);
+ private store = inject(Store);
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
@ViewChild('flowUploadControl') flowUploadControl!: ElementRef;
protected readonly ErrorContextKey = ErrorContextKey;
@@ -61,13 +64,10 @@ export class ImportNewDropletDialogComponent extends CloseOnEscapeDialog impleme
importNewFlowForm: FormGroup;
fileNameAttached: string | null = '';
- constructor(
- @Inject(MAT_DIALOG_DATA) public data: ImportNewFlowDialogData,
- private store: Store,
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
super();
+ const data = this.data;
+
this.buckets = data.buckets;
this.importNewFlowForm = this.formBuilder.group({
name: new FormControl('', Validators.required),
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-version-dialog/import-new-droplet-version-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-version-dialog/import-new-droplet-version-dialog.component.ts
index 778bfd0f48..0d3a9817f1 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-version-dialog/import-new-droplet-version-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/pages/resources/feature/ui/import-new-droplet-version-dialog/import-new-droplet-version-dialog.component.ts
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-import { Component, ElementRef, Inject, ViewChild } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { Component, ElementRef, ViewChild, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { CloseOnEscapeDialog, NiFiCommon } from '@nifi/shared';
import { FormBuilder, FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
@@ -37,7 +36,6 @@ export interface ImportNewFlowVersionDialogData {
@Component({
selector: 'app-import-new-flow-version-dialog',
imports: [
- CommonModule,
MatDialogModule,
FormsModule,
ReactiveFormsModule,
@@ -51,6 +49,11 @@ export interface ImportNewFlowVersionDialogData {
styleUrl: './import-new-droplet-version-dialog.component.scss'
})
export class ImportNewDropletVersionDialogComponent extends CloseOnEscapeDialog {
+ data = inject<ImportNewFlowVersionDialogData>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject(Store);
+ private nifiCommon = inject(NiFiCommon);
+
@ViewChild('flowUploadControl') flowUploadControl!: ElementRef;
protected readonly ErrorContextKey = ErrorContextKey;
@@ -64,13 +67,10 @@ export class ImportNewDropletVersionDialogComponent extends CloseOnEscapeDialog
importNewFlowVersionForm: FormGroup;
fileNameAttached: string | null = '';
- constructor(
- @Inject(MAT_DIALOG_DATA) public data: ImportNewFlowVersionDialogData,
- private formBuilder: FormBuilder,
- private store: Store,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
super();
+ const data = this.data;
+
this.droplet = data.droplet;
this.importNewFlowVersionForm = this.formBuilder.group({
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/service/buckets.service.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/service/buckets.service.ts
index fa4c5d3ec3..1ac5412bfc 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/service/buckets.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/service/buckets.service.ts
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
@Injectable({ providedIn: 'root' })
export class BucketsService {
- private static readonly API: string = '../nifi-registry-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-registry-api';
getBuckets(): Observable<any> {
// const mockError: HttpErrorResponse = new HttpErrorResponse({
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/service/droplets.service.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/service/droplets.service.ts
index e4194a176d..70d730655c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/service/droplets.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/service/droplets.service.ts
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpHeaders } from '@angular/common/http';
@Injectable({ providedIn: 'root' })
export class DropletsService {
- private static readonly API: string = '../nifi-registry-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-registry-api';
getDroplets(bucketId?: string): Observable<any> {
// const mockError: HttpErrorResponse = new HttpErrorResponse({
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/state/buckets/buckets.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/state/buckets/buckets.effects.ts
index 256ffe2a36..070ad3a38b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/state/buckets/buckets.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/state/buckets/buckets.effects.ts
@@ -27,10 +27,8 @@ import * as DropletsActions from '../droplets/droplets.actions';
@Injectable()
export class BucketsEffects {
- constructor(
- private bucketsService: BucketsService,
- private errorHelper: ErrorHelper
- ) {}
+ private bucketsService = inject(BucketsService);
+ private errorHelper = inject(ErrorHelper);
actions$ = inject(Actions);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/state/droplets/droplets.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/state/droplets/droplets.effects.ts
index 0729382ed4..8e9ef9d32d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/state/droplets/droplets.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/state/droplets/droplets.effects.ts
@@ -44,12 +44,10 @@ import * as ErrorActions from '../../state/error/error.actions';
@Injectable()
export class DropletsEffects {
- constructor(
- private dropletsService: DropletsService,
- private dialog: MatDialog,
- private errorHelper: ErrorHelper,
- private router: Router
- ) {}
+ private dropletsService = inject(DropletsService);
+ private dialog = inject(MatDialog);
+ private errorHelper = inject(ErrorHelper);
+ private router = inject(Router);
actions$ = inject(Actions);
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 c05221f5a6..0aec083315 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
@@ -35,6 +35,8 @@ import { ErrorContextKey } from '../../../state/error';
styleUrl: './context-error-banner.component.scss'
})
export class ContextErrorBanner implements OnDestroy {
+ private store = inject<Store<NiFiRegistryState>>(Store);
+
private _context!: ErrorContextKey;
@Input({ required: true }) set context(context: ErrorContextKey) {
this._context = context;
@@ -48,8 +50,6 @@ export class ContextErrorBanner implements OnDestroy {
messages$: Observable<string[]> | null = null;
private destroyRef: DestroyRef = inject(DestroyRef);
- constructor(private store: Store<NiFiRegistryState>) {}
-
ngOnDestroy(): void {
this.store.dispatch(clearBannerErrors({ context: this.context }));
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/header/header.component.ts b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/header/header.component.ts
index 43a41a460d..968eac9ead 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/header/header.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/src/app/ui/header/header.component.ts
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
-import { CommonModule, NgOptimizedImage } from '@angular/common';
+import { Component, inject } from '@angular/core';
+import { NgOptimizedImage } from '@angular/common';
import { Router, RouterModule } from '@angular/router';
import { MatButton } from '@angular/material/button';
import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
@@ -25,11 +25,15 @@ import { DARK_THEME, LIGHT_THEME, OS_SETTING, Storage, ThemingService } from '@n
@Component({
selector: 'app-header',
standalone: true,
- imports: [CommonModule, NgOptimizedImage, RouterModule, MatButton, MatMenu, MatMenuItem, MatMenuTrigger],
+ imports: [NgOptimizedImage, RouterModule, MatButton, MatMenu, MatMenuItem, MatMenuTrigger],
templateUrl: './header.component.html',
styleUrl: './header.component.scss'
})
export class HeaderComponent {
+ private storage = inject(Storage);
+ private themingService = inject(ThemingService);
+ private router = inject(Router);
+
theme: any | undefined;
darkModeOn: boolean | undefined;
LIGHT_THEME: string = LIGHT_THEME;
@@ -37,11 +41,7 @@ export class HeaderComponent {
OS_SETTING: string = OS_SETTING;
disableAnimations: string | null;
- constructor(
- private storage: Storage,
- private themingService: ThemingService,
- private router: Router
- ) {
+ constructor() {
this.darkModeOn = window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
this.theme = this.storage.getItem('theme');
this.disableAnimations = this.storage.getItem('disable-animations');
diff --git a/nifi-frontend/src/main/frontend/apps/nifi-registry/tsconfig.app.json b/nifi-frontend/src/main/frontend/apps/nifi-registry/tsconfig.app.json
index 994d3618ce..5b02172ec1 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi-registry/tsconfig.app.json
+++ b/nifi-frontend/src/main/frontend/apps/nifi-registry/tsconfig.app.json
@@ -2,7 +2,8 @@
"extends": "./tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/app",
- "types": []
+ "types": [],
+ "moduleResolution": "bundler"
},
"files": ["src/main.ts"],
"include": ["src/**/*.d.ts"]
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/app.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/app.component.ts
index f1c5754df0..e1d4f434d0 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/app.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/app.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import {
GuardsCheckEnd,
GuardsCheckStart,
@@ -44,6 +44,12 @@ import { DocumentVisibility } from './state/document-visibility';
standalone: false
})
export class AppComponent implements OnDestroy {
+ private router = inject(Router);
+ private storage = inject(Storage);
+ private themingService = inject(ThemingService);
+ private dialog = inject(MatDialog);
+ private store = inject<Store<NiFiState>>(Store);
+
title = 'nifi';
guardLoading = true;
@@ -59,13 +65,7 @@ export class AppComponent implements OnDestroy {
);
};
- constructor(
- private router: Router,
- private storage: Storage,
- private themingService: ThemingService,
- private dialog: MatDialog,
- private store: Store<NiFiState>
- ) {
+ constructor() {
this.router.events
.pipe(
takeUntilDestroyed(),
@@ -85,7 +85,7 @@ export class AppComponent implements OnDestroy {
concatLatestFrom(() => this.store.select(selectBackNavigation))
)
.subscribe(([event, previousBackNavigation]) => {
- const extras = this.router.getCurrentNavigation()?.extras;
+ const extras = this.router.currentNavigation()?.extras;
if (extras?.state?.['backNavigation']) {
const backNavigation: BackNavigation = extras?.state?.['backNavigation'];
this.store.dispatch(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/service/access-policy.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/service/access-policy.service.ts
index 9f85f64269..4d36ec4a44 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/service/access-policy.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/service/access-policy.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Client } from '../../../service/client.service';
import { Observable } from 'rxjs';
@@ -26,14 +26,12 @@ import { ClusterConnectionService } from '../../../service/cluster-connection.se
@Injectable({ providedIn: 'root' })
export class AccessPolicyService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
createAccessPolicy(
resourceAction: ResourceAction,
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
index 2496e87718..ee8458b52c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import { NiFiState } from '../../../../state';
@@ -41,14 +41,12 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class AccessPolicyEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private router: Router,
- private accessPoliciesService: AccessPolicyService,
- private dialog: MatDialog,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private router = inject(Router);
+ private accessPoliciesService = inject(AccessPolicyService);
+ private dialog = inject(MatDialog);
+ private errorHelper = inject(ErrorHelper);
setAccessPolicy$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/policy-component/policy-component.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/policy-component/policy-component.effects.ts
index e28c85c867..ad9866cd72 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/policy-component/policy-component.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/policy-component/policy-component.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as PolicyComponentActions from './policy-component.actions';
import * as ErrorActions from '../../../../state/error/error.actions';
@@ -26,11 +26,9 @@ import { ErrorHelper } from '../../../../service/error-helper.service';
@Injectable()
export class PolicyComponentEffects {
- constructor(
- private actions$: Actions,
- private accessPoliciesService: AccessPolicyService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private accessPoliciesService = inject(AccessPolicyService);
+ private errorHelper = inject(ErrorHelper);
loadPolicyComponent$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/tenants/tenants.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/tenants/tenants.effects.ts
index 6d3a152100..f2c499e352 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/tenants/tenants.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/state/tenants/tenants.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as TenantsActions from './tenants.actions';
import * as ErrorActions from '../../../../state/error/error.actions';
@@ -26,11 +26,9 @@ import { ErrorHelper } from '../../../../service/error-helper.service';
@Injectable()
export class TenantsEffects {
- constructor(
- private actions$: Actions,
- private accessPoliciesService: AccessPolicyService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private accessPoliciesService = inject(AccessPolicyService);
+ private errorHelper = inject(ErrorHelper);
loadTenants$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/add-tenant-to-policy-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/add-tenant-to-policy-dialog.component.ts
index 5b93106127..e1f2975268 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/add-tenant-to-policy-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/add-tenant-to-policy-dialog/add-tenant-to-policy-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, DestroyRef, EventEmitter, inject, Inject, Input, Output } from '@angular/core';
+import { Component, DestroyRef, EventEmitter, inject, Input, Output } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { AccessPolicy } from '../../../state/shared';
import { MatButtonModule } from '@angular/material/button';
@@ -52,6 +52,9 @@ import { CloseOnEscapeDialog } from '@nifi/shared';
styleUrls: ['./add-tenant-to-policy-dialog.component.scss']
})
export class AddTenantToPolicyDialog extends CloseOnEscapeDialog {
+ private request = inject<AddTenantToPolicyDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+
@Input() set users$(users$: Observable<UserEntity[]>) {
users$.pipe(takeUntilDestroyed(this.destroyRef)).subscribe((users: UserEntity[]) => {
const policy: AccessPolicy = this.request.accessPolicy.component;
@@ -103,10 +106,7 @@ export class AddTenantToPolicyDialog extends CloseOnEscapeDialog {
userLookup: Map<string, UserEntity> = new Map<string, UserEntity>();
userGroupLookup: Map<string, UserGroupEntity> = new Map<string, UserGroupEntity>();
- constructor(
- @Inject(MAT_DIALOG_DATA) private request: AddTenantToPolicyDialogRequest,
- private formBuilder: FormBuilder
- ) {
+ constructor() {
super();
this.addTenantsForm = this.formBuilder.group({
users: new FormControl([]),
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/override-policy-dialog/override-policy-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/override-policy-dialog/override-policy-dialog.component.ts
index ac62ce8a1a..e0288b3eaf 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/override-policy-dialog/override-policy-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/override-policy-dialog/override-policy-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Output } from '@angular/core';
+import { Component, EventEmitter, Output, inject } from '@angular/core';
import { MatDialogModule } from '@angular/material/dialog';
import { MatButtonModule } from '@angular/material/button';
import { FormBuilder, FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
@@ -29,11 +29,13 @@ import { CloseOnEscapeDialog } from '@nifi/shared';
styleUrls: ['./override-policy-dialog.component.scss']
})
export class OverridePolicyDialog extends CloseOnEscapeDialog {
+ private formBuilder = inject(FormBuilder);
+
@Output() copyInheritedPolicy: EventEmitter<boolean> = new EventEmitter<boolean>();
overridePolicyForm: FormGroup;
- constructor(private formBuilder: FormBuilder) {
+ constructor() {
super();
this.overridePolicyForm = this.formBuilder.group({
override: new FormControl('copy')
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.ts
index df5dfe8849..1cf89a3c28 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { MatSortModule, Sort } from '@angular/material/sort';
import { NiFiCommon } from '@nifi/shared';
@@ -40,6 +40,8 @@ export interface TenantItem {
styleUrls: ['./policy-table.component.scss']
})
export class PolicyTable {
+ private nifiCommon = inject(NiFiCommon);
+
displayedColumns: string[] = ['user', 'actions'];
dataSource: MatTableDataSource<TenantItem> = new MatTableDataSource<TenantItem>();
@@ -86,8 +88,6 @@ export class PolicyTable {
direction: 'asc'
};
- constructor(private nifiCommon: NiFiCommon) {}
-
updateSort(sort: Sort): void {
this.sort = sort;
this.dataSource.data = this.sortUsers(this.dataSource.data, sort);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts
index d91891e11c..8486e1882d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core';
+import { Component, OnDestroy, OnInit, TemplateRef, ViewChild, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { selectCurrentUser } from '../../../../state/current-user/current-user.selectors';
import {
@@ -55,6 +55,10 @@ import { ErrorContextKey } from '../../../../state/error';
standalone: false
})
export class ComponentAccessPolicies implements OnInit, OnDestroy {
+ private store = inject<Store<AccessPolicyState>>(Store);
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
flowConfiguration$ = this.store.select(selectFlowConfiguration);
accessPolicyState$ = this.store.select(selectAccessPolicyState);
policyComponentState$ = this.store.select(selectPolicyComponentState);
@@ -134,11 +138,7 @@ export class ComponentAccessPolicies implements OnInit, OnDestroy {
@ViewChild('inheritedFromGlobalParameterContexts') inheritedFromGlobalParameterContexts!: TemplateRef<any>;
@ViewChild('inheritedFromProcessGroup') inheritedFromProcessGroup!: TemplateRef<any>;
- constructor(
- private store: Store<AccessPolicyState>,
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
this.policyForm = this.formBuilder.group({
policyAction: new FormControl(this.policyActionOptions[0].value, Validators.required)
});
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.ts
index 65ed72409f..74226feb68 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit, TemplateRef, ViewChild } from '@angular/core';
+import { Component, OnDestroy, OnInit, TemplateRef, ViewChild, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { selectCurrentUser } from '../../../../state/current-user/current-user.selectors';
import {
@@ -56,6 +56,10 @@ import { ErrorContextKey } from '../../../../state/error';
standalone: false
})
export class GlobalAccessPolicies implements OnInit, OnDestroy {
+ private store = inject<Store<AccessPoliciesState>>(Store);
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
flowConfiguration$ = this.store.select(selectFlowConfiguration);
accessPolicyState$ = this.store.select(selectAccessPolicyState);
currentUser$ = this.store.select(selectCurrentUser);
@@ -75,11 +79,7 @@ export class GlobalAccessPolicies implements OnInit, OnDestroy {
@ViewChild('inheritedFromController') inheritedFromController!: TemplateRef<any>;
@ViewChild('inheritedFromNoRestrictions') inheritedFromNoRestrictions!: TemplateRef<any>;
- constructor(
- private store: Store<AccessPoliciesState>,
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
this.resourceOptions = this.nifiCommon.getAllPolicyTypeListing();
this.policyForm = this.formBuilder.group({
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/service/bulletin-board.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/service/bulletin-board.service.ts
index 7bf89481e4..1f102c4a87 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/service/bulletin-board.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/service/bulletin-board.service.ts
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
import { LoadBulletinBoardRequest } from '../state/bulletin-board';
@Injectable({ providedIn: 'root' })
export class BulletinBoardService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getBulletins(request: LoadBulletinBoardRequest) {
const params: HttpParams = request as HttpParams;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.effects.ts
index 351f1510c7..a402f2c837 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/state/bulletin-board/bulletin-board.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import { Store } from '@ngrx/store';
@@ -30,12 +30,10 @@ import { HttpErrorResponse } from '@angular/common/http';
@Injectable()
export class BulletinBoardEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private bulletinBoardService: BulletinBoardService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private bulletinBoardService = inject(BulletinBoardService);
+ private errorHelper = inject(ErrorHelper);
loadBulletinBoard$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board-list/bulletin-board-list.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board-list/bulletin-board-list.component.ts
index 995253abbb..44c9da6f82 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board-list/bulletin-board-list.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board-list/bulletin-board-list.component.ts
@@ -45,6 +45,9 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
styleUrls: ['./bulletin-board-list.component.scss']
})
export class BulletinBoardList implements AfterViewInit, OnDestroy {
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
filterTerm = '';
filterColumn: 'message' | 'name' | 'id' | 'groupId' = 'message';
filterForm: FormGroup;
@@ -67,10 +70,7 @@ export class BulletinBoardList implements AfterViewInit, OnDestroy {
@Output() filterChanged: EventEmitter<BulletinBoardFilterArgs> = new EventEmitter<BulletinBoardFilterArgs>();
- constructor(
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
this.filterForm = this.formBuilder.group({ filterTerm: '', filterColumn: 'message' });
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board.component.ts
index 32f116786f..01afbab52d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/bulletins/ui/bulletin-board/bulletin-board.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { BulletinBoardFilterArgs, BulletinBoardState, LoadBulletinBoardRequest } from '../../state/bulletin-board';
@@ -62,14 +62,14 @@ import { MatButtonModule } from '@angular/material/button';
styleUrls: ['./bulletin-board.component.scss']
})
export class BulletinBoard implements OnInit, OnDestroy {
+ private store = inject<Store<BulletinBoardState>>(Store);
+
bulletinBoardState$ = this.store.select(selectBulletinBoardState);
private bulletinBoardFilter$ = this.store.select(selectBulletinBoardFilter);
private currentFilter: BulletinBoardFilterArgs | null = null;
autoRefresh = true;
- constructor(private store: Store<BulletinBoardState>) {}
-
ngOnInit(): void {
this.store.dispatch(
loadBulletinBoard({
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/feature/cluster.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/feature/cluster.component.ts
index 1848bcf22a..787a696a75 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/feature/cluster.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/feature/cluster.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../state';
import {
@@ -48,6 +48,8 @@ interface TabLink {
standalone: false
})
export class Cluster implements OnInit, OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
private _currentUser!: CurrentUser;
private _tabLinks: TabLink[] = [
{ label: 'Nodes', link: 'nodes', restricted: false },
@@ -66,7 +68,7 @@ export class Cluster implements OnInit, OnDestroy {
private _userHasSystemReadAccess: boolean | null = null;
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.currentUser$.pipe(takeUntilDestroyed()).subscribe((currentUser) => {
this._currentUser = currentUser;
if (!currentUser.controllerPermissions.canRead) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/service/cluster.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/service/cluster.service.ts
index ddac4f67be..7eb0d0a2d0 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/service/cluster.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/service/cluster.service.ts
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { ClusterListingResponse, ClusterNodeEntity } from '../state/cluster-listing';
@Injectable({ providedIn: 'root' })
export class ClusterService {
- private static readonly API = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API = '../nifi-api';
getClusterListing(): Observable<ClusterListingResponse> {
return this.httpClient.get(`${ClusterService.API}/controller/cluster`) as Observable<ClusterListingResponse>;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/state/cluster-listing/cluster-listing.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/state/cluster-listing/cluster-listing.effects.ts
index acc4520047..f4aac0841b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/state/cluster-listing/cluster-listing.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/state/cluster-listing/cluster-listing.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { ActionCreator, Creator, Store } from '@ngrx/store';
import { NiFiState } from '../../../../state';
@@ -37,14 +37,12 @@ import { concatLatestFrom } from '@ngrx/operators';
@Injectable()
export class ClusterListingEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private errorHelper: ErrorHelper,
- private router: Router,
- private clusterService: ClusterService,
- private dialog: MatDialog
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private errorHelper = inject(ErrorHelper);
+ private router = inject(Router);
+ private clusterService = inject(ClusterService);
+ private dialog = inject(MatDialog);
loadClusterListing$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-content-storage-listing/cluster-content-storage-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-content-storage-listing/cluster-content-storage-listing.component.ts
index 76349cb427..57e4e3c2ca 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-content-storage-listing/cluster-content-storage-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-content-storage-listing/cluster-content-storage-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { AsyncPipe } from '@angular/common';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { RepositoryStorageTable } from '../common/repository-storage-table/repository-storage-table.component';
@@ -45,6 +45,8 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
styleUrl: './cluster-content-storage-listing.component.scss'
})
export class ClusterContentStorageListing {
+ private store = inject<Store<NiFiState>>(Store);
+
loadedTimestamp = this.store.selectSignal(selectClusterListingLoadedTimestamp);
listingStatus = this.store.selectSignal(selectClusterListingStatus);
selectedClusterNodeId = this.store.selectSignal(selectClusterNodeIdFromRoute);
@@ -68,8 +70,6 @@ export class ClusterContentStorageListing {
})
);
- constructor(private store: Store<NiFiState>) {}
-
isInitialLoading(loadedTimestamp: string): boolean {
return loadedTimestamp == initialClusterState.loadedTimestamp;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-flow-file-storage-listing/cluster-flow-file-storage-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-flow-file-storage-listing/cluster-flow-file-storage-listing.component.ts
index c55c78b0d8..77db7efe96 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-flow-file-storage-listing/cluster-flow-file-storage-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-flow-file-storage-listing/cluster-flow-file-storage-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { RepositoryStorageTable } from '../common/repository-storage-table/repository-storage-table.component';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import {
@@ -44,6 +44,8 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
styleUrl: './cluster-flow-file-storage-listing.component.scss'
})
export class ClusterFlowFileStorageListing {
+ private store = inject<Store<NiFiState>>(Store);
+
loadedTimestamp = this.store.selectSignal(selectClusterListingLoadedTimestamp);
listingStatus = this.store.selectSignal(selectClusterListingStatus);
selectedClusterNodeId = this.store.selectSignal(selectClusterNodeIdFromRoute);
@@ -62,8 +64,6 @@ export class ClusterFlowFileStorageListing {
})
);
- constructor(private store: Store<NiFiState>) {}
-
isInitialLoading(loadedTimestamp: string): boolean {
return loadedTimestamp == initialClusterState.loadedTimestamp;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-jvm-listing/cluster-jvm-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-jvm-listing/cluster-jvm-listing.component.ts
index 1d067632c2..6715a2fb1a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-jvm-listing/cluster-jvm-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-jvm-listing/cluster-jvm-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { ClusterJvmTable } from './cluster-jvm-table/cluster-jvm-table.component';
import {
@@ -37,13 +37,13 @@ import { clearJvmNodeSelection, selectJvmNode } from '../../state/cluster-listin
styleUrl: './cluster-jvm-listing.component.scss'
})
export class ClusterJvmListing {
+ private store = inject<Store<NiFiState>>(Store);
+
loadedTimestamp = this.store.selectSignal(selectClusterListingLoadedTimestamp);
listingStatus = this.store.selectSignal(selectClusterListingStatus);
selectedClusterNodeId = this.store.selectSignal(selectClusterNodeIdFromRoute);
nodes = this.store.selectSignal(selectSystemNodeSnapshots);
- constructor(private store: Store<NiFiState>) {}
-
isInitialLoading(loadedTimestamp: string): boolean {
return loadedTimestamp == initialClusterState.loadedTimestamp;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-jvm-listing/cluster-jvm-table/cluster-jvm-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-jvm-listing/cluster-jvm-table/cluster-jvm-table.component.ts
index 347f04d873..355728b7f7 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-jvm-listing/cluster-jvm-table/cluster-jvm-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-jvm-listing/cluster-jvm-table/cluster-jvm-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ClusterTable } from '../../common/cluster-table/cluster-table.component';
import { NodeSnapshot } from '../../../../../state/system-diagnostics';
import {
@@ -36,6 +36,8 @@ import { ConnectedPosition } from '@angular/cdk/overlay';
styleUrl: './cluster-jvm-table.component.scss'
})
export class ClusterJvmTable extends ClusterTable<NodeSnapshot> {
+ private nifiCommon = inject(NiFiCommon);
+
filterableColumns: ClusterTableFilterColumn[] = [{ key: 'address', label: 'Address' }];
displayedColumns: string[] = [
@@ -50,10 +52,6 @@ export class ClusterJvmTable extends ClusterTable<NodeSnapshot> {
'uptime'
];
- constructor(private nifiCommon: NiFiCommon) {
- super();
- }
-
formatNodeAddress(item: NodeSnapshot): string {
return `${item.address}:${item.apiPort}`;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-detail-dialog/cluster-node-detail-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-detail-dialog/cluster-node-detail-dialog.component.ts
index 2ef0973b39..80bef32545 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-detail-dialog/cluster-node-detail-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-detail-dialog/cluster-node-detail-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatButton } from '@angular/material/button';
import { ClusterNode } from '../../../state/cluster-listing';
@@ -28,10 +28,14 @@ import { CloseOnEscapeDialog, CopyDirective } from '@nifi/shared';
styleUrl: './cluster-node-detail-dialog.component.scss'
})
export class ClusterNodeDetailDialog extends CloseOnEscapeDialog {
+ request = inject<ClusterNode>(MAT_DIALOG_DATA);
+
node: ClusterNode;
- constructor(@Inject(MAT_DIALOG_DATA) public request: ClusterNode) {
+ constructor() {
super();
+ const request = this.request;
+
this.node = request;
}
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-listing.component.ts
index c88b1eb4e2..49bccfaff8 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { initialClusterState } from '../../state/cluster-listing/cluster-listing.reducer';
import {
@@ -46,14 +46,14 @@ import { selectCurrentUser } from '../../../../state/current-user/current-user.s
styleUrl: './cluster-node-listing.component.scss'
})
export class ClusterNodeListing {
+ private store = inject<Store<NiFiState>>(Store);
+
loadedTimestamp = this.store.selectSignal(selectClusterListingLoadedTimestamp);
listingStatus = this.store.selectSignal(selectClusterListingStatus);
nodes = this.store.selectSignal(selectClusterListingNodes);
selectedClusterNodeId = this.store.selectSignal(selectClusterNodeIdFromRoute);
currentUser = this.store.selectSignal(selectCurrentUser);
- constructor(private store: Store<NiFiState>) {}
-
isInitialLoading(loadedTimestamp: string): boolean {
return loadedTimestamp == initialClusterState.loadedTimestamp;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-table/cluster-node-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-table/cluster-node-table.component.ts
index d375bc1e5a..d5b7bda60a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-table/cluster-node-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-node-listing/cluster-node-table/cluster-node-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MatCell, MatHeaderCell, MatTableModule } from '@angular/material/table';
import { ClusterNode } from '../../../state/cluster-listing';
import { MatSortHeader, MatSortModule, Sort } from '@angular/material/sort';
@@ -49,6 +49,8 @@ import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
styleUrl: './cluster-node-table.component.scss'
})
export class ClusterNodeTable extends ClusterTable<ClusterNode> {
+ private nifiCommon = inject(NiFiCommon);
+
private _currentUser!: CurrentUser;
@Output() disconnectNode: EventEmitter<ClusterNode> = new EventEmitter<ClusterNode>();
@@ -81,10 +83,6 @@ export class ClusterNodeTable extends ClusterTable<ClusterNode> {
displayedColumns: string[] = ['address', 'activeThreadCount', 'queued', 'status', 'nodeStartTime', 'heartbeat'];
- constructor(private nifiCommon: NiFiCommon) {
- super();
- }
-
formatNodeAddress(item: ClusterNode): string {
return `${item.address}:${item.apiPort}`;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-provenance-storage-listing/cluster-provenance-storage-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-provenance-storage-listing/cluster-provenance-storage-listing.component.ts
index 6c28eb4d2c..334b7bca58 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-provenance-storage-listing/cluster-provenance-storage-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-provenance-storage-listing/cluster-provenance-storage-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
selectClusterListingLoadedTimestamp,
selectClusterListingStatus,
@@ -45,6 +45,8 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
styleUrl: './cluster-provenance-storage-listing.component.scss'
})
export class ClusterProvenanceStorageListing {
+ private store = inject<Store<NiFiState>>(Store);
+
loadedTimestamp = this.store.selectSignal(selectClusterListingLoadedTimestamp);
listingStatus = this.store.selectSignal(selectClusterListingStatus);
selectedClusterNodeId = this.store.selectSignal(selectClusterNodeIdFromRoute);
@@ -68,8 +70,6 @@ export class ClusterProvenanceStorageListing {
})
);
- constructor(private store: Store<NiFiState>) {}
-
isInitialLoading(loadedTimestamp: string): boolean {
return loadedTimestamp == initialClusterState.loadedTimestamp;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-system-listing/cluster-system-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-system-listing/cluster-system-listing.component.ts
index 7486c57d0c..8db35f7683 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-system-listing/cluster-system-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-system-listing/cluster-system-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
selectClusterListingLoadedTimestamp,
selectClusterListingStatus,
@@ -37,13 +37,13 @@ import { NodeSnapshot } from '../../../../state/system-diagnostics';
styleUrl: './cluster-system-listing.component.scss'
})
export class ClusterSystemListing {
+ private store = inject<Store<NiFiState>>(Store);
+
loadedTimestamp = this.store.selectSignal(selectClusterListingLoadedTimestamp);
listingStatus = this.store.selectSignal(selectClusterListingStatus);
selectedClusterNodeId = this.store.selectSignal(selectClusterNodeIdFromRoute);
nodes = this.store.selectSignal(selectSystemNodeSnapshots);
- constructor(private store: Store<NiFiState>) {}
-
isInitialLoading(loadedTimestamp: string): boolean {
return loadedTimestamp == initialClusterState.loadedTimestamp;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-system-listing/cluster-system-table/cluster-system-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-system-listing/cluster-system-table/cluster-system-table.component.ts
index f7d2fb66f2..3f73f1439e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-system-listing/cluster-system-table/cluster-system-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-system-listing/cluster-system-table/cluster-system-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
ClusterTableFilter,
ClusterTableFilterColumn
@@ -33,6 +33,8 @@ import { MatTableModule } from '@angular/material/table';
styleUrl: './cluster-system-table.component.scss'
})
export class ClusterSystemTable extends ClusterTable<NodeSnapshot> {
+ private nifiCommon = inject(NiFiCommon);
+
filterableColumns: ClusterTableFilterColumn[] = [{ key: 'address', label: 'Address' }];
displayedColumns: string[] = [
@@ -43,10 +45,6 @@ export class ClusterSystemTable extends ClusterTable<NodeSnapshot> {
'daemonThreads'
];
- constructor(private nifiCommon: NiFiCommon) {
- super();
- }
-
formatNodeAddress(item: NodeSnapshot): string {
return `${item.address}:${item.apiPort}`;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-version-listing/cluster-version-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-version-listing/cluster-version-listing.component.ts
index e658a035bc..eec2279d9e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-version-listing/cluster-version-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-version-listing/cluster-version-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
selectClusterListingLoadedTimestamp,
selectClusterListingStatus,
@@ -37,13 +37,13 @@ import { ClusterVersionTable } from './cluster-version-table/cluster-version-tab
styleUrl: './cluster-version-listing.component.scss'
})
export class ClusterVersionListing {
+ private store = inject<Store<NiFiState>>(Store);
+
loadedTimestamp = this.store.selectSignal(selectClusterListingLoadedTimestamp);
listingStatus = this.store.selectSignal(selectClusterListingStatus);
selectedClusterNodeId = this.store.selectSignal(selectClusterNodeIdFromRoute);
nodes = this.store.selectSignal(selectSystemNodeSnapshots);
- constructor(private store: Store<NiFiState>) {}
-
isInitialLoading(loadedTimestamp: string): boolean {
return loadedTimestamp == initialClusterState.loadedTimestamp;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-version-listing/cluster-version-table/cluster-version-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-version-listing/cluster-version-table/cluster-version-table.component.ts
index 2672273385..cd4bc3c216 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-version-listing/cluster-version-table/cluster-version-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/cluster-version-listing/cluster-version-table/cluster-version-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
ClusterTableFilter,
ClusterTableFilterColumn
@@ -33,6 +33,8 @@ import { MatSortModule, Sort } from '@angular/material/sort';
styleUrl: './cluster-version-table.component.scss'
})
export class ClusterVersionTable extends ClusterTable<NodeSnapshot> {
+ private nifiCommon = inject(NiFiCommon);
+
filterableColumns: ClusterTableFilterColumn[] = [{ key: 'address', label: 'Address' }];
displayedColumns: string[] = [
@@ -45,10 +47,6 @@ export class ClusterVersionTable extends ClusterTable<NodeSnapshot> {
'osArchitecture'
];
- constructor(private nifiCommon: NiFiCommon) {
- super();
- }
-
formatNodeAddress(item: NodeSnapshot): string {
return `${item.address}:${item.apiPort}`;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/common/cluster-table-filter/cluster-table-filter.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/common/cluster-table-filter/cluster-table-filter.component.ts
index 84612135dd..04824d1273 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/common/cluster-table-filter/cluster-table-filter.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/common/cluster-table-filter/cluster-table-filter.component.ts
@@ -45,6 +45,8 @@ export interface ClusterTableFilterContext extends ClusterTableFilterArgs {
styleUrl: './cluster-table-filter.component.scss'
})
export class ClusterTableFilter implements AfterViewInit {
+ private formBuilder = inject(FormBuilder);
+
filterForm: FormGroup;
private _filteredCount = 0;
private _totalCount = 0;
@@ -99,7 +101,7 @@ export class ClusterTableFilter implements AfterViewInit {
@Output() filterChanged: EventEmitter<ClusterTableFilterContext> = new EventEmitter<ClusterTableFilterContext>();
- constructor(private formBuilder: FormBuilder) {
+ constructor() {
this.filterForm = this.formBuilder.group({
filterTerm: '',
filterColumn: this._initialFilterColumn || 'address'
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/common/repository-storage-table/repository-storage-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/common/repository-storage-table/repository-storage-table.component.ts
index 5e9ab60346..1ca50a017b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/common/repository-storage-table/repository-storage-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/cluster/ui/common/repository-storage-table/repository-storage-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { ClusterTable } from '../cluster-table/cluster-table.component';
import { ClusterNodeRepositoryStorageUsage } from '../../../../../state/system-diagnostics';
import { MatSortModule, Sort } from '@angular/material/sort';
@@ -30,6 +30,8 @@ import { MatTableModule } from '@angular/material/table';
styleUrl: './repository-storage-table.component.scss'
})
export class RepositoryStorageTable extends ClusterTable<ClusterNodeRepositoryStorageUsage> {
+ private nifiCommon = inject(NiFiCommon);
+
filterableColumns: ClusterTableFilterColumn[] = [{ key: 'address', label: 'Address' }];
displayedColumns: string[] = ['address', 'totalSpace', 'usedSpace', 'freeSpace', 'utilization'];
@@ -47,10 +49,6 @@ export class RepositoryStorageTable extends ClusterTable<ClusterNodeRepositorySt
}
}
- constructor(private nifiCommon: NiFiCommon) {
- super();
- }
-
override filterPredicate(item: ClusterNodeRepositoryStorageUsage, filter: string): boolean {
const { filterTerm, filterColumn } = JSON.parse(filter);
if (filterTerm === '') {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/feature/content-viewer.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/feature/content-viewer.component.ts
index 055e1835d7..e56fdbbd2d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/feature/content-viewer.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/feature/content-viewer.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../state';
import { loadContentViewerOptions, resetContentViewerOptions } from '../state/viewer-options/viewer-options.actions';
@@ -46,6 +46,10 @@ interface SupportedContentViewer {
standalone: false
})
export class ContentViewerComponent implements OnInit, OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+ private nifiCommon = inject(NiFiCommon);
+ private formBuilder = inject(FormBuilder);
+
viewerForm: FormGroup;
viewAsOptions: SelectGroup[] = [];
panelWidth: string | null = 'auto';
@@ -65,11 +69,7 @@ export class ContentViewerComponent implements OnInit, OnDestroy {
private queryParamsLoaded = false;
private viewerOptionsLoaded = false;
- constructor(
- private store: Store<NiFiState>,
- private nifiCommon: NiFiCommon,
- private formBuilder: FormBuilder
- ) {
+ constructor() {
this.viewerForm = this.formBuilder.group({ viewAs: null });
this.store
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/service/content-viewer.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/service/content-viewer.service.ts
index cc7ffde977..d60f3d565c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/service/content-viewer.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/service/content-viewer.service.ts
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpHeaders } from '@angular/common/http';
@Injectable({ providedIn: 'root' })
export class ContentViewerService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getContentViewers(): Observable<any> {
return this.httpClient.get(`${ContentViewerService.API}/flow/content-viewers`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/content/content.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/content/content.effects.ts
index c5cd0800fe..082e36372f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/content/content.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/content/content.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as ContentActions from './content.actions';
import { map, tap } from 'rxjs';
@@ -24,11 +24,9 @@ import { NiFiCommon } from '@nifi/shared';
@Injectable()
export class ContentEffects {
- constructor(
- private actions$: Actions,
- private router: Router,
- private nifiCommon: NiFiCommon
- ) {}
+ private actions$ = inject(Actions);
+ private router = inject(Router);
+ private nifiCommon = inject(NiFiCommon);
navigateToBundledContentViewer$ = createEffect(
() =>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/external-viewer/external-viewer.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/external-viewer/external-viewer.effects.ts
index ee997aa35d..26f1e99b6e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/external-viewer/external-viewer.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/external-viewer/external-viewer.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as ExternalViewerActions from './external-viewer.actions';
import { tap } from 'rxjs';
@@ -23,10 +23,8 @@ import { NavigationExtras, Router } from '@angular/router';
@Injectable()
export class ExternalViewerEffects {
- constructor(
- private actions$: Actions,
- private router: Router
- ) {}
+ private actions$ = inject(Actions);
+ private router = inject(Router);
navigateToExternalViewer$ = createEffect(
() =>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/viewer-options/viewer-options.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/viewer-options/viewer-options.effects.ts
index 716f34ed7b..f6346629ff 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/viewer-options/viewer-options.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/state/viewer-options/viewer-options.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as ViewerOptionsActions from './viewer-options.actions';
import { catchError, from, map, of, switchMap } from 'rxjs';
@@ -26,11 +26,9 @@ import { ContentViewerEntity } from './index';
@Injectable()
export class ViewerOptionsEffects {
- constructor(
- private actions$: Actions,
- private contentViewerService: ContentViewerService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private contentViewerService = inject(ContentViewerService);
+ private errorHelper = inject(ErrorHelper);
loadContentViewerOptions$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/external-viewer/external-viewer.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/external-viewer/external-viewer.component.ts
index 3ea9ee36df..613e0af409 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/external-viewer/external-viewer.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/external-viewer/external-viewer.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, SecurityContext } from '@angular/core';
+import { Component, OnDestroy, SecurityContext, inject } from '@angular/core';
import { NiFiState } from '../../../../state';
import { Store } from '@ngrx/store';
import { selectRef } from '../../state/content/content.selectors';
@@ -35,16 +35,16 @@ import { RecreateViewDirective } from '../recreate-view.directive';
styleUrls: ['./external-viewer.component.scss']
})
export class ExternalViewer implements OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+ private domSanitizer = inject(DomSanitizer);
+ protected systemTokensService = inject(SystemTokensService);
+
private ref: string | null = null;
private request: ExternalViewerRequest | null = null;
frameSource: SafeResourceUrl | null = null;
- constructor(
- private store: Store<NiFiState>,
- private domSanitizer: DomSanitizer,
- protected systemTokensService: SystemTokensService
- ) {
+ constructor() {
this.store
.select(selectRef)
.pipe(isDefinedAndNotNull(), takeUntilDestroyed())
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/hex-viewer/hex-viewer.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/hex-viewer/hex-viewer.component.ts
index 29f7413822..009172f11f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/hex-viewer/hex-viewer.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/hex-viewer/hex-viewer.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ContentViewerService } from '../../service/content-viewer.service';
import { HttpErrorResponse } from '@angular/common/http';
import { ErrorHelper } from '../../../../service/error-helper.service';
@@ -32,6 +32,10 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
styleUrls: ['./hex-viewer.component.scss']
})
export class HexViewer {
+ private store = inject<Store<NiFiState>>(Store);
+ private contentViewerService = inject(ContentViewerService);
+ private errorHelper = inject(ErrorHelper);
+
private static readonly KB_COUNT = 10;
private static readonly MAX_CONTENT_BYTES = HexViewer.KB_COUNT * NiFiCommon.BYTES_IN_KILOBYTE;
@@ -42,11 +46,7 @@ export class HexViewer {
hexdump: string = '';
error: string | null = null;
- constructor(
- private store: Store<NiFiState>,
- private contentViewerService: ContentViewerService,
- private errorHelper: ErrorHelper
- ) {
+ constructor() {
this.store
.select(selectRef)
.pipe(isDefinedAndNotNull(), takeUntilDestroyed())
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/image-viewer/image-viewer.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/image-viewer/image-viewer.component.ts
index 20754d6090..55ac66f0f9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/image-viewer/image-viewer.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/image-viewer/image-viewer.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { NiFiState } from '../../../../state';
import { Store } from '@ngrx/store';
import { selectRef } from '../../state/content/content.selectors';
@@ -29,9 +29,11 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
styleUrls: ['./image-viewer.component.scss']
})
export class ImageViewer {
+ private store = inject<Store<NiFiState>>(Store);
+
ref: string | null = null;
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectRef)
.pipe(isDefinedAndNotNull(), takeUntilDestroyed())
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/recreate-view.directive.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/recreate-view.directive.ts
index 50062ba3ee..a0b67481b3 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/recreate-view.directive.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/content-viewer/ui/recreate-view.directive.ts
@@ -22,7 +22,8 @@ import {
OnChanges,
SimpleChanges,
TemplateRef,
- ViewContainerRef
+ ViewContainerRef,
+ inject
} from '@angular/core';
@Directive({
@@ -30,15 +31,13 @@ import {
standalone: true
})
export class RecreateViewDirective implements OnChanges {
+ private templateRef = inject<TemplateRef<unknown>>(TemplateRef);
+ private viewContainer = inject(ViewContainerRef);
+
@Input('recreateView') key: unknown;
viewRef: EmbeddedViewRef<unknown> | null = null;
- constructor(
- private templateRef: TemplateRef<unknown>,
- private viewContainer: ViewContainerRef
- ) {}
-
ngOnChanges(changes: SimpleChanges): void {
if (changes['key']) {
this.destroyView();
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/feature/counters.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/feature/counters.component.ts
index e011bc4a7d..fe36e591a3 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/feature/counters.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/feature/counters.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../state';
import { resetCounterState } from '../state/counter-listing/counter-listing.actions';
@@ -27,7 +27,7 @@ import { resetCounterState } from '../state/counter-listing/counter-listing.acti
standalone: false
})
export class Counters implements OnDestroy {
- constructor(private store: Store<NiFiState>) {}
+ private store = inject<Store<NiFiState>>(Store);
ngOnDestroy(): void {
this.store.dispatch(resetCounterState());
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/service/counters.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/service/counters.service.ts
index ce2cc99b89..8d87dc42a2 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/service/counters.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/service/counters.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Client } from '../../../service/client.service';
import { Observable } from 'rxjs';
@@ -23,12 +23,10 @@ import { ResetCounterRequest } from '../state/counter-listing';
@Injectable({ providedIn: 'root' })
export class CountersService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
- constructor(
- private httpClient: HttpClient,
- private client: Client
- ) {}
+ private static readonly API: string = '../nifi-api';
getCounters(): Observable<any> {
return this.httpClient.get(`${CountersService.API}/counters`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/state/counter-listing/counter-listing.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/state/counter-listing/counter-listing.effects.ts
index a13690235e..0bf5f254c9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/state/counter-listing/counter-listing.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/state/counter-listing/counter-listing.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import { NiFiState } from '../../../../state';
@@ -32,13 +32,11 @@ import { selectStatus } from './counter-listing.selectors';
@Injectable()
export class CounterListingEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private countersService: CountersService,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private countersService = inject(CountersService);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
loadCounters$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-listing.component.ts
index 34d8f8265d..889c2f3910 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { CounterEntity, CounterListingState } from '../../state/counter-listing';
import { Store } from '@ngrx/store';
import {
@@ -38,11 +38,11 @@ import { CounterTable } from './counter-table/counter-table.component';
styleUrls: ['./counter-listing.component.scss']
})
export class CounterListing implements OnInit {
+ private store = inject<Store<CounterListingState>>(Store);
+
counterListingState$ = this.store.select(selectCounterListingState);
currentUser$ = this.store.select(selectCurrentUser);
- constructor(private store: Store<CounterListingState>) {}
-
ngOnInit(): void {
this.store.dispatch(loadCounters());
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.ts
index b09e79e568..d9228174ca 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.ts
@@ -46,6 +46,9 @@ import { MatButton } from '@angular/material/button';
styleUrls: ['./counter-table.component.scss']
})
export class CounterTable implements AfterViewInit {
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
private _canModifyCounters = false;
private destroyRef: DestroyRef = inject(DestroyRef);
filterTerm = '';
@@ -104,10 +107,7 @@ export class CounterTable implements AfterViewInit {
@Output() resetCounter: EventEmitter<CounterEntity> = new EventEmitter<CounterEntity>();
@Output() resetAllCounters: EventEmitter<number> = new EventEmitter<number>();
- constructor(
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
this.filterForm = this.formBuilder.group({ filterTerm: '', filterColumn: 'name' });
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/feature/documentation.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/feature/documentation.component.ts
index 0da9de0b7e..a66dc3077d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/feature/documentation.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/feature/documentation.component.ts
@@ -16,7 +16,7 @@
*/
import {
- afterRender,
+ afterNextRender,
AfterViewInit,
Component,
DestroyRef,
@@ -56,6 +56,11 @@ import { concatLatestFrom } from '@ngrx/operators';
standalone: false
})
export class Documentation implements OnInit, AfterViewInit {
+ private store = inject<Store<NiFiState>>(Store);
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+ private documentation = inject(ElementRef);
+
private destroyRef: DestroyRef = inject(DestroyRef);
processorTypes$ = this.store
@@ -89,12 +94,7 @@ export class Documentation implements OnInit, AfterViewInit {
reportingTasksExpanded = false;
parameterProvidersExpanded = false;
- constructor(
- private store: Store<NiFiState>,
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon,
- private documentation: ElementRef
- ) {
+ constructor() {
this.store
.select(selectDefinitionCoordinatesFromRoute)
.pipe(
@@ -154,7 +154,7 @@ export class Documentation implements OnInit, AfterViewInit {
filter: new FormControl(null)
});
- afterRender(() => {
+ afterNextRender(() => {
if (!this.scrolledIntoView) {
const selectedType = this.documentation.nativeElement.querySelector('a.selected');
if (selectedType) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/service/documentation.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/service/documentation.service.ts
index 343211ed2e..68e17dd0f6 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/service/documentation.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/service/documentation.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { ProcessorDefinition } from '../state/processor-definition';
@@ -28,9 +28,9 @@ import { FlowAnalysisRuleDefinition } from '../state/flow-analysis-rule-definiti
@Injectable({ providedIn: 'root' })
export class DocumentationService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getProcessorDefinition(coordinates: DefinitionCoordinates): Observable<ProcessorDefinition> {
return this.httpClient.get<ProcessorDefinition>(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/additional-details/additional-details.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/additional-details/additional-details.effects.ts
index fa25b010a3..b3f6d9fa10 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/additional-details/additional-details.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/additional-details/additional-details.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as AdditionalDetailsActions from './additional-details.actions';
import { catchError, from, map, of, switchMap } from 'rxjs';
@@ -26,11 +26,9 @@ import { AdditionalDetailsEntity } from './index';
@Injectable()
export class AdditionalDetailsEffects {
- constructor(
- private actions$: Actions,
- private documentationService: DocumentationService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private documentationService = inject(DocumentationService);
+ private errorHelper = inject(ErrorHelper);
loadAdditionalDetails$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/controller-service-definition/controller-service-definition.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/controller-service-definition/controller-service-definition.effects.ts
index 50c6255161..ced35a7a6b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/controller-service-definition/controller-service-definition.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/controller-service-definition/controller-service-definition.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as ControllerServiceDefinitionActions from './controller-service-definition.actions';
import { catchError, from, map, of, switchMap } from 'rxjs';
@@ -26,11 +26,9 @@ import { ControllerServiceDefinition } from './index';
@Injectable()
export class ControllerServiceDefinitionEffects {
- constructor(
- private actions$: Actions,
- private documentationService: DocumentationService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private documentationService = inject(DocumentationService);
+ private errorHelper = inject(ErrorHelper);
loadControllerServiceDefinition$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/documentation/documentation.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/documentation/documentation.effects.ts
index 3d21a1dea4..e680169ba8 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/documentation/documentation.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/documentation/documentation.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as DocumentationActions from './documentation.actions';
import { tap } from 'rxjs';
@@ -23,10 +23,8 @@ import { Router } from '@angular/router';
@Injectable()
export class DocumentationEffects {
- constructor(
- private actions$: Actions,
- private router: Router
- ) {}
+ private actions$ = inject(Actions);
+ private router = inject(Router);
navigateToOverview$ = createEffect(
() =>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/flow-analysis-rule-definition/flow-analysis-rule-definition.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/flow-analysis-rule-definition/flow-analysis-rule-definition.effects.ts
index d9da28cc5d..a544b31772 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/flow-analysis-rule-definition/flow-analysis-rule-definition.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/flow-analysis-rule-definition/flow-analysis-rule-definition.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as FlowAnalysisRuleDefinitionActions from './flow-analysis-rule-definition.actions';
import { catchError, from, map, of, switchMap } from 'rxjs';
@@ -26,11 +26,9 @@ import { FlowAnalysisRuleDefinition } from './index';
@Injectable()
export class FlowAnalysisRuleDefinitionEffects {
- constructor(
- private actions$: Actions,
- private documentationService: DocumentationService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private documentationService = inject(DocumentationService);
+ private errorHelper = inject(ErrorHelper);
loadFlowAnalysisRuleDefinition$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/parameter-provider-definition/parameter-provider-definition.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/parameter-provider-definition/parameter-provider-definition.effects.ts
index 9f9d6cca17..bfe6f3816a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/parameter-provider-definition/parameter-provider-definition.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/parameter-provider-definition/parameter-provider-definition.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as ParameterProviderDefinitionActions from './parameter-provider-definition.actions';
import { catchError, from, map, of, switchMap } from 'rxjs';
@@ -26,11 +26,9 @@ import { ParameterProviderDefinition } from './index';
@Injectable()
export class ParameterProviderDefinitionEffects {
- constructor(
- private actions$: Actions,
- private documentationService: DocumentationService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private documentationService = inject(DocumentationService);
+ private errorHelper = inject(ErrorHelper);
loadParameterProviderDefinition$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/processor-definition/processor-definition.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/processor-definition/processor-definition.effects.ts
index 1da71eb2e1..10f1286eba 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/processor-definition/processor-definition.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/processor-definition/processor-definition.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as ProcessorDefinitionActions from './processor-definition.actions';
import { catchError, from, map, of, switchMap } from 'rxjs';
@@ -26,11 +26,9 @@ import { ProcessorDefinition } from './index';
@Injectable()
export class ProcessorDefinitionEffects {
- constructor(
- private actions$: Actions,
- private documentationService: DocumentationService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private documentationService = inject(DocumentationService);
+ private errorHelper = inject(ErrorHelper);
loadProcessorDefinition$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/reporting-task-definition/reporting-task-definition.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/reporting-task-definition/reporting-task-definition.effects.ts
index d4645fb3fc..560eaa9bf4 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/reporting-task-definition/reporting-task-definition.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/state/reporting-task-definition/reporting-task-definition.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as ReportingTaskDefinitionActions from './reporting-task-definition.actions';
import { catchError, from, map, of, switchMap } from 'rxjs';
@@ -26,11 +26,9 @@ import { ReportingTaskDefinition } from './index';
@Injectable()
export class ReportingTaskDefinitionEffects {
- constructor(
- private actions$: Actions,
- private documentationService: DocumentationService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private documentationService = inject(DocumentationService);
+ private errorHelper = inject(ErrorHelper);
loadReportingTaskDefinition$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/additional-details/additional-details.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/additional-details/additional-details.component.ts
index 2be2fcaced..cdc4b40783 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/additional-details/additional-details.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/additional-details/additional-details.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { AfterViewChecked, Component, Input, OnDestroy, viewChild } from '@angular/core';
+import { AfterViewChecked, Component, Input, OnDestroy, viewChild, inject } from '@angular/core';
import { ConfigurableExtensionDefinition } from '../../../state';
import { MatExpansionModule, MatExpansionPanel } from '@angular/material/expansion';
import { NiFiState } from '../../../../../state';
@@ -36,6 +36,8 @@ import { MarkdownComponent } from 'ngx-markdown';
styleUrl: './additional-details.component.scss'
})
export class AdditionalDetailsComponent implements AfterViewChecked, OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
@Input() set configurableExtensionDefinition(configurableExtensionDefinition: ConfigurableExtensionDefinition) {
if (
this.group !== configurableExtensionDefinition.group ||
@@ -67,8 +69,6 @@ export class AdditionalDetailsComponent implements AfterViewChecked, OnDestroy {
private expanded = false;
private viewChecked = false;
- constructor(private store: Store<NiFiState>) {}
-
ngAfterViewChecked(): void {
this.viewChecked = true;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/attributes-definition/attributes-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/attributes-definition/attributes-definition.component.ts
index d798ee883f..3017bed01a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/attributes-definition/attributes-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/attributes-definition/attributes-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { NiFiCommon } from '@nifi/shared';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { Attribute } from '../../../state/processor-definition';
@@ -27,6 +27,8 @@ import { Attribute } from '../../../state/processor-definition';
styleUrl: './attributes-definition.component.scss'
})
export class AttributesDefinitionComponent {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set attributes(attributes: Attribute[]) {
this.dataSource.data = this.sortAttributes(attributes);
}
@@ -34,8 +36,6 @@ export class AttributesDefinitionComponent {
displayedColumns: string[] = ['name', 'description'];
dataSource: MatTableDataSource<Attribute> = new MatTableDataSource<Attribute>();
- constructor(private nifiCommon: NiFiCommon) {}
-
sortAttributes(items: Attribute[]): Attribute[] {
const data: Attribute[] = items.slice();
return data.sort((a, b) => {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/configurable-extension-definition/configurable-extension-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/configurable-extension-definition/configurable-extension-definition.component.ts
index 542c8868c2..53e844c72d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/configurable-extension-definition/configurable-extension-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/configurable-extension-definition/configurable-extension-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { NiFiCommon } from '@nifi/shared';
import { ConfigurableExtensionDefinition, Stateful } from '../../../state';
import { PropertiesDefinitionComponent } from '../properties-definition/properties-definition.component';
@@ -39,9 +39,9 @@ import { AdditionalDetailsComponent } from '../additional-details/additional-det
styleUrl: './configurable-extension-definition.component.scss'
})
export class ConfigurableExtensionDefinitionComponent {
- @Input() configurableExtensionDefinition: ConfigurableExtensionDefinition | null = null;
+ private nifiCommon = inject(NiFiCommon);
- constructor(private nifiCommon: NiFiCommon) {}
+ @Input() configurableExtensionDefinition: ConfigurableExtensionDefinition | null = null;
formatExtensionName(extensionType: string): string {
return this.nifiCommon.getComponentTypeLabel(extensionType);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/dynamic-properties-definition/dynamic-properties-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/dynamic-properties-definition/dynamic-properties-definition.component.ts
index 000ad12104..26a79e9b01 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/dynamic-properties-definition/dynamic-properties-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/dynamic-properties-definition/dynamic-properties-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input, viewChild } from '@angular/core';
+import { Component, Input, viewChild, inject } from '@angular/core';
import { NiFiCommon } from '@nifi/shared';
import { ConfigurableExtensionDefinition, DynamicProperty, ExpressionLanguageScope } from '../../../state';
import { MatAccordion, MatExpansionModule } from '@angular/material/expansion';
@@ -28,6 +28,8 @@ import { MatIconButton } from '@angular/material/button';
styleUrl: './dynamic-properties-definition.component.scss'
})
export class DynamicPropertiesDefinitionComponent {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set configurableExtensionDefinition(configurableExtensionDefinition: ConfigurableExtensionDefinition) {
if (configurableExtensionDefinition.dynamicProperties) {
this.dynamicProperties = Object.values(configurableExtensionDefinition.dynamicProperties).sort((a, b) => {
@@ -47,8 +49,6 @@ export class DynamicPropertiesDefinitionComponent {
supportsDynamicSensitiveProperties: boolean | null = null;
- constructor(private nifiCommon: NiFiCommon) {}
-
expand(): void {
this.dynamicPropertiesAccordion().openAll();
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/multi-processor-use-case/multi-processor-use-case.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/multi-processor-use-case/multi-processor-use-case.component.ts
index 0651156c44..ad938ebdea 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/multi-processor-use-case/multi-processor-use-case.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/multi-processor-use-case/multi-processor-use-case.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input, viewChild } from '@angular/core';
+import { Component, Input, viewChild, inject } from '@angular/core';
import { ComponentType, NiFiCommon } from '@nifi/shared';
import { DocumentedType } from '../../../../../state/shared';
import { Observable } from 'rxjs';
@@ -35,15 +35,13 @@ import { MatIconButton } from '@angular/material/button';
styleUrl: './multi-processor-use-case.component.scss'
})
export class MultiProcessorUseCaseComponent {
+ private store = inject<Store<NiFiState>>(Store);
+ private nifiCommon = inject(NiFiCommon);
+
@Input() multiProcessorUseCases: MultiProcessorUseCase[] | null = null;
useCaseAccordion = viewChild.required(MatAccordion);
- constructor(
- private store: Store<NiFiState>,
- private nifiCommon: NiFiCommon
- ) {}
-
expand(): void {
this.useCaseAccordion().openAll();
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/properties-definition/properties-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/properties-definition/properties-definition.component.ts
index 86eb5c5e45..e43f49f0ce 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/properties-definition/properties-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/properties-definition/properties-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input, viewChild } from '@angular/core';
+import { Component, Input, viewChild, inject } from '@angular/core';
import { ConfigurableExtensionDefinition, PropertyDescriptor } from '../../../state';
import { MatAccordion, MatExpansionModule } from '@angular/material/expansion';
import { MatButtonModule } from '@angular/material/button';
@@ -29,6 +29,8 @@ import { PropertyDefinitionComponent } from '../property-definition/property-def
styleUrl: './properties-definition.component.scss'
})
export class PropertiesDefinitionComponent {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set configurableExtensionDefinition(configurableExtensionDefinition: ConfigurableExtensionDefinition) {
if (configurableExtensionDefinition.propertyDescriptors) {
this.propertyDescriptors = Object.values(configurableExtensionDefinition.propertyDescriptors).sort(
@@ -42,8 +44,6 @@ export class PropertiesDefinitionComponent {
propertyDescriptors: PropertyDescriptor[] | null = null;
propertiesAccordion = viewChild.required(MatAccordion);
- constructor(private nifiCommon: NiFiCommon) {}
-
formatTitle(descriptor: PropertyDescriptor): string {
if (descriptor.required) {
return `${descriptor.displayName}*`;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/property-definition/property-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/property-definition/property-definition.component.ts
index 543d09ad30..358f67c18f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/property-definition/property-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/property-definition/property-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { ComponentType, NiFiCommon, NifiTooltipDirective, TextTip } from '@nifi/shared';
import {
@@ -42,6 +42,9 @@ import { RouterLink } from '@angular/router';
styleUrl: './property-definition.component.scss'
})
export class PropertyDefinitionComponent {
+ private store = inject<Store<NiFiState>>(Store);
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set propertyDescriptor(propertyDescriptor: PropertyDescriptor) {
this.descriptor = propertyDescriptor;
@@ -63,11 +66,6 @@ export class PropertyDefinitionComponent {
descriptor: PropertyDescriptor | null = null;
serviceImplementations$: Observable<DocumentedType[]> | null = null;
- constructor(
- private store: Store<NiFiState>,
- private nifiCommon: NiFiCommon
- ) {}
-
formatDefaultValue(descriptor: PropertyDescriptor): string | undefined {
if (descriptor.allowableValues) {
const defaultAllowableValue: AllowableValue | undefined = descriptor.allowableValues.find(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/relationships-definition/relationships-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/relationships-definition/relationships-definition.component.ts
index 26f3e7f800..a89a3e4e09 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/relationships-definition/relationships-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/relationships-definition/relationships-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { NiFiCommon } from '@nifi/shared';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { Relationship } from '../../../state/processor-definition';
@@ -27,6 +27,8 @@ import { Relationship } from '../../../state/processor-definition';
styleUrl: './relationships-definition.component.scss'
})
export class RelationshipsDefinitionComponent {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set relationships(relationships: Relationship[]) {
this.dataSource.data = this.sortRelationships(relationships);
}
@@ -34,8 +36,6 @@ export class RelationshipsDefinitionComponent {
displayedColumns: string[] = ['name', 'description'];
dataSource: MatTableDataSource<Relationship> = new MatTableDataSource<Relationship>();
- constructor(private nifiCommon: NiFiCommon) {}
-
sortRelationships(items: Relationship[]): Relationship[] {
const data: Relationship[] = items.slice();
return data.sort((a, b) => {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/resource-considerations/resource-considerations.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/resource-considerations/resource-considerations.component.ts
index b6c7d213b3..48e1a68d7c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/resource-considerations/resource-considerations.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/resource-considerations/resource-considerations.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { NiFiCommon } from '@nifi/shared';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { SystemResourceConsideration } from '../../../state';
@@ -27,6 +27,8 @@ import { SystemResourceConsideration } from '../../../state';
styleUrl: './resource-considerations.component.scss'
})
export class ResourceConsiderationsComponent {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set resourceConsiderations(resourceConsideration: SystemResourceConsideration[]) {
this.dataSource.data = this.sortResourceConsiderations(resourceConsideration);
}
@@ -34,8 +36,6 @@ export class ResourceConsiderationsComponent {
displayedColumns: string[] = ['resource', 'description'];
dataSource: MatTableDataSource<SystemResourceConsideration> = new MatTableDataSource<SystemResourceConsideration>();
- constructor(private nifiCommon: NiFiCommon) {}
-
sortResourceConsiderations(items: SystemResourceConsideration[]): SystemResourceConsideration[] {
const data: SystemResourceConsideration[] = items.slice();
return data.sort((a, b) => {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/restrictions-definition/restrictions-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/restrictions-definition/restrictions-definition.component.ts
index 2a563bb7f7..052ded06a9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/restrictions-definition/restrictions-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/restrictions-definition/restrictions-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { NiFiCommon } from '@nifi/shared';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { Restriction } from '../../../state';
@@ -27,6 +27,8 @@ import { Restriction } from '../../../state';
styleUrl: './restrictions-definition.component.scss'
})
export class RestrictionsDefinitionComponent {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set restrictions(restrictions: Restriction[]) {
this.dataSource.data = this.sortRestrictions(restrictions);
}
@@ -34,8 +36,6 @@ export class RestrictionsDefinitionComponent {
displayedColumns: string[] = ['required-permission', 'explanation'];
dataSource: MatTableDataSource<Restriction> = new MatTableDataSource<Restriction>();
- constructor(private nifiCommon: NiFiCommon) {}
-
sortRestrictions(items: Restriction[]): Restriction[] {
const data: Restriction[] = items.slice();
return data.sort((a, b) => {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/see-also/see-also.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/see-also/see-also.component.ts
index 35d9dac90d..7b87264d3d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/see-also/see-also.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/common/see-also/see-also.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { ComponentType, NiFiCommon, TextTip } from '@nifi/shared';
import { Observable } from 'rxjs';
import { AsyncPipe } from '@angular/common';
@@ -34,12 +34,10 @@ import { DocumentedType } from '../../../../../state/shared';
styleUrl: './see-also.component.scss'
})
export class SeeAlsoComponent {
- @Input() extensionTypes: string[] | null = null;
+ private store = inject<Store<NiFiState>>(Store);
+ private nifiCommon = inject(NiFiCommon);
- constructor(
- private store: Store<NiFiState>,
- private nifiCommon: NiFiCommon
- ) {}
+ @Input() extensionTypes: string[] | null = null;
getProcessorFromType(extensionTypes: string[]): Observable<LoadExtensionTypesForDocumentationResponse> {
return this.store.select(selectExtensionFromTypes(extensionTypes));
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/controller-service-definition/controller-service-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/controller-service-definition/controller-service-definition.component.ts
index d612318224..d57026ad6d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/controller-service-definition/controller-service-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/controller-service-definition/controller-service-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../../state';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
@@ -39,9 +39,11 @@ import { SeeAlsoComponent } from '../common/see-also/see-also.component';
styleUrl: './controller-service-definition.component.scss'
})
export class ControllerServiceDefinition implements OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
controllerServiceDefinitionState: ControllerServiceDefinitionState | null = null;
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectDefinitionCoordinatesFromRouteForComponentType(ComponentType.ControllerService))
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/flow-analysis-rule-definition/flow-analysis-rule-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/flow-analysis-rule-definition/flow-analysis-rule-definition.component.ts
index a3aa82c7e9..42fb4e0e1a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/flow-analysis-rule-definition/flow-analysis-rule-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/flow-analysis-rule-definition/flow-analysis-rule-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../../state';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
@@ -38,9 +38,11 @@ import { selectFlowAnalysisRuleDefinitionState } from '../../state/flow-analysis
styleUrl: './flow-analysis-rule-definition.component.scss'
})
export class FlowAnalysisRuleDefinition implements OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
flowAnalysisRuleDefinitionState: FlowAnalysisRuleDefinitionState | null = null;
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectDefinitionCoordinatesFromRouteForComponentType(ComponentType.FlowAnalysisRule))
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/overview/overview.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/overview/overview.component.ts
index cf51056227..c0df533852 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/overview/overview.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/overview/overview.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { NiFiState } from '../../../../state';
import { Store } from '@ngrx/store';
import { ComponentType } from '@nifi/shared';
@@ -33,10 +33,10 @@ import { NgTemplateOutlet } from '@angular/common';
styleUrls: ['./overview.component.scss']
})
export class Overview {
+ private store = inject<Store<NiFiState>>(Store);
+
generalDocumentation = this.store.selectSignal(selectAllGeneralDocumentation);
developerDocumentation = this.store.selectSignal(selectAllDeveloperDocumentation);
- constructor(private store: Store<NiFiState>) {}
-
protected readonly ComponentType = ComponentType;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/parameter-provider-definition/parameter-provider-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/parameter-provider-definition/parameter-provider-definition.component.ts
index 72343247c0..74d503e8d5 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/parameter-provider-definition/parameter-provider-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/parameter-provider-definition/parameter-provider-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../../state';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
@@ -38,9 +38,11 @@ import { selectParameterProviderDefinitionState } from '../../state/parameter-pr
styleUrl: './parameter-provider-definition.component.scss'
})
export class ParameterProviderDefinition implements OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
parameterProviderDefinitionState: ParameterProviderDefinitionState | null = null;
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectDefinitionCoordinatesFromRouteForComponentType(ComponentType.ParameterProvider))
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/processor-definition/processor-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/processor-definition/processor-definition.component.ts
index 14baffcdf4..e7ddd8c9d1 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/processor-definition/processor-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/processor-definition/processor-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../../state';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
@@ -54,9 +54,11 @@ import { distinctUntilChanged } from 'rxjs';
styleUrl: './processor-definition.component.scss'
})
export class ProcessorDefinition implements OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
processorDefinitionState: ProcessorDefinitionState | null = null;
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectDefinitionCoordinatesFromRouteForComponentType(ComponentType.Processor))
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/reporting-task-definition/reporting-task-definition.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/reporting-task-definition/reporting-task-definition.component.ts
index a0afe149ea..cdb29059bf 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/reporting-task-definition/reporting-task-definition.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/documentation/ui/reporting-task-definition/reporting-task-definition.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../../state';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
@@ -38,9 +38,11 @@ import { selectReportingTaskDefinitionState } from '../../state/reporting-task-d
styleUrl: './reporting-task-definition.component.scss'
})
export class ReportingTaskDefinition implements OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
reportingTaskDefinitionState: ReportingTaskDefinitionState | null = null;
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectDefinitionCoordinatesFromRouteForComponentType(ComponentType.ReportingTask))
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/error/feature/error.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/error/feature/error.component.ts
index 9ffc6f85c6..b74af1042a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/error/feature/error.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/error/feature/error.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { selectFullScreenError } from '../../../state/error/error.selectors';
import { NiFiState } from '../../../state';
@@ -30,9 +30,9 @@ import { PageContent } from '../../../ui/common/page-content/page-content.compon
styleUrls: ['./error.component.scss']
})
export class Error implements OnDestroy {
- errorDetail$ = this.store.select(selectFullScreenError);
+ private store = inject<Store<NiFiState>>(Store);
- constructor(private store: Store<NiFiState>) {}
+ errorDetail$ = this.store.select(selectFullScreenError);
ngOnDestroy(): void {
this.store.dispatch(resetErrorState());
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/service/flow-configuration-history.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/service/flow-configuration-history.service.ts
index 4fab11fd72..c44e0843f3 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/service/flow-configuration-history.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/service/flow-configuration-history.service.ts
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { HistoryQueryRequest, PurgeHistoryRequest } from '../state/flow-configuration-history-listing';
@Injectable({ providedIn: 'root' })
export class FlowConfigurationHistoryService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getHistory(request: HistoryQueryRequest): Observable<any> {
return this.httpClient.get(`${FlowConfigurationHistoryService.API}/flow/history`, { params: { ...request } });
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/state/flow-configuration-history-listing/flow-configuration-history-listing.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/state/flow-configuration-history-listing/flow-configuration-history-listing.effects.ts
index ca3ae39d3e..14f8976609 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/state/flow-configuration-history-listing/flow-configuration-history-listing.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/state/flow-configuration-history-listing/flow-configuration-history-listing.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import { Store } from '@ngrx/store';
@@ -37,14 +37,12 @@ import { selectAbout } from '../../../../state/about/about.selectors';
@Injectable()
export class FlowConfigurationHistoryListingEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog,
- private historyService: FlowConfigurationHistoryService,
- private router: Router
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
+ private historyService = inject(FlowConfigurationHistoryService);
+ private router = inject(Router);
loadHistory$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.ts
index eec4fdac04..3f7266f933 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/action-details/action-details.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import {
@@ -38,9 +38,7 @@ import { MatButtonModule } from '@angular/material/button';
styleUrls: ['./action-details.component.scss']
})
export class ActionDetails extends CloseOnEscapeDialog {
- constructor(@Inject(MAT_DIALOG_DATA) public actionEntity: ActionEntity) {
- super();
- }
+ actionEntity = inject<ActionEntity>(MAT_DIALOG_DATA);
isRemoteProcessGroup(action: Action): boolean {
return action.sourceType === 'RemoteProcessGroup';
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.ts
index e8f010ce2b..c125c9f69c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.ts
@@ -72,6 +72,10 @@ interface FilterableColumn {
styleUrls: ['./flow-configuration-history-listing.component.scss']
})
export class FlowConfigurationHistoryListing implements OnInit, OnDestroy {
+ private store = inject<Store<FlowConfigurationHistoryListingState>>(Store);
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
private static readonly DEFAULT_START_TIME: string = '00:00:00';
private static readonly DEFAULT_END_TIME: string = '23:59:59';
private static readonly TIME_REGEX = /^([0-1]\d|2[0-3]):([0-5]\d):([0-5]\d)$/;
@@ -97,11 +101,7 @@ export class FlowConfigurationHistoryListing implements OnInit, OnDestroy {
{ key: 'userIdentity', label: 'user' }
];
- constructor(
- private store: Store<FlowConfigurationHistoryListingState>,
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
this.queryRequest$
.pipe(takeUntilDestroyed(), isDefinedAndNotNull())
.subscribe((queryRequest) => (this.queryRequest = queryRequest));
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/purge-history/purge-history.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/purge-history/purge-history.component.ts
index 20b63b6d17..6e2e6a8274 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/purge-history/purge-history.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/purge-history/purge-history.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Output } from '@angular/core';
+import { Component, EventEmitter, Output, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MatDialogModule } from '@angular/material/dialog';
import { MatButtonModule } from '@angular/material/button';
@@ -47,6 +47,10 @@ import { MatRadioButton, MatRadioGroup } from '@angular/material/radio';
styleUrls: ['./purge-history.component.scss']
})
export class PurgeHistory extends CloseOnEscapeDialog {
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+ private store = inject<Store<FlowConfigurationHistoryListingState>>(Store);
+
private static readonly DEFAULT_PURGE_TIME: string = '00:00:00';
private static readonly TIME_REGEX = /^([0-1]\d|2[0-3]):([0-5]\d):([0-5]\d)$/;
purgeHistoryForm: FormGroup;
@@ -55,11 +59,7 @@ export class PurgeHistory extends CloseOnEscapeDialog {
@Output() submitPurgeRequest: EventEmitter<PurgeHistoryRequest> = new EventEmitter<PurgeHistoryRequest>();
- constructor(
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon,
- private store: Store<FlowConfigurationHistoryListingState>
- ) {
+ constructor() {
super();
const now: Date = new Date();
const aMonthAgo: Date = new Date();
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/feature/flow-designer.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/feature/flow-designer.component.ts
index 6f628a1b35..de258f9464 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/feature/flow-designer.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/feature/flow-designer.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { loadExtensionTypesForCanvas } from '../../../state/extension-types/extension-types.actions';
import { NiFiState } from '../../../state';
@@ -27,7 +27,7 @@ import { NiFiState } from '../../../state';
standalone: false
})
export class FlowDesigner implements OnInit {
- constructor(private store: Store<NiFiState>) {}
+ private store = inject<Store<NiFiState>>(Store);
ngOnInit(): void {
this.store.dispatch(loadExtensionTypesForCanvas());
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/connectable-behavior.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/connectable-behavior.service.ts
index 78742260b2..d76d65eca5 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/connectable-behavior.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/connectable-behavior.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import * as d3 from 'd3';
import { CanvasUtils } from '../canvas-utils.service';
import { Store } from '@ngrx/store';
@@ -30,14 +30,14 @@ import { NiFiCommon } from '@nifi/shared';
providedIn: 'root'
})
export class ConnectableBehavior {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private nifiCommon = inject(NiFiCommon);
+
private readonly connect: any;
private origin: any;
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
const self: ConnectableBehavior = this;
// dragging behavior for the connector
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts
index 4e7b254895..aa19a66ac6 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import * as d3 from 'd3';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../state';
@@ -34,6 +34,11 @@ import { ClusterConnectionService } from '../../../../service/cluster-connection
providedIn: 'root'
})
export class DraggableBehavior {
+ private store = inject<Store<CanvasState>>(Store);
+ private client = inject(Client);
+ private canvasUtils = inject(CanvasUtils);
+ private clusterConnectionService = inject(ClusterConnectionService);
+
private readonly drag: any;
private snapEnabled = false;
private snapAlignmentPixels = 8;
@@ -42,12 +47,7 @@ export class DraggableBehavior {
private updatePositionRequestId = 0;
- constructor(
- private store: Store<CanvasState>,
- private client: Client,
- private canvasUtils: CanvasUtils,
- private clusterConnectionService: ClusterConnectionService
- ) {
+ constructor() {
const self: DraggableBehavior = this;
// subscribe to scale updates
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/editable-behavior.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/editable-behavior.service.ts
index c18746c8a4..2b2e8800c4 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/editable-behavior.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/editable-behavior.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { DraggableBehavior } from './draggable-behavior.service';
import { CanvasUtils } from '../canvas-utils.service';
import { ConnectableBehavior } from './connectable-behavior.service';
@@ -24,11 +24,9 @@ import { ConnectableBehavior } from './connectable-behavior.service';
providedIn: 'root'
})
export class EditableBehavior {
- constructor(
- private draggableBehavior: DraggableBehavior,
- private connectableBehavior: ConnectableBehavior,
- private canvasUtils: CanvasUtils
- ) {}
+ private draggableBehavior = inject(DraggableBehavior);
+ private connectableBehavior = inject(ConnectableBehavior);
+ private canvasUtils = inject(CanvasUtils);
public editable(selection: any): void {
if (this.canvasUtils.canModify(selection)) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/position-behavior.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/position-behavior.service.ts
index 2c3cc58af7..cce1ec60dd 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/position-behavior.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/position-behavior.service.ts
@@ -15,12 +15,12 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { TransitionBehavior } from './transition-behavior.service';
@Injectable({ providedIn: 'root' })
export class PositionBehavior {
- constructor(private transitionBehavior: TransitionBehavior) {}
+ private transitionBehavior = inject(TransitionBehavior);
public position(updated: any, transition: boolean): any {
if (updated.empty()) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/quick-select-behavior.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/quick-select-behavior.service.ts
index 225963e88f..9a0f1d0d93 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/quick-select-behavior.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/quick-select-behavior.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { CanvasUtils } from '../canvas-utils.service';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../state';
@@ -25,10 +25,8 @@ import { navigateToEditComponent } from '../../state/flow/flow.actions';
providedIn: 'root'
})
export class QuickSelectBehavior {
- constructor(
- private canvasUtils: CanvasUtils,
- private store: Store<CanvasState>
- ) {}
+ private canvasUtils = inject(CanvasUtils);
+ private store = inject<Store<CanvasState>>(Store);
/**
* Attempts to show configuration or details dialog for the specified slection.
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/selectable-behavior.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/selectable-behavior.service.ts
index f37783f187..07e5d7b734 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/selectable-behavior.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/behavior/selectable-behavior.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import * as d3 from 'd3';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../state';
@@ -26,7 +26,7 @@ import { SelectedComponent } from '../../state/flow';
providedIn: 'root'
})
export class SelectableBehavior {
- constructor(private store: Store<CanvasState>) {}
+ private store = inject<Store<CanvasState>>(Store);
public select(event: MouseEvent, g: any): void {
const components: SelectedComponent[] = g.data().map(function (d: any) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts
index f27e1219a9..28a6c4f90e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts
@@ -39,6 +39,17 @@ import { ComponentEntityWithDimensions } from '../state/flow';
providedIn: 'root'
})
export class BirdseyeView {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasView = inject(CanvasView);
+ private nifiCommon = inject(NiFiCommon);
+ private canvasUtils = inject(CanvasUtils);
+ private processorManager = inject(ProcessorManager);
+ private processGroupManager = inject(ProcessGroupManager);
+ private remoteProcessGroupManager = inject(RemoteProcessGroupManager);
+ private portManager = inject(PortManager);
+ private funnelManager = inject(FunnelManager);
+ private labelManager = inject(LabelManager);
+
private destroyRef = inject(DestroyRef);
private birdseyeGroup: any = null;
@@ -51,18 +62,7 @@ export class BirdseyeView {
private initialized = false;
- constructor(
- private store: Store<CanvasState>,
- private canvasView: CanvasView,
- private nifiCommon: NiFiCommon,
- private canvasUtils: CanvasUtils,
- private processorManager: ProcessorManager,
- private processGroupManager: ProcessGroupManager,
- private remoteProcessGroupManager: RemoteProcessGroupManager,
- private portManager: PortManager,
- private funnelManager: FunnelManager,
- private labelManager: LabelManager
- ) {
+ constructor() {
this.store
.select(selectTransform)
.pipe(takeUntilDestroyed(this.destroyRef))
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-actions.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-actions.service.ts
index 6dce407f6f..370a387b0f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-actions.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-actions.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { CanvasUtils } from './canvas-utils.service';
import {
copySuccess,
@@ -77,6 +77,13 @@ export interface CanvasActions {
providedIn: 'root'
})
export class CanvasActionsService {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private canvasView = inject(CanvasView);
+ private dialog = inject(MatDialog);
+ private client = inject(Client);
+ private copyService = inject(CopyPasteService);
+
private _actions: CanvasActions = {
delete: {
id: 'delete',
@@ -533,15 +540,6 @@ export class CanvasActionsService {
currentProcessGroupId = this.store.selectSignal(selectCurrentProcessGroupId);
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private canvasView: CanvasView,
- private dialog: MatDialog,
- private client: Client,
- private copyService: CopyPasteService
- ) {}
-
private select(selection: d3.Selection<any, any, any, any>) {
const selectedComponents: SelectedComponent[] = [];
if (selection) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
index 13ae7a098a..80bfeaaa7a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { CanvasUtils } from './canvas-utils.service';
import { Store } from '@ngrx/store';
import { CanvasState } from '../state';
@@ -76,6 +76,13 @@ import { BackNavigation } from '../../../state/navigation';
@Injectable({ providedIn: 'root' })
export class CanvasContextMenu implements ContextMenuDefinitionProvider {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private client = inject(Client);
+ private canvasView = inject(CanvasView);
+ private canvasActionsService = inject(CanvasActionsService);
+ private draggableBehavior = inject(DraggableBehavior);
+
private updatePositionRequestId = 0;
readonly VERSION_MENU = {
@@ -1363,14 +1370,7 @@ export class CanvasContextMenu implements ContextMenuDefinitionProvider {
private allMenus: Map<string, ContextMenuDefinition>;
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private client: Client,
- private canvasView: CanvasView,
- private canvasActionsService: CanvasActionsService,
- private draggableBehavior: DraggableBehavior
- ) {
+ constructor() {
this.allMenus = new Map<string, ContextMenuDefinition>();
this.allMenus.set(this.ROOT_MENU.id, this.ROOT_MENU);
this.allMenus.set(this.PROVENANCE_REPLAY.id, this.PROVENANCE_REPLAY);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
index fcd3cba00d..f0feda136c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts
@@ -49,6 +49,10 @@ import { selectScale } from '../state/transform/transform.selectors';
providedIn: 'root'
})
export class CanvasUtils {
+ private store = inject<Store<CanvasState>>(Store);
+ private nifiCommon = inject(NiFiCommon);
+ private overlay = inject(Overlay);
+
private static readonly TWO_PI: number = 2 * Math.PI;
private destroyRef = inject(DestroyRef);
@@ -68,11 +72,7 @@ export class CanvasUtils {
private readonly humanizeDuration: Humanizer;
- constructor(
- private store: Store<CanvasState>,
- private nifiCommon: NiFiCommon,
- private overlay: Overlay
- ) {
+ constructor() {
this.humanizeDuration = humanizer();
this.store
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
index ed5d05d5ee..70b0ae5b18 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import * as d3 from 'd3';
import { Store } from '@ngrx/store';
import { CanvasState } from '../state';
@@ -36,6 +36,16 @@ import { Position } from '../state/shared';
providedIn: 'root'
})
export class CanvasView {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private processorManager = inject(ProcessorManager);
+ private processGroupManager = inject(ProcessGroupManager);
+ private remoteProcessGroupManager = inject(RemoteProcessGroupManager);
+ private portManager = inject(PortManager);
+ private funnelManager = inject(FunnelManager);
+ private labelManager = inject(LabelManager);
+ private connectionManager = inject(ConnectionManager);
+
private static readonly INCREMENT: number = 1.2;
private static readonly MAX_SCALE: number = 8;
private static readonly MIN_SCALE: number = 0.2;
@@ -55,17 +65,7 @@ export class CanvasView {
private canvasInitialized: boolean = false;
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private processorManager: ProcessorManager,
- private processGroupManager: ProcessGroupManager,
- private remoteProcessGroupManager: RemoteProcessGroupManager,
- private portManager: PortManager,
- private funnelManager: FunnelManager,
- private labelManager: LabelManager,
- private connectionManager: ConnectionManager
- ) {
+ constructor() {
const self: CanvasView = this;
let refreshed: Promise<void> | null;
let panning = false;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/controller-service.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/controller-service.service.ts
index 54db5259c0..c5188a69e0 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/controller-service.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/controller-service.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { EMPTY, Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Client } from '../../../service/client.service';
@@ -31,14 +31,12 @@ import { ClusterConnectionService } from '../../../service/cluster-connection.se
@Injectable({ providedIn: 'root' })
export class ControllerServiceService implements ControllerServiceCreator, PropertyDescriptorRetriever {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getControllerServices(processGroupId: string): Observable<any> {
const uiOnly: any = { uiOnly: true };
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/copy-paste.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/copy-paste.service.ts
index ae28d6c03d..379f43ca75 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/copy-paste.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/copy-paste.service.ts
@@ -17,7 +17,7 @@
* under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Dimensions, PasteRequest, PasteRequestContext, PasteRequestEntity } from '../state/flow';
import { Observable } from 'rxjs';
@@ -34,16 +34,14 @@ import * as d3 from 'd3';
providedIn: 'root'
})
export class CopyPasteService {
+ private httpClient = inject(HttpClient);
+ private clusterConnectionService = inject(ClusterConnectionService);
+ private canvasView = inject(CanvasView);
+ private store = inject<Store<NiFiState>>(Store);
+
private static readonly API: string = '../nifi-api';
currentProcessGroupId = this.store.selectSignal(selectCurrentProcessGroupId);
- constructor(
- private httpClient: HttpClient,
- private clusterConnectionService: ClusterConnectionService,
- private canvasView: CanvasView,
- private store: Store<NiFiState>
- ) {}
-
copy(copyRequest: CopyRequestContext): Observable<CopyResponseEntity> {
return this.httpClient.post(
`${CopyPasteService.API}/process-groups/${copyRequest.processGroupId}/copy`,
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/flow-analysis.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/flow-analysis.service.ts
index 571d91534f..6a76adfed5 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/flow-analysis.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/flow-analysis.service.ts
@@ -16,16 +16,16 @@
*/
import { HttpClient } from '@angular/common/http';
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
@Injectable({
providedIn: 'root'
})
export class FlowAnalysisService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getResults(processGroupId: string): Observable<any> {
return this.httpClient.get(`${FlowAnalysisService.API}/flow/flow-analysis/results/${processGroupId}`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/flow.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/flow.service.ts
index 05e94729f7..8a98836064 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/flow.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/flow.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import {
@@ -59,14 +59,12 @@ import { PropertyDescriptorRetriever } from '../../../state/shared';
@Injectable({ providedIn: 'root' })
export class FlowService implements PropertyDescriptorRetriever {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getFlow(processGroupId = 'root'): Observable<any> {
const uiOnly: any = { uiOnly: true };
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manage-remote-port.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manage-remote-port.service.ts
index 5e14820da4..d8402bfa47 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manage-remote-port.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manage-remote-port.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import { ComponentType, NiFiCommon } from '@nifi/shared';
@@ -24,13 +24,11 @@ import { Client } from '../../../service/client.service';
@Injectable({ providedIn: 'root' })
export class ManageRemotePortService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon
- ) {}
+ private static readonly API: string = '../nifi-api';
getRemotePorts(rpgId: string): Observable<any> {
return this.httpClient.get(`${ManageRemotePortService.API}/remote-process-groups/${rpgId}`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/connection-manager.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/connection-manager.service.ts
index f82d74dc6b..e32ea34440 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/connection-manager.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/connection-manager.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../state';
import { CanvasUtils } from '../canvas-utils.service';
@@ -56,6 +56,15 @@ export class ConnectionRenderOptions {
providedIn: 'root'
})
export class ConnectionManager implements OnDestroy {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private nifiCommon = inject(NiFiCommon);
+ private client = inject(Client);
+ private selectableBehavior = inject(SelectableBehavior);
+ private transitionBehavior = inject(TransitionBehavior);
+ private quickSelectBehavior = inject(QuickSelectBehavior);
+ private clusterConnectionService = inject(ClusterConnectionService);
+
private destroyed$: Subject<boolean> = new Subject();
private static readonly DIMENSIONS: Dimension = {
@@ -91,16 +100,7 @@ export class ConnectionManager implements OnDestroy {
private snapEnabled = true;
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private nifiCommon: NiFiCommon,
- private client: Client,
- private selectableBehavior: SelectableBehavior,
- private transitionBehavior: TransitionBehavior,
- private quickSelectBehavior: QuickSelectBehavior,
- private clusterConnectionService: ClusterConnectionService
- ) {
+ constructor() {
const self: ConnectionManager = this;
// define the line generator
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/funnel-manager.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/funnel-manager.service.ts
index 55b2b870ec..d0fa21b9df 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/funnel-manager.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/funnel-manager.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
import * as d3 from 'd3';
import { PositionBehavior } from '../behavior/position-behavior.service';
import { CanvasState } from '../../state';
@@ -34,6 +34,11 @@ import { filter, Subject, switchMap, takeUntil } from 'rxjs';
@Injectable({ providedIn: 'root' })
export class FunnelManager implements OnDestroy {
+ private store = inject<Store<CanvasState>>(Store);
+ private positionBehavior = inject(PositionBehavior);
+ private selectableBehavior = inject(SelectableBehavior);
+ private editableBehavior = inject(EditableBehavior);
+
private destroyed$: Subject<boolean> = new Subject();
private dimensions: Dimension = {
@@ -45,13 +50,6 @@ export class FunnelManager implements OnDestroy {
private funnelContainer: any = null;
private transitionRequired = false;
- constructor(
- private store: Store<CanvasState>,
- private positionBehavior: PositionBehavior,
- private selectableBehavior: SelectableBehavior,
- private editableBehavior: EditableBehavior
- ) {}
-
private select() {
return this.funnelContainer.selectAll('g.funnel').data(this.funnels, function (d: any) {
return d.id;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/label-manager.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/label-manager.service.ts
index d0e4c747c3..c9b97ecc4b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/label-manager.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/label-manager.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../state';
import { CanvasUtils } from '../canvas-utils.service';
@@ -41,6 +41,16 @@ import { ClusterConnectionService } from '../../../../service/cluster-connection
providedIn: 'root'
})
export class LabelManager implements OnDestroy {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private nifiCommon = inject(NiFiCommon);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
+ private positionBehavior = inject(PositionBehavior);
+ private selectableBehavior = inject(SelectableBehavior);
+ private quickSelectBehavior = inject(QuickSelectBehavior);
+ private editableBehavior = inject(EditableBehavior);
+
private destroyed$: Subject<boolean> = new Subject();
public static readonly INITIAL_WIDTH: number = 148;
@@ -56,17 +66,7 @@ export class LabelManager implements OnDestroy {
private labelPointDrag: any;
private snapEnabled = true;
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private nifiCommon: NiFiCommon,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService,
- private positionBehavior: PositionBehavior,
- private selectableBehavior: SelectableBehavior,
- private quickSelectBehavior: QuickSelectBehavior,
- private editableBehavior: EditableBehavior
- ) {
+ constructor() {
const self: LabelManager = this;
// handle bend point drag events
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts
index f5f0e63787..57e3cdb51b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
import { CanvasState } from '../../state';
import { Store } from '@ngrx/store';
import { CanvasUtils } from '../canvas-utils.service';
@@ -40,6 +40,14 @@ import { renderConnectionsForComponent } from '../../state/flow/flow.actions';
providedIn: 'root'
})
export class PortManager implements OnDestroy {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private nifiCommon = inject(NiFiCommon);
+ private positionBehavior = inject(PositionBehavior);
+ private selectableBehavior = inject(SelectableBehavior);
+ private quickSelectBehavior = inject(QuickSelectBehavior);
+ private editableBehavior = inject(EditableBehavior);
+
private destroyed$: Subject<boolean> = new Subject();
private portDimensions: Dimension = {
@@ -58,16 +66,6 @@ export class PortManager implements OnDestroy {
private portContainer: any = null;
private transitionRequired = false;
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private nifiCommon: NiFiCommon,
- private positionBehavior: PositionBehavior,
- private selectableBehavior: SelectableBehavior,
- private quickSelectBehavior: QuickSelectBehavior,
- private editableBehavior: EditableBehavior
- ) {}
-
private dimensions(d: any): Dimension {
return d.allowRemoteAccess === true ? this.remotePortDimensions : this.portDimensions;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/process-group-manager.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/process-group-manager.service.ts
index ac0a748022..08be36be1f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/process-group-manager.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/process-group-manager.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
import { CanvasState } from '../../state';
import { Store } from '@ngrx/store';
import { PositionBehavior } from '../behavior/position-behavior.service';
@@ -40,6 +40,13 @@ import { ComponentType, NiFiCommon, TextTip } from '@nifi/shared';
providedIn: 'root'
})
export class ProcessGroupManager implements OnDestroy {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private nifiCommon = inject(NiFiCommon);
+ private positionBehavior = inject(PositionBehavior);
+ private selectableBehavior = inject(SelectableBehavior);
+ private editableBehavior = inject(EditableBehavior);
+
private destroyed$: Subject<boolean> = new Subject();
private registryClients = this.store.selectSignal(selectRegistryClients);
@@ -57,15 +64,6 @@ export class ProcessGroupManager implements OnDestroy {
private processGroupContainer: any = null;
private transitionRequired = false;
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private nifiCommon: NiFiCommon,
- private positionBehavior: PositionBehavior,
- private selectableBehavior: SelectableBehavior,
- private editableBehavior: EditableBehavior
- ) {}
-
private select() {
return this.processGroupContainer.selectAll('g.process-group').data(this.processGroups, function (d: any) {
return d.id;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
index 2f4a71002a..b07d23bb59 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../state';
import { CanvasUtils } from '../canvas-utils.service';
@@ -39,6 +39,14 @@ import { filter, Subject, switchMap, takeUntil } from 'rxjs';
providedIn: 'root'
})
export class ProcessorManager implements OnDestroy {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private nifiCommon = inject(NiFiCommon);
+ private positionBehavior = inject(PositionBehavior);
+ private selectableBehavior = inject(SelectableBehavior);
+ private quickSelectBehavior = inject(QuickSelectBehavior);
+ private editableBehavior = inject(EditableBehavior);
+
private destroyed$: Subject<boolean> = new Subject();
private dimensions: Dimension = {
@@ -52,16 +60,6 @@ export class ProcessorManager implements OnDestroy {
private processorContainer: any = null;
private transitionRequired = false;
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private nifiCommon: NiFiCommon,
- private positionBehavior: PositionBehavior,
- private selectableBehavior: SelectableBehavior,
- private quickSelectBehavior: QuickSelectBehavior,
- private editableBehavior: EditableBehavior
- ) {}
-
private select() {
return this.processorContainer.selectAll('g.processor').data(this.processors, function (d: any) {
return d.id;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/remote-process-group-manager.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/remote-process-group-manager.service.ts
index c4e1df26e3..9d1e2fbef1 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/remote-process-group-manager.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/manager/remote-process-group-manager.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable, OnDestroy } from '@angular/core';
+import { Injectable, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../state';
import { CanvasUtils } from '../canvas-utils.service';
@@ -39,6 +39,14 @@ import { ComponentType, NiFiCommon, TextTip } from '@nifi/shared';
providedIn: 'root'
})
export class RemoteProcessGroupManager implements OnDestroy {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private nifiCommon = inject(NiFiCommon);
+ private positionBehavior = inject(PositionBehavior);
+ private selectableBehavior = inject(SelectableBehavior);
+ private quickSelectBehavior = inject(QuickSelectBehavior);
+ private editableBehavior = inject(EditableBehavior);
+
private destroyed$: Subject<boolean> = new Subject();
private dimensions: Dimension = {
@@ -52,16 +60,6 @@ export class RemoteProcessGroupManager implements OnDestroy {
private remoteProcessGroupContainer: any = null;
private transitionRequired = false;
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private nifiCommon: NiFiCommon,
- private positionBehavior: PositionBehavior,
- private selectableBehavior: SelectableBehavior,
- private quickSelectBehavior: QuickSelectBehavior,
- private editableBehavior: EditableBehavior
- ) {}
-
private select() {
return this.remoteProcessGroupContainer
.selectAll('g.remote-process-group')
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/parameter-helper.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/parameter-helper.service.ts
index 804c3cae03..14ef171f04 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/parameter-helper.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/parameter-helper.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { catchError, EMPTY, filter, map, Observable, switchMap, takeUntil, tap } from 'rxjs';
import { Store } from '@ngrx/store';
@@ -42,14 +42,12 @@ export interface ConvertToParameterResponse {
providedIn: 'root'
})
export class ParameterHelperService {
- constructor(
- private dialog: MatDialog,
- private store: Store<NiFiState>,
- private parameterContextService: ParameterContextService,
- private clusterConnectionService: ClusterConnectionService,
- private client: Client,
- private errorHelper: ErrorHelper
- ) {}
+ private dialog = inject(MatDialog);
+ private store = inject<Store<NiFiState>>(Store);
+ private parameterContextService = inject(ParameterContextService);
+ private clusterConnectionService = inject(ClusterConnectionService);
+ private client = inject(Client);
+ private errorHelper = inject(ErrorHelper);
/**
* Returns a function that can be used to pass into a PropertyTable to convert a Property into a Parameter, inline.
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/parameter.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/parameter.service.ts
index fcc82e8574..860797bbda 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/parameter.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/parameter.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { NiFiCommon } from '@nifi/shared';
@@ -24,13 +24,11 @@ import { ClusterConnectionService } from '../../../service/cluster-connection.se
@Injectable({ providedIn: 'root' })
export class ParameterService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getParameterContext(id: string, includeInheritedParameters: boolean): Observable<any> {
return this.httpClient.get(`${ParameterService.API}/parameter-contexts/${id}`, {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/queue.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/queue.service.ts
index bcb0fae850..6727aff15d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/queue.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/queue.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import { NiFiCommon } from '@nifi/shared';
@@ -23,12 +23,10 @@ import { DropRequest, SubmitEmptyQueueRequest, SubmitEmptyQueuesRequest } from '
@Injectable({ providedIn: 'root' })
export class QueueService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private nifiCommon = inject(NiFiCommon);
- constructor(
- private httpClient: HttpClient,
- private nifiCommon: NiFiCommon
- ) {}
+ private static readonly API: string = '../nifi-api';
submitEmptyQueueRequest(emptyQueueRequest: SubmitEmptyQueueRequest): Observable<any> {
return this.httpClient.post(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/registry.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/registry.service.ts
index 50bea55535..d27bd40861 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/registry.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/registry.service.ts
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { ImportFromRegistryRequest } from '../state/flow';
@Injectable({ providedIn: 'root' })
export class RegistryService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getRegistryClients(): Observable<any> {
return this.httpClient.get(`${RegistryService.API}/flow/registries`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/search.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/search.service.ts
index a962d45c31..4fe6db54d6 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/search.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/search.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
@@ -54,9 +54,9 @@ export interface SearchResultsEntity {
@Injectable({ providedIn: 'root' })
export class SearchService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
search(query: string, processGroupId: string): Observable<SearchResultsEntity> {
return this.httpClient.get<SearchResultsEntity>(`${SearchService.API}/flow/search-results`, {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/snippet.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/snippet.service.ts
index 9a4a6d5a35..5debb708d5 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/snippet.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/snippet.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Snippet, SnippetComponentRequest } from '../state/flow';
@@ -25,13 +25,11 @@ import { Client } from '../../../service/client.service';
@Injectable({ providedIn: 'root' })
export class SnippetService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
marshalSnippet(components: SnippetComponentRequest[], processGroupId: string): Snippet {
return components.reduce(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
index 8384d38831..c2a047d1c1 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as ControllerServicesActions from './controller-services.actions';
@@ -70,20 +70,18 @@ import { ParameterContextService } from '../../../parameter-contexts/service/par
@Injectable()
export class ControllerServicesEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private storage: Storage,
- private client: Client,
- private controllerServiceService: ControllerServiceService,
- private parameterContextService: ParameterContextService,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog,
- private router: Router,
- private propertyTableHelperService: PropertyTableHelperService,
- private parameterHelperService: ParameterHelperService,
- private extensionTypesService: ExtensionTypesService
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private storage = inject(Storage);
+ private client = inject(Client);
+ private controllerServiceService = inject(ControllerServiceService);
+ private parameterContextService = inject(ParameterContextService);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
+ private router = inject(Router);
+ private propertyTableHelperService = inject(PropertyTableHelperService);
+ private parameterHelperService = inject(ParameterHelperService);
+ private extensionTypesService = inject(ExtensionTypesService);
loadControllerServices$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/flow-analysis/flow-analysis.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/flow-analysis/flow-analysis.effects.ts
index c8b808d17e..79fbf0dc19 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/flow-analysis/flow-analysis.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/flow-analysis/flow-analysis.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import { NiFiState } from '../../../../state';
@@ -33,14 +33,12 @@ import { ViolationDetailsDialogComponent } from '../../ui/canvas/header/flow-ana
@Injectable()
export class FlowAnalysisEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private flowAnalysisService: FlowAnalysisService,
- private errorHelper: ErrorHelper,
- private router: Router,
- private dialog: MatDialog
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private flowAnalysisService = inject(FlowAnalysisService);
+ private errorHelper = inject(ErrorHelper);
+ private router = inject(Router);
+ private dialog = inject(MatDialog);
startPollingFlowAnalysis$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
index c62d0caf4b..74f7d049cb 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts
@@ -180,34 +180,34 @@ import { ParameterContextService } from '../../../parameter-contexts/service/par
@Injectable()
export class FlowEffects {
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private storage = inject(Storage);
+ private flowService = inject(FlowService);
+ private controllerServiceService = inject(ControllerServiceService);
+ private registryService = inject(RegistryService);
+ private client = inject(Client);
+ private canvasUtils = inject(CanvasUtils);
+ private canvasView = inject(CanvasView);
+ private birdseyeView = inject(BirdseyeView);
+ private connectionManager = inject(ConnectionManager);
+ private clusterConnectionService = inject(ClusterConnectionService);
+ private snippetService = inject(SnippetService);
+ private router = inject(Router);
+ private dialog = inject(MatDialog);
+ private propertyTableHelperService = inject(PropertyTableHelperService);
+ private parameterHelperService = inject(ParameterHelperService);
+ private parameterContextService = inject(ParameterContextService);
+ private extensionTypesService = inject(ExtensionTypesService);
+ private errorHelper = inject(ErrorHelper);
+ private copyPasteService = inject(CopyPasteService);
+
private createProcessGroupDialogRef: MatDialogRef<CreateProcessGroup, any> | undefined;
private editProcessGroupDialogRef: MatDialogRef<EditProcessGroup, any> | undefined;
private destroyRef = inject(DestroyRef);
private lastReload: number = 0;
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private storage: Storage,
- private flowService: FlowService,
- private controllerServiceService: ControllerServiceService,
- private registryService: RegistryService,
- private client: Client,
- private canvasUtils: CanvasUtils,
- private canvasView: CanvasView,
- private birdseyeView: BirdseyeView,
- private connectionManager: ConnectionManager,
- private clusterConnectionService: ClusterConnectionService,
- private snippetService: SnippetService,
- private router: Router,
- private dialog: MatDialog,
- private propertyTableHelperService: PropertyTableHelperService,
- private parameterHelperService: ParameterHelperService,
- private parameterContextService: ParameterContextService,
- private extensionTypesService: ExtensionTypesService,
- private errorHelper: ErrorHelper,
- private copyPasteService: CopyPasteService
- ) {
+ constructor() {
this.store
.select(selectDocumentVisibilityState)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts
index d72dad83c1..963ad1d665 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/manage-remote-ports/manage-remote-ports.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as ManageRemotePortsActions from './manage-remote-ports.actions';
@@ -40,15 +40,13 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class ManageRemotePortsEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private manageRemotePortService: ManageRemotePortService,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog,
- private router: Router,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private manageRemotePortService = inject(ManageRemotePortService);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
+ private router = inject(Router);
+ private clusterConnectionService = inject(ClusterConnectionService);
loadRemotePorts$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts
index 18fa722a8a..48f5a2413f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as ParameterActions from './parameter.actions';
@@ -50,17 +50,15 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class ParameterEffects {
- private parameterContextDialogRef: MatDialogRef<EditParameterContext, any> | undefined;
+ private actions$ = inject(Actions);
+ private store = inject<Store<CanvasState>>(Store);
+ private parameterService = inject(ParameterService);
+ private parameterContextService = inject(ParameterContextService);
+ private errorHelper = inject(ErrorHelper);
+ private storage = inject(Storage);
+ private dialog = inject(MatDialog);
- constructor(
- private actions$: Actions,
- private store: Store<CanvasState>,
- private parameterService: ParameterService,
- private parameterContextService: ParameterContextService,
- private errorHelper: ErrorHelper,
- private storage: Storage,
- private dialog: MatDialog
- ) {}
+ private parameterContextDialogRef: MatDialogRef<EditParameterContext, any> | undefined;
submitParameterContextUpdateRequest$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts
index 8fceaf2d60..d260d3b125 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as QueueActions from './queue.actions';
@@ -37,13 +37,11 @@ import { selectCurrentProcessGroupId } from '../flow/flow.selectors';
@Injectable()
export class QueueEffects {
- constructor(
- private actions$: Actions,
- private store: Store<CanvasState>,
- private queueService: QueueService,
- private dialog: MatDialog,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<CanvasState>>(Store);
+ private queueService = inject(QueueService);
+ private dialog = inject(MatDialog);
+ private errorHelper = inject(ErrorHelper);
promptEmptyQueueRequest$ = createEffect(
() =>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/transform/transform.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/transform/transform.effects.ts
index 1b954cff56..fe0d08195c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/transform/transform.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/transform/transform.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as TransformActions from './transform.actions';
@@ -36,16 +36,14 @@ interface StorageTransform {
@Injectable()
export class TransformEffects {
- private static readonly VIEW_PREFIX: string = 'nifi-view-';
+ private actions$ = inject(Actions);
+ private store = inject<Store<CanvasState>>(Store);
+ private storage = inject(Storage);
+ private canvasView = inject(CanvasView);
+ private birdseyeView = inject(BirdseyeView);
+ private labelManager = inject(LabelManager);
- constructor(
- private actions$: Actions,
- private store: Store<CanvasState>,
- private storage: Storage,
- private canvasView: CanvasView,
- private birdseyeView: BirdseyeView,
- private labelManager: LabelManager
- ) {}
+ private static readonly VIEW_PREFIX: string = 'nifi-view-';
transformComplete$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
index 0272a925e9..fbd875c5ae 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, HostListener, OnDestroy, OnInit } from '@angular/core';
+import { Component, HostListener, OnDestroy, OnInit, inject } from '@angular/core';
import { CanvasState } from '../../state';
import { Position } from '../../state/shared';
import { Store } from '@ngrx/store';
@@ -81,6 +81,15 @@ import { snackBarError } from '../../../../state/error/error.actions';
standalone: false
})
export class Canvas implements OnInit, OnDestroy {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasView = inject(CanvasView);
+ private storage = inject(Storage);
+ private canvasUtils = inject(CanvasUtils);
+ canvasContextMenu = inject(CanvasContextMenu);
+ private canvasActionsService = inject(CanvasActionsService);
+ private dialog = inject(MatDialog);
+ nifiCommon = inject(NiFiCommon);
+
private svg: any;
private canvas: any;
@@ -89,16 +98,7 @@ export class Canvas implements OnInit, OnDestroy {
flowAnalysisOpen = this.store.selectSignal(selectFlowAnalysisOpen);
- constructor(
- private store: Store<CanvasState>,
- private canvasView: CanvasView,
- private storage: Storage,
- private canvasUtils: CanvasUtils,
- public canvasContextMenu: CanvasContextMenu,
- private canvasActionsService: CanvasActionsService,
- private dialog: MatDialog,
- public nifiCommon: NiFiCommon
- ) {
+ constructor() {
this.store
.select(selectTransform)
.pipe(takeUntilDestroyed())
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.ts
index ce8f3b5428..c71f5cab55 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/change-color-dialog/change-color-dialog.component.ts
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Output } from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { Component, EventEmitter, Output, inject } from '@angular/core';
+
import {
MAT_DIALOG_DATA,
MatDialogActions,
@@ -36,7 +36,6 @@ import { MatCheckbox } from '@angular/material/checkbox';
@Component({
selector: 'change-component-dialog',
imports: [
- CommonModule,
MatDialogTitle,
ReactiveFormsModule,
MatDialogContent,
@@ -52,6 +51,11 @@ import { MatCheckbox } from '@angular/material/checkbox';
styleUrl: './change-color-dialog.component.scss'
})
export class ChangeColorDialog extends CloseOnEscapeDialog {
+ private data = inject(MAT_DIALOG_DATA);
+ private canvasUtils = inject(CanvasUtils);
+ private nifiCommon = inject(NiFiCommon);
+ private formBuilder = inject(FormBuilder);
+
color: string | null = null;
noColor: boolean = true;
contrastColor: string | null = null;
@@ -62,13 +66,11 @@ export class ChangeColorDialog extends CloseOnEscapeDialog {
@Output() changeColor = new EventEmitter<ChangeColorRequest[]>();
- constructor(
- @Inject(MAT_DIALOG_DATA) private data: ChangeColorRequest[],
- private canvasUtils: CanvasUtils,
- private nifiCommon: NiFiCommon,
- private formBuilder: FormBuilder
- ) {
+ constructor() {
super();
+ const data = this.data;
+ const formBuilder = this.formBuilder;
+
this._data = data;
let isDefaultColor = true;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/footer/footer.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/footer/footer.component.ts
index 8a0f85c630..9dcfeb690c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/footer/footer.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/footer/footer.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { selectBreadcrumbs, selectCurrentProcessGroupId } from '../../../state/flow/flow.selectors';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../../state';
@@ -29,8 +29,8 @@ import { AsyncPipe } from '@angular/common';
styleUrls: ['./footer.component.scss']
})
export class FooterComponent {
+ private store = inject<Store<CanvasState>>(Store);
+
breadcrumbs$ = this.store.select(selectBreadcrumbs);
currentProcessGroupId$ = this.store.select(selectCurrentProcessGroupId);
-
- constructor(private store: Store<CanvasState>) {}
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.ts
index 4380276022..c462c97ecd 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import {
selectBreadcrumbs,
@@ -34,9 +34,9 @@ import { NiFiState } from '../../../../../state';
styleUrls: ['./graph-controls.component.scss']
})
export class GraphControls {
+ private store = inject<Store<NiFiState>>(Store);
+
navigationCollapsed$ = this.store.select(selectNavigationCollapsed);
operationCollapsed$ = this.store.select(selectOperationCollapsed);
breadcrumbEntity$ = this.store.select(selectBreadcrumbs);
-
- constructor(private store: Store<NiFiState>) {}
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/birdseye/birdseye.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/birdseye/birdseye.component.ts
index 58d4783ed0..071420b426 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/birdseye/birdseye.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/birdseye/birdseye.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { BirdseyeView } from '../../../../../service/birdseye-view.service';
@Component({
@@ -25,7 +25,7 @@ import { BirdseyeView } from '../../../../../service/birdseye-view.service';
styleUrls: ['./birdseye.component.scss']
})
export class Birdseye implements OnInit, OnDestroy {
- constructor(private birdseyeView: BirdseyeView) {}
+ private birdseyeView = inject(BirdseyeView);
ngOnInit(): void {
const birdseye: any = document.getElementById('birdseye');
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.scss b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.scss
index f4bf6bd485..082e201295 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.scss
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.scss
@@ -18,8 +18,8 @@
div.navigation-control {
margin-bottom: 2px;
- --mdc-icon-button-state-layer-size: 34px;
- --mdc-icon-button-icon-size: 17px;
+ --mat-icon-button-state-layer-size: 34px;
+ --mat-icon-button-icon-size: 17px;
.navigation-control-header {
.fa {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.ts
index 3fe10cedb5..aab74e6f9e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/navigation-control/navigation-control.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../../../state';
import { zoomActual, zoomFit, zoomIn, zoomOut } from '../../../../state/transform/transform.actions';
@@ -34,6 +34,10 @@ import { MatButtonModule } from '@angular/material/button';
styleUrls: ['./navigation-control.component.scss']
})
export class NavigationControl {
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private storage = inject(Storage);
+
private static readonly CONTROL_VISIBILITY_KEY: string = 'graph-control-visibility';
private static readonly NAVIGATION_KEY: string = 'navigation-control';
@@ -41,11 +45,7 @@ export class NavigationControl {
navigationCollapsed: boolean = initialState.navigationCollapsed;
- constructor(
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private storage: Storage
- ) {
+ constructor() {
try {
const item: { [key: string]: boolean } | null = this.storage.getItem(
NavigationControl.CONTROL_VISIBILITY_KEY
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.scss b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.scss
index ab6ae7d6d1..3ef2614457 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.scss
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.scss
@@ -18,8 +18,8 @@
div.operation-control {
margin-bottom: 2px;
- --mdc-icon-button-state-layer-size: 34px;
- --mdc-icon-button-icon-size: 17px;
+ --mat-icon-button-state-layer-size: 34px;
+ --mat-icon-button-icon-size: 17px;
.operation-control-header {
.fa {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.ts
index d4a77c8d28..4627f4905f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { setOperationCollapsed } from '../../../../state/flow/flow.actions';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../../../state';
@@ -36,6 +36,13 @@ import { CanvasActionsService } from '../../../../service/canvas-actions.service
styleUrls: ['./operation-control.component.scss']
})
export class OperationControl {
+ private store = inject<Store<CanvasState>>(Store);
+ canvasUtils = inject(CanvasUtils);
+ private canvasView = inject(CanvasView);
+ private client = inject(Client);
+ private storage = inject(Storage);
+ private canvasActionsService = inject(CanvasActionsService);
+
private static readonly CONTROL_VISIBILITY_KEY: string = 'graph-control-visibility';
private static readonly OPERATION_KEY: string = 'operation-control';
@@ -44,14 +51,7 @@ export class OperationControl {
operationCollapsed: boolean = initialState.operationCollapsed;
- constructor(
- private store: Store<CanvasState>,
- public canvasUtils: CanvasUtils,
- private canvasView: CanvasView,
- private client: Client,
- private storage: Storage,
- private canvasActionsService: CanvasActionsService
- ) {
+ constructor() {
try {
const item: { [key: string]: boolean } | null = this.storage.getItem(
OperationControl.CONTROL_VISIBILITY_KEY
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/flow-analysis-drawer.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/flow-analysis-drawer.component.html
index 259660457f..6a44bd57e7 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/flow-analysis-drawer.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/flow-analysis-drawer.component.html
@@ -1,26 +1,26 @@
<!--
- ~ 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.
- -->
+~ 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.
+-->
<div class="flow-analysis-drawer h-full w-96 p-5">
<component-context type="ProcessGroup" [name]="processGroupName" [id]="currentProcessGroupId"></component-context>
<div class="flex items-center w-full">
- <ng-container *ngIf="isAnalysisPending">
+ @if (isAnalysisPending) {
<span *nifiSpinner="isAnalysisPending"></span>
<div class="ml-1">Rules analysis pending...</div>
- </ng-container>
+ }
</div>
<div class="mt-5">
<div class="flex items-center justify-between">
@@ -84,9 +84,13 @@
@for (violation of violationsMap.get(rule.id); track violation.scope) {
<div class="flex align-center justify-between mt-2">
<div class="flex flex-col items-start ml-2">
- <div *ngIf="violation?.subjectPermissionDto?.canRead; else unauthorized">
- {{ violation.subjectDisplayName }}
- </div>
+ @if (violation?.subjectPermissionDto?.canRead) {
+ <div>
+ {{ violation.subjectDisplayName }}
+ </div>
+ } @else {
+ Unauthorized
+ }
<span class="text-sm">
{{ violation.subjectId }}
</span>
@@ -149,10 +153,13 @@
@for (violation of violationsMap.get(rule.id); track violation.scope) {
<li class="flex align-center justify-between mt-2">
<div class="flex flex-col items-start ml-2">
- <div
- *ngIf="violation?.subjectPermissionDto?.canRead; else unauthorized">
- {{ violation.subjectDisplayName }}
- </div>
+ @if (violation?.subjectPermissionDto?.canRead) {
+ <div>
+ {{ violation.subjectDisplayName }}
+ </div>
+ } @else {
+ Unauthorized
+ }
<span class="text-sm">
{{ violation.subjectId }}
</span>
@@ -186,9 +193,13 @@
<div class="error-color">{{ getRuleName(violation.ruleId) }}</div>
<div class="flex align-center justify-between ml-2">
<div class="flex flex-col items-start">
- <div *ngIf="violation?.subjectPermissionDto?.canRead; else unauthorized">
- {{ violation.subjectDisplayName }}
- </div>
+ @if (violation?.subjectPermissionDto?.canRead) {
+ <div>
+ {{ violation.subjectDisplayName }}
+ </div>
+ } @else {
+ Unauthorized
+ }
<span class="text-sm">{{ violation.subjectId }}</span>
</div>
@@ -215,9 +226,13 @@
<div class="error-color">{{ getRuleName(violation.ruleId) }}</div>
<div class="flex align-center justify-between ml-2">
<div class="flex flex-col items-start">
- <div *ngIf="violation?.subjectPermissionDto?.canRead; else unauthorized">
- {{ violation.subjectDisplayName }}
- </div>
+ @if (violation?.subjectPermissionDto?.canRead) {
+ <div>
+ {{ violation.subjectDisplayName }}
+ </div>
+ } @else {
+ Unauthorized
+ }
<span class="text-sm">{{ violation.subjectId }}</span>
</div>
@@ -246,13 +261,10 @@
[disabled]="!violation?.subjectPermissionDto?.canRead">
<i class="fa fa-info-circle mr-2 primary-color"></i>Violation details
</button>
- <button
- mat-menu-item
- [routerLink]="getProcessorLink(violation)"
- *ngIf="violation?.subjectComponentType === 'PROCESSOR' && violation?.subjectPermissionDto?.canRead">
- <i class="fa mr-2 fa-long-arrow-right primary-color"></i>Go to component
- </button>
+ @if (violation?.subjectComponentType === 'PROCESSOR' && violation?.subjectPermissionDto?.canRead) {
+ <button mat-menu-item [routerLink]="getProcessorLink(violation)">
+ <i class="fa mr-2 fa-long-arrow-right primary-color"></i>Go to component
+ </button>
+ }
</mat-menu>
</ng-template>
-
-<ng-template #unauthorized> Unauthorized </ng-template>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/flow-analysis-drawer.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/flow-analysis-drawer.component.ts
index 432d04551b..35061f3522 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/flow-analysis-drawer.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/flow-analysis-drawer.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, model } from '@angular/core';
+import { Component, model, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { Store } from '@ngrx/store';
@@ -57,6 +57,8 @@ import { BreadcrumbEntity } from '../../../../state/shared';
styleUrl: './flow-analysis-drawer.component.scss'
})
export class FlowAnalysisDrawerComponent {
+ private store = inject(Store);
+
violationsMap = new Map();
warningRules: FlowAnalysisRule[] = [];
enforcedRules: FlowAnalysisRule[] = [];
@@ -71,7 +73,7 @@ export class FlowAnalysisDrawerComponent {
currentProcessGroupId$ = this.store.select(selectCurrentProcessGroupId);
processGroupName = '';
- constructor(private store: Store) {
+ constructor() {
this.store.dispatch(startPollingFlowAnalysis());
this.flowAnalysisState$.pipe(takeUntilDestroyed()).subscribe((res) => {
this.clearRulesTracking();
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/violation-details-dialog/violation-details-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/violation-details-dialog/violation-details-dialog.component.ts
index 7f7143df16..1acdcd91ea 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/violation-details-dialog/violation-details-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-analysis-drawer/violation-details-dialog/violation-details-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { FlowAnalysisRule, FlowAnalysisRuleViolation } from '../../../../../state/flow-analysis';
@@ -37,15 +37,17 @@ interface Data {
styleUrl: './violation-details-dialog.component.scss'
})
export class ViolationDetailsDialogComponent {
+ data = inject<Data>(MAT_DIALOG_DATA);
+ private store = inject(Store);
+
violation: FlowAnalysisRuleViolation;
rule: FlowAnalysisRule;
currentProcessGroupId$ = this.store.select(selectCurrentProcessGroupId);
currentProcessGroupId = '';
- constructor(
- @Inject(MAT_DIALOG_DATA) public data: Data,
- private store: Store
- ) {
+ constructor() {
+ const data = this.data;
+
this.violation = data.violation;
this.rule = data.rule;
this.currentProcessGroupId$.subscribe((pgId) => {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.ts
index 7ba32ed2a3..1ff82eb87c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { ControllerStatus } from '../../../../state/flow';
import { initialState } from '../../../../state/flow/flow.reducer';
import { BulletinsTip } from '../../../../../../ui/common/tooltips/bulletins-tip/bulletins-tip.component';
@@ -39,6 +39,10 @@ import { CanvasUtils } from '../../../../service/canvas-utils.service';
styleUrls: ['./flow-status.component.scss']
})
export class FlowStatus {
+ private store = inject<Store<NiFiState>>(Store);
+ private storage = inject(Storage);
+ private canvasUtils = inject(CanvasUtils);
+
private static readonly FLOW_ANALYSIS_VISIBILITY_KEY: string = 'flow-analysis-visibility';
private static readonly FLOW_ANALYSIS_KEY: string = 'flow-analysis';
public flowAnalysisNotificationClass: string = '';
@@ -73,11 +77,7 @@ export class FlowStatus {
protected readonly BulletinsTip = BulletinsTip;
- constructor(
- private store: Store<NiFiState>,
- private storage: Storage,
- private canvasUtils: CanvasUtils
- ) {
+ constructor() {
try {
const item: { [key: string]: boolean } | null = this.storage.getItem(
FlowStatus.FLOW_ANALYSIS_VISIBILITY_KEY
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/header.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/header.component.ts
index c6edc3d242..a280128910 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/header.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/header.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { ComponentType } from '@nifi/shared';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../../state';
@@ -45,6 +45,9 @@ import { selectFlowAnalysisState } from '../../../state/flow-analysis/flow-analy
styleUrls: ['./header.component.scss']
})
export class HeaderComponent {
+ private store = inject<Store<CanvasState>>(Store);
+ loadingService = inject(LoadingService);
+
protected readonly ComponentType = ComponentType;
controllerStatus$ = this.store.select(selectControllerStatus);
@@ -55,9 +58,4 @@ export class HeaderComponent {
canvasPermissions$ = this.store.select(selectCanvasPermissions);
flowAnalysisState$ = this.store.select(selectFlowAnalysisState);
flowAnalysisOpen$ = this.store.select(selectFlowAnalysisOpen);
-
- constructor(
- private store: Store<CanvasState>,
- public loadingService: LoadingService
- ) {}
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.ts
index 80eef46c49..7bc7379831 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { CdkDrag, CdkDragEnd } from '@angular/cdk/drag-drop';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../../../state';
@@ -34,6 +34,10 @@ import { ConnectedPosition } from '@angular/cdk/overlay';
styleUrls: ['./new-canvas-item.component.scss']
})
export class NewCanvasItem {
+ private client = inject(Client);
+ private canvasView = inject(CanvasView);
+ private store = inject<Store<CanvasState>>(Store);
+
@Input() type!: ComponentType;
@Input() iconClass = '';
@Input() iconHoverClass = '';
@@ -54,11 +58,7 @@ export class NewCanvasItem {
private hovering = false;
- constructor(
- private client: Client,
- private canvasView: CanvasView,
- private store: Store<CanvasState>
- ) {
+ constructor() {
this.store
.select(selectDragging)
.pipe(takeUntilDestroyed())
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/search/search.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/search/search.component.ts
index bd5c6cf545..be8432e012 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/search/search.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/search/search.component.ts
@@ -58,6 +58,11 @@ import { ErrorHelper } from '../../../../../../service/error-helper.service';
]
})
export class Search implements OnInit {
+ private formBuilder = inject(FormBuilder);
+ private searchService = inject(SearchService);
+ private store = inject<Store<CanvasState>>(Store);
+ private errorHelper = inject(ErrorHelper);
+
protected readonly ComponentType = ComponentType;
protected readonly SearchMatchTip = SearchMatchTip;
@@ -98,12 +103,7 @@ export class Search implements OnInit {
selectedComponentType: ComponentType | null = null;
selectedComponentId: string | null = null;
- constructor(
- private formBuilder: FormBuilder,
- private searchService: SearchService,
- private store: Store<CanvasState>,
- private errorHelper: ErrorHelper
- ) {
+ constructor() {
this.searchForm = this.formBuilder.group({ searchBar: '' });
this.store
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.ts
index a02f3577f3..8087a85488 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import {
CreateConnectionDialogRequest,
@@ -89,6 +89,13 @@ import { ContextErrorBanner } from '../../../../../../../ui/common/context-error
styleUrls: ['./create-connection.component.scss']
})
export class CreateConnection extends CloseOnEscapeDialog {
+ private dialogRequest = inject<CreateConnectionDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<NiFiState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private clusterConnectionService = inject(ClusterConnectionService);
+ private client = inject(Client);
+
@Input() set getChildOutputPorts(getChildOutputPorts: (groupId: string) => Observable<any>) {
if (this.source.componentType == ComponentType.ProcessGroup) {
this.childOutputPorts$ = getChildOutputPorts(this.source.id).pipe(
@@ -132,15 +139,10 @@ export class CreateConnection extends CloseOnEscapeDialog {
loadBalancePartitionAttributeRequired = false;
loadBalanceCompressionRequired = false;
- constructor(
- @Inject(MAT_DIALOG_DATA) private dialogRequest: CreateConnectionDialogRequest,
- private formBuilder: FormBuilder,
- private store: Store<NiFiState>,
- private canvasUtils: CanvasUtils,
- private clusterConnectionService: ClusterConnectionService,
- private client: Client
- ) {
+ constructor() {
super();
+ const dialogRequest = this.dialogRequest;
+
this.source = dialogRequest.request.source;
this.destination = dialogRequest.request.destination;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts
index c0b98271e8..f87064441e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import {
EditConnectionDialogRequest,
@@ -89,6 +89,12 @@ import { ContextErrorBanner } from '../../../../../../../ui/common/context-error
styleUrls: ['./edit-connection.component.scss']
})
export class EditConnectionComponent extends TabbedDialog {
+ dialogRequest = inject<EditConnectionDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<NiFiState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private client = inject(Client);
+
@Input() set getChildOutputPorts(getChildOutputPorts: (groupId: string) => Observable<any>) {
if (this.sourceType == ComponentType.ProcessGroup) {
this.childOutputPorts$ = getChildOutputPorts(this.source.groupId);
@@ -223,14 +229,9 @@ export class EditConnectionComponent extends TabbedDialog {
loadBalanceCompressionRequired = false;
initialCompression: string;
- constructor(
- @Inject(MAT_DIALOG_DATA) public dialogRequest: EditConnectionDialogRequest,
- private formBuilder: FormBuilder,
- private store: Store<NiFiState>,
- private canvasUtils: CanvasUtils,
- private client: Client
- ) {
+ constructor() {
super('edit-connection-selected-index');
+ const dialogRequest = this.dialogRequest;
const connection: any = dialogRequest.entity.component;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/prioritizers/prioritizers.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/prioritizers/prioritizers.component.ts
index c474ed26b4..74019807fd 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/prioritizers/prioritizers.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/prioritizers/prioritizers.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, forwardRef, Input } from '@angular/core';
+import { Component, forwardRef, Input, inject } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule } from '@angular/material/dialog';
@@ -55,6 +55,8 @@ import {
styleUrls: ['./prioritizers.component.scss']
})
export class Prioritizers implements ControlValueAccessor {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set allPrioritizers(allPrioritizers: DocumentedType[]) {
this._allPrioritizers = [...allPrioritizers];
this.processPrioritizers();
@@ -74,8 +76,6 @@ export class Prioritizers implements ControlValueAccessor {
value!: string[];
- constructor(private nifiCommon: NiFiCommon) {}
-
private processPrioritizers(): void {
if (this._allPrioritizers && this.value) {
const selected: DocumentedType[] = [];
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-processor/source-processor.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-processor/source-processor.component.ts
index f5321fc3b9..e2eb645847 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-processor/source-processor.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-processor/source-processor.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, forwardRef, Input } from '@angular/core';
+import { Component, forwardRef, Input, inject } from '@angular/core';
import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -42,6 +42,8 @@ export interface RelationshipItem {
]
})
export class SourceProcessor implements ControlValueAccessor {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set processor(processor: any) {
if (processor) {
this.name = processor.component.name;
@@ -62,8 +64,6 @@ export class SourceProcessor implements ControlValueAccessor {
relationshipItems!: RelationshipItem[];
selectedRelationships!: string[];
- constructor(private nifiCommon: NiFiCommon) {}
-
processRelationships(): void {
if (this.relationships) {
if (this.nifiCommon.isEmpty(this.selectedRelationships)) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-dialog/change-version-dialog.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-dialog/change-version-dialog.ts
index 7a465ecd3d..b1be2d5dfa 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-dialog/change-version-dialog.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/change-version-dialog/change-version-dialog.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Output } from '@angular/core';
+import { Component, EventEmitter, Output, inject } from '@angular/core';
import { MatButton } from '@angular/material/button';
import { MatCell, MatCellDef, MatColumnDef, MatTableDataSource, MatTableModule } from '@angular/material/table';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
@@ -34,6 +34,10 @@ import { NiFiCommon, CloseOnEscapeDialog } from '@nifi/shared';
styleUrl: './change-version-dialog.scss'
})
export class ChangeVersionDialog extends CloseOnEscapeDialog {
+ private dialogRequest = inject<ChangeVersionDialogRequest>(MAT_DIALOG_DATA);
+ private nifiCommon = inject(NiFiCommon);
+ private store = inject<Store<CanvasState>>(Store);
+
displayedColumns: string[] = ['version', 'created', 'comments'];
dataSource: MatTableDataSource<VersionedFlowSnapshotMetadata> =
new MatTableDataSource<VersionedFlowSnapshotMetadata>();
@@ -48,12 +52,10 @@ export class ChangeVersionDialog extends CloseOnEscapeDialog {
@Output() changeVersion: EventEmitter<VersionedFlowSnapshotMetadata> =
new EventEmitter<VersionedFlowSnapshotMetadata>();
- constructor(
- @Inject(MAT_DIALOG_DATA) private dialogRequest: ChangeVersionDialogRequest,
- private nifiCommon: NiFiCommon,
- private store: Store<CanvasState>
- ) {
+ constructor() {
super();
+ const dialogRequest = this.dialogRequest;
+
const flowVersions = dialogRequest.versions.map((entity) => entity.versionedFlowSnapshotMetadata);
const sortedFlowVersions = this.sortVersions(flowVersions, this.sort);
this.selectedFlowVersion = sortedFlowVersions[0];
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/import-from-registry/import-from-registry.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/import-from-registry/import-from-registry.component.ts
index 00167b19a5..bd8ec57120 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/import-from-registry/import-from-registry.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/import-from-registry/import-from-registry.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject, Input, OnInit, signal, WritableSignal } from '@angular/core';
+import { Component, Input, OnInit, signal, WritableSignal, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { ImportFromRegistryDialogRequest } from '../../../../../state/flow';
import { Store } from '@ngrx/store';
@@ -88,6 +88,14 @@ import { NgxSkeletonLoaderComponent } from 'ngx-skeleton-loader';
styleUrls: ['./import-from-registry.component.scss']
})
export class ImportFromRegistry extends CloseOnEscapeDialog implements OnInit {
+ private dialogRequest = inject<ImportFromRegistryDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<CanvasState>>(Store);
+ private nifiCommon = inject(NiFiCommon);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
+ private errorHelper = inject(ErrorHelper);
+
@Input() getBranches: (registryId: string) => Observable<BranchEntity[]> = () => of([]);
@Input() getBuckets!: (registryId: string, branch?: string | null) => Observable<BucketEntity[]>;
@Input() getFlows!: (
@@ -133,16 +141,10 @@ export class ImportFromRegistry extends CloseOnEscapeDialog implements OnInit {
loadingVersions: WritableSignal<boolean> = signal(false);
loadingVersionsError: WritableSignal<string | null> = signal(null);
- constructor(
- @Inject(MAT_DIALOG_DATA) private dialogRequest: ImportFromRegistryDialogRequest,
- private formBuilder: FormBuilder,
- private store: Store<CanvasState>,
- private nifiCommon: NiFiCommon,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService,
- private errorHelper: ErrorHelper
- ) {
+ constructor() {
super();
+ const dialogRequest = this.dialogRequest;
+
this.store
.select(selectTimeOffset)
.pipe(isDefinedAndNotNull(), takeUntilDestroyed())
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-dialog.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-dialog.ts
index ef67a859a1..5ee085816c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-dialog.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-dialog.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Output } from '@angular/core';
+import { Component, EventEmitter, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import {
FlowComparisonEntity,
@@ -36,6 +36,8 @@ import { CloseOnEscapeDialog } from '@nifi/shared';
styleUrl: './local-changes-dialog.scss'
})
export class LocalChangesDialog extends CloseOnEscapeDialog {
+ private dialogRequest = inject<LocalChangesDialogRequest>(MAT_DIALOG_DATA);
+
mode: 'SHOW' | 'REVERT' = 'SHOW';
versionControlInformation: VersionControlInformationEntity;
localModifications: FlowComparisonEntity;
@@ -46,8 +48,10 @@ export class LocalChangesDialog extends CloseOnEscapeDialog {
revert: EventEmitter<LocalChangesDialogRequest> = new EventEmitter<LocalChangesDialogRequest>();
@Output() goToChange: EventEmitter<NavigateToComponentRequest> = new EventEmitter<NavigateToComponentRequest>();
- constructor(@Inject(MAT_DIALOG_DATA) private dialogRequest: LocalChangesDialogRequest) {
+ constructor() {
super();
+ const dialogRequest = this.dialogRequest;
+
this.mode = dialogRequest.mode;
this.versionControlInformation = dialogRequest.versionControlInformation;
this.localModifications = dialogRequest.localModifications;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-table/local-changes-table.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-table/local-changes-table.ts
index 02d9eaef34..e7123f8057 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-table/local-changes-table.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-table/local-changes-table.ts
@@ -55,6 +55,9 @@ interface LocalChange {
styleUrl: './local-changes-table.scss'
})
export class LocalChangesTable implements AfterViewInit {
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
private destroyRef: DestroyRef = inject(DestroyRef);
initialSortColumn: 'componentName' | 'changeType' | 'difference' = 'componentName';
initialSortDirection: 'asc' | 'desc' = 'asc';
@@ -95,10 +98,7 @@ export class LocalChangesTable implements AfterViewInit {
@Output() goToChange: EventEmitter<NavigateToComponentRequest> = new EventEmitter<NavigateToComponentRequest>();
- constructor(
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
this.filterForm = this.formBuilder.group({ filterTerm: '', filterColumn: 'componentName' });
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/save-version-dialog/save-version-dialog.component.html b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/save-version-dialog/save-version-dialog.component.html
index 0ebfbc98ec..a4a8c7cb1a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/save-version-dialog/save-version-dialog.component.html
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/save-version-dialog/save-version-dialog.component.html
@@ -1,19 +1,19 @@
<!--
- ~ 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.
- -->
+~ 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.
+-->
<h2 mat-dialog-title>Save Flow Version</h2>
<form class="save-version-form" [formGroup]="saveVersionForm">
@@ -75,9 +75,9 @@
<mat-form-field>
<mat-label>Branch</mat-label>
<mat-select formControlName="branch" (selectionChange)="branchChanged($event.value)">
- <ng-container *ngFor="let option of branchOptions">
+ @for (option of branchOptions; track option) {
<mat-option [value]="option.value">{{ option.text }}</mat-option>
- </ng-container>
+ }
</mat-select>
@if (saveVersionForm.controls['branch'].hasError('required')) {
<mat-error>No branches available</mat-error>
@@ -88,8 +88,8 @@
<mat-form-field>
<mat-label>Bucket</mat-label>
<mat-select formControlName="bucket">
- <ng-container *ngFor="let option of bucketOptions">
- <ng-container *ngIf="option.description; else noDescription">
+ @for (option of bucketOptions; track option) {
+ @if (option.description) {
<mat-option
[value]="option.value"
nifiTooltip
@@ -98,11 +98,10 @@
[delayClose]="false"
>{{ option.text }}
</mat-option>
- </ng-container>
- <ng-template #noDescription>
+ } @else {
<mat-option [value]="option.value">{{ option.text }}</mat-option>
- </ng-template>
- </ng-container>
+ }
+ }
</mat-select>
@if (saveVersionForm.controls['bucket'].hasError('required')) {
<mat-error>No buckets available</mat-error>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/save-version-dialog/save-version-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/save-version-dialog/save-version-dialog.component.ts
index 84d9f68709..a96cac6c31 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/save-version-dialog/save-version-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/save-version-dialog/save-version-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Input, OnInit, Output, Signal } from '@angular/core';
+import { Component, EventEmitter, Input, OnInit, Output, Signal, inject } from '@angular/core';
import {
MAT_DIALOG_DATA,
MatDialogActions,
@@ -32,7 +32,7 @@ import { Observable, of, take } from 'rxjs';
import { BranchEntity, BucketEntity, RegistryClientEntity } from '../../../../../../../state/shared';
import { SaveVersionDialogRequest, SaveVersionRequest, VersionControlInformation } from '../../../../../state/flow';
import { TextTip, NiFiCommon, NifiTooltipDirective, CloseOnEscapeDialog, SelectOption } from '@nifi/shared';
-import { NgForOf, NgIf } from '@angular/common';
+
import { MatInput } from '@angular/material/input';
import { ErrorContextKey } from '../../../../../../../state/error';
import { ContextErrorBanner } from '../../../../../../../ui/common/context-error-banner/context-error-banner.component';
@@ -53,8 +53,6 @@ import { ContextErrorBanner } from '../../../../../../../ui/common/context-error
NifiTooltipDirective,
MatError,
MatLabel,
- NgForOf,
- NgIf,
MatInput,
ContextErrorBanner
],
@@ -62,6 +60,10 @@ import { ContextErrorBanner } from '../../../../../../../ui/common/context-error
styleUrl: './save-version-dialog.component.scss'
})
export class SaveVersionDialog extends CloseOnEscapeDialog implements OnInit {
+ private dialogRequest = inject<SaveVersionDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
@Input() getBranches: (registryId: string) => Observable<BranchEntity[]> = () => of([]);
@Input() getBuckets: (registryId: string, branch?: string | null) => Observable<BucketEntity[]> = () => of([]);
@Input({ required: true }) saving!: Signal<boolean>;
@@ -78,12 +80,11 @@ export class SaveVersionDialog extends CloseOnEscapeDialog implements OnInit {
private clientBranchingSupportMap: Map<string, boolean> = new Map<string, boolean>();
- constructor(
- @Inject(MAT_DIALOG_DATA) private dialogRequest: SaveVersionDialogRequest,
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
super();
+ const dialogRequest = this.dialogRequest;
+ const formBuilder = this.formBuilder;
+
this.versionControlInformation = dialogRequest.versionControlInformation;
this.forceCommit = !!dialogRequest.forceCommit;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/label/edit-label/edit-label.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/label/edit-label/edit-label.component.ts
index 15b4aa7089..8a1d97f0b8 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/label/edit-label/edit-label.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/label/edit-label/edit-label.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { CanvasState } from '../../../../../state';
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
@@ -54,6 +54,12 @@ import { ContextErrorBanner } from '../../../../../../../ui/common/context-error
styleUrls: ['./edit-label.component.scss']
})
export class EditLabel extends CloseOnEscapeDialog {
+ request = inject<EditComponentDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<CanvasState>>(Store);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
+
saving$ = this.store.select(selectSaving);
editLabelForm: FormGroup;
@@ -66,14 +72,10 @@ export class EditLabel extends CloseOnEscapeDialog {
};
});
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: EditComponentDialogRequest,
- private formBuilder: FormBuilder,
- private store: Store<CanvasState>,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService
- ) {
+ constructor() {
super();
+ const request = this.request;
+
this.readonly = !request.entity.permissions.canWrite;
let fontSize = this.fontSizeOptions[0].value;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.ts
index 88a6f550df..20738a51f6 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../../../../state';
@@ -50,6 +50,10 @@ import { ContextErrorBanner } from '../../../../../../../ui/common/context-error
styleUrls: ['./create-port.component.scss']
})
export class CreatePort extends CloseOnEscapeDialog {
+ request = inject<CreateComponentRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<CanvasState>>(Store);
+
saving$ = this.store.select(selectSaving);
protected readonly TextTip = TextTip;
@@ -71,11 +75,7 @@ export class CreatePort extends CloseOnEscapeDialog {
}
];
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: CreateComponentRequest,
- private formBuilder: FormBuilder,
- private store: Store<CanvasState>
- ) {
+ constructor() {
super();
// set the port type name
if (ComponentType.InputPort == this.request.type) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/edit-port/edit-port.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/edit-port/edit-port.component.ts
index 04c46a55a7..40b4ae7659 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/edit-port/edit-port.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/port/edit-port/edit-port.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { CanvasState } from '../../../../../state';
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
@@ -51,21 +51,23 @@ import { ContextErrorBanner } from '../../../../../../../ui/common/context-error
styleUrls: ['./edit-port.component.scss']
})
export class EditPort extends CloseOnEscapeDialog {
+ request = inject<EditComponentDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<CanvasState>>(Store);
+ private canvasUtils = inject(CanvasUtils);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
+
saving$ = this.store.select(selectSaving);
editPortForm: FormGroup;
readonly: boolean;
portTypeLabel: string;
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: EditComponentDialogRequest,
- private formBuilder: FormBuilder,
- private store: Store<CanvasState>,
- private canvasUtils: CanvasUtils,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService
- ) {
+ constructor() {
super();
+ const request = this.request;
+
this.readonly =
!request.entity.permissions.canWrite || !this.canvasUtils.runnableSupportsModification(request.entity);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/create-process-group.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/create-process-group.component.ts
index 3fc67b6013..d560fb1d98 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/create-process-group.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/create-process-group/create-process-group.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, ElementRef, Inject, Input, ViewChild } from '@angular/core';
+import { Component, ElementRef, Input, ViewChild, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { CreateProcessGroupDialogRequest } from '../../../../../state/flow';
import { Store } from '@ngrx/store';
@@ -66,6 +66,11 @@ import { selectCurrentUser } from '../../../../../../../state/current-user/curre
styleUrls: ['./create-process-group.component.scss']
})
export class CreateProcessGroup extends CloseOnEscapeDialog {
+ private dialogRequest = inject<CreateProcessGroupDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<CanvasState>>(Store);
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set parameterContexts(parameterContexts: ParameterContextEntity[]) {
this.parameterContextsOptions = [];
this._parameterContexts = parameterContexts;
@@ -120,12 +125,7 @@ export class CreateProcessGroup extends CloseOnEscapeDialog {
flowDefinition: File | null = null;
currentUser$ = this.store.select(selectCurrentUser);
- constructor(
- @Inject(MAT_DIALOG_DATA) private dialogRequest: CreateProcessGroupDialogRequest,
- private formBuilder: FormBuilder,
- private store: Store<CanvasState>,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
super();
this.createProcessGroupForm = this.formBuilder.group({
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.ts
index c27650ac86..1ee3120e4b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { FormBuilder, FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';
@@ -62,6 +62,12 @@ import { selectCurrentUser } from '../../../../../../../state/current-user/curre
styleUrls: ['./edit-process-group.component.scss']
})
export class EditProcessGroup extends TabbedDialog {
+ request = inject<EditComponentDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
+ private store = inject<Store<CanvasState>>(Store);
+
@Input() set parameterContexts(parameterContexts: ParameterContextEntity[]) {
if (parameterContexts !== undefined) {
this.parameterContextsOptions = [];
@@ -181,14 +187,9 @@ export class EditProcessGroup extends TabbedDialog {
}
];
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: EditComponentDialogRequest,
- private formBuilder: FormBuilder,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService,
- private store: Store<CanvasState>
- ) {
+ constructor() {
super('edit-process-group-selected-index');
+ const request = this.request;
this.readonly = !request.entity.permissions.canWrite;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/group-components/group-components.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/group-components/group-components.component.ts
index ac7185b7ca..0619a0cff5 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/group-components/group-components.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/group-components/group-components.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { GroupComponentsDialogRequest } from '../../../../../state/flow';
import { Store } from '@ngrx/store';
@@ -53,6 +53,11 @@ import { Client } from '../../../../../../../service/client.service';
styleUrls: ['./group-components.component.scss']
})
export class GroupComponents {
+ private dialogRequest = inject<GroupComponentsDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<CanvasState>>(Store);
+ private client = inject(Client);
+
saving$ = this.store.select(selectSaving);
protected readonly TextTip = TextTip;
@@ -60,12 +65,9 @@ export class GroupComponents {
createProcessGroupForm: FormGroup;
parameterContextsOptions: SelectOption[] = [];
- constructor(
- @Inject(MAT_DIALOG_DATA) private dialogRequest: GroupComponentsDialogRequest,
- private formBuilder: FormBuilder,
- private store: Store<CanvasState>,
- private client: Client
- ) {
+ constructor() {
+ const dialogRequest = this.dialogRequest;
+
this.parameterContextsOptions.push({
text: 'No parameter context',
value: null
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/create-processor/create-processor.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/create-processor/create-processor.component.ts
index 18f980401d..f6d5f9eb4e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/create-processor/create-processor.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/create-processor/create-processor.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MAT_DIALOG_DATA } from '@angular/material/dialog';
import { CreateProcessorDialogRequest } from '../../../../../state/flow';
import { Store } from '@ngrx/store';
@@ -37,15 +37,13 @@ import {
styleUrls: ['./create-processor.component.scss']
})
export class CreateProcessor {
+ private dialogRequest = inject<CreateProcessorDialogRequest>(MAT_DIALOG_DATA);
+ private store = inject<Store<CanvasState>>(Store);
+
processorTypes$ = this.store.select(selectProcessorTypes);
processorTypesLoadingStatus$ = this.store.select(selectExtensionTypesLoadingStatus);
saving$ = this.store.select(selectSaving);
- constructor(
- @Inject(MAT_DIALOG_DATA) private dialogRequest: CreateProcessorDialogRequest,
- private store: Store<CanvasState>
- ) {}
-
createProcessor(processorType: DocumentedType): void {
this.store.dispatch(
createProcessor({
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/edit-processor.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/edit-processor.component.ts
index 233feed9ec..657980dd0e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/edit-processor.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/edit-processor.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatMenuModule } from '@angular/material/menu';
import {
@@ -111,6 +111,13 @@ import { ConnectedPosition } from '@angular/cdk/overlay';
styleUrls: ['./edit-processor.component.scss']
})
export class EditProcessor extends TabbedDialog {
+ request = inject<EditComponentDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private client = inject(Client);
+ private canvasUtils = inject(CanvasUtils);
+ private clusterConnectionService = inject(ClusterConnectionService);
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set processorUpdates(processorUpdates: any | undefined) {
this.processRunStateUpdates(processorUpdates);
}
@@ -202,15 +209,9 @@ export class EditProcessor extends TabbedDialog {
timerDrivenSchedulingPeriod: string;
runDurationMillis: number;
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: EditComponentDialogRequest,
- private formBuilder: FormBuilder,
- private client: Client,
- private canvasUtils: CanvasUtils,
- private clusterConnectionService: ClusterConnectionService,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
super('edit-processor-selected-index');
+ const request = this.request;
const processorProperties: any = request.entity.component.config.properties;
const properties: Property[] = Object.entries(processorProperties).map((entry: any) => {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.ts
index 29451c5de6..979a76f529 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, forwardRef } from '@angular/core';
+import { Component, forwardRef, inject } from '@angular/core';
import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR, ReactiveFormsModule } from '@angular/forms';
import { MatSliderModule } from '@angular/material/slider';
@@ -58,6 +58,8 @@ export interface RelationshipConfiguration {
]
})
export class RelationshipSettings implements ControlValueAccessor {
+ private nifiCommon = inject(NiFiCommon);
+
protected readonly TextTip = TextTip;
relationships!: Relationship[];
@@ -70,8 +72,6 @@ export class RelationshipSettings implements ControlValueAccessor {
onTouched!: () => void;
onChange!: (relationshipConfiguration: RelationshipConfiguration) => void;
- constructor(private nifiCommon: NiFiCommon) {}
-
registerOnChange(onChange: (relationshipConfiguration: RelationshipConfiguration) => void): void {
this.onChange = onChange;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/create-remote-process-group/create-remote-process-group.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/create-remote-process-group/create-remote-process-group.component.ts
index 87ce1dc31e..5aaa308267 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/create-remote-process-group/create-remote-process-group.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/create-remote-process-group/create-remote-process-group.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { Store } from '@ngrx/store';
import { CanvasState } from '../../../../../state';
@@ -55,15 +55,15 @@ import { ContextErrorBanner } from '../../../../../../../ui/common/context-error
styleUrls: ['./create-remote-process-group.component.scss']
})
export class CreateRemoteProcessGroup extends CloseOnEscapeDialog {
+ private dialogRequest = inject<CreateComponentRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<CanvasState>>(Store);
+
saving$ = this.store.select(selectSaving);
createRemoteProcessGroupForm: FormGroup;
- constructor(
- @Inject(MAT_DIALOG_DATA) private dialogRequest: CreateComponentRequest,
- private formBuilder: FormBuilder,
- private store: Store<CanvasState>
- ) {
+ constructor() {
super();
this.createRemoteProcessGroupForm = this.formBuilder.group({
urls: new FormControl('', Validators.required),
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/edit-remote-process-group/edit-remote-process-group.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/edit-remote-process-group/edit-remote-process-group.component.ts
index d094312bdc..dbee95561a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/edit-remote-process-group/edit-remote-process-group.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/remote-process-group/edit-remote-process-group/edit-remote-process-group.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { FormBuilder, FormControl, FormGroup, FormsModule, ReactiveFormsModule, Validators } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';
@@ -54,6 +54,11 @@ import { ContextErrorBanner } from '../../../../../../../ui/common/context-error
styleUrls: ['./edit-remote-process-group.component.scss']
})
export class EditRemoteProcessGroup extends CloseOnEscapeDialog {
+ request = inject<EditComponentDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private canvasUtils = inject(CanvasUtils);
+ private client = inject(Client);
+
@Input() saving$!: Observable<boolean>;
@Output() editRemoteProcessGroup: EventEmitter<any> = new EventEmitter<any>();
@@ -62,13 +67,10 @@ export class EditRemoteProcessGroup extends CloseOnEscapeDialog {
editRemoteProcessGroupForm: FormGroup;
readonly: boolean;
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: EditComponentDialogRequest,
- private formBuilder: FormBuilder,
- private canvasUtils: CanvasUtils,
- private client: Client
- ) {
+ constructor() {
super();
+ const request = this.request;
+
this.readonly =
!request.entity.permissions.canWrite ||
!this.canvasUtils.remoteProcessGroupSupportsModification(request.entity);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/common/breadcrumbs/breadcrumbs.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/common/breadcrumbs/breadcrumbs.component.ts
index d8088e6ac5..4e4998f018 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/common/breadcrumbs/breadcrumbs.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/common/breadcrumbs/breadcrumbs.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, ElementRef, Input, ViewChild } from '@angular/core';
+import { Component, ElementRef, Input, ViewChild, inject } from '@angular/core';
import { initialState } from '../../../state/flow/flow.reducer';
import { RouterLink } from '@angular/router';
@@ -29,6 +29,8 @@ import { Title } from '@angular/platform-browser';
styleUrls: ['./breadcrumbs.component.scss']
})
export class Breadcrumbs {
+ private title = inject(Title);
+
@Input() entity: BreadcrumbEntity = initialState.flow.processGroupFlow.breadcrumb;
@Input() currentProcessGroupId: string = initialState.id;
@@ -42,8 +44,6 @@ export class Breadcrumbs {
}
}
- constructor(private title: Title) {}
-
prepareBreadcrumbs(): BreadcrumbEntity[] {
const breadcrumbs: BreadcrumbEntity[] = [];
this.prepareBreadcrumb(breadcrumbs, this.entity);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/common/no-registry-clients-dialog/no-registry-clients-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/common/no-registry-clients-dialog/no-registry-clients-dialog.component.ts
index 6dd883cef0..1795ce96fd 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/common/no-registry-clients-dialog/no-registry-clients-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/common/no-registry-clients-dialog/no-registry-clients-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatButtonModule } from '@angular/material/button';
import { NoRegistryClientsDialogRequest } from '../../../state/flow';
@@ -29,5 +29,5 @@ import { RouterLink } from '@angular/router';
styleUrls: ['./no-registry-clients-dialog.component.scss']
})
export class NoRegistryClientsDialog {
- constructor(@Inject(MAT_DIALOG_DATA) public request: NoRegistryClientsDialogRequest) {}
+ request = inject<NoRegistryClientsDialogRequest>(MAT_DIALOG_DATA);
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/controller-service/controller-services.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/controller-service/controller-services.component.ts
index 171bbc1920..c8303d5bf3 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/controller-service/controller-services.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/controller-service/controller-services.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { filter, Observable, switchMap, take, tap } from 'rxjs';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -61,6 +61,8 @@ import { DocumentationRequest } from '../../../../state/documentation';
standalone: false
})
export class ControllerServices implements OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
serviceState$ = this.store.select(selectControllerServicesState);
selectedServiceId$ = this.store.select(selectControllerServiceIdFromRoute);
currentUser$ = this.store.select(selectCurrentUser);
@@ -70,7 +72,7 @@ export class ControllerServices implements OnDestroy {
private currentProcessGroupId!: string;
- constructor(private store: Store<NiFiState>) {
+ constructor() {
// load the controller services using the process group id from the route
this.store
.select(selectProcessGroupIdFromRoute)
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/edit-remote-port/edit-remote-port.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/edit-remote-port/edit-remote-port.component.ts
index 841849a470..9b2b2e4f09 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/edit-remote-port/edit-remote-port.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/edit-remote-port/edit-remote-port.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
import { Store } from '@ngrx/store';
@@ -52,19 +52,21 @@ import { ContextErrorBanner } from '../../../../../ui/common/context-error-banne
styleUrls: ['./edit-remote-port.component.scss']
})
export class EditRemotePortComponent extends CloseOnEscapeDialog {
+ request = inject<EditRemotePortDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<CanvasState>>(Store);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
+
saving$ = this.store.select(selectSaving);
editPortForm: FormGroup;
portTypeLabel: string;
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: EditRemotePortDialogRequest,
- private formBuilder: FormBuilder,
- private store: Store<CanvasState>,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService
- ) {
+ constructor() {
super();
+ const request = this.request;
+
// set the port type name
if (ComponentType.InputPort == this.request.type) {
this.portTypeLabel = 'Input Port';
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.ts
index 59d624fd60..7d4cb7d51f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { filter, switchMap, take, tap } from 'rxjs';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
@@ -57,6 +57,9 @@ import { selectAbout } from '../../../../state/about/about.selectors';
standalone: false
})
export class ManageRemotePorts implements OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+ private nifiCommon = inject(NiFiCommon);
+
initialSortColumn: 'name' | 'type' | 'tasks' | 'count' | 'size' | 'duration' | 'compression' | 'actions' = 'name';
initialSortDirection: 'asc' | 'desc' = 'asc';
activeSort: Sort = {
@@ -85,10 +88,7 @@ export class ManageRemotePorts implements OnDestroy {
private currentRpgId!: string;
protected currentRpg: any | null = null;
- constructor(
- private store: Store<NiFiState>,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
// load the ports after the flow configuration `timeOffset` and about `timezone` are loaded into the store
this.store
.select(selectTimeOffset)
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/feature/login.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/feature/login.component.ts
index d20cc080f4..1ba4a1d662 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/feature/login.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/feature/login.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { LoginState } from '../state';
import { selectCurrentUserState } from '../../../state/current-user/current-user.selectors';
@@ -31,12 +31,14 @@ import { isDefinedAndNotNull } from '@nifi/shared';
standalone: false
})
export class Login {
+ private store = inject<Store<LoginState>>(Store);
+
currentUserState$ = this.store.select(selectCurrentUserState).pipe(take(1));
loginConfiguration = this.store.selectSignal(selectLoginConfiguration);
loading: boolean = true;
- constructor(private store: Store<LoginState>) {
+ constructor() {
this.store
.select(selectLoginConfiguration)
.pipe(isDefinedAndNotNull(), takeUntilDestroyed())
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/state/access/access.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/state/access/access.effects.ts
index 0f08ce310d..46f87732bb 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/state/access/access.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/state/access/access.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as AccessActions from './access.actions';
import { catchError, from, map, of, switchMap, tap } from 'rxjs';
@@ -32,14 +32,12 @@ import { resetLoginFailure } from './access.actions';
@Injectable()
export class AccessEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private authService: AuthService,
- private router: Router,
- private dialog: MatDialog,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private authService = inject(AuthService);
+ private router = inject(Router);
+ private dialog = inject(MatDialog);
+ private errorHelper = inject(ErrorHelper);
login$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/ui/login-form/login-form.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/ui/login-form/login-form.component.ts
index 5609abd209..9b18de6be3 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/ui/login-form/login-form.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/login/ui/login-form/login-form.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
import { Store } from '@ngrx/store';
import { login } from '../../state/access/access.actions';
@@ -37,14 +37,14 @@ import { MatLabel } from '@angular/material/select';
styleUrls: ['./login-form.component.scss']
})
export class LoginForm {
+ private formBuilder = inject(FormBuilder);
+ private store = inject<Store<NiFiState>>(Store);
+
logoutSupported = this.store.selectSignal(selectLogoutSupported);
loginForm: FormGroup;
- constructor(
- private formBuilder: FormBuilder,
- private store: Store<NiFiState>
- ) {
+ constructor() {
// build the form
this.loginForm = this.formBuilder.group({
username: new FormControl('', Validators.required),
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/service/parameter-contexts.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/service/parameter-contexts.service.ts
index a52cd08a10..90dbd9f126 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/service/parameter-contexts.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/service/parameter-contexts.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Client } from '../../../service/client.service';
@@ -30,14 +30,12 @@ import { ClusterConnectionService } from '../../../service/cluster-connection.se
@Injectable({ providedIn: 'root' })
export class ParameterContextService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getParameterContexts(): Observable<any> {
return this.httpClient.get(`${ParameterContextService.API}/flow/parameter-contexts`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts
index bd0bc4c71b..5f4542ce3c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as ParameterContextListingActions from './parameter-context-listing.actions';
@@ -58,15 +58,13 @@ import { EditParameterContext } from '../../../../ui/common/parameter-context/ed
@Injectable()
export class ParameterContextListingEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private storage: Storage,
- private parameterContextService: ParameterContextService,
- private dialog: MatDialog,
- private router: Router,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private storage = inject(Storage);
+ private parameterContextService = inject(ParameterContextService);
+ private dialog = inject(MatDialog);
+ private router = inject(Router);
+ private errorHelper = inject(ErrorHelper);
loadParameterContexts$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-listing.component.ts
index 6383b9cf79..182989ffac 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { ParameterContextListingState } from '../../state/parameter-context-listing';
import {
@@ -51,12 +51,14 @@ import { ParameterContextTable } from './parameter-context-table/parameter-conte
styleUrls: ['./parameter-context-listing.component.scss']
})
export class ParameterContextListing implements OnInit {
+ private store = inject<Store<ParameterContextListingState>>(Store);
+
parameterContextListingState$ = this.store.select(selectParameterContextListingState);
selectedParameterContextId$ = this.store.select(selectParameterContextIdFromRoute);
currentUser$ = this.store.select(selectCurrentUser);
flowConfiguration$ = this.store.select(selectFlowConfiguration);
- constructor(private store: Store<ParameterContextListingState>) {
+ constructor() {
this.store
.select(selectSingleEditedParameterContext)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-table/parameter-context-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-table/parameter-context-table.component.ts
index fbbc0744a3..58ce248b91 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-table/parameter-context-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-table/parameter-context-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { MatSortModule, Sort } from '@angular/material/sort';
import { NiFiCommon, NifiTooltipDirective } from '@nifi/shared';
@@ -45,6 +45,8 @@ import { ProcessGroupTip } from '../../../../../ui/common/tooltips/process-group
]
})
export class ParameterContextTable {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() initialSortColumn: 'name' | 'provider' | 'description' | 'process groups' = 'name';
@Input() initialSortDirection: 'asc' | 'desc' = 'asc';
activeSort: Sort = {
@@ -68,8 +70,6 @@ export class ParameterContextTable {
displayedColumns: string[] = ['name', 'provider', 'description', 'process groups', 'actions'];
dataSource: MatTableDataSource<ParameterContextEntity> = new MatTableDataSource<ParameterContextEntity>();
- constructor(private nifiCommon: NiFiCommon) {}
-
canRead(entity: ParameterContextEntity): boolean {
return entity.permissions.canRead;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.ts
index f5279fe569..c2ee52d430 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { AfterViewInit, ChangeDetectorRef, Component, forwardRef, Input } from '@angular/core';
+import { AfterViewInit, ChangeDetectorRef, Component, forwardRef, Input, inject } from '@angular/core';
import { ControlValueAccessor, FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule } from '@angular/material/dialog';
@@ -71,6 +71,10 @@ export interface ParameterItem {
]
})
export class ParameterTable implements AfterViewInit, ControlValueAccessor {
+ private store = inject<Store<ParameterContextListingState>>(Store);
+ private changeDetector = inject(ChangeDetectorRef);
+ private nifiCommon = inject(NiFiCommon);
+
@Input() createNewParameter!: (existingParameters: string[]) => Observable<EditParameterResponse>;
@Input() editParameter!: (parameter: Parameter) => Observable<EditParameterResponse>;
@Input() canAddParameters = true;
@@ -95,12 +99,6 @@ export class ParameterTable implements AfterViewInit, ControlValueAccessor {
showInheritedParameters: boolean = true;
- constructor(
- private store: Store<ParameterContextListingState>,
- private changeDetector: ChangeDetectorRef,
- private nifiCommon: NiFiCommon
- ) {}
-
ngAfterViewInit(): void {
this.initFilter();
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/feature/provenance.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/feature/provenance.component.ts
index 721d2fd1ac..f3671b9409 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/feature/provenance.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/feature/provenance.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../state';
import { loadProvenanceOptions } from '../state/provenance-event-listing/provenance-event-listing.actions';
@@ -27,7 +27,7 @@ import { loadProvenanceOptions } from '../state/provenance-event-listing/provena
standalone: false
})
export class Provenance implements OnInit {
- constructor(private store: Store<NiFiState>) {}
+ private store = inject<Store<NiFiState>>(Store);
ngOnInit(): void {
this.store.dispatch(loadProvenanceOptions());
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/service/provenance.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/service/provenance.service.ts
index 2dfe322b7f..7f75252764 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/service/provenance.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/service/provenance.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { ProvenanceRequest } from '../state/provenance-event-listing';
@@ -24,12 +24,10 @@ import { Client } from '../../../service/client.service';
@Injectable({ providedIn: 'root' })
export class ProvenanceService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
- constructor(
- private httpClient: HttpClient,
- private client: Client
- ) {}
+ private static readonly API: string = '../nifi-api';
getSearchOptions(): Observable<any> {
return this.httpClient.get(`${ProvenanceService.API}/provenance/search-options`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/state/lineage/lineage.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/state/lineage/lineage.effects.ts
index a7a198c47a..c69b02c354 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/state/lineage/lineage.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/state/lineage/lineage.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as LineageActions from './lineage.actions';
@@ -34,14 +34,12 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class LineageEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private provenanceService: ProvenanceService,
- private errorHelper: ErrorHelper,
- private nifiCommon: NiFiCommon,
- private dialog: MatDialog
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private provenanceService = inject(ProvenanceService);
+ private errorHelper = inject(ErrorHelper);
+ private nifiCommon = inject(NiFiCommon);
+ private dialog = inject(MatDialog);
submitLineageQuery$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts
index 017c83b02c..46cb2e7915 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as ProvenanceEventListingActions from './provenance-event-listing.actions';
@@ -49,16 +49,14 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class ProvenanceEventListingEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private provenanceService: ProvenanceService,
- private errorHelper: ErrorHelper,
- private clusterService: ClusterService,
- private nifiCommon: NiFiCommon,
- private dialog: MatDialog,
- private router: Router
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private provenanceService = inject(ProvenanceService);
+ private errorHelper = inject(ErrorHelper);
+ private clusterService = inject(ClusterService);
+ private nifiCommon = inject(NiFiCommon);
+ private dialog = inject(MatDialog);
+ private router = inject(Router);
loadProvenanceOptions$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-listing.component.ts
index 867f16e8a0..959ae1a7dd 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import {
GoToProvenanceEventSourceRequest,
@@ -62,6 +62,8 @@ import { NgxSkeletonLoaderComponent } from 'ngx-skeleton-loader';
styleUrls: ['./provenance-event-listing.component.scss']
})
export class ProvenanceEventListing implements OnInit, OnDestroy {
+ private store = inject<Store<ProvenanceEventListingState>>(Store);
+
status$ = this.store.select(selectStatus);
loadedTimestamp$ = this.store.select(selectLoadedTimestamp);
provenance$ = this.store.select(selectCompletedProvenance);
@@ -71,7 +73,7 @@ export class ProvenanceEventListing implements OnInit, OnDestroy {
request!: ProvenanceRequest;
stateReset = false;
- constructor(private store: Store<ProvenanceEventListingState>) {
+ constructor() {
this.store
.select(selectSearchableFieldsFromRoute)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/provenance-event-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/provenance-event-table.component.ts
index e3393230a3..da2469c7d9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/provenance-event-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/provenance-event-table.component.ts
@@ -67,6 +67,9 @@ import { ErrorContextKey } from '../../../../../state/error';
styleUrls: ['./provenance-event-table.component.scss']
})
export class ProvenanceEventTable implements AfterViewInit {
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set events(events: ProvenanceEventSummary[]) {
if (events) {
this.dataSource.data = this.sortEvents(events, this.sort);
@@ -221,10 +224,7 @@ export class ProvenanceEventTable implements AfterViewInit {
initialEventTimestampThreshold = 0;
currentEventTimestampThreshold = 0;
- constructor(
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
this.filterForm = this.formBuilder.group({ filterTerm: '', filterColumn: this.filterColumnOptions[0] });
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-search-dialog/provenance-search-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-search-dialog/provenance-search-dialog.component.ts
index 5dd2d95e41..bde6e7c91e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-search-dialog/provenance-search-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-search-dialog/provenance-search-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';
@@ -49,6 +49,10 @@ import { CloseOnEscapeDialog, SelectOption } from '@nifi/shared';
styleUrls: ['./provenance-search-dialog.component.scss']
})
export class ProvenanceSearchDialog extends CloseOnEscapeDialog {
+ request = inject<ProvenanceSearchDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
@Input() timezone!: string;
@Output() submitSearchCriteria: EventEmitter<ProvenanceRequest> = new EventEmitter<ProvenanceRequest>();
@@ -61,12 +65,10 @@ export class ProvenanceSearchDialog extends CloseOnEscapeDialog {
provenanceOptionsForm: FormGroup;
searchLocationOptions: SelectOption[] = [];
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: ProvenanceSearchDialogRequest,
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
super();
+ const request = this.request;
+
const now = new Date();
this.clearTime(now);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/service/queue.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/service/queue.service.ts
index d34977c49b..5a62f07d9e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/service/queue.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/service/queue.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { NiFiCommon } from '@nifi/shared';
@@ -30,13 +30,11 @@ import { Client } from '../../../service/client.service';
@Injectable({ providedIn: 'root' })
export class QueueService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private nifiCommon = inject(NiFiCommon);
+ private client = inject(Client);
- constructor(
- private httpClient: HttpClient,
- private nifiCommon: NiFiCommon,
- private client: Client
- ) {}
+ private static readonly API: string = '../nifi-api';
getConnection(connectionId: string): Observable<any> {
return this.httpClient.get(`${QueueService.API}/connections/${connectionId}`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts
index b928671508..cc56328e84 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as QueueListingActions from './queue-listing.actions';
@@ -38,14 +38,12 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class QueueListingEffects {
- constructor(
- private actions$: Actions,
- private store: Store<CanvasState>,
- private queueService: QueueService,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog,
- private nifiCommon: NiFiCommon
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<CanvasState>>(Store);
+ private queueService = inject(QueueService);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
+ private nifiCommon = inject(NiFiCommon);
loadConnectionLabel$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.ts
index 761de181d6..535436b4ee 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-dialog/flowfile-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';
@@ -49,15 +49,15 @@ import { TabbedDialog } from '../../../../../ui/common/tabbed-dialog/tabbed-dial
]
})
export class FlowFileDialog extends TabbedDialog {
+ request = inject<FlowFileDialogRequest>(MAT_DIALOG_DATA);
+ private nifiCommon = inject(NiFiCommon);
+
@Input() contentViewerAvailable!: boolean;
@Output() downloadContent: EventEmitter<void> = new EventEmitter<void>();
@Output() viewContent: EventEmitter<void> = new EventEmitter<void>();
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: FlowFileDialogRequest,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
super('flowfile-dialog-selected-index');
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.ts
index 3c090b0c0c..bc53b1f355 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { BulletinsTip } from '../../../../../ui/common/tooltips/bulletins-tip/bulletins-tip.component';
import { ValidationErrorsTip } from '../../../../../ui/common/tooltips/validation-errors-tip/validation-errors-tip.component';
@@ -37,6 +37,8 @@ import { ContextErrorBanner } from '../../../../../ui/common/context-error-banne
styleUrls: ['./flowfile-table.component.scss']
})
export class FlowFileTable {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() selectedConnection: SelectedConnection | null = null;
@Input() set listingRequest(listingRequest: ListingRequest) {
@@ -97,8 +99,6 @@ export class FlowFileTable {
queueSizeObjectCount = 0;
queueSizeByteCount = 0;
- constructor(private nifiCommon: NiFiCommon) {}
-
sortFlowFiles(summaries: FlowFileSummary[]): FlowFileSummary[] {
const data: FlowFileSummary[] = summaries.slice();
return data.sort((a: FlowFileSummary, b: FlowFileSummary) => {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/queue-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/queue-listing.component.ts
index 5492caf50a..a1ff0bcc59 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/queue-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/queue/ui/queue-listing/queue-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { distinctUntilChanged, filter } from 'rxjs';
import {
@@ -54,6 +54,8 @@ import { MatIconButton } from '@angular/material/button';
styleUrls: ['./queue-listing.component.scss']
})
export class QueueListing implements OnInit, OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
status$ = this.store.select(selectStatus);
selectedConnection$ = this.store.select(selectSelectedConnection);
loadedTimestamp$ = this.store.select(selectLoadedTimestamp);
@@ -62,7 +64,7 @@ export class QueueListing implements OnInit, OnDestroy {
about$ = this.store.select(selectAbout);
clusterSummary$ = this.store.select(selectClusterSummary);
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectConnectionIdFromRoute)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/feature/settings.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/feature/settings.component.ts
index 3014550edf..3d537e24ac 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/feature/settings.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/feature/settings.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../state';
import { loadExtensionTypesForSettings } from '../../../state/extension-types/extension-types.actions';
@@ -27,6 +27,8 @@ import { loadExtensionTypesForSettings } from '../../../state/extension-types/ex
standalone: false
})
export class Settings implements OnInit {
+ private store = inject<Store<NiFiState>>(Store);
+
tabLinks: any[] = [
{
label: 'General',
@@ -54,8 +56,6 @@ export class Settings implements OnInit {
}
];
- constructor(private store: Store<NiFiState>) {}
-
ngOnInit(): void {
this.store.dispatch(loadExtensionTypesForSettings());
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/controller.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/controller.service.ts
index 56ae2738c7..4a1d5605ca 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/controller.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/controller.service.ts
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import { ControllerEntity } from '../state/general';
@Injectable({ providedIn: 'root' })
export class ControllerService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getControllerConfig(): Observable<any> {
return this.httpClient.get(`${ControllerService.API}/controller/config`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/flow-analysis-rule.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/flow-analysis-rule.service.ts
index 68348d32e4..9b03e51fb5 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/flow-analysis-rule.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/flow-analysis-rule.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Client } from '../../../service/client.service';
@@ -32,14 +32,12 @@ import { ClusterConnectionService } from '../../../service/cluster-connection.se
@Injectable({ providedIn: 'root' })
export class FlowAnalysisRuleService implements PropertyDescriptorRetriever {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getFlowAnalysisRule(): Observable<any> {
return this.httpClient.get(`${FlowAnalysisRuleService.API}/controller/flow-analysis-rules`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/management-controller-service.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/management-controller-service.service.ts
index 4b20db236c..3722999123 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/management-controller-service.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/management-controller-service.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import {
@@ -34,14 +34,12 @@ import { ClusterConnectionService } from '../../../service/cluster-connection.se
@Injectable({ providedIn: 'root' })
export class ManagementControllerServiceService implements ControllerServiceCreator, PropertyDescriptorRetriever {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getControllerServices(): Observable<any> {
const uiOnly: any = { uiOnly: true };
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/parameter-provider.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/parameter-provider.service.ts
index d17b9c3b35..ac532a9cef 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/parameter-provider.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/parameter-provider.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Client } from '../../../service/client.service';
import { NiFiCommon } from '@nifi/shared';
@@ -34,14 +34,12 @@ import { ClusterConnectionService } from '../../../service/cluster-connection.se
@Injectable({ providedIn: 'root' })
export class ParameterProviderService implements PropertyDescriptorRetriever {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getParameterProviders(): Observable<any> {
return this.httpClient.get(`${ParameterProviderService.API}/flow/parameter-providers`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/registry-client.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/registry-client.service.ts
index b1d4d482fb..bc3631d3dd 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/registry-client.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/registry-client.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Client } from '../../../service/client.service';
@@ -30,14 +30,12 @@ import { ClusterConnectionService } from '../../../service/cluster-connection.se
@Injectable({ providedIn: 'root' })
export class RegistryClientService implements PropertyDescriptorRetriever {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getRegistryClients(): Observable<any> {
return this.httpClient.get(`${RegistryClientService.API}/controller/registry-clients`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/reporting-task.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/reporting-task.service.ts
index 613fd6b02a..80aceb0c08 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/reporting-task.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/service/reporting-task.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Client } from '../../../service/client.service';
@@ -33,14 +33,12 @@ import { ClusterConnectionService } from '../../../service/cluster-connection.se
@Injectable({ providedIn: 'root' })
export class ReportingTaskService implements PropertyDescriptorRetriever {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getReportingTasks(): Observable<any> {
return this.httpClient.get(`${ReportingTaskService.API}/flow/reporting-tasks`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts
index d5b16350ab..e3349fb88e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as FlowAnalysisRuleActions from './flow-analysis-rules.actions';
@@ -57,17 +57,15 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class FlowAnalysisRulesEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private managementControllerServiceService: ManagementControllerServiceService,
- private flowAnalysisRuleService: FlowAnalysisRuleService,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog,
- private router: Router,
- private propertyTableHelperService: PropertyTableHelperService,
- private extensionTypesService: ExtensionTypesService
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private managementControllerServiceService = inject(ManagementControllerServiceService);
+ private flowAnalysisRuleService = inject(FlowAnalysisRuleService);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
+ private router = inject(Router);
+ private propertyTableHelperService = inject(PropertyTableHelperService);
+ private extensionTypesService = inject(ExtensionTypesService);
loadFlowAnalysisRule$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/general/general.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/general/general.effects.ts
index 2f6ab625bc..09d6503b25 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/general/general.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/general/general.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as GeneralActions from './general.actions';
@@ -33,13 +33,11 @@ import { SMALL_DIALOG } from '@nifi/shared';
@Injectable()
export class GeneralEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private controllerService: ControllerService,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private controllerService = inject(ControllerService);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
loadControllerConfig$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts
index d252b6b652..c53bdd5a96 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as ManagementControllerServicesActions from './management-controller-services.actions';
@@ -62,17 +62,15 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class ManagementControllerServicesEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private client: Client,
- private managementControllerServiceService: ManagementControllerServiceService,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog,
- private router: Router,
- private propertyTableHelperService: PropertyTableHelperService,
- private extensionTypesService: ExtensionTypesService
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private client = inject(Client);
+ private managementControllerServiceService = inject(ManagementControllerServiceService);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
+ private router = inject(Router);
+ private propertyTableHelperService = inject(PropertyTableHelperService);
+ private extensionTypesService = inject(ExtensionTypesService);
loadManagementControllerServices$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts
index 05878f31ea..5bd82c3e6a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import { Store } from '@ngrx/store';
@@ -73,17 +73,15 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class ParameterProvidersEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private client: Client,
- private dialog: MatDialog,
- private router: Router,
- private parameterProviderService: ParameterProviderService,
- private propertyTableHelperService: PropertyTableHelperService,
- private managementControllerServiceService: ManagementControllerServiceService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private client = inject(Client);
+ private dialog = inject(MatDialog);
+ private router = inject(Router);
+ private parameterProviderService = inject(ParameterProviderService);
+ private propertyTableHelperService = inject(PropertyTableHelperService);
+ private managementControllerServiceService = inject(ManagementControllerServiceService);
+ private errorHelper = inject(ErrorHelper);
loadParameterProviders$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts
index a293de20a3..9d5caebae9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as RegistryClientsActions from './registry-clients.actions';
@@ -44,16 +44,14 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class RegistryClientsEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private registryClientService: RegistryClientService,
- private managementControllerServiceService: ManagementControllerServiceService,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog,
- private router: Router,
- private propertyTableHelperService: PropertyTableHelperService
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private registryClientService = inject(RegistryClientService);
+ private managementControllerServiceService = inject(ManagementControllerServiceService);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
+ private router = inject(Router);
+ private propertyTableHelperService = inject(PropertyTableHelperService);
loadRegistryClients$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts
index ac782bda6f..d0755f7a86 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as ReportingTaskActions from './reporting-tasks.actions';
@@ -53,17 +53,15 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class ReportingTasksEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private reportingTaskService: ReportingTaskService,
- private managementControllerServiceService: ManagementControllerServiceService,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog,
- private router: Router,
- private propertyTableHelperService: PropertyTableHelperService,
- private extensionTypesService: ExtensionTypesService
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private reportingTaskService = inject(ReportingTaskService);
+ private managementControllerServiceService = inject(ManagementControllerServiceService);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
+ private router = inject(Router);
+ private propertyTableHelperService = inject(PropertyTableHelperService);
+ private extensionTypesService = inject(ExtensionTypesService);
loadReportingTasks$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/create-flow-analysis-rule/create-flow-analysis-rule.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/create-flow-analysis-rule/create-flow-analysis-rule.component.ts
index bfe8431e36..70b191533d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/create-flow-analysis-rule/create-flow-analysis-rule.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/create-flow-analysis-rule/create-flow-analysis-rule.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { ExtensionCreation } from '../../../../../ui/common/extension-creation/extension-creation.component';
import { FlowAnalysisRulesState } from '../../../state/flow-analysis-rules';
@@ -37,17 +37,13 @@ import {
styleUrls: ['./create-flow-analysis-rule.component.scss']
})
export class CreateFlowAnalysisRule extends CloseOnEscapeDialog {
+ private store = inject<Store<FlowAnalysisRulesState>>(Store);
+ private client = inject(Client);
+
flowAnalysisRulesTypes$ = this.store.select(selectFlowAnalysisRuleTypes);
flowAnalysisRulesTypesLoadingStatus$ = this.store.select(selectExtensionTypesLoadingStatus);
saving$ = this.store.select(selectSaving);
- constructor(
- private store: Store<FlowAnalysisRulesState>,
- private client: Client
- ) {
- super();
- }
-
createFlowAnalysisRule(flowAnalysisRuleType: DocumentedType): void {
this.store.dispatch(
createFlowAnalysisRule({
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/edit-flow-analysis-rule/edit-flow-analysis-rule.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/edit-flow-analysis-rule/edit-flow-analysis-rule.component.ts
index dd8943ae6b..ef6d0480ed 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/edit-flow-analysis-rule/edit-flow-analysis-rule.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/edit-flow-analysis-rule/edit-flow-analysis-rule.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatInputModule } from '@angular/material/input';
import { MatButtonModule } from '@angular/material/button';
@@ -68,6 +68,12 @@ import { ContextErrorBanner } from '../../../../../ui/common/context-error-banne
styleUrls: ['./edit-flow-analysis-rule.component.scss']
})
export class EditFlowAnalysisRule extends TabbedDialog {
+ request = inject<EditFlowAnalysisRuleDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
+
@Input() createNewProperty!: (existingProperties: string[], allowsSensitive: boolean) => Observable<Property>;
@Input() createNewService!: (request: InlineServiceCreationRequest) => Observable<InlineServiceCreationResponse>;
@Input() saving$!: Observable<boolean>;
@@ -95,14 +101,9 @@ export class EditFlowAnalysisRule extends TabbedDialog {
}
];
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: EditFlowAnalysisRuleDialogRequest,
- private formBuilder: FormBuilder,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {
+ constructor() {
super('edit-flow-analysis-rule-selected-index');
+ const request = this.request;
this.readonly =
!request.flowAnalysisRule.permissions.canWrite || request.flowAnalysisRule.status.runStatus !== 'DISABLED';
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.ts
index 975a4fc911..ff19a62f7c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule } from '@angular/material/dialog';
import { NgClass } from '@angular/common';
@@ -47,6 +47,8 @@ import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
styleUrls: ['./flow-analysis-rule-table.component.scss']
})
export class FlowAnalysisRuleTable {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set flowAnalysisRules(flowAnalysisRuleEntities: FlowAnalysisRuleEntity[]) {
this.dataSource.data = this.sortFlowAnalysisRules(flowAnalysisRuleEntities, this.sort);
}
@@ -80,8 +82,6 @@ export class FlowAnalysisRuleTable {
displayedColumns: string[] = ['moreDetails', 'name', 'type', 'bundle', 'state', 'actions'];
dataSource: MatTableDataSource<FlowAnalysisRuleEntity> = new MatTableDataSource<FlowAnalysisRuleEntity>();
- constructor(private nifiCommon: NiFiCommon) {}
-
updateSort(sort: Sort): void {
this.sort = sort;
this.dataSource.data = this.sortFlowAnalysisRules(this.dataSource.data, sort);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rules.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rules.component.ts
index d9613486d0..9065b133e6 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rules.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rules.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { Store } from '@ngrx/store';
import { filter, switchMap, take } from 'rxjs';
@@ -56,11 +56,13 @@ import { FlowAnalysisRuleTable } from './flow-analysis-rule-table/flow-analysis-
styleUrls: ['./flow-analysis-rules.component.scss']
})
export class FlowAnalysisRules implements OnInit, OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
flowAnalysisRuleState$ = this.store.select(selectFlowAnalysisRulesState);
selectedFlowAnalysisRuleId$ = this.store.select(selectFlowAnalysisRuleIdFromRoute);
currentUser$ = this.store.select(selectCurrentUser);
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectSingleEditedFlowAnalysisRule)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/general/general-form/general-form.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/general/general-form/general-form.component.ts
index 638193e78f..cfaf397639 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/general/general-form/general-form.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/general/general-form/general-form.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
import { ControllerEntity, GeneralState, UpdateControllerConfigRequest } from '../../../state/general';
import { Store } from '@ngrx/store';
@@ -48,6 +48,11 @@ import { NifiSpinnerDirective } from '../../../../../ui/common/spinner/nifi-spin
styleUrls: ['./general-form.component.scss']
})
export class GeneralForm {
+ private formBuilder = inject(FormBuilder);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
+ private store = inject<Store<GeneralState>>(Store);
+
private _controller!: ControllerEntity;
@Input() set controller(controller: ControllerEntity) {
@@ -59,12 +64,7 @@ export class GeneralForm {
currentUser$ = this.store.select(selectCurrentUser);
controllerForm: FormGroup;
- constructor(
- private formBuilder: FormBuilder,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService,
- private store: Store<GeneralState>
- ) {
+ constructor() {
// build the form
this.controllerForm = this.formBuilder.group({
timerDrivenThreadCount: new FormControl('', Validators.required)
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/general/general.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/general/general.component.ts
index 7155efd6e4..1ea047408b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/general/general.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/general/general.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { GeneralState } from '../../state/general';
import { Store } from '@ngrx/store';
import { loadControllerConfig, resetGeneralState } from '../../state/general/general.actions';
@@ -31,9 +31,9 @@ import { GeneralForm } from './general-form/general-form.component';
styleUrls: ['./general.component.scss']
})
export class General implements OnInit, OnDestroy {
- general$ = this.store.select(selectGeneral);
+ private store = inject<Store<GeneralState>>(Store);
- constructor(private store: Store<GeneralState>) {}
+ general$ = this.store.select(selectGeneral);
ngOnInit(): void {
this.store.dispatch(loadControllerConfig());
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.ts
index 44705d43e0..c7e8e158e5 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { ManagementControllerServicesState } from '../../state/management-controller-services';
import {
@@ -61,12 +61,14 @@ import { ControllerServiceTable } from '../../../../ui/common/controller-service
styleUrls: ['./management-controller-services.component.scss']
})
export class ManagementControllerServices implements OnInit, OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
serviceState$ = this.store.select(selectManagementControllerServicesState);
selectedServiceId$ = this.store.select(selectControllerServiceIdFromRoute);
currentUser$ = this.store.select(selectCurrentUser);
flowConfiguration$ = this.store.select(selectFlowConfiguration);
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectSingleEditedService)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.ts
index 2c57d4b903..7e7e3e5732 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.ts
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Input, Output } from '@angular/core';
-
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatTabsModule } from '@angular/material/tabs';
import { MatButtonModule } from '@angular/material/button';
@@ -75,6 +74,12 @@ import { ContextErrorBanner } from '../../../../../ui/common/context-error-banne
styleUrls: ['./edit-parameter-provider.component.scss']
})
export class EditParameterProvider extends TabbedDialog {
+ request = inject<EditParameterProviderRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
+
@Input() createNewProperty!: (existingProperties: string[], allowsSensitive: boolean) => Observable<Property>;
@Input() createNewService!: (request: InlineServiceCreationRequest) => Observable<InlineServiceCreationResponse>;
@Input() goToService!: (serviceId: string) => void;
@@ -90,14 +95,9 @@ export class EditParameterProvider extends TabbedDialog {
editParameterProviderForm: FormGroup;
readonly: boolean;
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: EditParameterProviderRequest,
- private formBuilder: FormBuilder,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {
+ constructor() {
super('edit-parameter-provider-selected-index');
+ const request = this.request;
this.readonly = !request.parameterProvider.permissions.canWrite;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.ts
index 52b8502d49..f7abcee750 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/fetch-parameter-provider-parameters.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, DestroyRef, inject, Inject, Input, OnInit } from '@angular/core';
+import { Component, DestroyRef, inject, Input, OnInit } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
@@ -71,6 +71,12 @@ import { ContextErrorBanner } from '../../../../../ui/common/context-error-banne
styleUrls: ['./fetch-parameter-provider-parameters.component.scss']
})
export class FetchParameterProviderParameters extends CloseOnEscapeDialog implements OnInit {
+ private formBuilder = inject(FormBuilder);
+ private clusterConnectionService = inject(ClusterConnectionService);
+ private nifiCommon = inject(NiFiCommon);
+ private store = inject<Store<ParameterProvidersState>>(Store);
+ request = inject<FetchParameterProviderDialogRequest>(MAT_DIALOG_DATA);
+
fetchParametersForm: FormGroup;
parameterProvider: ParameterProviderEntity;
selectedParameterGroup: ParameterGroupConfiguration | null = null;
@@ -103,14 +109,10 @@ export class FetchParameterProviderParameters extends CloseOnEscapeDialog implem
private destroyRef: DestroyRef = inject(DestroyRef);
- constructor(
- private formBuilder: FormBuilder,
- private clusterConnectionService: ClusterConnectionService,
- private nifiCommon: NiFiCommon,
- private store: Store<ParameterProvidersState>,
- @Inject(MAT_DIALOG_DATA) public request: FetchParameterProviderDialogRequest
- ) {
+ constructor() {
super();
+ const request = this.request;
+
this.parameterProvider = request.parameterProvider;
this.fetchParametersForm = this.formBuilder.group({});
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/parameter-groups-table/parameter-groups-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/parameter-groups-table/parameter-groups-table.component.ts
index 26cd03e79f..d9a6c617fb 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/parameter-groups-table/parameter-groups-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/parameter-groups-table/parameter-groups-table.component.ts
@@ -15,8 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
-
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MatSortModule, Sort } from '@angular/material/sort';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { ParameterGroupConfiguration } from '../../../../state/parameter-providers';
@@ -29,6 +28,8 @@ import { NiFiCommon } from '@nifi/shared';
styleUrls: ['./parameter-groups-table.component.scss']
})
export class ParameterGroupsTable {
+ private nifiCommon = inject(NiFiCommon);
+
parameterGroupsDataSource: MatTableDataSource<ParameterGroupConfiguration> =
new MatTableDataSource<ParameterGroupConfiguration>();
selectedParameterGroup: ParameterGroupConfiguration | null = null;
@@ -39,8 +40,6 @@ export class ParameterGroupsTable {
direction: 'asc'
};
- constructor(private nifiCommon: NiFiCommon) {}
-
@Input() set parameterGroups(parameterGroups: ParameterGroupConfiguration[]) {
this.parameterGroupsDataSource.data = this.sortEntities(parameterGroups, this.activeParameterGroupSort);
if (this.parameterGroupsDataSource.data.length > 0) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.ts
index 52da7d9c75..0aecadca2d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MatSortModule, Sort, SortDirection } from '@angular/material/sort';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
@@ -48,6 +48,8 @@ export type SupportedColumns = 'name' | 'type' | 'bundle';
styleUrls: ['./parameter-providers-table.component.scss']
})
export class ParameterProvidersTable {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() initialSortColumn: SupportedColumns = 'name';
@Input() initialSortDirection: SortDirection = 'asc';
@@ -58,8 +60,6 @@ export class ParameterProvidersTable {
direction: this.initialSortDirection
};
- constructor(private nifiCommon: NiFiCommon) {}
-
@Input() selectedParameterProviderId!: string;
@Input() currentUser!: CurrentUser;
@Input() flowConfiguration!: FlowConfiguration;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.ts
index 384319f6b8..356d9c4969 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../../state';
import { ParameterProviderEntity, ParameterProvidersState } from '../../state/parameter-providers';
@@ -46,12 +46,14 @@ import { ParameterProvidersTable } from './parameter-providers-table/parameter-p
styleUrls: ['./parameter-providers.component.scss']
})
export class ParameterProviders implements OnInit, OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
currentUser$ = this.store.select(selectCurrentUser);
parameterProvidersState$ = this.store.select(selectParameterProvidersState);
selectedParameterProviderId$ = this.store.select(selectParameterProviderIdFromRoute);
flowConfiguration$ = this.store.select(selectFlowConfiguration);
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectSingleEditedParameterProvider)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/create-registry-client/create-registry-client.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/create-registry-client/create-registry-client.component.ts
index 4f6b0c8e2d..4f1bf9135f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/create-registry-client/create-registry-client.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/create-registry-client/create-registry-client.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MatDialogModule } from '@angular/material/dialog';
import { ReactiveFormsModule } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';
@@ -48,6 +48,10 @@ import { ExtensionTypesLoadingStatus } from '../../../../../state/extension-type
styleUrls: ['./create-registry-client.component.scss']
})
export class CreateRegistryClient {
+ private nifiCommon = inject(NiFiCommon);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
+
@Input() saving$!: Observable<boolean>;
@Input() registryClientTypes$!: Observable<DocumentedType[]>;
@Input() registryClientTypesLoadingStatus$!: Observable<ExtensionTypesLoadingStatus>;
@@ -56,12 +60,6 @@ export class CreateRegistryClient {
protected readonly TextTip = TextTip;
- constructor(
- private nifiCommon: NiFiCommon,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService
- ) {}
-
registryClientTypeSelected(registryClientType: DocumentedType) {
const request: CreateRegistryClientRequest = {
revision: {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.ts
index 7ab52a20da..0986ac165b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { AbstractControl, FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms';
import { MatInputModule } from '@angular/material/input';
@@ -61,6 +61,12 @@ import { ContextErrorBanner } from '../../../../../ui/common/context-error-banne
styleUrls: ['./edit-registry-client.component.scss']
})
export class EditRegistryClient extends TabbedDialog {
+ request = inject<EditRegistryClientDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
+
@Input() createNewProperty!: (existingProperties: string[], allowsSensitive: boolean) => Observable<Property>;
@Input() createNewService!: (request: InlineServiceCreationRequest) => Observable<InlineServiceCreationResponse>;
@Input() goToService!: (serviceId: string) => void;
@@ -72,14 +78,9 @@ export class EditRegistryClient extends TabbedDialog {
editRegistryClientForm: FormGroup;
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: EditRegistryClientDialogRequest,
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService
- ) {
+ constructor() {
super('edit-registry-client-selected-index');
+ const request = this.request;
const serviceProperties: any = request.registryClient.component.properties;
const properties: Property[] = Object.entries(serviceProperties).map((entry: any) => {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.ts
index ea9763e807..6b8ff63728 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { MatSortModule, Sort } from '@angular/material/sort';
import { ReportingTaskEntity } from '../../../state/reporting-tasks';
@@ -33,6 +33,8 @@ import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
imports: [MatTableModule, MatSortModule, NifiTooltipDirective, MatIconButton, MatMenuTrigger, MatMenu, MatMenuItem]
})
export class RegistryClientTable {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() set registryClients(registryClientEntities: RegistryClientEntity[]) {
if (registryClientEntities) {
this.dataSource.data = this.sortEvents(registryClientEntities, this.sort);
@@ -57,8 +59,6 @@ export class RegistryClientTable {
direction: 'asc'
};
- constructor(private nifiCommon: NiFiCommon) {}
-
canRead(entity: RegistryClientEntity): boolean {
return entity.permissions.canRead;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.ts
index 4b201620f4..9a3b6452fc 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import {
selectRegistryClient,
@@ -51,11 +51,13 @@ import { RegistryClientTable } from './registry-client-table/registry-client-tab
styleUrls: ['./registry-clients.component.scss']
})
export class RegistryClients implements OnInit, OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
registryClientsState$ = this.store.select(selectRegistryClientsState);
selectedRegistryClientId$ = this.store.select(selectRegistryClientIdFromRoute);
currentUser$ = this.store.select(selectCurrentUser);
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectSingleEditedRegistryClient)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/create-reporting-task/create-reporting-task.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/create-reporting-task/create-reporting-task.component.ts
index 94da39ac08..197932cb4a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/create-reporting-task/create-reporting-task.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/create-reporting-task/create-reporting-task.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { ExtensionCreation } from '../../../../../ui/common/extension-creation/extension-creation.component';
import { ReportingTasksState } from '../../../state/reporting-tasks';
@@ -37,17 +37,13 @@ import {
styleUrls: ['./create-reporting-task.component.scss']
})
export class CreateReportingTask extends CloseOnEscapeDialog {
+ private store = inject<Store<ReportingTasksState>>(Store);
+ private client = inject(Client);
+
reportingTaskTypes$ = this.store.select(selectReportingTaskTypes);
reportingTaskTypesLoadingStatus$ = this.store.select(selectExtensionTypesLoadingStatus);
saving$ = this.store.select(selectSaving);
- constructor(
- private store: Store<ReportingTasksState>,
- private client: Client
- ) {
- super();
- }
-
createReportingTask(reportingTaskType: DocumentedType): void {
this.store.dispatch(
createReportingTask({
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.ts
index f11792515a..c07aab4bc9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatInputModule } from '@angular/material/input';
import { MatCheckboxModule } from '@angular/material/checkbox';
@@ -76,6 +76,12 @@ import { ContextErrorBanner } from '../../../../../ui/common/context-error-banne
styleUrls: ['./edit-reporting-task.component.scss']
})
export class EditReportingTask extends TabbedDialog {
+ request = inject<EditReportingTaskDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
+
@Input() createNewProperty!: (existingProperties: string[], allowsSensitive: boolean) => Observable<Property>;
@Input() createNewService!: (request: InlineServiceCreationRequest) => Observable<InlineServiceCreationResponse>;
@Input() goToService!: (serviceId: string) => void;
@@ -109,14 +115,9 @@ export class EditReportingTask extends TabbedDialog {
}
];
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: EditReportingTaskDialogRequest,
- private formBuilder: FormBuilder,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {
+ constructor() {
super('edit-reporting-task-selected-index');
+ const request = this.request;
this.readonly =
!request.reportingTask.permissions.canWrite ||
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.ts
index d547b3756f..19e741a636 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
import { MatSortModule, Sort } from '@angular/material/sort';
import { ReportingTaskEntity } from '../../../state/reporting-tasks';
@@ -45,6 +45,8 @@ import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu';
]
})
export class ReportingTaskTable {
+ private nifiCommon = inject(NiFiCommon);
+
@Input() initialSortColumn: 'name' | 'type' | 'bundle' | 'state' = 'name';
@Input() initialSortDirection: 'asc' | 'desc' = 'asc';
activeSort: Sort = {
@@ -79,8 +81,6 @@ export class ReportingTaskTable {
displayedColumns: string[] = ['moreDetails', 'name', 'type', 'bundle', 'state', 'actions'];
dataSource: MatTableDataSource<ReportingTaskEntity> = new MatTableDataSource<ReportingTaskEntity>();
- constructor(private nifiCommon: NiFiCommon) {}
-
canRead(entity: ReportingTaskEntity): boolean {
return entity.permissions.canRead;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-tasks.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-tasks.component.ts
index e61e5af253..4ac49f34f5 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-tasks.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-tasks.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { takeUntilDestroyed } from '@angular/core/rxjs-interop';
import { Store } from '@ngrx/store';
import { filter, switchMap, take } from 'rxjs';
@@ -59,12 +59,14 @@ import { ReportingTaskTable } from './reporting-task-table/reporting-task-table.
styleUrls: ['./reporting-tasks.component.scss']
})
export class ReportingTasks implements OnInit, OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
reportingTaskState$ = this.store.select(selectReportingTasksState);
selectedReportingTaskId$ = this.store.select(selectReportingTaskIdFromRoute);
currentUser$ = this.store.select(selectCurrentUser);
flowConfiguration$ = this.store.select(selectFlowConfiguration);
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.store
.select(selectSingleEditedReportingTask)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/feature/summary.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/feature/summary.component.ts
index c9fac63766..5135a5240f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/feature/summary.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/feature/summary.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Component, OnDestroy, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../state';
import { loadSummaryListing, resetSummaryState } from '../state/summary-listing/summary-listing.actions';
@@ -37,6 +37,8 @@ interface TabLink {
standalone: false
})
export class Summary implements OnInit, OnDestroy {
+ private store = inject<Store<NiFiState>>(Store);
+
tabLinks: TabLink[] = [
{ label: 'Processors', link: 'processors' },
{ label: 'Input Ports', link: 'input-ports' },
@@ -49,7 +51,7 @@ export class Summary implements OnInit, OnDestroy {
clusterSummary$ = this.store.select(selectClusterSummary);
selectedClusterNode$ = this.store.select(selectSelectedClusterNode).pipe(isDefinedAndNotNull());
- constructor(private store: Store<NiFiState>) {
+ constructor() {
this.clusterSummary$.pipe(takeUntilDestroyed(), isDefinedAndNotNull()).subscribe((clusterSummary) => {
if (clusterSummary.connectedToCluster) {
this.store.dispatch(searchCluster({ request: {} }));
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/service/component-cluster-status.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/service/component-cluster-status.service.ts
index 8c87828d33..17a6dd6507 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/service/component-cluster-status.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/service/component-cluster-status.service.ts
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Observable } from 'rxjs';
import { ComponentType } from '@nifi/shared';
@Injectable({ providedIn: 'root' })
export class ComponentClusterStatusService {
- private static readonly API = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API = '../nifi-api';
getClusterStatus(componentId: string, componentType: ComponentType, nodewise: boolean = true): Observable<any> {
let componentPath: string;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/service/process-group-status.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/service/process-group-status.service.ts
index ce793a76ce..1581f96917 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/service/process-group-status.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/service/process-group-status.service.ts
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Observable } from 'rxjs';
import { LoadSummaryRequest } from '../state/summary-listing';
@Injectable({ providedIn: 'root' })
export class ProcessGroupStatusService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getProcessGroupsStatus(request: LoadSummaryRequest): Observable<any> {
let params: HttpParams = new HttpParams();
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts
index 5308434d33..f3c67b85e0 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/state/component-cluster-status/component-cluster-status.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import { NiFiState } from '../../../../state';
@@ -33,13 +33,11 @@ import * as ErrorActions from '../../../../state/error/error.actions';
@Injectable()
export class ComponentClusterStatusEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private errorHelper: ErrorHelper,
- private clusterStatusService: ComponentClusterStatusService,
- private dialog: MatDialog
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private errorHelper = inject(ErrorHelper);
+ private clusterStatusService = inject(ComponentClusterStatusService);
+ private dialog = inject(MatDialog);
loadComponentClusterStatusAndOpenDialog$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/state/summary-listing/summary-listing.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/state/summary-listing/summary-listing.effects.ts
index 686dc30927..76e9af00a7 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/state/summary-listing/summary-listing.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/state/summary-listing/summary-listing.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import { Store } from '@ngrx/store';
@@ -33,13 +33,11 @@ import { LoadSummaryRequest } from './index';
@Injectable()
export class SummaryListingEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private pgStatusService: ProcessGroupStatusService,
- private errorHelper: ErrorHelper,
- private router: Router
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private pgStatusService = inject(ProcessGroupStatusService);
+ private errorHelper = inject(ErrorHelper);
+ private router = inject(Router);
loadSummaryListing$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.ts
index 080753ca94..d61c63a3df 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/cluster-summary-dialog/cluster-summary-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
MAT_DIALOG_DATA,
MatDialogActions,
@@ -71,6 +71,9 @@ interface Helper {
styleUrl: './cluster-summary-dialog.component.scss'
})
export class ClusterSummaryDialog extends CloseOnEscapeDialog {
+ private store = inject<Store<ComponentClusterStatusState>>(Store);
+ private clusterStatusRequest = inject<ComponentClusterStatusRequest>(MAT_DIALOG_DATA);
+
loading$: Observable<boolean> = this.store
.select(selectComponentClusterStatusLoadingStatus)
.pipe(map((status) => status === 'loading'));
@@ -88,11 +91,10 @@ export class ClusterSummaryDialog extends CloseOnEscapeDialog {
}
};
- constructor(
- private store: Store<ComponentClusterStatusState>,
- @Inject(MAT_DIALOG_DATA) private clusterStatusRequest: ComponentClusterStatusRequest
- ) {
+ constructor() {
super();
+ const clusterStatusRequest = this.clusterStatusRequest;
+
this.componentId = clusterStatusRequest.id;
this.componentType = clusterStatusRequest.componentType;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/port-status-table/port-status-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/port-status-table/port-status-table.component.ts
index 9b8aff9b84..f8281ef4bd 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/port-status-table/port-status-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/port-status-table/port-status-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MatSortModule, Sort } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
@@ -48,16 +48,14 @@ export type SupportedColumns = 'name' | 'runStatus' | 'in' | 'out';
styleUrls: ['./port-status-table.component.scss']
})
export class PortStatusTable extends ComponentStatusTable<PortStatusSnapshotEntity> {
+ private nifiCommon = inject(NiFiCommon);
+
private _portType!: 'input' | 'output';
filterableColumns: SummaryTableFilterColumn[] = [{ key: 'name', label: 'name' }];
displayedColumns: string[] = [];
- constructor(private nifiCommon: NiFiCommon) {
- super();
- }
-
@Input() set portType(type: 'input' | 'output') {
if (type === 'input') {
this.displayedColumns = ['name', 'runStatus', 'out', 'actions'];
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/summary-table-filter/summary-table-filter.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/summary-table-filter/summary-table-filter.component.ts
index b983ed84f4..de77c3b026 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/summary-table-filter/summary-table-filter.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/common/summary-table-filter/summary-table-filter.component.ts
@@ -50,6 +50,8 @@ export interface SummaryTableFilterContext extends SummaryTableFilterArgs {
styleUrls: ['./summary-table-filter.component.scss']
})
export class SummaryTableFilter implements AfterViewInit {
+ private formBuilder = inject(FormBuilder);
+
filterForm: FormGroup;
private _filteredCount = 0;
private _totalCount = 0;
@@ -166,7 +168,7 @@ export class SummaryTableFilter implements AfterViewInit {
return this._totalCount;
}
- constructor(private formBuilder: FormBuilder) {
+ constructor() {
this.filterForm = this.formBuilder.group({
filterTerm: '',
filterColumn: this._initialFilterColumn || 'name',
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-listing.component.ts
index 586dc75430..0ea9448343 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { SummaryListingState } from '../../state/summary-listing';
import { initialState } from '../../state/summary-listing/summary-listing.reducer';
@@ -53,6 +53,8 @@ import { ConnectionStatusTable } from './connection-status-table/connection-stat
styleUrls: ['./connection-status-listing.component.scss']
})
export class ConnectionStatusListing {
+ private store = inject<Store<SummaryListingState>>(Store);
+
loadedTimestamp$ = this.store.select(selectSummaryListingLoadedTimestamp);
summaryListingStatus$ = this.store.select(selectSummaryListingStatus);
currentUser$ = this.store.select(selectCurrentUser);
@@ -68,7 +70,7 @@ export class ConnectionStatusListing {
);
selectedClusterNode$ = this.store.select(selectSelectedClusterNode);
- constructor(private store: Store<SummaryListingState>) {
+ constructor() {
this.store
.select(selectViewStatusHistory)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.ts
index 12372947f7..908e963dc8 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MatSortModule, Sort } from '@angular/material/sort';
import { ComponentType, NiFiCommon } from '@nifi/shared';
@@ -59,6 +59,8 @@ export type SupportedColumns =
styleUrls: ['./connection-status-table.component.scss']
})
export class ConnectionStatusTable extends ComponentStatusTable<ConnectionStatusSnapshotEntity> {
+ private nifiCommon = inject(NiFiCommon);
+
filterableColumns: SummaryTableFilterColumn[] = [
{ key: 'sourceName', label: 'source' },
{ key: 'name', label: 'name' },
@@ -78,10 +80,6 @@ export class ConnectionStatusTable extends ComponentStatusTable<ConnectionStatus
'actions'
];
- constructor(private nifiCommon: NiFiCommon) {
- super();
- }
-
override filterPredicate(data: ConnectionStatusSnapshotEntity, filter: string): boolean {
const { filterTerm, filterColumn } = JSON.parse(filter);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/input-port-status-listing/input-port-status-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/input-port-status-listing/input-port-status-listing.component.ts
index cff37c9028..8da8d2eaee 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/input-port-status-listing/input-port-status-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/input-port-status-listing/input-port-status-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
selectInputPortIdFromRoute,
selectInputPortStatusSnapshots,
@@ -49,6 +49,8 @@ import { PortStatusTable } from '../common/port-status-table/port-status-table.c
styleUrls: ['./input-port-status-listing.component.scss']
})
export class InputPortStatusListing {
+ private store = inject<Store<SummaryListingState>>(Store);
+
portStatusSnapshots$ = this.store.select(selectInputPortStatusSnapshots);
loadedTimestamp$ = this.store.select(selectSummaryListingLoadedTimestamp);
summaryListingStatus$ = this.store.select(selectSummaryListingStatus);
@@ -64,8 +66,6 @@ export class InputPortStatusListing {
);
selectedClusterNode$ = this.store.select(selectSelectedClusterNode);
- constructor(private store: Store<SummaryListingState>) {}
-
isInitialLoading(loadedTimestamp: string): boolean {
return loadedTimestamp == initialState.loadedTimestamp;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/output-port-status-listing/output-port-status-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/output-port-status-listing/output-port-status-listing.component.ts
index 7365068cf8..ea8e28ecff 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/output-port-status-listing/output-port-status-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/output-port-status-listing/output-port-status-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
selectOutputPortIdFromRoute,
selectOutputPortStatusSnapshots,
@@ -49,6 +49,8 @@ import { PortStatusTable } from '../common/port-status-table/port-status-table.c
styleUrls: ['./output-port-status-listing.component.scss']
})
export class OutputPortStatusListing {
+ private store = inject<Store<SummaryListingState>>(Store);
+
portStatusSnapshots$ = this.store.select(selectOutputPortStatusSnapshots);
loadedTimestamp$ = this.store.select(selectSummaryListingLoadedTimestamp);
summaryListingStatus$ = this.store.select(selectSummaryListingStatus);
@@ -64,8 +66,6 @@ export class OutputPortStatusListing {
);
selectedClusterNode$ = this.store.select(selectSelectedClusterNode);
- constructor(private store: Store<SummaryListingState>) {}
-
isInitialLoading(loadedTimestamp: string): boolean {
return loadedTimestamp == initialState.loadedTimestamp;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-listing.component.ts
index 1afd21c21e..292411a013 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { initialState } from '../../state/summary-listing/summary-listing.reducer';
import * as SummaryListingActions from '../../state/summary-listing/summary-listing.actions';
import { SummaryListingState } from '../../state/summary-listing';
@@ -54,6 +54,8 @@ import { ProcessGroupStatusTable } from './process-group-status-table/process-gr
styleUrls: ['./process-group-status-listing.component.scss']
})
export class ProcessGroupStatusListing {
+ private store = inject<Store<SummaryListingState>>(Store);
+
processGroupStatusSnapshots$ = this.store.select(selectProcessGroupStatusSnapshots);
loadedTimestamp$ = this.store.select(selectSummaryListingLoadedTimestamp);
summaryListingStatus$ = this.store.select(selectSummaryListingStatus);
@@ -70,7 +72,7 @@ export class ProcessGroupStatusListing {
);
selectedClusterNode$ = this.store.select(selectSelectedClusterNode);
- constructor(private store: Store<SummaryListingState>) {
+ constructor() {
this.store
.select(selectViewStatusHistory)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-table/process-group-status-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-table/process-group-status-table.component.ts
index a7d6fe7ee6..6d9cf6e1e9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-table/process-group-status-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/process-group-status-listing/process-group-status-table/process-group-status-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Input } from '@angular/core';
+import { Component, Input, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MatSortModule, Sort } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table';
@@ -61,6 +61,8 @@ export type SupportedColumns =
styleUrls: ['./process-group-status-table.component.scss']
})
export class ProcessGroupStatusTable extends ComponentStatusTable<ProcessGroupStatusSnapshotEntity> {
+ private nifiCommon = inject(NiFiCommon);
+
filterableColumns: SummaryTableFilterColumn[] = [{ key: 'name', label: 'name' }];
displayedColumns: string[] = [
@@ -77,10 +79,6 @@ export class ProcessGroupStatusTable extends ComponentStatusTable<ProcessGroupSt
'actions'
];
- constructor(private nifiCommon: NiFiCommon) {
- super();
- }
-
@Input() rootProcessGroup!: ProcessGroupStatusSnapshot;
override filterPredicate(data: ProcessGroupStatusSnapshotEntity, filter: string): boolean {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.ts
index 6cdfdb0a55..2c213f853a 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.ts
@@ -54,6 +54,8 @@ import { NgxSkeletonLoaderComponent } from 'ngx-skeleton-loader';
styleUrls: ['./processor-status-listing.component.scss']
})
export class ProcessorStatusListing implements AfterViewInit, OnDestroy {
+ private store = inject<Store<SummaryListingState>>(Store);
+
private destroyRef = inject(DestroyRef);
processorStatusSnapshots$ = this.store.select(selectProcessorStatusSnapshots);
@@ -76,7 +78,7 @@ export class ProcessorStatusListing implements AfterViewInit, OnDestroy {
@ViewChild(ProcessorStatusTable) table!: ProcessorStatusTable;
private subject: Subject<void> = new Subject<void>();
- constructor(private store: Store<SummaryListingState>) {
+ constructor() {
this.store
.select(selectViewStatusHistory)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.ts
index 210b755fe9..1a376c6a34 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-table/processor-status-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MatTableModule } from '@angular/material/table';
import { MatSortModule, Sort } from '@angular/material/sort';
import {
@@ -51,6 +51,8 @@ export type SupportedColumns = 'name' | 'type' | 'processGroup' | 'runStatus' |
]
})
export class ProcessorStatusTable extends ComponentStatusTable<ProcessorStatusSnapshotEntity> {
+ private nifiCommon = inject(NiFiCommon);
+
filterableColumns: SummaryTableFilterColumn[] = [
{ key: 'name', label: 'name' },
{ key: 'type', label: 'type' }
@@ -68,10 +70,6 @@ export class ProcessorStatusTable extends ComponentStatusTable<ProcessorStatusSn
'actions'
];
- constructor(private nifiCommon: NiFiCommon) {
- super();
- }
-
formatName(processor: ProcessorStatusSnapshotEntity): string {
return processor.processorStatusSnapshot.name;
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-listing.component.ts
index 946c1a2968..e6df7a3948 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import {
selectRemoteProcessGroupIdFromRoute,
selectRemoteProcessGroupStatus,
@@ -53,6 +53,8 @@ import { RemoteProcessGroupStatusTable } from './remote-process-group-status-tab
styleUrls: ['./remote-process-group-status-listing.component.scss']
})
export class RemoteProcessGroupStatusListing {
+ private store = inject<Store<SummaryListingState>>(Store);
+
loadedTimestamp$ = this.store.select(selectSummaryListingLoadedTimestamp);
summaryListingStatus$ = this.store.select(selectSummaryListingStatus);
currentUser$ = this.store.select(selectCurrentUser);
@@ -68,7 +70,7 @@ export class RemoteProcessGroupStatusListing {
);
selectedClusterNode$ = this.store.select(selectSelectedClusterNode);
- constructor(private store: Store<SummaryListingState>) {
+ constructor() {
this.store
.select(selectViewStatusHistory)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-table/remote-process-group-status-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-table/remote-process-group-status-table.component.ts
index beaf594b7a..a46494c5a9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-table/remote-process-group-status-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-table/remote-process-group-status-table.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MatSortModule, Sort } from '@angular/material/sort';
import {
@@ -51,16 +51,14 @@ export type SupportedColumns = 'name' | 'uri' | 'transmitting' | 'sent' | 'recei
styleUrls: ['./remote-process-group-status-table.component.scss']
})
export class RemoteProcessGroupStatusTable extends ComponentStatusTable<RemoteProcessGroupStatusSnapshotEntity> {
+ private nifiCommon = inject(NiFiCommon);
+
filterableColumns: SummaryTableFilterColumn[] = [
{ key: 'name', label: 'name' },
{ key: 'targetUri', label: 'uri' }
];
displayedColumns: string[] = ['name', 'uri', 'transmitting', 'sent', 'received', 'actions'];
- constructor(private nifiCommon: NiFiCommon) {
- super();
- }
-
override filterPredicate(data: RemoteProcessGroupStatusSnapshotEntity, filter: string): boolean {
const { filterTerm, filterColumn } = JSON.parse(filter);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/feature/users.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/feature/users.component.ts
index 12eab66172..67f5382ee5 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/feature/users.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/feature/users.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnDestroy } from '@angular/core';
+import { Component, OnDestroy, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../state';
import { resetUsersState } from '../state/user-listing/user-listing.actions';
@@ -27,7 +27,7 @@ import { resetUsersState } from '../state/user-listing/user-listing.actions';
standalone: false
})
export class Users implements OnDestroy {
- constructor(private store: Store<NiFiState>) {}
+ private store = inject<Store<NiFiState>>(Store);
ngOnDestroy(): void {
this.store.dispatch(resetUsersState());
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/service/users.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/service/users.service.ts
index 594f383ff2..8f2764c6ee 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/service/users.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/service/users.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
import { Client } from '../../../service/client.service';
import { Observable } from 'rxjs';
@@ -31,14 +31,12 @@ import { ClusterConnectionService } from '../../../service/cluster-connection.se
@Injectable({ providedIn: 'root' })
export class UsersService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getUsers(): Observable<any> {
return this.httpClient.get(`${UsersService.API}/tenants/users`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts
index e5525170a2..a8598f24df 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import { NiFiState } from '../../../../state';
@@ -40,18 +40,16 @@ import { ErrorContextKey } from '../../../../state/error';
@Injectable()
export class UserListingEffects {
- private requestId = 0;
+ private actions$ = inject(Actions);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
+ private store = inject<Store<NiFiState>>(Store);
+ private router = inject(Router);
+ private usersService = inject(UsersService);
+ private errorHelper = inject(ErrorHelper);
+ private dialog = inject(MatDialog);
- constructor(
- private actions$: Actions,
- private client: Client,
- private nifiCommon: NiFiCommon,
- private store: Store<NiFiState>,
- private router: Router,
- private usersService: UsersService,
- private errorHelper: ErrorHelper,
- private dialog: MatDialog
- ) {}
+ private requestId = 0;
loadTenants$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.ts
index 0cd06b6b16..b8d608557f 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, Inject } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatTableDataSource, MatTableModule } from '@angular/material/table';
@@ -43,6 +43,9 @@ import { ComponentType, SelectOption, CloseOnEscapeDialog, NiFiCommon } from '@n
styleUrls: ['./user-access-policies.component.scss']
})
export class UserAccessPolicies extends CloseOnEscapeDialog {
+ request = inject<UserAccessPoliciesDialogRequest>(MAT_DIALOG_DATA);
+ private nifiCommon = inject(NiFiCommon);
+
displayedColumns: string[] = ['policy', 'action', 'actions'];
dataSource: MatTableDataSource<AccessPolicySummaryEntity> = new MatTableDataSource<AccessPolicySummaryEntity>();
selectedPolicyId: string | null = null;
@@ -52,11 +55,10 @@ export class UserAccessPolicies extends CloseOnEscapeDialog {
direction: 'asc'
};
- constructor(
- @Inject(MAT_DIALOG_DATA) public request: UserAccessPoliciesDialogRequest,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
super();
+ const request = this.request;
+
this.dataSource.data = this.sortPolicies(request.accessPolicies, this.sort);
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-listing.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-listing.component.ts
index 485450810a..c7586e68e2 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-listing.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-listing.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { selectCurrentUser } from '../../../../state/current-user/current-user.selectors';
import { UserListingState } from '../../state/user-listing';
@@ -55,12 +55,14 @@ import { MatIconButton } from '@angular/material/button';
styleUrls: ['./user-listing.component.scss']
})
export class UserListing implements OnInit {
+ private store = inject<Store<UserListingState>>(Store);
+
flowConfiguration$ = this.store.select(selectFlowConfiguration);
userListingState$ = this.store.select(selectUserListingState);
selectedTenantId$ = this.store.select(selectTenantIdFromRoute);
currentUser$ = this.store.select(selectCurrentUser);
- constructor(private store: Store<UserListingState>) {
+ constructor() {
this.store
.select(selectSingleEditedTenant)
.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.ts
index 309bac121f..d349d4b286 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.ts
@@ -62,6 +62,9 @@ export interface Tenants {
styleUrls: ['./user-table.component.scss']
})
export class UserTable implements AfterViewInit {
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
filterTerm = '';
filterColumn: 'user' | 'membership' = 'user';
totalCount = 0;
@@ -137,10 +140,7 @@ export class UserTable implements AfterViewInit {
direction: 'asc'
};
- constructor(
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
this.filterForm = this.formBuilder.group({ filterTerm: '', filterColumn: 'user' });
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/about.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/about.service.ts
index 9cabf5f1a9..aa638291cd 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/about.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/about.service.ts
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
@Injectable({ providedIn: 'root' })
export class AboutService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getAbout(): Observable<any> {
return this.httpClient.get(`${AboutService.API}/flow/about`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/auth.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/auth.service.ts
index e39d8cb475..0640e835a8 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/auth.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/auth.service.ts
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
@Injectable({ providedIn: 'root' })
export class AuthService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
public getLoginConfiguration(): Observable<any> {
return this.httpClient.get(`${AuthService.API}/authentication/configuration`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/banner-text.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/banner-text.service.ts
index 5ab78ba0a4..401b045655 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/banner-text.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/banner-text.service.ts
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import { BannerTextEntity } from '../state/banner-text';
@Injectable({ providedIn: 'root' })
export class BannerTextService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getBannerText(): Observable<BannerTextEntity> {
return this.httpClient.get<BannerTextEntity>(`${BannerTextService.API}/flow/banners`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/client.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/client.service.ts
index fe2d7167d5..d9565d01f0 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/client.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/client.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { v4 as uuidv4 } from 'uuid';
import { SessionStorageService } from '@nifi/shared';
@@ -23,9 +23,11 @@ import { SessionStorageService } from '@nifi/shared';
providedIn: 'root'
})
export class Client {
+ private sessionStorage = inject(SessionStorageService);
+
private clientId: string;
- constructor(private sessionStorage: SessionStorageService) {
+ constructor() {
let clientId = this.sessionStorage.getItem<string>('clientId');
if (clientId === null) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/cluster-connection.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/cluster-connection.service.ts
index da4e4f2419..e4c8ebe5f3 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/cluster-connection.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/cluster-connection.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Store } from '@ngrx/store';
import { ClusterSummaryState } from '../state/cluster-summary';
import { selectDisconnectionAcknowledged } from '../state/cluster-summary/cluster-summary.selectors';
@@ -24,9 +24,9 @@ import { selectDisconnectionAcknowledged } from '../state/cluster-summary/cluste
providedIn: 'root'
})
export class ClusterConnectionService {
- private disconnectionAcknowledged = this.store.selectSignal(selectDisconnectionAcknowledged);
+ private store = inject<Store<ClusterSummaryState>>(Store);
- constructor(private store: Store<ClusterSummaryState>) {}
+ private disconnectionAcknowledged = this.store.selectSignal(selectDisconnectionAcknowledged);
isDisconnectionAcknowledged(): boolean {
return this.disconnectionAcknowledged();
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/cluster.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/cluster.service.ts
index 36e22b5102..5bddd4ffa7 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/cluster.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/cluster.service.ts
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient, HttpParams } from '@angular/common/http';
import { ClusterSearchResults } from '../state/cluster-summary';
@Injectable({ providedIn: 'root' })
export class ClusterService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getClusterSummary(): Observable<any> {
return this.httpClient.get(`${ClusterService.API}/flow/cluster/summary`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/component-state.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/component-state.service.ts
index 435edfd4f1..95807994dd 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/component-state.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/component-state.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { ClearComponentStateRequest, ComponentStateEntity, LoadComponentStateRequest } from '../state/component-state';
import { Observable } from 'rxjs';
@@ -23,10 +23,8 @@ import { NiFiCommon } from '@nifi/shared';
@Injectable({ providedIn: 'root' })
export class ComponentStateService {
- constructor(
- private httpClient: HttpClient,
- private nifiCommon: NiFiCommon
- ) {}
+ private httpClient = inject(HttpClient);
+ private nifiCommon = inject(NiFiCommon);
getComponentState(request: LoadComponentStateRequest): Observable<ComponentStateEntity> {
return this.httpClient.get<ComponentStateEntity>(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/controller-service-state.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/controller-service-state.service.ts
index f94d464ce8..ef8bf602f9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/controller-service-state.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/controller-service-state.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import {
@@ -29,14 +29,12 @@ import { ClusterConnectionService } from './cluster-connection.service';
@Injectable({ providedIn: 'root' })
export class ControllerServiceStateService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private nifiCommon = inject(NiFiCommon);
+ private client = inject(Client);
+ private clusterConnectionService = inject(ClusterConnectionService);
- constructor(
- private httpClient: HttpClient,
- private nifiCommon: NiFiCommon,
- private client: Client,
- private clusterConnectionService: ClusterConnectionService
- ) {}
+ private static readonly API: string = '../nifi-api';
getControllerService(id: string): Observable<any> {
const uiOnly: any = { uiOnly: true };
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/current-user.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/current-user.service.ts
index feb06e9ee6..cad8bc8967 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/current-user.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/current-user.service.ts
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
@Injectable({ providedIn: 'root' })
export class CurrentUserService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getUser(): Observable<any> {
return this.httpClient.get(`${CurrentUserService.API}/flow/current-user`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/extension-types.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/extension-types.service.ts
index 0cb93ba8de..477b1b6510 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/extension-types.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/extension-types.service.ts
@@ -15,16 +15,16 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
import { Bundle } from '../state/shared';
@Injectable({ providedIn: 'root' })
export class ExtensionTypesService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getProcessorTypes(): Observable<any> {
return this.httpClient.get(`${ExtensionTypesService.API}/flow/processor-types`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/flow-configuration.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/flow-configuration.service.ts
index 9a5b323539..1dcd1fe0f6 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/flow-configuration.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/flow-configuration.service.ts
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Observable } from 'rxjs';
import { HttpClient } from '@angular/common/http';
@Injectable({ providedIn: 'root' })
export class FlowConfigurationService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
- constructor(private httpClient: HttpClient) {}
+ private static readonly API: string = '../nifi-api';
getFlowConfiguration(): Observable<any> {
return this.httpClient.get(`${FlowConfigurationService.API}/flow/config`);
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/property-table-helper.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/property-table-helper.service.ts
index e246e7a492..49375ba5d7 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/property-table-helper.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/property-table-helper.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { MatDialog } from '@angular/material/dialog';
import { catchError, EMPTY, map, Observable, of, switchMap, take, takeUntil, tap } from 'rxjs';
import {
@@ -46,16 +46,14 @@ import { ErrorHelper } from './error-helper.service';
providedIn: 'root'
})
export class PropertyTableHelperService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private dialog = inject(MatDialog);
+ private store = inject<Store<NiFiState>>(Store);
+ private extensionTypesService = inject(ExtensionTypesService);
+ private client = inject(Client);
+ private errorHelper = inject(ErrorHelper);
- constructor(
- private httpClient: HttpClient,
- private dialog: MatDialog,
- private store: Store<NiFiState>,
- private extensionTypesService: ExtensionTypesService,
- private client: Client,
- private errorHelper: ErrorHelper
- ) {}
+ private static readonly API: string = '../nifi-api';
getComponentHistory(componentId: string): Observable<ComponentHistoryEntity> {
return this.httpClient.get<ComponentHistoryEntity>(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/property-verification.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/property-verification.service.ts
index df0deadc55..d5251278c1 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/property-verification.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/property-verification.service.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Client } from './client.service';
import {
@@ -29,13 +29,11 @@ import { NiFiCommon } from '@nifi/shared';
@Injectable({ providedIn: 'root' })
export class PropertyVerificationService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
+ private nifiCommon = inject(NiFiCommon);
- constructor(
- private httpClient: HttpClient,
- private client: Client,
- private nifiCommon: NiFiCommon
- ) {}
+ private static readonly API: string = '../nifi-api';
getAnalysis(request: VerifyPropertiesRequestContext): Observable<ConfigurationAnalysisResponse> {
const body = {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/status-history.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/status-history.service.ts
index fe1e15d8c0..ddca7d6014 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/status-history.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/status-history.service.ts
@@ -15,19 +15,17 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Client } from './client.service';
import { ComponentType } from '@nifi/shared';
@Injectable({ providedIn: 'root' })
export class StatusHistoryService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
- constructor(
- private httpClient: HttpClient,
- private client: Client
- ) {}
+ private static readonly API: string = '../nifi-api';
getComponentStatusHistory(componentType: ComponentType, componentId: string) {
let componentPath: string;
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/system-diagnostics.service.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/system-diagnostics.service.ts
index 6f59d3cf98..de2de7d60d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/system-diagnostics.service.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/service/system-diagnostics.service.ts
@@ -15,18 +15,16 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Client } from './client.service';
@Injectable({ providedIn: 'root' })
export class SystemDiagnosticsService {
- private static readonly API: string = '../nifi-api';
+ private httpClient = inject(HttpClient);
+ private client = inject(Client);
- constructor(
- private httpClient: HttpClient,
- private client: Client
- ) {}
+ private static readonly API: string = '../nifi-api';
getSystemDiagnostics(nodewise?: boolean) {
if (nodewise) {
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/about/about.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/about/about.effects.ts
index 14b43d10af..2c9fb9d1a9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/about/about.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/about/about.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as AboutActions from './about.actions';
import * as ErrorActions from '../error/error.actions';
@@ -29,12 +29,10 @@ import { ErrorHelper } from '../../service/error-helper.service';
@Injectable()
export class AboutEffects {
- constructor(
- private actions$: Actions,
- private aboutService: AboutService,
- private dialog: MatDialog,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private aboutService = inject(AboutService);
+ private dialog = inject(MatDialog);
+ private errorHelper = inject(ErrorHelper);
loadAbout$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/banner-text/banner-text.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/banner-text/banner-text.effects.ts
index e5162c1231..9b183ddb21 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/banner-text/banner-text.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/banner-text/banner-text.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as BannerTextActions from './banner-text.actions';
import { filter, from, map, switchMap } from 'rxjs';
@@ -27,11 +27,9 @@ import { selectBannerText } from './banner-text.selectors';
@Injectable()
export class BannerTextEffects {
- constructor(
- private actions$: Actions,
- private bannerTextService: BannerTextService,
- private store: Store<NiFiState>
- ) {}
+ private actions$ = inject(Actions);
+ private bannerTextService = inject(BannerTextService);
+ private store = inject<Store<NiFiState>>(Store);
loadBannerText$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/cluster-summary/cluster-summary.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/cluster-summary/cluster-summary.effects.ts
index 8e816cfb43..3974441d5b 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/cluster-summary/cluster-summary.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/cluster-summary/cluster-summary.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as ClusterSummaryActions from './cluster-summary.actions';
@@ -34,13 +34,11 @@ import { ErrorHelper } from '../../service/error-helper.service';
@Injectable()
export class ClusterSummaryEffects {
- constructor(
- private actions$: Actions,
- private clusterService: ClusterService,
- private store: Store<ClusterSummaryState>,
- private dialog: MatDialog,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private clusterService = inject(ClusterService);
+ private store = inject<Store<ClusterSummaryState>>(Store);
+ private dialog = inject(MatDialog);
+ private errorHelper = inject(ErrorHelper);
loadClusterSummary$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/component-state/component-state.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/component-state/component-state.effects.ts
index 2fb334395e..5568ca64aa 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/component-state/component-state.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/component-state/component-state.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import { Store } from '@ngrx/store';
@@ -36,13 +36,11 @@ import { ComponentState, ComponentStateEntity } from './index';
@Injectable()
export class ComponentStateEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private componentStateService: ComponentStateService,
- private dialog: MatDialog,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private componentStateService = inject(ComponentStateService);
+ private dialog = inject(MatDialog);
+ private errorHelper = inject(ErrorHelper);
getComponentStateAndOpenDialog$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts
index b8c12d4199..88a940a3a2 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { concatLatestFrom } from '@ngrx/operators';
import * as ControllerServiceActions from './controller-service-state.actions';
@@ -34,13 +34,11 @@ import { ErrorHelper } from '../../service/error-helper.service';
@Injectable()
export class ControllerServiceStateEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private dialog: MatDialog,
- private controllerServiceStateService: ControllerServiceStateService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private dialog = inject(MatDialog);
+ private controllerServiceStateService = inject(ControllerServiceStateService);
+ private errorHelper = inject(ErrorHelper);
submitEnableRequest$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/current-user/current-user.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/current-user/current-user.effects.ts
index e27c153ac9..8bb50a5416 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/current-user/current-user.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/current-user/current-user.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as UserActions from './current-user.actions';
import { asyncScheduler, catchError, from, interval, map, of, switchMap, takeUntil, tap } from 'rxjs';
@@ -31,14 +31,12 @@ import { HttpErrorResponse } from '@angular/common/http';
@Injectable()
export class CurrentUserEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private router: Router,
- private userService: CurrentUserService,
- private authService: AuthService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private router = inject(Router);
+ private userService = inject(CurrentUserService);
+ private authService = inject(AuthService);
+ private errorHelper = inject(ErrorHelper);
loadCurrentUser$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/documentation/documentation.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/documentation/documentation.effects.ts
index eca572f312..10f604906c 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/documentation/documentation.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/documentation/documentation.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as DocumentationActions from './documentation.actions';
import { map, tap } from 'rxjs';
@@ -24,10 +24,8 @@ import { DocumentationParameters } from './index';
@Injectable()
export class DocumentationEffects {
- constructor(
- private actions$: Actions,
- private router: Router
- ) {}
+ private actions$ = inject(Actions);
+ private router = inject(Router);
navigateToComponentDocumentation$ = createEffect(
() =>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/error/error.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/error/error.effects.ts
index db38a37635..dff4908213 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/error/error.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/error/error.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as ErrorActions from './error.actions';
import { map, tap } from 'rxjs';
@@ -24,11 +24,9 @@ import { MatSnackBar } from '@angular/material/snack-bar';
@Injectable()
export class ErrorEffects {
- constructor(
- private actions$: Actions,
- private router: Router,
- private snackBar: MatSnackBar
- ) {}
+ private actions$ = inject(Actions);
+ private router = inject(Router);
+ private snackBar = inject(MatSnackBar);
fullScreenError$ = createEffect(
() =>
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/extension-types/extension-types.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/extension-types/extension-types.effects.ts
index 48f034b6b3..961e35e5f6 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/extension-types/extension-types.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/extension-types/extension-types.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as ExtensionTypesActions from './extension-types.actions';
import { catchError, combineLatest, map, of, switchMap } from 'rxjs';
@@ -26,11 +26,9 @@ import { ErrorHelper } from '../../service/error-helper.service';
@Injectable()
export class ExtensionTypesEffects {
- constructor(
- private actions$: Actions,
- private extensionTypesService: ExtensionTypesService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private extensionTypesService = inject(ExtensionTypesService);
+ private errorHelper = inject(ErrorHelper);
loadExtensionTypesForCanvas$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/flow-configuration/flow-configuration.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/flow-configuration/flow-configuration.effects.ts
index 7060ff9c12..5cbbab64d1 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/flow-configuration/flow-configuration.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/flow-configuration/flow-configuration.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as FlowConfigurationActions from './flow-configuration.actions';
import { catchError, from, map, of, switchMap } from 'rxjs';
@@ -26,11 +26,9 @@ import { ErrorHelper } from '../../service/error-helper.service';
@Injectable()
export class FlowConfigurationEffects {
- constructor(
- private actions$: Actions,
- private flowConfigurationService: FlowConfigurationService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private flowConfigurationService = inject(FlowConfigurationService);
+ private errorHelper = inject(ErrorHelper);
loadFlowConfiguration$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/login-configuration/login-configuration.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/login-configuration/login-configuration.effects.ts
index 8a0d33cdf0..fef21a2a91 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/login-configuration/login-configuration.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/login-configuration/login-configuration.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import * as LoginConfigurationActions from './login-configuration.actions';
import { catchError, from, map, of, switchMap } from 'rxjs';
@@ -26,11 +26,9 @@ import { AuthService } from '../../service/auth.service';
@Injectable()
export class LoginConfigurationEffects {
- constructor(
- private actions$: Actions,
- private authService: AuthService,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private authService = inject(AuthService);
+ private errorHelper = inject(ErrorHelper);
loadLoginConfiguration$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/property-verification/property-verification.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/property-verification/property-verification.effects.ts
index 8349663160..d029b0402d 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/property-verification/property-verification.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/property-verification/property-verification.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { ConfigurationAnalysisResponse, PropertyVerificationState } from './index';
import { Store } from '@ngrx/store';
@@ -39,15 +39,13 @@ import { isDefinedAndNotNull, MEDIUM_DIALOG, SMALL_DIALOG, MapTableHelperService
@Injectable()
export class PropertyVerificationEffects {
- constructor(
- private actions$: Actions,
- private store: Store<PropertyVerificationState>,
- private dialog: MatDialog,
- private errorHelper: ErrorHelper,
- private propertyVerificationService: PropertyVerificationService,
- private propertyTableHelperService: PropertyTableHelperService,
- private mapTableHelperService: MapTableHelperService
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<PropertyVerificationState>>(Store);
+ private dialog = inject(MatDialog);
+ private errorHelper = inject(ErrorHelper);
+ private propertyVerificationService = inject(PropertyVerificationService);
+ private propertyTableHelperService = inject(PropertyTableHelperService);
+ private mapTableHelperService = inject(MapTableHelperService);
verifyProperties$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/status-history/status-history.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/status-history/status-history.effects.ts
index 31cee47112..92e1de2101 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/status-history/status-history.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/status-history/status-history.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { Store } from '@ngrx/store';
import { NiFiState } from '../index';
@@ -32,13 +32,11 @@ import { ErrorContextKey } from '../error';
@Injectable()
export class StatusHistoryEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private statusHistoryService: StatusHistoryService,
- private dialog: MatDialog,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private statusHistoryService = inject(StatusHistoryService);
+ private dialog = inject(MatDialog);
+ private errorHelper = inject(ErrorHelper);
reloadComponentStatusHistory$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts
index cb92214df9..da39702ee8 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
import { Actions, createEffect, ofType } from '@ngrx/effects';
import { Store } from '@ngrx/store';
import { NiFiState } from '../index';
@@ -33,13 +33,11 @@ import { ErrorContextKey } from '../error';
@Injectable()
export class SystemDiagnosticsEffects {
- constructor(
- private actions$: Actions,
- private store: Store<NiFiState>,
- private systemDiagnosticsService: SystemDiagnosticsService,
- private dialog: MatDialog,
- private errorHelper: ErrorHelper
- ) {}
+ private actions$ = inject(Actions);
+ private store = inject<Store<NiFiState>>(Store);
+ private systemDiagnosticsService = inject(SystemDiagnosticsService);
+ private dialog = inject(MatDialog);
+ private errorHelper = inject(ErrorHelper);
reloadSystemDiagnostics$ = createEffect(() =>
this.actions$.pipe(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/about-dialog/about-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/about-dialog/about-dialog.component.ts
index 7a1579f381..ddca09027e 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/about-dialog/about-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/about-dialog/about-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule } from '@angular/material/dialog';
import { MatTableModule } from '@angular/material/table';
@@ -46,9 +46,7 @@ import { selectAbout } from '../../../state/about/about.selectors';
styleUrls: ['./about-dialog.component.scss']
})
export class AboutDialog extends CloseOnEscapeDialog {
- about$ = this.store.select(selectAbout);
+ private store = inject<Store<AboutState>>(Store);
- constructor(private store: Store<AboutState>) {
- super();
- }
+ about$ = this.store.select(selectAbout);
}
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/advanced-ui/advanced-ui.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/advanced-ui/advanced-ui.component.ts
index 385078fa0b..dbb6db7233 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/advanced-ui/advanced-ui.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/advanced-ui/advanced-ui.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, SecurityContext } from '@angular/core';
+import { Component, SecurityContext, inject } from '@angular/core';
import { NiFiState } from '../../../state';
import { Store } from '@ngrx/store';
import { DomSanitizer, SafeResourceUrl } from '@angular/platform-browser';
@@ -33,15 +33,15 @@ import { selectDisconnectionAcknowledged } from '../../../state/cluster-summary/
styleUrls: ['./advanced-ui.component.scss']
})
export class AdvancedUi {
+ private store = inject<Store<NiFiState>>(Store);
+ private domSanitizer = inject(DomSanitizer);
+ protected systemTokensService = inject(SystemTokensService);
+
frameSource!: SafeResourceUrl | null;
private params: AdvancedUiParams | null = null;
- constructor(
- private store: Store<NiFiState>,
- private domSanitizer: DomSanitizer,
- protected systemTokensService: SystemTokensService
- ) {
+ constructor() {
this.store
.select(selectRouteData)
.pipe(takeUntilDestroyed(), isDefinedAndNotNull())
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/banner-text/banner-text.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/banner-text/banner-text.component.ts
index e66fb00f51..52cfe2d2d9 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/banner-text/banner-text.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/banner-text/banner-text.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
import { loadBannerText } from '../../../state/banner-text/banner-text.actions';
import { Store } from '@ngrx/store';
import { NiFiState } from '../../../state';
@@ -28,9 +28,9 @@ import { selectBannerText } from '../../../state/banner-text/banner-text.selecto
styleUrls: ['./banner-text.component.scss']
})
export class BannerText implements OnInit {
- bannerText = this.store.selectSignal(selectBannerText);
+ private store = inject<Store<NiFiState>>(Store);
- constructor(private store: Store<NiFiState>) {}
+ bannerText = this.store.selectSignal(selectBannerText);
ngOnInit(): void {
this.store.dispatch(loadBannerText());
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/cancel-dialog/cancel-dialog.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/cancel-dialog/cancel-dialog.component.ts
index ee1f02e250..1dc53b46ce 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/cancel-dialog/cancel-dialog.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/cancel-dialog/cancel-dialog.component.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Output } from '@angular/core';
+import { Component, EventEmitter, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatButtonModule } from '@angular/material/button';
import { CancelDialogRequest } from '../../../state/shared';
@@ -27,9 +27,9 @@ import { CancelDialogRequest } from '../../../state/shared';
styleUrls: ['./cancel-dialog.component.scss']
})
export class CancelDialog {
- @Output() exit: EventEmitter<void> = new EventEmitter<void>();
+ request = inject<CancelDialogRequest>(MAT_DIALOG_DATA);
- constructor(@Inject(MAT_DIALOG_DATA) public request: CancelDialogRequest) {}
+ @Output() exit: EventEmitter<void> = new EventEmitter<void>();
cancelClicked(): void {
this.exit.next();
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/change-component-version-dialog/change-component-version-dialog.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/change-component-version-dialog/change-component-version-dialog.ts
index 7a18f44d17..cd256b33eb 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/change-component-version-dialog/change-component-version-dialog.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/change-component-version-dialog/change-component-version-dialog.ts
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-import { Component, EventEmitter, Inject, Output } from '@angular/core';
+import { Component, EventEmitter, Output, inject } from '@angular/core';
import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog';
import { MatButton } from '@angular/material/button';
import { Bundle, DocumentedType, OpenChangeComponentVersionDialogRequest } from '../../../state/shared';
@@ -40,6 +40,10 @@ import { ControllerServiceApi } from '../controller-service/controller-service-a
styleUrl: './change-component-version-dialog.scss'
})
export class ChangeComponentVersionDialog extends CloseOnEscapeDialog {
+ private dialogRequest = inject<OpenChangeComponentVersionDialogRequest>(MAT_DIALOG_DATA);
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
versions: DocumentedType[];
selected: DocumentedType | null = null;
changeComponentVersionForm: FormGroup;
@@ -47,12 +51,10 @@ export class ChangeComponentVersionDialog extends CloseOnEscapeDialog {
@Output() changeVersion: EventEmitter<DocumentedType> = new EventEmitter<DocumentedType>();
- constructor(
- @Inject(MAT_DIALOG_DATA) private dialogRequest: OpenChangeComponentVersionDialogRequest,
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
super();
+ const dialogRequest = this.dialogRequest;
+
this.versions = dialogRequest.componentVersions;
this.currentBundle = dialogRequest.fetchRequest.bundle;
const idx = this.versions.findIndex(
diff --git a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/component-state/component-state.component.ts b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/component-state/component-state.component.ts
index c19cd23800..ddf4763b67 100644
--- a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/component-state/component-state.component.ts
+++ b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/component-state/component-state.component.ts
@@ -62,6 +62,10 @@ import { NifiSpinnerDirective } from '../spinner/nifi-spinner.directive';
styleUrls: ['./component-state.component.scss']
})
export class ComponentStateDialog extends CloseOnEscapeDialog implements AfterViewInit {
+ private store = inject<Store<ComponentStateState>>(Store);
+ private formBuilder = inject(FormBuilder);
+ private nifiCommon = inject(NiFiCommon);
+
@Input() initialSortColumn: 'key' | 'value' = 'key';
@Input() initialSortDirection: 'asc' | 'desc' = 'asc';
@@ -81,11 +85,7 @@ export class ComponentStateDialog extends CloseOnEscapeDialog implements AfterVi
canClear = false;
private destroyRef: DestroyRef = inject(DestroyRef);
- constructor(
- private store: Store<ComponentStateState>,
- private formBuilder: FormBuilder,
- private nifiCommon: NiFiCommon
- ) {
+ constructor() {
... 43037 lines suppressed ...