scottyaslan commented on code in PR #9561: URL: https://github.com/apache/nifi/pull/9561#discussion_r1879247364
########## 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: If the user enters a name the 'Add' button becomes enabled but if the user attempts to click the 'Add' button they will receive the snackbar error. Do you think that the 'Add' button should be disabled in this case?  ########## 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 (editable) { + <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> + <mat-slide-toggle + [disabled]="!editable" + [checked]="flowFilePolicy === 'USE_ORIGINAL'" + (change)="updateFlowFilePolicy($event)"></mat-slide-toggle> + </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"> + <form [formGroup]="searchForm"> + @if (!newRule) { + <mat-form-field subscriptSizing="dynamic"> + <mat-label>Search</mat-label> + <input matInput type="text" class="small" formControlName="searchRules" /> + </mat-form-field> + } + </form> + <div class="flex gap-x-1"> + @if (flowFilePolicy === 'USE_ORIGINAL' && !reorderDisabled()) { + <div class="flex gap-x-1 items-center"> + <div>Reorder rules</div> + <mat-slide-toggle Review Comment: Should this be disabled when the user does not have modify permissions? ########## 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 (editable) { + <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> + <mat-slide-toggle Review Comment: Should this be disabled if the user does not have modify permissions? ########## 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 (editable) { + <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> + <mat-slide-toggle + [disabled]="!editable" + [checked]="flowFilePolicy === 'USE_ORIGINAL'" + (change)="updateFlowFilePolicy($event)"></mat-slide-toggle> + </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"> + <form [formGroup]="searchForm"> + @if (!newRule) { + <mat-form-field subscriptSizing="dynamic"> + <mat-label>Search</mat-label> + <input matInput type="text" class="small" formControlName="searchRules" /> + </mat-form-field> + } + </form> + <div class="flex gap-x-1"> + @if (flowFilePolicy === 'USE_ORIGINAL' && !reorderDisabled()) { + <div class="flex gap-x-1 items-center"> + <div>Reorder rules</div> + <mat-slide-toggle + [checked]="allowRuleReordering" + (change)="setAllowRuleReordering($event)"></mat-slide-toggle> + </div> + } + @if (!newRule) { + <button + mat-icon-button + class="primary-icon-button" + [disabled]="!editable || allowRuleReordering" + (click)="populateNewRule()"> + <i class="fa fa-plus"></i> + </button> + } + </div> + </div> + @if (filteredRulesList.length === 0 && !newRule) { + <div class="unset">No matching rules</div> + } @else { + @if (allowRuleReordering) { + <mat-accordion + [multi]="true" + [hideToggle]="true" + cdkDropList + [cdkDropListDisabled]="!editable" + [cdkDropListData]="rulesList" + (cdkDropListDropped)="reorderRules($event)"> + @for (rule of filteredRulesList; track rule.id) { + <mat-expansion-panel cdkDrag (opened)="panelOpened(rule)" (closed)="panelClosed(rule)"> Review Comment: I think you are missing some styles here. When the parameter context inheritence and connection priority drag and drop reorder UX is presented to the user they look like:  <img width="515" alt="Screenshot 2024-12-10 at 10 24 10 PM" src="https://github.com/user-attachments/assets/3ea2a61a-4bac-4d6c-8fcf-8c1d0cb9144c";> We may want to consider simplifying this UX a bit more and not allow the expansion of the rows while the user is reordering the rules. ########## 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 (editable) { + <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> + <mat-slide-toggle + [disabled]="!editable" + [checked]="flowFilePolicy === 'USE_ORIGINAL'" + (change)="updateFlowFilePolicy($event)"></mat-slide-toggle> + </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"> + <form [formGroup]="searchForm"> + @if (!newRule) { + <mat-form-field subscriptSizing="dynamic"> + <mat-label>Search</mat-label> + <input matInput type="text" class="small" formControlName="searchRules" /> + </mat-form-field> + } + </form> + <div class="flex gap-x-1"> + @if (flowFilePolicy === 'USE_ORIGINAL' && !reorderDisabled()) { + <div class="flex gap-x-1 items-center"> + <div>Reorder rules</div> + <mat-slide-toggle + [checked]="allowRuleReordering" + (change)="setAllowRuleReordering($event)"></mat-slide-toggle> + </div> + } + @if (!newRule) { + <button + mat-icon-button + class="primary-icon-button" + [disabled]="!editable || allowRuleReordering" + (click)="populateNewRule()"> + <i class="fa fa-plus"></i> + </button> + } + </div> + </div> + @if (filteredRulesList.length === 0 && !newRule) { + <div class="unset">No matching rules</div> + } @else { + @if (allowRuleReordering) { + <mat-accordion + [multi]="true" + [hideToggle]="true" + cdkDropList + [cdkDropListDisabled]="!editable" + [cdkDropListData]="rulesList" + (cdkDropListDropped)="reorderRules($event)"> + @for (rule of filteredRulesList; track rule.id) { + <mat-expansion-panel cdkDrag (opened)="panelOpened(rule)" (closed)="panelClosed(rule)"> + <mat-expansion-panel-header [collapsedHeight]="'42px'" [expandedHeight]="'42px'"> + <mat-panel-title class="items-center"> + <span class="grip -mt-0.5 mr-5 cursor-grab"></span> + {{ rule.name }} + </mat-panel-title> + <mat-panel-description class="flex justify-between items-center"> + {{ rule.comments }} + </mat-panel-description> + </mat-expansion-panel-header> + <edit-rule + [id]="rule.id" + [name]="rule.name" + [existingRuleNames]="getExistingRuleNames()" + [comments]="rule.comments" + [conditions]="rule.conditions" + [actions]="rule.actions" + [editable]="false"></edit-rule> + </mat-expansion-panel> + } + </mat-accordion> + } @else { + <mat-accordion [multi]="true" [hideToggle]="true"> Review Comment: We could remove the hideToggle here as well to help the user understand that the row is expandable. ########## 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 (editable) { + <div>No rules configured for this Processor. Get started by defining your first.</div> + <button mat-flat-button (click)="populateNewRule()">Create Rule</button> Review Comment: Should this be disabled if the user does not have modify permissions? ########## 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 (editable) { + <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> + <mat-slide-toggle + [disabled]="!editable" + [checked]="flowFilePolicy === 'USE_ORIGINAL'" + (change)="updateFlowFilePolicy($event)"></mat-slide-toggle> + </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"> + <form [formGroup]="searchForm"> + @if (!newRule) { + <mat-form-field subscriptSizing="dynamic"> + <mat-label>Search</mat-label> + <input matInput type="text" class="small" formControlName="searchRules" /> + </mat-form-field> + } + </form> + <div class="flex gap-x-1"> + @if (flowFilePolicy === 'USE_ORIGINAL' && !reorderDisabled()) { + <div class="flex gap-x-1 items-center"> + <div>Reorder rules</div> + <mat-slide-toggle + [checked]="allowRuleReordering" + (change)="setAllowRuleReordering($event)"></mat-slide-toggle> + </div> + } + @if (!newRule) { + <button + mat-icon-button + class="primary-icon-button" + [disabled]="!editable || allowRuleReordering" + (click)="populateNewRule()"> + <i class="fa fa-plus"></i> + </button> + } + </div> + </div> + @if (filteredRulesList.length === 0 && !newRule) { + <div class="unset">No matching rules</div> + } @else { + @if (allowRuleReordering) { + <mat-accordion + [multi]="true" + [hideToggle]="true" + cdkDropList + [cdkDropListDisabled]="!editable" + [cdkDropListData]="rulesList" + (cdkDropListDropped)="reorderRules($event)"> + @for (rule of filteredRulesList; track rule.id) { + <mat-expansion-panel cdkDrag (opened)="panelOpened(rule)" (closed)="panelClosed(rule)"> + <mat-expansion-panel-header [collapsedHeight]="'42px'" [expandedHeight]="'42px'"> + <mat-panel-title class="items-center"> + <span class="grip -mt-0.5 mr-5 cursor-grab"></span> + {{ rule.name }} + </mat-panel-title> + <mat-panel-description class="flex justify-between items-center"> + {{ rule.comments }} + </mat-panel-description> + </mat-expansion-panel-header> + <edit-rule + [id]="rule.id" + [name]="rule.name" + [existingRuleNames]="getExistingRuleNames()" + [comments]="rule.comments" + [conditions]="rule.conditions" + [actions]="rule.actions" + [editable]="false"></edit-rule> + </mat-expansion-panel> + } + </mat-accordion> + } @else { + <mat-accordion [multi]="true" [hideToggle]="true"> + @for (rule of filteredRulesList; track rule.id) { + <mat-expansion-panel #expansionPanel (opened)="panelOpened(rule)" (closed)="panelClosed(rule)"> + <mat-expansion-panel-header [collapsedHeight]="'42px'" [expandedHeight]="'42px'"> + <mat-panel-title class="items-center"> + {{ rule.name }} + </mat-panel-title> + <mat-panel-description class="flex justify-between items-center"> + <div> + {{ rule.comments }} + </div> + @if (editable) { + <button Review Comment: Should this be disabled when the user does not have modify permissions? ########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/ua-editor/_ua-editor.component-theme.scss: ########## @@ -0,0 +1,36 @@ +/* + * 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. + */ + +@use 'sass:map'; +@use '@angular/material' as mat; + +@mixin generate-theme() { + .ua-editor { + @include mat.button-density(-1); + + .editor { + &.blank { + border-color: var(--mdc-outlined-text-field-disabled-label-text-color); + cursor: not-allowed !important; + } + } + + .CodeMirror.cm-s-nifi { + height: 108px; Review Comment: It appears this is not always being applied properly. When the editor is resized to a smaller height there is a lot of empty space between the codemirror and the action buttons: <img width="1170" alt="Screenshot 2024-12-10 at 10 52 22 PM" src="https://github.com/user-attachments/assets/aa49e97f-e771-4703-80e8-20482cc620d4";> ########## 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 (editable) { + <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> + <mat-slide-toggle + [disabled]="!editable" + [checked]="flowFilePolicy === 'USE_ORIGINAL'" + (change)="updateFlowFilePolicy($event)"></mat-slide-toggle> + </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"> + <form [formGroup]="searchForm"> + @if (!newRule) { + <mat-form-field subscriptSizing="dynamic"> + <mat-label>Search</mat-label> + <input matInput type="text" class="small" formControlName="searchRules" /> + </mat-form-field> + } + </form> + <div class="flex gap-x-1"> + @if (flowFilePolicy === 'USE_ORIGINAL' && !reorderDisabled()) { + <div class="flex gap-x-1 items-center"> + <div>Reorder rules</div> + <mat-slide-toggle + [checked]="allowRuleReordering" + (change)="setAllowRuleReordering($event)"></mat-slide-toggle> + </div> + } + @if (!newRule) { + <button Review Comment: Should this be disabled when the user does not have modify permissions? ########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/condition-table/condition-table.component.ts: ########## @@ -0,0 +1,320 @@ +/* + * 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. + */ + +import { + AfterViewInit, + ChangeDetectorRef, + Component, + DestroyRef, + forwardRef, + inject, + Input, + QueryList, + ViewChildren +} from '@angular/core'; +import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { MatButtonModule } from '@angular/material/button'; +import { MatDialogModule } from '@angular/material/dialog'; +import { MatTableDataSource, MatTableModule } from '@angular/material/table'; +import { NiFiCommon, NifiTooltipDirective, TextTip } from '@nifi/shared'; +import { NgTemplateOutlet } from '@angular/common'; +import { + CdkConnectedOverlay, + CdkOverlayOrigin, + ConnectionPositionPair, + OriginConnectionPosition, + OverlayConnectionPosition +} from '@angular/cdk/overlay'; +import { takeUntilDestroyed } from '@angular/core/rxjs-interop'; +import { MatMenu, MatMenuItem, MatMenuModule } from '@angular/material/menu'; +import { Condition } from '../../state/rules'; +import { v4 as uuidv4 } from 'uuid'; +import { UaEditor } from "../ua-editor/ua-editor.component"; + +export interface ConditionItem { + id: string; + triggerEdit: boolean; + deleted: boolean; + dirty: boolean; + added: boolean; + condition: Condition; +} + +@Component({ + selector: 'condition-table', + standalone: true, + templateUrl: './condition-table.component.html', + imports: [ + MatButtonModule, + MatDialogModule, + MatTableModule, + MatMenuModule, + NifiTooltipDirective, + NgTemplateOutlet, + CdkOverlayOrigin, + CdkConnectedOverlay, + MatMenu, + MatMenuItem, + UaEditor + ], + styleUrls: ['./condition-table.component.scss'], + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => ConditionTable), + multi: true + } + ] +}) +export class ConditionTable implements AfterViewInit, ControlValueAccessor { + @Input() isNew: boolean = false; + + private destroyRef = inject(DestroyRef); + + protected readonly TextTip = TextTip; + + displayedColumns: string[] = ['expression', 'actions']; + dataSource: MatTableDataSource<ConditionItem> = new MatTableDataSource<ConditionItem>(); + selectedItem!: ConditionItem; + + @ViewChildren('trigger') valueTriggers!: QueryList<CdkOverlayOrigin>; + + isDisabled = false; + isTouched = false; + onTouched!: () => void; + onChange!: (conditions: Condition[]) => void; + + editorOpen = false; + editorTrigger: any = null; + editorItem!: ConditionItem; + editorWidth = 0; + editorOffsetX = 8; + editorOffsetY = 66; + + private originPos: OriginConnectionPosition = { + originX: 'center', + originY: 'center' + }; + private editorOverlayPos: OverlayConnectionPosition = { + overlayX: 'center', + overlayY: 'center' + }; + public editorPositions: ConnectionPositionPair[] = []; + + constructor( + private changeDetector: ChangeDetectorRef, + private nifiCommon: NiFiCommon + ) {} + + ngAfterViewInit(): void { + this.initFilter(); + + this.valueTriggers.changes.pipe(takeUntilDestroyed(this.destroyRef)).subscribe(() => { Review Comment: Is there an extra line return here? ########## 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 (editable) { + <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> + <mat-slide-toggle + [disabled]="!editable" + [checked]="flowFilePolicy === 'USE_ORIGINAL'" + (change)="updateFlowFilePolicy($event)"></mat-slide-toggle> + </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"> + <form [formGroup]="searchForm"> + @if (!newRule) { + <mat-form-field subscriptSizing="dynamic"> + <mat-label>Search</mat-label> + <input matInput type="text" class="small" formControlName="searchRules" /> + </mat-form-field> + } + </form> + <div class="flex gap-x-1"> + @if (flowFilePolicy === 'USE_ORIGINAL' && !reorderDisabled()) { + <div class="flex gap-x-1 items-center"> + <div>Reorder rules</div> + <mat-slide-toggle + [checked]="allowRuleReordering" + (change)="setAllowRuleReordering($event)"></mat-slide-toggle> + </div> + } + @if (!newRule) { + <button + mat-icon-button + class="primary-icon-button" + [disabled]="!editable || allowRuleReordering" + (click)="populateNewRule()"> + <i class="fa fa-plus"></i> + </button> + } + </div> + </div> + @if (filteredRulesList.length === 0 && !newRule) { + <div class="unset">No matching rules</div> + } @else { + @if (allowRuleReordering) { + <mat-accordion + [multi]="true" + [hideToggle]="true" Review Comment: Maybe in this UX we should not hideToggle? That may make it more obvious that this is an expanandable row. We could also add some padding in between the expansion rows like we do in other use cases throughout nifi where we use expansion panels: <img width="257" alt="Screenshot 2024-12-10 at 11 10 34 PM" src="https://github.com/user-attachments/assets/0f9000cd-0886-49ce-ac1a-b737b581c70a";> ########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/condition-table/condition-table.component.html: ########## @@ -0,0 +1,111 @@ +<!-- + ~ 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-end items-center"> + @if (!isDisabled) { + <button mat-icon-button class="primary-icon-button" type="button" (click)="newConditionClicked()"> + <i class="fa fa-plus"></i> + </button> + } + </div> + <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"> + {{ expression }} + </div> + @if (hasExtraWhitespace(expression)) { + <div + class="fa fa-info-circle primary-color" + nifiTooltip + [tooltipComponentType]="TextTip" + tooltipInputData="The specified value contains leading and/or trailing whitespace character(s). This could produce unexpected results if it was not intentional."></div> + } + </div> + </ng-template> + </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> Review Comment: I think this should be disabled when the user does not have modify permission. ########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/condition-table/condition-table.component.html: ########## @@ -0,0 +1,111 @@ +<!-- + ~ 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-end items-center"> + @if (!isDisabled) { + <button mat-icon-button class="primary-icon-button" type="button" (click)="newConditionClicked()"> Review Comment: I think this should be disabled when the user does not have modify permission. ########## nifi-frontend/src/main/frontend/apps/update-attribute/src/app/pages/update-attribute/ui/rule-listing/rule-listing.component.scss: ########## @@ -0,0 +1,28 @@ +/*! + * 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. + */ + +:host { + width: 100%; +} + +.rule-listing { + .cdk-drag-disabled { + font-style: normal; Review Comment: Is this needed? What is the purpose? -- 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]
