scottyaslan commented on code in PR #9561: URL: https://github.com/apache/nifi/pull/9561#discussion_r1879281310
########## 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. That may make it more obvious that this is an expandable 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: ########## 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 expandable 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";> -- 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]
