From d9012539740390d3abbe5230eed8be4c78657ff6 Mon Sep 17 00:00:00 2001 From: Rob Fellows Date: Tue, 30 Jan 2024 12:26:18 -0500 Subject: [PATCH] [NIFI-12686] eslint configuration (#8313) * [NIFI-12686] eslint configuration for ts files * add linting to the default maven build * updates for RAT plugin * remove .eslitrc as it wasn't needed. updated RAT config This closes #8313 --- .../nifi-web/nifi-web-frontend/pom.xml | 19 +- .../src/main/nifi/.eslintrc.json | 40 + .../src/main/nifi/.prettierignore | 36 + .../src/main/nifi/angular.json | 9 + .../src/main/nifi/package-lock.json | 1420 ++++++++++++++++- .../src/main/nifi/package.json | 12 +- .../src/main/nifi/src/.eslintrc | 15 - .../src/main/nifi/src/app/app.component.ts | 2 +- .../service/access-policy.service.ts | 2 +- .../access-policy/access-policy.actions.ts | 2 +- .../access-policy/access-policy.effects.ts | 16 +- .../access-policy/access-policy.reducer.ts | 8 +- .../state/access-policy/index.ts | 2 +- .../policy-component.actions.ts | 2 +- .../policy-component.reducer.ts | 2 +- .../state/tenants/tenants.actions.ts | 2 +- .../state/tenants/tenants.reducer.ts | 2 +- .../policy-table.component.spec.ts | 1 - .../policy-table/policy-table.component.ts | 7 +- .../component-access-policies.component.ts | 4 +- .../global-access-policies.component.ts | 10 +- .../counters/service/counters.service.ts | 2 +- .../counter-listing.actions.ts | 2 +- .../counter-listing.reducer.ts | 2 +- .../counter-table/counter-table.component.ts | 8 +- .../feature/flow-designer-routing.module.ts | 2 - .../behavior/draggable-behavior.service.ts | 10 +- .../position-behavior.service.spec.ts | 3 - .../service/birdseye-view.service.ts | 12 +- .../service/canvas-context-menu.service.ts | 2 +- .../service/canvas-utils.service.ts | 4 +- .../service/canvas-view.service.ts | 12 +- .../manager/connection-manager.service.ts | 34 +- .../service/manager/funnel-manager.service.ts | 2 +- .../service/manager/label-manager.service.ts | 10 +- .../service/manager/port-manager.service.ts | 8 +- .../manager/process-group-manager.service.ts | 2 +- .../manager/processor-manager.service.ts | 8 +- .../remote-process-group-manager.service.ts | 2 +- .../service/parameter.service.ts | 2 +- .../flow-designer/service/search.service.ts | 3 +- .../controller-services.effects.ts | 6 +- .../controller-services.reducer.ts | 4 +- .../state/controller-services/index.ts | 2 +- .../flow-designer/state/flow/flow.effects.ts | 24 +- .../flow-designer/state/flow/flow.reducer.ts | 4 +- .../state/parameter/parameter.effects.ts | 6 +- .../state/parameter/parameter.reducer.ts | 2 +- .../state/queue/queue.effects.ts | 14 +- .../state/queue/queue.reducer.ts | 2 +- .../state/transform/transform.effects.ts | 2 +- .../state/transform/transform.reducer.ts | 2 +- .../ui/canvas/canvas.component.ts | 16 +- .../graph-controls.component.ts | 6 +- .../operation-control.component.ts | 2 +- .../flow-status/flow-status.component.ts | 4 +- .../new-canvas-item.component.html | 2 +- .../new-canvas-item.component.ts | 18 +- .../canvas/header/search/search.component.ts | 8 +- .../create-connection.component.ts | 4 +- .../destination-funnel.component.ts | 2 - .../destination-output-port.component.ts | 2 - .../destination-process-group.component.ts | 10 +- .../destination-processor.component.ts | 2 - ...tination-remote-process-group.component.ts | 8 +- .../edit-connection.component.ts | 4 +- .../prioritizers/prioritizers.component.ts | 4 +- .../source-funnel/source-funnel.component.ts | 2 - .../source-input-port.component.ts | 2 - .../source-process-group.component.ts | 10 +- .../source-processor.component.ts | 6 +- .../source-remote-process-group.component.ts | 8 +- .../port/create-port/create-port.component.ts | 2 +- .../edit-process-group.component.spec.ts | 2 +- .../edit-process-group.component.ts | 2 +- .../relationship-settings.component.ts | 4 +- .../run-duration-slider.component.ts | 6 +- .../breadcrumbs/breadcrumbs.component.ts | 2 +- .../version-control-tip.component.ts | 4 +- .../ui/root/guard/root-group.guard.ts | 2 +- .../service/parameter-contexts.service.ts | 2 +- .../state/parameter-context-listing/index.ts | 1 - .../parameter-context-listing.effects.ts | 6 +- .../parameter-context-listing.reducer.ts | 6 +- ...parameter-context-inheritance.component.ts | 4 +- .../parameter-table.component.ts | 6 +- .../process-group-references.component.ts | 2 - .../feature/provenance.component.spec.ts | 2 - .../provenance/service/provenance.service.ts | 6 +- .../state/lineage/lineage.effects.ts | 6 +- .../state/lineage/lineage.reducer.ts | 2 +- .../provenance-event-listing.effects.ts | 12 +- .../provenance-event-listing.reducer.ts | 2 +- .../provenance-event-listing.component.ts | 3 +- .../lineage/lineage.component.spec.ts | 2 - .../lineage/lineage.component.ts | 79 +- .../provenance-event-table.component.ts | 30 +- .../provenance-search-dialog.component.ts | 8 +- .../queue/feature/queue-routing.module.ts | 1 - .../app/pages/queue/service/queue.service.ts | 4 +- .../queue-listing/queue-listing.effects.ts | 14 +- .../queue-listing/queue-listing.reducer.ts | 4 +- .../flowfile-table.component.ts | 18 +- .../settings/service/controller.service.ts | 2 +- .../service/parameter-provider.service.ts | 4 +- .../service/registry-client.service.ts | 2 +- .../flow-analysis-rules.effects.ts | 2 +- .../flow-analysis-rules.reducer.ts | 4 +- .../settings/state/general/general.reducer.ts | 2 +- .../management-controller-services/index.ts | 2 +- .../management-controller-services.effects.ts | 4 +- .../management-controller-services.reducer.ts | 6 +- .../parameter-providers.actions.ts | 2 +- .../parameter-providers.effects.ts | 2 +- .../parameter-providers.reducer.ts | 4 +- .../registry-clients.effects.ts | 2 +- .../registry-clients.reducer.ts | 4 +- .../reporting-tasks.effects.ts | 16 +- .../reporting-tasks.reducer.ts | 4 +- .../edit-flow-analysis-rule.component.ts | 2 +- .../flow-analysis-rule-table.component.html | 4 +- .../flow-analysis-rule-table.component.ts | 8 +- .../flow-analysis-rules.component.ts | 11 +- ...anagement-controller-services.component.ts | 7 +- ...reate-parameter-provider.component.spec.ts | 5 +- .../edit-parameter-provider.component.ts | 1 - .../parameter-providers-table.component.ts | 3 +- .../parameter-providers.component.ts | 2 +- .../parameter-providers.module.ts | 1 - .../registry-client-table.component.ts | 2 +- .../registry-clients.component.ts | 1 - .../edit-reporting-task.component.ts | 2 +- .../reporting-task-table.component.ts | 2 +- .../summary-listing.reducer.ts | 6 +- .../summary-table-filter.component.spec.ts | 1 - .../connection-status-table.component.ts | 4 +- ...nput-port-status-listing.component.spec.ts | 4 - ...processor-status-listing.component.spec.ts | 2 - .../processor-status-listing.component.ts | 1 - ...te-process-group-status-table.component.ts | 4 +- .../user-listing/user-listing.actions.ts | 2 +- .../user-listing/user-listing.effects.ts | 16 +- .../user-listing/user-listing.reducer.ts | 4 +- .../user-access-policies.component.ts | 6 +- .../user-table/user-table.component.ts | 8 +- .../nifi/src/app/service/about.service.ts | 2 +- .../src/app/service/auth-storage.service.ts | 2 - .../nifi/src/app/service/client.service.ts | 2 - .../controller-service-state.service.ts | 2 +- .../src/app/service/current-user.service.ts | 2 +- .../app/service/flow-configuration.service.ts | 2 +- .../app/service/guard/authentication.guard.ts | 8 +- .../app/service/guard/authorization.guard.ts | 4 +- .../service/guard/flow-configuration.guard.ts | 4 +- .../service/interceptors/auth.interceptor.ts | 2 +- .../src/app/service/nifi-common.service.ts | 14 +- .../nifi/src/app/service/storage.service.ts | 2 - .../component-state.effects.ts | 10 +- .../component-state.reducer.ts | 2 +- .../controller-service-state.effects.ts | 14 +- .../controller-service-state.reducer.ts | 2 +- .../controller-service-state.selectors.ts | 3 +- .../nifi/src/app/state/error/error.reducer.ts | 2 +- .../status-history/status-history.effects.ts | 1 - .../status-history/status-history.reducer.ts | 4 +- .../src/app/state/system-diagnostics/index.ts | 2 - .../system-diagnostics.actions.ts | 4 +- .../system-diagnostics.effects.ts | 2 +- .../system-diagnostics.reducer.ts | 4 +- .../component-state.component.ts | 8 +- .../context-menu/context-menu.component.html | 2 +- .../context-menu/context-menu.component.ts | 8 +- .../controller-service-api.component.spec.ts | 2 +- .../controller-service-table.component.html | 4 +- .../controller-service-table.component.ts | 4 +- ...reate-controller-service.component.spec.ts | 2 +- .../edit-tenant-dialog.component.ts | 8 +- .../_login-message.component-theme.scss | 0 .../page-content/page-content.component.ts | 2 +- .../combo-editor.component.spec.ts | 6 +- .../combo-editor/combo-editor.component.ts | 16 +- .../editors/nf-editor/modes/el.service.ts | 2 +- .../editors/nf-editor/modes/nfel.ts | 31 +- .../editors/nf-editor/modes/nfpr.ts | 12 +- .../nf-editor/nf-editor.component.spec.ts | 4 +- .../editors/nf-editor/nf-editor.component.ts | 10 +- .../property-table.component.ts | 18 +- .../provenance-event-dialog.component.ts | 2 +- .../common/resizable/resizable.component.ts | 6 +- .../ui/common/spinner/spinner.component.ts | 4 +- .../status-history-chart.component.ts | 18 +- .../status-history.component.html | 7 +- .../status-history.component.ts | 8 +- ...ystem-diagnostics-dialog.component.spec.ts | 6 +- .../system-diagnostics-dialog.component.ts | 21 +- .../bulletins-tip/bulletins-tip.component.ts | 4 +- .../controller-service-api-tip.component.ts | 4 +- .../el-function-tip.component.ts | 4 +- .../common/tooltips/nifi-tooltip.directive.ts | 17 +- .../parameter-tip/parameter-tip.component.ts | 4 +- .../property-hint-tip.component.ts | 4 +- .../property-tip/property-tip.component.ts | 4 +- .../restrictions-tip.component.ts | 4 +- .../tooltips/text-tip/text-tip.component.ts | 4 +- .../unordered-list-tip.component.ts | 4 +- .../validation-errors-tip.component.ts | 4 +- 206 files changed, 1978 insertions(+), 732 deletions(-) create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.eslintrc.json create mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/.eslintrc delete mode 100644 nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/page-content/_login-message.component-theme.scss diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml index ed567b185d..2501172e7a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/pom.xml @@ -147,6 +147,22 @@ ${frontend.working.dir} + + + + lint + + npm + + generate-resources + + run lint + ${frontend.working.dir} + + + @@ -176,7 +192,8 @@ src/main/nifi/README.md src/main/nifi/proxy.config.mjs src/main/nifi/.prettierrc - src/main/nifi/src/.eslintrc + src/main/nifi/.prettierignore + src/main/nifi/dist/**/* diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.eslintrc.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.eslintrc.json new file mode 100644 index 0000000000..f89cc93cbb --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.eslintrc.json @@ -0,0 +1,40 @@ +{ + "root": true, + "ignorePatterns": ["projects/**/*"], + "overrides": [ + { + "files": ["*.ts"], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/recommended", + "plugin:@angular-eslint/recommended", + "plugin:@angular-eslint/template/process-inline-templates", + "plugin:prettier/recommended" + ], + "rules": { + "@angular-eslint/directive-selector": [ + "error", + { + "type": "attribute", + "prefix": "", + "style": "camelCase" + } + ], + "@angular-eslint/component-selector": [ + "error", + { + "type": "element", + "prefix": "", + "style": "kebab-case" + } + ], + "@angular-eslint/component-class-suffix": "off", + "@typescript-eslint/no-explicit-any": "off", + "@typescript-eslint/ban-ts-comment": "off", + "@typescript-eslint/no-non-null-assertion": "off", + "@typescript-eslint/no-this-alias": "warn", + "no-useless-escape": "off" + } + } + ] +} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore new file mode 100644 index 0000000000..2e6d78c196 --- /dev/null +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/.prettierignore @@ -0,0 +1,36 @@ +# Compiled output +/dist +/tmp +/out-tsc +/bazel-out + +# Node +/node_modules +npm-debug.log + +# IDEs and editors +.idea/ +.project +.classpath +.c9/ +*.launch +.settings/ +*.sublime-workspace + +# Visual Studio Code +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +.history/* + +# Miscellaneous +/.angular/cache +.sass-cache/ +/connect.lock +/coverage + +# System files +.DS_Store +Thumbs.db diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json index c270293b66..af7b04ecd5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/angular.json @@ -86,8 +86,17 @@ "scripts": [], "karmaConfig": "karma.conf.js" } + }, + "lint": { + "builder": "@angular-eslint/builder:lint", + "options": { + "lintFilePatterns": ["src/**/*.ts"] + } } } } + }, + "cli": { + "schematicCollections": ["@angular-eslint/schematics"] } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package-lock.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package-lock.json index bdfc546804..2de4455353 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package-lock.json +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package-lock.json @@ -37,6 +37,11 @@ }, "devDependencies": { "@angular-devkit/build-angular": "^16.2.10", + "@angular-eslint/builder": "16.3.0", + "@angular-eslint/eslint-plugin": "16.3.0", + "@angular-eslint/eslint-plugin-template": "16.3.0", + "@angular-eslint/schematics": "16.3.0", + "@angular-eslint/template-parser": "16.3.0", "@angular/cli": "~16.2.10", "@angular/compiler-cli": "^16.2.12", "@types/codemirror": "^5.60.15", @@ -44,7 +49,10 @@ "@types/humanize-duration": "^3.27.3", "@types/jasmine": "~4.6.4", "@types/webfontloader": "^1.6.38", + "@typescript-eslint/eslint-plugin": "5.62.0", + "@typescript-eslint/parser": "5.62.0", "autoprefixer": "^10.4.16", + "eslint": "^8.51.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.0.1", "jasmine-core": "~4.6.0", @@ -64,7 +72,6 @@ "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==", "dev": true, - "peer": true, "engines": { "node": ">=0.10.0" } @@ -362,6 +369,125 @@ "yarn": ">= 1.13.0" } }, + "node_modules/@angular-eslint/builder": { + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/builder/-/builder-16.3.0.tgz", + "integrity": "sha512-XL0W32j2SzjfI6JWF9vcMS2jJktDnf+3oQfjIrZU/QHn9hqQevMgUbfYBi+P266gSyEL6vpKmrAVAfS+f0C8XA==", + "dev": true, + "dependencies": { + "@nx/devkit": "16.5.1", + "nx": "16.5.1" + }, + "peerDependencies": { + "eslint": "^7.20.0 || ^8.0.0", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/bundled-angular-compiler": { + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/bundled-angular-compiler/-/bundled-angular-compiler-16.3.0.tgz", + "integrity": "sha512-pRncxJMYHBGE7fQ3DQOSiyUd+23AIgDcYDsCn7OmBlxXShUFNj/zAseWDXn6sVzXlzkNwvx2RcwFe5pDjGw6Ig==", + "dev": true + }, + "node_modules/@angular-eslint/eslint-plugin": { + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin/-/eslint-plugin-16.3.0.tgz", + "integrity": "sha512-BgO40/npRHfFJWZ+JVOlO3/JrBffyXh/RTxsbXE1g7DEB37kcNUImdxTIv0E/MWi0V/xTlB621X5h5qp5jCCbA==", + "dev": true, + "dependencies": { + "@angular-eslint/utils": "16.3.0", + "@typescript-eslint/utils": "5.62.0" + }, + "peerDependencies": { + "eslint": "^7.20.0 || ^8.0.0", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/eslint-plugin-template": { + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/eslint-plugin-template/-/eslint-plugin-template-16.3.0.tgz", + "integrity": "sha512-j0I6rih4Tg1PgKaxcrjFtM4CmbKbb6/lo0eM3txH4H7MZ8sA5LaqYjNr1k5+wxmotD5UU0za6wNnGjdaZn7n4Q==", + "dev": true, + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "16.3.0", + "@angular-eslint/utils": "16.3.0", + "@typescript-eslint/type-utils": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "aria-query": "5.3.0", + "axobject-query": "4.0.0" + }, + "peerDependencies": { + "eslint": "^7.20.0 || ^8.0.0", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/schematics": { + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/schematics/-/schematics-16.3.0.tgz", + "integrity": "sha512-XGClXqD0/1hCA3sxHsT+0PKuX7BVol2PULL7eJNZgRsdIcVuD5NxSmZoP8sQ/I5jl3k2lXwZq8bqohPLRpVZ7w==", + "dev": true, + "dependencies": { + "@angular-eslint/eslint-plugin": "16.3.0", + "@angular-eslint/eslint-plugin-template": "16.3.0", + "@nx/devkit": "16.5.1", + "ignore": "5.2.4", + "nx": "16.5.1", + "strip-json-comments": "3.1.1", + "tmp": "0.2.1" + }, + "peerDependencies": { + "@angular/cli": ">= 16.0.0 < 17.0.0" + } + }, + "node_modules/@angular-eslint/schematics/node_modules/ignore": { + "version": "5.2.4", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.2.4.tgz", + "integrity": "sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==", + "dev": true, + "engines": { + "node": ">= 4" + } + }, + "node_modules/@angular-eslint/schematics/node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "dependencies": { + "rimraf": "^3.0.0" + }, + "engines": { + "node": ">=8.17.0" + } + }, + "node_modules/@angular-eslint/template-parser": { + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/template-parser/-/template-parser-16.3.0.tgz", + "integrity": "sha512-MC4Z8196ekH3C5KNkBBiDFQPvxbMxwoPaqpjZY1CkgKcjykgyWSGZyEo8jVmFM/G3gmyyDnRsdOJO3s1CA8aLA==", + "dev": true, + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "16.3.0", + "eslint-scope": "^7.0.0" + }, + "peerDependencies": { + "eslint": "^7.20.0 || ^8.0.0", + "typescript": "*" + } + }, + "node_modules/@angular-eslint/utils": { + "version": "16.3.0", + "resolved": "https://registry.npmjs.org/@angular-eslint/utils/-/utils-16.3.0.tgz", + "integrity": "sha512-ylFcKHRzjqnYFx4RHMLid/XiuRa1YaG8DpFVrKMXA93epa5SGlvuMVNLX5zH40UwRUj0K6ebcafa8ZjwYdnQDA==", + "dev": true, + "dependencies": { + "@angular-eslint/bundled-angular-compiler": "16.3.0", + "@typescript-eslint/utils": "5.62.0" + }, + "peerDependencies": { + "eslint": "^7.20.0 || ^8.0.0", + "typescript": "*" + } + }, "node_modules/@angular/animations": { "version": "16.2.12", "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-16.2.12.tgz", @@ -2929,7 +3055,6 @@ "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", "dev": true, - "peer": true, "dependencies": { "eslint-visitor-keys": "^3.3.0" }, @@ -2945,7 +3070,6 @@ "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.10.0.tgz", "integrity": "sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA==", "dev": true, - "peer": true, "engines": { "node": "^12.0.0 || ^14.0.0 || >=16.0.0" } @@ -2955,7 +3079,6 @@ "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", "dev": true, - "peer": true, "dependencies": { "ajv": "^6.12.4", "debug": "^4.3.2", @@ -2979,7 +3102,6 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -2995,15 +3117,13 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@eslint/eslintrc/node_modules/globals": { "version": "13.23.0", "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, - "peer": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -3019,7 +3139,6 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "peer": true, "dependencies": { "argparse": "^2.0.1" }, @@ -3031,15 +3150,13 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@eslint/eslintrc/node_modules/type-fest": { "version": "0.20.2", "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -3052,7 +3169,6 @@ "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.55.0.tgz", "integrity": "sha512-qQfo2mxH5yVom1kacMtZZJFVdW+E70mqHMJvVg6WTLo+VBuQJ4TojZlfWBjK0ve5BdEeNAVxOsl/nvNMpJOaJA==", "dev": true, - "peer": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" } @@ -3068,7 +3184,6 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.13.tgz", "integrity": "sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==", "dev": true, - "peer": true, "dependencies": { "@humanwhocodes/object-schema": "^2.0.1", "debug": "^4.1.1", @@ -3083,7 +3198,6 @@ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, - "peer": true, "engines": { "node": ">=12.22" }, @@ -3096,8 +3210,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz", "integrity": "sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@isaacs/cliui": { "version": "8.0.2", @@ -4303,6 +4416,267 @@ "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, + "node_modules/@nrwl/devkit": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nrwl/devkit/-/devkit-16.5.1.tgz", + "integrity": "sha512-NB+DE/+AFJ7lKH/WBFyatJEhcZGj25F24ncDkwjZ6MzEiSOGOJS0LaV/R+VUsmS5EHTPXYOpn3zHWWAcJhyOmA==", + "dev": true, + "dependencies": { + "@nx/devkit": "16.5.1" + } + }, + "node_modules/@nrwl/tao": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nrwl/tao/-/tao-16.5.1.tgz", + "integrity": "sha512-x+gi/fKdM6uQNIti9exFlm3V5LBP3Y8vOEziO42HdOigyrXa0S0HD2WMpccmp6PclYKhwEDUjKJ39xh5sdh4Ig==", + "dev": true, + "dependencies": { + "nx": "16.5.1" + }, + "bin": { + "tao": "index.js" + } + }, + "node_modules/@nx/devkit": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/devkit/-/devkit-16.5.1.tgz", + "integrity": "sha512-T1acZrVVmJw/sJ4PIGidCBYBiBqlg/jT9e8nIGXLSDS20xcLvfo4zBQf8UZLrmHglnwwpDpOWuVJCp2rYA5aDg==", + "dev": true, + "dependencies": { + "@nrwl/devkit": "16.5.1", + "ejs": "^3.1.7", + "ignore": "^5.0.4", + "semver": "7.5.3", + "tmp": "~0.2.1", + "tslib": "^2.3.0" + }, + "peerDependencies": { + "nx": ">= 15 <= 17" + } + }, + "node_modules/@nx/devkit/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nx/devkit/node_modules/semver": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/@nx/devkit/node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "dependencies": { + "rimraf": "^3.0.0" + }, + "engines": { + "node": ">=8.17.0" + } + }, + "node_modules/@nx/devkit/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, + "node_modules/@nx/nx-darwin-arm64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.5.1.tgz", + "integrity": "sha512-q98TFI4B/9N9PmKUr1jcbtD4yAFs1HfYd9jUXXTQOlfO9SbDjnrYJgZ4Fp9rMNfrBhgIQ4x1qx0AukZccKmH9Q==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-darwin-x64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.5.1.tgz", + "integrity": "sha512-j9HmL1l8k7EVJ3eOM5y8COF93gqrydpxCDoz23ZEtsY+JHY77VAiRQsmqBgEx9GGA2dXi9VEdS67B0+1vKariw==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-freebsd-x64": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.5.1.tgz", + "integrity": "sha512-CXSPT01aVS869tvCCF2tZ7LnCa8l41wJ3mTVtWBkjmRde68E5Up093hklRMyXb3kfiDYlfIKWGwrV4r0eH6x1A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm-gnueabihf": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.5.1.tgz", + "integrity": "sha512-BhrumqJSZCWFfLFUKl4CAUwR0Y0G2H5EfFVGKivVecEQbb+INAek1aa6c89evg2/OvetQYsJ+51QknskwqvLsA==", + "cpu": [ + "arm" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-gnu": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.5.1.tgz", + "integrity": "sha512-x7MsSG0W+X43WVv7JhiSq2eKvH2suNKdlUHEG09Yt0vm3z0bhtym1UCMUg3IUAK7jy9hhLeDaFVFkC6zo+H/XQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-arm64-musl": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.5.1.tgz", + "integrity": "sha512-J+/v/mFjOm74I0PNtH5Ka+fDd+/dWbKhpcZ2R1/6b9agzZk+Ff/SrwJcSYFXXWKbPX+uQ4RcJoytT06Zs3s0ow==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-gnu": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-gnu/-/nx-linux-x64-gnu-16.5.1.tgz", + "integrity": "sha512-igooWJ5YxQ94Zft7IqgL+Lw0qHaY15Btw4gfK756g/YTYLZEt4tTvR1y6RnK/wdpE3sa68bFTLVBNCGTyiTiDQ==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-linux-x64-musl": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-linux-x64-musl/-/nx-linux-x64-musl-16.5.1.tgz", + "integrity": "sha512-zF/exnPqFYbrLAduGhTmZ7zNEyADid2bzNQiIjJkh8Y6NpDwrQIwVIyvIxqynsjMrIs51kBH+8TUjKjj2Jgf5A==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-arm64-msvc": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.5.1.tgz", + "integrity": "sha512-qtqiLS9Y9TYyAbbpq58kRoOroko4ZXg5oWVqIWFHoxc5bGPweQSJCROEqd1AOl2ZDC6BxfuVHfhDDop1kK05WA==", + "cpu": [ + "arm64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@nx/nx-win32-x64-msvc": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.5.1.tgz", + "integrity": "sha512-kUJBLakK7iyA9WfsGGQBVennA4jwf5XIgm0lu35oMOphtZIluvzItMt0EYBmylEROpmpEIhHq0P6J9FA+WH0Rg==", + "cpu": [ + "x64" + ], + "dev": true, + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">= 10" + } + }, + "node_modules/@parcel/watcher": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/@parcel/watcher/-/watcher-2.0.4.tgz", + "integrity": "sha512-cTDi+FUDBIUOBKEtj+nhiJ71AZVlkAsQFuGQTun5tV9mwQBQgZvhCzG+URPQc8myeN32yRVZEfVAPCs1RW+Jvg==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "node-addon-api": "^3.2.1", + "node-gyp-build": "^4.3.0" + }, + "engines": { + "node": ">= 10.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/parcel" + } + }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", @@ -5016,6 +5390,12 @@ "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA==", "dev": true }, + "node_modules/@types/semver": { + "version": "7.5.6", + "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz", + "integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A==", + "dev": true + }, "node_modules/@types/send": { "version": "0.17.4", "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz", @@ -5078,12 +5458,250 @@ "@types/node": "*" } }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz", + "integrity": "sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag==", + "dev": true, + "dependencies": { + "@eslint-community/regexpp": "^4.4.0", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/type-utils": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "debug": "^4.3.4", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "natural-compare-lite": "^1.4.0", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "@typescript-eslint/parser": "^5.0.0", + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/parser": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.62.0.tgz", + "integrity": "sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA==", + "dev": true, + "dependencies": { + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", + "debug": "^4.3.4" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/scope-manager": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz", + "integrity": "sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/type-utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz", + "integrity": "sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew==", + "dev": true, + "dependencies": { + "@typescript-eslint/typescript-estree": "5.62.0", + "@typescript-eslint/utils": "5.62.0", + "debug": "^4.3.4", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "*" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/types": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.62.0.tgz", + "integrity": "sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ==", + "dev": true, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, + "node_modules/@typescript-eslint/typescript-estree": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz", + "integrity": "sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/visitor-keys": "5.62.0", + "debug": "^4.3.4", + "globby": "^11.1.0", + "is-glob": "^4.0.3", + "semver": "^7.3.7", + "tsutils": "^3.21.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependenciesMeta": { + "typescript": { + "optional": true + } + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/globby": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz", + "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==", + "dev": true, + "dependencies": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.2.9", + "ignore": "^5.2.0", + "merge2": "^1.4.1", + "slash": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/@typescript-eslint/utils": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.62.0.tgz", + "integrity": "sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ==", + "dev": true, + "dependencies": { + "@eslint-community/eslint-utils": "^4.2.0", + "@types/json-schema": "^7.0.9", + "@types/semver": "^7.3.12", + "@typescript-eslint/scope-manager": "5.62.0", + "@typescript-eslint/types": "5.62.0", + "@typescript-eslint/typescript-estree": "5.62.0", + "eslint-scope": "^5.1.1", + "semver": "^7.3.7" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + }, + "peerDependencies": { + "eslint": "^6.0.0 || ^7.0.0 || ^8.0.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "dependencies": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + }, + "engines": { + "node": ">=8.0.0" + } + }, + "node_modules/@typescript-eslint/utils/node_modules/estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true, + "engines": { + "node": ">=4.0" + } + }, + "node_modules/@typescript-eslint/visitor-keys": { + "version": "5.62.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz", + "integrity": "sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw==", + "dev": true, + "dependencies": { + "@typescript-eslint/types": "5.62.0", + "eslint-visitor-keys": "^3.3.0" + }, + "engines": { + "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/typescript-eslint" + } + }, "node_modules/@ungap/structured-clone": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/@vitejs/plugin-basic-ssl": { "version": "1.0.1", @@ -5354,6 +5972,37 @@ "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==", "dev": true }, + "node_modules/@yarnpkg/parsers": { + "version": "3.0.0-rc.46", + "resolved": "https://registry.npmjs.org/@yarnpkg/parsers/-/parsers-3.0.0-rc.46.tgz", + "integrity": "sha512-aiATs7pSutzda/rq8fnuPwTglyVwjM22bNnK2ZgjrpAjQHSSl3lztd2f9evst1W/qnC58DRz7T7QndUDumAR4Q==", + "dev": true, + "dependencies": { + "js-yaml": "^3.10.0", + "tslib": "^2.4.0" + }, + "engines": { + "node": ">=14.15.0" + } + }, + "node_modules/@zkochan/js-yaml": { + "version": "0.0.6", + "resolved": "https://registry.npmjs.org/@zkochan/js-yaml/-/js-yaml-0.0.6.tgz", + "integrity": "sha512-nzvgl3VfhcELQ8LyVrYOru+UtAy1nrygk2+AGbTm8a5YcO6o8lSjAT+pfg3vJWxIoZKOUhrK6UU7xW/+00kQrg==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/@zkochan/js-yaml/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, "node_modules/abab": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz", @@ -5428,7 +6077,6 @@ "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "dev": true, - "peer": true, "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } @@ -5661,12 +6309,36 @@ "sprintf-js": "~1.0.2" } }, + "node_modules/aria-query": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "dev": true, + "dependencies": { + "dequal": "^2.0.3" + } + }, "node_modules/array-flatten": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.2.tgz", "integrity": "sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==", "dev": true }, + "node_modules/array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/async": { + "version": "3.2.5", + "resolved": "https://registry.npmjs.org/async/-/async-3.2.5.tgz", + "integrity": "sha512-baNZyqaaLhyLVKm/DlvdW051MSgO6b8eVfIezl9E5PqWxFgzLm/wQntEW4zOytVburDEr0JlALEpdOFwvErLsg==", + "dev": true + }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", @@ -5710,6 +6382,40 @@ "postcss": "^8.1.0" } }, + "node_modules/axios": { + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", + "dev": true, + "dependencies": { + "follow-redirects": "^1.15.4", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" + } + }, + "node_modules/axios/node_modules/form-data": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz", + "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==", + "dev": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "mime-types": "^2.1.12" + }, + "engines": { + "node": ">= 6" + } + }, + "node_modules/axobject-query": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/axobject-query/-/axobject-query-4.0.0.tgz", + "integrity": "sha512-+60uv1hiVFhHZeO+Lz0RYzsVHy5Wr1ayX0mwda9KPDVLNJgZ1T9Ny7VmFbLDzxsH0D87I86vgj3gFrjTJUYznw==", + "dev": true, + "dependencies": { + "dequal": "^2.0.3" + } + }, "node_modules/babel-loader": { "version": "9.1.3", "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-9.1.3.tgz", @@ -7319,8 +8025,7 @@ "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/default-browser": { "version": "4.0.0", @@ -7545,6 +8250,15 @@ "node": ">= 0.8" } }, + "node_modules/dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "dev": true, + "engines": { + "node": ">=6" + } + }, "node_modules/destroy": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", @@ -7614,7 +8328,6 @@ "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", "dev": true, - "peer": true, "dependencies": { "esutils": "^2.0.2" }, @@ -7711,6 +8424,21 @@ "url": "https://github.com/fb55/domutils?sponsor=1" } }, + "node_modules/dotenv": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-10.0.0.tgz", + "integrity": "sha512-rlBi9d8jpv9Sf1klPjNfFAuWDjKLwTIJJ/VxtoTwIR6hnZxcEOQCZg2oIL3MWBYw5GpUDKOEnND7LXTbIpQ03Q==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/duplexer": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", + "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==", + "dev": true + }, "node_modules/eastasianwidth": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", @@ -7723,6 +8451,21 @@ "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", "dev": true }, + "node_modules/ejs": { + "version": "3.1.9", + "resolved": "https://registry.npmjs.org/ejs/-/ejs-3.1.9.tgz", + "integrity": "sha512-rC+QVNMJWv+MtPgkt0y+0rVEIdbtxVADApW9JXrUVlzHetgcyczP/E7DJmWJ4fJCZF2cPcBk0laWO9ZHMG3DmQ==", + "dev": true, + "dependencies": { + "jake": "^10.8.5" + }, + "bin": { + "ejs": "bin/cli.js" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/electron-to-chromium": { "version": "1.4.606", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.606.tgz", @@ -7763,6 +8506,15 @@ "iconv-lite": "^0.6.2" } }, + "node_modules/end-of-stream": { + "version": "1.4.4", + "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", + "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", + "dev": true, + "dependencies": { + "once": "^1.4.0" + } + }, "node_modules/engine.io": { "version": "6.5.4", "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.5.4.tgz", @@ -7827,6 +8579,18 @@ "node": ">=10.13.0" } }, + "node_modules/enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "dependencies": { + "ansi-colors": "^4.1.1" + }, + "engines": { + "node": ">=8.6" + } + }, "node_modules/ent": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz", @@ -7997,7 +8761,6 @@ "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.55.0.tgz", "integrity": "sha512-iyUUAM0PCKj5QpwGfmCAG9XXbZCWsqP/eWAWrG/W0umvjuLRBECwSFdt+rCntju0xEH7teIABPwXpahftIaTdA==", "dev": true, - "peer": true, "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", "@eslint-community/regexpp": "^4.6.1", @@ -8094,7 +8857,6 @@ "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", "dev": true, - "peer": true, "dependencies": { "esrecurse": "^4.3.0", "estraverse": "^5.2.0" @@ -8111,7 +8873,6 @@ "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, - "peer": true, "engines": { "node": "^12.22.0 || ^14.17.0 || >=16.0.0" }, @@ -8124,7 +8885,6 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "dev": true, - "peer": true, "dependencies": { "fast-deep-equal": "^3.1.1", "fast-json-stable-stringify": "^2.0.0", @@ -8141,7 +8901,6 @@ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, - "peer": true, "dependencies": { "color-convert": "^2.0.1" }, @@ -8156,15 +8915,13 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", - "dev": true, - "peer": true + "dev": true }, "node_modules/eslint/node_modules/chalk": { "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, - "peer": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -8181,7 +8938,6 @@ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "dev": true, - "peer": true, "dependencies": { "color-name": "~1.1.4" }, @@ -8193,15 +8949,13 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", - "dev": true, - "peer": true + "dev": true }, "node_modules/eslint/node_modules/escape-string-regexp": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -8214,7 +8968,6 @@ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, - "peer": true, "dependencies": { "locate-path": "^6.0.0", "path-exists": "^4.0.0" @@ -8231,7 +8984,6 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "dev": true, - "peer": true, "dependencies": { "is-glob": "^4.0.3" }, @@ -8244,7 +8996,6 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-13.23.0.tgz", "integrity": "sha512-XAmF0RjlrjY23MA51q3HltdlGxUpXPvg0GioKiD9X6HD28iMjo2dKC8Vqwm7lne4GNr78+RHTfliktR6ZH09wA==", "dev": true, - "peer": true, "dependencies": { "type-fest": "^0.20.2" }, @@ -8260,7 +9011,6 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -8270,7 +9020,6 @@ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", "dev": true, - "peer": true, "dependencies": { "argparse": "^2.0.1" }, @@ -8282,15 +9031,13 @@ "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true, - "peer": true + "dev": true }, "node_modules/eslint/node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, - "peer": true, "dependencies": { "p-locate": "^5.0.0" }, @@ -8306,7 +9053,6 @@ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, - "peer": true, "dependencies": { "yocto-queue": "^0.1.0" }, @@ -8322,7 +9068,6 @@ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, - "peer": true, "dependencies": { "p-limit": "^3.0.2" }, @@ -8338,7 +9083,6 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, - "peer": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -8351,7 +9095,6 @@ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, @@ -8364,7 +9107,6 @@ "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, - "peer": true, "dependencies": { "acorn": "^8.9.0", "acorn-jsx": "^5.3.2", @@ -8395,7 +9137,6 @@ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==", "dev": true, - "peer": true, "dependencies": { "estraverse": "^5.1.0" }, @@ -8712,8 +9453,7 @@ "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/fastq": { "version": "1.15.0", @@ -8756,7 +9496,6 @@ "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "dev": true, - "peer": true, "dependencies": { "flat-cache": "^3.0.4" }, @@ -8764,6 +9503,36 @@ "node": "^10.12.0 || >=12.0.0" } }, + "node_modules/filelist": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/filelist/-/filelist-1.0.4.tgz", + "integrity": "sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==", + "dev": true, + "dependencies": { + "minimatch": "^5.0.1" + } + }, + "node_modules/filelist/node_modules/brace-expansion": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz", + "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==", + "dev": true, + "dependencies": { + "balanced-match": "^1.0.0" + } + }, + "node_modules/filelist/node_modules/minimatch": { + "version": "5.1.6", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", + "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "dev": true, + "dependencies": { + "brace-expansion": "^2.0.1" + }, + "engines": { + "node": ">=10" + } + }, "node_modules/fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -8850,12 +9619,20 @@ "node": ">=8" } }, + "node_modules/flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true, + "bin": { + "flat": "cli.js" + } + }, "node_modules/flat-cache": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", "dev": true, - "peer": true, "dependencies": { "flatted": "^3.2.9", "keyv": "^4.5.3", @@ -8872,9 +9649,9 @@ "dev": true }, "node_modules/follow-redirects": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.3.tgz", - "integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "dev": true, "funding": [ { @@ -8972,6 +9749,12 @@ "node": ">= 0.6" } }, + "node_modules/fs-constants": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz", + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "dev": true + }, "node_modules/fs-extra": { "version": "8.1.0", "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", @@ -9203,8 +9986,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", - "dev": true, - "peer": true + "dev": true }, "node_modules/guess-parser": { "version": "0.4.22", @@ -9998,7 +10780,6 @@ "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", "dev": true, - "peer": true, "engines": { "node": ">=8" } @@ -10231,6 +11012,94 @@ "@pkgjs/parseargs": "^0.11.0" } }, + "node_modules/jake": { + "version": "10.8.7", + "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.7.tgz", + "integrity": "sha512-ZDi3aP+fG/LchyBzUM804VjddnwfSfsdeYkwt8NcbKRvo4rFkjhs456iLFn3k2ZUWvNe4i48WACDbza8fhq2+w==", + "dev": true, + "dependencies": { + "async": "^3.2.3", + "chalk": "^4.0.2", + "filelist": "^1.0.4", + "minimatch": "^3.1.2" + }, + "bin": { + "jake": "bin/cli.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/jake/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/jake/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/jake/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/jake/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/jake/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/jake/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/jasmine-core": { "version": "4.6.0", "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-4.6.0.tgz", @@ -10371,8 +11240,7 @@ "version": "3.0.1", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/json-parse-even-better-errors": { "version": "2.3.1", @@ -10390,8 +11258,7 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", - "dev": true, - "peer": true + "dev": true }, "node_modules/json5": { "version": "2.2.3", @@ -10604,7 +11471,6 @@ "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, - "peer": true, "dependencies": { "json-buffer": "3.0.1" } @@ -10745,7 +11611,6 @@ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, - "peer": true, "dependencies": { "prelude-ls": "^1.2.1", "type-check": "~0.4.0" @@ -10832,8 +11697,7 @@ "version": "4.6.2", "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true, - "peer": true + "dev": true }, "node_modules/log-symbols": { "version": "4.1.0", @@ -11646,8 +12510,13 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", - "dev": true, - "peer": true + "dev": true + }, + "node_modules/natural-compare-lite": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare-lite/-/natural-compare-lite-1.4.0.tgz", + "integrity": "sha512-Tj+HTDSJJKaZnfiuw+iaF9skdPpTo2GtEly5JHnWV/hfv2Qj/9RKsGISQtLh2ox3l5EAGw487hnBee0sIJ6v2g==", + "dev": true }, "node_modules/needle": { "version": "3.2.0", @@ -11744,8 +12613,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", - "dev": true, - "optional": true + "dev": true }, "node_modules/node-forge": { "version": "1.3.1", @@ -11786,7 +12654,6 @@ "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.7.1.tgz", "integrity": "sha512-wTSrZ+8lsRRa3I3H8Xr65dLWSgCvY2l4AOnaeKdPA9TB/WYMPaTcrzf3rXvFoVvjKNVnu0CcWSx54qq9GKRUYg==", "dev": true, - "optional": true, "bin": { "node-gyp-build": "bin.js", "node-gyp-build-optional": "optional.js", @@ -12069,6 +12936,321 @@ "integrity": "sha512-ub5E4+FBPKwAZx0UwIQOjYWGHTEq5sPqHQNRN8Z9e4A7u3Tj1weLJsL59yH9vmvqEtBHaOmT6cYQKIZOxp35FQ==", "dev": true }, + "node_modules/nx": { + "version": "16.5.1", + "resolved": "https://registry.npmjs.org/nx/-/nx-16.5.1.tgz", + "integrity": "sha512-I3hJRE4hG7JWAtncWwDEO3GVeGPpN0TtM8xH5ArZXyDuVeTth/i3TtJzdDzqXO1HHtIoAQN0xeq4n9cLuMil5g==", + "dev": true, + "hasInstallScript": true, + "dependencies": { + "@nrwl/tao": "16.5.1", + "@parcel/watcher": "2.0.4", + "@yarnpkg/lockfile": "^1.1.0", + "@yarnpkg/parsers": "3.0.0-rc.46", + "@zkochan/js-yaml": "0.0.6", + "axios": "^1.0.0", + "chalk": "^4.1.0", + "cli-cursor": "3.1.0", + "cli-spinners": "2.6.1", + "cliui": "^7.0.2", + "dotenv": "~10.0.0", + "enquirer": "~2.3.6", + "fast-glob": "3.2.7", + "figures": "3.2.0", + "flat": "^5.0.2", + "fs-extra": "^11.1.0", + "glob": "7.1.4", + "ignore": "^5.0.4", + "js-yaml": "4.1.0", + "jsonc-parser": "3.2.0", + "lines-and-columns": "~2.0.3", + "minimatch": "3.0.5", + "npm-run-path": "^4.0.1", + "open": "^8.4.0", + "semver": "7.5.3", + "string-width": "^4.2.3", + "strong-log-transformer": "^2.1.0", + "tar-stream": "~2.2.0", + "tmp": "~0.2.1", + "tsconfig-paths": "^4.1.2", + "tslib": "^2.3.0", + "v8-compile-cache": "2.3.0", + "yargs": "^17.6.2", + "yargs-parser": "21.1.1" + }, + "bin": { + "nx": "bin/nx.js" + }, + "optionalDependencies": { + "@nx/nx-darwin-arm64": "16.5.1", + "@nx/nx-darwin-x64": "16.5.1", + "@nx/nx-freebsd-x64": "16.5.1", + "@nx/nx-linux-arm-gnueabihf": "16.5.1", + "@nx/nx-linux-arm64-gnu": "16.5.1", + "@nx/nx-linux-arm64-musl": "16.5.1", + "@nx/nx-linux-x64-gnu": "16.5.1", + "@nx/nx-linux-x64-musl": "16.5.1", + "@nx/nx-win32-arm64-msvc": "16.5.1", + "@nx/nx-win32-x64-msvc": "16.5.1" + }, + "peerDependencies": { + "@swc-node/register": "^1.4.2", + "@swc/core": "^1.2.173" + }, + "peerDependenciesMeta": { + "@swc-node/register": { + "optional": true + }, + "@swc/core": { + "optional": true + } + } + }, + "node_modules/nx/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/nx/node_modules/argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "node_modules/nx/node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/nx/node_modules/cli-spinners": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.6.1.tgz", + "integrity": "sha512-x/5fWmGMnbKQAaNwN+UZlV79qBLM9JFnJuJ03gIi5whrob0xV0ofNVHy9DhwGdsMJQc2OKv0oGmLzvaqvAVv+g==", + "dev": true, + "engines": { + "node": ">=6" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/nx/node_modules/cliui": { + "version": "7.0.4", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", + "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", + "dev": true, + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^7.0.0" + } + }, + "node_modules/nx/node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/nx/node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "node_modules/nx/node_modules/fast-glob": { + "version": "3.2.7", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz", + "integrity": "sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==", + "dev": true, + "dependencies": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.2", + "merge2": "^1.3.0", + "micromatch": "^4.0.4" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nx/node_modules/fs-extra": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz", + "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==", + "dev": true, + "dependencies": { + "graceful-fs": "^4.2.0", + "jsonfile": "^6.0.1", + "universalify": "^2.0.0" + }, + "engines": { + "node": ">=14.14" + } + }, + "node_modules/nx/node_modules/glob": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.4.tgz", + "integrity": "sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==", + "dev": true, + "dependencies": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + }, + "engines": { + "node": "*" + } + }, + "node_modules/nx/node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "engines": { + "node": ">=8" + } + }, + "node_modules/nx/node_modules/js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "dependencies": { + "argparse": "^2.0.1" + }, + "bin": { + "js-yaml": "bin/js-yaml.js" + } + }, + "node_modules/nx/node_modules/jsonfile": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", + "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==", + "dev": true, + "dependencies": { + "universalify": "^2.0.0" + }, + "optionalDependencies": { + "graceful-fs": "^4.1.6" + } + }, + "node_modules/nx/node_modules/lines-and-columns": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-2.0.4.tgz", + "integrity": "sha512-wM1+Z03eypVAVUCE7QdSqpVIvelbOakn1M0bPDoA4SGWPx3sNDVUiMo3L6To6WWGClB7VyXnhQ4Sn7gxiJbE6A==", + "dev": true, + "engines": { + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + } + }, + "node_modules/nx/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/nx/node_modules/minimatch": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.5.tgz", + "integrity": "sha512-tUpxzX0VAzJHjLu0xUfFv1gwVp9ba3IOuRAVH2EGuRW8a5emA2FlACLqiT/lDVtS1W+TGNwqz3sWaNyLgDJWuw==", + "dev": true, + "dependencies": { + "brace-expansion": "^1.1.7" + }, + "engines": { + "node": "*" + } + }, + "node_modules/nx/node_modules/semver": { + "version": "7.5.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.3.tgz", + "integrity": "sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==", + "dev": true, + "dependencies": { + "lru-cache": "^6.0.0" + }, + "bin": { + "semver": "bin/semver.js" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/nx/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/nx/node_modules/tmp": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.2.1.tgz", + "integrity": "sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==", + "dev": true, + "dependencies": { + "rimraf": "^3.0.0" + }, + "engines": { + "node": ">=8.17.0" + } + }, + "node_modules/nx/node_modules/universalify": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", + "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==", + "dev": true, + "engines": { + "node": ">= 10.0.0" + } + }, + "node_modules/nx/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -12178,7 +13360,6 @@ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==", "dev": true, - "peer": true, "dependencies": { "@aashutoshrathi/word-wrap": "^1.2.3", "deep-is": "^0.1.3", @@ -12942,7 +14123,6 @@ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, - "peer": true, "engines": { "node": ">= 0.8.0" } @@ -13042,6 +14222,12 @@ "node": ">= 0.10" } }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==", + "dev": true + }, "node_modules/prr": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", @@ -14477,6 +15663,15 @@ "node": ">=8" } }, + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha512-vavAMRXOgBVNF6nyEEmL3DBK19iRpDcoIwW+swQ+CbGiu7lju6t+JklA1MHweoWtadgt4ISVUsXLyDq34ddcwA==", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -14491,7 +15686,6 @@ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "dev": true, - "peer": true, "engines": { "node": ">=8" }, @@ -14499,6 +15693,23 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/strong-log-transformer": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/strong-log-transformer/-/strong-log-transformer-2.1.0.tgz", + "integrity": "sha512-B3Hgul+z0L9a236FAUC9iZsL+nVHgoCJnqCbN588DjYxvGXaXaaFbfmQ/JhvKjZwsOukuR72XbHv71Qkug0HxA==", + "dev": true, + "dependencies": { + "duplexer": "^0.1.1", + "minimist": "^1.2.0", + "through": "^2.3.4" + }, + "bin": { + "sl-log-transformer": "bin/sl-log-transformer.js" + }, + "engines": { + "node": ">=4" + } + }, "node_modules/sucrase": { "version": "3.34.0", "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz", @@ -14680,6 +15891,22 @@ "node": ">=10" } }, + "node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", + "dev": true, + "dependencies": { + "bl": "^4.0.3", + "end-of-stream": "^1.4.1", + "fs-constants": "^1.0.0", + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/tar/node_modules/fs-minipass": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", @@ -14987,11 +16214,46 @@ "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", "dev": true }, + "node_modules/tsconfig-paths": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-4.2.0.tgz", + "integrity": "sha512-NoZ4roiN7LnbKn9QqE1amc9DJfzvZXxF4xDavcOWt1BPkdx+m+0gJuPM+S0vCe7zTJMYUP0R8pO2XMr+Y8oLIg==", + "dev": true, + "dependencies": { + "json5": "^2.2.2", + "minimist": "^1.2.6", + "strip-bom": "^3.0.0" + }, + "engines": { + "node": ">=6" + } + }, "node_modules/tslib": { "version": "2.6.2", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz", "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==" }, + "node_modules/tsutils": { + "version": "3.21.0", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.21.0.tgz", + "integrity": "sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==", + "dev": true, + "dependencies": { + "tslib": "^1.8.1" + }, + "engines": { + "node": ">= 6" + }, + "peerDependencies": { + "typescript": ">=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta" + } + }, + "node_modules/tsutils/node_modules/tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, "node_modules/tuf-js": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-1.1.7.tgz", @@ -15095,7 +16357,6 @@ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, - "peer": true, "dependencies": { "prelude-ls": "^1.2.1" }, @@ -15340,6 +16601,12 @@ "uuid": "dist/bin/uuid" } }, + "node_modules/v8-compile-cache": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", + "integrity": "sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==", + "dev": true + }, "node_modules/validate-npm-package-license": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", @@ -16084,7 +17351,6 @@ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, - "peer": true, "engines": { "node": ">=10" }, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package.json b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package.json index fc84b76629..b52182c429 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package.json +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/package.json @@ -10,7 +10,9 @@ "test:dev": "ng test --karma-config=karma.conf.js --watch=true --browsers=Chrome", "prettier": "prettier --config .prettierrc . --check", "prettier-format": "prettier --config .prettierrc . --write", - "ci": "npm ci --ignore-scripts" + "ci": "npm ci --ignore-scripts", + "lint": "ng lint --eslint-config .eslintrc.json", + "lint:fix": "ng lint --eslint-config .eslintrc.json --fix" }, "private": true, "dependencies": { @@ -43,6 +45,11 @@ }, "devDependencies": { "@angular-devkit/build-angular": "^16.2.10", + "@angular-eslint/builder": "16.3.0", + "@angular-eslint/eslint-plugin": "16.3.0", + "@angular-eslint/eslint-plugin-template": "16.3.0", + "@angular-eslint/schematics": "16.3.0", + "@angular-eslint/template-parser": "16.3.0", "@angular/cli": "~16.2.10", "@angular/compiler-cli": "^16.2.12", "@types/codemirror": "^5.60.15", @@ -50,7 +57,10 @@ "@types/humanize-duration": "^3.27.3", "@types/jasmine": "~4.6.4", "@types/webfontloader": "^1.6.38", + "@typescript-eslint/eslint-plugin": "5.62.0", + "@typescript-eslint/parser": "5.62.0", "autoprefixer": "^10.4.16", + "eslint": "^8.51.0", "eslint-config-prettier": "^9.1.0", "eslint-plugin-prettier": "^5.0.1", "jasmine-core": "~4.6.0", diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/.eslintrc b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/.eslintrc deleted file mode 100644 index fa387be874..0000000000 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/.eslintrc +++ /dev/null @@ -1,15 +0,0 @@ -{ - "root": true, - "parser": "@typescript-eslint/parser", - "plugins": ["@typescript-eslint", "prettier"], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/eslint-recommended", - "plugin:@typescript-eslint/recommended", - "prettier" - ], - "rules": { - "no-console": 1, // Means warning - "prettier/prettier": 2 // Means error - } -} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.component.ts index 09dddb542b..df4a3fe6bf 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/app.component.ts @@ -26,7 +26,7 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; }) export class AppComponent { title = 'nifi'; - guardLoading: boolean = true; + guardLoading = true; constructor(private router: Router) { this.router.events.pipe(takeUntilDestroyed()).subscribe((event) => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/service/access-policy.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/service/access-policy.service.ts index 5462f2de53..a734e6e92c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/service/access-policy.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/service/access-policy.service.ts @@ -43,7 +43,7 @@ export class AccessPolicyService { users?: TenantEntity[]; } = {} ): Observable { - let resource: string = `/${resourceAction.resource}`; + let resource = `/${resourceAction.resource}`; if (resourceAction.resourceIdentifier) { resource += `/${resourceAction.resourceIdentifier}`; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts index d747ab69a0..555b7b01d9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.actions.ts @@ -28,7 +28,7 @@ import { SelectComponentAccessPolicyRequest } from './index'; -const ACCESS_POLICY_PREFIX: string = '[Access Policy]'; +const ACCESS_POLICY_PREFIX = '[Access Policy]'; export const selectGlobalAccessPolicy = createAction( `${ACCESS_POLICY_PREFIX} Select Global Access Policy`, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts index cec4550455..b779a6346c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.effects.ts @@ -63,7 +63,7 @@ export class AccessPolicyEffects { this.actions$.pipe( ofType(AccessPolicyActions.reloadAccessPolicy), concatLatestFrom(() => this.store.select(selectResourceAction).pipe(isDefinedAndNotNull())), - switchMap(([action, resourceAction]) => { + switchMap(([, resourceAction]) => { return of( AccessPolicyActions.loadAccessPolicy({ request: { @@ -84,7 +84,7 @@ export class AccessPolicyEffects { map((response) => { const accessPolicy: AccessPolicyEntity = response; - let requestedResource: string = `/${request.resourceAction.resource}`; + let requestedResource = `/${request.resourceAction.resource}`; if (request.resourceAction.resourceIdentifier) { requestedResource += `/${request.resourceAction.resourceIdentifier}`; } @@ -138,7 +138,7 @@ export class AccessPolicyEffects { this.actions$.pipe( ofType(AccessPolicyActions.createAccessPolicy), concatLatestFrom(() => this.store.select(selectResourceAction).pipe(isDefinedAndNotNull())), - switchMap(([action, resourceAction]) => + switchMap(([, resourceAction]) => from(this.accessPoliciesService.createAccessPolicy(resourceAction)).pipe( map((response) => { const accessPolicy: AccessPolicyEntity = response; @@ -170,7 +170,7 @@ export class AccessPolicyEffects { this.actions$.pipe( ofType(AccessPolicyActions.promptOverrideAccessPolicy), concatLatestFrom(() => this.store.select(selectAccessPolicy).pipe(isDefinedAndNotNull())), - tap(([action, accessPolicy]) => { + tap(([, accessPolicy]) => { const dialogReference = this.dialog.open(OverridePolicyDialog, { panelClass: 'small-dialog' }); @@ -287,7 +287,7 @@ export class AccessPolicyEffects { this.actions$.pipe( ofType(AccessPolicyActions.openAddTenantToPolicyDialog), concatLatestFrom(() => this.store.select(selectAccessPolicy)), - tap(([action, accessPolicy]) => { + tap(([, accessPolicy]) => { const dialogReference = this.dialog.open(AddTenantToPolicyDialog, { data: { accessPolicy @@ -417,7 +417,7 @@ export class AccessPolicyEffects { () => this.actions$.pipe( ofType(AccessPolicyActions.promptDeleteAccessPolicy), - tap((request) => { + tap(() => { const dialogReference = this.dialog.open(YesNoDialog, { data: { title: 'Delete Policy', @@ -442,9 +442,9 @@ export class AccessPolicyEffects { this.store.select(selectResourceAction).pipe(isDefinedAndNotNull()), this.store.select(selectAccessPolicy).pipe(isDefinedAndNotNull()) ]), - switchMap(([action, resourceAction, accessPolicy]) => + switchMap(([, resourceAction, accessPolicy]) => from(this.accessPoliciesService.deleteAccessPolicy(accessPolicy)).pipe( - map((response) => { + map(() => { // the policy was removed, we need to reload the policy for this resource and action to fetch // the inherited policy or correctly when it's not found return AccessPolicyActions.loadAccessPolicy({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.reducer.ts index 0f2300b13d..63786d2405 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/access-policy.reducer.ts @@ -42,7 +42,7 @@ export const accessPolicyReducer = createReducer( ...state, resourceAction: request.resourceAction })), - on(loadAccessPolicy, (state, { request }) => ({ + on(loadAccessPolicy, (state) => ({ ...state, status: 'loading' as const })), @@ -54,11 +54,11 @@ export const accessPolicyReducer = createReducer( saving: false, status: 'success' as const })), - on(addTenantsToPolicy, (state, { request }) => ({ + on(addTenantsToPolicy, (state) => ({ ...state, saving: true })), - on(removeTenantFromPolicy, (state, { request }) => ({ + on(removeTenantFromPolicy, (state) => ({ ...state, saving: true })), @@ -76,7 +76,7 @@ export const accessPolicyReducer = createReducer( policyStatus: undefined, status: 'error' as const })), - on(resetAccessPolicyState, (state) => ({ + on(resetAccessPolicyState, () => ({ ...initialState })) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/index.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/index.ts index d9b0a4fa53..9f2256e926 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/index.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/access-policy/index.ts @@ -16,7 +16,7 @@ */ import { AccessPolicyEntity, ComponentResourceAction, PolicyStatus, ResourceAction } from '../shared'; -import { TenantEntity, UserEntity, UserGroupEntity } from '../../../../state/shared'; +import { TenantEntity } from '../../../../state/shared'; export const accessPolicyFeatureKey = 'accessPolicy'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/policy-component/policy-component.actions.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/policy-component/policy-component.actions.ts index e046d2cc9e..40e2137790 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/policy-component/policy-component.actions.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/policy-component/policy-component.actions.ts @@ -18,7 +18,7 @@ import { createAction, props } from '@ngrx/store'; import { LoadPolicyComponentRequest, LoadPolicyComponentSuccess } from './index'; -const POLICY_COMPONENT_PREFIX: string = '[Policy Component]'; +const POLICY_COMPONENT_PREFIX = '[Policy Component]'; export const loadPolicyComponent = createAction( `${POLICY_COMPONENT_PREFIX} Load Policy Component`, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/policy-component/policy-component.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/policy-component/policy-component.reducer.ts index 024a4ac0bd..8c04dcbdf1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/policy-component/policy-component.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/policy-component/policy-component.reducer.ts @@ -51,7 +51,7 @@ export const policyComponentReducer = createReducer( error: error, status: 'error' as const })), - on(resetPolicyComponentState, (state) => ({ + on(resetPolicyComponentState, () => ({ ...initialState })) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/tenants/tenants.actions.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/tenants/tenants.actions.ts index 573c88ba75..64f2c72670 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/tenants/tenants.actions.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/tenants/tenants.actions.ts @@ -18,7 +18,7 @@ import { createAction, props } from '@ngrx/store'; import { LoadTenantsSuccess } from './index'; -const TENANTS_PREFIX: string = '[Tenants]'; +const TENANTS_PREFIX = '[Tenants]'; export const loadTenants = createAction(`${TENANTS_PREFIX} Load Tenants`); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/tenants/tenants.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/tenants/tenants.reducer.ts index a971604af7..eedf5f4c93 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/tenants/tenants.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/state/tenants/tenants.reducer.ts @@ -44,7 +44,7 @@ export const tenantsReducer = createReducer( error: error, status: 'error' as const })), - on(resetTenantsState, (state) => ({ + on(resetTenantsState, () => ({ ...initialState })) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.spec.ts index 1fd95e1a67..5108326c07 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.spec.ts @@ -24,7 +24,6 @@ import { MatInputModule } from '@angular/material/input'; import { ReactiveFormsModule } from '@angular/forms'; import { MatSelectModule } from '@angular/material/select'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; -import { CurrentUser } from '../../../../../state/current-user'; describe('PolicyTable', () => { let component: PolicyTable; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.ts index 584fcf08ef..8add8eaf30 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.ts @@ -15,12 +15,11 @@ * limitations under the License. */ -import { AfterViewInit, Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MatTableDataSource, MatTableModule } from '@angular/material/table'; import { MatSortModule, Sort } from '@angular/material/sort'; import { NiFiCommon } from '../../../../../service/nifi-common.service'; -import { CurrentUser } from '../../../../../state/current-user'; -import { TenantEntity, UserEntity } from '../../../../../state/shared'; +import { TenantEntity } from '../../../../../state/shared'; import { NgIf } from '@angular/common'; import { AccessPolicyEntity } from '../../../state/shared'; import { RemoveTenantFromPolicyRequest } from '../../../state/access-policy'; @@ -98,7 +97,7 @@ export class PolicyTable { return data.sort((a, b) => { const isAsc = sort.direction === 'asc'; - let retVal: number = 0; + let retVal = 0; switch (sort.active) { case 'user': retVal = this.nifiCommon.compareString(a.user, b.user); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts index dc70525b2b..5df811ae45 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.ts @@ -35,13 +35,13 @@ import { selectAccessPolicyState, selectComponentResourceActionFromRoute } from '../../state/access-policy/access-policy.selectors'; -import { distinctUntilChanged, filter } from 'rxjs'; +import { distinctUntilChanged } from 'rxjs'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { NiFiCommon } from '../../../../service/nifi-common.service'; import { ComponentType, isDefinedAndNotNull, SelectOption, TextTipInput } from '../../../../state/shared'; import { TextTip } from '../../../../ui/common/tooltips/text-tip/text-tip.component'; -import { AccessPolicyEntity, Action, ComponentResourceAction, PolicyStatus, ResourceAction } from '../../state/shared'; +import { AccessPolicyEntity, Action, PolicyStatus, ResourceAction } from '../../state/shared'; import { loadFlowConfiguration } from '../../../../state/flow-configuration/flow-configuration.actions'; import { selectFlowConfiguration } from '../../../../state/flow-configuration/flow-configuration.selectors'; import { loadTenants, resetTenantsState } from '../../state/tenants/tenants.actions'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.ts index a9033481c6..0809c0c949 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/global-access-policies/global-access-policies.component.ts @@ -35,7 +35,7 @@ import { selectAccessPolicyState, selectGlobalResourceActionFromRoute } from '../../state/access-policy/access-policy.selectors'; -import { distinctUntilChanged, filter } from 'rxjs'; +import { distinctUntilChanged } from 'rxjs'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { FormBuilder, FormControl, FormGroup, Validators } from '@angular/forms'; import { NiFiCommon } from '../../../../service/nifi-common.service'; @@ -47,7 +47,7 @@ import { TextTipInput } from '../../../../state/shared'; import { TextTip } from '../../../../ui/common/tooltips/text-tip/text-tip.component'; -import { AccessPolicyEntity, Action, PolicyStatus, ResourceAction } from '../../state/shared'; +import { AccessPolicyEntity, Action, PolicyStatus } from '../../state/shared'; import { loadExtensionTypesForPolicies } from '../../../../state/extension-types/extension-types.actions'; import { selectRequiredPermissions } from '../../../../state/extension-types/extension-types.selectors'; import { loadFlowConfiguration } from '../../../../state/flow-configuration/flow-configuration.actions'; @@ -74,8 +74,8 @@ export class GlobalAccessPolicies implements OnInit, OnDestroy { policyForm: FormGroup; resourceOptions: SelectOption[]; requiredPermissionOptions!: SelectOption[]; - supportsReadWriteAction: boolean = false; - supportsResourceIdentifier: boolean = false; + supportsReadWriteAction = false; + supportsResourceIdentifier = false; @ViewChild('inheritedFromPolicies') inheritedFromPolicies!: TemplateRef; @ViewChild('inheritedFromController') inheritedFromController!: TemplateRef; @@ -97,7 +97,7 @@ export class GlobalAccessPolicies implements OnInit, OnDestroy { .select(selectRequiredPermissions) .pipe(takeUntilDestroyed()) .subscribe((requiredPermissions: RequiredPermission[]) => { - const regardlessOfRestrictions: string = 'regardless of restrictions'; + const regardlessOfRestrictions = 'regardless of restrictions'; const options: SelectOption[] = [ { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/service/counters.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/service/counters.service.ts index 987d23e757..05e484576e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/service/counters.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/service/counters.service.ts @@ -19,7 +19,7 @@ import { Injectable } from '@angular/core'; import { HttpClient } from '@angular/common/http'; import { Client } from '../../../service/client.service'; import { Observable } from 'rxjs'; -import { CounterEntity, ResetCounterRequest } from '../state/counter-listing'; +import { ResetCounterRequest } from '../state/counter-listing'; @Injectable({ providedIn: 'root' }) export class CountersService { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.actions.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.actions.ts index 5b7f6a4ab0..6abf48fc23 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.actions.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.actions.ts @@ -18,7 +18,7 @@ import { createAction, props } from '@ngrx/store'; import { LoadCounterListingResponse, ResetCounterRequest, ResetCounterSuccess } from './index'; -const COUNTER_PREFIX: string = '[Counter Listing]'; +const COUNTER_PREFIX = '[Counter Listing]'; export const loadCounters = createAction(`${COUNTER_PREFIX} Load Counter Listing`); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.reducer.ts index c14d9cc316..342d97e3c5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/state/counter-listing/counter-listing.reducer.ts @@ -63,7 +63,7 @@ export const counterListingReducer = createReducer( } }); }), - on(resetCounterState, (state) => ({ + on(resetCounterState, () => ({ ...initialState })) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.ts index 093528662a..ae59e7cff8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.ts @@ -29,11 +29,11 @@ import { NiFiCommon } from '../../../../../service/nifi-common.service'; styleUrls: ['./counter-table.component.scss'] }) export class CounterTable implements AfterViewInit { - private _canModifyCounters: boolean = false; - filterTerm: string = ''; + private _canModifyCounters = false; + filterTerm = ''; filterColumn: 'context' | 'name' = 'name'; - totalCount: number = 0; - filteredCount: number = 0; + totalCount = 0; + filteredCount = 0; displayedColumns: string[] = ['context', 'name', 'value']; dataSource: MatTableDataSource = new MatTableDataSource(); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/feature/flow-designer-routing.module.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/feature/flow-designer-routing.module.ts index e52c9b3e3b..b19a2fa793 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/feature/flow-designer-routing.module.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/feature/flow-designer-routing.module.ts @@ -20,8 +20,6 @@ import { RouterModule, Routes } from '@angular/router'; import { FlowDesigner } from './flow-designer.component'; import { RootGroupRedirector } from '../ui/root/redirector/root-group-redirector.component'; import { rootGroupGuard } from '../ui/root/guard/root-group.guard'; -import { Canvas } from '../ui/canvas/canvas.component'; -import { ControllerServices } from '../ui/controller-service/controller-services.component'; const routes: Routes = [ { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts index bdbfcf44b5..3160a762a0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/draggable-behavior.service.ts @@ -34,12 +34,12 @@ import { ComponentType } from '../../../../state/shared'; }) export class DraggableBehavior { private readonly drag: any; - private snapEnabled: boolean = false; - private snapAlignmentPixels: number = 8; + private snapEnabled = false; + private snapAlignmentPixels = 8; private scale: number = INITIAL_SCALE; - private updateConnectionRequestId: number = 0; + private updateConnectionRequestId = 0; constructor( private store: Store, @@ -84,8 +84,8 @@ export class DraggableBehavior { if (minY === null || d.position.y < minY) { minY = d.position.y; } - var componentMaxX = d.position.x + d.dimensions.width; - var componentMaxY = d.position.y + d.dimensions.height; + const componentMaxX = d.position.x + d.dimensions.width; + const componentMaxY = d.position.y + d.dimensions.height; if (maxX === null || componentMaxX > maxX) { maxX = componentMaxX; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/position-behavior.service.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/position-behavior.service.spec.ts index 21327e2c1c..97ea5e1f03 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/position-behavior.service.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/behavior/position-behavior.service.spec.ts @@ -18,9 +18,6 @@ import { TestBed } from '@angular/core/testing'; import { PositionBehavior } from './position-behavior.service'; -import { provideMockStore } from '@ngrx/store/testing'; -import { initialState } from '../../state/flow/flow.reducer'; -import { selectFlowState } from '../../state/flow/flow.selectors'; describe('PositionBehavior', () => { let service: PositionBehavior; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts index 6537790336..33c090eac8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/birdseye-view.service.ts @@ -208,8 +208,8 @@ export class BirdseyeView { } // offset in case the graph has positive/negative coordinates and panning appropriately - let offsetX: number = 0; - let left: number = -graphLeft; + let offsetX = 0; + const left: number = -graphLeft; if (translate[0] < 0) { if (translate[0] < left) { offsetX = left; @@ -221,8 +221,8 @@ export class BirdseyeView { offsetX = left - translate[0]; } } - let offsetY: number = 0; - let top: number = -graphTop; + let offsetY = 0; + const top: number = -graphTop; if (translate[1] < 0) { if (translate[1] < top) { offsetY = top; @@ -274,7 +274,7 @@ export class BirdseyeView { // labels this.labelManager.selectAll().each(function (d: any) { // default color - let color: string = '#fff7d7'; + let color = '#fff7d7'; if (d.permissions.canRead) { // use the specified color if appropriate @@ -313,7 +313,7 @@ export class BirdseyeView { // processors this.processorManager.selectAll().each(function (d: any) { // default color - let color: string = '#dde4eb'; + let color = '#dde4eb'; if (d.permissions.canRead) { // use the specified color if appropriate diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts index 5e27e1cab8..5d083166e1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-context-menu.service.ts @@ -778,7 +778,7 @@ export class CanvasContextMenu implements ContextMenuDefinitionProvider { const selectionData = selection.datum(); const componentType: ComponentType = selectionData.type; - let resource: string = 'process-groups'; + let resource = 'process-groups'; switch (componentType) { case ComponentType.Processor: resource = 'processors'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts index 3c23b1a78b..fa43903e36 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts @@ -753,7 +753,7 @@ export class CanvasUtils { if (isDisconnected) { // go through each connection to ensure its source and destination are included - connections.forEach(function (connection, id) { + connections.forEach((connection) => { if (isDisconnected) { // determine whether this connection and its components are included within the selection isDisconnected = @@ -949,7 +949,7 @@ export class CanvasUtils { return false; } - private binarySearch(length: number, comparator: Function): number { + private binarySearch(length: number, comparator: (data: number) => number): number { let low = 0; let high = length - 1; let mid = 0; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts index b65dd312b7..ed70a7191c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts @@ -50,7 +50,7 @@ export class CanvasView { private behavior: any; - private birdseyeTranslateInProgress: boolean = false; + private birdseyeTranslateInProgress = false; constructor( private store: Store, @@ -95,7 +95,7 @@ export class CanvasView { const self: CanvasView = this; let refreshed: Promise | null; - let panning: boolean = false; + let panning = false; // define the behavior this.behavior = d3 @@ -123,7 +123,7 @@ export class CanvasView { refreshBirdseye: false }); }) - .on('end', function (event) { + .on('end', function () { if (!self.isBirdseyeEvent()) { // ensure the canvas was actually refreshed if (refreshed) { @@ -244,7 +244,7 @@ export class CanvasView { }; // marks the specific component as visible and determines if its entering or leaving visibility - const updateVisibility = function (selection: any, d: any, isVisible: Function) { + const updateVisibility = function (selection: any, d: any, isVisible: (d: any) => boolean) { const visible: boolean = isVisible(d); const wasVisible: boolean = selection.classed('visible'); @@ -307,11 +307,11 @@ export class CanvasView { let box; if (this.canvasUtils.isConnection(selection)) { let x, y; - let d = selection.datum(); + const d = selection.datum(); // get the position of the connection label if (d.bends.length > 0) { - let i: number = Math.min(Math.max(0, d.labelIndex), d.bends.length - 1); + const i: number = Math.min(Math.max(0, d.labelIndex), d.bends.length - 1); x = d.bends[i].x; y = d.bends[i].y; } else { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/connection-manager.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/connection-manager.service.ts index ce1ce97aec..b2e23f111b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/connection-manager.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/connection-manager.service.ts @@ -77,7 +77,7 @@ export class ConnectionManager { private connections: [] = []; private connectionContainer: any; - private transitionRequired: boolean = false; + private transitionRequired = false; private currentProcessGroupId: string = initialState.id; private scale: number = INITIAL_SCALE; @@ -87,7 +87,7 @@ export class ConnectionManager { private endpointDrag: any; private labelDrag: any; - private snapEnabled: boolean = true; + private snapEnabled = true; private viewContainerRef: ViewContainerRef | undefined; @@ -190,7 +190,7 @@ export class ConnectionManager { } let minimumDistance: number; - let index: number = 0; + let index = 0; // line is comprised of start -> [bends] -> end const line = [connectionData.start].concat(connectionData.bends, [connectionData.end]); @@ -567,7 +567,7 @@ export class ConnectionManager { if (updatePath) { updated .classed('grouped', function (d: any) { - let grouped: boolean = false; + let grouped = false; if (d.permissions.canRead) { // if there are more than one selected relationship, mark this as grouped @@ -579,7 +579,7 @@ export class ConnectionManager { return grouped; }) .classed('ghost', function (d: any) { - let ghost: boolean = false; + let ghost = false; if (d.permissions.canRead) { // if the connection has a relationship that is unavailable, mark it a ghost relationship @@ -799,7 +799,7 @@ export class ConnectionManager { } const newBends: any[] = []; - let bendIndex: number = -1; + let bendIndex = -1; // create a new array of bends without the selected one connectionData.component.bends.forEach((bend: any, i: number) => { @@ -890,8 +890,8 @@ export class ConnectionManager { .attr('stroke', 'transparent'); } - let labelCount: number = 0; - const rowHeight: number = 19; + let labelCount = 0; + const rowHeight = 19; const backgrounds: any[] = []; const borders: any[] = []; @@ -964,7 +964,7 @@ export class ConnectionManager { connectionFrom .select('text.connection-from') .each(function (this: any) { - let connectionFromLabel = d3.select(this); + const connectionFromLabel = d3.select(this); // reset the label name to handle any previous state connectionFromLabel.text(null).selectAll('title').remove(); @@ -1079,7 +1079,7 @@ export class ConnectionManager { connectionTo .select('text.connection-to') .each(function (this: any, d: any) { - let connectionToLabel = d3.select(this); + const connectionToLabel = d3.select(this); // reset the label name to handle any previous state connectionToLabel.text(null).selectAll('title').remove(); @@ -1191,7 +1191,7 @@ export class ConnectionManager { connectionName .select('text.connection-name') .each(function (this: any) { - let connectionToLabel = d3.select(this); + const connectionToLabel = d3.select(this); // reset the label name to handle any previous state connectionToLabel.text(null).selectAll('title').remove(); @@ -1472,7 +1472,7 @@ export class ConnectionManager { .select('title') .text(function () { if (d.permissions.canRead) { - let loadBalanceStrategyText: string = ''; + let loadBalanceStrategyText = ''; const loadBalanceStrategyOption: SelectOption | undefined = loadBalanceStrategies.find( (option) => option.value == d.component.loadBalanceStrategy @@ -1485,7 +1485,7 @@ export class ConnectionManager { loadBalanceStrategyText += ' (' + d.component.loadBalancePartitionAttribute + ')'; } - let loadBalanceCompression: string = 'no compression'; + let loadBalanceCompression = 'no compression'; switch (d.component.loadBalanceCompression) { case 'COMPRESS_ATTRIBUTES_ONLY': loadBalanceCompression = "'Attribute' compression"; @@ -1619,7 +1619,7 @@ export class ConnectionManager { return flowFileAvailability !== 'HEAD_OF_QUEUE_PENALIZED'; }) .attr('x', function () { - let offset: number = 0; + let offset = 0; if (!connectionLabelContainer.select('text.expiration-icon').classed('hidden')) { offset += 16; } @@ -1878,8 +1878,8 @@ export class ConnectionManager { // ensure the bend lengths are the same if (bends.length === connectionData.component.bends.length) { // determine if the bend points have moved - let different: boolean = false; - for (let i: number = 0; i < bends.length && !different; i++) { + let different = false; + for (let i = 0; i < bends.length && !different; i++) { if ( bends[i].x !== connectionData.component.bends[i].x || bends[i].y !== connectionData.component.bends[i].y @@ -2088,7 +2088,7 @@ export class ConnectionManager { y: datum.y + datum.height / 2 }; - let closestBendIndex: number = -1; + let closestBendIndex = -1; let minDistance: number; d.bends.forEach((bend: Position, i: number) => { const bendPoint: Position = { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/funnel-manager.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/funnel-manager.service.ts index a6d8b9452c..0a4e543405 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/funnel-manager.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/funnel-manager.service.ts @@ -44,7 +44,7 @@ export class FunnelManager { private funnels: [] = []; private funnelContainer: any; - private transitionRequired: boolean = false; + private transitionRequired = false; constructor( private store: Store, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/label-manager.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/label-manager.service.ts index 8ad51734b4..973eb5802b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/label-manager.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/label-manager.service.ts @@ -52,10 +52,10 @@ export class LabelManager { private labels: [] = []; private labelContainer: any; - private transitionRequired: boolean = false; + private transitionRequired = false; private labelPointDrag: any; - private snapEnabled: boolean = true; + private snapEnabled = true; constructor( private store: Store, @@ -323,14 +323,14 @@ export class LabelManager { const labelData: any = label.datum(); // determine if the width has changed - let different: boolean = false; - let widthSet: boolean = !!labelData.component.width; + let different = false; + const widthSet = !!labelData.component.width; if (widthSet || labelData.dimensions.width !== labelData.component.width) { different = true; } // determine if the height has changed - let heightSet: boolean = !!labelData.component.height; + const heightSet = !!labelData.component.height; if ((!different && heightSet) || labelData.dimensions.height !== labelData.component.height) { different = true; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts index 30d7a791bc..0def655caa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/port-manager.service.ts @@ -59,7 +59,7 @@ export class PortManager { private ports: [] = []; private portContainer: any; - private transitionRequired: boolean = false; + private transitionRequired = false; private viewContainerRef: ViewContainerRef | undefined; @@ -386,7 +386,7 @@ export class PortManager { updated .select('text.run-status-icon') .attr('class', function (d: any) { - let clazz: string = 'primary-500'; + let clazz = 'primary-500'; if (d.status.aggregateSnapshot.runStatus === 'Invalid') { clazz = 'canvas-accent-A200'; @@ -399,7 +399,7 @@ export class PortManager { return `run-status-icon ${clazz}`; }) .attr('font-family', function (d: any) { - let family: string = 'FontAwesome'; + let family = 'FontAwesome'; if (d.status.aggregateSnapshot.runStatus === 'Disabled') { family = 'flowfont'; } @@ -407,7 +407,7 @@ export class PortManager { }) .attr('y', this.offsetY(25)) .text(function (d: any) { - let img: string = ''; + let img = ''; if (d.status.aggregateSnapshot.runStatus === 'Disabled') { img = '\ue802'; } else if (d.status.aggregateSnapshot.runStatus === 'Invalid') { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/process-group-manager.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/process-group-manager.service.ts index 871676cadc..d7120dab75 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/process-group-manager.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/process-group-manager.service.ts @@ -56,7 +56,7 @@ export class ProcessGroupManager { private processGroups: [] = []; private processGroupContainer: any; - private transitionRequired: boolean = false; + private transitionRequired = false; private viewContainerRef: ViewContainerRef | undefined; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts index c6365a54db..21b86db0aa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/processor-manager.service.ts @@ -53,7 +53,7 @@ export class ProcessorManager { private processors: [] = []; private processorContainer: any; - private transitionRequired: boolean = false; + private transitionRequired = false; private viewContainerRef: ViewContainerRef | undefined; @@ -670,7 +670,7 @@ export class ProcessorManager { updated .select('text.run-status-icon') .attr('class', function (d: any) { - let clazz: string = 'primary-500'; + let clazz = 'primary-500'; if (d.status.aggregateSnapshot.runStatus === 'Validating') { clazz = 'warn-contrast-300'; @@ -685,7 +685,7 @@ export class ProcessorManager { return `run-status-icon ${clazz}`; }) .attr('font-family', function (d: any) { - let family: string = 'FontAwesome'; + let family = 'FontAwesome'; if (d.status.aggregateSnapshot.runStatus === 'Disabled') { family = 'flowfont'; } @@ -695,7 +695,7 @@ export class ProcessorManager { return d.status.aggregateSnapshot.runStatus === 'Validating'; }) .text(function (d: any) { - let img: string = ''; + let img = ''; if (d.status.aggregateSnapshot.runStatus === 'Disabled') { img = '\ue802'; } else if (d.status.aggregateSnapshot.runStatus === 'Validating') { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/remote-process-group-manager.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/remote-process-group-manager.service.ts index 98374f4466..12684936d2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/remote-process-group-manager.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/manager/remote-process-group-manager.service.ts @@ -53,7 +53,7 @@ export class RemoteProcessGroupManager { private remoteProcessGroups: [] = []; private remoteProcessGroupContainer: any; - private transitionRequired: boolean = false; + private transitionRequired = false; private viewContainerRef: ViewContainerRef | undefined; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/parameter.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/parameter.service.ts index 009a01c4ca..9bdf082039 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/parameter.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/parameter.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { NiFiCommon } from '../../../service/nifi-common.service'; import { ParameterContextUpdateRequest, SubmitParameterContextUpdate } from '../../../state/shared'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/search.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/search.service.ts index d45fc28530..a962d45c31 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/search.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/search.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; export interface SearchResultGroup { @@ -51,6 +51,7 @@ export interface SearchResults { export interface SearchResultsEntity { searchResultsDTO: SearchResults; } + @Injectable({ providedIn: 'root' }) export class SearchService { private static readonly API: string = '../nifi-api'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts index 7997d62ca7..77742b1baa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.effects.ts @@ -104,7 +104,7 @@ export class ControllerServicesEffects { this.store.select(selectControllerServiceTypes), this.store.select(selectCurrentProcessGroupId) ]), - tap(([action, controllerServiceTypes, processGroupId]) => { + tap(([, controllerServiceTypes, processGroupId]) => { const dialogReference = this.dialog.open(CreateControllerService, { data: { controllerServiceTypes @@ -255,7 +255,7 @@ export class ControllerServicesEffects { }; editDialogReference.componentInstance.parameterContext = parameterContext; - editDialogReference.componentInstance.goToParameter = (parameter: string) => { + editDialogReference.componentInstance.goToParameter = () => { const commands: string[] = ['/parameter-contexts', parameterContext.id]; goTo(commands, 'Parameter'); }; @@ -322,7 +322,7 @@ export class ControllerServicesEffects { }) ); }), - catchError((error) => { + catchError(() => { // TODO handle error return NEVER; }) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.reducer.ts index 33513a1afb..0497d9edf2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/controller-services.reducer.ts @@ -55,7 +55,7 @@ export const initialState: ControllerServicesState = { export const controllerServicesReducer = createReducer( initialState, - on(resetControllerServicesState, (state) => ({ + on(resetControllerServicesState, () => ({ ...initialState })), on(loadControllerServices, (state) => ({ @@ -77,7 +77,7 @@ export const controllerServicesReducer = createReducer( error, status: 'error' as const })), - on(createControllerService, configureControllerService, deleteControllerService, (state, { request }) => ({ + on(createControllerService, configureControllerService, deleteControllerService, (state) => ({ ...state, saving: true })), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/index.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/index.ts index 4cafd6f50e..81bd22e170 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/index.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/controller-services/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Bundle, ControllerServiceEntity, Revision } from '../../../../state/shared'; +import { ControllerServiceEntity } from '../../../../state/shared'; import { BreadcrumbEntity } from '../shared'; export const controllerServicesFeatureKey = 'controllerServiceListing'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts index 1af9e879cf..6b0ece8162 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.effects.ts @@ -118,7 +118,7 @@ export class FlowEffects { this.actions$.pipe( ofType(FlowActions.reloadFlow), concatLatestFrom(() => this.store.select(selectCurrentProcessGroupId)), - switchMap(([action, processGroupId]) => { + switchMap(([, processGroupId]) => { return of( FlowActions.loadProcessGroup({ request: { @@ -193,7 +193,7 @@ export class FlowEffects { takeUntil(this.actions$.pipe(ofType(FlowActions.stopProcessGroupPolling))) ) ), - switchMap((request) => of(FlowActions.reloadFlow())) + switchMap(() => of(FlowActions.reloadFlow())) ) ); @@ -348,7 +348,7 @@ export class FlowEffects { ofType(FlowActions.getParameterContextsAndOpenGroupComponentsDialog), map((action) => action.request), concatLatestFrom(() => this.store.select(selectCurrentProcessGroupId)), - switchMap(([request, currentProcessGroupId]) => + switchMap(([request]) => from(this.flowService.getParameterContexts()).pipe( concatLatestFrom(() => this.store.select(selectCurrentParameterContext)), map(([response, parameterContext]) => { @@ -659,7 +659,7 @@ export class FlowEffects { this.actions$.pipe( ofType(FlowActions.navigateToEditCurrentProcessGroup), concatLatestFrom(() => this.store.select(selectCurrentProcessGroupId)), - tap(([action, processGroupId]) => { + tap(([, processGroupId]) => { this.router.navigate(['/process-groups', processGroupId, 'edit']); }) ), @@ -887,7 +887,7 @@ export class FlowEffects { }; editDialogReference.componentInstance.parameterContext = parameterContext; - editDialogReference.componentInstance.goToParameter = (parameter: string) => { + editDialogReference.componentInstance.goToParameter = () => { const commands: string[] = ['/parameter-contexts', parameterContext.id]; goTo(commands, 'Parameter'); }; @@ -954,7 +954,7 @@ export class FlowEffects { }) ); }), - catchError((error) => { + catchError(() => { // TODO handle error return NEVER; }) @@ -1569,7 +1569,7 @@ export class FlowEffects { return from(this.flowService.createSnippet(snippet)).pipe( switchMap((response) => this.flowService.moveSnippet(response.snippet.id, request.groupId)), - map((response) => { + map(() => { const deleteResponses: DeleteComponentResponse[] = []; // prepare the delete responses with all requested components that are now deleted @@ -1598,7 +1598,7 @@ export class FlowEffects { mergeMap(([requests, processGroupId]) => { if (requests.length === 1) { return from(this.flowService.deleteComponent(requests[0])).pipe( - map((response) => { + map(() => { const deleteResponses: DeleteComponentResponse[] = [ { id: requests[0].id, @@ -1670,7 +1670,7 @@ export class FlowEffects { return from(this.flowService.createSnippet(snippet)).pipe( switchMap((response) => this.flowService.deleteSnippet(response.snippet.id)), - map((response) => { + map(() => { const deleteResponses: DeleteComponentResponse[] = []; // prepare the delete responses with all requested components that are now deleted @@ -1733,8 +1733,8 @@ export class FlowEffects { this.actions$.pipe( ofType(FlowActions.leaveProcessGroup), concatLatestFrom(() => this.store.select(selectParentProcessGroupId)), - filter(([action, parentProcessGroupId]) => parentProcessGroupId != null), - tap(([action, parentProcessGroupId]) => { + filter(([, parentProcessGroupId]) => parentProcessGroupId != null), + tap(([, parentProcessGroupId]) => { this.router.navigate(['/process-groups', parentProcessGroupId]); }) ), @@ -1822,7 +1822,7 @@ export class FlowEffects { this.actions$.pipe( ofType(FlowActions.deselectAllComponents), concatLatestFrom(() => this.store.select(selectCurrentProcessGroupId)), - switchMap(([action, processGroupId]) => { + switchMap(([, processGroupId]) => { return of(FlowActions.navigateWithoutTransform({ url: ['/process-groups', processGroupId] })); }) ) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.reducer.ts index 87e48cb1f5..01db056062 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/flow/flow.reducer.ts @@ -145,7 +145,7 @@ export const initialState: FlowState = { export const flowReducer = createReducer( initialState, - on(resetFlowState, (state) => ({ + on(resetFlowState, () => ({ ...initialState })), on(loadProcessGroup, (state, { request }) => ({ @@ -307,7 +307,7 @@ export const flowReducer = createReducer( ...state, skipTransform: skipTransform })), - on(navigateWithoutTransform, (state, { url }) => ({ + on(navigateWithoutTransform, (state) => ({ ...state, skipTransform: true })), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts index a9900be81f..a58918c79a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.effects.ts @@ -89,7 +89,7 @@ export class ParameterEffects { this.actions$.pipe( ofType(ParameterActions.pollParameterContextUpdateRequest), concatLatestFrom(() => this.store.select(selectUpdateRequest)), - switchMap(([action, updateRequest]) => { + switchMap(([, updateRequest]) => { if (updateRequest) { return from(this.parameterService.pollParameterContextUpdate(updateRequest.request)).pipe( map((response) => @@ -132,7 +132,7 @@ export class ParameterEffects { stopPollingParameterContextUpdateRequest$ = createEffect(() => this.actions$.pipe( ofType(ParameterActions.stopPollingParameterContextUpdateRequest), - switchMap((response) => of(ParameterActions.deleteParameterContextUpdateRequest())) + switchMap(() => of(ParameterActions.deleteParameterContextUpdateRequest())) ) ); @@ -140,7 +140,7 @@ export class ParameterEffects { this.actions$.pipe( ofType(ParameterActions.deleteParameterContextUpdateRequest), concatLatestFrom(() => this.store.select(selectUpdateRequest)), - tap(([action, updateRequest]) => { + tap(([, updateRequest]) => { if (updateRequest) { this.parameterService.deleteParameterContextUpdate(updateRequest.request).subscribe(); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.reducer.ts index 09237efeb1..8c2ad0055d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/parameter/parameter.reducer.ts @@ -31,7 +31,7 @@ export const initialState: ParameterState = { export const parameterReducer = createReducer( initialState, - on(submitParameterContextUpdateRequest, (state, { request }) => ({ + on(submitParameterContextUpdateRequest, (state) => ({ ...state, saving: true })), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts index 4ee573022c..37ba8e9180 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.effects.ts @@ -203,7 +203,7 @@ export class QueueEffects { this.actions$.pipe( ofType(QueueActions.pollEmptyQueueRequest), concatLatestFrom(() => this.store.select(selectDropRequestEntity).pipe(isDefinedAndNotNull())), - switchMap(([action, dropEntity]) => { + switchMap(([, dropEntity]) => { return from(this.queueService.pollEmptyQueueRequest(dropEntity.dropRequest)).pipe( map((response) => QueueActions.pollEmptyQueueRequestSuccess({ @@ -229,14 +229,14 @@ export class QueueEffects { ofType(QueueActions.pollEmptyQueueRequestSuccess), map((action) => action.response), filter((response) => response.dropEntity.dropRequest.finished), - switchMap((response) => of(QueueActions.stopPollingEmptyQueueRequest())) + switchMap(() => of(QueueActions.stopPollingEmptyQueueRequest())) ) ); stopPollingEmptyQueueRequest$ = createEffect(() => this.actions$.pipe( ofType(QueueActions.stopPollingEmptyQueueRequest), - switchMap((response) => of(QueueActions.deleteEmptyQueueRequest())) + switchMap(() => of(QueueActions.deleteEmptyQueueRequest())) ) ); @@ -244,7 +244,7 @@ export class QueueEffects { this.actions$.pipe( ofType(QueueActions.deleteEmptyQueueRequest), concatLatestFrom(() => this.store.select(selectDropRequestEntity).pipe(isDefinedAndNotNull())), - switchMap(([action, dropEntity]) => { + switchMap(([, dropEntity]) => { this.dialog.closeAll(); return from(this.queueService.deleteEmptyQueueRequest(dropEntity.dropRequest)).pipe( @@ -255,7 +255,7 @@ export class QueueEffects { } }) ), - catchError((error) => + catchError(() => of( QueueActions.showEmptyQueueResults({ request: { @@ -282,7 +282,7 @@ export class QueueEffects { const dropRequest: DropRequest = request.dropEntity.dropRequest; const droppedTokens: string[] = dropRequest.dropped.split(/ \/ /); - let message: string = `${droppedTokens[0]} FlowFiles (${droppedTokens[1]})`; + let message = `${droppedTokens[0]} FlowFiles (${droppedTokens[1]})`; if (dropRequest.percentCompleted < 100) { const originalTokens: string[] = dropRequest.original.split(/ \/ /); @@ -334,7 +334,7 @@ export class QueueEffects { () => this.actions$.pipe( ofType(QueueActions.queueApiError), - tap((action) => this.dialog.closeAll()) + tap(() => this.dialog.closeAll()) ), { dispatch: false } ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.reducer.ts index 7a2fb7c9c4..b752e37243 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/queue/queue.reducer.ts @@ -59,7 +59,7 @@ export const queueReducer = createReducer( error, status: 'error' as const })), - on(resetQueueState, (state) => ({ + on(resetQueueState, () => ({ ...initialState })) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.effects.ts index 7b6b3024fd..f73830d8f4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.effects.ts @@ -66,7 +66,7 @@ export class TransformEffects { this.actions$.pipe( ofType(TransformActions.restoreViewport), concatLatestFrom(() => this.store.select(selectCurrentProcessGroupId)), - tap(([action, processGroupId]) => { + tap(([, processGroupId]) => { try { // see if we can restore the view position from storage const name: string = TransformEffects.VIEW_PREFIX + processGroupId; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.reducer.ts index 88f13eb7f7..e557ac7f24 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/state/transform/transform.reducer.ts @@ -24,7 +24,7 @@ export const INITIAL_TRANSLATE = { y: 0 }; -export const INITIAL_SCALE: number = 1; +export const INITIAL_SCALE = 1; export const initialState: CanvasTransform = { translate: INITIAL_TRANSLATE, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts index 8d7e83bb42..62a1779df8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts @@ -118,7 +118,7 @@ export class Canvas implements OnInit, OnDestroy { concatLatestFrom(() => this.store.select(selectSkipTransform)), takeUntilDestroyed() ) - .subscribe(([status, skipTransform]) => { + .subscribe(([, skipTransform]) => { if (skipTransform) { this.store.dispatch(setSkipTransform({ skipTransform: false })); } else { @@ -136,7 +136,7 @@ export class Canvas implements OnInit, OnDestroy { concatLatestFrom(() => this.store.select(selectSkipTransform)), takeUntilDestroyed() ) - .subscribe(([selectedComponent, skipTransform]) => { + .subscribe(([, skipTransform]) => { if (skipTransform) { this.store.dispatch(setSkipTransform({ skipTransform: false })); } else { @@ -154,7 +154,7 @@ export class Canvas implements OnInit, OnDestroy { concatLatestFrom(() => this.store.select(selectSkipTransform)), takeUntilDestroyed() ) - .subscribe(([ids, skipTransform]) => { + .subscribe(([, skipTransform]) => { if (skipTransform) { this.store.dispatch(setSkipTransform({ skipTransform: false })); } else { @@ -350,10 +350,7 @@ export class Canvas implements OnInit, OnDestroy { .attr('result', 'offsetBlur'); // color/opacity - componentDropShadowFilter - .append('feFlood') - .attr('flood-opacity', 0.4) - .attr('result', 'offsetColor'); + componentDropShadowFilter.append('feFlood').attr('flood-opacity', 0.4).attr('result', 'offsetColor'); // combine componentDropShadowFilter @@ -391,10 +388,7 @@ export class Canvas implements OnInit, OnDestroy { .attr('result', 'offsetBlur'); // color/opacity - connectionFullDropShadowFilter - .append('feFlood') - .attr('flood-opacity', 1) - .attr('result', 'offsetColor'); + connectionFullDropShadowFilter.append('feFlood').attr('flood-opacity', 1).attr('result', 'offsetColor'); // combine connectionFullDropShadowFilter diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.ts index 6247bcfb25..8d008f132a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/graph-controls.component.ts @@ -17,7 +17,6 @@ import { Component } from '@angular/core'; import { Store } from '@ngrx/store'; -import { CanvasState } from '../../../state'; import { selectBreadcrumbs, selectNavigationCollapsed, @@ -27,10 +26,7 @@ import { NavigationControl } from './navigation-control/navigation-control.compo import { OperationControl } from './operation-control/operation-control.component'; import { AsyncPipe } from '@angular/common'; import { NiFiState } from '../../../../../state'; -import { - selectFlowConfiguration, - selectSupportsManagedAuthorizer -} from '../../../../../state/flow-configuration/flow-configuration.selectors'; +import { selectSupportsManagedAuthorizer } from '../../../../../state/flow-configuration/flow-configuration.selectors'; @Component({ selector: 'graph-controls', diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.ts index 3236fbaf99..7509fb33f3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/graph-controls/operation-control/operation-control.component.ts @@ -223,7 +223,7 @@ export class OperationControl { const selectionData = selection.datum(); const componentType: ComponentType = selectionData.type; - let resource: string = 'process-groups'; + let resource = 'process-groups'; switch (componentType) { case ComponentType.Processor: resource = 'processors'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.ts index ae85e1421a..0155d55239 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.ts @@ -37,12 +37,10 @@ export class FlowStatus { @Input() clusterSummary: ClusterSummary = initialState.clusterSummary; @Input() bulletins: BulletinEntity[] = initialState.controllerBulletins.bulletins; @Input() currentProcessGroupId: string = initialState.id; - @Input() loadingStatus: boolean = false; + @Input() loadingStatus = false; protected readonly BulletinsTip = BulletinsTip; - constructor() {} - hasTerminatedThreads(): boolean { return this.controllerStatus.terminatedThreadCount > 0; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.html index 339d9328e4..089fc26961 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.html @@ -24,7 +24,7 @@ (mouseleave)="mouseLeave()" cdkDrag cdkDragBoundary="body" - (cdkDragStarted)="onDragStarted($event)" + (cdkDragStarted)="onDragStarted()" (cdkDragEnded)="onDragEnded($event)"> diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.ts index 77d841fc29..c7b87c5619 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/new-canvas-item/new-canvas-item.component.ts @@ -15,8 +15,8 @@ * limitations under the License. */ -import { Component, Input, OnInit } from '@angular/core'; -import { CdkDrag, CdkDragEnd, CdkDragStart } from '@angular/cdk/drag-drop'; +import { Component, Input } from '@angular/core'; +import { CdkDrag, CdkDragEnd } from '@angular/cdk/drag-drop'; import { Store } from '@ngrx/store'; import { CanvasState } from '../../../../state'; import { INITIAL_SCALE, INITIAL_TRANSLATE } from '../../../../state/transform/transform.reducer'; @@ -35,14 +35,14 @@ import { ComponentType } from '../../../../../../state/shared'; imports: [CdkDrag], styleUrls: ['./new-canvas-item.component.scss'] }) -export class NewCanvasItem implements OnInit { +export class NewCanvasItem { @Input() type!: ComponentType; - @Input() iconClass: string = ''; - @Input() iconHoverClass: string = ''; + @Input() iconClass = ''; + @Input() iconHoverClass = ''; - dragging: boolean = false; + dragging = false; - private hovering: boolean = false; + private hovering = false; private scale: number = INITIAL_SCALE; private translate: Position = INITIAL_TRANSLATE; @@ -67,8 +67,6 @@ export class NewCanvasItem implements OnInit { }); } - ngOnInit(): void {} - mouseEnter() { this.hovering = true; } @@ -81,7 +79,7 @@ export class NewCanvasItem implements OnInit { return this.hovering && !this.dragging; } - onDragStarted(event: CdkDragStart): void { + onDragStarted(): void { this.store.dispatch( setDragging({ dragging: true diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/search/search.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/search/search.component.ts index 4d5dc3960c..bee859ebac 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/search/search.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/header/search/search.component.ts @@ -27,8 +27,6 @@ import { OriginConnectionPosition, OverlayConnectionPosition } from '@angular/cdk/overlay'; -import { Store } from '@ngrx/store'; -import { CanvasState } from '../../../../state'; import { ComponentType } from '../../../../../../state/shared'; import { NgForOf, NgIf, NgTemplateOutlet } from '@angular/common'; import { RouterLink } from '@angular/router'; @@ -58,10 +56,10 @@ export class Search implements OnInit { public positions: ConnectionPositionPair[] = [this.position]; searchForm: FormGroup; - searchInputVisible: boolean = false; + searchInputVisible = false; - searching: boolean = false; - searchingResultsVisible: boolean = false; + searching = false; + searchingResultsVisible = false; processorResults: ComponentSearchResult[] = []; connectionResults: ComponentSearchResult[] = []; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.ts index 3877d2f8f1..34a0aaa6c7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/create-connection/create-connection.component.ts @@ -132,8 +132,8 @@ export class CreateConnection { childOutputPorts$!: Observable | null; childInputPorts$!: Observable | null; - loadBalancePartitionAttributeRequired: boolean = false; - loadBalanceCompressionRequired: boolean = false; + loadBalancePartitionAttributeRequired = false; + loadBalanceCompressionRequired = false; constructor( @Inject(MAT_DIALOG_DATA) private dialogRequest: CreateConnectionDialogRequest, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-funnel/destination-funnel.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-funnel/destination-funnel.component.ts index 1da54fe026..682899690a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-funnel/destination-funnel.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-funnel/destination-funnel.component.ts @@ -25,6 +25,4 @@ import { Component, Input } from '@angular/core'; }) export class DestinationFunnel { @Input() groupName!: string; - - constructor() {} } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-output-port/destination-output-port.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-output-port/destination-output-port.component.ts index 04685b9539..b4c8f601b0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-output-port/destination-output-port.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-output-port/destination-output-port.component.ts @@ -30,6 +30,4 @@ export class DestinationOutputPort { @Input() groupName!: string; name!: string; - - constructor() {} } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-process-group/destination-process-group.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-process-group/destination-process-group.component.ts index 599a27dfe4..387090e5a6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-process-group/destination-process-group.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-process-group/destination-process-group.component.ts @@ -83,8 +83,8 @@ export class DestinationProcessGroup implements ControlValueAccessor { protected readonly TextTip = TextTip; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (outputPort: string) => void; @@ -92,10 +92,8 @@ export class DestinationProcessGroup implements ControlValueAccessor { inputPortItems!: SelectOption[]; selectedInputPort!: string; - noPorts: boolean = false; - hasUnauthorizedPorts: boolean = false; - - constructor() {} + noPorts = false; + hasUnauthorizedPorts = false; registerOnChange(onChange: (selectedInputPort: string) => void): void { this.onChange = onChange; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-processor/destination-processor.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-processor/destination-processor.component.ts index 7ddfa361d6..bf19d80f51 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-processor/destination-processor.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-processor/destination-processor.component.ts @@ -36,6 +36,4 @@ export class DestinationProcessor { @Input() groupName!: string; processorName!: string; - - constructor() {} } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-remote-process-group/destination-remote-process-group.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-remote-process-group/destination-remote-process-group.component.ts index 214d51b16c..4d02a016ea 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-remote-process-group/destination-remote-process-group.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/destination/destination-remote-process-group/destination-remote-process-group.component.ts @@ -72,8 +72,8 @@ export class DestinationRemoteProcessGroup implements ControlValueAccessor { protected readonly TextTip = TextTip; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (outputPort: string) => void; @@ -81,9 +81,7 @@ export class DestinationRemoteProcessGroup implements ControlValueAccessor { inputPortItems!: SelectOption[]; selectedInputPort!: string; - noPorts: boolean = false; - - constructor() {} + noPorts = false; registerOnChange(onChange: (selectedInputPort: string) => void): void { this.onChange = onChange; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts index b0a014daeb..b82a47a444 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/edit-connection/edit-connection.component.ts @@ -160,9 +160,9 @@ export class EditConnectionComponent { childOutputPorts$!: Observable | null; childInputPorts$!: Observable | null; - loadBalancePartitionAttributeRequired: boolean = false; + loadBalancePartitionAttributeRequired = false; initialPartitionAttribute: string; - loadBalanceCompressionRequired: boolean = false; + loadBalanceCompressionRequired = false; initialCompression: string; constructor( diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/prioritizers/prioritizers.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/prioritizers/prioritizers.component.ts index cd39755f79..c33d8c2429 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/prioritizers/prioritizers.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/prioritizers/prioritizers.component.ts @@ -73,8 +73,8 @@ export class Prioritizers implements ControlValueAccessor { protected readonly TextTip = TextTip; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (selectedPrioritizers: string[]) => void; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-funnel/source-funnel.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-funnel/source-funnel.component.ts index 8f0d397d48..a2ba73f31a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-funnel/source-funnel.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-funnel/source-funnel.component.ts @@ -25,6 +25,4 @@ import { Component, Input } from '@angular/core'; }) export class SourceFunnel { @Input() groupName!: string; - - constructor() {} } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-input-port/source-input-port.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-input-port/source-input-port.component.ts index c24b8a212c..ada9207ca4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-input-port/source-input-port.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-input-port/source-input-port.component.ts @@ -30,6 +30,4 @@ export class SourceInputPort { @Input() groupName!: string; name!: string; - - constructor() {} } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-process-group/source-process-group.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-process-group/source-process-group.component.ts index 3f9b2cc0a2..cea6fd2811 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-process-group/source-process-group.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-process-group/source-process-group.component.ts @@ -86,8 +86,8 @@ export class SourceProcessGroup implements ControlValueAccessor { protected readonly TextTip = TextTip; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (outputPort: string) => void; @@ -95,10 +95,8 @@ export class SourceProcessGroup implements ControlValueAccessor { outputPortItems!: SelectOption[]; selectedOutputPort!: string; - noPorts: boolean = false; - hasUnauthorizedPorts: boolean = false; - - constructor() {} + noPorts = false; + hasUnauthorizedPorts = false; registerOnChange(onChange: (selectedOutputPort: string) => void): void { this.onChange = onChange; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-processor/source-processor.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-processor/source-processor.component.ts index 9fec37d746..3c6afbaa01 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-processor/source-processor.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-processor/source-processor.component.ts @@ -51,8 +51,8 @@ export class SourceProcessor implements ControlValueAccessor { } @Input() groupName!: string; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (selectedRelationships: string[]) => void; @@ -62,8 +62,6 @@ export class SourceProcessor implements ControlValueAccessor { relationshipItems!: RelationshipItem[]; selectedRelationships!: string[]; - constructor() {} - processRelationships(): void { if (this.relationships && this.selectedRelationships) { this.relationshipItems = this.relationships.map((relationship) => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-remote-process-group/source-remote-process-group.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-remote-process-group/source-remote-process-group.component.ts index 829099cccc..c0765c0ff1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-remote-process-group/source-remote-process-group.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/connection/source/source-remote-process-group/source-remote-process-group.component.ts @@ -74,8 +74,8 @@ export class SourceRemoteProcessGroup implements ControlValueAccessor { protected readonly TextTip = TextTip; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (outputPort: string) => void; @@ -83,9 +83,7 @@ export class SourceRemoteProcessGroup implements ControlValueAccessor { outputPortItems!: SelectOption[]; selectedOutputPort!: string; - noPorts: boolean = false; - - constructor() {} + noPorts = false; registerOnChange(onChange: (selectedOutputPort: string) => void): void { this.onChange = onChange; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.ts index 926aa98daa..8a7652196c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/port/create-port/create-port.component.ts @@ -61,7 +61,7 @@ export class CreatePort { protected readonly TextTip = TextTip; createPortForm: FormGroup; - isRootProcessGroup: boolean = false; + isRootProcessGroup = false; portTypeLabel: string; allowRemoteAccessOptions: SelectOption[] = [ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.spec.ts index ea68a2f2ac..7dba0e555b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.spec.ts @@ -25,7 +25,7 @@ describe('EditProcessGroup', () => { let component: EditProcessGroup; let fixture: ComponentFixture; - const parameterContextId: string = '95d509b9-018b-1000-daff-b7957ea7934f'; + const parameterContextId = '95d509b9-018b-1000-daff-b7957ea7934f'; const data: any = { type: 'ProcessGroup', uri: 'https://localhost:4200/nifi-api/process-groups/162380af-018c-1000-a7eb-f5d06f77168b', diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.ts index 6e226ad214..3ddc6a3e7b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/process-group/edit-process-group/edit-process-group.component.ts @@ -194,7 +194,7 @@ export class EditProcessGroup { } submitForm() { - let updateStrategy: string = 'DIRECT_CHILDREN'; + let updateStrategy = 'DIRECT_CHILDREN'; if (this.editProcessGroupForm.get('applyParameterContextRecursively')?.value) { updateStrategy = 'ALL_DESCENDANTS'; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.ts index 089ebc282c..610b5408f6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/relationship-settings/relationship-settings.component.ts @@ -70,8 +70,8 @@ export class RelationshipSettings implements ControlValueAccessor { maxBackoffPeriod!: string; retryCount!: number; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (relationshipConfiguration: RelationshipConfiguration) => void; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/run-duration-slider/run-duration-slider.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/run-duration-slider/run-duration-slider.component.ts index 9045d92e5a..2f6a72ada6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/run-duration-slider/run-duration-slider.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/run-duration-slider/run-duration-slider.component.ts @@ -37,13 +37,11 @@ export class RunDurationSlider implements ControlValueAccessor { runDurationValues: number[] = [0, 25, 50, 100, 250, 500, 1000, 2000]; runDurationIndex!: number; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (runDuration: number) => void; - constructor() {} - registerOnChange(onChange: (runDuration: number) => void): void { this.onChange = onChange; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/breadcrumbs/breadcrumbs.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/breadcrumbs/breadcrumbs.component.ts index 2447d8eb99..3a1a2c5083 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/breadcrumbs/breadcrumbs.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/breadcrumbs/breadcrumbs.component.ts @@ -32,7 +32,7 @@ export class Breadcrumbs { @Input() entity: BreadcrumbEntity = initialState.flow.processGroupFlow.breadcrumb; @Input() currentProcessGroupId: string = initialState.id; - private scrolledToProcessGroupId: string = ''; + private scrolledToProcessGroupId = ''; @ViewChild('currentProcessGroup') set currentProcessGroupBreadcrumb(currentProcessGroupBreadcrumb: ElementRef) { // only auto scroll to the breadcrumb for the current pg once as the user may have manually scrolled since diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/tooltips/version-control-tip/version-control-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/tooltips/version-control-tip/version-control-tip.component.ts index 50a02e6f8b..25de0597fa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/tooltips/version-control-tip/version-control-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/common/tooltips/version-control-tip/version-control-tip.component.ts @@ -24,8 +24,8 @@ import { VersionControlInformation, VersionControlTipInput } from '../../../../s styleUrls: ['./version-control-tip.component.scss'] }) export class VersionControlTip { - @Input() left: number = 0; - @Input() top: number = 0; + @Input() left = 0; + @Input() top = 0; @Input() data: VersionControlTipInput | undefined; getTrackingMessage(): string { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/root/guard/root-group.guard.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/root/guard/root-group.guard.ts index f435146fd3..a275bdc76e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/root/guard/root-group.guard.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/root/guard/root-group.guard.ts @@ -25,7 +25,7 @@ import { FlowState } from '../../../state/flow'; import { selectCurrentProcessGroupId } from '../../../state/flow/flow.selectors'; import { initialState } from '../../../state/flow/flow.reducer'; -export const rootGroupGuard: CanActivateFn = (route, state) => { +export const rootGroupGuard: CanActivateFn = () => { const router: Router = inject(Router); const flowService: FlowService = inject(FlowService); const store: Store = inject(Store); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/service/parameter-contexts.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/service/parameter-contexts.service.ts index ae6b5cc2ae..b71a28752d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/service/parameter-contexts.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/service/parameter-contexts.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { Client } from '../../../service/client.service'; import { NiFiCommon } from '../../../service/nifi-common.service'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/index.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/index.ts index 682ed87b98..caa0c36768 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/index.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/index.ts @@ -16,7 +16,6 @@ */ import { - AffectedComponentEntity, ParameterContextReferenceEntity, ParameterContextUpdateRequestEntity, ParameterEntity, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts index 51ad177f74..7229979dde 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts @@ -370,7 +370,7 @@ export class ParameterContextListingEffects { this.actions$.pipe( ofType(ParameterContextListingActions.pollParameterContextUpdateRequest), concatLatestFrom(() => this.store.select(selectUpdateRequest)), - switchMap(([action, updateRequest]) => { + switchMap(([, updateRequest]) => { if (updateRequest) { return from(this.parameterContextService.pollParameterContextUpdate(updateRequest.request)).pipe( map((response) => @@ -413,7 +413,7 @@ export class ParameterContextListingEffects { stopPollingParameterContextUpdateRequest$ = createEffect(() => this.actions$.pipe( ofType(ParameterContextListingActions.stopPollingParameterContextUpdateRequest), - switchMap((response) => of(ParameterContextListingActions.deleteParameterContextUpdateRequest())) + switchMap(() => of(ParameterContextListingActions.deleteParameterContextUpdateRequest())) ) ); @@ -422,7 +422,7 @@ export class ParameterContextListingEffects { this.actions$.pipe( ofType(ParameterContextListingActions.deleteParameterContextUpdateRequest), concatLatestFrom(() => this.store.select(selectUpdateRequest)), - tap(([action, updateRequest]) => { + tap(([, updateRequest]) => { if (updateRequest) { this.parameterContextService.deleteParameterContextUpdate(updateRequest.request).subscribe(); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.reducer.ts index 8453373d19..e1db22deb0 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.reducer.ts @@ -60,7 +60,7 @@ export const parameterContextListingReducer = createReducer( error, status: 'error' as const })), - on(createParameterContext, (state, { request }) => ({ + on(createParameterContext, (state) => ({ ...state, saving: true })), @@ -70,7 +70,7 @@ export const parameterContextListingReducer = createReducer( draftState.saving = false; }); }), - on(submitParameterContextUpdateRequest, (state, { request }) => ({ + on(submitParameterContextUpdateRequest, (state) => ({ ...state, saving: true })), @@ -78,7 +78,7 @@ export const parameterContextListingReducer = createReducer( ...state, updateRequestEntity: response.requestEntity })), - on(editParameterContextComplete, (state, {}) => { + on(editParameterContextComplete, (state) => { return produce(state, (draftState) => { const updateRequestEntity: ParameterContextUpdateRequestEntity | null = draftState.updateRequestEntity; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-inheritance/parameter-context-inheritance.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-inheritance/parameter-context-inheritance.component.ts index 341ac71c63..ae108cdd39 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-inheritance/parameter-context-inheritance.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-inheritance/parameter-context-inheritance.component.ts @@ -76,8 +76,8 @@ export class ParameterContextInheritance implements ControlValueAccessor { protected readonly TextTip = TextTip; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (inheritedParameterContexts: ParameterContextReferenceEntity[]) => void; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.ts index f11f1d5927..6bf6139598 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.ts @@ -76,8 +76,8 @@ export class ParameterTable implements AfterViewInit, ControlValueAccessor { dataSource: MatTableDataSource = new MatTableDataSource(); selectedItem: ParameterItem | null = null; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (parameters: ParameterEntity[]) => void; @@ -92,7 +92,7 @@ export class ParameterTable implements AfterViewInit, ControlValueAccessor { } initFilter(): void { - this.dataSource.filterPredicate = (data: ParameterItem, filter: string) => this.isVisible(data); + this.dataSource.filterPredicate = (data: ParameterItem) => this.isVisible(data); this.dataSource.filter = ' '; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/process-group-references/process-group-references.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/process-group-references/process-group-references.component.ts index 3e1663804b..77f31d0081 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/process-group-references/process-group-references.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/process-group-references/process-group-references.component.ts @@ -52,8 +52,6 @@ export class ProcessGroupReferences { authorizedProcessGroupReferences: BoundProcessGroup[] = []; unauthorizedProcessGroupReferences: BoundProcessGroup[] = []; - constructor() {} - private getUnauthorized(references: BoundProcessGroup[] | undefined) { if (references) { return references.filter((reference) => !reference.permissions.canRead); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/feature/provenance.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/feature/provenance.component.spec.ts index ab5bc363f0..e51cf1c4b4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/feature/provenance.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/feature/provenance.component.spec.ts @@ -22,8 +22,6 @@ import { provideMockStore } from '@ngrx/store/testing'; import { RouterModule } from '@angular/router'; import { RouterTestingModule } from '@angular/router/testing'; import { initialState } from '../state/provenance-event-listing/provenance-event-listing.reducer'; -import { Navigation } from '../../../ui/common/navigation/navigation.component'; -import { HttpClientTestingModule } from '@angular/common/http/testing'; import { Component } from '@angular/core'; describe('Provenance', () => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/service/provenance.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/service/provenance.service.ts index 3e1d238699..b7b3638099 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/service/provenance.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/service/provenance.service.ts @@ -55,7 +55,7 @@ export class ProvenanceService { } downloadContent(id: string, direction: string): void { - let dataUri: string = `${ProvenanceService.API}/provenance-events/${encodeURIComponent( + let dataUri = `${ProvenanceService.API}/provenance-events/${encodeURIComponent( id )}/content/${encodeURIComponent(direction)}`; @@ -73,9 +73,7 @@ export class ProvenanceService { viewContent(nifiUrl: string, contentViewerUrl: string, id: string, direction: string): void { // build the uri to the data - let dataUri: string = `${nifiUrl}provenance-events/${encodeURIComponent(id)}/content/${encodeURIComponent( - direction - )}`; + let dataUri = `${nifiUrl}provenance-events/${encodeURIComponent(id)}/content/${encodeURIComponent(direction)}`; const dataUriParameters: any = {}; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.effects.ts index 9d68f1d3b7..7ecc158556 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.effects.ts @@ -101,7 +101,7 @@ export class LineageEffects { this.actions$.pipe( ofType(LineageActions.pollLineageQuery), concatLatestFrom(() => [this.store.select(selectLineageId), this.store.select(selectClusterNodeId)]), - switchMap(([action, id, clusterNodeId]) => { + switchMap(([, id, clusterNodeId]) => { if (id) { return from(this.provenanceService.getLineageQuery(id, clusterNodeId)).pipe( map((response) => @@ -145,7 +145,7 @@ export class LineageEffects { stopPollingLineageQuery$ = createEffect(() => this.actions$.pipe( ofType(LineageActions.stopPollingLineageQuery), - switchMap((response) => of(LineageActions.deleteLineageQuery())) + switchMap(() => of(LineageActions.deleteLineageQuery())) ) ); @@ -154,7 +154,7 @@ export class LineageEffects { this.actions$.pipe( ofType(LineageActions.deleteLineageQuery), concatLatestFrom(() => [this.store.select(selectLineageId), this.store.select(selectClusterNodeId)]), - tap(([action, id, clusterNodeId]) => { + tap(([, id, clusterNodeId]) => { if (id) { this.provenanceService.deleteLineageQuery(id, clusterNodeId).subscribe(); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.reducer.ts index 3dde0e0028..ca00691016 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/lineage/lineage.reducer.ts @@ -33,7 +33,7 @@ export const initialState: LineageState = { export const lineageReducer = createReducer( initialState, - on(resetLineage, (state) => ({ + on(resetLineage, () => ({ ...initialState })), on(submitLineageQuery, (state) => ({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts index 4c2b4b5013..e182558dfb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.effects.ts @@ -51,7 +51,7 @@ export class ProvenanceEventListingEffects { loadProvenanceOptions$ = createEffect(() => this.actions$.pipe( ofType(ProvenanceEventListingActions.loadProvenanceOptions), - switchMap((request) => + switchMap(() => from(this.provenanceService.getSearchOptions()).pipe( map((response) => ProvenanceEventListingActions.loadProvenanceOptionsSuccess({ @@ -157,7 +157,7 @@ export class ProvenanceEventListingEffects { this.actions$.pipe( ofType(ProvenanceEventListingActions.pollProvenanceQuery), concatLatestFrom(() => [this.store.select(selectProvenanceId), this.store.select(selectClusterNodeId)]), - switchMap(([action, id, clusterNodeId]) => { + switchMap(([, id, clusterNodeId]) => { if (id) { return from(this.provenanceService.getProvenanceQuery(id, clusterNodeId)).pipe( map((response) => @@ -201,7 +201,7 @@ export class ProvenanceEventListingEffects { stopPollingProvenanceQuery$ = createEffect(() => this.actions$.pipe( ofType(ProvenanceEventListingActions.stopPollingProvenanceQuery), - switchMap((response) => of(ProvenanceEventListingActions.deleteProvenanceQuery())) + switchMap(() => of(ProvenanceEventListingActions.deleteProvenanceQuery())) ) ); @@ -210,7 +210,7 @@ export class ProvenanceEventListingEffects { this.actions$.pipe( ofType(ProvenanceEventListingActions.deleteProvenanceQuery), concatLatestFrom(() => [this.store.select(selectProvenanceId), this.store.select(selectClusterNodeId)]), - tap(([action, id, clusterNodeId]) => { + tap(([, id, clusterNodeId]) => { if (id) { this.provenanceService.deleteProvenanceQuery(id, clusterNodeId).subscribe(); } @@ -229,7 +229,7 @@ export class ProvenanceEventListingEffects { this.store.select(selectProvenanceRequest), this.store.select(selectAbout) ]), - tap(([request, timeOffset, options, currentRequest, about]) => { + tap(([, timeOffset, options, currentRequest, about]) => { if (about) { const dialogReference = this.dialog.open(ProvenanceSearchDialog, { data: { @@ -321,7 +321,7 @@ export class ProvenanceEventListingEffects { }); }); }, - error: (error) => { + error: () => { // TODO - handle error } }); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.reducer.ts index acfdc3d998..b8f3a918d2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/state/provenance-event-listing/provenance-event-listing.reducer.ts @@ -39,7 +39,7 @@ export const initialState: ProvenanceEventListingState = { export const provenanceEventListingReducer = createReducer( initialState, - on(resetProvenanceState, (state) => ({ + on(resetProvenanceState, () => ({ ...initialState })), on(loadProvenanceOptionsSuccess, (state, { response }) => ({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-listing.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-listing.component.ts index d035104e3b..e5cd6a77c3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-listing.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-listing.component.ts @@ -44,7 +44,6 @@ import { saveProvenanceRequest } from '../../state/provenance-event-listing/provenance-event-listing.actions'; import { ProvenanceSearchDialog } from './provenance-search-dialog/provenance-search-dialog.component'; -import { ProvenanceEventSummary } from '../../../../state/shared'; import { resetLineage, submitLineageQuery } from '../../state/lineage/lineage.actions'; import { LineageRequest } from '../../state/lineage'; import { selectLineage } from '../../state/lineage/lineage.selectors'; @@ -61,7 +60,7 @@ export class ProvenanceEventListing implements OnDestroy { lineage$ = this.store.select(selectLineage); request!: ProvenanceRequest; - stateReset: boolean = false; + stateReset = false; constructor(private store: Store) { this.store diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.spec.ts index c73e439bf3..f66e85103e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.spec.ts @@ -18,8 +18,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { LineageComponent } from './lineage.component'; -import SpyObj = jasmine.SpyObj; -import createSpyObj = jasmine.createSpyObj; describe('LineageComponent', () => { let component: LineageComponent; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.ts index 5b0ce03446..f92d9260ee 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/lineage/lineage.component.ts @@ -51,8 +51,8 @@ export class LineageComponent implements OnInit { @Input() set eventTimestampThreshold(eventTimestampThreshold: number) { if (this.previousEventTimestampThreshold >= 0) { - let nodes: any = this.lineageContainerElement.selectAll('g.node.rendered'); - let links: any = this.lineageContainerElement.selectAll('path.link.rendered'); + const nodes: any = this.lineageContainerElement.selectAll('g.node.rendered'); + const links: any = this.lineageContainerElement.selectAll('path.link.rendered'); if (this.previousEventTimestampThreshold > eventTimestampThreshold) { // the threshold is descending @@ -123,7 +123,7 @@ export class LineageComponent implements OnInit { }, clazz: 'fa fa-long-arrow-left', text: 'Back to events', - action: (selection: any) => { + action: () => { this.closeLineage.next(); } }, @@ -226,7 +226,7 @@ export class LineageComponent implements OnInit { private nodeLookup: Map = new Map(); private linkLookup: Map = new Map(); - private previousEventTimestampThreshold: number = -1; + private previousEventTimestampThreshold = -1; constructor() { this.allMenus = new Map(); @@ -247,7 +247,7 @@ export class LineageComponent implements OnInit { // include if there is no condition (non conditional item, separator, sub menu, etc) return true; }, - menuItemClicked(menuItem: ContextMenuItemDefinition, event: MouseEvent) { + menuItemClicked(menuItem: ContextMenuItemDefinition) { if (menuItem.action) { const selection: any = d3.select('circle.context'); return menuItem.action(selection); @@ -257,7 +257,6 @@ export class LineageComponent implements OnInit { } ngOnInit(): void { - const self: LineageComponent = this; this.lineageElement = document.getElementById('lineage'); // handle zoom behavior @@ -283,9 +282,9 @@ export class LineageComponent implements OnInit { .attr('class', 'lineage') .attr('width', '100%') .attr('height', '100%') - .on('mousedown', function (event, d) { + .on('mousedown', (event) => { // hide the context menu if necessary - self.clearSelectionContext(); + this.clearSelectionContext(); // prevents browser from using text cursor event.preventDefault(); @@ -385,7 +384,7 @@ export class LineageComponent implements OnInit { let immediate: string[] = Array.from(immediateSet.values()); // attempt to identify fan in/out cases - let nodesWithTwoParents: number = 0; + let nodesWithTwoParents = 0; immediate.forEach((nodeId) => { const node: any = this.nodeLookup.get(nodeId); @@ -552,7 +551,7 @@ export class LineageComponent implements OnInit { }); // mark each nodes index so subsequent recursive calls can position children accordingly - let nodesWithTwoChildren: number = 0; + let nodesWithTwoChildren = 0; immediate.forEach((nodeId: string, i: number) => { const node: any = this.nodeLookup.get(nodeId); node.index = i; @@ -593,7 +592,7 @@ export class LineageComponent implements OnInit { // add the new links links.forEach((link) => { - const linkId: string = `${link.sourceId}-${link.targetId}`; + const linkId = `${link.sourceId}-${link.targetId}`; // create the link object this.linkLookup.set(linkId, { @@ -614,13 +613,13 @@ export class LineageComponent implements OnInit { const startNodes: Set = new Set(this.nodeLookup.keys()); // go through the nodes to reset their outgoing links - this.nodeLookup.forEach(function (node, id) { + this.nodeLookup.forEach((node) => { node.outgoing = []; node.incoming = []; }); // go through the links in order to compute the new layout - this.linkLookup.forEach(function (link, id) { + this.linkLookup.forEach((link) => { // updating the nodes connections link.source.outgoing.push(link); link.target.incoming.push(link); @@ -713,10 +712,8 @@ export class LineageComponent implements OnInit { } private renderFlowFile(flowfiles: any): void { - const self: LineageComponent = this; - - flowfiles.classed('flowfile', true).on('mousedown', function (event: MouseEvent, d: any) { - self.clearSelectionContext(); + flowfiles.classed('flowfile', true).on('mousedown', (event: MouseEvent) => { + this.clearSelectionContext(); event.stopPropagation(); }); @@ -726,25 +723,25 @@ export class LineageComponent implements OnInit { .attr('class', 'flowfile-link') .attr('r', 16) .attr('stroke-width', 1.0) - .on('mouseover', function (event: MouseEvent, d: any) { - self.lineageContainerElement + .on('mouseover', (event: MouseEvent, d: any) => { + this.lineageContainerElement .selectAll('path.link') - .filter(function (linkDatum: any) { + .filter((linkDatum: any) => { return d.id === linkDatum.flowFileUuid; }) .classed('selected', true) - .attr('marker-end', function (d: any) { + .attr('marker-end', (d: any) => { return `url(#${d.target.type}-SELECTED)`; }); }) - .on('mouseout', function (event: MouseEvent, d: any) { - self.lineageContainerElement + .on('mouseout', (event: MouseEvent, d: any) => { + this.lineageContainerElement .selectAll('path.link') - .filter(function (linkDatum: any) { + .filter((linkDatum: any) => { return d.id === linkDatum.flowFileUuid; }) .classed('selected', false) - .attr('marker-end', function (d: any) { + .attr('marker-end', (d: any) => { return `url(#${d.target.type})`; }); }); @@ -761,25 +758,25 @@ export class LineageComponent implements OnInit { .attr('transform', function () { return 'translate(0,15)'; }) - .on('mouseover', function (event: MouseEvent, d: any) { - self.lineageContainerElement + .on('mouseover', (event: MouseEvent, d: any) => { + this.lineageContainerElement .selectAll('path.link') - .filter(function (linkDatum: any) { + .filter((linkDatum: any) => { return d.id === linkDatum.flowFileUuid; }) .classed('selected', true) - .attr('marker-end', function (d: any) { + .attr('marker-end', (d: any) => { return `url(#${d.target.type}-SELECTED)`; }); }) - .on('mouseout', function (event: MouseEvent, d: any) { - self.lineageContainerElement + .on('mouseout', (event: MouseEvent, d: any) => { + this.lineageContainerElement .selectAll('path.link') - .filter(function (linkDatum: any) { + .filter((linkDatum: any) => { return d.id === linkDatum.flowFileUuid; }) .classed('selected', false) - .attr('marker-end', function (d: any) { + .attr('marker-end', (d: any) => { return `url(#${d.target.type})`; }); }) @@ -789,18 +786,16 @@ export class LineageComponent implements OnInit { } private renderEvent(events: any): void { - const self: LineageComponent = this; - events - .on('mousedown', function (event: MouseEvent, d: any) { - self.clearSelectionContext(); + .on('mousedown', (event: MouseEvent, d: any) => { + this.clearSelectionContext(); d3.select(`#event-node-${d.id}`).classed('context', true); event.stopPropagation(); }) - .on('dblclick', function (event: MouseEvent, d: any) { + .on('dblclick', (event: MouseEvent, d: any) => { // show the event details // TODO - cluster node id - self.openEventDialog.next({ + this.openEventDialog.next({ id: d.id }); }); @@ -821,8 +816,8 @@ export class LineageComponent implements OnInit { events .append('circle') .attr('class', 'event-circle') - .classed('selected', function (d: any) { - return d.id === self.eventId; + .classed('selected', (d: any) => { + return d.id === this.eventId; }) .attr('r', 8) .attr('stroke-width', 1.0) @@ -941,7 +936,7 @@ export class LineageComponent implements OnInit { .remove(); // select the links - let linkSelection: any = this.lineageContainerElement + const linkSelection: any = this.lineageContainerElement .selectAll('path.link') .data(this.linkLookup.values(), function (d: any) { return d.id; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/provenance-event-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/provenance-event-table.component.ts index 66230ece90..3f04d8f966 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/provenance-event-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-event-table/provenance-event-table.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AfterViewInit, Component, EventEmitter, Input, OnInit, Output, ViewChild } from '@angular/core'; +import { AfterViewInit, Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { MatTableDataSource, MatTableModule } from '@angular/material/table'; import { MatSortModule, Sort } from '@angular/material/sort'; import { TextTip } from '../../../../../ui/common/tooltips/text-tip/text-tip.component'; @@ -89,17 +89,19 @@ export class ProvenanceEventTable implements AfterViewInit { } } } + @Input() oldestEventAvailable!: string; @Input() timeOffset!: number; @Input() resultsMessage!: string; @Input() hasRequest!: boolean; @Input() loading!: boolean; @Input() loadedTimestamp!: string; + @Input() set lineage$(lineage$: Observable) { this.provenanceLineage$ = lineage$.pipe( tap((lineage) => { - let minMillis: number = -1; - let maxMillis: number = -1; + let minMillis = -1; + let maxMillis = -1; lineage?.results.nodes.forEach((node) => { // ensure this event has an event time @@ -121,7 +123,7 @@ export class ProvenanceEventTable implements AfterViewInit { // determine the range for the slider let range: number = this.maxEventTimestamp - this.minEventTimestamp; - const binCount: number = 10; + const binCount = 10; const remainder: number = range % binCount; if (remainder > 0) { // if the range doesn't fall evenly into binCount, increase the @@ -174,19 +176,19 @@ export class ProvenanceEventTable implements AfterViewInit { filterForm: FormGroup; filterColumnOptions: string[] = ['component name', 'component type', 'type']; - totalCount: number = 0; - filteredCount: number = 0; - filterApplied: boolean = false; + totalCount = 0; + filteredCount = 0; + filterApplied = false; - showLineage: boolean = false; + showLineage = false; provenanceLineage$!: Observable; eventId: string | null = null; - minEventTimestamp: number = -1; - maxEventTimestamp: number = -1; - eventTimestampStep: number = 1; - initialEventTimestampThreshold: number = 0; - currentEventTimestampThreshold: number = 0; + minEventTimestamp = -1; + maxEventTimestamp = -1; + eventTimestampStep = 1; + initialEventTimestampThreshold = 0; + currentEventTimestampThreshold = 0; constructor( private formBuilder: FormBuilder, @@ -223,7 +225,7 @@ export class ProvenanceEventTable implements AfterViewInit { return data.sort((a, b) => { const isAsc = sort.direction === 'asc'; - let retVal: number = 0; + let retVal = 0; switch (sort.active) { case 'eventTime': // event ideas are increasing, so we can use this simple number for sorting purposes diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-search-dialog/provenance-search-dialog.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-search-dialog/provenance-search-dialog.component.ts index 6474387adb..79e232cdb8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-search-dialog/provenance-search-dialog.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/provenance/ui/provenance-event-listing/provenance-search-dialog/provenance-search-dialog.component.ts @@ -69,8 +69,8 @@ export class ProvenanceSearchDialog { let startTime: string = ProvenanceSearchDialog.DEFAULT_START_TIME; let endDate: Date = now; let endTime: string = ProvenanceSearchDialog.DEFAULT_END_TIME; - let minFileSize: string = ''; - let maxFileSize: string = ''; + let minFileSize = ''; + let maxFileSize = ''; if (request.currentRequest) { const requestedStartDate = request.currentRequest.startDate; @@ -117,8 +117,8 @@ export class ProvenanceSearchDialog { const searchableFields: SearchableField[] = request.options.searchableFields; searchableFields.forEach((searchableField) => { - let value: string = ''; - let inverse: boolean = false; + let value = ''; + let inverse = false; if (searchTerms && searchTerms[searchableField.id]) { value = searchTerms[searchableField.id].value; inverse = searchTerms[searchableField.id].inverse; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/feature/queue-routing.module.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/feature/queue-routing.module.ts index 9063539da3..0b12d6dc0c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/feature/queue-routing.module.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/feature/queue-routing.module.ts @@ -18,7 +18,6 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { Queue } from './queue.component'; -import { QueueListingRoutingModule } from '../ui/queue-listing/queue-listing-routing.module'; const routes: Routes = [ { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/service/queue.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/service/queue.service.ts index 695d73ae87..acb0fbffe7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/service/queue.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/service/queue.service.ts @@ -54,7 +54,7 @@ export class QueueService { } downloadContent(flowfileSummary: FlowFileSummary): void { - let dataUri: string = `${this.nifiCommon.stripProtocol(flowfileSummary.uri)}/content`; + let dataUri = `${this.nifiCommon.stripProtocol(flowfileSummary.uri)}/content`; const queryParameters: any = {}; @@ -70,7 +70,7 @@ export class QueueService { viewContent(flowfileSummary: FlowFileSummary, contentViewerUrl: string): void { // build the uri to the data - let dataUri: string = `${this.nifiCommon.stripProtocol(flowfileSummary.uri)}/content`; + let dataUri = `${this.nifiCommon.stripProtocol(flowfileSummary.uri)}/content`; const dataUriParameters: any = {}; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts index 3b29d84e46..2d9eba388d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.effects.ts @@ -50,7 +50,7 @@ export class QueueListingEffects { map((response) => { const connection: any = response.component; - let connectionLabel: string = 'Connection'; + let connectionLabel = 'Connection'; if (!this.nifiCommon.isBlank(connection.name)) { connectionLabel = connection.name; } else if (connection.selectedRelationships) { @@ -63,7 +63,7 @@ export class QueueListingEffects { } }); }), - catchError((error) => + catchError(() => of( QueueListingActions.loadConnectionLabelSuccess({ response: { @@ -119,7 +119,7 @@ export class QueueListingEffects { this.actions$.pipe( ofType(QueueListingActions.resubmitQueueListingRequest), concatLatestFrom(() => this.store.select(selectConnectionIdFromRoute)), - switchMap(([action, connectionId]) => + switchMap(([, connectionId]) => of(QueueListingActions.submitQueueListingRequest({ request: { connectionId } })) ) ) @@ -156,7 +156,7 @@ export class QueueListingEffects { this.actions$.pipe( ofType(QueueListingActions.pollQueueListingRequest), concatLatestFrom(() => this.store.select(selectListingRequestEntity).pipe(isDefinedAndNotNull())), - switchMap(([action, requestEntity]) => { + switchMap(([, requestEntity]) => { return from(this.queueService.pollQueueListingRequest(requestEntity.listingRequest)).pipe( map((response) => QueueListingActions.pollQueueListingRequestSuccess({ @@ -182,14 +182,14 @@ export class QueueListingEffects { ofType(QueueListingActions.pollQueueListingRequestSuccess), map((action) => action.response), filter((response) => response.requestEntity.listingRequest.finished), - switchMap((response) => of(QueueListingActions.stopPollingQueueListingRequest())) + switchMap(() => of(QueueListingActions.stopPollingQueueListingRequest())) ) ); stopPollingQueueListingRequest$ = createEffect(() => this.actions$.pipe( ofType(QueueListingActions.stopPollingQueueListingRequest), - switchMap((response) => of(QueueListingActions.deleteQueueListingRequest())) + switchMap(() => of(QueueListingActions.deleteQueueListingRequest())) ) ); @@ -198,7 +198,7 @@ export class QueueListingEffects { this.actions$.pipe( ofType(QueueListingActions.deleteQueueListingRequest), concatLatestFrom(() => this.store.select(selectListingRequestEntity)), - tap(([action, requestEntity]) => { + tap(([, requestEntity]) => { this.dialog.closeAll(); if (requestEntity) { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.reducer.ts index e45e94f6b7..27f7fde081 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/state/queue-listing/queue-listing.reducer.ts @@ -40,7 +40,7 @@ export const queueListingReducer = createReducer( ...state, connectionLabel: response.connectionLabel })), - on(submitQueueListingRequest, (state, { request }) => ({ + on(submitQueueListingRequest, (state) => ({ ...state, status: 'loading' as const })), @@ -56,7 +56,7 @@ export const queueListingReducer = createReducer( error, status: 'error' as const })), - on(resetQueueListingState, (state) => ({ + on(resetQueueListingState, () => ({ ...initialState })) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.ts index 2158f3b59d..be07533874 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/queue/ui/queue-listing/flowfile-table/flowfile-table.component.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { AfterViewInit, Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MatTableDataSource, MatTableModule } from '@angular/material/table'; import { TextTip } from '../../../../../ui/common/tooltips/text-tip/text-tip.component'; import { BulletinsTip } from '../../../../../ui/common/tooltips/bulletins-tip/bulletins-tip.component'; @@ -33,8 +33,9 @@ import { CurrentUser } from '../../../../../state/current-user'; imports: [MatTableModule, NgForOf, NgIf, RouterLink], styleUrls: ['./flowfile-table.component.scss'] }) -export class FlowFileTable implements AfterViewInit { +export class FlowFileTable { @Input() connectionLabel!: string; + @Input() set listingRequest(listingRequest: ListingRequest) { if (listingRequest.flowFileSummaries) { this.dataSource.data = this.sortFlowFiles(listingRequest.flowFileSummaries); @@ -47,6 +48,7 @@ export class FlowFileTable implements AfterViewInit { this.destinationRunning = listingRequest.destinationRunning; } } + @Input() currentUser!: CurrentUser; @Input() contentViewerAvailable!: boolean; @@ -73,17 +75,15 @@ export class FlowFileTable implements AfterViewInit { dataSource: MatTableDataSource = new MatTableDataSource(); selectedUuid: string | null = null; - sourceRunning: boolean = false; - destinationRunning: boolean = false; + sourceRunning = false; + destinationRunning = false; - displayObjectCount: number = 0; - queueSizeObjectCount: number = 0; - queueSizeByteCount: number = 0; + displayObjectCount = 0; + queueSizeObjectCount = 0; + queueSizeByteCount = 0; constructor(private nifiCommon: NiFiCommon) {} - ngAfterViewInit(): void {} - sortFlowFiles(summaries: FlowFileSummary[]): FlowFileSummary[] { const data: FlowFileSummary[] = summaries.slice(); return data.sort((a: FlowFileSummary, b: FlowFileSummary) => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/controller.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/controller.service.ts index c79bd204d0..56ae2738c7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/controller.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/controller.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { ControllerEntity } from '../state/general'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/parameter-provider.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/parameter-provider.service.ts index ed22e317c0..4eb74f97db 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/parameter-provider.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/parameter-provider.service.ts @@ -26,7 +26,7 @@ import { DeleteParameterProviderRequest, ParameterProviderEntity } from '../state/parameter-providers'; -import { PropertyDescriptorRetriever, Revision } from '../../../state/shared'; +import { PropertyDescriptorRetriever } from '../../../state/shared'; @Injectable({ providedIn: 'root' }) export class ParameterProviderService implements PropertyDescriptorRetriever { @@ -59,7 +59,7 @@ export class ParameterProviderService implements PropertyDescriptorRetriever { ...revision, disconnectedNodeAcknowledged: false }; - return this.httpClient.delete(this.nifiCommon.stripProtocol(entity.uri), { params: revision }); + return this.httpClient.delete(this.nifiCommon.stripProtocol(entity.uri), { params }); } getPropertyDescriptor(id: string, propertyName: string, sensitive: boolean): Observable { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/registry-client.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/registry-client.service.ts index c1aeab3473..94ed22fd26 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/registry-client.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/service/registry-client.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { Client } from '../../../service/client.service'; import { NiFiCommon } from '../../../service/nifi-common.service'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts index 57d734a6cb..5095c200f9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.effects.ts @@ -80,7 +80,7 @@ export class FlowAnalysisRulesEffects { this.actions$.pipe( ofType(FlowAnalysisRuleActions.openNewFlowAnalysisRuleDialog), concatLatestFrom(() => this.store.select(selectFlowAnalysisRuleTypes)), - tap(([action, flowAnalysisRuleTypes]) => { + tap(([, flowAnalysisRuleTypes]) => { this.dialog.open(CreateFlowAnalysisRule, { data: { flowAnalysisRuleTypes diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.reducer.ts index e7202b2408..45f8cdda1c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/flow-analysis-rules/flow-analysis-rules.reducer.ts @@ -45,7 +45,7 @@ export const initialState: FlowAnalysisRulesState = { export const flowAnalysisRulesReducer = createReducer( initialState, - on(resetFlowAnalysisRulesState, (state) => ({ + on(resetFlowAnalysisRulesState, () => ({ ...initialState })), on(loadFlowAnalysisRules, (state) => ({ @@ -98,7 +98,7 @@ export const flowAnalysisRulesReducer = createReducer( configureFlowAnalysisRule, enableFlowAnalysisRule, disableFlowAnalysisRule, - (state, { request }) => ({ + (state) => ({ ...state, saving: true }) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/general/general.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/general/general.reducer.ts index b8e7ba09c3..60c2a55f69 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/general/general.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/general/general.reducer.ts @@ -46,7 +46,7 @@ export const initialState: GeneralState = { export const generalReducer = createReducer( initialState, - on(resetGeneralState, (state) => ({ + on(resetGeneralState, () => ({ ...initialState })), on(loadControllerConfig, (state) => ({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/index.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/index.ts index 6c1be51d41..3fbbd08aa5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/index.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/index.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { Bundle, ControllerServiceEntity, Revision } from '../../../../state/shared'; +import { ControllerServiceEntity } from '../../../../state/shared'; export const managementControllerServicesFeatureKey = 'managementControllerServices'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts index b94109c269..e0377d3fbd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.effects.ts @@ -59,7 +59,7 @@ export class ManagementControllerServicesEffects { this.actions$.pipe( ofType(ManagementControllerServicesActions.loadManagementControllerServices), concatLatestFrom(() => this.store.select(selectStatus)), - switchMap(([action, status]) => + switchMap(([, status]) => from(this.managementControllerServiceService.getControllerServices()).pipe( map((response) => ManagementControllerServicesActions.loadManagementControllerServicesSuccess({ @@ -90,7 +90,7 @@ export class ManagementControllerServicesEffects { this.actions$.pipe( ofType(ManagementControllerServicesActions.openNewControllerServiceDialog), concatLatestFrom(() => this.store.select(selectControllerServiceTypes)), - tap(([action, controllerServiceTypes]) => { + tap(([, controllerServiceTypes]) => { const dialogReference = this.dialog.open(CreateControllerService, { data: { controllerServiceTypes diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.reducer.ts index f276f37632..b550ec3587 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/management-controller-services/management-controller-services.reducer.ts @@ -41,7 +41,7 @@ export const initialState: ManagementControllerServicesState = { export const managementControllerServicesReducer = createReducer( initialState, - on(resetManagementControllerServicesState, (state) => ({ + on(resetManagementControllerServicesState, () => ({ ...initialState })), on(loadManagementControllerServices, (state) => ({ @@ -54,11 +54,11 @@ export const managementControllerServicesReducer = createReducer( loadedTimestamp: response.loadedTimestamp, status: 'success' as const })), - on(managementControllerServicesBannerApiError, (state, { error }) => ({ + on(managementControllerServicesBannerApiError, (state) => ({ ...state, saving: false })), - on(createControllerService, configureControllerService, deleteControllerService, (state, { request }) => ({ + on(createControllerService, configureControllerService, deleteControllerService, (state) => ({ ...state, saving: true })), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.actions.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.actions.ts index ae7166e57e..d59cbeb051 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.actions.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.actions.ts @@ -28,7 +28,7 @@ import { SelectParameterProviderRequest } from './index'; -const PARAMETER_PROVIDERS_PREFIX: string = '[Parameter Providers]'; +const PARAMETER_PROVIDERS_PREFIX = '[Parameter Providers]'; export const resetParameterProvidersState = createAction(`${PARAMETER_PROVIDERS_PREFIX} Reset Parameter Providers`); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts index 67cbdbfce1..6df1a3fd76 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.effects.ts @@ -86,7 +86,7 @@ export class ParameterProvidersEffects { this.actions$.pipe( ofType(ParameterProviderActions.openNewParameterProviderDialog), concatLatestFrom(() => this.store.select(selectParameterProviderTypes)), - tap(([action, parameterProviderTypes]) => { + tap(([, parameterProviderTypes]) => { const dialogReference = this.dialog.open(CreateParameterProvider, { data: { parameterProviderTypes diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.reducer.ts index 574fcffd39..571a48ca49 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/parameter-providers/parameter-providers.reducer.ts @@ -42,7 +42,7 @@ export const initialParameterProvidersState: ParameterProvidersState = { export const parameterProvidersReducer = createReducer( initialParameterProvidersState, - on(resetParameterProvidersState, (state: ParameterProvidersState) => ({ + on(resetParameterProvidersState, () => ({ ...initialParameterProvidersState })), @@ -66,7 +66,7 @@ export const parameterProvidersReducer = createReducer( status: 'error' as const })), - on(createParameterProvider, configureParameterProvider, deleteParameterProvider, (state, { request }) => ({ + on(createParameterProvider, configureParameterProvider, deleteParameterProvider, (state) => ({ ...state, saving: true })), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts index bd431167f1..dc67ba24b5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.effects.ts @@ -79,7 +79,7 @@ export class RegistryClientsEffects { this.actions$.pipe( ofType(RegistryClientsActions.openNewRegistryClientDialog), concatLatestFrom(() => this.store.select(selectRegistryClientTypes)), - tap(([action, registryClientTypes]) => { + tap(([, registryClientTypes]) => { const dialogReference = this.dialog.open(CreateRegistryClient, { data: { registryClientTypes diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.reducer.ts index fc943574bb..0abbad1e50 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/registry-clients/registry-clients.reducer.ts @@ -41,7 +41,7 @@ export const initialState: RegistryClientsState = { export const registryClientsReducer = createReducer( initialState, - on(resetRegistryClientsState, (state) => ({ + on(resetRegistryClientsState, () => ({ ...initialState })), on(loadRegistryClients, (state) => ({ @@ -61,7 +61,7 @@ export const registryClientsReducer = createReducer( error, status: 'error' as const })), - on(createRegistryClient, configureRegistryClient, deleteRegistryClient, (state, { request }) => ({ + on(createRegistryClient, configureRegistryClient, deleteRegistryClient, (state) => ({ ...state, saving: true })), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts index b668f3da78..eeaee7661b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.effects.ts @@ -18,7 +18,7 @@ import { Injectable } from '@angular/core'; import { Actions, concatLatestFrom, createEffect, ofType } from '@ngrx/effects'; import * as ReportingTaskActions from './reporting-tasks.actions'; -import { catchError, from, map, NEVER, Observable, of, switchMap, take, takeUntil, tap } from 'rxjs'; +import { catchError, from, map, of, switchMap, take, takeUntil, tap } from 'rxjs'; import { MatDialog } from '@angular/material/dialog'; import { Store } from '@ngrx/store'; import { NiFiState } from '../../../../state'; @@ -28,20 +28,10 @@ import { ReportingTaskService } from '../../service/reporting-task.service'; import { CreateReportingTask } from '../../ui/reporting-tasks/create-reporting-task/create-reporting-task.component'; import { Router } from '@angular/router'; import { selectSaving } from '../management-controller-services/management-controller-services.selectors'; -import { - InlineServiceCreationRequest, - InlineServiceCreationResponse, - NewPropertyDialogRequest, - NewPropertyDialogResponse, - Property, - PropertyDescriptor, - UpdateControllerServiceRequest -} from '../../../../state/shared'; -import { NewPropertyDialog } from '../../../../ui/common/new-property-dialog/new-property-dialog.component'; +import { UpdateControllerServiceRequest } from '../../../../state/shared'; import { EditReportingTask } from '../../ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component'; import { CreateReportingTaskSuccess } from './index'; import { ExtensionTypesService } from '../../../../service/extension-types.service'; -import { CreateControllerService } from '../../../../ui/common/controller-service/create-controller-service/create-controller-service.component'; import { ManagementControllerServiceService } from '../../service/management-controller-service.service'; import { Client } from '../../../../service/client.service'; import { PropertyTableHelperService } from '../../../../service/property-table-helper.service'; @@ -90,7 +80,7 @@ export class ReportingTasksEffects { this.actions$.pipe( ofType(ReportingTaskActions.openNewReportingTaskDialog), concatLatestFrom(() => this.store.select(selectReportingTaskTypes)), - tap(([action, reportingTaskTypes]) => { + tap(([, reportingTaskTypes]) => { this.dialog.open(CreateReportingTask, { data: { reportingTaskTypes diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.reducer.ts index 7595438e8a..0943102919 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/state/reporting-tasks/reporting-tasks.reducer.ts @@ -43,7 +43,7 @@ export const initialState: ReportingTasksState = { export const reportingTasksReducer = createReducer( initialState, - on(resetReportingTasksState, (state) => ({ + on(resetReportingTasksState, () => ({ ...initialState })), on(loadReportingTasks, (state) => ({ @@ -72,7 +72,7 @@ export const reportingTasksReducer = createReducer( draftState.saving = false; }); }), - on(createReportingTask, deleteReportingTask, configureReportingTask, (state, { request }) => ({ + on(createReportingTask, deleteReportingTask, configureReportingTask, (state) => ({ ...state, saving: true })), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/edit-flow-analysis-rule/edit-flow-analysis-rule.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/edit-flow-analysis-rule/edit-flow-analysis-rule.component.ts index d55f09fa05..71842fd0ed 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/edit-flow-analysis-rule/edit-flow-analysis-rule.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/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, signal } from '@angular/core'; +import { Component, EventEmitter, Inject, Input, Output } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { MatTooltipModule } from '@angular/material/tooltip'; import { MatInputModule } from '@angular/material/input'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.html index 1b0d10065a..0a760ada17 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.html @@ -121,12 +121,12 @@
{ const isAsc = sort.direction === 'asc'; - let retVal: number = 0; + let retVal = 0; switch (sort.active) { case 'name': retVal = this.nifiCommon.compareString(a.component.name, b.component.name); @@ -219,7 +219,7 @@ export class FlowAnalysisRuleTable { return userAuthorized && this.isDisabled(entity) && entity.status.validationStatus === 'VALID'; } - enabledClicked(entity: FlowAnalysisRuleEntity, event: MouseEvent): void { + enabledClicked(entity: FlowAnalysisRuleEntity): void { this.enableFlowAnalysisRule.next(entity); } @@ -228,7 +228,7 @@ export class FlowAnalysisRuleTable { return userAuthorized && this.isEnabled(entity); } - disableClicked(entity: FlowAnalysisRuleEntity, event: MouseEvent): void { + disableClicked(entity: FlowAnalysisRuleEntity): void { this.disableFlowAnalysisRule.next(entity); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rules.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rules.component.ts index c1596d7295..aa452e4558 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rules.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rules.component.ts @@ -22,25 +22,24 @@ import { filter, switchMap, take } from 'rxjs'; import { selectFlowAnalysisRuleIdFromRoute, selectFlowAnalysisRulesState, - selectSingleEditedFlowAnalysisRule, - selectRule + selectRule, + selectSingleEditedFlowAnalysisRule } from '../../state/flow-analysis-rules/flow-analysis-rules.selectors'; import { + disableFlowAnalysisRule, + enableFlowAnalysisRule, loadFlowAnalysisRules, navigateToEditFlowAnalysisRule, openConfigureFlowAnalysisRuleDialog, openNewFlowAnalysisRuleDialog, promptFlowAnalysisRuleDeletion, resetFlowAnalysisRulesState, - selectFlowAnalysisRule, - enableFlowAnalysisRule, - disableFlowAnalysisRule + selectFlowAnalysisRule } from '../../state/flow-analysis-rules/flow-analysis-rules.actions'; import { initialState } from '../../state/flow-analysis-rules/flow-analysis-rules.reducer'; import { selectCurrentUser } from '../../../../state/current-user/current-user.selectors'; import { NiFiState } from '../../../../state'; import { FlowAnalysisRuleEntity, FlowAnalysisRulesState } from '../../state/flow-analysis-rules'; -import { CurrentUser } from '../../../../state/current-user'; import { getComponentStateAndOpenDialog } from '../../../../state/component-state/component-state.actions'; @Component({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.ts index 7635b648cb..9dcf48d00d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/management-controller-services/management-controller-services.component.ts @@ -102,11 +102,11 @@ export class ManagementControllerServices implements OnInit, OnDestroy { this.store.dispatch(loadManagementControllerServices()); } - formatScope(entity: ControllerServiceEntity): string { + formatScope(): string { return 'Controller'; } - definedByCurrentGroup(entity: ControllerServiceEntity): boolean { + definedByCurrentGroup(): boolean { return true; } @@ -163,8 +163,7 @@ export class ManagementControllerServices implements OnInit, OnDestroy { } canModifyParent(currentUser: CurrentUser): (entity: ControllerServiceEntity) => boolean { - return (entity: ControllerServiceEntity) => - currentUser.controllerPermissions.canRead && currentUser.controllerPermissions.canWrite; + return () => currentUser.controllerPermissions.canRead && currentUser.controllerPermissions.canWrite; } selectControllerService(entity: ControllerServiceEntity): void { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/create-parameter-provider/create-parameter-provider.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/create-parameter-provider/create-parameter-provider.component.spec.ts index 25517a106f..ec8b448243 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/create-parameter-provider/create-parameter-provider.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/create-parameter-provider/create-parameter-provider.component.spec.ts @@ -21,10 +21,7 @@ import { CreateParameterProvider } from './create-parameter-provider.component'; import { MAT_DIALOG_DATA } from '@angular/material/dialog'; import { provideMockStore } from '@ngrx/store/testing'; import { initialParameterProvidersState } from '../../../state/parameter-providers/parameter-providers.reducer'; -import { - CreateParameterProviderDialogRequest, - CreateParameterProviderRequest -} from '../../../state/parameter-providers'; +import { CreateParameterProviderDialogRequest } from '../../../state/parameter-providers'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; describe('CreateParameterProvider', () => { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.ts index 2032ab2868..f285a24451 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.ts @@ -23,7 +23,6 @@ import { MatButtonModule } from '@angular/material/button'; import { NifiSpinnerDirective } from '../../../../../ui/common/spinner/nifi-spinner.directive'; import { Observable } from 'rxjs'; import { - ControllerServiceReferencingComponent, InlineServiceCreationRequest, InlineServiceCreationResponse, ParameterContextReferenceEntity, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.ts index fafebbdfe5..9d4c1ef008 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.ts @@ -25,10 +25,9 @@ import { CurrentUser } from '../../../../../state/current-user'; import { FlowConfiguration } from '../../../../../state/flow-configuration'; import { MatPaginatorModule } from '@angular/material/paginator'; import { SummaryTableFilterModule } from '../../../../summary/ui/common/summary-table-filter/summary-table-filter.module'; -import { PortStatusSnapshotEntity } from '../../../../summary/state/summary-listing'; import { ValidationErrorsTip } from '../../../../../ui/common/tooltips/validation-errors-tip/validation-errors-tip.component'; import { NifiTooltipDirective } from '../../../../../ui/common/tooltips/nifi-tooltip.directive'; -import { ControllerServiceEntity, ValidationErrorsTipInput } from '../../../../../state/shared'; +import { ValidationErrorsTipInput } from '../../../../../state/shared'; import { RouterLink } from '@angular/router'; export type SupportedColumns = 'name' | 'type' | 'bundle'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.ts index aab8243728..0fe04a284f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.component.ts @@ -30,7 +30,7 @@ import { selectFlowConfiguration } from '../../../../state/flow-configuration/fl import { loadFlowConfiguration } from '../../../../state/flow-configuration/flow-configuration.actions'; import * as ParameterProviderActions from '../../state/parameter-providers/parameter-providers.actions'; import { initialParameterProvidersState } from '../../state/parameter-providers/parameter-providers.reducer'; -import { filter, switchMap, take } from 'rxjs'; +import { switchMap, take } from 'rxjs'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { isDefinedAndNotNull } from '../../../../state/shared'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.module.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.module.ts index 6ea65f94f6..ec080ddc10 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.module.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers.module.ts @@ -19,7 +19,6 @@ import { NgModule } from '@angular/core'; import { CommonModule } from '@angular/common'; import { ParameterProviders } from './parameter-providers.component'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; -import { ParameterContextListingModule } from '../../../parameter-contexts/ui/parameter-context-listing/parameter-context-listing.module'; import { ParameterProvidersTable } from './parameter-providers-table/parameter-providers-table.component'; @NgModule({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.ts index 16ce46de72..7b05aa0351 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.ts @@ -106,7 +106,7 @@ export class RegistryClientTable { return data.sort((a, b) => { const isAsc = sort.direction === 'asc'; - let retVal: number = 0; + let retVal = 0; switch (sort.active) { case 'name': retVal = this.nifiCommon.compareString(a.component.name, b.component.name); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.ts index 7a4446e961..55690c4bfb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/registry-clients.component.ts @@ -38,7 +38,6 @@ import { selectCurrentUser } from '../../../../state/current-user/current-user.s import { NiFiState } from '../../../../state'; import { filter, switchMap, take } from 'rxjs'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; -import { state } from '@angular/animations'; @Component({ selector: 'registry-clients', diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.ts index 36192b4ed5..90aa4d15b4 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/reporting-tasks/edit-reporting-task/edit-reporting-task.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/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, signal } from '@angular/core'; +import { Component, EventEmitter, Inject, Input, Output } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; import { MatTooltipModule } from '@angular/material/tooltip'; import { MatInputModule } from '@angular/material/input'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.ts index eab7334ac0..26e8c874d8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/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 { AfterViewInit, Component, EventEmitter, Input, Output } from '@angular/core'; +import { Component, EventEmitter, Input, Output } from '@angular/core'; import { MatTableDataSource } from '@angular/material/table'; import { Sort } from '@angular/material/sort'; import { ReportingTaskEntity } from '../../../state/reporting-tasks'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/summary-listing/summary-listing.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/summary-listing/summary-listing.reducer.ts index 847b06781c..d8c0a94c66 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/summary-listing/summary-listing.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/state/summary-listing/summary-listing.reducer.ts @@ -105,16 +105,16 @@ export const summaryListingReducer = createReducer( status: 'error' as const })), - on(resetSummaryState, (state) => ({ + on(resetSummaryState, () => ({ ...initialState })) ); function flattenProcessorStatusSnapshots( snapshot: ProcessGroupStatusSnapshot, - parentPath: string = '' + parentPath = '' ): ProcessorStatusSnapshotEntity[] { - const path: string = `${parentPath}/${snapshot.name}`; + const path = `${parentPath}/${snapshot.name}`; // supplement the processors with the parent process group name const processors = snapshot.processorStatusSnapshots.map((p) => { return { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/common/summary-table-filter/summary-table-filter.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/common/summary-table-filter/summary-table-filter.component.spec.ts index 40ad8fca6d..bd97e6d0f8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/common/summary-table-filter/summary-table-filter.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/common/summary-table-filter/summary-table-filter.component.spec.ts @@ -18,7 +18,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SummaryTableFilter } from './summary-table-filter.component'; -import { MatFormFieldModule } from '@angular/material/form-field'; import { SummaryTableFilterModule } from './summary-table-filter.module'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.ts index 969ec2315e..114266d15f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/connection-status-listing/connection-status-table/connection-status-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/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, EventEmitter, Input, Output, ViewChild } from '@angular/core'; +import { AfterViewInit, Component, EventEmitter, Input, Output, ViewChild } from '@angular/core'; import { CommonModule } from '@angular/common'; import { SummaryTableFilterModule } from '../../common/summary-table-filter/summary-table-filter.module'; import { MatSortModule, Sort, SortDirection } from '@angular/material/sort'; @@ -40,7 +40,7 @@ export type SupportedColumns = 'name' | 'queue' | 'in' | 'out' | 'threshold' | ' templateUrl: './connection-status-table.component.html', styleUrls: ['./connection-status-table.component.scss'] }) -export class ConnectionStatusTable { +export class ConnectionStatusTable implements AfterViewInit { private _initialSortColumn: SupportedColumns = 'sourceName'; private _initialSortDirection: SortDirection = 'asc'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/input-port-status-listing/input-port-status-listing.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/input-port-status-listing/input-port-status-listing.component.spec.ts index 68105e8c82..c1e4df4803 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/input-port-status-listing/input-port-status-listing.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/input-port-status-listing/input-port-status-listing.component.spec.ts @@ -18,11 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { InputPortStatusListing } from './input-port-status-listing.component'; -import { CommonModule } from '@angular/common'; import { SummaryTableFilterModule } from '../common/summary-table-filter/summary-table-filter.module'; -import { MatSortModule } from '@angular/material/sort'; -import { MatTableModule } from '@angular/material/table'; -import { RouterLink } from '@angular/router'; import { PortStatusTable } from '../common/port-status-table/port-status-table.component'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; import { provideMockStore } from '@ngrx/store/testing'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.spec.ts index 8474535eb4..4a68277617 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.spec.ts @@ -18,9 +18,7 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { ProcessorStatusListing } from './processor-status-listing.component'; -import { SummaryTableFilter } from '../common/summary-table-filter/summary-table-filter.component'; import { SummaryTableFilterModule } from '../common/summary-table-filter/summary-table-filter.module'; -import { ProcessorStatusListingModule } from './processor-status-listing.module'; import { provideMockStore } from '@ngrx/store/testing'; import { ProcessorStatusTable } from './processor-status-table/processor-status-table.component'; import { NoopAnimationsModule } from '@angular/platform-browser/animations'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.ts index 2fab11b83a..f4fa1235aa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/processor-status-listing/processor-status-listing.component.ts @@ -35,7 +35,6 @@ import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import * as SummaryListingActions from '../../state/summary-listing/summary-listing.actions'; import { MatPaginator } from '@angular/material/paginator'; import { ProcessorStatusTable } from './processor-status-table/processor-status-table.component'; -import { getSystemDiagnosticsAndOpenDialog } from '../../../../state/system-diagnostics/system-diagnostics.actions'; @Component({ selector: 'processor-status-listing', diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-table/remote-process-group-status-table.component.ts index f32b2d4963..8a157c82aa 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/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-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/summary/ui/remote-process-group-status-listing/remote-process-group-status-table/remote-process-group-status-table.component.ts @@ -41,9 +41,7 @@ export type SupportedColumns = 'name' | 'uri' | 'transmitting' | 'sent' | 'recei standalone: true, imports: [CommonModule, SummaryTableFilterModule, MatSortModule, MatTableModule, RouterLink, MatPaginatorModule], templateUrl: './remote-process-group-status-table.component.html', - styleUrls: [ - './remote-process-group-status-table.component.scss' - ] + styleUrls: ['./remote-process-group-status-table.component.scss'] }) export class RemoteProcessGroupStatusTable implements AfterViewInit { private _initialSortColumn: SupportedColumns = 'name'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.actions.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.actions.ts index 2fd3d53557..0e33230507 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.actions.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.actions.ts @@ -33,7 +33,7 @@ import { UpdateUserGroupResponse } from './index'; -const USER_PREFIX: string = '[User Listing]'; +const USER_PREFIX = '[User Listing]'; export const resetUsersState = createAction(`${USER_PREFIX} Reset Users State`); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts index 3a8eedfde5..c134684d79 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.effects.ts @@ -35,7 +35,7 @@ import { UserAccessPolicies } from '../../ui/user-listing/user-access-policies/u @Injectable() export class UserListingEffects { - private requestId: number = 0; + private requestId = 0; constructor( private actions$: Actions, @@ -90,7 +90,7 @@ export class UserListingEffects { this.actions$.pipe( ofType(UserListingActions.openCreateTenantDialog), concatLatestFrom(() => [this.store.select(selectUsers), this.store.select(selectUserGroups)]), - tap(([action, existingUsers, existingUserGroups]) => { + tap(([, existingUsers, existingUserGroups]) => { const editTenantRequest: EditTenantRequest = { existingUsers, existingUserGroups @@ -232,7 +232,7 @@ export class UserListingEffects { // @ts-ignore createUserResponse.userGroupUpdate.requestId === updateSuccess.response.requestId ), - map((response) => UserListingActions.createUserComplete({ response: createUserResponse })) + map(() => UserListingActions.createUserComplete({ response: createUserResponse })) ) ) ) @@ -359,7 +359,7 @@ export class UserListingEffects { } }); - dialogReference.afterClosed().subscribe((response) => { + dialogReference.afterClosed().subscribe(() => { this.store.dispatch( selectTenant({ id: request.user.id @@ -499,7 +499,7 @@ export class UserListingEffects { // @ts-ignore updateUserResponse.userGroupUpdate.requestId === updateSuccess.response.requestId ), - map((response) => UserListingActions.updateUserComplete()) + map(() => UserListingActions.updateUserComplete()) ) ) ) @@ -511,7 +511,7 @@ export class UserListingEffects { tap(() => { this.dialog.closeAll(); }), - switchMap((request) => of(UserListingActions.loadTenants())) + switchMap(() => of(UserListingActions.loadTenants())) ) ); @@ -599,7 +599,7 @@ export class UserListingEffects { tap(() => { this.dialog.closeAll(); }), - switchMap((request) => of(UserListingActions.loadTenants())) + switchMap(() => of(UserListingActions.loadTenants())) ) ); @@ -673,7 +673,7 @@ export class UserListingEffects { map((action) => action.request), switchMap((request) => from(this.usersService.deleteUser(request.user)).pipe( - map((response) => UserListingActions.loadTenants()), + map(() => UserListingActions.loadTenants()), catchError((error) => of(UserListingActions.usersApiError({ error: error.error }))) ) ) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.reducer.ts index 11babfb804..7602d059fe 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/state/user-listing/user-listing.reducer.ts @@ -42,7 +42,7 @@ export const initialState: UserListingState = { export const userListingReducer = createReducer( initialState, - on(resetUsersState, (state) => ({ + on(resetUsersState, () => ({ ...initialState })), on(loadTenants, (state) => ({ @@ -69,7 +69,7 @@ export const userListingReducer = createReducer( ...state, saving: false })), - on(createUserGroupSuccess, (state, { response }) => ({ + on(createUserGroupSuccess, (state) => ({ ...state, saving: false })), diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.ts index b03ec33a4b..12f6aa5714 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.ts @@ -65,7 +65,7 @@ export class UserAccessPolicies { return data.sort((a, b) => { const isAsc = sort.direction === 'asc'; - let retVal: number = 0; + let retVal = 0; if (a.permissions.canRead && b.permissions.canRead) { switch (sort.active) { case 'policy': @@ -124,7 +124,7 @@ export class UserAccessPolicies { return 'Restricted components regardless of restrictions'; } - var subResource = this.nifiCommon.substringAfterFirst(resource, '/restricted-components/'); + const subResource = this.nifiCommon.substringAfterFirst(resource, '/restricted-components/'); return `Restricted components requiring '${subResource}'`; } @@ -136,7 +136,7 @@ export class UserAccessPolicies { */ private componentResourceParser(policy: AccessPolicySummaryEntity): string { let resource: string = policy.component.resource; - let policyLabel: string = ''; + let policyLabel = ''; // determine policy type if (resource.startsWith('/policies')) { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.ts index 8cef58e890..bf51505df5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.ts @@ -57,10 +57,10 @@ export interface Tenants { styleUrls: ['./user-table.component.scss'] }) export class UserTable implements AfterViewInit { - filterTerm: string = ''; + filterTerm = ''; filterColumn: 'user' | 'membership' = 'user'; - totalCount: number = 0; - filteredCount: number = 0; + totalCount = 0; + filteredCount = 0; displayedColumns: string[] = ['user', 'membership', 'actions']; dataSource: MatTableDataSource = new MatTableDataSource(); @@ -172,7 +172,7 @@ export class UserTable implements AfterViewInit { return data.sort((a, b) => { const isAsc = sort.direction === 'asc'; - let retVal: number = 0; + let retVal = 0; switch (sort.active) { case 'user': retVal = this.nifiCommon.compareString(a.user, b.user); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/about.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/about.service.ts index af8c75c85b..9cabf5f1a9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/about.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/about.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; @Injectable({ providedIn: 'root' }) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/auth-storage.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/auth-storage.service.ts index 1852c9223e..f953992018 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/auth-storage.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/auth-storage.service.ts @@ -25,8 +25,6 @@ export class AuthStorage { private static readonly REQUEST_TOKEN_PATTERN: RegExp = new RegExp('Request-Token=([^;]+)'); - constructor() {} - /** * Get Request Token from document cookies * diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/client.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/client.service.ts index c0291bb7fc..42be8eecac 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/client.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/client.service.ts @@ -23,8 +23,6 @@ import { Injectable } from '@angular/core'; export class Client { private clientId: string = crypto.randomUUID(); - constructor() {} - public getClientId(): string { return this.clientId; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/controller-service-state.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/controller-service-state.service.ts index 7d446c5aa7..213e2c4dea 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/controller-service-state.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/controller-service-state.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; import { ControllerServiceEntity, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/current-user.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/current-user.service.ts index 8415517810..feb06e9ee6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/current-user.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/current-user.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; @Injectable({ providedIn: 'root' }) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/flow-configuration.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/flow-configuration.service.ts index 0cb905be67..9a5b323539 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/flow-configuration.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/flow-configuration.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; @Injectable({ providedIn: 'root' }) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authentication.guard.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authentication.guard.ts index bdd3a16388..7de1050c56 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authentication.guard.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authentication.guard.ts @@ -26,7 +26,7 @@ import { CurrentUserState } from '../../state/current-user'; import { loadCurrentUserSuccess } from '../../state/current-user/current-user.actions'; import { selectCurrentUserState } from '../../state/current-user/current-user.selectors'; -export const authenticationGuard: CanMatchFn = (route, state) => { +export const authenticationGuard: CanMatchFn = () => { const authStorage: AuthStorage = inject(AuthStorage); const authService: AuthService = inject(AuthService); const userService: CurrentUserService = inject(CurrentUserService); @@ -49,7 +49,7 @@ export const authenticationGuard: CanMatchFn = (route, state) => { resolve(true); }, - error: (error) => { + error: () => { authService .ticketExpiration() .pipe(take(1)) @@ -65,7 +65,7 @@ export const authenticationGuard: CanMatchFn = (route, state) => { resolve(true); }, - error: (error) => { + error: () => { resolve(false); } }); @@ -112,7 +112,7 @@ export const authenticationGuard: CanMatchFn = (route, state) => { } resolve(true); }, - error: (error) => { + error: () => { window.location.href = './login'; resolve(false); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authorization.guard.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authorization.guard.ts index a56673f8bf..5708f4897f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authorization.guard.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/authorization.guard.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { CanMatchFn, Route, Router, UrlSegment } from '@angular/router'; +import { CanMatchFn, Router } from '@angular/router'; import { inject } from '@angular/core'; import { map } from 'rxjs'; import { Store } from '@ngrx/store'; @@ -23,7 +23,7 @@ import { CurrentUser, CurrentUserState } from '../../state/current-user'; import { selectCurrentUser } from '../../state/current-user/current-user.selectors'; export const authorizationGuard = (authorizationCheck: (user: CurrentUser) => boolean): CanMatchFn => { - return (route: Route, state: UrlSegment[]) => { + return () => { const router: Router = inject(Router); const store: Store = inject(Store); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/flow-configuration.guard.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/flow-configuration.guard.ts index 9204c8e9be..5b29233e1c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/flow-configuration.guard.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/guard/flow-configuration.guard.ts @@ -15,7 +15,7 @@ * limitations under the License. */ -import { CanMatchFn, Route, Router, UrlSegment } from '@angular/router'; +import { CanMatchFn, Router } from '@angular/router'; import { inject } from '@angular/core'; import { map } from 'rxjs'; import { Store } from '@ngrx/store'; @@ -25,7 +25,7 @@ import { selectFlowConfiguration } from '../../state/flow-configuration/flow-con export const checkFlowConfiguration = ( flowConfigurationCheck: (flowConfiguration: FlowConfiguration) => boolean ): CanMatchFn => { - return (route: Route, state: UrlSegment[]) => { + return () => { const router: Router = inject(Router); const store: Store = inject(Store); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/interceptors/auth.interceptor.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/interceptors/auth.interceptor.ts index 7c7620ca33..5daf5c7323 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/interceptors/auth.interceptor.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/interceptors/auth.interceptor.ts @@ -28,7 +28,7 @@ import { NiFiCommon } from '../nifi-common.service'; providedIn: 'root' }) export class AuthInterceptor implements HttpInterceptor { - routedToFullScreenError: boolean = false; + routedToFullScreenError = false; constructor( private authStorage: AuthStorage, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/nifi-common.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/nifi-common.service.ts index 85ec206b4f..bbe69cfdcd 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/nifi-common.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/nifi-common.service.ts @@ -97,8 +97,6 @@ export class NiFiCommon { } ]; - constructor() {} - /** * Extracts the contents of the specified str before the last strToFind. If the * strToFind is not found or the first part of the str, an empty string is @@ -142,10 +140,10 @@ export class NiFiCommon { * @argument {string} strToFind The substring to find */ public substringAfterFirst(str: string, strToFind: string) { - var result = ''; - var indexOfStrToFind = str.indexOf(strToFind); + let result = ''; + const indexOfStrToFind = str.indexOf(strToFind); if (indexOfStrToFind >= 0) { - var indexAfterStrToFind = indexOfStrToFind + strToFind.length; + const indexAfterStrToFind = indexOfStrToFind + strToFind.length; if (indexAfterStrToFind < str.length) { result = str.substring(indexAfterStrToFind); } @@ -206,7 +204,7 @@ export class NiFiCommon { public stringContains( stringToSearch: string | null | undefined, stringToFind: string | null | undefined, - caseInsensitive: boolean = false + caseInsensitive = false ): boolean { if (this.isBlank(stringToSearch)) { return false; @@ -250,7 +248,7 @@ export class NiFiCommon { * @param bundle */ public formatBundle(bundle: any): string { - let groupString: string = ''; + let groupString = ''; if (bundle.group !== 'default') { groupString = bundle.group + ' - '; } @@ -382,7 +380,7 @@ export class NiFiCommon { // detect if there is millis const secondsSpec: string[] = time[2].split(/\./); const seconds: number = parseInt(secondsSpec[0], 10); - let milliseconds: number = 0; + let milliseconds = 0; if (secondsSpec.length === 2) { milliseconds = parseInt(secondsSpec[1], 10); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/storage.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/storage.service.ts index 56b5cbb80e..aaa65d6c8c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/storage.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/service/storage.service.ts @@ -24,8 +24,6 @@ export class Storage { private static readonly MILLIS_PER_DAY: number = 86400000; private static readonly TWO_DAYS: number = Storage.MILLIS_PER_DAY * 2; - constructor() {} - /** * Checks the expiration for the specified entry. * diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts index 5f02df85a2..467a108019 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.effects.ts @@ -68,7 +68,7 @@ export class ComponentStateEffects { this.actions$.pipe( ofType(ComponentStateActions.loadComponentStateSuccess), map((action) => action.response), - switchMap((response) => of(ComponentStateActions.openComponentStateDialog())) + switchMap(() => of(ComponentStateActions.openComponentStateDialog())) ) ); @@ -81,7 +81,7 @@ export class ComponentStateEffects { panelClass: 'large-dialog' }); - dialogReference.afterClosed().subscribe((response) => { + dialogReference.afterClosed().subscribe(() => { this.store.dispatch(resetComponentState()); }); }) @@ -93,10 +93,10 @@ export class ComponentStateEffects { this.actions$.pipe( ofType(ComponentStateActions.clearComponentState), concatLatestFrom(() => this.store.select(selectComponentUri).pipe(isDefinedAndNotNull())), - switchMap(([action, componentUri]) => + switchMap(([, componentUri]) => from( this.componentStateService.clearComponentState({ componentUri }).pipe( - map((response: any) => ComponentStateActions.reloadComponentState()), + map(() => ComponentStateActions.reloadComponentState()), catchError((error) => of( ComponentStateActions.componentStateApiError({ @@ -114,7 +114,7 @@ export class ComponentStateEffects { this.actions$.pipe( ofType(ComponentStateActions.reloadComponentState), concatLatestFrom(() => this.store.select(selectComponentUri).pipe(isDefinedAndNotNull())), - switchMap(([action, componentUri]) => + switchMap(([, componentUri]) => from( this.componentStateService.getComponentState({ componentUri }).pipe( map((response: any) => diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.reducer.ts index d8ee39c266..1b167a57a1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/component-state/component-state.reducer.ts @@ -54,7 +54,7 @@ export const componentStateReducer = createReducer( error, status: 'error' as const })), - on(resetComponentState, (state) => ({ + on(resetComponentState, () => ({ ...initialState })) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts index 8a055438bc..1010a4ed17 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.effects.ts @@ -66,7 +66,7 @@ export class ControllerServiceStateEffects { this.actions$.pipe( ofType(ControllerServiceActions.submitDisableRequest), concatLatestFrom(() => this.store.select(selectControllerService).pipe(isDefinedAndNotNull())), - switchMap(([request, controllerService]) => { + switchMap(([, controllerService]) => { if (this.hasUnauthorizedReferences(controllerService.component.referencingComponents)) { return of( ControllerServiceActions.setEnableStepFailure({ @@ -90,7 +90,7 @@ export class ControllerServiceStateEffects { this.store.select(selectControllerService), this.store.select(selectControllerServiceSetEnableRequest) ]), - switchMap(([request, controllerService, setEnableRequest]) => { + switchMap(([, controllerService, setEnableRequest]) => { if (controllerService) { return from( this.controllerServiceStateService.setEnable(controllerService, setEnableRequest.enable) @@ -132,7 +132,7 @@ export class ControllerServiceStateEffects { map((action) => action.response), // if the current step is DisableService, it's the end of a disable request and there is no need to start polling filter((response) => response.currentStep !== SetEnableStep.DisableService), - switchMap((response) => of(ControllerServiceActions.startPollingControllerService())) + switchMap(() => of(ControllerServiceActions.startPollingControllerService())) ) ); @@ -155,7 +155,7 @@ export class ControllerServiceStateEffects { this.store.select(selectControllerService).pipe(isDefinedAndNotNull()), this.store.select(selectControllerServiceSetEnableRequest) ]), - switchMap(([action, controllerService, setEnableRequest]) => + switchMap(([, controllerService, setEnableRequest]) => from(this.controllerServiceStateService.getControllerService(controllerService.id)).pipe( map((response) => ControllerServiceActions.pollControllerServiceSuccess({ @@ -221,7 +221,7 @@ export class ControllerServiceStateEffects { this.store.select(selectControllerService), this.store.select(selectControllerServiceSetEnableRequest) ]), - switchMap(([action, controllerService, setEnableRequest]) => { + switchMap(([, controllerService, setEnableRequest]) => { if (controllerService) { return from( this.controllerServiceStateService.updateReferencingServices( @@ -267,7 +267,7 @@ export class ControllerServiceStateEffects { this.store.select(selectControllerService), this.store.select(selectControllerServiceSetEnableRequest) ]), - switchMap(([action, controllerService, setEnableRequest]) => { + switchMap(([, controllerService, setEnableRequest]) => { if (controllerService) { return from( this.controllerServiceStateService.updateReferencingSchedulableComponents( @@ -312,7 +312,7 @@ export class ControllerServiceStateEffects { map((action) => action.response), // if the current step is StartReferencingComponents, it's the end of an enable request and there is no need to start polling filter((response) => response.currentStep !== SetEnableStep.StartReferencingComponents), - switchMap((response) => of(ControllerServiceActions.startPollingControllerService())) + switchMap(() => of(ControllerServiceActions.startPollingControllerService())) ) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.reducer.ts index 9dfd495714..5166796a4d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.reducer.ts @@ -45,7 +45,7 @@ export const initialState: ControllerServiceState = { export const controllerServiceStateReducer = createReducer( initialState, - on(resetEnableControllerServiceState, (state) => ({ + on(resetEnableControllerServiceState, () => ({ ...initialState })), on(setControllerService, (state, { request }) => ({ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.selectors.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.selectors.ts index b02e620898..d49b7caf22 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.selectors.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/contoller-service-state/controller-service-state.selectors.ts @@ -16,8 +16,7 @@ */ import { createFeatureSelector, createSelector } from '@ngrx/store'; -import { controllerServiceStateFeatureKey, ControllerServiceState } from './index'; -import { ControllerServiceEntity } from '../shared'; +import { ControllerServiceState, controllerServiceStateFeatureKey } from './index'; export const selectEnableControllerServiceState = createFeatureSelector( controllerServiceStateFeatureKey diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.reducer.ts index 939be0688d..abce7a8bb3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/error/error.reducer.ts @@ -44,7 +44,7 @@ export const errorReducer = createReducer( ...state, bannerErrors: null })), - on(resetErrorState, (state) => ({ + on(resetErrorState, () => ({ ...initialState })) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.effects.ts index 3d8ec8171e..f6d4cb81dc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.effects.ts @@ -25,7 +25,6 @@ import { StatusHistoryRequest } from './index'; import { catchError, from, map, of, switchMap, tap } from 'rxjs'; import { MatDialog } from '@angular/material/dialog'; import { StatusHistory } from '../../ui/common/status-history/status-history.component'; -import { ComponentType } from '../shared'; @Injectable() export class StatusHistoryEffects { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.reducer.ts index 3f565207e0..f5be61f97c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/status-history/status-history.reducer.ts @@ -56,11 +56,11 @@ export const statusHistoryReducer = createReducer( status: 'error' as const })), - on(clearStatusHistory, (state) => ({ + on(clearStatusHistory, () => ({ ...initialState })), - on(viewStatusHistoryComplete, (state) => ({ + on(viewStatusHistoryComplete, () => ({ ...initialState })) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/index.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/index.ts index 3c73b8f932..8a37795f3c 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/index.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/index.ts @@ -93,8 +93,6 @@ export interface SystemDiagnosticsRequest { nodewise: boolean; } -export interface OpenSystemDiagnosticsDialogRequest {} - export interface SystemDiagnosticsResponse { systemDiagnostics: SystemDiagnostics; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.actions.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.actions.ts index efba28867d..307cdb9fad 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.actions.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.actions.ts @@ -16,9 +16,9 @@ */ import { createAction, props } from '@ngrx/store'; -import { OpenSystemDiagnosticsDialogRequest, SystemDiagnosticsRequest, SystemDiagnosticsResponse } from './index'; +import { SystemDiagnosticsRequest, SystemDiagnosticsResponse } from './index'; -const SYSTEM_DIAGNOSTICS_PREFIX: string = '[System Diagnostics]'; +const SYSTEM_DIAGNOSTICS_PREFIX = '[System Diagnostics]'; export const reloadSystemDiagnostics = createAction( `${SYSTEM_DIAGNOSTICS_PREFIX} Load System Diagnostics`, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts index dbedee1d19..aa5d64914d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.effects.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { act, Actions, createEffect, ofType } from '@ngrx/effects'; +import { Actions, createEffect, ofType } from '@ngrx/effects'; import { Store } from '@ngrx/store'; import { NiFiState } from '../index'; import { MatDialog } from '@angular/material/dialog'; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.reducer.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.reducer.ts index 61b55bb4ff..2d6448403d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.reducer.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/state/system-diagnostics/system-diagnostics.reducer.ts @@ -56,11 +56,11 @@ export const systemDiagnosticsReducer = createReducer( status: 'error' as const })), - on(resetSystemDiagnostics, (state) => ({ + on(resetSystemDiagnostics, () => ({ ...initialSystemDiagnosticsState })), - on(viewSystemDiagnosticsComplete, (state) => ({ + on(viewSystemDiagnosticsComplete, () => ({ ...initialSystemDiagnosticsState })) ); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.ts index f415bbfa94..2aa782319f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/component-state/component-state.component.ts @@ -71,10 +71,10 @@ export class ComponentStateDialog implements AfterViewInit { filterForm: FormGroup; - stateDescription: string = ''; - totalEntries: number = 0; - filteredEntries: number = 0; - partialResults: boolean = false; + stateDescription = ''; + totalEntries = 0; + filteredEntries = 0; + partialResults = false; constructor( private store: Store, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/context-menu.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/context-menu.component.html index c84e0bc0d5..48758d27f5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/context-menu.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/context-menu.component.html @@ -16,7 +16,7 @@ --> -
+
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/context-menu.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/context-menu.component.ts index d38c861960..4c155a62b3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/context-menu.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/context-menu/context-menu.component.ts @@ -28,11 +28,11 @@ export interface ContextMenuDefinitionProvider { export interface ContextMenuItemDefinition { isSeparator?: boolean; - condition?: Function; + condition?: (selection: any) => boolean; clazz?: string; text?: string; subMenuId?: string; - action?: Function; + action?: (selection: any, event?: MouseEvent) => void; } export interface ContextMenuDefinition { @@ -55,8 +55,6 @@ export class ContextMenu implements OnInit { private showFocused: Subject = new Subject(); showFocused$: Observable = this.showFocused.asObservable(); - constructor() {} - getMenuItems(menuId: string | undefined): ContextMenuItemDefinition[] { if (menuId) { const menuDefinition: ContextMenuDefinition | undefined = this.menuProvider.getMenu(menuId); @@ -116,7 +114,7 @@ export class ContextMenu implements OnInit { return !!menuItemDefinition.subMenuId; } - keydown(event: KeyboardEvent): void { + keydown(): void { // TODO - Currently the first item in the context menu is auto focused. By default, this is rendered with an // outline. This appears to be an issue with the cdkMenu/cdkMenuItem so we are working around it by manually // overriding styles. diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-api/controller-service-api.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-api/controller-service-api.component.spec.ts index 03ec28a5b0..0f18deeac5 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-api/controller-service-api.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-api/controller-service-api.component.spec.ts @@ -24,7 +24,7 @@ describe('ControllerServiceApi', () => { let component: ControllerServiceApi; let fixture: ComponentFixture; - const serviceType: string = 'org.apache.nifi.ssl.StandardRestrictedSSLContextService'; + const serviceType = 'org.apache.nifi.ssl.StandardRestrictedSSLContextService'; const serviceBundle: Bundle = { group: 'org.apache.nifi', artifact: 'nifi-ssl-context-service-nar', diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-table/controller-service-table.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-table/controller-service-table.component.html index 0ae491ed2f..b52c6c74de 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-table/controller-service-table.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/controller-service-table/controller-service-table.component.html @@ -125,12 +125,12 @@
{ let component: CreateControllerService; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/edit-tenant/edit-tenant-dialog.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/edit-tenant/edit-tenant-dialog.component.ts index a972185469..2d34ba51de 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/edit-tenant/edit-tenant-dialog.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/edit-tenant/edit-tenant-dialog.component.ts @@ -69,7 +69,7 @@ export class EditTenantDialog { readonly USER: string = 'user'; readonly USER_GROUP: string = 'userGroup'; - isUser: boolean = true; + isUser = true; identity: FormControl; tenantType: FormControl; @@ -91,7 +91,7 @@ export class EditTenantDialog { if (user || userGroup) { this.isNew = false; - let identity: string = ''; + let identity = ''; let tenantType: string = this.USER; if (user) { identity = user.component.identity; @@ -176,7 +176,7 @@ export class EditTenantDialog { this.editTenantForm.removeControl('userGroups'); } - let users: string[] = []; + const users: string[] = []; if (this.request.userGroup) { users.push(...this.request.userGroup.component.users.map((user) => user.id)); } @@ -189,7 +189,7 @@ export class EditTenantDialog { this.editTenantForm.removeControl('users'); } - let userGroups: string[] = []; + const userGroups: string[] = []; if (this.request.user) { userGroups.push(...this.request.user.component.userGroups.map((userGroup) => userGroup.id)); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/page-content/_login-message.component-theme.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/page-content/_login-message.component-theme.scss deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/page-content/page-content.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/page-content/page-content.component.ts index d0c965f77a..9c30af4ac3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/page-content/page-content.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/page-content/page-content.component.ts @@ -29,7 +29,7 @@ import { NgIf } from '@angular/common'; styleUrls: ['./page-content.component.scss'] }) export class PageContent { - @Input() title: string = ''; + @Input() title = ''; constructor( private authStorage: AuthStorage, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.spec.ts index e3a7564d6e..d3d3bc4fcc 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.spec.ts @@ -28,7 +28,7 @@ describe('ComboEditor', () => { let fixture: ComponentFixture; let item: PropertyItem | null = null; - let parameters: Parameter[] = [ + const parameters: Parameter[] = [ { name: 'one', description: 'Description for one.', @@ -186,7 +186,7 @@ describe('ComboEditor', () => { item.value = '#{one}'; component.item = item; - component.getParameters = (sensitive: boolean) => { + component.getParameters = () => { return of(parameters); }; fixture.detectChanges(); @@ -210,7 +210,7 @@ describe('ComboEditor', () => { item.value = '#{three}'; component.item = item; - component.getParameters = (sensitive: boolean) => { + component.getParameters = () => { return of(parameters); }; fixture.detectChanges(); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.ts index 5cfdf99e46..78042e0835 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.ts @@ -91,21 +91,21 @@ export class ComboEditor { protected readonly TextTip = TextTip; itemLookup: Map = new Map(); - referencesParametersId: number = -1; - configuredParameterId: number = -1; + referencesParametersId = -1; + configuredParameterId = -1; comboEditorForm: FormGroup; descriptor!: PropertyDescriptor; allowableValues!: AllowableValueItem[]; - showParameterAllowableValues: boolean = false; + showParameterAllowableValues = false; parameterAllowableValues!: AllowableValueItem[]; - sensitive: boolean = false; - supportsParameters: boolean = false; - parametersLoaded: boolean = false; + sensitive = false; + supportsParameters = false; + parametersLoaded = false; - itemSet: boolean = false; + itemSet = false; configuredValue: string | null = null; _getParameters!: (sensitive: boolean) => Observable; @@ -121,7 +121,7 @@ export class ComboEditor { this.allowableValues = []; this.referencesParametersId = -1; - let i: number = 0; + let i = 0; let selectedItem: AllowableValueItem | null = null; if (!this.descriptor.required) { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/el.service.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/el.service.ts index 6f8d2630cc..3075ea32db 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/el.service.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/el.service.ts @@ -16,7 +16,7 @@ */ import { Injectable } from '@angular/core'; -import { Observable, throwError } from 'rxjs'; +import { Observable } from 'rxjs'; import { HttpClient } from '@angular/common/http'; @Injectable({ providedIn: 'root' }) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/nfel.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/nfel.ts index faaf2affd6..711c8ee553 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/nfel.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/nfel.ts @@ -51,7 +51,7 @@ export class NfEl { const description: string = elFunction.querySelector('span.description')?.textContent ?? ''; const returnType: string = elFunction.querySelector('span.returnType')?.textContent ?? ''; - let subject: string = ''; + let subject = ''; const subjectSpan: Element | null = elFunction.querySelector('span.subject'); const subjectless: Element | null = elFunction.querySelector('span.subjectless'); @@ -88,7 +88,6 @@ export class NfEl { }; }); }, - error: () => {}, complete: () => { // build the regex for all functions discovered self.subjectlessFunctionRegex = new RegExp('^((' + self.subjectlessFunctions.join(')|(') + '))$'); @@ -106,7 +105,7 @@ export class NfEl { return { copy: function () { const copy: any[] = []; - for (let i: number = 0; i < states.length; i++) { + for (let i = 0; i < states.length; i++) { copy.push({ context: states[i].context }); @@ -182,7 +181,7 @@ export class NfEl { // within an expression if (state.context === NfEl.EXPRESSION) { - const attributeOrSubjectlessFunctionExpression: RegExp = + const attributeOrSubjectlessFunctionExpression = /^[^'"#${}()[\],:;\/*\\\s\t\r\n0-9][^'"#${}()[\],:;\/*\\\s\t\r\n]*/; // attempt to extract a function name @@ -669,19 +668,19 @@ export class NfEl { }); } - private parameterKeyRegex: RegExp = /^[a-zA-Z0-9-_. ]+/; + private parameterKeyRegex = /^[a-zA-Z0-9-_. ]+/; private parameters: string[] = []; - private parameterRegex: RegExp = new RegExp('^$'); + private parameterRegex = new RegExp('^$'); private parameterDetails: { [key: string]: Parameter } = {}; - private parametersSupported: boolean = false; + private parametersSupported = false; private subjectlessFunctions: string[] = []; private functions: string[] = []; - private subjectlessFunctionRegex: RegExp = new RegExp('^$'); - private functionRegex: RegExp = new RegExp('^$'); + private subjectlessFunctionRegex = new RegExp('^$'); + private functionRegex = new RegExp('^$'); private functionDetails: { [key: string]: ElFunction } = {}; @@ -705,7 +704,7 @@ export class NfEl { */ private handleStart(startChar: string, context: string, stream: StringStream, states: any): null | string { // determine the number of sequential start chars - let startCharCount: number = 0; + let startCharCount = 0; stream.eatWhile(function (ch: string) { if (ch === startChar) { startCharCount++; @@ -756,8 +755,8 @@ export class NfEl { */ private handleStringLiteral(stream: StringStream, state: any): string | null { const current: string | null = stream.next(); - let foundTrailing: boolean = false; - let foundEscapeChar: boolean = false; + let foundTrailing = false; + let foundEscapeChar = false; // locate a closing string delimitor const foundStringLiteral: boolean = stream.eatWhile(function (ch: string) { @@ -809,7 +808,7 @@ export class NfEl { // Find the token at the cursor const cursor: CodeMirror.Position = editor.getCursor(); const token: CodeMirror.Token = editor.getTokenAt(cursor); - let includeAll: boolean = false; + let includeAll = false; const state = token.state.get(); // whether the current context is within a function @@ -837,10 +836,10 @@ export class NfEl { } // lower case for case-insensitive comparison - let value: string = token.string.toLowerCase(); + const value: string = token.string.toLowerCase(); // trim to ignore extra whitespace - let trimmed: string = value.trim(); + const trimmed: string = value.trim(); // identify potential patterns and increment the start location appropriately if (trimmed === '${' || trimmed === ':' || trimmed === '#{') { @@ -849,7 +848,7 @@ export class NfEl { } let options: string[] = self.functions; - let useFunctionDetails: boolean = true; + let useFunctionDetails = true; if (isSubjectlessFunction(context)) { options = self.subjectlessFunctions; } else if (isParameterReference(context)) { diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/nfpr.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/nfpr.ts index 95b199e9fb..e4fa1a60c2 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/nfpr.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/nfpr.ts @@ -38,7 +38,7 @@ export class NfPr { return { copy: function () { const copy: any[] = []; - for (let i: number = 0; i < states.length; i++) { + for (let i = 0; i < states.length; i++) { copy.push({ context: states[i].context }); @@ -183,13 +183,13 @@ export class NfPr { }); } - private parameterKeyRegex: RegExp = /^[a-zA-Z0-9-_. ]+/; + private parameterKeyRegex = /^[a-zA-Z0-9-_. ]+/; private parameters: string[] = []; - private parameterRegex: RegExp = new RegExp('^$'); + private parameterRegex = new RegExp('^$'); private parameterDetails: { [key: string]: Parameter } = {}; - private parametersSupported: boolean = false; + private parametersSupported = false; // valid context states private static readonly PARAMETER: string = 'parameter'; @@ -203,7 +203,7 @@ export class NfPr { */ private handlePound(stream: StringStream, states: any): string | null { // determine the number of sequential pounds - let poundCount: number = 0; + let poundCount = 0; stream.eatWhile(function (ch: string): boolean { if (ch === '#') { poundCount++; @@ -260,7 +260,7 @@ export class NfPr { // Find the token at the cursor const cursor: CodeMirror.Position = editor.getCursor(); const token: CodeMirror.Token = editor.getTokenAt(cursor); - let includeAll: boolean = false; + let includeAll = false; const state = token.state.get(); // whether the current context is within a function diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/nf-editor.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/nf-editor.component.spec.ts index 083a591e6b..b3850a933b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/nf-editor.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/nf-editor.component.spec.ts @@ -39,7 +39,7 @@ describe('NfEditor', () => { }); it('verify value set', () => { - const value: string = 'my-group-id'; + const value = 'my-group-id'; const item: PropertyItem = { property: 'group.id', value, @@ -76,7 +76,7 @@ describe('NfEditor', () => { }); it('verify empty value set', () => { - const value: string = ''; + const value = ''; const item: PropertyItem = { property: 'group.id', value, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/nf-editor.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/nf-editor.component.ts index 01cf9521de..aff7a61265 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/nf-editor.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/nf-editor.component.ts @@ -88,13 +88,13 @@ export class NfEditor implements OnDestroy { protected readonly PropertyHintTip = PropertyHintTip; - itemSet: boolean = false; - getParametersSet: boolean = false; + itemSet = false; + getParametersSet = false; nfEditorForm: FormGroup; - sensitive: boolean = false; - supportsEl: boolean = false; - supportsParameters: boolean = false; + sensitive = false; + supportsEl = false; + supportsParameters = false; mode!: string; _getParameters!: (sensitive: boolean) => Observable; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.ts index 685f20bc22..e5c0d02a8e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.ts @@ -105,7 +105,7 @@ export class PropertyTable implements AfterViewInit, ControlValueAccessor { @Input() goToParameter!: (parameter: string) => void; @Input() convertToParameter!: (name: string, sensitive: boolean, value: string | null) => Observable; @Input() goToService!: (serviceId: string) => void; - @Input() supportsSensitiveDynamicProperties: boolean = false; + @Input() supportsSensitiveDynamicProperties = false; private static readonly PARAM_REF_REGEX: RegExp = /#{[a-zA-Z0-9-_. ]+}/; @@ -122,8 +122,8 @@ export class PropertyTable implements AfterViewInit, ControlValueAccessor { @ViewChildren('trigger') valueTriggers!: QueryList; - isDisabled: boolean = false; - isTouched: boolean = false; + isDisabled = false; + isTouched = false; onTouched!: () => void; onChange!: (properties: Property[]) => void; @@ -142,10 +142,10 @@ export class PropertyTable implements AfterViewInit, ControlValueAccessor { 0 ); public editorPositions: ConnectionPositionPair[] = [this.editorPosition]; - editorOpen: boolean = false; + editorOpen = false; editorTrigger: any = null; editorItem!: PropertyItem; - editorWidth: number = 0; + editorWidth = 0; constructor( private changeDetector: ChangeDetectorRef, @@ -181,7 +181,7 @@ export class PropertyTable implements AfterViewInit, ControlValueAccessor { } initFilter(): void { - this.dataSource.filterPredicate = (data: PropertyItem, filter: string) => this.isVisible(data); + this.dataSource.filterPredicate = (data: PropertyItem) => this.isVisible(data); this.dataSource.filter = ' '; } @@ -254,7 +254,7 @@ export class PropertyTable implements AfterViewInit, ControlValueAccessor { writeValue(properties: Property[]): void { this.itemLookup.clear(); - let i: number = 0; + let i = 0; const propertyItems: PropertyItem[] = properties.map((property) => { // create the property item const item: PropertyItem = { @@ -439,13 +439,13 @@ export class PropertyTable implements AfterViewInit, ControlValueAccessor { } canConvertToParameter(item: PropertyItem): boolean { - let canUpdateParameterContext: boolean = false; + let canUpdateParameterContext = false; if (this.parameterContext) { canUpdateParameterContext = this.parameterContext.permissions.canRead && this.parameterContext.permissions.canWrite; } - let propertyReferencesParameter: boolean = false; + let propertyReferencesParameter = false; if (canUpdateParameterContext && item.value) { propertyReferencesParameter = PropertyTable.PARAM_REF_REGEX.test(item.value); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/provenance-event-dialog/provenance-event-dialog.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/provenance-event-dialog/provenance-event-dialog.component.ts index ab7eeb2d43..47085a148a 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/provenance-event-dialog/provenance-event-dialog.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/provenance-event-dialog/provenance-event-dialog.component.ts @@ -53,7 +53,7 @@ export class ProvenanceEventDialog { @Output() viewContent: EventEmitter = new EventEmitter(); @Output() replay: EventEmitter = new EventEmitter(); - onlyShowModifiedAttributes: boolean = false; + onlyShowModifiedAttributes = false; constructor( @Inject(MAT_DIALOG_DATA) public request: ProvenanceEventDialogRequest, diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts index 32c17ff1d0..c55b552c93 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts @@ -31,8 +31,8 @@ import { AsyncPipe, NgIf } from '@angular/common'; }) export class Resizable { @Output() resized = new EventEmitter(); - @Input() minHeight: number = 0; - @Input() minWidth: number = 0; + @Input() minHeight = 0; + @Input() minWidth = 0; private startSize$ = new Subject(); private dragMove$ = new Subject(); @@ -40,7 +40,7 @@ export class Resizable { withLatestFrom(this.startSize$), auditTime(25), tap(([{ distance }, rect]) => { - let resized: boolean = false; + let resized = false; if (rect.width + distance.x >= this.minWidth) { this.el.nativeElement.style.width = `${rect.width + distance.x}px`; resized = true; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/spinner/spinner.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/spinner/spinner.component.ts index 7a78488be6..f791083445 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/spinner/spinner.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/spinner/spinner.component.ts @@ -22,6 +22,4 @@ import { Component } from '@angular/core'; standalone: true, template: '' }) -export class Spinner { - constructor() {} -} +export class Spinner {} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history-chart/status-history-chart.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history-chart/status-history-chart.component.ts index 0846e66617..37fb1a5c9f 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history-chart/status-history-chart.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history-chart/status-history-chart.component.ts @@ -185,12 +185,12 @@ export class StatusHistoryChart { let width = chartContainer.clientWidth - margin.left - margin.right; let height = chartContainer.clientHeight - margin.top - margin.bottom; - let maxWidth = Math.min(chartContainer.clientWidth, this.getChartMaxWidth()); + const maxWidth = Math.min(chartContainer.clientWidth, this.getChartMaxWidth()); if (width > maxWidth) { width = maxWidth; } - let maxHeight = this.getChartMaxHeight(); + const maxHeight = this.getChartMaxHeight(); if (height > maxHeight) { height = maxHeight; } @@ -295,12 +295,11 @@ export class StatusHistoryChart { return d.label; }); - const me = this; // draw the control points for each line - status.each(function (d) { + status.each((d, index, nodes) => { // create a group for the control points const markGroup = d3 - .select(this) + .select(nodes[index]) .append('g') .attr('class', function () { return 'mark-group mark-group-' + d.id; @@ -329,12 +328,15 @@ export class StatusHistoryChart { .attr('r', 1.5) .append('title') .text((v) => { - return d.label + ' -- ' + me.formatters[selectedDescriptor.formatter](v.value); + return d.label + ' -- ' + this.formatters[selectedDescriptor.formatter](v.value); }); }); // update the size of the chart - chartSvg.attr('width', chartContainer.parentElement?.clientWidth!).attr('height', chartContainer.clientHeight); + const parentElement = chartContainer.parentElement; + if (parentElement) { + chartSvg.attr('width', parentElement.clientWidth).attr('height', chartContainer.clientHeight); + } // update the size of the clipper clipPath.attr('width', width).attr('height', height); @@ -572,7 +574,7 @@ export class StatusHistoryChart { // context area const brushNode: any = control.append('g').attr('class', 'brush').on('click', brushed).call(brush); - if (!!this.brushSelection) { + if (this.brushSelection) { brush = brush.move(brushNode, this.brushSelection); } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html index 4eb0dfb42d..817d10d34e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html @@ -14,12 +14,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -
+

Status History

diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.ts index 92146b328a..5c662808eb 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.ts @@ -80,8 +80,8 @@ export class StatusHistory implements OnInit, AfterViewInit { fieldDescriptors$ = this.store.select(selectStatusHistoryFieldDescriptors); fieldDescriptors: FieldDescriptor[] = []; - minDate: string = ''; - maxDate: string = ''; + minDate = ''; + maxDate = ''; statusHistoryForm: FormGroup; nodeStats: Stats = { @@ -216,8 +216,6 @@ export class StatusHistory implements OnInit, AfterViewInit { protected readonly Object = Object; - private resizeChart() {} - protected readonly TextTip = TextTip; selectNode(event: MatCheckboxChange) { @@ -242,7 +240,7 @@ export class StatusHistory implements OnInit, AfterViewInit { }; } - resized(event: DOMRect) { + resized() { if (this.selectedDescriptor) { // trigger the chart to re-render by changing the selection this.selectedDescriptor = { ...this.selectedDescriptor }; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.spec.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.spec.ts index 4758818f7f..c7355da7c1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.spec.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.spec.ts @@ -20,7 +20,6 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { SystemDiagnosticsDialog } from './system-diagnostics-dialog.component'; import { provideMockStore } from '@ngrx/store/testing'; import { initialSystemDiagnosticsState } from '../../../state/system-diagnostics/system-diagnostics.reducer'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; describe('SystemDiagnosticsDialog', () => { let component: SystemDiagnosticsDialog; @@ -29,10 +28,7 @@ describe('SystemDiagnosticsDialog', () => { beforeEach(() => { TestBed.configureTestingModule({ imports: [SystemDiagnosticsDialog], - providers: [ - { provide: MAT_DIALOG_DATA, useValue: {} }, - provideMockStore({ initialState: initialSystemDiagnosticsState }) - ] + providers: [provideMockStore({ initialState: initialSystemDiagnosticsState })] }); fixture = TestBed.createComponent(SystemDiagnosticsDialog); component = fixture.componentInstance; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.ts index 005f9132ce..df2c504538 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/system-diagnostics-dialog/system-diagnostics-dialog.component.ts @@ -15,16 +15,11 @@ * limitations under the License. */ -import { Component, Inject, OnInit, signal } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { CommonModule, NgForOf } from '@angular/common'; import { MatTabsModule } from '@angular/material/tabs'; -import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; -import { - GarbageCollection, - OpenSystemDiagnosticsDialogRequest, - RepositoryStorageUsage, - SystemDiagnosticsState -} from '../../../state/system-diagnostics'; +import { MatDialogModule } from '@angular/material/dialog'; +import { GarbageCollection, RepositoryStorageUsage, SystemDiagnosticsState } from '../../../state/system-diagnostics'; import { Store } from '@ngrx/store'; import { selectSystemDiagnostics, @@ -34,10 +29,9 @@ import { import { MatButtonModule } from '@angular/material/button'; import { reloadSystemDiagnostics } from '../../../state/system-diagnostics/system-diagnostics.actions'; import { NiFiCommon } from '../../../service/nifi-common.service'; -import { filter } from 'rxjs'; import { TextTip } from '../tooltips/text-tip/text-tip.component'; import { NifiTooltipDirective } from '../tooltips/nifi-tooltip.directive'; -import { TextTipInput } from '../../../state/shared'; +import { isDefinedAndNotNull, TextTipInput } from '../../../state/shared'; import { MatProgressBarModule } from '@angular/material/progress-bar'; @Component({ @@ -63,13 +57,12 @@ export class SystemDiagnosticsDialog implements OnInit { constructor( private store: Store, - private nifiCommon: NiFiCommon, - @Inject(MAT_DIALOG_DATA) public request: OpenSystemDiagnosticsDialogRequest + private nifiCommon: NiFiCommon ) {} ngOnInit(): void { - this.systemDiagnostics$.pipe(filter((diagnostics) => !!diagnostics)).subscribe((diagnostics) => { - const sorted = diagnostics!.aggregateSnapshot.garbageCollection.slice(); + this.systemDiagnostics$.pipe(isDefinedAndNotNull()).subscribe((diagnostics) => { + const sorted = diagnostics.aggregateSnapshot.garbageCollection.slice(); sorted.sort((a, b) => { return this.nifiCommon.compareString(a.name, b.name); }); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.ts index 8b7192a4eb..eecb6cd48e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.ts @@ -27,7 +27,7 @@ import { NgForOf, NgIf } from '@angular/common'; styleUrls: ['./bulletins-tip.component.scss'] }) export class BulletinsTip { - @Input() left: number = 0; - @Input() top: number = 0; + @Input() left = 0; + @Input() top = 0; @Input() data: BulletinsTipInput | undefined; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/controller-service-api-tip/controller-service-api-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/controller-service-api-tip/controller-service-api-tip.component.ts index 9a4f9b24bd..87ee37d633 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/controller-service-api-tip/controller-service-api-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/controller-service-api-tip/controller-service-api-tip.component.ts @@ -28,7 +28,7 @@ import { ControllerServiceApi } from '../../controller-service/controller-servic styleUrls: ['./controller-service-api-tip.component.scss'] }) export class ControllerServiceApiTip { - @Input() left: number = 0; - @Input() top: number = 0; + @Input() left = 0; + @Input() top = 0; @Input() data: ControllerServiceApiTipInput | undefined; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.ts index d4f34ca9e6..d68095801d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.ts @@ -29,8 +29,8 @@ import { ControllerServiceApi } from '../../controller-service/controller-servic styleUrls: ['./el-function-tip.component.scss'] }) export class ElFunctionTip { - @Input() left: number = 0; - @Input() bottom: number = 0; + @Input() left = 0; + @Input() bottom = 0; @Input() data!: ElFunctionTipInput; constructor(private nifiCommon: NiFiCommon) {} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/nifi-tooltip.directive.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/nifi-tooltip.directive.ts index 76f4be59ca..4341199633 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/nifi-tooltip.directive.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/nifi-tooltip.directive.ts @@ -24,19 +24,22 @@ import { ComponentRef, Directive, HostListener, Input, Type, ViewContainerRef } export class NifiTooltipDirective { @Input() tooltipComponentType!: Type; @Input() tooltipInputData: any; - @Input() xOffset: number = 0; // TODO - replace pixel based offset with css transformY to support positioning above/below - @Input() yOffset: number = 0; - @Input() delayClose: boolean = true; + @Input() xOffset = 0; // TODO - replace pixel based offset with css transformY to support positioning above/below + @Input() yOffset = 0; + @Input() delayClose = true; - private closeTimer: number = -1; + private closeTimer = -1; private tooltipRef: ComponentRef | undefined; constructor(private viewContainerRef: ViewContainerRef) {} @HostListener('mouseenter', ['$event']) mouseEnter(event: MouseEvent) { - // @ts-ignore - const { x, y, width, height } = event.currentTarget.getBoundingClientRect(); + if (!event.currentTarget) { + return; + } + const target = event.currentTarget as HTMLElement; + const { x, y, width, height } = target.getBoundingClientRect(); // clear any existing tooltips this.viewContainerRef.clear(); @@ -61,7 +64,7 @@ export class NifiTooltipDirective { } @HostListener('mouseleave', ['$event']) - mouseLeave(event: MouseEvent) { + mouseLeave() { if (this.delayClose) { this.closeTimer = window.setTimeout(() => { this.tooltipRef?.destroy(); diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.ts index 54e3930562..36196f26e9 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.ts @@ -29,8 +29,8 @@ import { ControllerServiceApi } from '../../controller-service/controller-servic styleUrls: ['./parameter-tip.component.scss'] }) export class ParameterTip { - @Input() left: number = 0; - @Input() bottom: number = 0; + @Input() left = 0; + @Input() bottom = 0; @Input() data!: ParameterTipInput; constructor(private nifiCommon: NiFiCommon) {} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-hint-tip/property-hint-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-hint-tip/property-hint-tip.component.ts index c1ea81772f..ae44763611 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-hint-tip/property-hint-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-hint-tip/property-hint-tip.component.ts @@ -28,7 +28,7 @@ import { ControllerServiceApi } from '../../controller-service/controller-servic styleUrls: ['./property-hint-tip.component.scss'] }) export class PropertyHintTip { - @Input() left: number = 0; - @Input() top: number = 0; + @Input() left = 0; + @Input() top = 0; @Input() data: PropertyHintTipInput | undefined; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-tip/property-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-tip/property-tip.component.ts index c99aa63e5a..b8ef06a2d1 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-tip/property-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/property-tip/property-tip.component.ts @@ -29,8 +29,8 @@ import { ControllerServiceApi } from '../../controller-service/controller-servic styleUrls: ['./property-tip.component.scss'] }) export class PropertyTip { - @Input() left: number = 0; - @Input() top: number = 0; + @Input() left = 0; + @Input() top = 0; @Input() data: PropertyTipInput | undefined; constructor(private nifiCommon: NiFiCommon) {} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/restrictions-tip/restrictions-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/restrictions-tip/restrictions-tip.component.ts index bbfaf90c48..3599883089 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/restrictions-tip/restrictions-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/restrictions-tip/restrictions-tip.component.ts @@ -28,8 +28,8 @@ import { NiFiCommon } from '../../../../service/nifi-common.service'; styleUrls: ['./restrictions-tip.component.scss'] }) export class RestrictionsTip { - @Input() left: number = 0; - @Input() top: number = 0; + @Input() left = 0; + @Input() top = 0; @Input() data: RestrictionsTipInput | undefined; constructor(private nifiCommon: NiFiCommon) {} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/text-tip/text-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/text-tip/text-tip.component.ts index 06a8e4e560..bfd8aaa92e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/text-tip/text-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/text-tip/text-tip.component.ts @@ -25,7 +25,7 @@ import { TextTipInput } from '../../../../state/shared'; styleUrls: ['./text-tip.component.scss'] }) export class TextTip { - @Input() left: number = 0; - @Input() top: number = 0; + @Input() left = 0; + @Input() top = 0; @Input() data: TextTipInput | undefined; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/unordered-list-tip/unordered-list-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/unordered-list-tip/unordered-list-tip.component.ts index 11993ddc41..23bc279839 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/unordered-list-tip/unordered-list-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/unordered-list-tip/unordered-list-tip.component.ts @@ -27,7 +27,7 @@ import { NgForOf } from '@angular/common'; styleUrls: ['./unordered-list-tip.component.scss'] }) export class UnorderedListTip { - @Input() left: number = 0; - @Input() top: number = 0; + @Input() left = 0; + @Input() top = 0; @Input() data: UnorderedListTipInput | undefined; } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/validation-errors-tip/validation-errors-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/validation-errors-tip/validation-errors-tip.component.ts index 3922d90635..a580244b7e 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/validation-errors-tip/validation-errors-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/validation-errors-tip/validation-errors-tip.component.ts @@ -27,7 +27,7 @@ import { NgForOf, NgIf } from '@angular/common'; styleUrls: ['./validation-errors-tip.component.scss'] }) export class ValidationErrorsTip { - @Input() left: number = 0; - @Input() top: number = 0; + @Input() left = 0; + @Input() top = 0; @Input() data: ValidationErrorsTipInput | undefined; }