diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts index 7ef3d5f383..b9ef64d99d 100644 --- a/packages/editor-ui/src/Interface.ts +++ b/packages/editor-ui/src/Interface.ts @@ -1862,7 +1862,8 @@ export type CloudUpdateLinkSourceType = | 'workflow-history' | 'worker-view' | 'external-secrets' - | 'rbac'; + | 'rbac' + | 'debug'; export type UTMCampaign = | 'upgrade-custom-data-filter' @@ -1883,7 +1884,8 @@ export type UTMCampaign = | 'upgrade-advanced-permissions' | 'upgrade-worker-view' | 'upgrade-external-secrets' - | 'upgrade-rbac'; + | 'upgrade-rbac' + | 'upgrade-debug'; export type N8nBanners = { [key in BannerName]: { diff --git a/packages/editor-ui/src/__tests__/defaults.ts b/packages/editor-ui/src/__tests__/defaults.ts index 7c034604f6..ee5865e923 100644 --- a/packages/editor-ui/src/__tests__/defaults.ts +++ b/packages/editor-ui/src/__tests__/defaults.ts @@ -160,6 +160,9 @@ export const defaultSettings: IN8nUISettings = { ai: { enabled: false, provider: '', + features: { + generateCurl: false, + }, }, workflowHistory: { pruneTime: 0, diff --git a/packages/editor-ui/src/__tests__/server/endpoints/settings.ts b/packages/editor-ui/src/__tests__/server/endpoints/settings.ts index 62050417fc..7aa6dfb730 100644 --- a/packages/editor-ui/src/__tests__/server/endpoints/settings.ts +++ b/packages/editor-ui/src/__tests__/server/endpoints/settings.ts @@ -1,10 +1,9 @@ import type { Server } from 'miragejs'; import { Response } from 'miragejs'; -import type { AppSchema } from '../types'; import { defaultSettings } from '../../defaults'; export function routesForSettings(server: Server) { - server.get('/rest/settings', (schema: AppSchema) => { + server.get('/rest/settings', () => { return new Response( 200, {}, diff --git a/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts b/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts index 26d4f93fd2..46f86fa693 100644 --- a/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts +++ b/packages/editor-ui/src/__tests__/server/endpoints/sourceControl.ts @@ -17,7 +17,7 @@ export function routesForSourceControl(server: Server) { keyGeneratorType: 'ed25519', }; - server.get(`${sourceControlApiRoot}/preferences`, (schema: AppSchema, request: Request) => { + server.get(`${sourceControlApiRoot}/preferences`, () => { return new Response( 200, {}, @@ -27,7 +27,7 @@ export function routesForSourceControl(server: Server) { ); }); - server.post(`${sourceControlApiRoot}/preferences`, (schema: AppSchema, request: Request) => { + server.post(`${sourceControlApiRoot}/preferences`, (_schema: AppSchema, request: Request) => { const requestBody: Partial = jsonParse(request.requestBody); return new Response( @@ -42,7 +42,7 @@ export function routesForSourceControl(server: Server) { ); }); - server.patch(`${sourceControlApiRoot}/preferences`, (schema: AppSchema, request: Request) => { + server.patch(`${sourceControlApiRoot}/preferences`, (_schema: AppSchema, request: Request) => { const requestBody: Partial = jsonParse(request.requestBody); return new Response( diff --git a/packages/editor-ui/src/__tests__/server/endpoints/sso.ts b/packages/editor-ui/src/__tests__/server/endpoints/sso.ts index 0293bab063..a9c13e7285 100644 --- a/packages/editor-ui/src/__tests__/server/endpoints/sso.ts +++ b/packages/editor-ui/src/__tests__/server/endpoints/sso.ts @@ -17,8 +17,8 @@ export function routesForSSO(server: Server) { return new Response(200, {}, { data: samlConfig }); }); - server.post('/rest/sso/saml/config', (schema: AppSchema, request: Request) => { - const requestBody = jsonParse(request.requestBody); + server.post('/rest/sso/saml/config', (_schema: AppSchema, request: Request) => { + const requestBody = jsonParse(request.requestBody); samlConfig = { ...samlConfig, diff --git a/packages/editor-ui/src/__tests__/server/factories/tag.ts b/packages/editor-ui/src/__tests__/server/factories/tag.ts index bed3ca2276..5e1c93070e 100644 --- a/packages/editor-ui/src/__tests__/server/factories/tag.ts +++ b/packages/editor-ui/src/__tests__/server/factories/tag.ts @@ -3,8 +3,8 @@ import type { ITag } from '@/Interface'; import { faker } from '@faker-js/faker'; export const tagFactory = Factory.extend({ - id(i: string) { - return i; + id(i: number) { + return i.toString(); }, name() { return faker.lorem.word(); diff --git a/packages/editor-ui/src/__tests__/server/factories/workflow.ts b/packages/editor-ui/src/__tests__/server/factories/workflow.ts index 6d12a8958b..c15217029e 100644 --- a/packages/editor-ui/src/__tests__/server/factories/workflow.ts +++ b/packages/editor-ui/src/__tests__/server/factories/workflow.ts @@ -3,8 +3,20 @@ import type { IWorkflowDb } from '@/Interface'; import { faker } from '@faker-js/faker'; export const workflowFactory = Factory.extend({ - id(i: string) { - return i; + id(i: number) { + return i.toString(); + }, + versionId(i: number) { + return i.toString(); + }, + active() { + return faker.datatype.boolean(); + }, + nodes() { + return []; + }, + connections() { + return {}; }, name() { return faker.lorem.word(); @@ -12,6 +24,9 @@ export const workflowFactory = Factory.extend({ createdAt() { return faker.date.recent().toISOString(); }, + updatedAt() { + return faker.date.recent().toISOString(); + }, tags() { return faker.lorem.words(2.5).split(' '); }, diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue index a240351381..a032f655ed 100644 --- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue +++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationCard.ee.vue @@ -35,7 +35,7 @@ active-color="#13ce66" inactive-color="#8899AA" data-test-id="workflow-activate-switch" - @update:model-value="onEnabledSwitched($event, destination.id)" + @update:model-value="onEnabledSwitched($event)" > @@ -128,17 +128,19 @@ export default defineComponent({ } }, async onClick(event: Event) { + const cardActions = this.$refs.cardActions as HTMLDivElement | null; + const target = event.target as HTMLDivElement | null; if ( - this.$refs.cardActions === event.target || - this.$refs.cardActions?.contains(event.target) || - event.target?.contains(this.$refs.cardActions) + cardActions === target || + cardActions?.contains(target) || + target?.contains(cardActions) ) { return; } this.$emit('edit', this.destination.id); }, - onEnabledSwitched(state: boolean, destinationId: string) { + onEnabledSwitched(state: boolean) { this.nodeParameters.enabled = state; void this.saveDestination(); }, diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue index 26efa0a1d0..c16bce7403 100644 --- a/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue +++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventSelection.ee.vue @@ -69,7 +69,7 @@