(nifi) branch main updated: [NIFI-13158] - Fix: need to prevent/diable keyboard hotkeys when a dialog is open or when typeing in the search bar. (#8781)
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 a840c14c84 [NIFI-13158] - Fix: need to prevent/diable keyboard hotkeys
when a dialog is open or when typeing in the search bar. (#8781)
a840c14c84 is described below
commit a840c14c8410fe11d4e71499e758195623b24053
Author: Rob Fellows
AuthorDate: Wed May 8 18:45:23 2024 -0400
[NIFI-13158] - Fix: need to prevent/diable keyboard hotkeys when a dialog
is open or when typeing in the search bar. (#8781)
This closes #8781
---
.../flow-designer/ui/canvas/canvas.component.ts| 63 ++
1 file changed, 41 insertions(+), 22 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
index 9dbaa4a28a..b38327ffa6 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/ui/canvas/canvas.component.ts
@@ -68,6 +68,7 @@ import { selectUrl } from
'../../../../state/router/router.selectors';
import { Storage } from '../../../../service/storage.service';
import { CanvasUtils } from '../../service/canvas-utils.service';
import { CanvasActionsService } from '../../service/canvas-actions.service';
+import { MatDialog } from '@angular/material/dialog';
@Component({
selector: 'fd-canvas',
@@ -87,7 +88,8 @@ export class Canvas implements OnInit, OnDestroy {
private storage: Storage,
private canvasUtils: CanvasUtils,
public canvasContextMenu: CanvasContextMenu,
-private canvasActionsService: CanvasActionsService
+private canvasActionsService: CanvasActionsService,
+private dialog: MatDialog
) {
this.store
.select(selectTransform)
@@ -596,80 +598,97 @@ export class Canvas implements OnInit, OnDestroy {
this.store.dispatch(stopProcessGroupPolling());
}
-private executeAction(actionId: string, bypassCondition?: boolean):
boolean {
-const selection = this.canvasUtils.getSelection();
-const canvasAction = this.canvasActionsService.getAction(actionId);
-if (canvasAction) {
-if (bypassCondition || canvasAction.condition(selection)) {
-canvasAction.action(selection);
-return true;
+private processKeyboardEvents(event: KeyboardEvent): boolean {
+const source = event.target as any;
+let searchFieldIsEventSource = false;
+if (source) {
+searchFieldIsEventSource =
source.classList.contains('search-input') || false;
+}
+
+return this.dialog.openDialogs.length === 0 &&
!searchFieldIsEventSource;
+}
+
+private executeAction(actionId: string, event: KeyboardEvent,
bypassCondition?: boolean): boolean {
+if (this.processKeyboardEvents(event)) {
+const selection = this.canvasUtils.getSelection();
+const canvasAction = this.canvasActionsService.getAction(actionId);
+if (canvasAction) {
+if (bypassCondition || canvasAction.condition(selection)) {
+canvasAction.action(selection);
+return true;
+}
}
}
return false;
}
@HostListener('window:keydown.delete', ['$event'])
-handleKeyDownDelete() {
-this.executeAction('delete');
+handleKeyDownDelete(event: KeyboardEvent) {
+this.executeAction('delete', event);
}
+
@HostListener('window:keydown.backspace', ['$event'])
-handleKeyDownBackspace() {
-this.executeAction('delete');
+handleKeyDownBackspace(event: KeyboardEvent) {
+this.executeAction('delete', event);
}
@HostListener('window:keydown.control.r', ['$event'])
handleKeyDownCtrlR(event: KeyboardEvent) {
-if (this.executeAction('refresh', true)) {
+if (this.executeAction('refresh', event, true)) {
event.preventDefault();
}
}
+
@HostListener('window:keydown.meta.r', ['$event'])
handleKeyDownMetaR(event: KeyboardEvent) {
-if (this.executeAction('refresh', true)) {
+if (this.executeAction('refresh', event, true)) {
event.preventDefault();
}
}
@HostListener('window:keydown.escape', ['$event'])
-handleKeyDownEsc() {
-this.executeAction('leaveGroup');
+handleKeyDownEsc(event: KeyboardEvent) {
+this.executeAction('leaveGroup', event);
}
(nifi) branch main updated: NIFI-13176: (#8780)
This is an automated email from the ASF dual-hosted git repository.
scottyaslan 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 63cc1c3af6 NIFI-13176: (#8780)
63cc1c3af6 is described below
commit 63cc1c3af6309a47c6b45cb6a6b295505304a0f5
Author: Matt Gilman
AuthorDate: Wed May 8 18:27:02 2024 -0400
NIFI-13176: (#8780)
- Relaxing the scale that triggers when details for components on the
canvas are not rendered.
This closes #8780
---
.../nifi/src/app/pages/flow-designer/service/canvas-view.service.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
index 7cf090f7b1..4488516e08 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-view.service.ts
@@ -39,7 +39,7 @@ export class CanvasView {
private static readonly INCREMENT: number = 1.2;
private static readonly MAX_SCALE: number = 8;
private static readonly MIN_SCALE: number = 0.2;
-private static readonly MIN_SCALE_TO_RENDER: number = 0.6;
+private static readonly MIN_SCALE_TO_RENDER: number = 0.4;
private svg: any;
private canvas: any;
(nifi) branch support/nifi-1.x updated: NIFI-13181 Updated msal4j to 1.15.0 This closes #8777
This is an automated email from the ASF dual-hosted git repository. joewitt pushed a commit to branch support/nifi-1.x in repository https://gitbox.apache.org/repos/asf/nifi.git The following commit(s) were added to refs/heads/support/nifi-1.x by this push: new dc39334b37 NIFI-13181 Updated msal4j to 1.15.0 This closes #8777 dc39334b37 is described below commit dc39334b37407d92c45974b134b28fc5bc80d19d Author: Peter Turcsanyi AuthorDate: Wed May 8 16:12:47 2024 +0200 NIFI-13181 Updated msal4j to 1.15.0 This closes #8777 Signed-off-by: Joseph Witt --- nifi-nar-bundles/nifi-azure-bundle/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nifi-nar-bundles/nifi-azure-bundle/pom.xml b/nifi-nar-bundles/nifi-azure-bundle/pom.xml index 20dbf48f25..eb662a1820 100644 --- a/nifi-nar-bundles/nifi-azure-bundle/pom.xml +++ b/nifi-nar-bundles/nifi-azure-bundle/pom.xml @@ -29,7 +29,7 @@ 8.6.6 1.2.23 -1.14.3 +1.15.0 0.34.1
(nifi) branch main updated (fc8f072e0a -> 6950290c24)
This is an automated email from the ASF dual-hosted git repository. mcgilman pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from fc8f072e0a [NIFI-13165] hide resize handle is status history when insufficient h… (#8768) add 6950290c24 [NIFI-13162] horizontal and vertical canvas component alignment (#8762) No new revisions were added by this update. Summary of changes: .../service/behavior/draggable-behavior.service.ts | 8 +- .../service/canvas-context-menu.service.ts | 200 +++-- .../flow-designer/service/canvas-utils.service.ts | 38 .../pages/flow-designer/state/flow/flow.effects.ts | 3 + 4 files changed, 234 insertions(+), 15 deletions(-)
(nifi) branch main updated: [NIFI-13165] hide resize handle is status history when insufficient h… (#8768)
This is an automated email from the ASF dual-hosted git repository.
rfellows 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 fc8f072e0a [NIFI-13165] hide resize handle is status history when
insufficient h… (#8768)
fc8f072e0a is described below
commit fc8f072e0a87c5fc627050f39089c58c4e9b11b2
Author: Scott Aslan
AuthorDate: Wed May 8 14:08:22 2024 -0400
[NIFI-13165] hide resize handle is status history when insufficient h…
(#8768)
* [NIFI-13165] hide resize handle is status history when insufficient
history
* hide last updated/refresh button when insufficient history
* Update
nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html
Co-authored-by: Rob Fellows
-
Co-authored-by: Rob Fellows
This closes #8768
---
.../app/ui/common/resizable/resizable.component.html | 18 ++
.../app/ui/common/resizable/resizable.component.scss | 1 +
.../src/app/ui/common/resizable/resizable.component.ts | 1 +
.../status-history/status-history.component.html | 10 --
4 files changed, 20 insertions(+), 10 deletions(-)
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.html
index dfa2a33325..42cd51b7e1 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.html
@@ -16,12 +16,14 @@
-->
-
-@if (sub$ | async) {
-
+@if (!resizeDisabled) {
+
+@if (sub$ | async) {
+
+}
}
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.scss
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.scss
index 3ac2025b19..65b66b11b2 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.scss
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.scss
@@ -24,6 +24,7 @@ $handle-size: 15px;
}
.resizable-handle {
+background: unset;
position: absolute;
width: $handle-size;
height: $handle-size;
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts
index 76ba77693c..cdbb9c709b 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/resizable/resizable.component.ts
@@ -33,6 +33,7 @@ export class Resizable {
@Output() resized = new EventEmitter();
@Input() minHeight = 0;
@Input() minWidth = 0;
+@Input() resizeDisabled = false;
private startSize$ = new Subject();
private dragMove$ = new Subject();
diff --git
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html
index e86b03d2da..82c9a6e982 100644
---
a/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html
+++
b/nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/ui/common/status-history/status-history.component.html
@@ -14,7 +14,13 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-
+
@if (statusHistoryState$ | async; as statusHistoryState) {
Status History
@@ -164,7 +170,7 @@
-@if (instances.length > 0) {
+@if (instances.length > 0 && fieldDescriptors.length >
0) {
(nifi) branch main updated (0f39428209 -> 43aca6597e)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 0f39428209 [NIFI-13158] support for keyboard shortcuts (#8770) add 43aca6597e [NIFI-13117] update label resize handle to match other resize handles and replace comments indicator with icon (#8774) No new revisions were added by this update. Summary of changes: .../service/manager/label-manager.service.ts | 11 .../service/manager/port-manager.service.ts| 24 + .../manager/process-group-manager.service.ts | 20 --- .../service/manager/processor-manager.service.ts | 20 --- .../remote-process-group-manager.service.ts| 30 -- .../ui/canvas/_canvas.component-theme.scss | 10 .../flow-designer/ui/canvas/canvas.component.scss | 12 - 7 files changed, 61 insertions(+), 66 deletions(-)
(nifi) branch main updated (45098ed859 -> 0f39428209)
This is an automated email from the ASF dual-hosted git repository. scottyaslan pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 45098ed859 [NIFI-13174] increase drag/drop preview hieght to not display scroll bar (#8769) add 0f39428209 [NIFI-13158] support for keyboard shortcuts (#8770) No new revisions were added by this update. Summary of changes: .../service/canvas-actions.service.ts | 469 + .../service/canvas-context-menu.service.ts | 378 ++--- .../flow-designer/service/canvas-utils.service.ts | 23 +- .../pages/flow-designer/state/flow/flow.effects.ts | 4 +- .../flow-designer/ui/canvas/canvas.component.ts| 144 +-- .../operation-control.component.ts | 288 ++--- .../context-menu/context-menu.component.html | 2 +- .../common/context-menu/context-menu.component.ts | 5 +- 8 files changed, 658 insertions(+), 655 deletions(-) create mode 100644 nifi-framework-bundle/nifi-framework/nifi-web/nifi-web-frontend/src/main/nifi/src/app/pages/flow-designer/service/canvas-actions.service.ts
(nifi) branch main updated (eda98121ce -> 45098ed859)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from eda98121ce NIFI-13155: (#8771) add 45098ed859 [NIFI-13174] increase drag/drop preview hieght to not display scroll bar (#8769) No new revisions were added by this update. Summary of changes: .../ui/canvas/items/connection/prioritizers/prioritizers.component.scss | 2 +- .../parameter-context-inheritance.component.scss| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
(nifi) branch main updated (0ab5e2f741 -> eda98121ce)
This is an automated email from the ASF dual-hosted git repository. rfellows pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/nifi.git from 0ab5e2f741 NIFI-13179 Upgraded oauth2-oidc-sdk from 9.43.4 to 11.10.1 add eda98121ce NIFI-13155: (#8771) No new revisions were added by this update. Summary of changes: .../nifi-web-frontend/src/main/nifi/README.md | 4 +- .../pages/flow-designer/state/flow/flow.effects.ts | 13 +- .../pages/flow-designer/state/flow/flow.reducer.ts | 241 + .../app/pages/flow-designer/state/flow/index.ts| 4 + .../cluster-summary/cluster-summary.actions.ts | 2 + .../cluster-summary/cluster-summary.reducer.ts | 11 + .../cluster-summary/cluster-summary.selectors.ts | 5 + .../nifi/src/app/state/cluster-summary/index.ts| 1 + 8 files changed, 238 insertions(+), 43 deletions(-)
(nifi-minifi-cpp) branch MINIFICPP-2345 created (now d3d205f3c)
This is an automated email from the ASF dual-hosted git repository. martinzink pushed a change to branch MINIFICPP-2345 in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git at d3d205f3c MINIFICPP-2360 Fix python venv configuration and compatibility tests No new revisions were added by this update.
