From 7522dde3d1f17eb7d69755db93261a5c7431b2dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?= =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?= =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?= Date: Wed, 28 Aug 2024 12:28:12 +0200 Subject: [PATCH 01/11] ci: Fix provenance generation during NPM publish (no-changelog) (#10586) --- .github/workflows/release-publish.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml index 522d47ff0f52b..7702fbff927b0 100644 --- a/.github/workflows/release-publish.yml +++ b/.github/workflows/release-publish.yml @@ -13,6 +13,8 @@ jobs: runs-on: ubuntu-latest if: github.event.pull_request.merged == true timeout-minutes: 10 + permissions: + id-token: write env: NPM_CONFIG_PROVENANCE: true outputs: From 4a125f511c5537977652900b7712a2ad908140e7 Mon Sep 17 00:00:00 2001 From: Csaba Tuncsik Date: Wed, 28 Aug 2024 13:06:01 +0200 Subject: [PATCH 02/11] fix(editor): Add tooltips to workflow history button (#10570) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ --- .../MainHeader/WorkflowDetails.spec.ts | 53 ++++++-------- .../components/MainHeader/WorkflowDetails.vue | 55 +++----------- .../MainHeader/WorkflowHistoryButton.test.ts | 63 ++++++++++++++++ .../MainHeader/WorkflowHistoryButton.vue | 73 +++++++++++++++++++ .../src/plugins/i18n/locales/en.json | 4 + 5 files changed, 172 insertions(+), 76 deletions(-) create mode 100644 packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.test.ts create mode 100644 packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.vue diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.spec.ts b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.spec.ts index 4eb0a829d993a..24d10c9a0ef00 100644 --- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.spec.ts +++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.spec.ts @@ -1,30 +1,22 @@ import WorkflowDetails from '@/components/MainHeader/WorkflowDetails.vue'; import { createComponentRenderer } from '@/__tests__/render'; -import { STORES, WORKFLOW_SHARE_MODAL_KEY } from '@/constants'; +import { EnterpriseEditionFeature, STORES, WORKFLOW_SHARE_MODAL_KEY } from '@/constants'; import { createTestingPinia } from '@pinia/testing'; import userEvent from '@testing-library/user-event'; import { useUIStore } from '@/stores/ui.store'; -vi.mock('vue-router', async () => { - const actual = await import('vue-router'); - - return { - ...actual, - useRoute: () => ({ - value: { - params: { - id: '1', - }, - }, - }), - }; -}); +vi.mock('vue-router', () => ({ + useRoute: () => vi.fn(), + useRouter: () => vi.fn(), + RouterLink: vi.fn(), +})); const initialState = { [STORES.SETTINGS]: { settings: { enterprise: { - sharing: true, + [EnterpriseEditionFeature.Sharing]: true, + [EnterpriseEditionFeature.WorkflowHistory]: true, }, }, areTagsEnabled: true, @@ -45,21 +37,26 @@ const initialState = { const renderComponent = createComponentRenderer(WorkflowDetails, { pinia: createTestingPinia({ initialState }), + global: { + stubs: { + RouterLink: true, + }, + }, }); let uiStore: ReturnType; +const workflow = { + id: '1', + name: 'Test Workflow', + tags: ['1', '2'], + active: false, +}; describe('WorkflowDetails', () => { beforeEach(() => { uiStore = useUIStore(); }); it('renders workflow name and tags', async () => { - const workflow = { - id: '1', - name: 'Test Workflow', - tags: ['1', '2'], - }; - const { getByTestId, getByText } = renderComponent({ props: { workflow, @@ -79,11 +76,7 @@ describe('WorkflowDetails', () => { const onSaveButtonClick = vi.fn(); const { getByTestId } = renderComponent({ props: { - workflow: { - id: '1', - name: 'Test Workflow', - tags: [], - }, + workflow, readOnly: false, }, global: { @@ -102,11 +95,7 @@ describe('WorkflowDetails', () => { const { getByTestId } = renderComponent({ props: { - workflow: { - id: '1', - name: 'Test Workflow', - tags: [], - }, + workflow, readOnly: false, }, }); diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue index 12c9cc33a1c4b..dd9a795d4a6da 100644 --- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue +++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue @@ -21,6 +21,7 @@ import SaveButton from '@/components/SaveButton.vue'; import TagsDropdown from '@/components/TagsDropdown.vue'; import InlineTextEdit from '@/components/InlineTextEdit.vue'; import BreakpointsObserver from '@/components/BreakpointsObserver.vue'; +import WorkflowHistoryButton from '@/components/MainHeader/WorkflowHistoryButton.vue'; import { useRootStore } from '@/stores/root.store'; import { useSettingsStore } from '@/stores/settings.store'; @@ -216,19 +217,6 @@ const isWorkflowHistoryFeatureEnabled = computed(() => { return settingsStore.isEnterpriseFeatureEnabled[EnterpriseEditionFeature.WorkflowHistory]; }); -const workflowHistoryRoute = computed<{ name: string; params: { workflowId: string } }>(() => { - return { - name: VIEWS.WORKFLOW_HISTORY, - params: { - workflowId: props.workflow.id, - }, - }; -}); - -const isWorkflowHistoryButtonDisabled = computed(() => { - return isNewWorkflow.value; -}); - const workflowTagIds = computed(() => { return (props.workflow.tags ?? []).map((tag) => (typeof tag === 'string' ? tag : tag.id)); }); @@ -588,6 +576,10 @@ function goToUpgrade() { void uiStore.goToUpgrade('workflow_sharing', 'upgrade-workflow-sharing'); } +function goToWorkflowHistoryUpgrade() { + void uiStore.goToUpgrade('workflow-history', 'upgrade-workflow-history'); +} + function showCreateWorkflowSuccessToast(id?: string) { if (!id || ['new', PLACEHOLDER_EMPTY_WORKFLOW_ID].includes(id)) { let toastTitle = locale.baseText('workflows.create.personal.toast.title'); @@ -732,20 +724,12 @@ function showCreateWorkflowSuccessToast(id?: string) { data-test-id="workflow-save-button" @click="onSaveButtonClick" /> - - - +
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.test.ts b/packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.test.ts new file mode 100644 index 0000000000000..ed26a5afafcf5 --- /dev/null +++ b/packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.test.ts @@ -0,0 +1,63 @@ +import { createComponentRenderer } from '@/__tests__/render'; +import { within } from '@testing-library/vue'; +import userEvent from '@testing-library/user-event'; +import WorkflowHistoryButton from '@/components/MainHeader/WorkflowHistoryButton.vue'; + +vi.mock('vue-router', () => ({ + useRoute: () => vi.fn(), + useRouter: () => vi.fn(), + RouterLink: vi.fn(), +})); + +const renderComponent = createComponentRenderer(WorkflowHistoryButton, { + global: { + stubs: { + RouterLink: true, + 'router-link': { + template: '
', + }, + }, + }, +}); + +describe('WorkflowHistoryButton', () => { + it('should be disabled if the feature is disabled', async () => { + const { getByRole, emitted } = renderComponent({ + props: { + workflowId: '1', + isNewWorkflow: false, + isFeatureEnabled: false, + }, + }); + expect(getByRole('button')).toBeDisabled(); + + await userEvent.hover(getByRole('button')); + expect(getByRole('tooltip')).toBeVisible(); + + within(getByRole('tooltip')).getByText('View plans').click(); + + expect(emitted()).toHaveProperty('upgrade'); + }); + + it('should be disabled if the feature is enabled but the workflow is new', async () => { + const { getByRole } = renderComponent({ + props: { + workflowId: '1', + isNewWorkflow: true, + isFeatureEnabled: true, + }, + }); + expect(getByRole('button')).toBeDisabled(); + }); + + it('should be enabled if the feature is enabled and the workflow is not new', async () => { + const { getByRole } = renderComponent({ + props: { + workflowId: '1', + isNewWorkflow: false, + isFeatureEnabled: true, + }, + }); + expect(getByRole('button')).toBeEnabled(); + }); +}); diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.vue b/packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.vue new file mode 100644 index 0000000000000..afa554e24109b --- /dev/null +++ b/packages/editor-ui/src/components/MainHeader/WorkflowHistoryButton.vue @@ -0,0 +1,73 @@ + + + + + diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json index 7f94aec41c8de..551f99beae1f0 100644 --- a/packages/editor-ui/src/plugins/i18n/locales/en.json +++ b/packages/editor-ui/src/plugins/i18n/locales/en.json @@ -2166,6 +2166,10 @@ "workflowHistory.action.restore.success.title": "Successfully restored workflow version", "workflowHistory.action.clone.success.title": "Successfully cloned workflow version", "workflowHistory.action.clone.success.message": "Open cloned workflow in a new tab", + "workflowHistory.button.tooltip.empty": "This workflow currently has no history to view. Once you've made your first save, you'll be able to view previous versions", + "workflowHistory.button.tooltip.enabled": "Workflow history to view and restore previous versions of your workflows", + "workflowHistory.button.tooltip.disabled": "Upgrade to unlock workflow history to view and restore previous versions of your workflows. {link}", + "workflowHistory.button.tooltip.disabled.link": "View plans", "workflows.heading": "Workflows", "workflows.add": "Add workflow", "workflows.project.add": "Add workflow to project", From e5c7534ebae0d7f42749f76270ca00eb49964d12 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 28 Aug 2024 13:34:34 +0200 Subject: [PATCH 03/11] :rocket: Release 1.57.0 (#10587) Co-authored-by: despairblue <927609+despairblue@users.noreply.github.com> --- CHANGELOG.md | 31 ++++++++++++++++++++++ package.json | 2 +- packages/@n8n/benchmark/package.json | 2 +- packages/@n8n/config/package.json | 2 +- packages/@n8n/nodes-langchain/package.json | 2 +- packages/cli/package.json | 2 +- packages/core/package.json | 2 +- packages/design-system/package.json | 2 +- packages/editor-ui/package.json | 2 +- packages/node-dev/package.json | 2 +- packages/nodes-base/package.json | 2 +- packages/workflow/package.json | 2 +- 12 files changed, 42 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 08aadc87daadc..b9ff1d8de13d0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,34 @@ +# [1.57.0](https://github.com/n8n-io/n8n/compare/n8n@1.56.0...n8n@1.57.0) (2024-08-28) + + +### Bug Fixes + +* **AI Agent Node:** Allow AWS Bedrock Chat to be used with conversational agent ([#10489](https://github.com/n8n-io/n8n/issues/10489)) ([bdcc657](https://github.com/n8n-io/n8n/commit/bdcc657965af5f604aac1eaff7d937f69a08ce1c)) +* **core:** Make boolean config value parsing backward-compatible ([#10560](https://github.com/n8n-io/n8n/issues/10560)) ([70b410f](https://github.com/n8n-io/n8n/commit/70b410f4b00dd599fcd4249aa105098aa262da66)) +* **core:** Restore Redis cache key ([#10520](https://github.com/n8n-io/n8n/issues/10520)) ([873056a](https://github.com/n8n-io/n8n/commit/873056a92e52cc629d2873c960656d5f06d4728e)) +* **core:** Scheduler tasks should not trigger on follower instances ([#10507](https://github.com/n8n-io/n8n/issues/10507)) ([3428f28](https://github.com/n8n-io/n8n/commit/3428f28a732f79e067b3cb515cc59d835de246a6)) +* **core:** Stop explicit redis client disconnect on shutdown ([#10551](https://github.com/n8n-io/n8n/issues/10551)) ([f712812](https://github.com/n8n-io/n8n/commit/f71281221efb79d65d8d7610c292bc90cef13d7a)) +* **editor:** Ensure `Datatable` component renders `All` option ([#10525](https://github.com/n8n-io/n8n/issues/10525)) ([bc27beb](https://github.com/n8n-io/n8n/commit/bc27beb6629883003a8991d7e840ffaa066d41ac)) +* **editor:** Prevent Safari users from accessing the frontend over insecure contexts ([#10510](https://github.com/n8n-io/n8n/issues/10510)) ([a73b9a3](https://github.com/n8n-io/n8n/commit/a73b9a38d6c48e2f78593328e7d9933f2493dbb6)) +* **editor:** Scale output item selector input width with value ([#10555](https://github.com/n8n-io/n8n/issues/10555)) ([52c574d](https://github.com/n8n-io/n8n/commit/52c574d83f344f03b0e39984bbc3ac0402e50791)) +* **Google Sheets Trigger Node:** Show sheet name is too long error ([#10542](https://github.com/n8n-io/n8n/issues/10542)) ([4e15007](https://github.com/n8n-io/n8n/commit/4e1500757700ec984cdad8b9cfcd76ee00ae127e)) +* **Wait Node:** Prevent waiting until invalid date ([#10523](https://github.com/n8n-io/n8n/issues/10523)) ([c0e7620](https://github.com/n8n-io/n8n/commit/c0e7620036738f8d0b382d0d0610b981dcbc29e0)) + + +### Features + +* Add new credentials for the HTTP Request node ([#9833](https://github.com/n8n-io/n8n/issues/9833)) ([26f1af3](https://github.com/n8n-io/n8n/commit/26f1af397b2b25e3394fc2dae91a5c281bf33d66)) +* **AI Agent Node:** Add tutorial link to agent node ([#10493](https://github.com/n8n-io/n8n/issues/10493)) ([5c7cc36](https://github.com/n8n-io/n8n/commit/5c7cc36c23e58a47a1e71911e7303a1bd54f167e)) +* **core:** Expose queue metrics for Prometheus ([#10559](https://github.com/n8n-io/n8n/issues/10559)) ([008c510](https://github.com/n8n-io/n8n/commit/008c510b7623fefb8c60730c7eac54dd9bb2e3fc)) +* **editor:** Implement workflowSelector parameter type ([#10482](https://github.com/n8n-io/n8n/issues/10482)) ([84e54be](https://github.com/n8n-io/n8n/commit/84e54beac763f25399c9687f695f1e658e3ce434)) + + +### Performance Improvements + +* **core:** Make execution queries faster ([#9817](https://github.com/n8n-io/n8n/issues/9817)) ([dc7dc99](https://github.com/n8n-io/n8n/commit/dc7dc995d5e2ea8fbd0dcb54cfa8aa93ecb437c9)) + + + # [1.56.0](https://github.com/n8n-io/n8n/compare/n8n@1.55.0...n8n@1.56.0) (2024-08-21) diff --git a/package.json b/package.json index 545a7c851f915..b4c470cbea65c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "n8n-monorepo", - "version": "1.56.0", + "version": "1.57.0", "private": true, "engines": { "node": ">=20.15", diff --git a/packages/@n8n/benchmark/package.json b/packages/@n8n/benchmark/package.json index 81588845b759a..1e733814277a6 100644 --- a/packages/@n8n/benchmark/package.json +++ b/packages/@n8n/benchmark/package.json @@ -1,6 +1,6 @@ { "name": "@n8n/n8n-benchmark", - "version": "1.0.0", + "version": "1.1.0", "description": "Cli for running benchmark tests for n8n", "main": "dist/index", "scripts": { diff --git a/packages/@n8n/config/package.json b/packages/@n8n/config/package.json index 36d280a71f251..905458d9ed06b 100644 --- a/packages/@n8n/config/package.json +++ b/packages/@n8n/config/package.json @@ -1,6 +1,6 @@ { "name": "@n8n/config", - "version": "1.6.0", + "version": "1.7.0", "scripts": { "clean": "rimraf dist .turbo", "dev": "pnpm watch", diff --git a/packages/@n8n/nodes-langchain/package.json b/packages/@n8n/nodes-langchain/package.json index 7e114c415611a..7f64abea6568e 100644 --- a/packages/@n8n/nodes-langchain/package.json +++ b/packages/@n8n/nodes-langchain/package.json @@ -1,6 +1,6 @@ { "name": "@n8n/n8n-nodes-langchain", - "version": "1.56.0", + "version": "1.57.0", "description": "", "main": "index.js", "scripts": { diff --git a/packages/cli/package.json b/packages/cli/package.json index 481c91032a512..fc43d35a8c3d0 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -1,6 +1,6 @@ { "name": "n8n", - "version": "1.56.0", + "version": "1.57.0", "description": "n8n Workflow Automation Tool", "main": "dist/index", "types": "dist/index.d.ts", diff --git a/packages/core/package.json b/packages/core/package.json index 601930264b0ea..04412c4c8ce14 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -1,6 +1,6 @@ { "name": "n8n-core", - "version": "1.56.0", + "version": "1.57.0", "description": "Core functionality of n8n", "main": "dist/index", "types": "dist/index.d.ts", diff --git a/packages/design-system/package.json b/packages/design-system/package.json index 09116e5218063..9ce733f10712b 100644 --- a/packages/design-system/package.json +++ b/packages/design-system/package.json @@ -1,6 +1,6 @@ { "name": "n8n-design-system", - "version": "1.46.0", + "version": "1.47.0", "main": "src/main.ts", "import": "src/main.ts", "scripts": { diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json index c81e9b960a0c6..22292c3c65456 100644 --- a/packages/editor-ui/package.json +++ b/packages/editor-ui/package.json @@ -1,6 +1,6 @@ { "name": "n8n-editor-ui", - "version": "1.56.0", + "version": "1.57.0", "description": "Workflow Editor UI for n8n", "main": "index.js", "scripts": { diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json index 256b992fa2de2..15ac29936e6fb 100644 --- a/packages/node-dev/package.json +++ b/packages/node-dev/package.json @@ -1,6 +1,6 @@ { "name": "n8n-node-dev", - "version": "1.56.0", + "version": "1.57.0", "description": "CLI to simplify n8n credentials/node development", "main": "dist/src/index", "types": "dist/src/index.d.ts", diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json index 4239424b67a08..efde3ca47b101 100644 --- a/packages/nodes-base/package.json +++ b/packages/nodes-base/package.json @@ -1,6 +1,6 @@ { "name": "n8n-nodes-base", - "version": "1.56.0", + "version": "1.57.0", "description": "Base nodes of n8n", "main": "index.js", "scripts": { diff --git a/packages/workflow/package.json b/packages/workflow/package.json index bbddb85cd4f11..9c543dac2fc27 100644 --- a/packages/workflow/package.json +++ b/packages/workflow/package.json @@ -1,6 +1,6 @@ { "name": "n8n-workflow", - "version": "1.55.0", + "version": "1.56.0", "description": "Workflow base code of n8n", "main": "dist/index.js", "module": "src/index.ts", From d7241cfc3ac0a443f09921a88853decd4245698e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= Date: Wed, 28 Aug 2024 13:59:27 +0200 Subject: [PATCH 04/11] refactor(core): Standardize filename casing for services and Public API (no-changelog) (#10579) --- packages/cli/scripts/build.mjs | 8 +++--- .../cli/src/__tests__/wait-tracker.test.ts | 2 +- .../cli/src/__tests__/workflow-runner.test.ts | 2 +- packages/cli/src/active-workflow-manager.ts | 2 +- packages/cli/src/commands/worker.ts | 2 +- ...dynamic-node-parameters.controller.test.ts | 2 +- .../__tests__/me.controller.test.ts | 2 +- .../__tests__/owner.controller.test.ts | 2 +- .../active-workflows.controller.ts | 2 +- .../controllers/ai-assistant.controller.ts | 2 +- .../dynamic-node-parameters.controller.ts | 2 +- packages/cli/src/controllers/me.controller.ts | 2 +- .../shared/shared-hook-functions.ts | 2 +- .../execution-recovery.service.test.ts | 2 +- .../external-secrets-manager.ee.test.ts | 2 +- packages/cli/src/license.ts | 2 +- .../src/{PublicApi => public-api}/index.ts | 2 +- .../swagger-theme.css} | 0 .../src/{PublicApi => public-api}/types.ts | 0 .../v1/handlers/audit/audit.handler.ts | 4 +-- .../v1/handlers/audit/spec/paths/audit.yml | 0 .../v1/handlers/audit/spec/schemas/audit.yml | 0 .../credentials/credentials.handler.ts | 0 .../credentials/credentials.middleware.ts | 0 .../credentials/credentials.service.ts | 0 .../spec/paths/credentials.id.transfer.yml | 0 .../credentials/spec/paths/credentials.id.yml | 0 .../spec/paths/credentials.schema.id.yml | 0 .../credentials/spec/paths/credentials.yml | 0 .../credentials/spec/schemas/credential.yml | 0 .../spec/schemas/credentialType.yml | 0 .../spec/schemas/parameters/credentialId.yml | 0 .../handlers/executions/executions.handler.ts | 0 .../executions/spec/paths/executions.id.yml | 0 .../executions/spec/paths/executions.yml | 0 .../executions/spec/schemas/execution.yml | 0 .../executions/spec/schemas/executionList.yml | 0 .../spec/schemas/parameters/executionId.yml | 0 .../spec/schemas/parameters/includeData.yml | 0 .../v1/handlers/projects/projects.handler.ts | 2 +- .../spec/paths/projects.projectId.yml | 0 .../handlers/projects/spec/paths/projects.yml | 0 .../spec/schemas/parameters/projectId.yml | 0 .../projects/spec/schemas/project.yml | 0 .../projects/spec/schemas/projectList.yml | 0 .../source-control/source-control.handler.ts} | 0 .../spec/paths/sourceControl.yml | 2 +- .../spec/schemas/importResult.yml | 0 .../source-control}/spec/schemas/pull.yml | 0 .../v1/handlers/tags/spec/paths/tags.id.yml | 0 .../v1/handlers/tags/spec/paths/tags.yml | 0 .../tags/spec/schemas/parameters/tagId.yml | 0 .../v1/handlers/tags/spec/schemas/tag.yml | 0 .../v1/handlers/tags/spec/schemas/tagList.yml | 0 .../v1/handlers/tags/tags.handler.ts | 0 .../users/spec/paths/users.id.role.yml | 0 .../v1/handlers/users/spec/paths/users.id.yml | 0 .../v1/handlers/users/spec/paths/users.yml | 0 .../spec/schemas/parameters/includeRole.yml | 0 .../schemas/parameters/userIdentifier.yml | 0 .../v1/handlers/users/spec/schemas/role.yml | 0 .../v1/handlers/users/spec/schemas/user.yml | 0 .../handlers/users/spec/schemas/userList.yml | 0 .../v1/handlers/users/users.handler.ee.ts | 0 .../v1/handlers/users/users.service.ee.ts | 0 .../variables/spec/paths/variables.id.yml | 0 .../variables/spec/paths/variables.yml | 0 .../spec/schemas/parameters/variableId.yml | 0 .../variables/spec/schemas/variable.yml | 0 .../variables/spec/schemas/variableList.yml | 0 .../handlers/variables/variables.handler.ts | 2 +- .../spec/paths/workflows.id.activate.yml | 0 .../spec/paths/workflows.id.deactivate.yml | 0 .../spec/paths/workflows.id.tags.yml | 0 .../spec/paths/workflows.id.transfer.yml | 0 .../workflows/spec/paths/workflows.id.yml | 0 .../workflows/spec/paths/workflows.yml | 0 .../handlers/workflows/spec/schemas/node.yml | 0 .../spec/schemas/parameters/workflowId.yml | 0 .../workflows/spec/schemas/tagIds.yml | 0 .../workflows/spec/schemas/workflow.yml | 0 .../workflows/spec/schemas/workflowList.yml | 0 .../spec/schemas/workflowSettings.yml | 0 .../workflows/spec/schemas/workflowTags.yml | 0 .../handlers/workflows/workflows.handler.ts | 0 .../handlers/workflows/workflows.service.ts | 0 .../{PublicApi => public-api}/v1/openapi.yml | 2 +- .../shared/middlewares/global.middleware.ts | 0 .../v1/shared/services/pagination.service.ts | 0 .../v1/shared/spec/parameters/_index.yml | 0 .../v1/shared/spec/parameters/cursor.yml | 0 .../v1/shared/spec/parameters/limit.yml | 0 .../v1/shared/spec/responses/_index.yml | 0 .../v1/shared/spec/responses/badRequest.yml | 0 .../v1/shared/spec/responses/conflict.yml | 0 .../v1/shared/spec/responses/forbidden.yml | 0 .../v1/shared/spec/responses/notFound.yml | 0 .../v1/shared/spec/responses/unauthorized.yml | 0 .../v1/shared/spec/schemas/_index.yml | 4 +-- .../v1/shared/spec/schemas/error.yml | 0 .../risk-reporters/instance-risk-reporter.ts | 2 +- packages/cli/src/server.ts | 2 +- ...st.ts => active-workflows.service.test.ts} | 2 +- ....ts => community-packages.service.test.ts} | 0 ....ts => execution-metadata.service.test.ts} | 2 +- .../__tests__/orchestration.service.test.ts | 14 +++++----- .../__tests__/ownership.service.test.ts | 2 +- ...service.ts => active-workflows.service.ts} | 0 ...ant.service.ts => ai-assistant.service.ts} | 0 ....ts => dynamic-node-parameters.service.ts} | 0 ...rvice.ts => execution-metadata.service.ts} | 0 packages/cli/src/services/frontend.service.ts | 2 +- .../orchestration.handler.base.service.ts | 2 +- .../cli/src/services/orchestration.service.ts | 6 ++--- .../cli/src/services/orchestration/helpers.ts | 4 +-- ...Main.ts => handle-command-message-main.ts} | 0 ...=> handle-worker-response-message-main.ts} | 4 +-- ...MainSetup.ee.ts => multi-main-setup.ee.ts} | 2 +- .../orchestration.handler.main.service.ts | 6 ++--- .../src/services/orchestration/main/types.ts | 2 +- ...k.ts => handle-command-message-webhook.ts} | 0 .../orchestration.handler.webhook.service.ts | 4 +-- ...er.ts => handle-command-message-worker.ts} | 4 +-- .../orchestration.handler.worker.service.ts | 2 +- .../services/orchestration/worker/types.ts | 2 +- packages/cli/src/services/redis.service.ts | 4 +-- .../{RedisConstants.ts => redis-constants.ts} | 0 ...asses.ts => redis-service-base-classes.ts} | 0 ...eCommands.ts => redis-service-commands.ts} | 0 ....ts => redis-service-pub-sub-publisher.ts} | 6 ++--- ...ts => redis-service-pub-sub-subscriber.ts} | 4 +-- ....service.ts => user-onboarding.service.ts} | 0 ...Webhooks.test.ts => test-webhooks.test.ts} | 0 ...est.ts => webhook-request-handler.test.ts} | 0 .../cli/src/workflows/workflows.controller.ts | 2 +- .../active-workflow-manager.test.ts | 2 +- .../cli/test/integration/auth.api.test.ts | 2 +- ...ta.api.test.ts => binary-data.api.test.ts} | 0 .../commands/credentials.cmd.test.ts | 22 +++++++-------- .../credentials-updated.json | 0 .../credentials.json | 0 .../separate/separate-credential.json | 0 .../combined-with-update/original.json | 0 .../combined-with-update/updated.json | 0 .../combined/combined.json | 0 .../separate/001-activeWorkflow.json | 0 .../separate/002-inactiveWorkflow.json | 0 .../integration/commands/import.cmd.test.ts | 27 +++++++++++-------- .../integration/commands/ldap/reset.test.ts | 2 +- .../integration/commands/license.cmd.test.ts | 2 +- .../integration/commands/reset.cmd.test.ts | 4 +-- .../commands/update/workflow.test.ts | 4 +-- .../integration/commands/worker.cmd.test.ts | 2 +- ...dynamic-node-parameters.controller.test.ts | 2 +- .../controllers/oauth/oauth2.api.test.ts | 2 +- ...per.test.ts => credentials-helper.test.ts} | 2 +- .../credentials/credentials.api.ee.test.ts | 2 +- .../credentials/credentials.api.test.ts | 2 +- .../credentials/credentials.service.test.ts | 2 +- .../cli/test/integration/cta.service.test.ts | 4 +-- .../repositories/execution.repository.test.ts | 2 +- .../repositories/project.repository.test.ts | 2 +- .../repositories/workflow.repository.test.ts | 2 +- .../test/integration/debug.controller.test.ts | 2 +- .../source-control-import.service.test.ts | 2 +- ...Control.test.ts => source-control.test.ts} | 2 +- .../execution.service.integration.test.ts | 2 +- .../integration/executions.controller.test.ts | 2 +- .../external-secrets.api.test.ts} | 2 +- .../test/integration/import.service.test.ts | 2 +- .../test/integration/ldap/ldap.api.test.ts | 2 +- .../license-metrics.repository.test.ts | 2 +- .../cli/test/integration/license.api.test.ts | 2 +- packages/cli/test/integration/me.api.test.ts | 2 +- .../cli/test/integration/mfa/mfa.api.test.ts | 2 +- ...bodyParser.test.ts => body-parser.test.ts} | 0 .../cli/test/integration/owner.api.test.ts | 2 +- ...api.test.ts => password-reset.api.test.ts} | 4 +-- .../integration/permission-checker.test.ts | 2 +- .../cli/test/integration/project.api.test.ts | 4 +-- .../project.service.integration.test.ts | 2 +- .../test/integration/pruning.service.test.ts | 2 +- .../credentials.test.ts | 2 +- .../executions.test.ts | 2 +- .../projects.test.ts | 2 +- .../{publicApi => public-api}/tags.test.ts | 2 +- .../users.ee.test.ts | 2 +- .../{publicApi => public-api}/users.test.ts | 2 +- .../variables.test.ts | 2 +- .../workflows.test.ts | 2 +- ...mlHelpers.test.ts => saml-helpers.test.ts} | 4 +-- .../test/integration/saml/saml.api.test.ts | 2 +- .../{sampleMetadata.ts => sample-metadata.ts} | 0 ...t.ts => credentials-risk-reporter.test.ts} | 2 +- ...test.ts => database-risk-reporter.test.ts} | 2 +- ...st.ts => filesystem-risk-reporter.test.ts} | 2 +- ...test.ts => instance-risk-reporter.test.ts} | 2 +- ...er.test.ts => nodes-risk-reporter.test.ts} | 2 +- ....ts => execution-metadata.service.test.ts} | 4 +-- .../services/project.service.test.ts | 2 +- ...s => workflow-static-data.service.test.ts} | 2 +- ...workflowHistory.ts => workflow-history.ts} | 0 ...owStatistics.ts => workflow-statistics.ts} | 0 .../shared/{testDb.ts => test-db.ts} | 0 .../{communityNodes.ts => community-nodes.ts} | 0 .../test/integration/shared/utils/index.ts | 4 +-- .../utils/{testCommand.ts => test-command.ts} | 2 +- .../utils/{testServer.ts => test-server.ts} | 4 +-- .../cli/test/integration/tags.api.test.ts | 2 +- .../test/integration/user.repository.test.ts | 2 +- .../cli/test/integration/users.api.test.ts | 2 +- .../cli/test/integration/variables.test.ts | 2 +- .../cli/test/integration/webhooks.api.test.ts | 2 +- ...st.ts => workflow-history-manager.test.ts} | 4 +-- ...i.test.ts => workflow-history.api.test.ts} | 4 +-- ...tag-mapping.repository.integration.test.ts | 2 +- ...st.ts => workflow-sharing.service.test.ts} | 2 +- .../workflows/workflow.service.ee.test.ts | 2 +- .../workflows/workflow.service.test.ts | 2 +- ...er-with-active-workflow-manager.ee.test.ts | 2 +- .../workflows/workflows.controller.ee.test.ts | 2 +- .../workflows/workflows.controller.test.ts | 2 +- .../utils.ts | 0 .../{mockObjects.ts => mock-objects.ts} | 0 .../test/shared/{testData.ts => test-data.ts} | 0 packages/cli/test/teardown.ts | 2 +- 226 files changed, 177 insertions(+), 172 deletions(-) rename packages/cli/src/{PublicApi => public-api}/index.ts (98%) rename packages/cli/src/{PublicApi/swaggerTheme.css => public-api/swagger-theme.css} (100%) rename packages/cli/src/{PublicApi => public-api}/types.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/audit/audit.handler.ts (81%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/audit/spec/paths/audit.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/audit/spec/schemas/audit.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/credentials/credentials.handler.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/credentials/credentials.middleware.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/credentials/credentials.service.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/credentials/spec/paths/credentials.id.transfer.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/credentials/spec/paths/credentials.id.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/credentials/spec/paths/credentials.schema.id.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/credentials/spec/paths/credentials.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/credentials/spec/schemas/credential.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/credentials/spec/schemas/credentialType.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/credentials/spec/schemas/parameters/credentialId.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/executions/executions.handler.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/executions/spec/paths/executions.id.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/executions/spec/paths/executions.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/executions/spec/schemas/execution.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/executions/spec/schemas/executionList.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/executions/spec/schemas/parameters/executionId.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/executions/spec/schemas/parameters/includeData.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/projects/projects.handler.ts (96%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/projects/spec/paths/projects.projectId.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/projects/spec/paths/projects.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/projects/spec/schemas/parameters/projectId.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/projects/spec/schemas/project.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/projects/spec/schemas/projectList.yml (100%) rename packages/cli/src/{PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts => public-api/v1/handlers/source-control/source-control.handler.ts} (100%) rename packages/cli/src/{PublicApi/v1/handlers/sourceControl => public-api/v1/handlers/source-control}/spec/paths/sourceControl.yml (89%) rename packages/cli/src/{PublicApi/v1/handlers/sourceControl => public-api/v1/handlers/source-control}/spec/schemas/importResult.yml (100%) rename packages/cli/src/{PublicApi/v1/handlers/sourceControl => public-api/v1/handlers/source-control}/spec/schemas/pull.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/tags/spec/paths/tags.id.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/tags/spec/paths/tags.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/tags/spec/schemas/parameters/tagId.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/tags/spec/schemas/tag.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/tags/spec/schemas/tagList.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/tags/tags.handler.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/users/spec/paths/users.id.role.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/users/spec/paths/users.id.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/users/spec/paths/users.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/users/spec/schemas/parameters/includeRole.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/users/spec/schemas/parameters/userIdentifier.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/users/spec/schemas/role.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/users/spec/schemas/user.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/users/spec/schemas/userList.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/users/users.handler.ee.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/users/users.service.ee.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/variables/spec/paths/variables.id.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/variables/spec/paths/variables.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/variables/spec/schemas/parameters/variableId.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/variables/spec/schemas/variable.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/variables/spec/schemas/variableList.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/variables/variables.handler.ts (96%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/paths/workflows.id.activate.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/paths/workflows.id.deactivate.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/paths/workflows.id.tags.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/paths/workflows.id.transfer.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/paths/workflows.id.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/paths/workflows.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/schemas/node.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/schemas/parameters/workflowId.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/schemas/tagIds.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/schemas/workflow.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/schemas/workflowList.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/schemas/workflowSettings.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/spec/schemas/workflowTags.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/workflows.handler.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/handlers/workflows/workflows.service.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/openapi.yml (97%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/middlewares/global.middleware.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/services/pagination.service.ts (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/parameters/_index.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/parameters/cursor.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/parameters/limit.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/responses/_index.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/responses/badRequest.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/responses/conflict.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/responses/forbidden.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/responses/notFound.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/responses/unauthorized.yml (100%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/schemas/_index.yml (87%) rename packages/cli/src/{PublicApi => public-api}/v1/shared/spec/schemas/error.yml (100%) rename packages/cli/src/services/__tests__/{activeWorkflows.service.test.ts => active-workflows.service.test.ts} (97%) rename packages/cli/src/services/__tests__/{communityPackages.service.test.ts => community-packages.service.test.ts} (100%) rename packages/cli/src/services/__tests__/{ExecutionMetadataService.test.ts => execution-metadata.service.test.ts} (91%) rename packages/cli/src/services/{activeWorkflows.service.ts => active-workflows.service.ts} (100%) rename packages/cli/src/services/{aiAsisstant.service.ts => ai-assistant.service.ts} (100%) rename packages/cli/src/services/{dynamicNodeParameters.service.ts => dynamic-node-parameters.service.ts} (100%) rename packages/cli/src/services/{executionMetadata.service.ts => execution-metadata.service.ts} (100%) rename packages/cli/src/services/orchestration/main/{handleCommandMessageMain.ts => handle-command-message-main.ts} (100%) rename packages/cli/src/services/orchestration/main/{handleWorkerResponseMessageMain.ts => handle-worker-response-message-main.ts} (96%) rename packages/cli/src/services/orchestration/main/{MultiMainSetup.ee.ts => multi-main-setup.ee.ts} (97%) rename packages/cli/src/services/orchestration/webhook/{handleCommandMessageWebhook.ts => handle-command-message-webhook.ts} (100%) rename packages/cli/src/services/orchestration/worker/{handleCommandMessageWorker.ts => handle-command-message-worker.ts} (98%) rename packages/cli/src/services/redis/{RedisConstants.ts => redis-constants.ts} (100%) rename packages/cli/src/services/redis/{RedisServiceBaseClasses.ts => redis-service-base-classes.ts} (100%) rename packages/cli/src/services/redis/{RedisServiceCommands.ts => redis-service-commands.ts} (100%) rename packages/cli/src/services/redis/{RedisServicePubSubPublisher.ts => redis-service-pub-sub-publisher.ts} (92%) rename packages/cli/src/services/redis/{RedisServicePubSubSubscriber.ts => redis-service-pub-sub-subscriber.ts} (94%) rename packages/cli/src/services/{userOnboarding.service.ts => user-onboarding.service.ts} (100%) rename packages/cli/src/webhooks/__tests__/{TestWebhooks.test.ts => test-webhooks.test.ts} (100%) rename packages/cli/src/webhooks/__tests__/{WebhookRequestHandler.test.ts => webhook-request-handler.test.ts} (100%) rename packages/cli/test/integration/{binaryData.api.test.ts => binary-data.api.test.ts} (100%) rename packages/cli/test/integration/commands/{importCredentials => import-credentials}/credentials-updated.json (100%) rename packages/cli/test/integration/commands/{importCredentials => import-credentials}/credentials.json (100%) rename packages/cli/test/integration/commands/{importCredentials => import-credentials}/separate/separate-credential.json (100%) rename packages/cli/test/integration/commands/{importWorkflows => import-workflows}/combined-with-update/original.json (100%) rename packages/cli/test/integration/commands/{importWorkflows => import-workflows}/combined-with-update/updated.json (100%) rename packages/cli/test/integration/commands/{importWorkflows => import-workflows}/combined/combined.json (100%) rename packages/cli/test/integration/commands/{importWorkflows => import-workflows}/separate/001-activeWorkflow.json (100%) rename packages/cli/test/integration/commands/{importWorkflows => import-workflows}/separate/002-inactiveWorkflow.json (100%) rename packages/cli/test/integration/{CredentialsHelper.test.ts => credentials-helper.test.ts} (98%) rename packages/cli/test/integration/environments/{SourceControl.test.ts => source-control.test.ts} (98%) rename packages/cli/test/integration/{ExternalSecrets/externalSecrets.api.test.ts => external-secrets/external-secrets.api.test.ts} (99%) rename packages/cli/test/integration/middlewares/{bodyParser.test.ts => body-parser.test.ts} (100%) rename packages/cli/test/integration/{passwordReset.api.test.ts => password-reset.api.test.ts} (98%) rename packages/cli/test/integration/{publicApi => public-api}/credentials.test.ts (99%) rename packages/cli/test/integration/{publicApi => public-api}/executions.test.ts (99%) rename packages/cli/test/integration/{publicApi => public-api}/projects.test.ts (99%) rename packages/cli/test/integration/{publicApi => public-api}/tags.test.ts (99%) rename packages/cli/test/integration/{publicApi => public-api}/users.ee.test.ts (99%) rename packages/cli/test/integration/{publicApi => public-api}/users.test.ts (99%) rename packages/cli/test/integration/{publicApi => public-api}/variables.test.ts (98%) rename packages/cli/test/integration/{publicApi => public-api}/workflows.test.ts (99%) rename packages/cli/test/integration/saml/{samlHelpers.test.ts => saml-helpers.test.ts} (88%) rename packages/cli/test/integration/saml/{sampleMetadata.ts => sample-metadata.ts} (100%) rename packages/cli/test/integration/security-audit/{CredentialsRiskReporter.test.ts => credentials-risk-reporter.test.ts} (99%) rename packages/cli/test/integration/security-audit/{DatabaseRiskReporter.test.ts => database-risk-reporter.test.ts} (99%) rename packages/cli/test/integration/security-audit/{FilesystemRiskReporter.test.ts => filesystem-risk-reporter.test.ts} (97%) rename packages/cli/test/integration/security-audit/{InstanceRiskReporter.test.ts => instance-risk-reporter.test.ts} (99%) rename packages/cli/test/integration/security-audit/{NodesRiskReporter.test.ts => nodes-risk-reporter.test.ts} (98%) rename packages/cli/test/integration/services/{executionMetadata.service.test.ts => execution-metadata.service.test.ts} (92%) rename packages/cli/test/integration/services/{workflowStaticData.service.test.ts => workflow-static-data.service.test.ts} (97%) rename packages/cli/test/integration/shared/db/{workflowHistory.ts => workflow-history.ts} (100%) rename packages/cli/test/integration/shared/db/{workflowStatistics.ts => workflow-statistics.ts} (100%) rename packages/cli/test/integration/shared/{testDb.ts => test-db.ts} (100%) rename packages/cli/test/integration/shared/utils/{communityNodes.ts => community-nodes.ts} (100%) rename packages/cli/test/integration/shared/utils/{testCommand.ts => test-command.ts} (96%) rename packages/cli/test/integration/shared/utils/{testServer.ts => test-server.ts} (98%) rename packages/cli/test/integration/{workflowHistoryManager.test.ts => workflow-history-manager.test.ts} (98%) rename packages/cli/test/integration/{workflowHistory.api.test.ts => workflow-history.api.test.ts} (98%) rename packages/cli/test/integration/workflows/{workflowSharing.service.test.ts => workflow-sharing.service.test.ts} (98%) rename packages/cli/test/shared/{ExternalSecrets => external-secrets}/utils.ts (100%) rename packages/cli/test/shared/{mockObjects.ts => mock-objects.ts} (100%) rename packages/cli/test/shared/{testData.ts => test-data.ts} (100%) diff --git a/packages/cli/scripts/build.mjs b/packages/cli/scripts/build.mjs index 36076ccfd4f04..f6d00d41da73d 100644 --- a/packages/cli/scripts/build.mjs +++ b/packages/cli/scripts/build.mjs @@ -9,7 +9,7 @@ const __dirname = path.dirname(__filename); const ROOT_DIR = path.resolve(__dirname, '..'); const SPEC_FILENAME = 'openapi.yml'; -const SPEC_THEME_FILENAME = 'swaggerTheme.css'; +const SPEC_THEME_FILENAME = 'swagger-theme.css'; const publicApiEnabled = process.env.N8N_PUBLIC_API_DISABLED !== 'true'; @@ -32,15 +32,15 @@ function copyUserManagementEmailTemplates() { function copySwaggerTheme() { const swaggerTheme = { - source: path.resolve(ROOT_DIR, 'src', 'PublicApi', SPEC_THEME_FILENAME), - destination: path.resolve(ROOT_DIR, 'dist', 'PublicApi'), + source: path.resolve(ROOT_DIR, 'src', 'public-api', SPEC_THEME_FILENAME), + destination: path.resolve(ROOT_DIR, 'dist', 'public-api'), }; shell.cp('-r', swaggerTheme.source, swaggerTheme.destination); } function bundleOpenApiSpecs() { - const publicApiDir = path.resolve(ROOT_DIR, 'src', 'PublicApi'); + const publicApiDir = path.resolve(ROOT_DIR, 'src', 'public-api'); shell .find(publicApiDir) diff --git a/packages/cli/src/__tests__/wait-tracker.test.ts b/packages/cli/src/__tests__/wait-tracker.test.ts index ee0697e110e99..204055b1d9cea 100644 --- a/packages/cli/src/__tests__/wait-tracker.test.ts +++ b/packages/cli/src/__tests__/wait-tracker.test.ts @@ -3,7 +3,7 @@ import { mock } from 'jest-mock-extended'; import type { ExecutionRepository } from '@/databases/repositories/execution.repository'; import type { IExecutionResponse } from '@/Interfaces'; import { OrchestrationService } from '@/services/orchestration.service'; -import type { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee'; +import type { MultiMainSetup } from '@/services/orchestration/main/multi-main-setup.ee'; jest.useFakeTimers(); diff --git a/packages/cli/src/__tests__/workflow-runner.test.ts b/packages/cli/src/__tests__/workflow-runner.test.ts index 542046e21b282..09e3bfb7b0828 100644 --- a/packages/cli/src/__tests__/workflow-runner.test.ts +++ b/packages/cli/src/__tests__/workflow-runner.test.ts @@ -4,7 +4,7 @@ import type { User } from '@/databases/entities/User'; import { WorkflowRunner } from '@/workflow-runner'; import config from '@/config'; -import * as testDb from '@test-integration/testDb'; +import * as testDb from '@test-integration/test-db'; import { setupTestServer } from '@test-integration/utils'; import { createUser } from '@test-integration/db/users'; import { createWorkflow } from '@test-integration/db/workflows'; diff --git a/packages/cli/src/active-workflow-manager.ts b/packages/cli/src/active-workflow-manager.ts index 358d2b514f892..c15e9e6bde983 100644 --- a/packages/cli/src/active-workflow-manager.ts +++ b/packages/cli/src/active-workflow-manager.ts @@ -45,7 +45,7 @@ import { Logger } from './logger'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { OrchestrationService } from '@/services/orchestration.service'; import { ActivationErrorsService } from '@/activation-errors.service'; -import { ActiveWorkflowsService } from '@/services/activeWorkflows.service'; +import { ActiveWorkflowsService } from '@/services/active-workflows.service'; import { WorkflowExecutionService } from '@/workflows/workflow-execution.service'; import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service'; import { OnShutdown } from '@/decorators/on-shutdown'; diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts index 05062ac78a1c3..fdbe448c11b2a 100644 --- a/packages/cli/src/commands/worker.ts +++ b/packages/cli/src/commands/worker.ts @@ -13,7 +13,7 @@ import type { ICredentialsOverwrite } from '@/Interfaces'; import { CredentialsOverwrites } from '@/credentials-overwrites'; import { rawBodyReader, bodyParser } from '@/middlewares'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; -import type { RedisServicePubSubSubscriber } from '@/services/redis/RedisServicePubSubSubscriber'; +import type { RedisServicePubSubSubscriber } from '@/services/redis/redis-service-pub-sub-subscriber'; import { EventMessageGeneric } from '@/eventbus/event-message-classes/event-message-generic'; import { OrchestrationHandlerWorkerService } from '@/services/orchestration/worker/orchestration.handler.worker.service'; import { OrchestrationWorkerService } from '@/services/orchestration/worker/orchestration.worker.service'; diff --git a/packages/cli/src/controllers/__tests__/dynamic-node-parameters.controller.test.ts b/packages/cli/src/controllers/__tests__/dynamic-node-parameters.controller.test.ts index 6d340d1a3b06b..aff34c70985ca 100644 --- a/packages/cli/src/controllers/__tests__/dynamic-node-parameters.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/dynamic-node-parameters.controller.test.ts @@ -1,6 +1,6 @@ import { DynamicNodeParametersController } from '@/controllers/dynamic-node-parameters.controller'; import type { DynamicNodeParametersRequest } from '@/requests'; -import type { DynamicNodeParametersService } from '@/services/dynamicNodeParameters.service'; +import type { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service'; import { mock } from 'jest-mock-extended'; import * as AdditionalData from '@/workflow-execute-additional-data'; import type { ILoadOptions, IWorkflowExecuteAdditionalData } from 'n8n-workflow'; diff --git a/packages/cli/src/controllers/__tests__/me.controller.test.ts b/packages/cli/src/controllers/__tests__/me.controller.test.ts index 472658bf549a1..b711a65ed6599 100644 --- a/packages/cli/src/controllers/__tests__/me.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/me.controller.test.ts @@ -13,7 +13,7 @@ import { ExternalHooks } from '@/external-hooks'; import { License } from '@/license'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { EventService } from '@/events/event.service'; -import { badPasswords } from '@test/testData'; +import { badPasswords } from '@test/test-data'; import { mockInstance } from '@test/mocking'; import { AuthUserRepository } from '@/databases/repositories/auth-user.repository'; import { InvalidAuthTokenRepository } from '@/databases/repositories/invalid-auth-token.repository'; diff --git a/packages/cli/src/controllers/__tests__/owner.controller.test.ts b/packages/cli/src/controllers/__tests__/owner.controller.test.ts index ae80b97f35349..042c21c09e9af 100644 --- a/packages/cli/src/controllers/__tests__/owner.controller.test.ts +++ b/packages/cli/src/controllers/__tests__/owner.controller.test.ts @@ -16,7 +16,7 @@ import type { UserService } from '@/services/user.service'; import { PasswordUtility } from '@/services/password.utility'; import { mockInstance } from '@test/mocking'; -import { badPasswords } from '@test/testData'; +import { badPasswords } from '@test/test-data'; describe('OwnerController', () => { const configGetSpy = jest.spyOn(config, 'getEnv'); diff --git a/packages/cli/src/controllers/active-workflows.controller.ts b/packages/cli/src/controllers/active-workflows.controller.ts index 20e75208c86b6..1a21c07942737 100644 --- a/packages/cli/src/controllers/active-workflows.controller.ts +++ b/packages/cli/src/controllers/active-workflows.controller.ts @@ -1,6 +1,6 @@ import { Get, RestController } from '@/decorators'; import { ActiveWorkflowRequest } from '@/requests'; -import { ActiveWorkflowsService } from '@/services/activeWorkflows.service'; +import { ActiveWorkflowsService } from '@/services/active-workflows.service'; @RestController('/active-workflows') export class ActiveWorkflowsController { diff --git a/packages/cli/src/controllers/ai-assistant.controller.ts b/packages/cli/src/controllers/ai-assistant.controller.ts index 473c20a79dcad..6248fa3bb090c 100644 --- a/packages/cli/src/controllers/ai-assistant.controller.ts +++ b/packages/cli/src/controllers/ai-assistant.controller.ts @@ -1,5 +1,5 @@ import { Post, RestController } from '@/decorators'; -import { AiAssistantService } from '@/services/aiAsisstant.service'; +import { AiAssistantService } from '@/services/ai-assistant.service'; import { AiAssistantRequest } from '@/requests'; import { Response } from 'express'; import type { AiAssistantSDK } from '@n8n_io/ai-assistant-sdk'; diff --git a/packages/cli/src/controllers/dynamic-node-parameters.controller.ts b/packages/cli/src/controllers/dynamic-node-parameters.controller.ts index cff338e437a77..3ce7dd1a3a79c 100644 --- a/packages/cli/src/controllers/dynamic-node-parameters.controller.ts +++ b/packages/cli/src/controllers/dynamic-node-parameters.controller.ts @@ -2,7 +2,7 @@ import type { INodePropertyOptions, NodeParameterValueType } from 'n8n-workflow' import { Post, RestController } from '@/decorators'; import { getBase } from '@/workflow-execute-additional-data'; -import { DynamicNodeParametersService } from '@/services/dynamicNodeParameters.service'; +import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service'; import { DynamicNodeParametersRequest } from '@/requests'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts index 8d3a74ada7f7f..26d9f04402bfd 100644 --- a/packages/cli/src/controllers/me.controller.ts +++ b/packages/cli/src/controllers/me.controller.ts @@ -21,7 +21,7 @@ import { Logger } from '@/logger'; import { ExternalHooks } from '@/external-hooks'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { UserRepository } from '@/databases/repositories/user.repository'; -import { isApiEnabled } from '@/PublicApi'; +import { isApiEnabled } from '@/public-api'; import { EventService } from '@/events/event.service'; import { MfaService } from '@/mfa/mfa.service'; import { InvalidMfaCodeError } from '@/errors/response-errors/invalid-mfa-code.error'; diff --git a/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts b/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts index 20ffec55ee1b3..2b418c05b1e24 100644 --- a/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts +++ b/packages/cli/src/execution-lifecycle-hooks/shared/shared-hook-functions.ts @@ -4,7 +4,7 @@ import type { ExecutionPayload, IExecutionDb } from '@/Interfaces'; import pick from 'lodash/pick'; import { isWorkflowIdValid } from '@/utils'; import { ExecutionRepository } from '@/databases/repositories/execution.repository'; -import { ExecutionMetadataService } from '@/services/executionMetadata.service'; +import { ExecutionMetadataService } from '@/services/execution-metadata.service'; import { Logger } from '@/logger'; export function determineFinalExecutionStatus(runData: IRun): ExecutionStatus { diff --git a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts index a6e8a01aaa262..0a7d1cb9893ed 100644 --- a/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts +++ b/packages/cli/src/executions/__tests__/execution-recovery.service.test.ts @@ -6,7 +6,7 @@ import { InstanceSettings } from 'n8n-core'; import { mockInstance } from '@test/mocking'; import { createWorkflow } from '@test-integration/db/workflows'; import { createExecution } from '@test-integration/db/executions'; -import * as testDb from '@test-integration/testDb'; +import * as testDb from '@test-integration/test-db'; import { mock } from 'jest-mock-extended'; import { ExecutionRecoveryService } from '@/executions/execution-recovery.service'; diff --git a/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts b/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts index 80a6d3d065865..28db4a84c278e 100644 --- a/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts +++ b/packages/cli/src/external-secrets/__tests__/external-secrets-manager.ee.test.ts @@ -11,7 +11,7 @@ import { ErrorProvider, FailedProvider, MockProviders, -} from '@test/ExternalSecrets/utils'; +} from '@test/external-secrets/utils'; import { mock } from 'jest-mock-extended'; describe('External Secrets Manager', () => { diff --git a/packages/cli/src/license.ts b/packages/cli/src/license.ts index 1c54eb58edd59..7b402c0369833 100644 --- a/packages/cli/src/license.ts +++ b/packages/cli/src/license.ts @@ -13,7 +13,7 @@ import { } from './constants'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; import type { BooleanLicenseFeature, N8nInstanceType, NumericLicenseFeature } from './Interfaces'; -import type { RedisServicePubSubPublisher } from './services/redis/RedisServicePubSubPublisher'; +import type { RedisServicePubSubPublisher } from './services/redis/redis-service-pub-sub-publisher'; import { RedisService } from './services/redis.service'; import { OrchestrationService } from '@/services/orchestration.service'; import { OnShutdown } from '@/decorators/on-shutdown'; diff --git a/packages/cli/src/PublicApi/index.ts b/packages/cli/src/public-api/index.ts similarity index 98% rename from packages/cli/src/PublicApi/index.ts rename to packages/cli/src/public-api/index.ts index 63efc02e81e0d..0d16f9d214f1a 100644 --- a/packages/cli/src/PublicApi/index.ts +++ b/packages/cli/src/public-api/index.ts @@ -36,7 +36,7 @@ async function createApiRouter( if (!Container.get(GlobalConfig).publicApi.swaggerUiDisabled) { const { serveFiles, setup } = await import('swagger-ui-express'); - const swaggerThemePath = path.join(__dirname, 'swaggerTheme.css'); + const swaggerThemePath = path.join(__dirname, 'swagger-theme.css'); const swaggerThemeCss = await fs.readFile(swaggerThemePath, { encoding: 'utf-8' }); apiController.use( diff --git a/packages/cli/src/PublicApi/swaggerTheme.css b/packages/cli/src/public-api/swagger-theme.css similarity index 100% rename from packages/cli/src/PublicApi/swaggerTheme.css rename to packages/cli/src/public-api/swagger-theme.css diff --git a/packages/cli/src/PublicApi/types.ts b/packages/cli/src/public-api/types.ts similarity index 100% rename from packages/cli/src/PublicApi/types.ts rename to packages/cli/src/public-api/types.ts diff --git a/packages/cli/src/PublicApi/v1/handlers/audit/audit.handler.ts b/packages/cli/src/public-api/v1/handlers/audit/audit.handler.ts similarity index 81% rename from packages/cli/src/PublicApi/v1/handlers/audit/audit.handler.ts rename to packages/cli/src/public-api/v1/handlers/audit/audit.handler.ts index 8aa09cb902d40..3c1121711bf29 100644 --- a/packages/cli/src/PublicApi/v1/handlers/audit/audit.handler.ts +++ b/packages/cli/src/public-api/v1/handlers/audit/audit.handler.ts @@ -1,6 +1,6 @@ -import { globalScope } from '@/PublicApi/v1/shared/middlewares/global.middleware'; +import { globalScope } from '@/public-api/v1/shared/middlewares/global.middleware'; import type { Response } from 'express'; -import type { AuditRequest } from '@/PublicApi/types'; +import type { AuditRequest } from '@/public-api/types'; import Container from 'typedi'; export = { diff --git a/packages/cli/src/PublicApi/v1/handlers/audit/spec/paths/audit.yml b/packages/cli/src/public-api/v1/handlers/audit/spec/paths/audit.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/audit/spec/paths/audit.yml rename to packages/cli/src/public-api/v1/handlers/audit/spec/paths/audit.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/audit/spec/schemas/audit.yml b/packages/cli/src/public-api/v1/handlers/audit/spec/schemas/audit.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/audit/spec/schemas/audit.yml rename to packages/cli/src/public-api/v1/handlers/audit/spec/schemas/audit.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts b/packages/cli/src/public-api/v1/handlers/credentials/credentials.handler.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts rename to packages/cli/src/public-api/v1/handlers/credentials/credentials.handler.ts diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts b/packages/cli/src/public-api/v1/handlers/credentials/credentials.middleware.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts rename to packages/cli/src/public-api/v1/handlers/credentials/credentials.middleware.ts diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts b/packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts rename to packages/cli/src/public-api/v1/handlers/credentials/credentials.service.ts diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.transfer.yml b/packages/cli/src/public-api/v1/handlers/credentials/spec/paths/credentials.id.transfer.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.transfer.yml rename to packages/cli/src/public-api/v1/handlers/credentials/spec/paths/credentials.id.transfer.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.yml b/packages/cli/src/public-api/v1/handlers/credentials/spec/paths/credentials.id.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.id.yml rename to packages/cli/src/public-api/v1/handlers/credentials/spec/paths/credentials.id.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.schema.id.yml b/packages/cli/src/public-api/v1/handlers/credentials/spec/paths/credentials.schema.id.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.schema.id.yml rename to packages/cli/src/public-api/v1/handlers/credentials/spec/paths/credentials.schema.id.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.yml b/packages/cli/src/public-api/v1/handlers/credentials/spec/paths/credentials.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/credentials/spec/paths/credentials.yml rename to packages/cli/src/public-api/v1/handlers/credentials/spec/paths/credentials.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/credential.yml b/packages/cli/src/public-api/v1/handlers/credentials/spec/schemas/credential.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/credential.yml rename to packages/cli/src/public-api/v1/handlers/credentials/spec/schemas/credential.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/credentialType.yml b/packages/cli/src/public-api/v1/handlers/credentials/spec/schemas/credentialType.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/credentialType.yml rename to packages/cli/src/public-api/v1/handlers/credentials/spec/schemas/credentialType.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/parameters/credentialId.yml b/packages/cli/src/public-api/v1/handlers/credentials/spec/schemas/parameters/credentialId.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/credentials/spec/schemas/parameters/credentialId.yml rename to packages/cli/src/public-api/v1/handlers/credentials/spec/schemas/parameters/credentialId.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts b/packages/cli/src/public-api/v1/handlers/executions/executions.handler.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts rename to packages/cli/src/public-api/v1/handlers/executions/executions.handler.ts diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.id.yml b/packages/cli/src/public-api/v1/handlers/executions/spec/paths/executions.id.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.id.yml rename to packages/cli/src/public-api/v1/handlers/executions/spec/paths/executions.id.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.yml b/packages/cli/src/public-api/v1/handlers/executions/spec/paths/executions.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/executions/spec/paths/executions.yml rename to packages/cli/src/public-api/v1/handlers/executions/spec/paths/executions.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/spec/schemas/execution.yml b/packages/cli/src/public-api/v1/handlers/executions/spec/schemas/execution.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/executions/spec/schemas/execution.yml rename to packages/cli/src/public-api/v1/handlers/executions/spec/schemas/execution.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/spec/schemas/executionList.yml b/packages/cli/src/public-api/v1/handlers/executions/spec/schemas/executionList.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/executions/spec/schemas/executionList.yml rename to packages/cli/src/public-api/v1/handlers/executions/spec/schemas/executionList.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/spec/schemas/parameters/executionId.yml b/packages/cli/src/public-api/v1/handlers/executions/spec/schemas/parameters/executionId.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/executions/spec/schemas/parameters/executionId.yml rename to packages/cli/src/public-api/v1/handlers/executions/spec/schemas/parameters/executionId.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/spec/schemas/parameters/includeData.yml b/packages/cli/src/public-api/v1/handlers/executions/spec/schemas/parameters/includeData.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/executions/spec/schemas/parameters/includeData.yml rename to packages/cli/src/public-api/v1/handlers/executions/spec/schemas/parameters/includeData.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/projects.handler.ts b/packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts similarity index 96% rename from packages/cli/src/PublicApi/v1/handlers/projects/projects.handler.ts rename to packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts index e61e808daf301..caf9727a118f3 100644 --- a/packages/cli/src/PublicApi/v1/handlers/projects/projects.handler.ts +++ b/packages/cli/src/public-api/v1/handlers/projects/projects.handler.ts @@ -1,7 +1,7 @@ import { globalScope, isLicensed, validCursor } from '../../shared/middlewares/global.middleware'; import type { Response } from 'express'; import type { ProjectRequest } from '@/requests'; -import type { PaginatedRequest } from '@/PublicApi/types'; +import type { PaginatedRequest } from '@/public-api/types'; import Container from 'typedi'; import { ProjectController } from '@/controllers/project.controller'; import { ProjectRepository } from '@/databases/repositories/project.repository'; diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.projectId.yml b/packages/cli/src/public-api/v1/handlers/projects/spec/paths/projects.projectId.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.projectId.yml rename to packages/cli/src/public-api/v1/handlers/projects/spec/paths/projects.projectId.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.yml b/packages/cli/src/public-api/v1/handlers/projects/spec/paths/projects.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/projects/spec/paths/projects.yml rename to packages/cli/src/public-api/v1/handlers/projects/spec/paths/projects.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/parameters/projectId.yml b/packages/cli/src/public-api/v1/handlers/projects/spec/schemas/parameters/projectId.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/parameters/projectId.yml rename to packages/cli/src/public-api/v1/handlers/projects/spec/schemas/parameters/projectId.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/project.yml b/packages/cli/src/public-api/v1/handlers/projects/spec/schemas/project.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/project.yml rename to packages/cli/src/public-api/v1/handlers/projects/spec/schemas/project.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/projectList.yml b/packages/cli/src/public-api/v1/handlers/projects/spec/schemas/projectList.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/projects/spec/schemas/projectList.yml rename to packages/cli/src/public-api/v1/handlers/projects/spec/schemas/projectList.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts b/packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/sourceControl/sourceControl.handler.ts rename to packages/cli/src/public-api/v1/handlers/source-control/source-control.handler.ts diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/paths/sourceControl.yml b/packages/cli/src/public-api/v1/handlers/source-control/spec/paths/sourceControl.yml similarity index 89% rename from packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/paths/sourceControl.yml rename to packages/cli/src/public-api/v1/handlers/source-control/spec/paths/sourceControl.yml index 21a9d882f318e..67ef8b278b616 100644 --- a/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/paths/sourceControl.yml +++ b/packages/cli/src/public-api/v1/handlers/source-control/spec/paths/sourceControl.yml @@ -1,6 +1,6 @@ post: x-eov-operation-id: pull - x-eov-operation-handler: v1/handlers/sourceControl/sourceControl.handler + x-eov-operation-handler: v1/handlers/source-control/source-control.handler tags: - SourceControl summary: Pull changes from the remote repository diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/schemas/importResult.yml b/packages/cli/src/public-api/v1/handlers/source-control/spec/schemas/importResult.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/schemas/importResult.yml rename to packages/cli/src/public-api/v1/handlers/source-control/spec/schemas/importResult.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/schemas/pull.yml b/packages/cli/src/public-api/v1/handlers/source-control/spec/schemas/pull.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/sourceControl/spec/schemas/pull.yml rename to packages/cli/src/public-api/v1/handlers/source-control/spec/schemas/pull.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/spec/paths/tags.id.yml b/packages/cli/src/public-api/v1/handlers/tags/spec/paths/tags.id.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/tags/spec/paths/tags.id.yml rename to packages/cli/src/public-api/v1/handlers/tags/spec/paths/tags.id.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/spec/paths/tags.yml b/packages/cli/src/public-api/v1/handlers/tags/spec/paths/tags.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/tags/spec/paths/tags.yml rename to packages/cli/src/public-api/v1/handlers/tags/spec/paths/tags.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/parameters/tagId.yml b/packages/cli/src/public-api/v1/handlers/tags/spec/schemas/parameters/tagId.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/parameters/tagId.yml rename to packages/cli/src/public-api/v1/handlers/tags/spec/schemas/parameters/tagId.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/tag.yml b/packages/cli/src/public-api/v1/handlers/tags/spec/schemas/tag.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/tag.yml rename to packages/cli/src/public-api/v1/handlers/tags/spec/schemas/tag.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/tagList.yml b/packages/cli/src/public-api/v1/handlers/tags/spec/schemas/tagList.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/tags/spec/schemas/tagList.yml rename to packages/cli/src/public-api/v1/handlers/tags/spec/schemas/tagList.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/tags/tags.handler.ts b/packages/cli/src/public-api/v1/handlers/tags/tags.handler.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/tags/tags.handler.ts rename to packages/cli/src/public-api/v1/handlers/tags/tags.handler.ts diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.role.yml b/packages/cli/src/public-api/v1/handlers/users/spec/paths/users.id.role.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.role.yml rename to packages/cli/src/public-api/v1/handlers/users/spec/paths/users.id.role.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.yml b/packages/cli/src/public-api/v1/handlers/users/spec/paths/users.id.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.id.yml rename to packages/cli/src/public-api/v1/handlers/users/spec/paths/users.id.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml b/packages/cli/src/public-api/v1/handlers/users/spec/paths/users.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/users/spec/paths/users.yml rename to packages/cli/src/public-api/v1/handlers/users/spec/paths/users.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/parameters/includeRole.yml b/packages/cli/src/public-api/v1/handlers/users/spec/schemas/parameters/includeRole.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/parameters/includeRole.yml rename to packages/cli/src/public-api/v1/handlers/users/spec/schemas/parameters/includeRole.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/parameters/userIdentifier.yml b/packages/cli/src/public-api/v1/handlers/users/spec/schemas/parameters/userIdentifier.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/parameters/userIdentifier.yml rename to packages/cli/src/public-api/v1/handlers/users/spec/schemas/parameters/userIdentifier.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/role.yml b/packages/cli/src/public-api/v1/handlers/users/spec/schemas/role.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/role.yml rename to packages/cli/src/public-api/v1/handlers/users/spec/schemas/role.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/user.yml b/packages/cli/src/public-api/v1/handlers/users/spec/schemas/user.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/user.yml rename to packages/cli/src/public-api/v1/handlers/users/spec/schemas/user.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/userList.yml b/packages/cli/src/public-api/v1/handlers/users/spec/schemas/userList.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/users/spec/schemas/userList.yml rename to packages/cli/src/public-api/v1/handlers/users/spec/schemas/userList.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts b/packages/cli/src/public-api/v1/handlers/users/users.handler.ee.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/users/users.handler.ee.ts rename to packages/cli/src/public-api/v1/handlers/users/users.handler.ee.ts diff --git a/packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts b/packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/users/users.service.ee.ts rename to packages/cli/src/public-api/v1/handlers/users/users.service.ee.ts diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.id.yml b/packages/cli/src/public-api/v1/handlers/variables/spec/paths/variables.id.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.id.yml rename to packages/cli/src/public-api/v1/handlers/variables/spec/paths/variables.id.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.yml b/packages/cli/src/public-api/v1/handlers/variables/spec/paths/variables.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/variables/spec/paths/variables.yml rename to packages/cli/src/public-api/v1/handlers/variables/spec/paths/variables.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/parameters/variableId.yml b/packages/cli/src/public-api/v1/handlers/variables/spec/schemas/parameters/variableId.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/parameters/variableId.yml rename to packages/cli/src/public-api/v1/handlers/variables/spec/schemas/parameters/variableId.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variable.yml b/packages/cli/src/public-api/v1/handlers/variables/spec/schemas/variable.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variable.yml rename to packages/cli/src/public-api/v1/handlers/variables/spec/schemas/variable.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variableList.yml b/packages/cli/src/public-api/v1/handlers/variables/spec/schemas/variableList.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/variables/spec/schemas/variableList.yml rename to packages/cli/src/public-api/v1/handlers/variables/spec/schemas/variableList.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/variables/variables.handler.ts b/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts similarity index 96% rename from packages/cli/src/PublicApi/v1/handlers/variables/variables.handler.ts rename to packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts index 3073044eac03d..50e35fb076a2d 100644 --- a/packages/cli/src/PublicApi/v1/handlers/variables/variables.handler.ts +++ b/packages/cli/src/public-api/v1/handlers/variables/variables.handler.ts @@ -5,7 +5,7 @@ import { globalScope, isLicensed, validCursor } from '../../shared/middlewares/g import { encodeNextCursor } from '../../shared/services/pagination.service'; import type { Response } from 'express'; import type { VariablesRequest } from '@/requests'; -import type { PaginatedRequest } from '@/PublicApi/types'; +import type { PaginatedRequest } from '@/public-api/types'; type Create = VariablesRequest.Create; type Delete = VariablesRequest.Delete; diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.activate.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.activate.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.activate.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.activate.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.deactivate.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.deactivate.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.deactivate.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.deactivate.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.tags.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.tags.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.tags.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.tags.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.transfer.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.transfer.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.transfer.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.transfer.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.id.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.id.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/paths/workflows.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/paths/workflows.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/node.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/node.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/node.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/node.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/parameters/workflowId.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/parameters/workflowId.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/parameters/workflowId.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/parameters/workflowId.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/tagIds.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/tagIds.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/tagIds.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/tagIds.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflow.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/workflow.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflow.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/workflow.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowList.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/workflowList.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowList.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/workflowList.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowSettings.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/workflowSettings.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowSettings.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/workflowSettings.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowTags.yml b/packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/workflowTags.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/spec/schemas/workflowTags.yml rename to packages/cli/src/public-api/v1/handlers/workflows/spec/schemas/workflowTags.yml diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts rename to packages/cli/src/public-api/v1/handlers/workflows/workflows.handler.ts diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts rename to packages/cli/src/public-api/v1/handlers/workflows/workflows.service.ts diff --git a/packages/cli/src/PublicApi/v1/openapi.yml b/packages/cli/src/public-api/v1/openapi.yml similarity index 97% rename from packages/cli/src/PublicApi/v1/openapi.yml rename to packages/cli/src/public-api/v1/openapi.yml index 0a84925734c7b..2608f349808f2 100644 --- a/packages/cli/src/PublicApi/v1/openapi.yml +++ b/packages/cli/src/public-api/v1/openapi.yml @@ -73,7 +73,7 @@ paths: /users/{id}/role: $ref: './handlers/users/spec/paths/users.id.role.yml' /source-control/pull: - $ref: './handlers/sourceControl/spec/paths/sourceControl.yml' + $ref: './handlers/source-control/spec/paths/sourceControl.yml' /variables: $ref: './handlers/variables/spec/paths/variables.yml' /variables/{id}: diff --git a/packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts b/packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/middlewares/global.middleware.ts rename to packages/cli/src/public-api/v1/shared/middlewares/global.middleware.ts diff --git a/packages/cli/src/PublicApi/v1/shared/services/pagination.service.ts b/packages/cli/src/public-api/v1/shared/services/pagination.service.ts similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/services/pagination.service.ts rename to packages/cli/src/public-api/v1/shared/services/pagination.service.ts diff --git a/packages/cli/src/PublicApi/v1/shared/spec/parameters/_index.yml b/packages/cli/src/public-api/v1/shared/spec/parameters/_index.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/spec/parameters/_index.yml rename to packages/cli/src/public-api/v1/shared/spec/parameters/_index.yml diff --git a/packages/cli/src/PublicApi/v1/shared/spec/parameters/cursor.yml b/packages/cli/src/public-api/v1/shared/spec/parameters/cursor.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/spec/parameters/cursor.yml rename to packages/cli/src/public-api/v1/shared/spec/parameters/cursor.yml diff --git a/packages/cli/src/PublicApi/v1/shared/spec/parameters/limit.yml b/packages/cli/src/public-api/v1/shared/spec/parameters/limit.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/spec/parameters/limit.yml rename to packages/cli/src/public-api/v1/shared/spec/parameters/limit.yml diff --git a/packages/cli/src/PublicApi/v1/shared/spec/responses/_index.yml b/packages/cli/src/public-api/v1/shared/spec/responses/_index.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/spec/responses/_index.yml rename to packages/cli/src/public-api/v1/shared/spec/responses/_index.yml diff --git a/packages/cli/src/PublicApi/v1/shared/spec/responses/badRequest.yml b/packages/cli/src/public-api/v1/shared/spec/responses/badRequest.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/spec/responses/badRequest.yml rename to packages/cli/src/public-api/v1/shared/spec/responses/badRequest.yml diff --git a/packages/cli/src/PublicApi/v1/shared/spec/responses/conflict.yml b/packages/cli/src/public-api/v1/shared/spec/responses/conflict.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/spec/responses/conflict.yml rename to packages/cli/src/public-api/v1/shared/spec/responses/conflict.yml diff --git a/packages/cli/src/PublicApi/v1/shared/spec/responses/forbidden.yml b/packages/cli/src/public-api/v1/shared/spec/responses/forbidden.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/spec/responses/forbidden.yml rename to packages/cli/src/public-api/v1/shared/spec/responses/forbidden.yml diff --git a/packages/cli/src/PublicApi/v1/shared/spec/responses/notFound.yml b/packages/cli/src/public-api/v1/shared/spec/responses/notFound.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/spec/responses/notFound.yml rename to packages/cli/src/public-api/v1/shared/spec/responses/notFound.yml diff --git a/packages/cli/src/PublicApi/v1/shared/spec/responses/unauthorized.yml b/packages/cli/src/public-api/v1/shared/spec/responses/unauthorized.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/spec/responses/unauthorized.yml rename to packages/cli/src/public-api/v1/shared/spec/responses/unauthorized.yml diff --git a/packages/cli/src/PublicApi/v1/shared/spec/schemas/_index.yml b/packages/cli/src/public-api/v1/shared/spec/schemas/_index.yml similarity index 87% rename from packages/cli/src/PublicApi/v1/shared/spec/schemas/_index.yml rename to packages/cli/src/public-api/v1/shared/spec/schemas/_index.yml index 270bd060706b0..0e268f2acc23e 100644 --- a/packages/cli/src/PublicApi/v1/shared/spec/schemas/_index.yml +++ b/packages/cli/src/public-api/v1/shared/spec/schemas/_index.yml @@ -23,9 +23,9 @@ CredentialType: Audit: $ref: './../../../handlers/audit/spec/schemas/audit.yml' Pull: - $ref: './../../../handlers/sourceControl/spec/schemas/pull.yml' + $ref: './../../../handlers/source-control/spec/schemas/pull.yml' ImportResult: - $ref: './../../../handlers/sourceControl/spec/schemas/importResult.yml' + $ref: './../../../handlers/source-control/spec/schemas/importResult.yml' UserList: $ref: './../../../handlers/users/spec/schemas/userList.yml' User: diff --git a/packages/cli/src/PublicApi/v1/shared/spec/schemas/error.yml b/packages/cli/src/public-api/v1/shared/spec/schemas/error.yml similarity index 100% rename from packages/cli/src/PublicApi/v1/shared/spec/schemas/error.yml rename to packages/cli/src/public-api/v1/shared/spec/schemas/error.yml diff --git a/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts b/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts index 4667b5618947a..9d96f18331a66 100644 --- a/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts +++ b/packages/cli/src/security-audit/risk-reporters/instance-risk-reporter.ts @@ -13,7 +13,7 @@ import { import { getN8nPackageJson, inDevelopment } from '@/constants'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import type { RiskReporter, Risk, n8n } from '@/security-audit/types'; -import { isApiEnabled } from '@/PublicApi'; +import { isApiEnabled } from '@/public-api'; import { Logger } from '@/logger'; import { GlobalConfig } from '@n8n/config'; diff --git a/packages/cli/src/server.ts b/packages/cli/src/server.ts index a6d9bc648e124..c90c913ab0978 100644 --- a/packages/cli/src/server.ts +++ b/packages/cli/src/server.ts @@ -22,7 +22,7 @@ import { } from '@/constants'; import type { APIRequest } from '@/requests'; import { ControllerRegistry } from '@/decorators'; -import { isApiEnabled, loadPublicApiVersions } from '@/PublicApi'; +import { isApiEnabled, loadPublicApiVersions } from '@/public-api'; import type { ICredentialsOverwrite } from '@/Interfaces'; import { CredentialsOverwrites } from '@/credentials-overwrites'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; diff --git a/packages/cli/src/services/__tests__/activeWorkflows.service.test.ts b/packages/cli/src/services/__tests__/active-workflows.service.test.ts similarity index 97% rename from packages/cli/src/services/__tests__/activeWorkflows.service.test.ts rename to packages/cli/src/services/__tests__/active-workflows.service.test.ts index 06eb9a5d96301..4d6b34728bfe8 100644 --- a/packages/cli/src/services/__tests__/activeWorkflows.service.test.ts +++ b/packages/cli/src/services/__tests__/active-workflows.service.test.ts @@ -2,7 +2,7 @@ import type { ActivationErrorsService } from '@/activation-errors.service'; import type { User } from '@/databases/entities/User'; import type { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import type { WorkflowRepository } from '@/databases/repositories/workflow.repository'; -import { ActiveWorkflowsService } from '@/services/activeWorkflows.service'; +import { ActiveWorkflowsService } from '@/services/active-workflows.service'; import { mock } from 'jest-mock-extended'; import { BadRequestError } from '@/errors/response-errors/bad-request.error'; import { WorkflowEntity } from '@/databases/entities/workflow-entity'; diff --git a/packages/cli/src/services/__tests__/communityPackages.service.test.ts b/packages/cli/src/services/__tests__/community-packages.service.test.ts similarity index 100% rename from packages/cli/src/services/__tests__/communityPackages.service.test.ts rename to packages/cli/src/services/__tests__/community-packages.service.test.ts diff --git a/packages/cli/src/services/__tests__/ExecutionMetadataService.test.ts b/packages/cli/src/services/__tests__/execution-metadata.service.test.ts similarity index 91% rename from packages/cli/src/services/__tests__/ExecutionMetadataService.test.ts rename to packages/cli/src/services/__tests__/execution-metadata.service.test.ts index 144aeb23f1194..16919b681a7cf 100644 --- a/packages/cli/src/services/__tests__/ExecutionMetadataService.test.ts +++ b/packages/cli/src/services/__tests__/execution-metadata.service.test.ts @@ -1,6 +1,6 @@ import { Container } from 'typedi'; import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository'; -import { ExecutionMetadataService } from '@/services/executionMetadata.service'; +import { ExecutionMetadataService } from '@/services/execution-metadata.service'; import { mockInstance } from '@test/mocking'; describe('ExecutionMetadataService', () => { diff --git a/packages/cli/src/services/__tests__/orchestration.service.test.ts b/packages/cli/src/services/__tests__/orchestration.service.test.ts index 811643b9671ea..3aec2a607e6ea 100644 --- a/packages/cli/src/services/__tests__/orchestration.service.test.ts +++ b/packages/cli/src/services/__tests__/orchestration.service.test.ts @@ -6,11 +6,11 @@ import type { WorkflowActivateMode } from 'n8n-workflow'; import config from '@/config'; import { OrchestrationService } from '@/services/orchestration.service'; -import type { RedisServiceWorkerResponseObject } from '@/services/redis/RedisServiceCommands'; +import type { RedisServiceWorkerResponseObject } from '@/services/redis/redis-service-commands'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; import { RedisService } from '@/services/redis.service'; -import { handleWorkerResponseMessageMain } from '@/services/orchestration/main/handleWorkerResponseMessageMain'; -import { handleCommandMessageMain } from '@/services/orchestration/main/handleCommandMessageMain'; +import { handleWorkerResponseMessageMain } from '@/services/orchestration/main/handle-worker-response-message-main'; +import { handleCommandMessageMain } from '@/services/orchestration/main/handle-command-message-main'; import { OrchestrationHandlerMainService } from '@/services/orchestration/main/orchestration.handler.main.service'; import * as helpers from '@/services/orchestration/helpers'; import { ExternalSecretsManager } from '@/external-secrets/external-secrets-manager.ee'; @@ -54,7 +54,7 @@ describe('Orchestration Service', () => { const eventBus = mockInstance(MessageEventBus); beforeAll(async () => { - jest.mock('@/services/redis/RedisServicePubSubPublisher', () => { + jest.mock('@/services/redis/redis-service-pub-sub-publisher', () => { return jest.fn().mockImplementation(() => { return { init: jest.fn(), @@ -64,7 +64,7 @@ describe('Orchestration Service', () => { }; }); }); - jest.mock('@/services/redis/RedisServicePubSubSubscriber', () => { + jest.mock('@/services/redis/redis-service-pub-sub-subscriber', () => { return jest.fn().mockImplementation(() => { return { subscribeToCommandChannel: jest.fn(), @@ -81,8 +81,8 @@ describe('Orchestration Service', () => { }); afterAll(async () => { - jest.mock('@/services/redis/RedisServicePubSubPublisher').restoreAllMocks(); - jest.mock('@/services/redis/RedisServicePubSubSubscriber').restoreAllMocks(); + jest.mock('@/services/redis/redis-service-pub-sub-publisher').restoreAllMocks(); + jest.mock('@/services/redis/redis-service-pub-sub-subscriber').restoreAllMocks(); await os.shutdown(); }); diff --git a/packages/cli/src/services/__tests__/ownership.service.test.ts b/packages/cli/src/services/__tests__/ownership.service.test.ts index 8390b9b4d413b..55998f4c7e598 100644 --- a/packages/cli/src/services/__tests__/ownership.service.test.ts +++ b/packages/cli/src/services/__tests__/ownership.service.test.ts @@ -10,7 +10,7 @@ import { mock } from 'jest-mock-extended'; import { Project } from '@/databases/entities/project'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; import { ProjectRelation } from '@/databases/entities/project-relation'; -import { mockCredential, mockProject } from '@test/mockObjects'; +import { mockCredential, mockProject } from '@test/mock-objects'; describe('OwnershipService', () => { const userRepository = mockInstance(UserRepository); diff --git a/packages/cli/src/services/activeWorkflows.service.ts b/packages/cli/src/services/active-workflows.service.ts similarity index 100% rename from packages/cli/src/services/activeWorkflows.service.ts rename to packages/cli/src/services/active-workflows.service.ts diff --git a/packages/cli/src/services/aiAsisstant.service.ts b/packages/cli/src/services/ai-assistant.service.ts similarity index 100% rename from packages/cli/src/services/aiAsisstant.service.ts rename to packages/cli/src/services/ai-assistant.service.ts diff --git a/packages/cli/src/services/dynamicNodeParameters.service.ts b/packages/cli/src/services/dynamic-node-parameters.service.ts similarity index 100% rename from packages/cli/src/services/dynamicNodeParameters.service.ts rename to packages/cli/src/services/dynamic-node-parameters.service.ts diff --git a/packages/cli/src/services/executionMetadata.service.ts b/packages/cli/src/services/execution-metadata.service.ts similarity index 100% rename from packages/cli/src/services/executionMetadata.service.ts rename to packages/cli/src/services/execution-metadata.service.ts diff --git a/packages/cli/src/services/frontend.service.ts b/packages/cli/src/services/frontend.service.ts index 1e70c972a05ab..34466adae8d01 100644 --- a/packages/cli/src/services/frontend.service.ts +++ b/packages/cli/src/services/frontend.service.ts @@ -32,7 +32,7 @@ import type { CommunityPackagesService } from '@/services/communityPackages.serv import { Logger } from '@/logger'; import { UrlService } from './url.service'; import { EventService } from '@/events/event.service'; -import { isApiEnabled } from '@/PublicApi'; +import { isApiEnabled } from '@/public-api'; @Service() export class FrontendService { diff --git a/packages/cli/src/services/orchestration.handler.base.service.ts b/packages/cli/src/services/orchestration.handler.base.service.ts index b2507151ce410..054ca3de2318f 100644 --- a/packages/cli/src/services/orchestration.handler.base.service.ts +++ b/packages/cli/src/services/orchestration.handler.base.service.ts @@ -1,6 +1,6 @@ import Container from 'typedi'; import { RedisService } from './redis.service'; -import type { RedisServicePubSubSubscriber } from './redis/RedisServicePubSubSubscriber'; +import type { RedisServicePubSubSubscriber } from './redis/redis-service-pub-sub-subscriber'; import type { WorkerCommandReceivedHandlerOptions } from './orchestration/worker/types'; import type { MainResponseReceivedHandlerOptions } from './orchestration/main/types'; diff --git a/packages/cli/src/services/orchestration.service.ts b/packages/cli/src/services/orchestration.service.ts index f9bfc1372855c..a81803d478f1a 100644 --- a/packages/cli/src/services/orchestration.service.ts +++ b/packages/cli/src/services/orchestration.service.ts @@ -1,11 +1,11 @@ import { Service } from 'typedi'; import { Logger } from '@/logger'; import config from '@/config'; -import type { RedisServicePubSubPublisher } from './redis/RedisServicePubSubPublisher'; -import type { RedisServiceBaseCommand, RedisServiceCommand } from './redis/RedisServiceCommands'; +import type { RedisServicePubSubPublisher } from './redis/redis-service-pub-sub-publisher'; +import type { RedisServiceBaseCommand, RedisServiceCommand } from './redis/redis-service-commands'; import { RedisService } from './redis.service'; -import { MultiMainSetup } from './orchestration/main/MultiMainSetup.ee'; +import { MultiMainSetup } from './orchestration/main/multi-main-setup.ee'; import type { WorkflowActivateMode } from 'n8n-workflow'; import { InstanceSettings } from 'n8n-core'; diff --git a/packages/cli/src/services/orchestration/helpers.ts b/packages/cli/src/services/orchestration/helpers.ts index 262c36ccee8ca..7301ae1bef271 100644 --- a/packages/cli/src/services/orchestration/helpers.ts +++ b/packages/cli/src/services/orchestration/helpers.ts @@ -1,8 +1,8 @@ import { Container } from 'typedi'; import { jsonParse } from 'n8n-workflow'; import { Logger } from '@/logger'; -import type { RedisServiceCommandObject } from '../redis/RedisServiceCommands'; -import { COMMAND_REDIS_CHANNEL } from '../redis/RedisConstants'; +import type { RedisServiceCommandObject } from '../redis/redis-service-commands'; +import { COMMAND_REDIS_CHANNEL } from '../redis/redis-constants'; import * as os from 'os'; export interface RedisServiceCommandLastReceived { diff --git a/packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts b/packages/cli/src/services/orchestration/main/handle-command-message-main.ts similarity index 100% rename from packages/cli/src/services/orchestration/main/handleCommandMessageMain.ts rename to packages/cli/src/services/orchestration/main/handle-command-message-main.ts diff --git a/packages/cli/src/services/orchestration/main/handleWorkerResponseMessageMain.ts b/packages/cli/src/services/orchestration/main/handle-worker-response-message-main.ts similarity index 96% rename from packages/cli/src/services/orchestration/main/handleWorkerResponseMessageMain.ts rename to packages/cli/src/services/orchestration/main/handle-worker-response-message-main.ts index b623f0b4f26a4..b54dc956b20ad 100644 --- a/packages/cli/src/services/orchestration/main/handleWorkerResponseMessageMain.ts +++ b/packages/cli/src/services/orchestration/main/handle-worker-response-message-main.ts @@ -2,8 +2,8 @@ import { jsonParse } from 'n8n-workflow'; import Container from 'typedi'; import { Logger } from '@/logger'; import { Push } from '../../../push'; -import type { RedisServiceWorkerResponseObject } from '../../redis/RedisServiceCommands'; -import { WORKER_RESPONSE_REDIS_CHANNEL } from '@/services/redis/RedisConstants'; +import type { RedisServiceWorkerResponseObject } from '../../redis/redis-service-commands'; +import { WORKER_RESPONSE_REDIS_CHANNEL } from '@/services/redis/redis-constants'; import type { MainResponseReceivedHandlerOptions } from './types'; export async function handleWorkerResponseMessageMain( diff --git a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts b/packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts similarity index 97% rename from packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts rename to packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts index 82c28d61f3315..19485bc0cbec5 100644 --- a/packages/cli/src/services/orchestration/main/MultiMainSetup.ee.ts +++ b/packages/cli/src/services/orchestration/main/multi-main-setup.ee.ts @@ -4,7 +4,7 @@ import { TIME } from '@/constants'; import { InstanceSettings } from 'n8n-core'; import { ErrorReporterProxy as EventReporter } from 'n8n-workflow'; import { Logger } from '@/logger'; -import { RedisServicePubSubPublisher } from '@/services/redis/RedisServicePubSubPublisher'; +import { RedisServicePubSubPublisher } from '@/services/redis/redis-service-pub-sub-publisher'; import { RedisClientService } from '@/services/redis/redis-client.service'; import { TypedEmitter } from '@/TypedEmitter'; diff --git a/packages/cli/src/services/orchestration/main/orchestration.handler.main.service.ts b/packages/cli/src/services/orchestration/main/orchestration.handler.main.service.ts index 983c39fd3333d..1b9a64006c8a1 100644 --- a/packages/cli/src/services/orchestration/main/orchestration.handler.main.service.ts +++ b/packages/cli/src/services/orchestration/main/orchestration.handler.main.service.ts @@ -1,7 +1,7 @@ import { Service } from 'typedi'; -import { COMMAND_REDIS_CHANNEL, WORKER_RESPONSE_REDIS_CHANNEL } from '../../redis/RedisConstants'; -import { handleWorkerResponseMessageMain } from './handleWorkerResponseMessageMain'; -import { handleCommandMessageMain } from './handleCommandMessageMain'; +import { COMMAND_REDIS_CHANNEL, WORKER_RESPONSE_REDIS_CHANNEL } from '../../redis/redis-constants'; +import { handleWorkerResponseMessageMain } from './handle-worker-response-message-main'; +import { handleCommandMessageMain } from './handle-command-message-main'; import { OrchestrationHandlerService } from '../../orchestration.handler.base.service'; import type { MainResponseReceivedHandlerOptions } from './types'; diff --git a/packages/cli/src/services/orchestration/main/types.ts b/packages/cli/src/services/orchestration/main/types.ts index d189d7cdf7b13..57992f8221de8 100644 --- a/packages/cli/src/services/orchestration/main/types.ts +++ b/packages/cli/src/services/orchestration/main/types.ts @@ -1,4 +1,4 @@ -import type { RedisServicePubSubPublisher } from '@/services/redis/RedisServicePubSubPublisher'; +import type { RedisServicePubSubPublisher } from '@/services/redis/redis-service-pub-sub-publisher'; export type MainResponseReceivedHandlerOptions = { queueModeId: string; diff --git a/packages/cli/src/services/orchestration/webhook/handleCommandMessageWebhook.ts b/packages/cli/src/services/orchestration/webhook/handle-command-message-webhook.ts similarity index 100% rename from packages/cli/src/services/orchestration/webhook/handleCommandMessageWebhook.ts rename to packages/cli/src/services/orchestration/webhook/handle-command-message-webhook.ts diff --git a/packages/cli/src/services/orchestration/webhook/orchestration.handler.webhook.service.ts b/packages/cli/src/services/orchestration/webhook/orchestration.handler.webhook.service.ts index 73ad86d0d41ed..398a93de3d024 100644 --- a/packages/cli/src/services/orchestration/webhook/orchestration.handler.webhook.service.ts +++ b/packages/cli/src/services/orchestration/webhook/orchestration.handler.webhook.service.ts @@ -1,7 +1,7 @@ import { Service } from 'typedi'; -import { COMMAND_REDIS_CHANNEL } from '../../redis/RedisConstants'; +import { COMMAND_REDIS_CHANNEL } from '../../redis/redis-constants'; import { OrchestrationHandlerService } from '../../orchestration.handler.base.service'; -import { handleCommandMessageWebhook } from './handleCommandMessageWebhook'; +import { handleCommandMessageWebhook } from './handle-command-message-webhook'; @Service() export class OrchestrationHandlerWebhookService extends OrchestrationHandlerService { diff --git a/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts b/packages/cli/src/services/orchestration/worker/handle-command-message-worker.ts similarity index 98% rename from packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts rename to packages/cli/src/services/orchestration/worker/handle-command-message-worker.ts index f3a991fb1681d..38696bfec592a 100644 --- a/packages/cli/src/services/orchestration/worker/handleCommandMessageWorker.ts +++ b/packages/cli/src/services/orchestration/worker/handle-command-message-worker.ts @@ -1,7 +1,7 @@ import { jsonParse } from 'n8n-workflow'; import Container from 'typedi'; -import type { RedisServiceCommandObject } from '@/services/redis/RedisServiceCommands'; -import { COMMAND_REDIS_CHANNEL } from '@/services/redis/RedisConstants'; +import type { RedisServiceCommandObject } from '@/services/redis/redis-service-commands'; +import { COMMAND_REDIS_CHANNEL } from '@/services/redis/redis-constants'; import * as os from 'os'; import { License } from '@/license'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; diff --git a/packages/cli/src/services/orchestration/worker/orchestration.handler.worker.service.ts b/packages/cli/src/services/orchestration/worker/orchestration.handler.worker.service.ts index cf866e06ecc14..f9c028d875284 100644 --- a/packages/cli/src/services/orchestration/worker/orchestration.handler.worker.service.ts +++ b/packages/cli/src/services/orchestration/worker/orchestration.handler.worker.service.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; import { OrchestrationHandlerService } from '../../orchestration.handler.base.service'; -import { getWorkerCommandReceivedHandler } from './handleCommandMessageWorker'; +import { getWorkerCommandReceivedHandler } from './handle-command-message-worker'; import type { WorkerCommandReceivedHandlerOptions } from './types'; @Service() diff --git a/packages/cli/src/services/orchestration/worker/types.ts b/packages/cli/src/services/orchestration/worker/types.ts index 957a6106badf8..e54490b447fad 100644 --- a/packages/cli/src/services/orchestration/worker/types.ts +++ b/packages/cli/src/services/orchestration/worker/types.ts @@ -1,5 +1,5 @@ import type { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow'; -import type { RedisServicePubSubPublisher } from '../../redis/RedisServicePubSubPublisher'; +import type { RedisServicePubSubPublisher } from '../../redis/redis-service-pub-sub-publisher'; import type { RunningJobSummary } from '@/scaling/scaling.types'; export interface WorkerCommandReceivedHandlerOptions { diff --git a/packages/cli/src/services/redis.service.ts b/packages/cli/src/services/redis.service.ts index d6cb11b294758..d3c0beb87a53b 100644 --- a/packages/cli/src/services/redis.service.ts +++ b/packages/cli/src/services/redis.service.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; -import { RedisServicePubSubSubscriber } from './redis/RedisServicePubSubSubscriber'; -import { RedisServicePubSubPublisher } from './redis/RedisServicePubSubPublisher'; +import { RedisServicePubSubSubscriber } from './redis/redis-service-pub-sub-subscriber'; +import { RedisServicePubSubPublisher } from './redis/redis-service-pub-sub-publisher'; /* * This is a convenience service that provides access to all the Redis clients. diff --git a/packages/cli/src/services/redis/RedisConstants.ts b/packages/cli/src/services/redis/redis-constants.ts similarity index 100% rename from packages/cli/src/services/redis/RedisConstants.ts rename to packages/cli/src/services/redis/redis-constants.ts diff --git a/packages/cli/src/services/redis/RedisServiceBaseClasses.ts b/packages/cli/src/services/redis/redis-service-base-classes.ts similarity index 100% rename from packages/cli/src/services/redis/RedisServiceBaseClasses.ts rename to packages/cli/src/services/redis/redis-service-base-classes.ts diff --git a/packages/cli/src/services/redis/RedisServiceCommands.ts b/packages/cli/src/services/redis/redis-service-commands.ts similarity index 100% rename from packages/cli/src/services/redis/RedisServiceCommands.ts rename to packages/cli/src/services/redis/redis-service-commands.ts diff --git a/packages/cli/src/services/redis/RedisServicePubSubPublisher.ts b/packages/cli/src/services/redis/redis-service-pub-sub-publisher.ts similarity index 92% rename from packages/cli/src/services/redis/RedisServicePubSubPublisher.ts rename to packages/cli/src/services/redis/redis-service-pub-sub-publisher.ts index 23ca9a5b6935e..bfcb8cc0ac6e7 100644 --- a/packages/cli/src/services/redis/RedisServicePubSubPublisher.ts +++ b/packages/cli/src/services/redis/redis-service-pub-sub-publisher.ts @@ -1,10 +1,10 @@ import { Service } from 'typedi'; -import { COMMAND_REDIS_CHANNEL, WORKER_RESPONSE_REDIS_CHANNEL } from './RedisConstants'; +import { COMMAND_REDIS_CHANNEL, WORKER_RESPONSE_REDIS_CHANNEL } from './redis-constants'; import type { RedisServiceCommandObject, RedisServiceWorkerResponseObject, -} from './RedisServiceCommands'; -import { RedisServiceBaseSender } from './RedisServiceBaseClasses'; +} from './redis-service-commands'; +import { RedisServiceBaseSender } from './redis-service-base-classes'; @Service() export class RedisServicePubSubPublisher extends RedisServiceBaseSender { diff --git a/packages/cli/src/services/redis/RedisServicePubSubSubscriber.ts b/packages/cli/src/services/redis/redis-service-pub-sub-subscriber.ts similarity index 94% rename from packages/cli/src/services/redis/RedisServicePubSubSubscriber.ts rename to packages/cli/src/services/redis/redis-service-pub-sub-subscriber.ts index 144647009f16b..c6ff27c249121 100644 --- a/packages/cli/src/services/redis/RedisServicePubSubSubscriber.ts +++ b/packages/cli/src/services/redis/redis-service-pub-sub-subscriber.ts @@ -1,6 +1,6 @@ import { Service } from 'typedi'; -import { COMMAND_REDIS_CHANNEL, WORKER_RESPONSE_REDIS_CHANNEL } from './RedisConstants'; -import { RedisServiceBaseReceiver } from './RedisServiceBaseClasses'; +import { COMMAND_REDIS_CHANNEL, WORKER_RESPONSE_REDIS_CHANNEL } from './redis-constants'; +import { RedisServiceBaseReceiver } from './redis-service-base-classes'; @Service() export class RedisServicePubSubSubscriber extends RedisServiceBaseReceiver { diff --git a/packages/cli/src/services/userOnboarding.service.ts b/packages/cli/src/services/user-onboarding.service.ts similarity index 100% rename from packages/cli/src/services/userOnboarding.service.ts rename to packages/cli/src/services/user-onboarding.service.ts diff --git a/packages/cli/src/webhooks/__tests__/TestWebhooks.test.ts b/packages/cli/src/webhooks/__tests__/test-webhooks.test.ts similarity index 100% rename from packages/cli/src/webhooks/__tests__/TestWebhooks.test.ts rename to packages/cli/src/webhooks/__tests__/test-webhooks.test.ts diff --git a/packages/cli/src/webhooks/__tests__/WebhookRequestHandler.test.ts b/packages/cli/src/webhooks/__tests__/webhook-request-handler.test.ts similarity index 100% rename from packages/cli/src/webhooks/__tests__/WebhookRequestHandler.test.ts rename to packages/cli/src/webhooks/__tests__/webhook-request-handler.test.ts diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts index deeecba04568b..7fa32c268590a 100644 --- a/packages/cli/src/workflows/workflows.controller.ts +++ b/packages/cli/src/workflows/workflows.controller.ts @@ -27,7 +27,7 @@ import { NotFoundError } from '@/errors/response-errors/not-found.error'; import { InternalServerError } from '@/errors/response-errors/internal-server.error'; import { ForbiddenError } from '@/errors/response-errors/forbidden.error'; import { NamingService } from '@/services/naming.service'; -import { UserOnboardingService } from '@/services/userOnboarding.service'; +import { UserOnboardingService } from '@/services/user-onboarding.service'; import { CredentialsService } from '../credentials/credentials.service'; import { WorkflowRequest } from './workflow.request'; import { EnterpriseWorkflowService } from './workflow.service.ee'; diff --git a/packages/cli/test/integration/active-workflow-manager.test.ts b/packages/cli/test/integration/active-workflow-manager.test.ts index 28752e8f0d3e6..13e1f5d37b137 100644 --- a/packages/cli/test/integration/active-workflow-manager.test.ts +++ b/packages/cli/test/integration/active-workflow-manager.test.ts @@ -17,7 +17,7 @@ import { ExecutionService } from '@/executions/execution.service'; import { WorkflowService } from '@/workflows/workflow.service'; import { mockInstance } from '../shared/mocking'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { createOwner } from './shared/db/users'; import { createWorkflow } from './shared/db/workflows'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; diff --git a/packages/cli/test/integration/auth.api.test.ts b/packages/cli/test/integration/auth.api.test.ts index 6f6acecbeedf8..52565b9edfcfe 100644 --- a/packages/cli/test/integration/auth.api.test.ts +++ b/packages/cli/test/integration/auth.api.test.ts @@ -9,7 +9,7 @@ import { MfaService } from '@/mfa/mfa.service'; import { LOGGED_OUT_RESPONSE_BODY } from './shared/constants'; import { randomValidPassword } from './shared/random'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import * as utils from './shared/utils/'; import { createUser, createUserShell } from './shared/db/users'; import type { SuperAgentTest } from './shared/types'; diff --git a/packages/cli/test/integration/binaryData.api.test.ts b/packages/cli/test/integration/binary-data.api.test.ts similarity index 100% rename from packages/cli/test/integration/binaryData.api.test.ts rename to packages/cli/test/integration/binary-data.api.test.ts diff --git a/packages/cli/test/integration/commands/credentials.cmd.test.ts b/packages/cli/test/integration/commands/credentials.cmd.test.ts index 61b4169712d6e..2c2c7df7e2fb9 100644 --- a/packages/cli/test/integration/commands/credentials.cmd.test.ts +++ b/packages/cli/test/integration/commands/credentials.cmd.test.ts @@ -3,9 +3,9 @@ import { nanoid } from 'nanoid'; import { ImportCredentialsCommand } from '@/commands/import/credentials'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; -import { setupTestCommand } from '@test-integration/utils/testCommand'; +import { setupTestCommand } from '@test-integration/utils/test-command'; import { mockInstance } from '../../shared/mocking'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { getAllCredentials, getAllSharedCredentials } from '../shared/db/credentials'; import { createMember, createOwner } from '../shared/db/users'; import { getPersonalProject } from '../shared/db/projects'; @@ -27,7 +27,7 @@ test('import:credentials should import a credential', async () => { // // ACT // - await command.run(['--input=./test/integration/commands/importCredentials/credentials.json']); + await command.run(['--input=./test/integration/commands/import-credentials/credentials.json']); // // ASSERT @@ -61,7 +61,7 @@ test('import:credentials should import a credential from separated files', async // import credential the first time, assigning it to the owner await command.run([ '--separate', - '--input=./test/integration/commands/importCredentials/separate', + '--input=./test/integration/commands/import-credentials/separate', ]); // @@ -99,7 +99,7 @@ test('`import:credentials --userId ...` should fail if the credential exists alr // import credential the first time, assigning it to the owner await command.run([ - '--input=./test/integration/commands/importCredentials/credentials.json', + '--input=./test/integration/commands/import-credentials/credentials.json', `--userId=${owner.id}`, ]); @@ -127,7 +127,7 @@ test('`import:credentials --userId ...` should fail if the credential exists alr // credential to another user. await expect( command.run([ - '--input=./test/integration/commands/importCredentials/credentials-updated.json', + '--input=./test/integration/commands/import-credentials/credentials-updated.json', `--userId=${member.id}`, ]), ).rejects.toThrowError( @@ -170,7 +170,7 @@ test("only update credential, don't create or update owner if neither `--userId` // import credential the first time, assigning it to a member await command.run([ - '--input=./test/integration/commands/importCredentials/credentials.json', + '--input=./test/integration/commands/import-credentials/credentials.json', `--userId=${member.id}`, ]); @@ -195,7 +195,7 @@ test("only update credential, don't create or update owner if neither `--userId` // // Import again only updating the name and omitting `--userId` await command.run([ - '--input=./test/integration/commands/importCredentials/credentials-updated.json', + '--input=./test/integration/commands/import-credentials/credentials-updated.json', ]); // @@ -235,7 +235,7 @@ test('`import:credential --projectId ...` should fail if the credential already // import credential the first time, assigning it to the owner await command.run([ - '--input=./test/integration/commands/importCredentials/credentials.json', + '--input=./test/integration/commands/import-credentials/credentials.json', `--userId=${owner.id}`, ]); @@ -263,7 +263,7 @@ test('`import:credential --projectId ...` should fail if the credential already // credential to another user. await expect( command.run([ - '--input=./test/integration/commands/importCredentials/credentials-updated.json', + '--input=./test/integration/commands/import-credentials/credentials-updated.json', `--projectId=${memberProject.id}`, ]), ).rejects.toThrowError( @@ -299,7 +299,7 @@ test('`import:credential --projectId ...` should fail if the credential already test('`import:credential --projectId ... --userId ...` fails explaining that only one of the options can be used at a time', async () => { await expect( command.run([ - '--input=./test/integration/commands/importCredentials/credentials-updated.json', + '--input=./test/integration/commands/import-credentials/credentials-updated.json', `--projectId=${nanoid()}`, `--userId=${nanoid()}`, ]), diff --git a/packages/cli/test/integration/commands/importCredentials/credentials-updated.json b/packages/cli/test/integration/commands/import-credentials/credentials-updated.json similarity index 100% rename from packages/cli/test/integration/commands/importCredentials/credentials-updated.json rename to packages/cli/test/integration/commands/import-credentials/credentials-updated.json diff --git a/packages/cli/test/integration/commands/importCredentials/credentials.json b/packages/cli/test/integration/commands/import-credentials/credentials.json similarity index 100% rename from packages/cli/test/integration/commands/importCredentials/credentials.json rename to packages/cli/test/integration/commands/import-credentials/credentials.json diff --git a/packages/cli/test/integration/commands/importCredentials/separate/separate-credential.json b/packages/cli/test/integration/commands/import-credentials/separate/separate-credential.json similarity index 100% rename from packages/cli/test/integration/commands/importCredentials/separate/separate-credential.json rename to packages/cli/test/integration/commands/import-credentials/separate/separate-credential.json diff --git a/packages/cli/test/integration/commands/importWorkflows/combined-with-update/original.json b/packages/cli/test/integration/commands/import-workflows/combined-with-update/original.json similarity index 100% rename from packages/cli/test/integration/commands/importWorkflows/combined-with-update/original.json rename to packages/cli/test/integration/commands/import-workflows/combined-with-update/original.json diff --git a/packages/cli/test/integration/commands/importWorkflows/combined-with-update/updated.json b/packages/cli/test/integration/commands/import-workflows/combined-with-update/updated.json similarity index 100% rename from packages/cli/test/integration/commands/importWorkflows/combined-with-update/updated.json rename to packages/cli/test/integration/commands/import-workflows/combined-with-update/updated.json diff --git a/packages/cli/test/integration/commands/importWorkflows/combined/combined.json b/packages/cli/test/integration/commands/import-workflows/combined/combined.json similarity index 100% rename from packages/cli/test/integration/commands/importWorkflows/combined/combined.json rename to packages/cli/test/integration/commands/import-workflows/combined/combined.json diff --git a/packages/cli/test/integration/commands/importWorkflows/separate/001-activeWorkflow.json b/packages/cli/test/integration/commands/import-workflows/separate/001-activeWorkflow.json similarity index 100% rename from packages/cli/test/integration/commands/importWorkflows/separate/001-activeWorkflow.json rename to packages/cli/test/integration/commands/import-workflows/separate/001-activeWorkflow.json diff --git a/packages/cli/test/integration/commands/importWorkflows/separate/002-inactiveWorkflow.json b/packages/cli/test/integration/commands/import-workflows/separate/002-inactiveWorkflow.json similarity index 100% rename from packages/cli/test/integration/commands/importWorkflows/separate/002-inactiveWorkflow.json rename to packages/cli/test/integration/commands/import-workflows/separate/002-inactiveWorkflow.json diff --git a/packages/cli/test/integration/commands/import.cmd.test.ts b/packages/cli/test/integration/commands/import.cmd.test.ts index 7a000ca9c6bff..5a41b505aa9dd 100644 --- a/packages/cli/test/integration/commands/import.cmd.test.ts +++ b/packages/cli/test/integration/commands/import.cmd.test.ts @@ -3,9 +3,9 @@ import { nanoid } from 'nanoid'; import { ImportWorkflowsCommand } from '@/commands/import/workflow'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; -import { setupTestCommand } from '@test-integration/utils/testCommand'; +import { setupTestCommand } from '@test-integration/utils/test-command'; import { mockInstance } from '../../shared/mocking'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { getAllSharedWorkflows, getAllWorkflows } from '../shared/db/workflows'; import { createMember, createOwner } from '../shared/db/users'; import { getPersonalProject } from '../shared/db/projects'; @@ -27,7 +27,10 @@ test('import:workflow should import active workflow and deactivate it', async () // // ACT // - await command.run(['--separate', '--input=./test/integration/commands/importWorkflows/separate']); + await command.run([ + '--separate', + '--input=./test/integration/commands/import-workflows/separate', + ]); // // ASSERT @@ -66,7 +69,9 @@ test('import:workflow should import active workflow from combined file and deact // // ACT // - await command.run(['--input=./test/integration/commands/importWorkflows/combined/combined.json']); + await command.run([ + '--input=./test/integration/commands/import-workflows/combined/combined.json', + ]); // // ASSERT @@ -105,7 +110,7 @@ test('`import:workflow --userId ...` should fail if the workflow exists already // Import workflow the first time, assigning it to a member. await command.run([ - '--input=./test/integration/commands/importWorkflows/combined-with-update/original.json', + '--input=./test/integration/commands/import-workflows/combined-with-update/original.json', `--userId=${owner.id}`, ]); @@ -132,7 +137,7 @@ test('`import:workflow --userId ...` should fail if the workflow exists already // to assign it to the member. await expect( command.run([ - '--input=./test/integration/commands/importWorkflows/combined-with-update/updated.json', + '--input=./test/integration/commands/import-workflows/combined-with-update/updated.json', `--userId=${member.id}`, ]), ).rejects.toThrowError( @@ -169,7 +174,7 @@ test("only update the workflow, don't create or update the owner if `--userId` i // Import workflow the first time, assigning it to a member. await command.run([ - '--input=./test/integration/commands/importWorkflows/combined-with-update/original.json', + '--input=./test/integration/commands/import-workflows/combined-with-update/original.json', `--userId=${member.id}`, ]); @@ -194,7 +199,7 @@ test("only update the workflow, don't create or update the owner if `--userId` i // // Import the same workflow again, with another name but the same ID. await command.run([ - '--input=./test/integration/commands/importWorkflows/combined-with-update/updated.json', + '--input=./test/integration/commands/import-workflows/combined-with-update/updated.json', ]); // @@ -228,7 +233,7 @@ test('`import:workflow --projectId ...` should fail if the credential already ex // Import workflow the first time, assigning it to a member. await command.run([ - '--input=./test/integration/commands/importWorkflows/combined-with-update/original.json', + '--input=./test/integration/commands/import-workflows/combined-with-update/original.json', `--userId=${owner.id}`, ]); @@ -255,7 +260,7 @@ test('`import:workflow --projectId ...` should fail if the credential already ex // to assign it to the member. await expect( command.run([ - '--input=./test/integration/commands/importWorkflows/combined-with-update/updated.json', + '--input=./test/integration/commands/import-workflows/combined-with-update/updated.json', `--projectId=${memberProject.id}`, ]), ).rejects.toThrowError( @@ -285,7 +290,7 @@ test('`import:workflow --projectId ...` should fail if the credential already ex test('`import:workflow --projectId ... --userId ...` fails explaining that only one of the options can be used at a time', async () => { await expect( command.run([ - '--input=./test/integration/commands/importWorkflows/combined-with-update/updated.json', + '--input=./test/integration/commands/import-workflows/combined-with-update/updated.json', `--userId=${nanoid()}`, `--projectId=${nanoid()}`, ]), diff --git a/packages/cli/test/integration/commands/ldap/reset.test.ts b/packages/cli/test/integration/commands/ldap/reset.test.ts index 2af2878c30885..a8965885d719c 100644 --- a/packages/cli/test/integration/commands/ldap/reset.test.ts +++ b/packages/cli/test/integration/commands/ldap/reset.test.ts @@ -13,7 +13,7 @@ import { LdapService } from '@/ldap/ldap.service.ee'; import { Push } from '@/push'; import { Telemetry } from '@/telemetry'; -import { setupTestCommand } from '@test-integration/utils/testCommand'; +import { setupTestCommand } from '@test-integration/utils/test-command'; import { mockInstance } from '../../../shared/mocking'; import { createLdapUser, createMember, getUserById } from '../../shared/db/users'; import { createWorkflow } from '../../shared/db/workflows'; diff --git a/packages/cli/test/integration/commands/license.cmd.test.ts b/packages/cli/test/integration/commands/license.cmd.test.ts index bdca192201861..f7c05a7c774f3 100644 --- a/packages/cli/test/integration/commands/license.cmd.test.ts +++ b/packages/cli/test/integration/commands/license.cmd.test.ts @@ -2,7 +2,7 @@ import { License } from '@/license'; import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { ClearLicenseCommand } from '@/commands/license/clear'; -import { setupTestCommand } from '@test-integration/utils/testCommand'; +import { setupTestCommand } from '@test-integration/utils/test-command'; import { mockInstance } from '../../shared/mocking'; mockInstance(LoadNodesAndCredentials); diff --git a/packages/cli/test/integration/commands/reset.cmd.test.ts b/packages/cli/test/integration/commands/reset.cmd.test.ts index 6ff2d952a9d3a..fdd23557f0f43 100644 --- a/packages/cli/test/integration/commands/reset.cmd.test.ts +++ b/packages/cli/test/integration/commands/reset.cmd.test.ts @@ -10,9 +10,9 @@ import { CredentialsEntity } from '@/databases/entities/credentials-entity'; import { SettingsRepository } from '@/databases/repositories/settings.repository'; import { UserRepository } from '@/databases/repositories/user.repository'; -import { setupTestCommand } from '@test-integration/utils/testCommand'; +import { setupTestCommand } from '@test-integration/utils/test-command'; import { mockInstance } from '../../shared/mocking'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { createMember, createUser } from '../shared/db/users'; import { createWorkflow } from '../shared/db/workflows'; import { getPersonalProject } from '../shared/db/projects'; diff --git a/packages/cli/test/integration/commands/update/workflow.test.ts b/packages/cli/test/integration/commands/update/workflow.test.ts index 1119536a8a59a..76fb81175974c 100644 --- a/packages/cli/test/integration/commands/update/workflow.test.ts +++ b/packages/cli/test/integration/commands/update/workflow.test.ts @@ -1,8 +1,8 @@ import { LoadNodesAndCredentials } from '@/load-nodes-and-credentials'; import { UpdateWorkflowCommand } from '@/commands/update/workflow'; -import { setupTestCommand } from '@test-integration/utils/testCommand'; -import * as testDb from '../../shared/testDb'; +import { setupTestCommand } from '@test-integration/utils/test-command'; +import * as testDb from '../../shared/test-db'; import { createWorkflowWithTrigger, getAllWorkflows } from '../../shared/db/workflows'; import { mockInstance } from '../../../shared/mocking'; diff --git a/packages/cli/test/integration/commands/worker.cmd.test.ts b/packages/cli/test/integration/commands/worker.cmd.test.ts index 3bfac6a07c669..7876a8a38c00c 100644 --- a/packages/cli/test/integration/commands/worker.cmd.test.ts +++ b/packages/cli/test/integration/commands/worker.cmd.test.ts @@ -11,7 +11,7 @@ import { License } from '@/license'; import { ExternalHooks } from '@/external-hooks'; import { ScalingService } from '@/scaling/scaling.service'; -import { setupTestCommand } from '@test-integration/utils/testCommand'; +import { setupTestCommand } from '@test-integration/utils/test-command'; import { mockInstance } from '../../shared/mocking'; import { LogStreamingEventRelay } from '@/events/log-streaming-event-relay'; diff --git a/packages/cli/test/integration/controllers/dynamic-node-parameters.controller.test.ts b/packages/cli/test/integration/controllers/dynamic-node-parameters.controller.test.ts index 6488fb3450c47..bf2f83037ed89 100644 --- a/packages/cli/test/integration/controllers/dynamic-node-parameters.controller.test.ts +++ b/packages/cli/test/integration/controllers/dynamic-node-parameters.controller.test.ts @@ -5,7 +5,7 @@ import type { } from 'n8n-workflow'; import { mock } from 'jest-mock-extended'; -import { DynamicNodeParametersService } from '@/services/dynamicNodeParameters.service'; +import { DynamicNodeParametersService } from '@/services/dynamic-node-parameters.service'; import * as AdditionalData from '@/workflow-execute-additional-data'; import { createOwner } from '../shared/db/users'; diff --git a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts index 1d7648052a4bd..11069ad008cad 100644 --- a/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts +++ b/packages/cli/test/integration/controllers/oauth/oauth2.api.test.ts @@ -10,7 +10,7 @@ import { OAuth2CredentialController } from '@/controllers/oauth/oauth2-credentia import { createOwner } from '@test-integration/db/users'; import { saveCredential } from '@test-integration/db/credentials'; -import * as testDb from '@test-integration/testDb'; +import * as testDb from '@test-integration/test-db'; import { setupTestServer } from '@test-integration/utils'; import type { SuperAgentTest } from '@test-integration/types'; diff --git a/packages/cli/test/integration/CredentialsHelper.test.ts b/packages/cli/test/integration/credentials-helper.test.ts similarity index 98% rename from packages/cli/test/integration/CredentialsHelper.test.ts rename to packages/cli/test/integration/credentials-helper.test.ts index df6c07996092a..9c979d9d2463c 100644 --- a/packages/cli/test/integration/CredentialsHelper.test.ts +++ b/packages/cli/test/integration/credentials-helper.test.ts @@ -1,5 +1,5 @@ import Container from 'typedi'; -import * as testDb from '../integration/shared/testDb'; +import * as testDb from './shared/test-db'; import { CredentialsHelper } from '@/credentials-helper'; import { createOwner, createAdmin, createMember } from './shared/db/users'; diff --git a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts index 9745fffd673a7..11edc2c4e9387 100644 --- a/packages/cli/test/integration/credentials/credentials.api.ee.test.ts +++ b/packages/cli/test/integration/credentials/credentials.api.ee.test.ts @@ -11,7 +11,7 @@ import { ProjectService } from '@/services/project.service'; import { UserManagementMailer } from '@/user-management/email'; import { randomCredentialPayload } from '../shared/random'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import type { SaveCredentialFunction } from '../shared/types'; import * as utils from '../shared/utils'; import { diff --git a/packages/cli/test/integration/credentials/credentials.api.test.ts b/packages/cli/test/integration/credentials/credentials.api.test.ts index cff168062808c..41bcce9489ef9 100644 --- a/packages/cli/test/integration/credentials/credentials.api.test.ts +++ b/packages/cli/test/integration/credentials/credentials.api.test.ts @@ -11,7 +11,7 @@ import type { Project } from '@/databases/entities/project'; import { CredentialsRepository } from '@/databases/repositories/credentials.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { setupTestServer } from '../shared/utils'; import { randomCredentialPayload as payload, diff --git a/packages/cli/test/integration/credentials/credentials.service.test.ts b/packages/cli/test/integration/credentials/credentials.service.test.ts index 6b2ee3338699d..819ce9bb2fab8 100644 --- a/packages/cli/test/integration/credentials/credentials.service.test.ts +++ b/packages/cli/test/integration/credentials/credentials.service.test.ts @@ -6,7 +6,7 @@ import { randomCredentialPayload } from '../shared/random'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import Container from 'typedi'; import { CredentialsService } from '@/credentials/credentials.service'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { createTeamProject, linkUserToProject } from '@test-integration/db/projects'; const credentialPayload = randomCredentialPayload(); diff --git a/packages/cli/test/integration/cta.service.test.ts b/packages/cli/test/integration/cta.service.test.ts index 2b29d9f304610..e720ae0bec875 100644 --- a/packages/cli/test/integration/cta.service.test.ts +++ b/packages/cli/test/integration/cta.service.test.ts @@ -1,10 +1,10 @@ import Container from 'typedi'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { CtaService } from '@/services/cta.service'; import { createUser } from './shared/db/users'; import { createManyWorkflows } from './shared/db/workflows'; import type { User } from '@/databases/entities/User'; -import { createWorkflowStatisticsItem } from './shared/db/workflowStatistics'; +import { createWorkflowStatisticsItem } from './shared/db/workflow-statistics'; import { StatisticsNames } from '@/databases/entities/workflow-statistics'; describe('CtaService', () => { diff --git a/packages/cli/test/integration/database/repositories/execution.repository.test.ts b/packages/cli/test/integration/database/repositories/execution.repository.test.ts index 14f7bf7bfa9ed..ade7254216d62 100644 --- a/packages/cli/test/integration/database/repositories/execution.repository.test.ts +++ b/packages/cli/test/integration/database/repositories/execution.repository.test.ts @@ -1,7 +1,7 @@ import Container from 'typedi'; import { ExecutionRepository } from '@/databases/repositories/execution.repository'; import { ExecutionDataRepository } from '@/databases/repositories/execution-data.repository'; -import * as testDb from '../../shared/testDb'; +import * as testDb from '../../shared/test-db'; import { createWorkflow } from '../../shared/db/workflows'; describe('ExecutionRepository', () => { diff --git a/packages/cli/test/integration/database/repositories/project.repository.test.ts b/packages/cli/test/integration/database/repositories/project.repository.test.ts index 7c94273ac6a66..8986b2ed3d092 100644 --- a/packages/cli/test/integration/database/repositories/project.repository.test.ts +++ b/packages/cli/test/integration/database/repositories/project.repository.test.ts @@ -1,6 +1,6 @@ import Container from 'typedi'; import { createMember, createOwner } from '../../shared/db/users'; -import * as testDb from '../../shared/testDb'; +import * as testDb from '../../shared/test-db'; import { ProjectRepository } from '@/databases/repositories/project.repository'; import { EntityNotFoundError } from '@n8n/typeorm'; import { createTeamProject } from '../../shared/db/projects'; diff --git a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts index 2f7acbb6d234f..5c64ad3fc0c71 100644 --- a/packages/cli/test/integration/database/repositories/workflow.repository.test.ts +++ b/packages/cli/test/integration/database/repositories/workflow.repository.test.ts @@ -2,7 +2,7 @@ import Container from 'typedi'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; -import * as testDb from '../../shared/testDb'; +import * as testDb from '../../shared/test-db'; import { createWorkflowWithTrigger, createWorkflow, diff --git a/packages/cli/test/integration/debug.controller.test.ts b/packages/cli/test/integration/debug.controller.test.ts index 09ffe280ec929..891b23c52fc38 100644 --- a/packages/cli/test/integration/debug.controller.test.ts +++ b/packages/cli/test/integration/debug.controller.test.ts @@ -3,7 +3,7 @@ import { ActiveWorkflowManager } from '@/active-workflow-manager'; import { generateNanoId } from '@/databases/utils/generators'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { OrchestrationService } from '@/services/orchestration.service'; -import { MultiMainSetup } from '@/services/orchestration/main/MultiMainSetup.ee'; +import { MultiMainSetup } from '@/services/orchestration/main/multi-main-setup.ee'; import { mockInstance } from '../shared/mocking'; import { randomName } from './shared/random'; diff --git a/packages/cli/test/integration/environments/source-control-import.service.test.ts b/packages/cli/test/integration/environments/source-control-import.service.test.ts index 1d619437454bf..4f6d78bcf6c4f 100644 --- a/packages/cli/test/integration/environments/source-control-import.service.test.ts +++ b/packages/cli/test/integration/environments/source-control-import.service.test.ts @@ -6,7 +6,7 @@ import { Cipher } from 'n8n-core'; import { nanoid } from 'nanoid'; import type { InstanceSettings } from 'n8n-core'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { SourceControlImportService } from '@/environments/source-control/source-control-import.service.ee'; import { createMember, getGlobalOwner } from '../shared/db/users'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; diff --git a/packages/cli/test/integration/environments/SourceControl.test.ts b/packages/cli/test/integration/environments/source-control.test.ts similarity index 98% rename from packages/cli/test/integration/environments/SourceControl.test.ts rename to packages/cli/test/integration/environments/source-control.test.ts index a5537459a04c4..4547dc9f23bae 100644 --- a/packages/cli/test/integration/environments/SourceControl.test.ts +++ b/packages/cli/test/integration/environments/source-control.test.ts @@ -6,7 +6,7 @@ import { SourceControlPreferencesService } from '@/environments/source-control/s import { SourceControlService } from '@/environments/source-control/source-control.service.ee'; import type { SourceControlledFile } from '@/environments/source-control/types/source-controlled-file'; -import * as utils from '../shared/utils/'; +import * as utils from '../shared/utils'; import { createUser } from '../shared/db/users'; import type { SuperAgentTest } from '../shared/types'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/test/integration/execution.service.integration.test.ts b/packages/cli/test/integration/execution.service.integration.test.ts index 18f2df542a538..3130fea5a186d 100644 --- a/packages/cli/test/integration/execution.service.integration.test.ts +++ b/packages/cli/test/integration/execution.service.integration.test.ts @@ -4,7 +4,7 @@ import { mock } from 'jest-mock-extended'; import Container from 'typedi'; import { createWorkflow } from './shared/db/workflows'; import { createExecution } from './shared/db/executions'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import type { ExecutionSummaries } from '@/executions/execution.types'; import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository'; diff --git a/packages/cli/test/integration/executions.controller.test.ts b/packages/cli/test/integration/executions.controller.test.ts index 9f9895a9d355c..700af7abd4412 100644 --- a/packages/cli/test/integration/executions.controller.test.ts +++ b/packages/cli/test/integration/executions.controller.test.ts @@ -3,7 +3,7 @@ import type { User } from '@/databases/entities/User'; import { createSuccessfulExecution, getAllExecutions } from './shared/db/executions'; import { createMember, createOwner } from './shared/db/users'; import { createWorkflow, shareWorkflowWithUsers } from './shared/db/workflows'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { setupTestServer } from './shared/utils'; import { mockInstance } from '../shared/mocking'; diff --git a/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts similarity index 99% rename from packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts rename to packages/cli/test/integration/external-secrets/external-secrets.api.test.ts index e3d3a307a694a..f15d0a94c594a 100644 --- a/packages/cli/test/integration/ExternalSecrets/externalSecrets.api.test.ts +++ b/packages/cli/test/integration/external-secrets/external-secrets.api.test.ts @@ -19,7 +19,7 @@ import { FailedProvider, MockProviders, TestFailProvider, -} from '../../shared/ExternalSecrets/utils'; +} from '../../shared/external-secrets/utils'; import type { SuperAgentTest } from '../shared/types'; import type { EventService } from '@/events/event.service'; diff --git a/packages/cli/test/integration/import.service.test.ts b/packages/cli/test/integration/import.service.test.ts index 775edd9d01090..7e3ca724b460c 100644 --- a/packages/cli/test/integration/import.service.test.ts +++ b/packages/cli/test/integration/import.service.test.ts @@ -10,7 +10,7 @@ import { TagEntity } from '@/databases/entities/tag-entity'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { mockInstance } from '../shared/mocking'; import { createMember, createOwner } from './shared/db/users'; import { diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts index 4cd73e1303864..2c272a1062b68 100644 --- a/packages/cli/test/integration/ldap/ldap.api.test.ts +++ b/packages/cli/test/integration/ldap/ldap.api.test.ts @@ -13,7 +13,7 @@ import { saveLdapSynchronization } from '@/ldap/helpers.ee'; import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from '@/sso/sso-helpers'; import { randomEmail, randomName, uniqueId } from './../shared/random'; -import * as testDb from './../shared/testDb'; +import * as testDb from '../shared/test-db'; import * as utils from '../shared/utils/'; import { createLdapUser, createUser, getAllUsers, getLdapIdentities } from '../shared/db/users'; import { getPersonalProject } from '../shared/db/projects'; diff --git a/packages/cli/test/integration/license-metrics.repository.test.ts b/packages/cli/test/integration/license-metrics.repository.test.ts index 2776c842dec2b..4fbad50ca4f8e 100644 --- a/packages/cli/test/integration/license-metrics.repository.test.ts +++ b/packages/cli/test/integration/license-metrics.repository.test.ts @@ -1,6 +1,6 @@ import { LicenseMetricsRepository } from '@/databases/repositories/license-metrics.repository'; import { createAdmin, createMember, createOwner, createUser } from './shared/db/users'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import Container from 'typedi'; import { createManyWorkflows } from './shared/db/workflows'; import { createManyCredentials } from './shared/db/credentials'; diff --git a/packages/cli/test/integration/license.api.test.ts b/packages/cli/test/integration/license.api.test.ts index e04f738d5f307..44071e1b6801a 100644 --- a/packages/cli/test/integration/license.api.test.ts +++ b/packages/cli/test/integration/license.api.test.ts @@ -5,7 +5,7 @@ import type { User } from '@/databases/entities/User'; import type { ILicensePostResponse, ILicenseReadResponse } from '@/Interfaces'; import { License } from '@/license'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import * as utils from './shared/utils/'; import { createUserShell } from './shared/db/users'; import type { SuperAgentTest } from './shared/types'; diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts index 6534b2f0a656f..e88b9c144735a 100644 --- a/packages/cli/test/integration/me.api.test.ts +++ b/packages/cli/test/integration/me.api.test.ts @@ -8,7 +8,7 @@ import { ProjectRepository } from '@/databases/repositories/project.repository'; import { SUCCESS_RESPONSE_BODY } from './shared/constants'; import { randomApiKey, randomEmail, randomName, randomValidPassword } from './shared/random'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import * as utils from './shared/utils/'; import { addApiKey, createOwner, createUser, createUserShell } from './shared/db/users'; import type { SuperAgentTest } from './shared/types'; diff --git a/packages/cli/test/integration/mfa/mfa.api.test.ts b/packages/cli/test/integration/mfa/mfa.api.test.ts index 713aba196daf0..52f257dc36562 100644 --- a/packages/cli/test/integration/mfa/mfa.api.test.ts +++ b/packages/cli/test/integration/mfa/mfa.api.test.ts @@ -7,7 +7,7 @@ import type { User } from '@/databases/entities/User'; import { AuthUserRepository } from '@/databases/repositories/auth-user.repository'; import { TOTPService } from '@/mfa/totp.service'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import * as utils from '../shared/utils'; import { randomValidPassword, uniqueId } from '../shared/random'; import { createUser, createUserWithMfaEnabled } from '../shared/db/users'; diff --git a/packages/cli/test/integration/middlewares/bodyParser.test.ts b/packages/cli/test/integration/middlewares/body-parser.test.ts similarity index 100% rename from packages/cli/test/integration/middlewares/bodyParser.test.ts rename to packages/cli/test/integration/middlewares/body-parser.test.ts diff --git a/packages/cli/test/integration/owner.api.test.ts b/packages/cli/test/integration/owner.api.test.ts index 9997659a51b10..a90aa8ecd508b 100644 --- a/packages/cli/test/integration/owner.api.test.ts +++ b/packages/cli/test/integration/owner.api.test.ts @@ -11,7 +11,7 @@ import { randomName, randomValidPassword, } from './shared/random'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import * as utils from './shared/utils/'; import { createUserShell } from './shared/db/users'; diff --git a/packages/cli/test/integration/passwordReset.api.test.ts b/packages/cli/test/integration/password-reset.api.test.ts similarity index 98% rename from packages/cli/test/integration/passwordReset.api.test.ts rename to packages/cli/test/integration/password-reset.api.test.ts index fb0105181fbf1..3037945c20f50 100644 --- a/packages/cli/test/integration/passwordReset.api.test.ts +++ b/packages/cli/test/integration/password-reset.api.test.ts @@ -16,14 +16,14 @@ import { UserRepository } from '@/databases/repositories/user.repository'; import { PasswordUtility } from '@/services/password.utility'; import { mockInstance } from '../shared/mocking'; -import { getAuthToken, setupTestServer } from './shared/utils/'; +import { getAuthToken, setupTestServer } from './shared/utils'; import { randomEmail, randomInvalidPassword, randomName, randomValidPassword, } from './shared/random'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { createUser } from './shared/db/users'; config.set('userManagement.jwtSecret', randomString(5, 10)); diff --git a/packages/cli/test/integration/permission-checker.test.ts b/packages/cli/test/integration/permission-checker.test.ts index 498755f8c2d5c..75da58e92a12b 100644 --- a/packages/cli/test/integration/permission-checker.test.ts +++ b/packages/cli/test/integration/permission-checker.test.ts @@ -12,7 +12,7 @@ import { PermissionChecker } from '@/user-management/permission-checker'; import { mockInstance } from '../shared/mocking'; import { randomCredentialPayload as randomCred } from './shared/random'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import type { SaveCredentialFunction } from './shared/types'; import { affixRoleToSaveCredential } from './shared/db/credentials'; import { createOwner, createUser } from './shared/db/users'; diff --git a/packages/cli/test/integration/project.api.test.ts b/packages/cli/test/integration/project.api.test.ts index bcb73b08f26c5..0a788b8b0b813 100644 --- a/packages/cli/test/integration/project.api.test.ts +++ b/packages/cli/test/integration/project.api.test.ts @@ -1,4 +1,4 @@ -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import * as utils from './shared/utils/'; import { createMember, createOwner, createUser } from './shared/db/users'; import { @@ -20,7 +20,7 @@ import { shareCredentialWithProjects, } from './shared/db/credentials'; import { randomCredentialPayload } from './shared/random'; -import { getWorkflowById } from '@/PublicApi/v1/handlers/workflows/workflows.service'; +import { getWorkflowById } from '@/public-api/v1/handlers/workflows/workflows.service'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { SharedCredentialsRepository } from '@/databases/repositories/shared-credentials.repository'; import type { GlobalRole } from '@/databases/entities/User'; diff --git a/packages/cli/test/integration/project.service.integration.test.ts b/packages/cli/test/integration/project.service.integration.test.ts index 0d81ec7b1ede5..ccb5b8865bcef 100644 --- a/packages/cli/test/integration/project.service.integration.test.ts +++ b/packages/cli/test/integration/project.service.integration.test.ts @@ -1,6 +1,6 @@ import Container from 'typedi'; import { ProjectService } from '@/services/project.service'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { SharedWorkflowRepository } from '@/databases/repositories/shared-workflow.repository'; import { createUser } from './shared/db/users'; import { createWorkflow } from './shared/db/workflows'; diff --git a/packages/cli/test/integration/pruning.service.test.ts b/packages/cli/test/integration/pruning.service.test.ts index abec1d033a85f..f4257c148b4bf 100644 --- a/packages/cli/test/integration/pruning.service.test.ts +++ b/packages/cli/test/integration/pruning.service.test.ts @@ -3,7 +3,7 @@ import { BinaryDataService, InstanceSettings } from 'n8n-core'; import type { ExecutionStatus } from 'n8n-workflow'; import Container from 'typedi'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import type { ExecutionEntity } from '@/databases/entities/execution-entity'; import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { ExecutionRepository } from '@/databases/repositories/execution.repository'; diff --git a/packages/cli/test/integration/publicApi/credentials.test.ts b/packages/cli/test/integration/public-api/credentials.test.ts similarity index 99% rename from packages/cli/test/integration/publicApi/credentials.test.ts rename to packages/cli/test/integration/public-api/credentials.test.ts index dfbb8d5fa0ed2..d924832a69a36 100644 --- a/packages/cli/test/integration/publicApi/credentials.test.ts +++ b/packages/cli/test/integration/public-api/credentials.test.ts @@ -8,7 +8,7 @@ import { SharedCredentialsRepository } from '@/databases/repositories/shared-cre import { randomApiKey, randomName } from '../shared/random'; import * as utils from '../shared/utils/'; import type { CredentialPayload, SaveCredentialFunction } from '../shared/types'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { affixRoleToSaveCredential, createCredentials } from '../shared/db/credentials'; import { addApiKey, createUser, createUserShell } from '../shared/db/users'; import type { SuperAgentTest } from '../shared/types'; diff --git a/packages/cli/test/integration/publicApi/executions.test.ts b/packages/cli/test/integration/public-api/executions.test.ts similarity index 99% rename from packages/cli/test/integration/publicApi/executions.test.ts rename to packages/cli/test/integration/public-api/executions.test.ts index 38d4188091a04..f68001b24c1ed 100644 --- a/packages/cli/test/integration/publicApi/executions.test.ts +++ b/packages/cli/test/integration/public-api/executions.test.ts @@ -3,7 +3,7 @@ import type { ActiveWorkflowManager } from '@/active-workflow-manager'; import { randomApiKey } from '../shared/random'; import * as utils from '../shared/utils/'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { createUser } from '../shared/db/users'; import { createManyWorkflows, diff --git a/packages/cli/test/integration/publicApi/projects.test.ts b/packages/cli/test/integration/public-api/projects.test.ts similarity index 99% rename from packages/cli/test/integration/publicApi/projects.test.ts rename to packages/cli/test/integration/public-api/projects.test.ts index 0554fd6f4116f..0f6dc160b3041 100644 --- a/packages/cli/test/integration/publicApi/projects.test.ts +++ b/packages/cli/test/integration/public-api/projects.test.ts @@ -1,6 +1,6 @@ import { setupTestServer } from '@test-integration/utils'; import { createMember, createOwner } from '@test-integration/db/users'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error'; import { createTeamProject, getProjectByNameOrFail } from '@test-integration/db/projects'; import { mockInstance } from '@test/mocking'; diff --git a/packages/cli/test/integration/publicApi/tags.test.ts b/packages/cli/test/integration/public-api/tags.test.ts similarity index 99% rename from packages/cli/test/integration/publicApi/tags.test.ts rename to packages/cli/test/integration/public-api/tags.test.ts index f38ea1c19dce7..3de96e3ab2cc2 100644 --- a/packages/cli/test/integration/publicApi/tags.test.ts +++ b/packages/cli/test/integration/public-api/tags.test.ts @@ -4,7 +4,7 @@ import { TagRepository } from '@/databases/repositories/tag.repository'; import { randomApiKey } from '../shared/random'; import * as utils from '../shared/utils/'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { createUser } from '../shared/db/users'; import { createTag } from '../shared/db/tags'; import type { SuperAgentTest } from '../shared/types'; diff --git a/packages/cli/test/integration/publicApi/users.ee.test.ts b/packages/cli/test/integration/public-api/users.ee.test.ts similarity index 99% rename from packages/cli/test/integration/publicApi/users.ee.test.ts rename to packages/cli/test/integration/public-api/users.ee.test.ts index 4874fab4f5354..b45c33e51b73e 100644 --- a/packages/cli/test/integration/publicApi/users.ee.test.ts +++ b/packages/cli/test/integration/public-api/users.ee.test.ts @@ -6,7 +6,7 @@ import { License } from '@/license'; import { mockInstance } from '../../shared/mocking'; import { randomApiKey } from '../shared/random'; import * as utils from '../shared/utils/'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { createOwner, createUser, createUserShell } from '../shared/db/users'; import type { SuperAgentTest } from '../shared/types'; import { createTeamProject, linkUserToProject } from '@test-integration/db/projects'; diff --git a/packages/cli/test/integration/publicApi/users.test.ts b/packages/cli/test/integration/public-api/users.test.ts similarity index 99% rename from packages/cli/test/integration/publicApi/users.test.ts rename to packages/cli/test/integration/public-api/users.test.ts index 6021ae01a35f5..7a68d8ddc37f1 100644 --- a/packages/cli/test/integration/publicApi/users.test.ts +++ b/packages/cli/test/integration/public-api/users.test.ts @@ -1,5 +1,5 @@ import { setupTestServer } from '@test-integration/utils'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { createMember, createOwner, getUserById } from '@test-integration/db/users'; import { mockInstance } from '@test/mocking'; import { Telemetry } from '@/telemetry'; diff --git a/packages/cli/test/integration/publicApi/variables.test.ts b/packages/cli/test/integration/public-api/variables.test.ts similarity index 98% rename from packages/cli/test/integration/publicApi/variables.test.ts rename to packages/cli/test/integration/public-api/variables.test.ts index b97c2467ebf63..2d0db72e37e36 100644 --- a/packages/cli/test/integration/publicApi/variables.test.ts +++ b/packages/cli/test/integration/public-api/variables.test.ts @@ -1,7 +1,7 @@ import { setupTestServer } from '@test-integration/utils'; import { createOwner } from '@test-integration/db/users'; import { createVariable, getVariableOrFail } from '@test-integration/db/variables'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { FeatureNotLicensedError } from '@/errors/feature-not-licensed.error'; describe('Variables in Public API', () => { diff --git a/packages/cli/test/integration/publicApi/workflows.test.ts b/packages/cli/test/integration/public-api/workflows.test.ts similarity index 99% rename from packages/cli/test/integration/publicApi/workflows.test.ts rename to packages/cli/test/integration/public-api/workflows.test.ts index cf83033e83325..e126be6ca01ee 100644 --- a/packages/cli/test/integration/publicApi/workflows.test.ts +++ b/packages/cli/test/integration/public-api/workflows.test.ts @@ -14,7 +14,7 @@ import { ExecutionService } from '@/executions/execution.service'; import { randomApiKey } from '../shared/random'; import * as utils from '../shared/utils/'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { createUser } from '../shared/db/users'; import { createWorkflow, createWorkflowWithTrigger } from '../shared/db/workflows'; import { createTag } from '../shared/db/tags'; diff --git a/packages/cli/test/integration/saml/samlHelpers.test.ts b/packages/cli/test/integration/saml/saml-helpers.test.ts similarity index 88% rename from packages/cli/test/integration/saml/samlHelpers.test.ts rename to packages/cli/test/integration/saml/saml-helpers.test.ts index ac43f57a1bcfe..b09103ab4f068 100644 --- a/packages/cli/test/integration/saml/samlHelpers.test.ts +++ b/packages/cli/test/integration/saml/saml-helpers.test.ts @@ -1,8 +1,8 @@ import * as helpers from '@/sso/saml/saml-helpers'; import type { SamlUserAttributes } from '@/sso/saml/types/saml-user-attributes'; -import { getPersonalProject } from '../../integration/shared/db/projects'; +import { getPersonalProject } from '../shared/db/projects'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; beforeAll(async () => { await testDb.init(); diff --git a/packages/cli/test/integration/saml/saml.api.test.ts b/packages/cli/test/integration/saml/saml.api.test.ts index 5c0b3fd9155c3..b667d3ddb9606 100644 --- a/packages/cli/test/integration/saml/saml.api.test.ts +++ b/packages/cli/test/integration/saml/saml.api.test.ts @@ -4,7 +4,7 @@ import { getCurrentAuthenticationMethod, setCurrentAuthenticationMethod } from ' import { randomEmail, randomName, randomValidPassword } from '../shared/random'; import * as utils from '../shared/utils/'; -import { sampleConfig } from './sampleMetadata'; +import { sampleConfig } from './sample-metadata'; import { createOwner, createUser } from '../shared/db/users'; import type { SuperAgentTest } from '../shared/types'; diff --git a/packages/cli/test/integration/saml/sampleMetadata.ts b/packages/cli/test/integration/saml/sample-metadata.ts similarity index 100% rename from packages/cli/test/integration/saml/sampleMetadata.ts rename to packages/cli/test/integration/saml/sample-metadata.ts diff --git a/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts similarity index 99% rename from packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts rename to packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts index 218839acd2f41..d9b14b8881d1e 100644 --- a/packages/cli/test/integration/security-audit/CredentialsRiskReporter.test.ts +++ b/packages/cli/test/integration/security-audit/credentials-risk-reporter.test.ts @@ -3,7 +3,7 @@ import config from '@/config'; import { SecurityAuditService } from '@/security-audit/security-audit.service'; import { CREDENTIALS_REPORT } from '@/security-audit/constants'; import { getRiskSection } from './utils'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { generateNanoId } from '@/databases/utils/generators'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import Container from 'typedi'; diff --git a/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts b/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts similarity index 99% rename from packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts rename to packages/cli/test/integration/security-audit/database-risk-reporter.test.ts index e9a6dcb6f1c89..819f1dbf9e578 100644 --- a/packages/cli/test/integration/security-audit/DatabaseRiskReporter.test.ts +++ b/packages/cli/test/integration/security-audit/database-risk-reporter.test.ts @@ -6,7 +6,7 @@ import { SQL_NODE_TYPES_WITH_QUERY_PARAMS, } from '@/security-audit/constants'; import { getRiskSection, saveManualTriggerWorkflow } from './utils'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { generateNanoId } from '@/databases/utils/generators'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import Container from 'typedi'; diff --git a/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts b/packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts similarity index 97% rename from packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts rename to packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts index 04b786f839469..a33d8cd74d57a 100644 --- a/packages/cli/test/integration/security-audit/FilesystemRiskReporter.test.ts +++ b/packages/cli/test/integration/security-audit/filesystem-risk-reporter.test.ts @@ -2,7 +2,7 @@ import { v4 as uuid } from 'uuid'; import { SecurityAuditService } from '@/security-audit/security-audit.service'; import { FILESYSTEM_INTERACTION_NODE_TYPES, FILESYSTEM_REPORT } from '@/security-audit/constants'; import { getRiskSection, saveManualTriggerWorkflow } from './utils'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { WorkflowRepository } from '@/databases/repositories/workflow.repository'; import Container from 'typedi'; diff --git a/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts similarity index 99% rename from packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts rename to packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts index 59479cfdb7b14..722f06fffa3aa 100644 --- a/packages/cli/test/integration/security-audit/InstanceRiskReporter.test.ts +++ b/packages/cli/test/integration/security-audit/instance-risk-reporter.test.ts @@ -8,7 +8,7 @@ import { simulateOutdatedInstanceOnce, simulateUpToDateInstance, } from './utils'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { toReportTitle } from '@/security-audit/utils'; import config from '@/config'; import { generateNanoId } from '@/databases/utils/generators'; diff --git a/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts b/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts similarity index 98% rename from packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts rename to packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts index 6556f1d3a6f1e..6a93447137d98 100644 --- a/packages/cli/test/integration/security-audit/NodesRiskReporter.test.ts +++ b/packages/cli/test/integration/security-audit/nodes-risk-reporter.test.ts @@ -10,7 +10,7 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository import { mockInstance } from '../../shared/mocking'; import { getRiskSection, MOCK_PACKAGE, saveManualTriggerWorkflow } from './utils'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; const nodesAndCredentials = mockInstance(LoadNodesAndCredentials); nodesAndCredentials.getCustomDirectories.mockReturnValue([]); diff --git a/packages/cli/test/integration/services/executionMetadata.service.test.ts b/packages/cli/test/integration/services/execution-metadata.service.test.ts similarity index 92% rename from packages/cli/test/integration/services/executionMetadata.service.test.ts rename to packages/cli/test/integration/services/execution-metadata.service.test.ts index d9c7bb535a939..4257979a98c7c 100644 --- a/packages/cli/test/integration/services/executionMetadata.service.test.ts +++ b/packages/cli/test/integration/services/execution-metadata.service.test.ts @@ -1,7 +1,7 @@ -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import Container from 'typedi'; import { ExecutionMetadataRepository } from '@/databases/repositories/execution-metadata.repository'; -import { ExecutionMetadataService } from '@/services/executionMetadata.service'; +import { ExecutionMetadataService } from '@/services/execution-metadata.service'; import { createExecution } from '@test-integration/db/executions'; import { createWorkflow } from '@test-integration/db/workflows'; diff --git a/packages/cli/test/integration/services/project.service.test.ts b/packages/cli/test/integration/services/project.service.test.ts index e709419fc9002..b1b4f02880a7c 100644 --- a/packages/cli/test/integration/services/project.service.test.ts +++ b/packages/cli/test/integration/services/project.service.test.ts @@ -1,5 +1,5 @@ import { ProjectService } from '@/services/project.service'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import Container from 'typedi'; import { createMember } from '../shared/db/users'; import { ProjectRepository } from '@/databases/repositories/project.repository'; diff --git a/packages/cli/test/integration/services/workflowStaticData.service.test.ts b/packages/cli/test/integration/services/workflow-static-data.service.test.ts similarity index 97% rename from packages/cli/test/integration/services/workflowStaticData.service.test.ts rename to packages/cli/test/integration/services/workflow-static-data.service.test.ts index 0ce2665001824..f6a0233e346dd 100644 --- a/packages/cli/test/integration/services/workflowStaticData.service.test.ts +++ b/packages/cli/test/integration/services/workflow-static-data.service.test.ts @@ -1,5 +1,5 @@ import { WorkflowStaticDataService } from '@/workflows/workflow-static-data.service'; -import * as testDb from '@test-integration/testDb'; +import * as testDb from '@test-integration/test-db'; import Container from 'typedi'; import { createWorkflow } from '@test-integration/db/workflows'; import { Workflow } from 'n8n-workflow'; diff --git a/packages/cli/test/integration/shared/db/workflowHistory.ts b/packages/cli/test/integration/shared/db/workflow-history.ts similarity index 100% rename from packages/cli/test/integration/shared/db/workflowHistory.ts rename to packages/cli/test/integration/shared/db/workflow-history.ts diff --git a/packages/cli/test/integration/shared/db/workflowStatistics.ts b/packages/cli/test/integration/shared/db/workflow-statistics.ts similarity index 100% rename from packages/cli/test/integration/shared/db/workflowStatistics.ts rename to packages/cli/test/integration/shared/db/workflow-statistics.ts diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/test-db.ts similarity index 100% rename from packages/cli/test/integration/shared/testDb.ts rename to packages/cli/test/integration/shared/test-db.ts diff --git a/packages/cli/test/integration/shared/utils/communityNodes.ts b/packages/cli/test/integration/shared/utils/community-nodes.ts similarity index 100% rename from packages/cli/test/integration/shared/utils/communityNodes.ts rename to packages/cli/test/integration/shared/utils/community-nodes.ts diff --git a/packages/cli/test/integration/shared/utils/index.ts b/packages/cli/test/integration/shared/utils/index.ts index 849af9a9c3e26..d135f55a9e324 100644 --- a/packages/cli/test/integration/shared/utils/index.ts +++ b/packages/cli/test/integration/shared/utils/index.ts @@ -20,7 +20,7 @@ import { OrchestrationService } from '@/services/orchestration.service'; import { mockInstance } from '../../../shared/mocking'; -export { setupTestServer } from './testServer'; +export { setupTestServer } from './test-server'; // ---------------------------------- // initializers @@ -137,7 +137,7 @@ export const setInstanceOwnerSetUp = async (value: boolean) => { // community nodes // ---------------------------------- -export * from './communityNodes'; +export * from './community-nodes'; // ---------------------------------- // workflow diff --git a/packages/cli/test/integration/shared/utils/testCommand.ts b/packages/cli/test/integration/shared/utils/test-command.ts similarity index 96% rename from packages/cli/test/integration/shared/utils/testCommand.ts rename to packages/cli/test/integration/shared/utils/test-command.ts index 4043725a8de3e..a81875e89c94e 100644 --- a/packages/cli/test/integration/shared/utils/testCommand.ts +++ b/packages/cli/test/integration/shared/utils/test-command.ts @@ -3,7 +3,7 @@ import type { Class } from 'n8n-core'; import { mock } from 'jest-mock-extended'; import type { BaseCommand } from '@/commands/base-command'; -import * as testDb from '../testDb'; +import * as testDb from '../test-db'; import { TelemetryEventRelay } from '@/events/telemetry-event-relay'; import { mockInstance } from '@test/mocking'; import { MessageEventBus } from '@/eventbus/message-event-bus/message-event-bus'; diff --git a/packages/cli/test/integration/shared/utils/testServer.ts b/packages/cli/test/integration/shared/utils/test-server.ts similarity index 98% rename from packages/cli/test/integration/shared/utils/testServer.ts rename to packages/cli/test/integration/shared/utils/test-server.ts index b1c0a3e299ca6..a66cde217f34c 100644 --- a/packages/cli/test/integration/shared/utils/testServer.ts +++ b/packages/cli/test/integration/shared/utils/test-server.ts @@ -18,7 +18,7 @@ import { AuthService } from '@/auth/auth.service'; import type { APIRequest } from '@/requests'; import { mockInstance } from '../../../shared/mocking'; -import * as testDb from '../../shared/testDb'; +import * as testDb from '../test-db'; import { PUBLIC_API_REST_PATH_SEGMENT, REST_PATH_SEGMENT } from '../constants'; import type { SetupProps, TestServer } from '../types'; import { LicenseMocker } from '../license'; @@ -114,7 +114,7 @@ export const setupTestServer = ({ const enablePublicAPI = endpointGroups?.includes('publicApi'); if (enablePublicAPI) { - const { loadPublicApiVersions } = await import('@/PublicApi'); + const { loadPublicApiVersions } = await import('@/public-api'); const { apiRouters } = await loadPublicApiVersions(PUBLIC_API_REST_PATH_SEGMENT); app.use(...apiRouters); } diff --git a/packages/cli/test/integration/tags.api.test.ts b/packages/cli/test/integration/tags.api.test.ts index abc9dc6c927bc..90933366eba25 100644 --- a/packages/cli/test/integration/tags.api.test.ts +++ b/packages/cli/test/integration/tags.api.test.ts @@ -3,7 +3,7 @@ import { Container } from 'typedi'; import { TagRepository } from '@/databases/repositories/tag.repository'; import * as utils from './shared/utils/'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import type { SuperAgentTest } from './shared/types'; import { createUserShell } from './shared/db/users'; diff --git a/packages/cli/test/integration/user.repository.test.ts b/packages/cli/test/integration/user.repository.test.ts index 6b35dde37be0f..018a9fcf2a94b 100644 --- a/packages/cli/test/integration/user.repository.test.ts +++ b/packages/cli/test/integration/user.repository.test.ts @@ -1,7 +1,7 @@ import Container from 'typedi'; import { UserRepository } from '@/databases/repositories/user.repository'; import { createAdmin, createMember, createOwner } from './shared/db/users'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { randomEmail } from './shared/random'; import { ProjectRelationRepository } from '@/databases/repositories/project-relation.repository'; diff --git a/packages/cli/test/integration/users.api.test.ts b/packages/cli/test/integration/users.api.test.ts index b76c8ad295c53..94d9edff253ab 100644 --- a/packages/cli/test/integration/users.api.test.ts +++ b/packages/cli/test/integration/users.api.test.ts @@ -23,7 +23,7 @@ import { SUCCESS_RESPONSE_BODY } from './shared/constants'; import { validateUser } from './shared/utils/users'; import { randomCredentialPayload } from './shared/random'; import * as utils from './shared/utils/'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { mockInstance } from '../shared/mocking'; import type { SuperAgentTest } from './shared/types'; import { createTeamProject, getPersonalProject, linkUserToProject } from './shared/db/projects'; diff --git a/packages/cli/test/integration/variables.test.ts b/packages/cli/test/integration/variables.test.ts index 9917d7dc2b9fc..d29dd1d485ccf 100644 --- a/packages/cli/test/integration/variables.test.ts +++ b/packages/cli/test/integration/variables.test.ts @@ -5,7 +5,7 @@ import { VariablesRepository } from '@/databases/repositories/variables.reposito import { generateNanoId } from '@/databases/utils/generators'; import { VariablesService } from '@/environments/variables/variables.service.ee'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import * as utils from './shared/utils/'; import { createOwner, createUser } from './shared/db/users'; import type { SuperAgentTest } from './shared/types'; diff --git a/packages/cli/test/integration/webhooks.api.test.ts b/packages/cli/test/integration/webhooks.api.test.ts index 78b78299811a7..0665c2b20e92d 100644 --- a/packages/cli/test/integration/webhooks.api.test.ts +++ b/packages/cli/test/integration/webhooks.api.test.ts @@ -10,7 +10,7 @@ import type { WorkflowEntity } from '@/databases/entities/workflow-entity'; import { mockInstance } from '../shared/mocking'; import { initActiveWorkflowManager } from './shared/utils'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { createUser } from './shared/db/users'; import { createWorkflow } from './shared/db/workflows'; import type { SuperAgentTest } from './shared/types'; diff --git a/packages/cli/test/integration/workflowHistoryManager.test.ts b/packages/cli/test/integration/workflow-history-manager.test.ts similarity index 98% rename from packages/cli/test/integration/workflowHistoryManager.test.ts rename to packages/cli/test/integration/workflow-history-manager.test.ts index 49e60ee1bed28..587c105ffe9e0 100644 --- a/packages/cli/test/integration/workflowHistoryManager.test.ts +++ b/packages/cli/test/integration/workflow-history-manager.test.ts @@ -8,9 +8,9 @@ import { License } from '@/license'; import { WorkflowHistoryManager } from '@/workflows/workflow-history/workflow-history-manager.ee'; import { mockInstance } from '../shared/mocking'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { createWorkflow } from './shared/db/workflows'; -import { createManyWorkflowHistoryItems } from './shared/db/workflowHistory'; +import { createManyWorkflowHistoryItems } from './shared/db/workflow-history'; describe('Workflow History Manager', () => { const license = mockInstance(License); diff --git a/packages/cli/test/integration/workflowHistory.api.test.ts b/packages/cli/test/integration/workflow-history.api.test.ts similarity index 98% rename from packages/cli/test/integration/workflowHistory.api.test.ts rename to packages/cli/test/integration/workflow-history.api.test.ts index 4c0cd7c806132..8d3cecd8f1687 100644 --- a/packages/cli/test/integration/workflowHistory.api.test.ts +++ b/packages/cli/test/integration/workflow-history.api.test.ts @@ -1,10 +1,10 @@ import type { User } from '@/databases/entities/User'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import * as utils from './shared/utils/'; import { createOwner, createUser } from './shared/db/users'; import { createWorkflow } from './shared/db/workflows'; -import { createWorkflowHistoryItem } from './shared/db/workflowHistory'; +import { createWorkflowHistoryItem } from './shared/db/workflow-history'; import type { SuperAgentTest } from './shared/types'; let owner: User; diff --git a/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts b/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts index f59ca5749dbd2..6ea88a698a15e 100644 --- a/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts +++ b/packages/cli/test/integration/workflow-tag-mapping.repository.integration.test.ts @@ -1,6 +1,6 @@ import Container from 'typedi'; -import * as testDb from './shared/testDb'; +import * as testDb from './shared/test-db'; import { WorkflowTagMappingRepository } from '@/databases/repositories/workflow-tag-mapping.repository'; import { createWorkflow } from './shared/db/workflows'; import { TagRepository } from '@/databases/repositories/tag.repository'; diff --git a/packages/cli/test/integration/workflows/workflowSharing.service.test.ts b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts similarity index 98% rename from packages/cli/test/integration/workflows/workflowSharing.service.test.ts rename to packages/cli/test/integration/workflows/workflow-sharing.service.test.ts index 740da03354b36..5ecff6b7fdc38 100644 --- a/packages/cli/test/integration/workflows/workflowSharing.service.test.ts +++ b/packages/cli/test/integration/workflows/workflow-sharing.service.test.ts @@ -3,7 +3,7 @@ import Container from 'typedi'; import type { User } from '@/databases/entities/User'; import { WorkflowSharingService } from '@/workflows/workflow-sharing.service'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { createUser } from '../shared/db/users'; import { createWorkflow, shareWorkflowWithUsers } from '../shared/db/workflows'; import { ProjectService } from '@/services/project.service'; diff --git a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts index 29efa61fcfcae..44d44f05c030e 100644 --- a/packages/cli/test/integration/workflows/workflow.service.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflow.service.ee.test.ts @@ -7,7 +7,7 @@ import { WorkflowRepository } from '@/databases/repositories/workflow.repository import { Telemetry } from '@/telemetry'; import { EnterpriseWorkflowService } from '@/workflows/workflow.service.ee'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { mockInstance } from '../../shared/mocking'; import { FIRST_CREDENTIAL_ID, diff --git a/packages/cli/test/integration/workflows/workflow.service.test.ts b/packages/cli/test/integration/workflows/workflow.service.test.ts index 157b937c79884..4c65f24858698 100644 --- a/packages/cli/test/integration/workflows/workflow.service.test.ts +++ b/packages/cli/test/integration/workflows/workflow.service.test.ts @@ -8,7 +8,7 @@ import { Telemetry } from '@/telemetry'; import { OrchestrationService } from '@/services/orchestration.service'; import { WorkflowService } from '@/workflows/workflow.service'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { mockInstance } from '../../shared/mocking'; import { createOwner } from '../shared/db/users'; import { createWorkflow } from '../shared/db/workflows'; diff --git a/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts index 7d976e59f876f..95bac8aee7882 100644 --- a/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller-with-active-workflow-manager.ee.test.ts @@ -1,7 +1,7 @@ import type { User } from '@/databases/entities/User'; import * as utils from '../shared/utils/'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { createUser } from '../shared/db/users'; import { createWorkflowWithTrigger } from '../shared/db/workflows'; import { createTeamProject } from '../shared/db/projects'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts index 3cbec2e646044..a57502f345d7c 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.ee.test.ts @@ -14,7 +14,7 @@ import type { WorkflowWithSharingsMetaDataAndCredentials } from '@/workflows/wor import { mockInstance } from '../../shared/mocking'; import * as utils from '../shared/utils/'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import type { SaveCredentialFunction } from '../shared/types'; import { makeWorkflow } from '../shared/utils/'; import { randomCredentialPayload } from '../shared/random'; diff --git a/packages/cli/test/integration/workflows/workflows.controller.test.ts b/packages/cli/test/integration/workflows/workflows.controller.test.ts index cb702858b2bc4..ac801b4e43985 100644 --- a/packages/cli/test/integration/workflows/workflows.controller.test.ts +++ b/packages/cli/test/integration/workflows/workflows.controller.test.ts @@ -17,7 +17,7 @@ import { License } from '@/license'; import { mockInstance } from '../../shared/mocking'; import * as utils from '../shared/utils/'; -import * as testDb from '../shared/testDb'; +import * as testDb from '../shared/test-db'; import { makeWorkflow, MOCK_PINDATA } from '../shared/utils/'; import { randomCredentialPayload } from '../shared/random'; import { saveCredential } from '../shared/db/credentials'; diff --git a/packages/cli/test/shared/ExternalSecrets/utils.ts b/packages/cli/test/shared/external-secrets/utils.ts similarity index 100% rename from packages/cli/test/shared/ExternalSecrets/utils.ts rename to packages/cli/test/shared/external-secrets/utils.ts diff --git a/packages/cli/test/shared/mockObjects.ts b/packages/cli/test/shared/mock-objects.ts similarity index 100% rename from packages/cli/test/shared/mockObjects.ts rename to packages/cli/test/shared/mock-objects.ts diff --git a/packages/cli/test/shared/testData.ts b/packages/cli/test/shared/test-data.ts similarity index 100% rename from packages/cli/test/shared/testData.ts rename to packages/cli/test/shared/test-data.ts diff --git a/packages/cli/test/teardown.ts b/packages/cli/test/teardown.ts index 824297e155511..476ea948416d4 100644 --- a/packages/cli/test/teardown.ts +++ b/packages/cli/test/teardown.ts @@ -2,7 +2,7 @@ import 'tsconfig-paths/register'; import { Container } from 'typedi'; import { GlobalConfig } from '@n8n/config'; import { DataSource as Connection } from '@n8n/typeorm'; -import { getBootstrapDBOptions, testDbPrefix } from './integration/shared/testDb'; +import { getBootstrapDBOptions, testDbPrefix } from './integration/shared/test-db'; export default async () => { const { type: dbType } = Container.get(GlobalConfig).database; From 95a9cd2c739cf4f817eb8df6509a9112ac24a3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= Date: Wed, 28 Aug 2024 14:01:05 +0200 Subject: [PATCH 05/11] feat(editor): Implement new app layout (#10548) --- cypress/e2e/17-sharing.cy.ts | 5 +- cypress/e2e/45-ai-assistant.cy.ts | 6 +- cypress/e2e/5-ndv.cy.ts | 2 +- packages/editor-ui/src/App.vue | 86 +++++++++++++------ packages/editor-ui/src/__tests__/utils.ts | 18 ++++ .../AskAssistant/AskAssistantChat.vue | 6 +- .../AskAssistant/NewAssistantSessionModal.vue | 3 +- .../__tests__/Assignment.test.ts | 6 ++ .../__tests__/AssignmentCollection.test.ts | 7 +- .../src/components/ExpressionEditModal.vue | 6 +- .../__tests__/FilterConditions.test.ts | 7 +- packages/editor-ui/src/components/Modal.vue | 59 ++++++++----- .../src/components/NDVDraggablePanels.vue | 36 +++----- .../src/components/NodeDetailsView.vue | 4 +- .../src/components/ParameterInput.vue | 3 +- .../components/ParameterInputWrapper.test.ts | 9 +- .../editor-ui/src/components/TextEdit.vue | 3 +- .../src/components/WorkflowSettings.spec.ts | 8 +- .../__tests__/ChangePasswordModal.test.ts | 6 ++ .../__tests__/ChatEmbedModal.test.ts | 21 +++-- .../CommunityPackageInstallModal.spec.ts | 21 +++-- .../__tests__/NodeDetailsView.test.ts | 12 ++- .../__tests__/ParameterInput.test.ts | 6 ++ .../__tests__/PersonalizationModal.spec.ts | 58 +++++++------ .../__tests__/ResourceMapper.test.ts | 7 +- .../__tests__/WorkflowLMChatModal.test.ts | 24 +++--- .../editor-ui/src/composables/useToast.ts | 2 +- packages/editor-ui/src/constants.ts | 4 +- packages/editor-ui/src/n8n-theme.scss | 4 + .../editor-ui/src/stores/assistant.store.ts | 17 +++- packages/editor-ui/src/stores/ui.store.ts | 3 + .../src/views/SettingsUsersView.test.ts | 8 +- 32 files changed, 315 insertions(+), 152 deletions(-) diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts index 64769ae1935b8..c90a884325239 100644 --- a/cypress/e2e/17-sharing.cy.ts +++ b/cypress/e2e/17-sharing.cy.ts @@ -7,7 +7,7 @@ import { WorkflowSharingModal, WorkflowsPage, } from '../pages'; -import { getVisibleDropdown, getVisibleSelect } from '../utils'; +import { getVisibleDropdown, getVisiblePopper, getVisibleSelect } from '../utils'; import * as projects from '../composables/projects'; /** @@ -180,7 +180,8 @@ describe('Sharing', { disableAutoLogin: true }, () => { ).should('be.visible'); credentialsModal.getters.usersSelect().click(); - cy.getByTestId('project-sharing-info') + getVisiblePopper() + .find('[data-test-id="project-sharing-info"]') .filter(':visible') .should('have.length', 3) .contains(INSTANCE_ADMIN.email) diff --git a/cypress/e2e/45-ai-assistant.cy.ts b/cypress/e2e/45-ai-assistant.cy.ts index 4431007df0065..37d38f739f1f5 100644 --- a/cypress/e2e/45-ai-assistant.cy.ts +++ b/cypress/e2e/45-ai-assistant.cy.ts @@ -34,7 +34,7 @@ describe('AI Assistant::enabled', () => { aiAssistant.getters.chatInputWrapper().should('not.exist'); aiAssistant.getters.closeChatButton().should('be.visible'); aiAssistant.getters.closeChatButton().click(); - aiAssistant.getters.askAssistantChat().should('not.exist'); + aiAssistant.getters.askAssistantChat().should('not.be.visible'); }); it('should resize assistant chat up', () => { @@ -162,13 +162,13 @@ describe('AI Assistant::enabled', () => { cy.createFixtureWorkflow('aiAssistant/test_workflow.json'); wf.actions.openNode('Edit Fields'); ndv.getters.nodeExecuteButton().click(); - aiAssistant.getters.nodeErrorViewAssistantButton().click(); + aiAssistant.getters.nodeErrorViewAssistantButton().click({ force: true }); cy.wait('@chatRequest'); aiAssistant.getters.closeChatButton().click(); ndv.getters.backToCanvas().click(); wf.actions.openNode('Stop and Error'); ndv.getters.nodeExecuteButton().click(); - aiAssistant.getters.nodeErrorViewAssistantButton().click(); + aiAssistant.getters.nodeErrorViewAssistantButton().click({ force: true }); // Since we already have an active session, a warning should be shown aiAssistant.getters.newAssistantSessionModal().should('be.visible'); aiAssistant.getters diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts index 24296ddca851d..3b2fa5885b999 100644 --- a/cypress/e2e/5-ndv.cy.ts +++ b/cypress/e2e/5-ndv.cy.ts @@ -199,7 +199,7 @@ describe('NDV', () => { .contains(key) .should('be.visible'); }); - getObjectValueItem().find('label').click(); + getObjectValueItem().find('label').click({ force: true }); expandedObjectProps.forEach((key) => { ndv.getters .outputPanel() diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue index 320fe5acca14a..d348f6ae79a26 100644 --- a/packages/editor-ui/src/App.vue +++ b/packages/editor-ui/src/App.vue @@ -1,5 +1,5 @@ diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/editor-ui/src/__tests__/utils.ts index ccbcd13bd321e..91e8d1a57337e 100644 --- a/packages/editor-ui/src/__tests__/utils.ts +++ b/packages/editor-ui/src/__tests__/utils.ts @@ -3,6 +3,7 @@ import userEvent from '@testing-library/user-event'; import type { ISettingsState } from '@/Interface'; import { UserManagementAuthenticationMethod } from '@/Interface'; import { defaultSettings } from './defaults'; +import { APP_MODALS_ELEMENT_ID } from '@/constants'; /** * Retries the given assertion until it passes or the timeout is reached @@ -90,3 +91,20 @@ export const getSelectedDropdownValue = async (items: NodeListOf) => { expect(selectedItem).toBeInTheDocument(); return selectedItem?.querySelector('p')?.textContent?.trim(); }; + +/** + * Create a container for teleported modals + * + * More info: https://test-utils.vuejs.org/guide/advanced/teleport#Mounting-the-Component + * @returns {HTMLElement} appModals + */ +export const createAppModals = () => { + const appModals = document.createElement('div'); + appModals.id = APP_MODALS_ELEMENT_ID; + document.body.appendChild(appModals); + return appModals; +}; + +export const cleanupAppModals = () => { + document.body.innerHTML = ''; +}; diff --git a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue b/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue index 38255426c55f8..ab4e62efa3527 100644 --- a/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue +++ b/packages/editor-ui/src/components/AskAssistant/AskAssistantChat.vue @@ -67,7 +67,7 @@ function onClose() {