From 3f7085fec83381b120963a75aa1748e802d430f6 Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Tue, 16 Apr 2024 17:17:36 -0400 Subject: [PATCH] [NIFI-13041] update listing table column widths (#8656) * [NIFI-13041] update listing table column widths (moreDetails) * listing tables actions column widths * update table columns to better fit the data * prettier * restore property table commented out html * name column now 25%, more-details and actions columns fixed width, all other columns flex * column width percenatages for clustered tables * property table updates This closes #8656 --- .../policy-table/policy-table.component.html | 2 +- .../policy-table/policy-table.component.scss | 2 +- ...configuration-history-table.component.html | 2 +- ...configuration-history-table.component.scss | 5 ++- .../local-changes-table.html | 4 +- .../local-changes-table.scss | 11 +++++- .../manage-remote-ports.component.html | 4 +- .../manage-remote-ports.component.scss | 24 +++++++----- .../parameter-context-table.component.html | 10 +++-- .../parameter-context-table.component.scss | 16 ++++++++ .../parameter-table.component.html | 2 +- .../parameter-table.component.scss | 2 +- .../provenance-event-table.component.html | 12 +++--- .../provenance-event-table.component.scss | 6 +-- .../flowfile-table.component.html | 12 +++--- .../flowfile-table.component.scss | 16 ++------ .../flow-analysis-rule-table.component.html | 4 +- .../flow-analysis-rule-table.component.scss | 10 ++++- ...rameter-provider-parameters.component.html | 2 +- ...rameter-provider-parameters.component.scss | 5 +-- .../parameter-groups-table.component.html | 2 +- .../parameter-groups-table.component.scss | 1 - .../parameter-providers-table.component.html | 7 ++-- .../parameter-providers-table.component.scss | 14 ++++++- .../registry-client-table.component.html | 8 ++-- .../registry-client-table.component.scss | 18 +++++++-- .../reporting-task-table.component.html | 8 ++-- .../reporting-task-table.component.scss | 10 ++++- .../connection-cluster-table.component.scss | 3 +- .../port-cluster-table.component.scss | 13 +++++-- ...process-group-cluster-table.component.scss | 3 +- .../processor-cluster-table.component.scss | 3 +- ...process-group-cluster-table.component.scss | 3 +- .../port-status-table.component.html | 6 ++- .../port-status-table.component.scss | 16 +++++++- .../connection-status-table.component.html | 6 ++- .../connection-status-table.component.scss | 8 ++-- .../process-group-status-table.component.html | 4 +- .../process-group-status-table.component.scss | 8 ++-- .../processor-status-table.component.html | 15 +++++--- .../processor-status-table.component.scss | 8 ++-- ...-process-group-status-table.component.html | 6 ++- ...-process-group-status-table.component.scss | 8 ++-- .../user-access-policies.component.html | 12 +++--- .../user-access-policies.component.scss | 11 +----- .../user-table/user-table.component.html | 2 +- .../user-table/user-table.component.scss | 2 +- .../controller-service-table.component.html | 28 +++++++------- .../controller-service-table.component.scss | 10 ++++- .../property-table.component.html | 2 +- .../property-table.component.scss | 10 +++++ .../property-table.component.ts | 38 +++++++++++++------ .../src/assets/styles/_listing-table.scss | 12 +----- 53 files changed, 286 insertions(+), 170 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.html index c515f49795..44f282f796 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/common/policy-table/policy-table.component.html @@ -38,7 +38,7 @@ -
+
@if (canRemove()) {
-
+
@if (canRead(item)) {
-
+
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-table/local-changes-table.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-table/local-changes-table.scss index 54460aa9c2..af9835c32d 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-table/local-changes-table.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/items/flow/local-changes-dialog/local-changes-table/local-changes-table.scss @@ -17,9 +17,16 @@ .local-changes-table { .listing-table { + .mat-column-componentName { + width: 230px; + } + + .mat-column-changeType { + width: 230px; + } + .mat-column-actions { - width: 40px; - min-width: 40px; + width: 32px; } } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.html index b9c4ec2477..8b61556009 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.html @@ -65,7 +65,7 @@ -
+
@if (hasComments(item)) {
-
+
@if ( port.exists === true && port.connected === true && diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.scss index c998c77801..3b817678a3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/manage-remote-ports/manage-remote-ports.component.scss @@ -21,18 +21,22 @@ line-height: normal; } -.manage-remote-ports-table.listing-table { - @include mat.table-density(-4); +.manage-remote-ports-table { + .listing-table { + @include mat.table-density(-4); - table { - .mat-column-moreDetails { - width: 32px; - min-width: 32px; - } + table { + .mat-column-moreDetails { + width: 52px; + } - .mat-column-actions { - width: 75px; - min-width: 75px; + .mat-column-name { + width: 25%; + } + + .mat-column-actions { + width: 52px; + } } } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-table/parameter-context-table.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-table/parameter-context-table.component.html index 50364177c5..8ac3a57ea3 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-table/parameter-context-table.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/parameter-contexts/ui/parameter-context-listing/parameter-context-table/parameter-context-table.component.html @@ -15,7 +15,7 @@ ~ limitations under the License. --> -
+
@@ -70,7 +72,7 @@ @@ -145,7 +147,7 @@ @@ -122,7 +124,7 @@ @@ -96,7 +97,7 @@
@if (canRead(item)) { -
+
@if (canRead(item)) {
@@ -44,7 +44,9 @@
Name -
+
{{ formatName(item) }}
-
+
@if (canRead(item) && canWrite(item)) {
-
+
@if (canGoToParameter(item)) {
-
+
+
+
-
+
-
+
+
+
-
+
@if (item.size > 0) {
@if (canRead(item)) { -
+
-
+
@if (canConfigure(item)) {
-
+
-
+
@if (isSyncedToParameterContext(item)) {
} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/parameter-groups-table/parameter-groups-table.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/parameter-groups-table/parameter-groups-table.component.scss index bf3d1a6f20..088527b977 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/parameter-groups-table/parameter-groups-table.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/fetch-parameter-provider-parameters/parameter-groups-table/parameter-groups-table.component.scss @@ -19,7 +19,6 @@ .listing-table { .mat-column-indicators { width: 32px; - min-width: 32px; } } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.html index 6ab8237df8..a7d2165844 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/settings/ui/parameter-providers/parameter-providers-table/parameter-providers-table.component.html @@ -32,7 +32,7 @@
@if (canRead(item)) { -
+
@@ -67,7 +67,8 @@ [ngClass]="{ unset: !canRead(item), 'nifi-surface-default': !canRead(item) - }"> + }" + class="overflow-hidden overflow-ellipsis whitespace-nowrap"> {{ formatName(item) }}
-
+
@if (canConfigure(item)) {
-
-
+
+
@@ -115,7 +117,7 @@ - + @@ -140,7 +142,7 @@ - + @@ -204,7 +206,7 @@ @@ -81,7 +83,9 @@
Type
@@ -101,8 +105,7 @@ - + @@ -146,7 +148,7 @@ diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.scss index 829cb39665..5ffd800fa6 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-access-policies/user-access-policies.component.scss @@ -24,17 +24,8 @@ .listing-table { table { - td, - th { - cursor: default; - } - - .mat-column-action { - width: 75px; - } - .mat-column-actions { - width: 50px; + width: 32px; } } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.html index 1c298fa5f7..2ce6997e35 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/users/ui/user-listing/user-table/user-table.component.html @@ -78,7 +78,7 @@
@if (canRead(item)) { -
+
@if (hasErrors(item)) {
-
+
@if (canConfigure(item)) {
@if (canRead(item)) { -
+
Name -
+
{{ formatName(item) }}
-
+
@if (canStop(item)) {
+
+
-
+
+
+
-
+
@if (canRead(item)) { -
+
@if (canRead(item)) {
-
+
@if (canRead(item)) { -
+
@if (canRead(item)) {
} -
{{ formatName(item) }}
+
+ {{ formatName(item) }} +
- {{ formatType(item) }} +
+ {{ formatType(item) }} +
Run Status -
+
{{ formatRunStatus(item) }} @@ -246,7 +249,7 @@
-
+
+
+
-
+
@if (canGoToPolicyTarget(item)) { -
+
+
+
}
-
+
@if (canEditOrDelete(currentUser, item)) {
-
-
+
+
@@ -97,6 +99,14 @@ + + + + + + @@ -108,20 +118,12 @@ - - - - - -
@if (canRead(item)) { -
+
Name -
+
{{ formatName(item) }}
Scope + {{ formatScope(item) }} + State Scope - {{ formatScope(item) }} - @if (definedByCurrentGroup(item)) { -
+
@if (canConfigure(item)) {
-
+
@if (item.descriptor.identifiesControllerService) {
void; onChange!: (properties: Property[]) => void; + editorOpen = false; + editorTrigger: any = null; + editorItem!: PropertyItem; + editorWidth = 0; + editorOffsetX = 0; + editorOffsetY = 0; private originPos: OriginConnectionPosition = { originX: 'center', @@ -136,17 +142,7 @@ export class PropertyTable implements AfterViewInit, ControlValueAccessor { overlayX: 'center', overlayY: 'center' }; - private editorPosition: ConnectionPositionPair = new ConnectionPositionPair( - this.originPos, - this.editorOverlayPos, - 0, - 0 - ); - public editorPositions: ConnectionPositionPair[] = [this.editorPosition]; - editorOpen = false; - editorTrigger: any = null; - editorItem!: PropertyItem; - editorWidth = 0; + public editorPositions: ConnectionPositionPair[] = []; constructor( private changeDetector: ChangeDetectorRef, @@ -408,10 +404,28 @@ export class PropertyTable implements AfterViewInit, ControlValueAccessor { if (td) { const { width } = td.getBoundingClientRect(); + this.editorPositions.pop(); this.editorItem = item; this.editorTrigger = editorTrigger; this.editorOpen = true; - this.editorWidth = width; + + if (this.hasAllowableValues(item)) { + this.editorWidth = width; + this.editorOffsetX = -24; + this.editorOffsetY = 24; + } else { + this.editorWidth = width + 100; + this.editorOffsetX = 8; + this.editorOffsetY = 56; + } + this.editorPositions.push( + new ConnectionPositionPair( + this.originPos, + this.editorOverlayPos, + this.editorOffsetX, + this.editorOffsetY + ) + ); } } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_listing-table.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_listing-table.scss index 3e5d1ff9a8..99dece746b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_listing-table.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/assets/styles/_listing-table.scss @@ -38,23 +38,15 @@ } .fa { - width: 10px; + width: 14px; height: 14px; text-align: center; } .icon { - width: 10px; + width: 14px; text-align: center; } - - .mat-column-moreDetails { - min-width: 30px; - } - - .mat-column-actions { - min-width: 115px; - } } }