mirror of
https://github.com/n8n-io/n8n.git
synced 2026-10-30 19:35:36 +08:00
refactor(editor): Rename redirection core to match the composable-name convention (no-changelog) (#35012)
Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: multica-agent <github@multica.ai>
This commit is contained in:
co-authored by
Claude Opus 4.8
multica-agent
parent
bc88dc4bd2
commit
bdc49798cd
+6
-6
@@ -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<typeof useSettingsStore>;
|
||||
let usersStore: ReturnType<typeof useUsersStore>;
|
||||
let versionStore: ReturnType<typeof useVersionsStore>;
|
||||
let pageRedirectionHelper: ReturnType<typeof usePageRedirectionHelper>;
|
||||
let pageRedirectionHelper: ReturnType<typeof useBasePageRedirectionHelper>;
|
||||
|
||||
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');
|
||||
|
||||
+6
-1
@@ -13,7 +13,12 @@ import { N8N_PRICING_PAGE_URL } from '@/app/constants';
|
||||
*/
|
||||
export type UpgradeRedirectGuard = () => Promise<boolean>;
|
||||
|
||||
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();
|
||||
@@ -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(),
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user