diff --git a/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-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 687dd48f45..85de7fe45c 100644 --- a/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-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 @@ -28,7 +28,6 @@ import { MatSelectModule } from '@angular/material/select'; import { Observable } from 'rxjs'; import { ParameterContextEntity, SelectOption } from '../../../../../../../state/shared'; import { Client } from '../../../../../../../service/client.service'; -import { PropertyTable } from '../../../../../../../ui/common/property-table/property-table.component'; import { NifiSpinnerDirective } from '../../../../../../../ui/common/spinner/nifi-spinner.directive'; import { NifiTooltipDirective } from '../../../../../../../ui/common/tooltips/nifi-tooltip.directive'; import { TextTip } from '../../../../../../../ui/common/tooltips/text-tip/text-tip.component'; @@ -51,7 +50,6 @@ import { ErrorBanner } from '../../../../../../../ui/common/error-banner/error-b MatOptionModule, MatSelectModule, AsyncPipe, - PropertyTable, NifiSpinnerDirective, NifiTooltipDirective, FormsModule, diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/edit-processor.component.spec.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/edit-processor.component.spec.ts index 1ba82720c0..f40f543a61 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/edit-processor.component.spec.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/edit-processor.component.spec.ts @@ -27,6 +27,8 @@ import { provideMockStore } from '@ngrx/store/testing'; import { initialState } from '../../../../../../../state/error/error.reducer'; import { ClusterConnectionService } from '../../../../../../../service/cluster-connection.service'; +import 'codemirror/addon/hint/show-hint'; + describe('EditProcessor', () => { let component: EditProcessor; let fixture: ComponentFixture; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.spec.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.spec.ts index 6c89bf0c5d..17ad6bd694 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.spec.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component.spec.ts @@ -27,6 +27,8 @@ import { initialState } from '../../../state/parameter-context-listing/parameter import { ClusterConnectionService } from '../../../../../service/cluster-connection.service'; import { ParameterContextEntity } from '../../../../../state/shared'; +import 'codemirror/addon/hint/show-hint'; + describe('EditParameterContext', () => { let component: EditParameterContext; let fixture: ComponentFixture; diff --git a/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.spec.ts b/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.spec.ts index 8eb895678d..dd1b16bf78 100644 --- a/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.spec.ts +++ b/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.spec.ts @@ -26,6 +26,8 @@ import { provideMockStore } from '@ngrx/store/testing'; import { initialState } from '../../../../../state/error/error.reducer'; import { ClusterConnectionService } from '../../../../../service/cluster-connection.service'; +import 'codemirror/addon/hint/show-hint'; + describe('EditFlowAnalysisRule', () => { let component: EditFlowAnalysisRule; let fixture: ComponentFixture; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.spec.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.spec.ts index 7eaeb44662..03f832a8bd 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.spec.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/registry-clients/edit-registry-client/edit-registry-client.component.spec.ts @@ -26,6 +26,8 @@ import { provideMockStore } from '@ngrx/store/testing'; import { initialState } from '../../../../../state/error/error.reducer'; import { ClusterConnectionService } from '../../../../../service/cluster-connection.service'; +import 'codemirror/addon/hint/show-hint'; + describe('EditRegistryClient', () => { let component: EditRegistryClient; let fixture: ComponentFixture; diff --git a/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.spec.ts b/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.spec.ts index 095096b8a9..122df2437f 100644 --- a/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.spec.ts +++ b/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.spec.ts @@ -26,6 +26,8 @@ import { provideMockStore } from '@ngrx/store/testing'; import { initialState } from '../../../../../state/error/error.reducer'; import { ClusterConnectionService } from '../../../../../service/cluster-connection.service'; +import 'codemirror/addon/hint/show-hint'; + describe('EditReportingTask', () => { let component: EditReportingTask; let fixture: ComponentFixture; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.ts index e6d4b72fd7..24fbc2c19d 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/disable-controller-service/disable-controller-service.component.ts @@ -28,7 +28,6 @@ import { AsyncPipe, NgTemplateOutlet } from '@angular/common'; import { MatTabsModule } from '@angular/material/tabs'; import { MatOptionModule } from '@angular/material/core'; import { MatSelectModule } from '@angular/material/select'; -import { PropertyTable } from '../../property-table/property-table.component'; import { ControllerServiceApi } from '../controller-service-api/controller-service-api.component'; import { ControllerServiceReferences } from '../controller-service-references/controller-service-references.component'; import { NifiSpinnerDirective } from '../../spinner/nifi-spinner.directive'; @@ -59,7 +58,6 @@ import { MatTabsModule, MatOptionModule, MatSelectModule, - PropertyTable, ControllerServiceApi, ControllerServiceReferences, AsyncPipe, diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.spec.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.spec.ts index 004be53f3a..f82f7a523a 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.spec.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/edit-controller-service/edit-controller-service.component.spec.ts @@ -26,6 +26,8 @@ import { provideMockStore } from '@ngrx/store/testing'; import { initialState } from '../../../../state/error/error.reducer'; import { ClusterConnectionService } from '../../../../service/cluster-connection.service'; +import 'codemirror/addon/hint/show-hint'; + describe('EditControllerService', () => { let component: EditControllerService; let fixture: ComponentFixture; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.ts index d6faedecdc..d06b698fd5 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/controller-service/enable-controller-service/enable-controller-service.component.ts @@ -30,7 +30,6 @@ import { AsyncPipe, NgTemplateOutlet } from '@angular/common'; import { MatTabsModule } from '@angular/material/tabs'; import { MatOptionModule } from '@angular/material/core'; import { MatSelectModule } from '@angular/material/select'; -import { PropertyTable } from '../../property-table/property-table.component'; import { ControllerServiceApi } from '../controller-service-api/controller-service-api.component'; import { ControllerServiceReferences } from '../controller-service-references/controller-service-references.component'; import { NifiSpinnerDirective } from '../../spinner/nifi-spinner.directive'; @@ -67,7 +66,6 @@ import { MatTabsModule, MatOptionModule, MatSelectModule, - PropertyTable, ControllerServiceApi, ControllerServiceReferences, AsyncPipe, diff --git a/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-theme.scss b/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-theme.scss index 24d2c44116..62f7f9a9ff 100644 --- a/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-theme.scss +++ b/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-theme.scss @@ -61,17 +61,14 @@ @include mat.button-density(-1); .nf-editor { + border-color: var(--mdc-outlined-text-field-label-text-color); + + &.blank { + border-color: var(--mdc-outlined-text-field-disabled-label-text-color); + } + .CodeMirror { background-color: if($is-dark, $nifi-theme-surface-palette-darker, $nifi-theme-surface-palette-lighter); - - &.blank { - background: $material-theme-primary-palette-default; - color: if( - $is-dark, - $material-theme-primary-palette-darker, - $material-theme-primary-palette-lighter - ); - } } .CodeMirror-code { diff --git a/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-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 711c8ee553..9b474bc711 100644 --- a/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-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/editors/nf-editor/modes/nfel.ts @@ -18,7 +18,6 @@ import { ComponentRef, Injectable, Renderer2, ViewContainerRef } from '@angular/core'; import * as CodeMirror from 'codemirror'; import { Editor, Hint, Hints, StringStream } from 'codemirror'; -import 'codemirror/addon/hint/show-hint'; import { ElFunction, Parameter } from '../../../../../../state/shared'; import { ParameterTip } from '../../../../tooltips/parameter-tip/parameter-tip.component'; import { ElService } from './el.service'; diff --git a/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 b/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 index 70068a8cbf..c33df55089 100644 --- a/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 +++ b/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 @@ -21,7 +21,7 @@ cdkDrag resizable (resized)="resized()"> -
+
-
+
diff --git a/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.scss b/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.scss index 4059149d78..5009a67920 100644 --- a/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.scss +++ b/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.scss @@ -31,7 +31,8 @@ .nf-editor { min-height: 100px; min-width: 210px; - border: 1px solid; + border-width: 1px; + border-style: solid; cursor: default; .CodeMirror { @@ -40,11 +41,6 @@ font-family: monospace; cursor: default; line-height: normal; - - &.blank { - border-width: 1px; - border-style: solid; - } } .CodeMirror-scroll { diff --git a/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-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 5877052e85..9a83dc43a5 100644 --- a/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-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 @@ -21,6 +21,8 @@ import { NfEditor } from './nf-editor.component'; import { HttpClientTestingModule } from '@angular/common/http/testing'; import { PropertyItem } from '../../property-table.component'; +import 'codemirror/addon/hint/show-hint'; + describe('NfEditor', () => { let component: NfEditor; let fixture: ComponentFixture; diff --git a/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-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 1cecd2f2ad..9764dba5da 100644 --- a/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-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 @@ -57,15 +57,16 @@ import { Resizable } from '../../../resizable/resizable.component'; export class NfEditor implements OnDestroy { @Input() set item(item: PropertyItem) { this.nfEditorForm.get('value')?.setValue(item.value); - - const isEmptyString: boolean = item.value == ''; - this.nfEditorForm.get('setEmptyString')?.setValue(isEmptyString); - if (isEmptyString) { - this.nfEditorForm.get('value')?.disable(); + if (item.descriptor.required) { + this.nfEditorForm.get('value')?.addValidators(Validators.required); } else { - this.nfEditorForm.get('value')?.enable(); + this.nfEditorForm.get('value')?.removeValidators(Validators.required); } + const isEmptyString: boolean = item.value === ''; + this.nfEditorForm.get('setEmptyString')?.setValue(isEmptyString); + this.setEmptyStringChanged(); + this.supportsEl = item.descriptor.supportsEl; this.sensitive = item.descriptor.sensitive; this.mode = this.supportsEl ? this.nfel.getLanguageId() : this.nfpr.getLanguageId(); @@ -83,7 +84,7 @@ export class NfEditor implements OnDestroy { @Input() width!: number; @Input() readonly: boolean = false; - @Output() ok: EventEmitter = new EventEmitter(); + @Output() ok: EventEmitter = new EventEmitter(); @Output() cancel: EventEmitter = new EventEmitter(); protected readonly PropertyHintTip = PropertyHintTip; @@ -95,6 +96,7 @@ export class NfEditor implements OnDestroy { sensitive = false; supportsEl = false; supportsParameters = false; + blank = false; mode!: string; _parameters!: Parameter[]; @@ -109,7 +111,7 @@ export class NfEditor implements OnDestroy { private nfpr: NfPr ) { this.nfEditorForm = this.formBuilder.group({ - value: new FormControl('', Validators.required), + value: new FormControl(''), setEmptyString: new FormControl(false) }); } @@ -117,7 +119,17 @@ export class NfEditor implements OnDestroy { codeMirrorLoaded(codeEditor: any): void { this.editor = codeEditor.codeMirror; this.editor.setSize('100%', '100%'); - this.editor.execCommand('selectAll'); + + if (!this.readonly) { + this.editor.execCommand('selectAll'); + } + + // disabling of the input through the form isn't supported until codemirror + // has loaded so we must disable again if the value is an empty string + if (this.nfEditorForm.get('setEmptyString')?.value) { + this.nfEditorForm.get('value')?.disable(); + this.editor.setOption('readOnly', 'nocursor'); + } } loadParameters(): void { @@ -164,7 +176,9 @@ export class NfEditor implements OnDestroy { extraKeys: { 'Ctrl-Space': 'autocomplete', Enter: () => { - this.okClicked(); + if (this.nfEditorForm.dirty && this.nfEditorForm.valid) { + this.okClicked(); + } } } }; @@ -188,6 +202,8 @@ export class NfEditor implements OnDestroy { setEmptyStringChanged(): void { const emptyStringChecked: AbstractControl | null = this.nfEditorForm.get('setEmptyString'); if (emptyStringChecked) { + this.blank = emptyStringChecked.value; + if (emptyStringChecked.value) { this.nfEditorForm.get('value')?.setValue(''); this.nfEditorForm.get('value')?.disable(); @@ -207,8 +223,18 @@ export class NfEditor implements OnDestroy { okClicked(): void { const valueControl: AbstractControl | null = this.nfEditorForm.get('value'); - if (valueControl) { - this.ok.next(valueControl.value); + const emptyStringChecked: AbstractControl | null = this.nfEditorForm.get('setEmptyString'); + if (valueControl && emptyStringChecked) { + const value = valueControl.value; + if (value === '') { + if (emptyStringChecked.value) { + this.ok.next(''); + } else { + this.ok.next(null); + } + } else { + this.ok.next(value); + } } } diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.spec.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.spec.ts index bcc1ebbd29..4efcba2acd 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.spec.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.spec.ts @@ -19,6 +19,8 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { PropertyTable } from './property-table.component'; +import 'codemirror/addon/hint/show-hint'; + describe('PropertyTable', () => { let component: PropertyTable; let fixture: ComponentFixture; diff --git a/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-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.ts index def4fc1264..39c6261d02 100644 --- a/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-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/property-table/property-table.component.ts @@ -554,7 +554,7 @@ export class PropertyTable implements AfterViewInit, ControlValueAccessor { } } - savePropertyValue(item: PropertyItem, newValue: string): void { + savePropertyValue(item: PropertyItem, newValue: string | null): void { if (item.value != newValue) { item.value = newValue; item.dirty = true; diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/main.ts b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/main.ts index b6eaeef9ed..2d0bdf4ada 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/main.ts +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/main.ts @@ -19,6 +19,15 @@ import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; import { AppModule } from './app/app.module'; +import 'codemirror/addon/edit/matchbrackets'; +import 'codemirror/addon/fold/brace-fold'; +import 'codemirror/addon/fold/comment-fold'; +import 'codemirror/addon/fold/foldcode'; +import 'codemirror/addon/fold/foldgutter'; +import 'codemirror/addon/fold/markdown-fold'; +import 'codemirror/addon/fold/xml-fold'; +import 'codemirror/addon/hint/show-hint'; + platformBrowserDynamic() .bootstrapModule(AppModule) .catch((err) => console.error(err));