diff --git a/designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Process with data should have counts button and modal #3.png b/designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Process with data should have counts button and modal #3.png index c7a7d2b8130..3f286e41ad8 100644 Binary files a/designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Process with data should have counts button and modal #3.png and b/designer/client/cypress/e2e/__image_snapshots__/electron/Linux/Process with data should have counts button and modal #3.png differ diff --git a/designer/client/cypress/e2e/process2.cy.ts b/designer/client/cypress/e2e/process2.cy.ts index 746ae46224d..edeea6e7327 100644 --- a/designer/client/cypress/e2e/process2.cy.ts +++ b/designer/client/cypress/e2e/process2.cy.ts @@ -21,14 +21,8 @@ describe("Process view", () => { it("should have node search toolbar", () => { cy.get("[data-testid=search-panel]").should("be.visible"); - cy.get("[data-testid=search-panel]") - .contains(/^search$/i) - .click(); - cy.get("[title='toggle left panel']").click(); - cy.get("[data-testid=search-panel]").should("be.not.visible"); - cy.get("#nk-graph-main").click(); - cy.realPress(["Meta", "F"]); - cy.get("[data-testid=search-panel] input").should("be.visible").should("be.focused"); + cy.get("[data-testid=search-panel]").contains(/^search$/i); + cy.get("[data-testid=search-panel] input").click(); cy.realType("en"); cy.get("[data-testid=search-panel]").contains(/sms/i).click(); cy.getNode("enricher") @@ -46,9 +40,7 @@ describe("Process view", () => { cy.get("[data-testid=window]") .contains(/^cancel$/i) .click(); - cy.get("#nk-graph-main").click(); - cy.realPress(["Meta", "F"]); - cy.get("[data-testid=search-panel] input").should("be.visible").should("be.focused"); + cy.get("[data-testid=search-panel] input").click().clear(); cy.realType("source"); cy.wait(750); //wait for animation cy.getNode("enricher") diff --git a/designer/client/src/components/toolbars/search/SearchPanel.tsx b/designer/client/src/components/toolbars/search/SearchPanel.tsx index 11e81ab49dc..6f0a93d19cd 100644 --- a/designer/client/src/components/toolbars/search/SearchPanel.tsx +++ b/designer/client/src/components/toolbars/search/SearchPanel.tsx @@ -1,11 +1,6 @@ import { isEmpty } from "lodash"; import React, { ReactElement, useCallback, useRef, useState } from "react"; import { useTranslation } from "react-i18next"; -import { useDispatch, useSelector } from "react-redux"; -import { toggleToolbar } from "../../../actions/nk/toolbars"; -import { useDocumentListeners } from "../../../containers/useDocumentListeners"; -import { getToolbarsConfigId } from "../../../reducers/selectors/toolbars"; -import { useSidePanel } from "../../sidePanels/SidePanel"; import { SearchIcon } from "../../table/SearchFilter"; import { Focusable } from "../../themed/InputWithIcon"; import { ToolbarPanelProps } from "../../toolbarComponents/DefaultToolbarPanel"; @@ -15,42 +10,10 @@ import { SearchInputWithIcon } from "../../themed/SearchInput"; export function SearchPanel(props: ToolbarPanelProps): ReactElement { const { t } = useTranslation(); - const dispatch = useDispatch(); - const toolbarsConfigId = useSelector(getToolbarsConfigId); - const [filter, setFilter] = useState(""); const clearFilter = useCallback(() => setFilter(""), []); const searchRef = useRef(); - const sidePanel = useSidePanel(); - - useDocumentListeners({ - keydown: (e) => { - switch (e.key.toUpperCase()) { - case "ESCAPE": { - e.preventDefault(); - e.stopImmediatePropagation(); - clearFilter(); - const target = e.composedPath().shift(); - if (target instanceof HTMLElement) { - target.blur(); - } - break; - } - case "F": { - if (!e.ctrlKey && !e.metaKey) return; - e.preventDefault(); - e.stopPropagation(); - if (!sidePanel.isOpened) { - sidePanel.onToggle(); - } - dispatch(toggleToolbar(props.id, toolbarsConfigId, false)); - searchRef.current.focus(); - break; - } - } - }, - }); return ( searchRef.current?.focus()}> @@ -63,7 +26,7 @@ export function SearchPanel(props: ToolbarPanelProps): ReactElement { > - + ); } diff --git a/docs/Changelog.md b/docs/Changelog.md index 99cffead3d6..ef6ee913eee 100644 --- a/docs/Changelog.md +++ b/docs/Changelog.md @@ -1,8 +1,9 @@ # Changelog -1.15.4 (5 July 2025) +1.15.4 (10 July 2025) ------------------------- * [#6319](https://github.com/TouK/nussknacker/pull/6319) Fix migration between environments. +* [#6322](https://github.com/TouK/nussknacker/pull/6322) Fix search nodes: usage of ctrl-f was limited to nodes search only. 1.15.3 (24 June 2024) -------------------------