From 87bee7123e3a5d1f4925a0f105f59b4b9cd7e715 Mon Sep 17 00:00:00 2001 From: Mutasem Aldmour Date: Wed, 30 Oct 2024 14:53:14 +0100 Subject: [PATCH] fix types --- packages/editor-ui/src/api/workflows.ts | 8 ++++---- packages/editor-ui/src/components/WorkflowSettings.vue | 8 +++++--- packages/editor-ui/src/stores/projects.store.ts | 2 +- packages/editor-ui/src/stores/workflows.store.ts | 2 +- packages/editor-ui/src/views/ProjectSettings.test.ts | 2 +- packages/editor-ui/src/views/WorkflowsView.vue | 2 +- 6 files changed, 13 insertions(+), 11 deletions(-) diff --git a/packages/editor-ui/src/api/workflows.ts b/packages/editor-ui/src/api/workflows.ts index 8bbed44ccc..456bfc2ce0 100644 --- a/packages/editor-ui/src/api/workflows.ts +++ b/packages/editor-ui/src/api/workflows.ts @@ -34,12 +34,12 @@ export async function getWorkflow(context: IRestApiContext, id: string, filter?: return await makeRestApiRequest(context, 'GET', `/workflows/${id}`, sendData); } -export async function getWorkflows(context: IRestApiContext, options: WorkflowsFetchOptions) { +export async function getWorkflows(context: IRestApiContext, options?: WorkflowsFetchOptions) { return await makeRestApiRequest(context, 'GET', '/workflows', { includeScopes: true, - ...options, - credentialIds: options.credentialIds?.length ? options.credentialIds.join(',') : undefined, - nodeTypes: options.nodeTypes?.length ? options.nodeTypes.join(',') : undefined, + ...(options ?? {}), + credentialIds: options?.credentialIds?.length ? options.credentialIds.join(',') : undefined, + nodeTypes: options?.nodeTypes?.length ? options.nodeTypes.join(',') : undefined, }); } diff --git a/packages/editor-ui/src/components/WorkflowSettings.vue b/packages/editor-ui/src/components/WorkflowSettings.vue index 1ecac538a6..fec757f959 100644 --- a/packages/editor-ui/src/components/WorkflowSettings.vue +++ b/packages/editor-ui/src/components/WorkflowSettings.vue @@ -407,9 +407,11 @@ export default defineComponent({ } }, async loadWorkflows() { - const workflows = (await this.workflowsStore.fetchAllWorkflows( - this.workflow.homeProject?.id, - )) as IWorkflowShortResponse[]; + const workflows = (await this.workflowsStore.fetchAllWorkflows({ + filter: { + projectId: this.workflow.homeProject?.id, + }, + })) as IWorkflowShortResponse[]; workflows.sort((a, b) => { if (a.name.toLowerCase() < b.name.toLowerCase()) { return -1; diff --git a/packages/editor-ui/src/stores/projects.store.ts b/packages/editor-ui/src/stores/projects.store.ts index 4eb4e1e9d9..0aa3933c9f 100644 --- a/packages/editor-ui/src/stores/projects.store.ts +++ b/packages/editor-ui/src/stores/projects.store.ts @@ -165,7 +165,7 @@ export const useProjectsStore = defineStore(STORES.PROJECTS, () => { ) => { if (resourceType === 'workflow') { await workflowsEEApi.moveWorkflowToProject(rootStore.restApiContext, resourceId, projectId); - await workflowsStore.fetchAllWorkflows(currentProjectId.value); + await workflowsStore.fetchAllWorkflows({ filter: { projectId: currentProjectId.value } }); } else { await credentialsEEApi.moveCredentialToProject( rootStore.restApiContext, diff --git a/packages/editor-ui/src/stores/workflows.store.ts b/packages/editor-ui/src/stores/workflows.store.ts index bf3a2bc92f..fb5ef1bbfb 100644 --- a/packages/editor-ui/src/stores/workflows.store.ts +++ b/packages/editor-ui/src/stores/workflows.store.ts @@ -473,7 +473,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, () => { ); } - async function fetchAllWorkflows(filters: WorkflowsFetchOptions): Promise { + async function fetchAllWorkflows(filters?: WorkflowsFetchOptions): Promise { const rootStore = useRootStore(); const workflows = await workflowsApi.getWorkflows(rootStore.restApiContext, filters); diff --git a/packages/editor-ui/src/views/ProjectSettings.test.ts b/packages/editor-ui/src/views/ProjectSettings.test.ts index 8dc7a01734..0e63c006fc 100644 --- a/packages/editor-ui/src/views/ProjectSettings.test.ts +++ b/packages/editor-ui/src/views/ProjectSettings.test.ts @@ -51,7 +51,7 @@ describe('ProjectSettings', () => { settingsStore = useSettingsStore(); vi.spyOn(usersStore, 'fetchUsers').mockImplementation(async () => await Promise.resolve()); - vi.spyOn(projectsStore, 'getAvailableProjects').mockImplementation(async () => {}); + vi.spyOn(projectsStore, 'getAvailableProjects').mockImplementation(async () => []); vi.spyOn(projectsStore, 'availableProjects', 'get').mockReturnValue(projects); vi.spyOn(settingsStore, 'settings', 'get').mockReturnValue({ enterprise: { diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue index 904af05a63..1a38e5b920 100644 --- a/packages/editor-ui/src/views/WorkflowsView.vue +++ b/packages/editor-ui/src/views/WorkflowsView.vue @@ -4,7 +4,7 @@ import ResourcesListLayout, { type IResource } from '@/components/layouts/Resour import WorkflowCard from '@/components/WorkflowCard.vue'; import WorkflowTagsDropdown from '@/components/WorkflowTagsDropdown.vue'; import { EnterpriseEditionFeature, MORE_ONBOARDING_OPTIONS_EXPERIMENT, VIEWS } from '@/constants'; -import type { ITag, IUser, IWorkflowDb, WorkflowsFetchOptions } from '@/Interface'; +import type { IUser, WorkflowsFetchOptions } from '@/Interface'; import { useUIStore } from '@/stores/ui.store'; import { useSettingsStore } from '@/stores/settings.store'; import { useUsersStore } from '@/stores/users.store';