Apache
/
nifi
mirror of https://github.com/apache/nifi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NIFI-12586: Fix handling of getParameters in NF Editor (#8223) 

* NIFI-12586:
- Fixing the handling of getParameters since the supplied input could be undefined in some instances.

* NIFI-12586:
- Removing unused event.
This commit is contained in:
Matt Gilman 2024-01-09 11:49:23 -05:00 committed by GitHub
parent bbd8d7fd8d
commit 3eba8334ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
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.html
View File

@ -15,7 +15,7 @@
~ limitations under the License.
-->
<div class="property-editor p-4" [style.width.px]="width" cdkDrag resizable (resized)="resized($event)">
<div class="property-editor p-4" [style.width.px]="width" cdkDrag resizable (resized)="resized()">
<form class="h-full" [formGroup]="nfEditorForm" cdkTrapFocus cdkTrapFocusAutoCapture>
<div class="flex flex-col gap-y-3 h-full">
<div class="flex justify-end">

23
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
View File

@ -76,7 +76,6 @@ export class NfEditor implements OnDestroy {
}
@Input() set getParameters(getParameters: (sensitive: boolean) => Observable<Parameter[]>) {
this.supportsParameters = true;
this._getParameters = getParameters;
this.getParametersSet = true;
@ -128,6 +127,8 @@ export class NfEditor implements OnDestroy {
if (this.getParametersSet) {
if (this._getParameters) {
this.supportsParameters = true;
this._getParameters(this.sensitive)
.pipe(take(1))
.subscribe((parameters) => {
@ -142,25 +143,17 @@ export class NfEditor implements OnDestroy {
}
});
} else {
this.supportsParameters = false;
this.nfel.disableParameters();
this.nfpr.disableParameters();
if (this.supportsEl) {
this.nfel.enableParameters();
this.nfel.setParameters([]);
this.nfel.configureAutocomplete();
} else {
this.nfpr.enableParameters();
this.nfpr.setParameters([]);
this.nfpr.configureAutocomplete();
}
}
} else {
this.nfel.disableParameters();
this.nfpr.disableParameters();
if (this.supportsEl) {
this.nfel.configureAutocomplete();
} else {
this.nfpr.configureAutocomplete();
}
}
}
}
@ -181,7 +174,7 @@ export class NfEditor implements OnDestroy {
};
}
resized(rect: DOMRect): void {
resized(): void {
this.editor.setSize('100%', '100%');
}