From 2af2a3956ef92a214bc40ac5f9874a93d86852ad Mon Sep 17 00:00:00 2001 From: Matt Gilman Date: Mon, 22 Apr 2024 14:03:00 -0400 Subject: [PATCH] NIFI-13054: (#8676) - Restoring Property Editor popups that provide EL Function documentation and Parameter descriptions. This closes #8676 --- .../el-function-tip.component.html | 2 +- .../el-function-tip.component.scss | 3 +++ .../el-function-tip/el-function-tip.component.ts | 2 ++ .../parameter-tip/parameter-tip.component.html | 4 +++- .../parameter-tip/parameter-tip.component.scss | 15 ++++++++++----- .../parameter-tip/parameter-tip.component.ts | 2 ++ 6 files changed, 21 insertions(+), 7 deletions(-) diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.html index d956885800..bf84151567 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.html @@ -15,7 +15,7 @@ ~ limitations under the License. --> -
+
@if (data?.elFunction; as elFunction) {
{{ elFunction.name }}
diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.scss index 5d2aff27f8..23567778de 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.scss @@ -16,6 +16,9 @@ */ .el-function-tooltip { + position: fixed; + width: 400px; + .el-name { font-weight: bold; font-family: monospace; diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.ts index 6ce25ef196..17209928ad 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/el-function-tip/el-function-tip.component.ts @@ -29,6 +29,8 @@ import { ControllerServiceApi } from '../../controller-service/controller-servic styleUrls: ['./el-function-tip.component.scss'] }) export class ElFunctionTip { + @Input() left = 0; + @Input() bottom = 0; @Input() data: ElFunctionTipInput | null = null; constructor(private nifiCommon: NiFiCommon) {} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.html b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.html index 0f8a99ae63..49908305d8 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.html +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.html @@ -15,12 +15,14 @@ ~ limitations under the License. --> -
+
@if (data?.parameter; as parameter) {
{{ parameter.name }}
@if (hasDescription(parameter)) {
{{ parameter.description }}
+ } @else { +
No description provided
}
} diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.scss b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.scss index 61df9f13bb..3c7dddeb7b 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.scss +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.scss @@ -15,9 +15,14 @@ * limitations under the License. */ -.parameter-name { - font-weight: 700; - font-family: monospace; - font-size: 16px; - margin-bottom: 10px; +.parameter-tip { + position: fixed; + width: 400px; + + .parameter-name { + font-weight: 700; + font-family: monospace; + font-size: 16px; + margin-bottom: 10px; + } } diff --git a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.ts b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.ts index 850b588bf2..d71082a5c7 100644 --- a/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.ts +++ b/nifi-nar-bundles/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/tooltips/parameter-tip/parameter-tip.component.ts @@ -29,6 +29,8 @@ import { ControllerServiceApi } from '../../controller-service/controller-servic styleUrls: ['./parameter-tip.component.scss'] }) export class ParameterTip { + @Input() left = 0; + @Input() bottom = 0; @Input() data: ParameterTipInput | null = null; constructor(private nifiCommon: NiFiCommon) {}