diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue index 626e262452..3fdf8495bd 100644 --- a/packages/editor-ui/src/App.vue +++ b/packages/editor-ui/src/App.vue @@ -33,11 +33,11 @@ import Telemetry from './components/Telemetry.vue'; import { HIRING_BANNER, LOCAL_STORAGE_THEME, VIEWS } from './constants'; import mixins from 'vue-typed-mixins'; -import { showMessage } from './components/mixins/showMessage'; -import { userHelpers } from './components/mixins/userHelpers'; +import { showMessage } from '@/mixins/showMessage'; +import { userHelpers } from '@/mixins/userHelpers'; import { loadLanguage } from './plugins/i18n'; -import { restApi } from '@/components/mixins/restApi'; -import { globalLinkActions } from '@/components/mixins/globalLinkActions'; +import { restApi } from '@/mixins/restApi'; +import { globalLinkActions } from '@/mixins/globalLinkActions'; import { mapStores } from 'pinia'; import { useUIStore } from './stores/ui'; import { useSettingsStore } from './stores/settings'; diff --git a/packages/editor-ui/src/api/api-keys.ts b/packages/editor-ui/src/api/api-keys.ts index 27598149be..738d3f23fb 100644 --- a/packages/editor-ui/src/api/api-keys.ts +++ b/packages/editor-ui/src/api/api-keys.ts @@ -1,5 +1,5 @@ import {IRestApiContext} from "@/Interface"; -import {makeRestApiRequest} from "@/api/helpers"; +import {makeRestApiRequest} from "@/utils"; export function getApiKey(context: IRestApiContext): Promise<{ apiKey: string | null }> { return makeRestApiRequest(context, 'GET', '/me/api-key'); diff --git a/packages/editor-ui/src/api/communityNodes.ts b/packages/editor-ui/src/api/communityNodes.ts index 3e2d116e01..5ed6b1a7ea 100644 --- a/packages/editor-ui/src/api/communityNodes.ts +++ b/packages/editor-ui/src/api/communityNodes.ts @@ -1,6 +1,6 @@ import { IRestApiContext } from '@/Interface'; import { PublicInstalledPackage } from 'n8n-workflow'; -import { get, post, makeRestApiRequest } from './helpers'; +import { get, post, makeRestApiRequest } from '@/utils'; export async function getInstalledCommunityNodes(context: IRestApiContext): Promise { const response = await get(context.baseUrl, '/nodes'); diff --git a/packages/editor-ui/src/api/credentials.ee.ts b/packages/editor-ui/src/api/credentials.ee.ts index 3673e4e0f7..3706b8527e 100644 --- a/packages/editor-ui/src/api/credentials.ee.ts +++ b/packages/editor-ui/src/api/credentials.ee.ts @@ -3,7 +3,7 @@ import { IRestApiContext, IShareCredentialsPayload, } from '@/Interface'; -import { makeRestApiRequest } from './helpers'; +import { makeRestApiRequest } from '@/utils'; import { IDataObject, } from 'n8n-workflow'; diff --git a/packages/editor-ui/src/api/credentials.ts b/packages/editor-ui/src/api/credentials.ts index 60a81e061e..a4aa6d50d0 100644 --- a/packages/editor-ui/src/api/credentials.ts +++ b/packages/editor-ui/src/api/credentials.ts @@ -1,5 +1,5 @@ import { ICredentialsDecryptedResponse, ICredentialsResponse, IRestApiContext } from '@/Interface'; -import { makeRestApiRequest } from './helpers'; +import { makeRestApiRequest } from '@/utils'; import { ICredentialsDecrypted, ICredentialType, diff --git a/packages/editor-ui/src/api/curlHelper.ts b/packages/editor-ui/src/api/curlHelper.ts index cbdd1ac6c7..a7bc84bdbe 100644 --- a/packages/editor-ui/src/api/curlHelper.ts +++ b/packages/editor-ui/src/api/curlHelper.ts @@ -1,5 +1,5 @@ import {CurlToJSONResponse, IRestApiContext} from "@/Interface"; -import {makeRestApiRequest} from "@/api/helpers"; +import {makeRestApiRequest} from "@/utils"; export function getCurlToJson(context: IRestApiContext, curlCommand: string): Promise { return makeRestApiRequest(context, 'POST', '/curl-to-json', { curlCommand }); diff --git a/packages/editor-ui/src/api/nodeTypes.ts b/packages/editor-ui/src/api/nodeTypes.ts index b6ebfe8f2b..b5553c64cb 100644 --- a/packages/editor-ui/src/api/nodeTypes.ts +++ b/packages/editor-ui/src/api/nodeTypes.ts @@ -1,4 +1,4 @@ -import { makeRestApiRequest } from './helpers'; +import { makeRestApiRequest } from '@/utils'; import type { INodeTranslationHeaders, IResourceLocatorReqParams, diff --git a/packages/editor-ui/src/api/settings.ts b/packages/editor-ui/src/api/settings.ts index f7917ef9e6..9595eab8bc 100644 --- a/packages/editor-ui/src/api/settings.ts +++ b/packages/editor-ui/src/api/settings.ts @@ -1,5 +1,5 @@ import { IRestApiContext, IN8nPrompts, IN8nValueSurveyData, IN8nUISettings, IN8nPromptResponse } from '../Interface'; -import { makeRestApiRequest, get, post } from './helpers'; +import { makeRestApiRequest, get, post } from '@/utils'; import { N8N_IO_BASE_URL, NPM_COMMUNITY_NODE_SEARCH_API_URL } from '@/constants'; export function getSettings(context: IRestApiContext): Promise { diff --git a/packages/editor-ui/src/api/tags.ts b/packages/editor-ui/src/api/tags.ts index 8e12b5e13f..290d79534e 100644 --- a/packages/editor-ui/src/api/tags.ts +++ b/packages/editor-ui/src/api/tags.ts @@ -1,5 +1,5 @@ import { IRestApiContext, ITag } from '@/Interface'; -import { makeRestApiRequest } from './helpers'; +import { makeRestApiRequest } from '@/utils'; export async function getTags(context: IRestApiContext, withUsageCount = false): Promise { return await makeRestApiRequest(context, 'GET', '/tags', { withUsageCount }); diff --git a/packages/editor-ui/src/api/templates.ts b/packages/editor-ui/src/api/templates.ts index 15efc8e8d7..ec7fc854b4 100644 --- a/packages/editor-ui/src/api/templates.ts +++ b/packages/editor-ui/src/api/templates.ts @@ -1,6 +1,6 @@ import { ITemplatesCategory, ITemplatesCollection, ITemplatesQuery, ITemplatesWorkflow, ITemplatesCollectionResponse, ITemplatesWorkflowResponse, IWorkflowTemplate } from '@/Interface'; import { IDataObject } from 'n8n-workflow'; -import { get } from './helpers'; +import { get } from '@/utils'; function stringifyArray(arr: number[]) { return arr.join(','); diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts index e7326ec340..1ffe5852b7 100644 --- a/packages/editor-ui/src/api/users.ts +++ b/packages/editor-ui/src/api/users.ts @@ -1,6 +1,6 @@ import { IInviteResponse, IPersonalizationLatestVersion, IRestApiContext, IUserResponse } from '@/Interface'; import { IDataObject } from 'n8n-workflow'; -import { makeRestApiRequest } from './helpers'; +import { makeRestApiRequest } from '@/utils'; export function loginCurrentUser(context: IRestApiContext): Promise { return makeRestApiRequest(context, 'GET', '/login'); diff --git a/packages/editor-ui/src/api/versions.ts b/packages/editor-ui/src/api/versions.ts index 009f6bc4b7..07abd13955 100644 --- a/packages/editor-ui/src/api/versions.ts +++ b/packages/editor-ui/src/api/versions.ts @@ -1,7 +1,6 @@ import { IVersion } from '@/Interface'; import { INSTANCE_ID_HEADER } from '@/constants'; -import { IDataObject } from 'n8n-workflow'; -import { get } from './helpers'; +import { get } from '@/utils'; export async function getNextVersions(endpoint: string, version: string, instanceId: string): Promise { const headers = {[INSTANCE_ID_HEADER as string] : instanceId}; diff --git a/packages/editor-ui/src/api/workflow-webhooks.ts b/packages/editor-ui/src/api/workflow-webhooks.ts index 236d72deb6..52ad98c747 100644 --- a/packages/editor-ui/src/api/workflow-webhooks.ts +++ b/packages/editor-ui/src/api/workflow-webhooks.ts @@ -1,5 +1,5 @@ import { IOnboardingCallPrompt, IOnboardingCallPromptResponse, IUser } from "@/Interface"; -import { get, post } from "./helpers"; +import { get, post } from "@/utils"; const N8N_API_BASE_URL = 'https://api.n8n.io/api'; const ONBOARDING_PROMPTS_ENDPOINT = '/prompts/onboarding'; diff --git a/packages/editor-ui/src/api/workflows.ee.ts b/packages/editor-ui/src/api/workflows.ee.ts index 34ef341b61..d935c60b4e 100644 --- a/packages/editor-ui/src/api/workflows.ee.ts +++ b/packages/editor-ui/src/api/workflows.ee.ts @@ -3,7 +3,7 @@ import { IShareWorkflowsPayload, IWorkflowsShareResponse, } from '@/Interface'; -import { makeRestApiRequest } from './helpers'; +import { makeRestApiRequest } from '@/utils'; import { IDataObject, } from 'n8n-workflow'; diff --git a/packages/editor-ui/src/api/workflows.ts b/packages/editor-ui/src/api/workflows.ts index 84276436c9..f476f03a86 100644 --- a/packages/editor-ui/src/api/workflows.ts +++ b/packages/editor-ui/src/api/workflows.ts @@ -1,6 +1,6 @@ import { IRestApiContext } from '@/Interface'; import { IDataObject } from 'n8n-workflow'; -import { makeRestApiRequest } from './helpers'; +import { makeRestApiRequest } from '@/utils'; export async function getNewWorkflow(context: IRestApiContext, name?: string) { const response = await makeRestApiRequest(context, 'GET', `/workflows/new`, name ? { name } : {}); diff --git a/packages/editor-ui/src/components/ActivationModal.vue b/packages/editor-ui/src/components/ActivationModal.vue index 9934c5e6e6..b76fa44d31 100644 --- a/packages/editor-ui/src/components/ActivationModal.vue +++ b/packages/editor-ui/src/components/ActivationModal.vue @@ -38,8 +38,7 @@ import Vue from 'vue'; import Modal from '@/components/Modal.vue'; import { WORKFLOW_ACTIVE_MODAL_KEY, WORKFLOW_SETTINGS_MODAL_KEY, LOCAL_STORAGE_ACTIVATION_FLAG, VIEWS } from '../constants'; -import { getActivatableTriggerNodes, getTriggerNodeServiceName } from './helpers'; -import { INodeTypeDescription } from 'n8n-workflow'; +import { getActivatableTriggerNodes, getTriggerNodeServiceName } from '@/utils'; import { mapStores } from 'pinia'; import { useUIStore } from '@/stores/ui'; import { useWorkflowsStore } from '@/stores/workflows'; diff --git a/packages/editor-ui/src/components/BinaryDataDisplay.vue b/packages/editor-ui/src/components/BinaryDataDisplay.vue index 2c9d63a510..59aac23200 100644 --- a/packages/editor-ui/src/components/BinaryDataDisplay.vue +++ b/packages/editor-ui/src/components/BinaryDataDisplay.vue @@ -23,15 +23,14 @@ import { IBinaryData, IRunData, - IRunExecutionData, } from 'n8n-workflow'; import BinaryDataDisplayEmbed from '@/components/BinaryDataDisplayEmbed.vue'; -import { nodeHelpers } from '@/components/mixins/nodeHelpers'; +import { nodeHelpers } from '@/mixins/nodeHelpers'; import mixins from 'vue-typed-mixins'; -import { restApi } from '@/components/mixins/restApi'; +import { restApi } from '@/mixins/restApi'; import { mapStores } from 'pinia'; import { useWorkflowsStore } from '@/stores/workflows'; diff --git a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue b/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue index 0caa82c2ff..61ac83ae11 100644 --- a/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue +++ b/packages/editor-ui/src/components/BinaryDataDisplayEmbed.vue @@ -20,7 +20,7 @@ import mixins from 'vue-typed-mixins'; -import { restApi } from '@/components/mixins/restApi'; +import { restApi } from '@/mixins/restApi'; export default mixins( restApi, diff --git a/packages/editor-ui/src/components/BreakpointsObserver.vue b/packages/editor-ui/src/components/BreakpointsObserver.vue index bad6647408..9be77b8b65 100644 --- a/packages/editor-ui/src/components/BreakpointsObserver.vue +++ b/packages/editor-ui/src/components/BreakpointsObserver.vue @@ -22,8 +22,8 @@ import { */ import mixins from "vue-typed-mixins"; -import { genericHelpers } from "@/components/mixins/genericHelpers"; -import { debounceHelper } from "./mixins/debounce"; +import { genericHelpers } from "@/mixins/genericHelpers"; +import { debounceHelper } from "@/mixins/debounce"; export default mixins(genericHelpers, debounceHelper).extend({ name: "BreakpointsObserver", diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/editor-ui/src/components/ChangePasswordModal.vue index 934042a9f4..151e2f3cb0 100644 --- a/packages/editor-ui/src/components/ChangePasswordModal.vue +++ b/packages/editor-ui/src/components/ChangePasswordModal.vue @@ -26,7 +26,7 @@