From e99d5948e14f0e33b74ded9e0973b9ec990b99b2 Mon Sep 17 00:00:00 2001 From: Lucas Oliveira <62335616+lucaseduoli@users.noreply.github.com> Date: Tue, 11 Mar 2025 00:00:39 -0300 Subject: [PATCH] feat: deprecate freeze and rename freeze path button (#6821) * Removed Freeze shortcut and Renamed Freeze path to Freeze * Removed freeze shortcut * Removed freeze type on shortcut * Removed freeze shortcut logic * Remove freeze option from node toolbar * Fixed freeze test --- src/frontend/src/constants/constants.ts | 5 --- .../hooks/use-shortcuts.ts | 10 ------ .../components/nodeToolbarComponent/index.tsx | 32 +------------------ src/frontend/src/stores/shortcuts.ts | 1 - src/frontend/src/types/store/index.ts | 1 - .../tests/core/features/freeze.spec.ts | 4 +-- 6 files changed, 3 insertions(+), 50 deletions(-) diff --git a/src/frontend/src/constants/constants.ts b/src/frontend/src/constants/constants.ts index 87f6d931f..0b08a88cd 100644 --- a/src/frontend/src/constants/constants.ts +++ b/src/frontend/src/constants/constants.ts @@ -870,11 +870,6 @@ export const defaultShortcuts = [ }, { display_name: "Freeze", - name: "Freeze", - shortcut: "mod+f", - }, - { - display_name: "Freeze Path", name: "Freeze Path", shortcut: "mod+shift+f", }, diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/hooks/use-shortcuts.ts b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/hooks/use-shortcuts.ts index 0d4ad5cc2..b29523349 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/hooks/use-shortcuts.ts +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/hooks/use-shortcuts.ts @@ -8,7 +8,6 @@ export default function useShortcuts({ openModal, showconfirmShare, FreezeAllVertices, - Freeze, downloadFunction, displayDocs, saveComponent, @@ -25,7 +24,6 @@ export default function useShortcuts({ openModal?: boolean; showconfirmShare?: boolean; FreezeAllVertices?: () => void; - Freeze?: () => void; downloadFunction?: () => void; displayDocs?: () => void; saveComponent?: () => void; @@ -45,7 +43,6 @@ export default function useShortcuts({ const code = useShortcutsStore((state) => state.code); const group = useShortcutsStore((state) => state.group); const download = useShortcutsStore((state) => state.download); - const freeze = useShortcutsStore((state) => state.freeze); const freezeAll = useShortcutsStore((state) => state.freezePath); const toolMode = useShortcutsStore((state) => state.toolMode); @@ -55,12 +52,6 @@ export default function useShortcuts({ FreezeAllVertices(); } - function handleFreeze(e: KeyboardEvent) { - if (isWrappedWithClass(e, "noflow") || !Freeze) return; - e.preventDefault(); - Freeze(); - } - function handleDownloadWShortcut(e: KeyboardEvent) { if (!downloadFunction) return; e.preventDefault(); @@ -136,7 +127,6 @@ export default function useShortcuts({ useHotkeys(save, handleSaveWShortcut, { preventDefault: true }); useHotkeys(docs, handleDocsWShortcut, { preventDefault: true }); useHotkeys(download, handleDownloadWShortcut, { preventDefault: true }); - useHotkeys(freeze, handleFreeze); useHotkeys(freezeAll, handleFreezeAll); useHotkeys(toolMode, (e) => handleToolModeWShortcut(e, hasToolMode), { preventDefault: true, diff --git a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx index 23f769f8a..bb3a88be4 100644 --- a/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx +++ b/src/frontend/src/pages/FlowPage/components/nodeToolbarComponent/index.tsx @@ -263,19 +263,6 @@ const NodeToolbarComponent = memo( }); }, [data.id, data.node?.documentation, openInNewTab]); - const freezeFunction = useCallback(() => { - setNode(data.id, (old) => ({ - ...old, - data: { - ...old.data, - node: { - ...old.data.node, - frozen: old.data?.node?.frozen ? false : true, - }, - }, - })); - }, [data.id, setNode]); - useShortcuts({ showOverrideModal, showModalAdvanced, @@ -284,7 +271,6 @@ const NodeToolbarComponent = memo( FreezeAllVertices: () => { FreezeAllVertices({ flowId: currentFlowId, stopNodeId: data.id }); }, - Freeze: freezeFunction, downloadFunction: () => downloadNode(flowComponent!), displayDocs: openDocs, saveComponent, @@ -333,9 +319,6 @@ const NodeToolbarComponent = memo( case "save": saveComponent(); break; - case "freeze": - freezeFunction(); - break; case "freezeAll": FreezeAllVertices({ flowId: currentFlowId, stopNodeId: data.id }); break; @@ -405,7 +388,6 @@ const NodeToolbarComponent = memo( }, [ saveComponent, - freezeFunction, FreezeAllVertices, setOpenModal, setShowModalAdvanced, @@ -713,24 +695,12 @@ const NodeToolbarComponent = memo( /> )} - + obj.name === "Freeze")?.shortcut! } value={"Freeze"} - icon={"Snowflake"} - dataTestId="freeze-button" - style={`${frozen ? " text-ice" : ""} transition-all`} - /> - - - obj.name === "Freeze Path") - ?.shortcut! - } - value={"Freeze Path"} icon={"FreezeAll"} dataTestId="freeze-path-button" style={`${frozen ? " text-ice" : ""} transition-all`} diff --git a/src/frontend/src/stores/shortcuts.ts b/src/frontend/src/stores/shortcuts.ts index 038172fe6..bb2b944d0 100644 --- a/src/frontend/src/stores/shortcuts.ts +++ b/src/frontend/src/stores/shortcuts.ts @@ -31,7 +31,6 @@ export const useShortcutsStore = create((set, get) => ({ api: "r", update: "mod+u", download: "mod+j", - freeze: "mod+f", freezePath: "mod+shift+f", toolMode: "mod+shift+m", toggleSidebar: "mod+b", diff --git a/src/frontend/src/types/store/index.ts b/src/frontend/src/types/store/index.ts index a48dbf387..8ab10576c 100644 --- a/src/frontend/src/types/store/index.ts +++ b/src/frontend/src/types/store/index.ts @@ -45,7 +45,6 @@ export type shortcutsStoreType = { delete: string; update: string; download: string; - freeze: string; toggleSidebar: string; freezePath: string; toolMode: string; diff --git a/src/frontend/tests/core/features/freeze.spec.ts b/src/frontend/tests/core/features/freeze.spec.ts index 3435e26ab..2c7eab80e 100644 --- a/src/frontend/tests/core/features/freeze.spec.ts +++ b/src/frontend/tests/core/features/freeze.spec.ts @@ -231,11 +231,11 @@ test( await page.getByTestId("more-options-modal").click(); - await page.waitForSelector('[data-testid="icon-Snowflake"]', { + await page.waitForSelector('[data-testid="icon-FreezeAll"]', { timeout: 1000, }); - await page.getByTestId("icon-Snowflake").click(); + await page.getByTestId("icon-FreezeAll").last().click(); await page.keyboard.press("Escape");