From bdc49798cd9ec093f7da51eb64e778a9bf22eb6c Mon Sep 17 00:00:00 2001 From: Alex Grozav Date: Mon, 27 Jul 2026 14:30:05 +0200 Subject: [PATCH] refactor(editor): Rename redirection core to match the composable-name convention (no-changelog) (#35012) Co-authored-by: Claude Opus 4.8 Co-authored-by: multica-agent --- ....test.ts => useBasePageRedirectionHelper.test.ts} | 12 ++++++------ ...elper.core.ts => useBasePageRedirectionHelper.ts} | 7 ++++++- .../app/composables/usePageRedirectionHelper.test.ts | 6 +++--- .../src/app/composables/usePageRedirectionHelper.ts | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) rename packages/frontend/editor-ui/src/app/composables/{usePageRedirectionHelper.core.test.ts => useBasePageRedirectionHelper.test.ts} (94%) rename packages/frontend/editor-ui/src/app/composables/{usePageRedirectionHelper.core.ts => useBasePageRedirectionHelper.ts} (91%) diff --git a/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.core.test.ts b/packages/frontend/editor-ui/src/app/composables/useBasePageRedirectionHelper.test.ts similarity index 94% rename from packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.core.test.ts rename to packages/frontend/editor-ui/src/app/composables/useBasePageRedirectionHelper.test.ts index 374e210b2fa..9474ea0c30f 100644 --- a/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.core.test.ts +++ b/packages/frontend/editor-ui/src/app/composables/useBasePageRedirectionHelper.test.ts @@ -1,7 +1,7 @@ import { ROLE } from '@n8n/api-types'; import { useSettingsStore } from '@/app/stores/settings.store'; import merge from 'lodash/merge'; -import { usePageRedirectionHelper } from './usePageRedirectionHelper.core'; +import { useBasePageRedirectionHelper } from './useBasePageRedirectionHelper'; import { defaultSettings } from '@/__tests__/defaults'; import { useUsersStore } from '@/features/settings/users/users.store'; import { createPinia, setActivePinia } from 'pinia'; @@ -22,7 +22,7 @@ vi.mock('@/app/composables/useWorkflowId', async () => { let settingsStore: ReturnType; let usersStore: ReturnType; let versionStore: ReturnType; -let pageRedirectionHelper: ReturnType; +let pageRedirectionHelper: ReturnType; vi.mock('@/app/composables/useTelemetry', () => { const track = vi.fn(); @@ -35,7 +35,7 @@ vi.mock('@/app/composables/useTelemetry', () => { }; }); -describe('usePageRedirectionHelper', () => { +describe('useBasePageRedirectionHelper', () => { afterEach(() => { vi.clearAllMocks(); }); @@ -46,7 +46,7 @@ describe('usePageRedirectionHelper', () => { usersStore = useUsersStore(); versionStore = useVersionsStore(); - pageRedirectionHelper = usePageRedirectionHelper({ guard: async () => true }); + pageRedirectionHelper = useBasePageRedirectionHelper({ guard: async () => true }); vi.spyOn(cloudPlanApi, 'getAdminPanelLoginCode').mockResolvedValue({ code: '123', @@ -259,7 +259,7 @@ describe('usePageRedirectionHelper', () => { test('aborts the redirect and skips telemetry when the guard resolves false', async () => { const telemetry = useTelemetry(); const initialHref = location.href; - const helper = usePageRedirectionHelper({ guard: async () => false }); + const helper = useBasePageRedirectionHelper({ guard: async () => false }); await helper.goToUpgrade('advanced-permissions', 'upgrade-api', 'redirect'); @@ -269,7 +269,7 @@ describe('usePageRedirectionHelper', () => { test('proceeds with the redirect when the guard resolves true', async () => { const telemetry = useTelemetry(); - const helper = usePageRedirectionHelper({ guard: async () => true }); + const helper = useBasePageRedirectionHelper({ guard: async () => true }); await helper.goToUpgrade('advanced-permissions', 'upgrade-api', 'redirect'); diff --git a/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.core.ts b/packages/frontend/editor-ui/src/app/composables/useBasePageRedirectionHelper.ts similarity index 91% rename from packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.core.ts rename to packages/frontend/editor-ui/src/app/composables/useBasePageRedirectionHelper.ts index 40a7ea8d470..64824e356a6 100644 --- a/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.core.ts +++ b/packages/frontend/editor-ui/src/app/composables/useBasePageRedirectionHelper.ts @@ -13,7 +13,12 @@ import { N8N_PRICING_PAGE_URL } from '@/app/constants'; */ export type UpgradeRedirectGuard = () => Promise; -export function usePageRedirectionHelper({ guard }: { guard: UpgradeRedirectGuard }) { +/** + * Injectable page-redirection composable. The app-facing `usePageRedirectionHelper` + * wraps this and supplies the guard; this base carries no feature dependency and is + * the unit that moves to `@n8n/composables` in N8N-71. + */ +export function useBasePageRedirectionHelper({ guard }: { guard: UpgradeRedirectGuard }) { const usersStore = useUsersStore(); const cloudPlanStore = useCloudPlanStore(); const versionsStore = useVersionsStore(); diff --git a/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.test.ts b/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.test.ts index 12e0e8022ff..d83583be410 100644 --- a/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.test.ts +++ b/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.test.ts @@ -1,9 +1,9 @@ import { usePageRedirectionHelper } from './usePageRedirectionHelper'; -import { usePageRedirectionHelper as useBasePageRedirectionHelper } from './usePageRedirectionHelper.core'; +import { useBasePageRedirectionHelper } from './useBasePageRedirectionHelper'; import { confirmIfBuilderStreaming } from '@/features/ai/assistant/composables/useBuilderStreamingGuard'; -vi.mock('./usePageRedirectionHelper.core', () => ({ - usePageRedirectionHelper: vi.fn(() => ({ +vi.mock('./useBasePageRedirectionHelper', () => ({ + useBasePageRedirectionHelper: vi.fn(() => ({ goToDashboard: vi.fn(), goToVersions: vi.fn(), goToUpgrade: vi.fn(), diff --git a/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.ts b/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.ts index d65124e77a8..481f339fac8 100644 --- a/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.ts +++ b/packages/frontend/editor-ui/src/app/composables/usePageRedirectionHelper.ts @@ -1,7 +1,7 @@ import { confirmIfBuilderStreaming } from '@/features/ai/assistant/composables/useBuilderStreamingGuard'; -import { usePageRedirectionHelper as useBasePageRedirectionHelper } from './usePageRedirectionHelper.core'; +import { useBasePageRedirectionHelper } from './useBasePageRedirectionHelper'; -export type { UpgradeRedirectGuard } from './usePageRedirectionHelper.core'; +export type { UpgradeRedirectGuard } from './useBasePageRedirectionHelper'; /** * App-facing `usePageRedirectionHelper`, pre-bound with the AI builder streaming