scottyaslan commented on code in PR #9561: URL: https://github.com/apache/nifi/pull/9561#discussion_r1882741694
########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/condition-table/condition-table.component.html: ########## @@ -0,0 +1,116 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<div class="condition-table flex flex-col h-full gap-y-2"> + <div class="flex justify-between items-center"> + <div>Conditions</div> + @if (!isDisabled) { + <button mat-icon-button class="primary-icon-button" type="button" (click)="newConditionClicked()"> + <i class="fa fa-plus"></i> + </button> + } + </div> + @if (hasConditions()) { + <div class="border"> + <table mat-table [dataSource]="dataSource"> + <!-- Expression Column --> + <ng-container matColumnDef="expression"> + <th mat-header-cell *matHeaderCellDef>Expression</th> + <td mat-cell *matCellDef="let item"> + <div + [id]="formatId(item)" + class="pointer min-h-[21px]" + cdkOverlayOrigin + #trigger="cdkOverlayOrigin" + (click)="openEditor(trigger, item, $event)"> + <ng-container + *ngTemplateOutlet=" + isEmptyString(item.condition.expression) ? blank : nonBlank; + context: { $implicit: item.condition.expression } + "></ng-container> + <ng-template #blank> + <div class="empty neutral-color">Empty string set</div> + </ng-template> + <ng-template #nonBlank let-expression> + <div class="flex justify-between items-center"> + <div class="whitespace-nowrap overflow-hidden text-ellipsis" [title]="expression"> Review Comment: ```suggestion <div class="truncate" [title]="expression"> ``` ########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/action-table/action-table.component.html: ########## @@ -0,0 +1,160 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<div class="action-table flex flex-col h-full gap-y-2"> + <div class="flex justify-between items-center"> + <div>Actions</div> + @if (!isDisabled) { + <button mat-icon-button class="primary-icon-button" type="button" (click)="newActionClicked()"> + <i class="fa fa-plus"></i> + </button> + } + </div> + @if (hasActions()) { + <div class="border"> + <table mat-table [dataSource]="dataSource"> + <!-- attribute Column --> + <ng-container matColumnDef="attribute"> + <th mat-header-cell *matHeaderCellDef>Attribute</th> + <td mat-cell *matCellDef="let item"> + <div + [id]="formatId(item)" + class="pointer min-h-[21px]" + cdkOverlayOrigin + #trigger="cdkOverlayOrigin" + (click)="openAttributeEditor(trigger, item, $event)"> + <ng-container + *ngTemplateOutlet=" + renderValue; + context: { $implicit: item.action.attribute } + "></ng-container> + </div> + </td> + </ng-container> + + <!-- value Column --> + <ng-container matColumnDef="value"> + <th mat-header-cell *matHeaderCellDef>Value</th> + <td mat-cell *matCellDef="let item"> + <div + [id]="formatId(item)" + class="pointer min-h-[21px]" + cdkOverlayOrigin + #trigger="cdkOverlayOrigin" + (click)="openValueEditor(trigger, item, $event)"> + <ng-container + *ngTemplateOutlet=" + renderValue; + context: { $implicit: item.action.value } + "></ng-container> + </div> + </td> + </ng-container> + + <!-- Actions Column --> + <ng-container matColumnDef="actions"> + <th mat-header-cell *matHeaderCellDef></th> + <td mat-cell *matCellDef="let item"> + <div class="flex items-center justify-end"> + <button + mat-icon-button + type="button" + [matMenuTriggerFor]="actionMenu" + class="h-16 w-16 flex items-center justify-center icon global-menu"> + <i class="fa fa-ellipsis-v"></i> + </button> + <mat-menu #actionMenu="matMenu" xPosition="before"> + <button mat-menu-item (click)="deleteAction(item)"> + <i class="fa fa-trash primary-color mr-2"></i> + Delete + </button> + </mat-menu> + </div> + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></tr> + <tr + mat-row + *matRowDef="let row; let even = even; columns: displayedColumns" + (click)="selectAction(row)" + [class.selected]="isSelected(row)" + [class.even]="even"></tr> + </table> + <ng-template #renderValue let-value> + <ng-container + *ngTemplateOutlet=" + isEmptyString(value) ? blank : nonBlank; + context: { $implicit: value } + "></ng-container> + <ng-template #blank> + <div class="empty neutral-color">Empty string set</div> + </ng-template> + <ng-template #nonBlank let-expression> + <div class="flex justify-between items-center"> + <div class="whitespace-nowrap overflow-hidden text-ellipsis" [title]="expression"> Review Comment: ```suggestion <div class="truncate" [title]="expression"> ``` ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/registry-clients/index.ts: ########## @@ -15,7 +15,8 @@ * limitations under the License. */ -import { Bundle, DocumentedType, RegistryClientEntity, Revision } from '../../../../state/shared'; +import { Bundle, DocumentedType, RegistryClientEntity } from '../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/edit-tenant/edit-tenant-dialog.component.ts: ########## @@ -17,7 +17,7 @@ import { Component, EventEmitter, Inject, Input, Output } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; -import { EditTenantRequest, EditTenantResponse, Revision, UserEntity, UserGroupEntity } from '../../../state/shared'; +import { EditTenantRequest, EditTenantResponse, UserEntity, UserGroupEntity } from '../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/service/canvas-utils.service.ts: ########## @@ -32,9 +32,8 @@ import { initialState as initialFlowState } from '../state/flow/flow.reducer'; import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; import { BulletinsTip } from '../../../ui/common/tooltips/bulletins-tip/bulletins-tip.component'; import { BreadcrumbEntity, Position } from '../state/shared'; -import { ComponentType } from 'libs/shared/src'; -import { BulletinEntity, ParameterContextReferenceEntity, Permissions } from '../../../state/shared'; -import { NiFiCommon } from '@nifi/shared'; +import { BulletinEntity, ComponentType, ParameterContextReferenceEntity } from 'libs/shared/src'; Review Comment: Can these be imported from @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/rule-listing/rule-listing.component.html: ########## @@ -0,0 +1,175 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +@if (rulesList.length === 0 && !newRule) { + <div class="h-full flex justify-center items-center gap-x-4"> + @if (isEditable) { + <div>No rules configured for this Processor. Get started by defining your first.</div> + <button mat-flat-button (click)="populateNewRule()">Create Rule</button> + } @else { + <div>No rules configured for this Processor.</div> + } + </div> +} @else { + <div class="rule-listing flex flex-col gap-y-4"> + @if (rulesList.length > 0 || !newRule) { + <div class="flex flex-col gap-y-1"> + <div class="flex gap-x-1 items-center"> + <div>Use original FlowFile for matching rules</div> + <form [formGroup]="flowFilePolicyForm"> + <mat-slide-toggle + formControlName="useOriginalFlowFilePolicy" + (change)="flowFilePolicyToggled($event)"></mat-slide-toggle> + </form> + </div> + <div class="text-sm">If disabled rules will be executed using a clone of the original FlowFile</div> + </div> + } + <div class="h-10 flex justify-between items-center"> Review Comment: ```suggestion <div class="flex justify-between items-center"> ``` ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/flow/index.ts: ########## @@ -17,21 +17,24 @@ import { BreadcrumbEntity, Position } from '../shared'; import { - BulletinEntity, Bundle, ComponentHistory, DocumentedType, ParameterContextEntity, - ParameterContextReferenceEntity, - Permissions, RegistryClientEntity, - Revision, SparseVersionedFlow, VersionedFlowSnapshotMetadataEntity } from '../../../../state/shared'; import { HttpErrorResponse } from '@angular/common/http'; import { BackNavigation } from '../../../../state/navigation'; -import { ComponentType, SelectOption } from 'libs/shared/src'; +import { + BulletinEntity, + ComponentType, + ParameterContextReferenceEntity, + Permissions, + Revision, + SelectOption +} from 'libs/shared/src'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/action-table/action-table.component.html: ########## @@ -0,0 +1,160 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> + +<div class="action-table flex flex-col h-full gap-y-2"> + <div class="flex justify-between items-center"> + <div>Actions</div> + @if (!isDisabled) { + <button mat-icon-button class="primary-icon-button" type="button" (click)="newActionClicked()"> + <i class="fa fa-plus"></i> + </button> + } + </div> + @if (hasActions()) { + <div class="border"> + <table mat-table [dataSource]="dataSource"> + <!-- attribute Column --> + <ng-container matColumnDef="attribute"> + <th mat-header-cell *matHeaderCellDef>Attribute</th> + <td mat-cell *matCellDef="let item"> + <div + [id]="formatId(item)" + class="pointer min-h-[21px]" + cdkOverlayOrigin + #trigger="cdkOverlayOrigin" + (click)="openAttributeEditor(trigger, item, $event)"> + <ng-container + *ngTemplateOutlet=" + renderValue; + context: { $implicit: item.action.attribute } + "></ng-container> + </div> + </td> + </ng-container> + + <!-- value Column --> + <ng-container matColumnDef="value"> + <th mat-header-cell *matHeaderCellDef>Value</th> + <td mat-cell *matCellDef="let item"> + <div + [id]="formatId(item)" + class="pointer min-h-[21px]" + cdkOverlayOrigin + #trigger="cdkOverlayOrigin" + (click)="openValueEditor(trigger, item, $event)"> + <ng-container + *ngTemplateOutlet=" + renderValue; + context: { $implicit: item.action.value } + "></ng-container> + </div> + </td> + </ng-container> + + <!-- Actions Column --> + <ng-container matColumnDef="actions"> + <th mat-header-cell *matHeaderCellDef></th> + <td mat-cell *matCellDef="let item"> + <div class="flex items-center justify-end"> + <button + mat-icon-button + type="button" + [matMenuTriggerFor]="actionMenu" + class="h-16 w-16 flex items-center justify-center icon global-menu"> + <i class="fa fa-ellipsis-v"></i> + </button> + <mat-menu #actionMenu="matMenu" xPosition="before"> + <button mat-menu-item (click)="deleteAction(item)"> + <i class="fa fa-trash primary-color mr-2"></i> + Delete + </button> + </mat-menu> + </div> + </td> + </ng-container> + + <tr mat-header-row *matHeaderRowDef="displayedColumns; sticky: true"></tr> + <tr + mat-row + *matRowDef="let row; let even = even; columns: displayedColumns" + (click)="selectAction(row)" + [class.selected]="isSelected(row)" + [class.even]="even"></tr> + </table> + <ng-template #renderValue let-value> + <ng-container + *ngTemplateOutlet=" + isEmptyString(value) ? blank : nonBlank; + context: { $implicit: value } + "></ng-container> + <ng-template #blank> + <div class="empty neutral-color">Empty string set</div> + </ng-template> + <ng-template #nonBlank let-expression> + <div class="flex justify-between items-center"> Review Comment: There appears to be some text overflow issues: <img width="1416" alt="Screenshot 2024-12-12 at 12 01 43 PM" src="https://github.com/user-attachments/assets/3323f6ea-61d5-4306-b515-f269ce9edeb4"; /> ########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/rule-listing/rule-listing.component.html: ########## @@ -0,0 +1,175 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +@if (rulesList.length === 0 && !newRule) { + <div class="h-full flex justify-center items-center gap-x-4"> + @if (isEditable) { + <div>No rules configured for this Processor. Get started by defining your first.</div> + <button mat-flat-button (click)="populateNewRule()">Create Rule</button> + } @else { + <div>No rules configured for this Processor.</div> + } + </div> +} @else { + <div class="rule-listing flex flex-col gap-y-4"> + @if (rulesList.length > 0 || !newRule) { + <div class="flex flex-col gap-y-1"> + <div class="flex gap-x-1 items-center"> + <div>Use original FlowFile for matching rules</div> + <form [formGroup]="flowFilePolicyForm"> + <mat-slide-toggle + formControlName="useOriginalFlowFilePolicy" + (change)="flowFilePolicyToggled($event)"></mat-slide-toggle> + </form> + </div> + <div class="text-sm">If disabled rules will be executed using a clone of the original FlowFile</div> Review Comment: ```suggestion <div class="text-sm">If disabled rules will use a clone of the original FlowFile and will execute in the same order.</div> ``` ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/flow-analysis/index.ts: ########## @@ -15,7 +15,8 @@ * limitations under the License. */ -import { PropertyDescriptor, Bundle, Permissions } from '../../../../state/shared'; +import { PropertyDescriptor, Bundle } from '../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/items/processor/edit-processor/edit-processor.component.ts: ########## @@ -37,13 +37,11 @@ import { MatOptionModule } from '@angular/material/core'; import { MatSelectModule } from '@angular/material/select'; import { Observable, of } from 'rxjs'; import { - BulletinEntity, BulletinsTipInput, InlineServiceCreationRequest, InlineServiceCreationResponse, ParameterContextEntity, - Property, - Revision + Property } from '../../../../../../../state/shared'; Review Comment: @nifi/shared ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/state/controller-services/index.ts: ########## @@ -15,8 +15,9 @@ * limitations under the License. */ -import { ControllerServiceEntity, ParameterContextReferenceEntity } from '../../../../state/shared'; +import { ControllerServiceEntity } from '../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.ts: ########## @@ -19,10 +19,10 @@ import { Component, Input } from '@angular/core'; import { ControllerStatus } from '../../../../state/flow'; import { initialState } from '../../../../state/flow/flow.reducer'; import { BulletinsTip } from '../../../../../../ui/common/tooltips/bulletins-tip/bulletins-tip.component'; -import { BulletinEntity, BulletinsTipInput } from '../../../../../../state/shared'; +import { BulletinsTipInput } from '../../../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.effects.ts: ########## @@ -39,20 +39,15 @@ import { Store } from '@ngrx/store'; import { NiFiState } from '../../../../state'; import { Router } from '@angular/router'; import { ParameterContextService } from '../../service/parameter-contexts.service'; -import { YesNoDialog } from '../../../../ui/common/yes-no-dialog/yes-no-dialog.component'; +import { Parameter, YesNoDialog } from '@nifi/shared'; import { EditParameterContext } from '../../ui/parameter-context-listing/edit-parameter-context/edit-parameter-context.component'; import { selectParameterContexts, selectParameterContextStatus, selectSaving, selectUpdateRequest } from './parameter-context-listing.selectors'; -import { - EditParameterRequest, - EditParameterResponse, - Parameter, - ParameterContextUpdateRequest -} from '../../../../state/shared'; +import { EditParameterRequest, EditParameterResponse, ParameterContextUpdateRequest } from '../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/flow-analysis-rules/index.ts: ########## @@ -15,14 +15,8 @@ * limitations under the License. */ -import { - BulletinEntity, - Bundle, - ComponentHistory, - DocumentedType, - Permissions, - Revision -} from '../../../../state/shared'; +import { Bundle, ComponentHistory, DocumentedType } from '../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-inheritance/parameter-context-inheritance.component.ts: ########## @@ -20,12 +20,9 @@ import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatDialogModule } from '@angular/material/dialog'; import { MatTableModule } from '@angular/material/table'; -import { AsyncPipe, NgTemplateOutlet } from '@angular/common'; -import { CdkConnectedOverlay, CdkOverlayOrigin } from '@angular/cdk/overlay'; -import { RouterLink } from '@angular/router'; -import { ParameterContextEntity, ParameterContextReferenceEntity } from '../../../../../state/shared'; -import { NifiTooltipDirective, NiFiCommon, TextTip } from '@nifi/shared'; -import { ParameterReferences } from '../../../../../ui/common/parameter-references/parameter-references.component'; +import { NgTemplateOutlet } from '@angular/common'; +import { ParameterContextEntity } from '../../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/parameter-providers/edit-parameter-provider/edit-parameter-provider.component.ts: ########## @@ -22,12 +22,7 @@ import { MatTabsModule } from '@angular/material/tabs'; import { MatButtonModule } from '@angular/material/button'; import { NifiSpinnerDirective } from '../../../../../ui/common/spinner/nifi-spinner.directive'; import { Observable, of } from 'rxjs'; -import { - InlineServiceCreationRequest, - InlineServiceCreationResponse, - ParameterContextReferenceEntity, - Property -} from '../../../../../state/shared'; +import { InlineServiceCreationRequest, InlineServiceCreationResponse, Property } from '../../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/state/parameter-context-listing/parameter-context-listing.reducer.ts: ########## @@ -32,7 +32,8 @@ import { submitParameterContextUpdateRequestSuccess, deleteParameterContextUpdateRequestSuccess } from './parameter-context-listing.actions'; -import { ParameterContextUpdateRequestEntity, Revision } from '../../../../state/shared'; +import { ParameterContextUpdateRequestEntity } from '../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/users/state/user-listing/index.ts: ########## @@ -15,7 +15,8 @@ * limitations under the License. */ -import { AccessPolicySummaryEntity, Revision, UserEntity, UserGroupEntity } from '../../../../state/shared'; +import { AccessPolicySummaryEntity, UserEntity, UserGroupEntity } from '../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/state/reporting-tasks/index.ts: ########## @@ -15,14 +15,8 @@ * limitations under the License. */ -import { - BulletinEntity, - Bundle, - ComponentHistory, - DocumentedType, - Permissions, - Revision -} from '../../../../state/shared'; +import { Bundle, ComponentHistory, DocumentedType } from '../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-table/parameter-table.component.ts: ########## @@ -23,8 +23,8 @@ import { MatTableDataSource, MatTableModule } from '@angular/material/table'; import { AsyncPipe, NgTemplateOutlet } from '@angular/common'; import { CdkConnectedOverlay, CdkOverlayOrigin } from '@angular/cdk/overlay'; import { RouterLink } from '@angular/router'; -import { EditParameterResponse, Parameter, ParameterEntity } from '../../../../../state/shared'; -import { NifiTooltipDirective, NiFiCommon, TextTip } from '@nifi/shared'; +import { EditParameterResponse, ParameterEntity } from '../../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/edit-parameter-dialog/edit-parameter-dialog.component.ts: ########## @@ -17,7 +17,7 @@ import { Component, EventEmitter, Inject, Input, Output } from '@angular/core'; import { MAT_DIALOG_DATA, MatDialogModule } from '@angular/material/dialog'; -import { EditParameterRequest, EditParameterResponse, Parameter } from '../../../state/shared'; +import { EditParameterRequest, EditParameterResponse } from '../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/property-table/editors/combo-editor/combo-editor.component.ts: ########## @@ -24,10 +24,10 @@ import { MatInputModule } from '@angular/material/input'; import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxModule } from '@angular/material/checkbox'; import { NgForOf, NgIf } from '@angular/common'; -import { AllowableValue, Parameter, ParameterConfig, PropertyDescriptor } from '../../../../../state/shared'; +import { AllowableValue, ParameterConfig, PropertyDescriptor } from '../../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/property-table/editors/nf-editor/nf-editor.component.ts: ########## @@ -17,39 +17,35 @@ import { Component, EventEmitter, Input, OnDestroy, Output, Renderer2, ViewContainerRef } from '@angular/core'; import { PropertyItem } from '../../property-table.component'; -import { CdkDrag, CdkDragHandle } from '@angular/cdk/drag-drop'; +import { CdkDrag } from '@angular/cdk/drag-drop'; import { AbstractControl, FormBuilder, FormControl, FormGroup, ReactiveFormsModule, Validators } from '@angular/forms'; import { MatDialogModule } from '@angular/material/dialog'; import { MatInputModule } from '@angular/material/input'; import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxModule } from '@angular/material/checkbox'; -import { NgTemplateOutlet } from '@angular/common'; -import { NifiTooltipDirective, Resizable } from '@nifi/shared'; -import { PropertyHintTip } from '../../../tooltips/property-hint-tip/property-hint-tip.component'; -import { Parameter, ParameterConfig, PropertyHintTipInput } from '../../../../../state/shared'; +import { Resizable, Parameter, PropertyHint } from '@nifi/shared'; +import { ParameterConfig } from '../../../../../state/shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/state/current-user/index.ts: ########## @@ -15,7 +15,8 @@ * limitations under the License. */ -import { Permissions, RequiredPermission } from '../shared'; +import { RequiredPermission } from '../shared'; Review Comment: @nifi/shared? ########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/edit-rule/edit-rule.component.html: ########## @@ -0,0 +1,68 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<form [formGroup]="editRuleForm"> + <div class="mt-2 flex flex-col gap-y-4"> + <div class="flex"> + <div class="w-1/2"> + <mat-form-field> + <mat-label>Name</mat-label> + <input matInput type="text" [readonly]="!isEditable" formControlName="name" /> + @if (nameControl.invalid) { + <mat-error>{{ getNameErrorMessage() }}</mat-error> + } + </mat-form-field> + </div> + </div> + <div class="flex"> + <div class="w-1/2"> + <mat-form-field class="w-1/2"> + <mat-label>Comments</mat-label> + <textarea matInput [readonly]="!isEditable" formControlName="comments" type="text"></textarea> + </mat-form-field> + </div> + </div> + <condition-table formControlName="conditions" [isNew]="!id"></condition-table> + <action-table formControlName="actions" [isNew]="!id"></action-table> + <div class="flex justify-end gap-x-2"> + @if (isEditable) { + <button type="button" (click)="cancelClicked()" mat-button>Cancel</button> + @if (id) { + <button + [disabled]="!editRuleForm.dirty || editRuleForm.invalid || saving" + type="button" + (click)="saveClicked()" + mat-flat-button> + Sav{{ saving ? 'ing' : 'e' }} + </button> + } @else { + <button Review Comment: This looks good in the latest updates. ########## nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.ts: ########## @@ -22,14 +22,14 @@ import { MatButtonModule } from '@angular/material/button'; import { NgClass, NgTemplateOutlet } from '@angular/common'; import { RouterLink } from '@angular/router'; import { MatDialogModule } from '@angular/material/dialog'; +import { BulletinsTipInput, ValidationErrorsTipInput } from '../../../state/shared'; Review Comment: @nifi/shared? -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
