From 5059c57f4a8a41b8f32e2cd2c070a1fc5ecbb356 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= Date: Wed, 23 Nov 2022 13:41:53 +0100 Subject: [PATCH] refactor(editor): Refactor utils files and mixins (#4654) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * ✨ Added `utils` module. Moved `canvasHelpers` and old `utils.ts` file to it * ✨ Moved rest of utils and helpers * ⚡ Fixing sytax errors * 🔨 Refactoring new utils files * 🔨 Organizing imports, adding comments and a bit more refactoring * ✔️ Fixing tests * 🔨 Moving mixins to `src` --- packages/editor-ui/src/App.vue | 8 +- packages/editor-ui/src/api/api-keys.ts | 2 +- packages/editor-ui/src/api/communityNodes.ts | 2 +- packages/editor-ui/src/api/credentials.ee.ts | 2 +- packages/editor-ui/src/api/credentials.ts | 2 +- packages/editor-ui/src/api/curlHelper.ts | 2 +- packages/editor-ui/src/api/nodeTypes.ts | 2 +- packages/editor-ui/src/api/settings.ts | 2 +- packages/editor-ui/src/api/tags.ts | 2 +- packages/editor-ui/src/api/templates.ts | 2 +- packages/editor-ui/src/api/users.ts | 2 +- packages/editor-ui/src/api/versions.ts | 3 +- .../editor-ui/src/api/workflow-webhooks.ts | 2 +- packages/editor-ui/src/api/workflows.ee.ts | 2 +- packages/editor-ui/src/api/workflows.ts | 2 +- .../src/components/ActivationModal.vue | 3 +- .../src/components/BinaryDataDisplay.vue | 5 +- .../src/components/BinaryDataDisplayEmbed.vue | 2 +- .../src/components/BreakpointsObserver.vue | 4 +- .../src/components/ChangePasswordModal.vue | 2 +- .../editor-ui/src/components/CodeEdit.vue | 4 +- .../CodeNodeEditor/CodeNodeEditor.vue | 2 +- .../src/components/CollectionCard.vue | 2 +- .../src/components/CollectionParameter.vue | 2 +- .../src/components/CollectionWorkflowCard.vue | 2 +- .../src/components/CollectionsCarousel.vue | 2 +- .../src/components/CommunityPackageCard.vue | 2 +- .../CommunityPackageInstallModal.vue | 2 +- .../CommunityPackageManageConfirmModal.vue | 2 +- .../src/components/ContactPromptModal.vue | 2 +- .../editor-ui/src/components/CopyInput.vue | 4 +- .../src/components/CredentialCard.vue | 2 +- .../CredentialEdit/CredentialConfig.vue | 4 +- .../CredentialEdit/CredentialEdit.vue | 6 +- .../CredentialEdit/CredentialSharing.ee.vue | 2 +- .../src/components/CredentialsSelectModal.vue | 2 +- .../src/components/DeleteUserModal.vue | 2 +- .../components/DuplicateWorkflowDialog.vue | 6 +- .../src/components/Error/NodeErrorView.vue | 5 +- .../src/components/ExecutionTime.vue | 2 +- .../src/components/ExecutionsList.vue | 10 +- .../ExecutionsView/ExecutionCard.vue | 8 +- .../ExecutionsView/ExecutionPreview.vue | 8 +- .../ExecutionsInfoAccordion.vue | 2 +- .../ExecutionsView/ExecutionsView.vue | 12 +- .../src/components/ExpressionEdit.vue | 8 +- .../src/components/ExpressionInput.vue | 4 +- .../src/components/ImportCurlModal.vue | 2 +- .../src/components/ImportParameter.vue | 2 +- .../src/components/InlineNameEdit.vue | 2 +- .../editor-ui/src/components/InputPanel.vue | 2 +- .../src/components/IntersectionObserved.vue | 2 +- .../src/components/InviteUsersModal.vue | 4 +- .../ExecutionDetails/ExecutionDetails.vue | 2 +- .../src/components/MainHeader/MainHeader.vue | 4 +- .../components/MainHeader/WorkflowDetails.vue | 4 +- .../editor-ui/src/components/MainSidebar.vue | 16 +- .../src/components/NDVDraggablePanels.vue | 2 +- packages/editor-ui/src/components/Node.vue | 14 +- .../src/components/Node/NodeCreation.vue | 4 +- .../Node/NodeCreator/CategorizedItems.vue | 8 +- .../components/Node/NodeCreator/MainPanel.vue | 2 +- .../components/Node/NodeCreator/NodeItem.vue | 3 +- .../components/Node/NodeCreator/SearchBar.vue | 2 +- .../Node/NodeCreator/TriggerHelperPanel.vue | 2 +- .../components/Node/NodeCreator/helpers.ts | 31 --- .../src/components/NodeCredentials.vue | 8 +- .../src/components/NodeDetailsView.vue | 10 +- .../src/components/NodeExecuteButton.vue | 4 +- .../editor-ui/src/components/NodeList.vue | 4 +- .../editor-ui/src/components/NodeSettings.vue | 6 +- .../src/components/NodeSettingsTabs.vue | 4 +- .../editor-ui/src/components/NodeWebhooks.vue | 6 +- .../components/OnboardingCallSignupModal.vue | 2 +- .../editor-ui/src/components/OutputPanel.vue | 2 +- .../editor-ui/src/components/PageAlert.vue | 2 +- .../src/components/ParameterInput.vue | 13 +- .../src/components/ParameterInputExpanded.vue | 2 +- .../src/components/ParameterInputFull.vue | 6 +- .../src/components/ParameterInputList.vue | 2 +- .../src/components/ParameterInputWrapper.vue | 6 +- .../src/components/ParameterOptions.vue | 3 +- .../src/components/PersonalizationModal.vue | 6 +- .../ResourceLocator/ResourceLocator.vue | 12 +- .../src/components/ResourceLocator/helpers.ts | 7 - packages/editor-ui/src/components/RunData.vue | 12 +- .../editor-ui/src/components/RunDataJson.vue | 5 +- .../src/components/RunDataJsonActions.vue | 10 +- .../editor-ui/src/components/RunDataTable.vue | 6 +- .../src/components/SettingsSidebar.vue | 4 +- .../editor-ui/src/components/ShortenName.vue | 2 +- packages/editor-ui/src/components/Sticky.vue | 10 +- .../editor-ui/src/components/TagsDropdown.vue | 2 +- .../components/TagsManager/TagsManager.vue | 2 +- .../editor-ui/src/components/Telemetry.vue | 2 +- .../editor-ui/src/components/TemplateCard.vue | 4 +- .../src/components/TemplateDetails.vue | 2 +- .../src/components/TemplateFilters.vue | 2 +- .../editor-ui/src/components/TemplateList.vue | 2 +- packages/editor-ui/src/components/TimeAgo.vue | 2 +- .../editor-ui/src/components/TriggerPanel.vue | 8 +- .../editor-ui/src/components/ValueSurvey.vue | 2 +- .../src/components/VariableSelector.vue | 2 +- .../src/components/VariableSelectorItem.vue | 2 +- .../src/components/WorkflowActivator.vue | 6 +- .../editor-ui/src/components/WorkflowCard.vue | 4 +- .../src/components/WorkflowPreview.vue | 2 +- .../src/components/WorkflowSettings.vue | 8 +- .../src/components/WorkflowShareModal.ee.vue | 2 +- packages/editor-ui/src/components/helpers.ts | 196 ------------------ .../layouts/ResourcesListLayout.vue | 4 +- .../src/components/mixins/helpers.ts | 11 - packages/editor-ui/src/main.ts | 2 +- .../src/{components => }/mixins/copyPaste.ts | 0 .../src/{components => }/mixins/debounce.ts | 0 .../mixins/deviceSupportHelpers.ts | 0 .../src/{components => }/mixins/emitter.ts | 0 .../mixins/executionsHelpers.ts | 0 .../{components => }/mixins/externalHooks.ts | 0 .../{components => }/mixins/genericHelpers.ts | 2 +- .../mixins/globalLinkActions.ts | 0 .../{components => }/mixins/mouseSelect.ts | 4 +- .../mixins/moveNodeWorkflow.ts | 4 +- .../{components => }/mixins/newVersions.ts | 0 .../src/{components => }/mixins/nodeBase.ts | 39 ++-- .../{components => }/mixins/nodeHelpers.ts | 2 +- .../src/{components => }/mixins/pinData.ts | 2 +- .../{components => }/mixins/pushConnection.ts | 14 +- .../src/{components => }/mixins/restApi.ts | 2 +- .../{components => }/mixins/showMessage.ts | 2 +- .../{components => }/mixins/titleChange.ts | 0 .../{components => }/mixins/userHelpers.ts | 2 +- .../mixins/workflowActivate.ts | 6 +- .../mixins/workflowHelpers.ts | 10 +- .../{components => }/mixins/workflowRun.ts | 8 +- packages/editor-ui/src/router.ts | 2 +- packages/editor-ui/src/stores/canvas.ts | 29 ++- packages/editor-ui/src/stores/credentials.ts | 2 +- packages/editor-ui/src/stores/nodeTypes.ts | 3 +- packages/editor-ui/src/stores/users.ts | 2 +- packages/editor-ui/src/stores/workflows.ts | 5 +- .../__tests__/typesUtils.test.ts} | 0 .../src/{api/helpers.ts => utils/apiUtils.ts} | 0 .../canvasHelpers.ts => utils/canvasUtils.ts} | 31 ++- .../src/{utils.ts => utils/htmlUtils.ts} | 55 +++-- packages/editor-ui/src/utils/index.ts | 9 + .../nodeTypesUtils.ts} | 118 ++++++++++- .../src/{ => utils}/pairedItemUtils.ts | 11 +- .../Node/NodeCreator => utils}/sortUtils.ts | 4 + .../editor-ui/src/{ => utils}/typeGuards.ts | 6 +- packages/editor-ui/src/utils/typesUtils.ts | 137 ++++++++++++ .../userHelpers.ts => utils/userUtils.ts} | 5 +- .../src/views/ChangePasswordView.vue | 2 +- .../editor-ui/src/views/CredentialsView.vue | 4 +- .../src/views/ForgotMyPasswordView.vue | 2 +- packages/editor-ui/src/views/NodeView.vue | 171 ++++++++------- .../editor-ui/src/views/SettingsApiView.vue | 2 +- .../src/views/SettingsCommunityNodesView.vue | 2 +- .../src/views/SettingsPersonalView.vue | 2 +- .../editor-ui/src/views/SettingsUsersView.vue | 2 +- packages/editor-ui/src/views/SetupView.vue | 4 +- packages/editor-ui/src/views/SigninView.vue | 2 +- packages/editor-ui/src/views/SignupView.vue | 2 +- .../src/views/TemplatesCollectionView.vue | 4 +- .../src/views/TemplatesSearchView.vue | 6 +- .../src/views/TemplatesWorkflowView.vue | 4 +- .../editor-ui/src/views/WorkflowsView.vue | 6 +- 167 files changed, 748 insertions(+), 674 deletions(-) delete mode 100644 packages/editor-ui/src/components/Node/NodeCreator/helpers.ts delete mode 100644 packages/editor-ui/src/components/ResourceLocator/helpers.ts delete mode 100644 packages/editor-ui/src/components/helpers.ts delete mode 100644 packages/editor-ui/src/components/mixins/helpers.ts rename packages/editor-ui/src/{components => }/mixins/copyPaste.ts (100%) rename packages/editor-ui/src/{components => }/mixins/debounce.ts (100%) rename packages/editor-ui/src/{components => }/mixins/deviceSupportHelpers.ts (100%) rename packages/editor-ui/src/{components => }/mixins/emitter.ts (100%) rename packages/editor-ui/src/{components => }/mixins/executionsHelpers.ts (100%) rename packages/editor-ui/src/{components => }/mixins/externalHooks.ts (100%) rename packages/editor-ui/src/{components => }/mixins/genericHelpers.ts (96%) rename packages/editor-ui/src/{components => }/mixins/globalLinkActions.ts (100%) rename packages/editor-ui/src/{components => }/mixins/mouseSelect.ts (96%) rename packages/editor-ui/src/{components => }/mixins/moveNodeWorkflow.ts (94%) rename packages/editor-ui/src/{components => }/mixins/newVersions.ts (100%) rename packages/editor-ui/src/{components => }/mixins/nodeBase.ts (89%) rename packages/editor-ui/src/{components => }/mixins/nodeHelpers.ts (99%) rename packages/editor-ui/src/{components => }/mixins/pinData.ts (97%) rename packages/editor-ui/src/{components => }/mixins/pushConnection.ts (97%) rename packages/editor-ui/src/{components => }/mixins/restApi.ts (99%) rename packages/editor-ui/src/{components => }/mixins/showMessage.ts (98%) rename packages/editor-ui/src/{components => }/mixins/titleChange.ts (100%) rename packages/editor-ui/src/{components => }/mixins/userHelpers.ts (93%) rename packages/editor-ui/src/{components => }/mixins/workflowActivate.ts (94%) rename packages/editor-ui/src/{components => }/mixins/workflowHelpers.ts (98%) rename packages/editor-ui/src/{components => }/mixins/workflowRun.ts (96%) rename packages/editor-ui/src/{utils.test.ts => utils/__tests__/typesUtils.test.ts} (100%) rename packages/editor-ui/src/{api/helpers.ts => utils/apiUtils.ts} (100%) rename packages/editor-ui/src/{views/canvasHelpers.ts => utils/canvasUtils.ts} (96%) rename packages/editor-ui/src/{utils.ts => utils/htmlUtils.ts} (53%) create mode 100644 packages/editor-ui/src/utils/index.ts rename packages/editor-ui/src/{stores/nodeTypesHelpers.ts => utils/nodeTypesUtils.ts} (51%) rename packages/editor-ui/src/{ => utils}/pairedItemUtils.ts (94%) rename packages/editor-ui/src/{components/Node/NodeCreator => utils}/sortUtils.ts (98%) rename packages/editor-ui/src/{ => utils}/typeGuards.ts (83%) create mode 100644 packages/editor-ui/src/utils/typesUtils.ts rename packages/editor-ui/src/{stores/userHelpers.ts => utils/userUtils.ts} (99%) 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 @@