From 62d5502bba7fe72c2b2ea6ad4eb6b3dbb675fe2d Mon Sep 17 00:00:00 2001 From: Scott Aslan Date: Thu, 23 May 2024 13:19:03 -0400 Subject: [PATCH] =?UTF-8?q?[NIFI-13207]=20page=20headers=20and=20refresh?= =?UTF-8?q?=20containers=20are=20consistently=20pos=E2=80=A6=20(#8804)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [NIFI-13207] page headers and refresh containers are consistently positioned between pages * pad error banner * display hint below form fields to follow material spec, updating padding/spacing accordingly * revert access policies template * remove unused MatHint * access policy status as hint and center align hints * use margin bottom on error banner and more spacing improvements * update hint spacing in a few more use cases * remove extra padding from bottom of nifi cluster table filter component * collapse hint height when no text to display * update padding for input form field placeholder padding * use margins instead of padding * final touches This closes #8804 --- .../feature/access-policies.component.html | 6 +- .../component-access-policies.component.html | 116 ++++++++------- .../global-access-policies.component.html | 140 +++++++++--------- .../feature/bulletins.component.html | 6 +- .../bulletin-board-list.component.html | 8 +- .../cluster/feature/cluster.component.html | 64 ++++---- .../cluster-table-filter.component.html | 46 +++--- .../counters/feature/counters.component.html | 6 +- .../counter-table.component.html | 10 +- .../flow-configuration-history.component.html | 6 +- ...nfiguration-history-listing.component.html | 18 +-- .../local-changes-table.html | 22 +-- .../save-version-dialog.component.html | 6 +- .../controller-services.component.html | 6 +- .../manage-remote-ports.component.html | 8 +- .../ui/login-form/login-form.component.html | 4 +- .../feature/parameter-contexts.component.html | 6 +- .../feature/provenance.component.html | 10 +- .../provenance-event-table.component.html | 54 +++---- .../pages/queue/feature/queue.component.html | 6 +- .../flowfile-table.component.html | 4 +- .../settings/feature/settings.component.html | 8 +- .../general-form/general-form.component.html | 2 +- .../summary/feature/summary.component.html | 8 +- .../summary-table-filter.component.html | 98 ++++++------ .../pages/users/feature/users.component.html | 6 +- .../user-table/user-table.component.html | 10 +- .../component-state.component.html | 32 ++-- .../error-banner/error-banner.component.html | 26 ++-- .../page-content/page-content.component.html | 2 +- .../src/main/nifi/src/assets/styles/_app.scss | 7 - 31 files changed, 382 insertions(+), 369 deletions(-) diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.html index e4b83b0b0f..adcbdc8801 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/feature/access-policies.component.html @@ -15,14 +15,14 @@ ~ limitations under the License. --> -
-
+
+

Access Policies

-
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.html index ef7b325143..5c0af4ab60 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/access-policies/ui/component-access-policies/component-access-policies.component.html @@ -23,67 +23,69 @@ } @else { @if (policyComponentState$ | async; as policyComponentState) { @if (flowConfiguration$ | async; as flowConfiguration) { -
+
-
-
- @switch (accessPolicyState.policyStatus) { - @case (PolicyStatus.NotFound) { - No policy for the specified resource. - @if (flowConfiguration.supportsConfigurableAuthorizer) { - Create a new policy. - } - } - @case (PolicyStatus.Inherited) { - @if (accessPolicyState.accessPolicy) { - - } - } - @case (PolicyStatus.Forbidden) { - Not authorized to access the policy for the specified resource. - } - } -
-
-
-
- -
- - Policy - - @for (option of policyActionOptions; track option) { - @if (isComponentPolicy(option, policyComponentState)) { - {{ option.text }} - +
+ +
+ +
+ + Policy + + @for (option of policyActionOptions; track option) { + @if (isComponentPolicy(option, policyComponentState)) { + {{ option.text }} + + } } + + +
+
+ +
+
+ @switch (accessPolicyState.policyStatus) { + @case (PolicyStatus.NotFound) { + No policy for the specified resource. + @if (flowConfiguration.supportsConfigurableAuthorizer) { + Create a new policy. } - - + } + @case (PolicyStatus.Inherited) { + @if (accessPolicyState.accessPolicy) { + + } + } + @case (PolicyStatus.Forbidden) { + Not authorized to access the policy for the specified resource. + } + }
- +
@if (flowConfiguration.supportsConfigurableAuthorizer) {
} @else { @if (flowConfiguration$ | async; as flowConfiguration) { -
+
-
-
- @switch (accessPolicyState.policyStatus) { - @case (PolicyStatus.NotFound) { - No policy for the specified resource. - @if (flowConfiguration.supportsConfigurableAuthorizer) { - Create a new policy. - } - } - @case (PolicyStatus.Inherited) { - @if (accessPolicyState.accessPolicy) { - - } - } - @case (PolicyStatus.Forbidden) { - Not authorized to access the policy for the specified resource. - } - } -
-
-
-
-
- - Policy - - @for (option of resourceOptions; track option) { - {{ option.text }} - - } - - -
- @if (supportsResourceIdentifier) { -
- - Option +
+ +
+
+ + Policy - @for (option of requiredPermissionOptions; track option) { + formControlName="resource" + (selectionChange)="resourceChanged($event.value)"> + @for (option of resourceOptions; track option) {
- } -
- - Action - - view - modify - - + @if (supportsResourceIdentifier) { +
+ + Option + + @for (option of requiredPermissionOptions; track option) { + {{ option.text }} + + } + + +
+ } +
+ + Action + + view + modify + + +
+
+ +
+
+ @switch (accessPolicyState.policyStatus) { + @case (PolicyStatus.NotFound) { + No policy for the specified resource. + @if (flowConfiguration.supportsConfigurableAuthorizer) { + Create a new policy. + } + } + @case (PolicyStatus.Inherited) { + @if (accessPolicyState.accessPolicy) { + + } + } + @case (PolicyStatus.Forbidden) { + Not authorized to access the policy for the specified resource. + } + }
- +
@if (flowConfiguration.supportsConfigurableAuthorizer) {
-
Last updated:
-
{{ loadedTimestamp() }}
+
+
+ +
Last updated:
+
{{ loadedTimestamp() }}
+
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/cluster/ui/common/cluster-table-filter/cluster-table-filter.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/cluster/ui/common/cluster-table-filter/cluster-table-filter.component.html index d5a29ae3f2..70e936fd58 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/cluster/ui/common/cluster-table-filter/cluster-table-filter.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/cluster/ui/common/cluster-table-filter/cluster-table-filter.component.html @@ -15,28 +15,28 @@ ~ limitations under the License. --> -
-
- Filter matched {{ filteredCount }} of {{ totalCount }} +
+
+ +
+
+ + Filter + + +
+
+ + Filter By + + @for (option of filterableColumns; track option) { + {{ option.label }} + } + + +
+
+ +
Filter matched {{ filteredCount }} of {{ totalCount }}
-
-
-
- - Filter - - -
-
- - Filter By - - @for (option of filterableColumns; track option) { - {{ option.label }} - } - - -
-
-
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/feature/counters.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/feature/counters.component.html index 875942461a..5390875065 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/feature/counters.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/feature/counters.component.html @@ -15,11 +15,11 @@ ~ limitations under the License. --> -
-
+
+
-
+

NiFi Counters

diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.html index 6d3424f6cb..e6b0798ce4 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/counters/ui/counter-listing/counter-table/counter-table.component.html @@ -16,17 +16,16 @@ -->
-
Displaying {{ filteredCount }} of {{ totalCount }}
-
-
+ +
- + Filter
- + Filter By name @@ -36,6 +35,7 @@
+
Displaying {{ filteredCount }} of {{ totalCount }}
diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/feature/flow-configuration-history.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/feature/flow-configuration-history.component.html index 450435febe..078c7603e7 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/feature/flow-configuration-history.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/feature/flow-configuration-history.component.html @@ -15,11 +15,11 @@ ~ limitations under the License. --> -
-
+
+
-
+

Flow Configuration History

diff --git a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.html b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.html index ab130b8092..d703767be9 100644 --- a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.html +++ b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-configuration-history/ui/flow-configuration-history-listing/flow-configuration-history-listing.component.html @@ -21,19 +21,19 @@
} @else { -
+
-
-
+ +
- + Filter
- + Filter By @for (option of filterableColumns; track option) { @@ -43,7 +43,7 @@
- + Date Range
- + Start Time ({{ (about$ | async)?.timezone }})
- + End Time ({{ (about$ | async)?.timezone }})
-
+
-
+
-
+
@if ((messages$ | async)!; as messages) { -