This is an automated email from the ASF dual-hosted git repository.
mcgilman pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/nifi.git
The following commit(s) were added to refs/heads/main by this push:
new bac6300e95 [NIFI-14024] - Improve Bulletin ToolTip (#9534)
bac6300e95 is described below
commit bac6300e95f05d77eeddae3db429fe269111908c
Author: Rob Fellows <[email protected]>
AuthorDate: Wed Nov 20 13:50:34 2024 -0500
[NIFI-14024] - Improve Bulletin ToolTip (#9534)
This closes #9534
---
.../canvas/header/flow-status/flow-status.component.html | 1 +
.../flow-analysis-rule-table.component.html | 2 +-
.../registry-client-table.component.html | 1 +
.../reporting-task-table.component.html | 2 +-
.../controller-service-references.component.html | 3 ++-
.../controller-service-table.component.html | 2 +-
.../parameter-references.component.html | 2 ++
.../tooltips/bulletins-tip/bulletins-tip.component.html | 14 +++++++++-----
.../tooltips/bulletins-tip/bulletins-tip.component.ts | 15 ++++++++++++++-
9 files changed, 32 insertions(+), 10 deletions(-)
diff --git
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.html
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.html
index 14d6ec2be0..5d9c04b55a 100644
---
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.html
+++
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/flow-designer/ui/canvas/header/flow-status/flow-status.component.html
@@ -138,6 +138,7 @@
@if (hasBulletins()) {
<button
nifiTooltip
+ [delayClose]="true"
[tooltipComponentType]="BulletinsTip"
[tooltipInputData]="getBulletins()"
[position]="getBulletinTooltipPosition()"
diff --git
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.html
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.html
index 1c7b128afc..2798ffbe9b 100644
---
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.html
+++
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/flow-analysis-rules/flow-analysis-rule-table/flow-analysis-rule-table.component.html
@@ -50,7 +50,7 @@
@if (hasBulletins(item)) {
<div
class="pointer fa fa-sticky-note-o
primary-color"
- [delayClose]="false"
+ [delayClose]="true"
nifiTooltip
[tooltipComponentType]="BulletinsTip"
[tooltipInputData]="getBulletinsTipData(item)"></div>
diff --git
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.html
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.html
index 8ba9d12dd5..a02826164f 100644
---
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.html
+++
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/registry-clients/registry-client-table/registry-client-table.component.html
@@ -42,6 +42,7 @@
<div
class="mr-3 pointer fa fa-sticky-note-o
primary-color"
nifiTooltip
+ [delayClose]="true"
[tooltipComponentType]="BulletinsTip"
[tooltipInputData]="getBulletinsTipData(item)"></div>
}
diff --git
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.html
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.html
index 0c10fe3ed6..9bdcba1cab 100644
---
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.html
+++
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/pages/settings/ui/reporting-tasks/reporting-task-table/reporting-task-table.component.html
@@ -50,7 +50,7 @@
@if (hasBulletins(item)) {
<div
class="pointer fa fa-sticky-note-o
primary-color"
- [delayClose]="false"
+ [delayClose]="true"
nifiTooltip
[tooltipComponentType]="BulletinsTip"
[tooltipInputData]="getBulletinsTipData(item)"></div>
diff --git
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html
index 7b7361ff4e..cbc6fac9fa 100644
---
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html
+++
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-references/controller-service-references.component.html
@@ -107,7 +107,7 @@
nifiTooltip
[tooltipComponentType]="BulletinsTip"
[tooltipInputData]="getBulletinsTipData(reference)"
- [delayClose]="false"></div>
+ [delayClose]="true"></div>
}
@if (hasActiveThreads(reference.component)) {
<div>({{
reference.component.activeThreadCount }})</div>
@@ -142,6 +142,7 @@
<div
class="pointer fa fa-sticky-note-o
primary-color"
nifiTooltip
+ [delayClose]="true"
[tooltipComponentType]="BulletinsTip"
[tooltipInputData]="getBulletinsTipData(service)"></div>
}
diff --git
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-table/controller-service-table.component.html
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-table/controller-service-table.component.html
index c6965769ea..281d758a5c 100644
---
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-table/controller-service-table.component.html
+++
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/controller-service/controller-service-table/controller-service-table.component.html
@@ -51,7 +51,7 @@
<div
class="pointer fa fa-sticky-note-o
primary-color"
nifiTooltip
- [delayClose]="false"
+ [delayClose]="true"
[tooltipComponentType]="BulletinsTip"
[tooltipInputData]="getBulletinsTipData(item)"></div>
}
diff --git
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
index 743d5183b0..eefa1c3e6a 100644
---
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
+++
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/parameter-references/parameter-references.component.html
@@ -73,6 +73,7 @@
<div
class="pointer fa fa-sticky-note-o
primary-color"
nifiTooltip
+ [delayClose]="true"
[tooltipComponentType]="BulletinsTip"
[tooltipInputData]="getBulletinsTipData(reference)"></div>
}
@@ -109,6 +110,7 @@
<div
class="pointer fa fa-sticky-note-o
primary-color"
nifiTooltip
+ [delayClose]="true"
[tooltipComponentType]="BulletinsTip"
[tooltipInputData]="getBulletinsTipData(service)"></div>
}
diff --git
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.html
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.html
index 86bc0b7d7c..35d04622c9 100644
---
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.html
+++
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.html
@@ -21,11 +21,15 @@
@if (bulletinEntity.canRead) {
<li>
<div class="inline-flex flex-wrap gap-x-1.5">
- <div>{{ bulletinEntity.bulletin.timestamp }}</div>
- @if (bulletinEntity.nodeAddress) {
- <div>{{ bulletinEntity.nodeAddress }}</div>
- }
- <div class="font-bold">{{
bulletinEntity.bulletin.level }}</div>
+ <div class="inline-flex flex-wrap gap-x-1.5"
[copy]="bulletinEntity.bulletin.message">
+ <div>{{ bulletinEntity.bulletin.timestamp }}</div>
+ @if (bulletinEntity.nodeAddress) {
+ <div>{{ bulletinEntity.nodeAddress }}</div>
+ }
+ <div class="font-bold {{
getSeverity(bulletinEntity.bulletin.level) }}">
+ {{ bulletinEntity.bulletin.level }}
+ </div>
+ </div>
<pre class="whitespace-pre-wrap">{{
bulletinEntity.bulletin.message }}</pre>
</div>
</li>
diff --git
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.ts
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.ts
index a5e2636980..ad284b0c9a 100644
---
a/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.ts
+++
b/nifi-frontend/src/main/frontend/apps/nifi/src/app/ui/common/tooltips/bulletins-tip/bulletins-tip.component.ts
@@ -17,14 +17,27 @@
import { Component, Input } from '@angular/core';
import { BulletinsTipInput } from '../../../../state/shared';
+import { CopyDirective } from '@nifi/shared';
@Component({
selector: 'bulletins-tip',
standalone: true,
templateUrl: './bulletins-tip.component.html',
- imports: [],
+ imports: [CopyDirective],
styleUrls: ['./bulletins-tip.component.scss']
})
export class BulletinsTip {
@Input() data: BulletinsTipInput | undefined;
+
+ getSeverity(severity: string) {
+ switch (severity.toLowerCase()) {
+ case 'error':
+ return 'bulletin-error error-color';
+ case 'warn':
+ case 'warning':
+ return 'bulletin-warn caution-color';
+ default:
+ return 'bulletin-normal success-color-default';
+ }
+ }
}
