mohiit1502/Automata
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(editor): Remove the restApi mixin (#6065)

Browse Source 
* ✨ Removing the `makeApiRequest` method from `restAPI` mixin, removing the mixing from the App component
* ✨ Removing `restApi` mixin
* 👕 Fixing lint errors
* ✔️ Fixing execution list unit tests and merge bug in workflowRun mixin
* 🐛 Added missing useStore
This commit is contained in:
Milorad FIlipović
2023-04-24 10:50:49 +02:00
committed by GitHub
parent 4bd55f7a1e
commit 59db96771e
30 changed files with 905 additions and 734 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/editor-ui/src/mixins/nodeHelpers.ts
View File

@@ -32,11 +32,8 @@ import {
IUser,
} from '@/Interface';
import { restApi } from '@/mixins/restApi';
import { get } from 'lodash-es';
import mixins from 'vue-typed-mixins';
import { isObjectLiteral } from '@/utils';
import { getCredentialPermissions } from '@/permissions';
import { mapStores } from 'pinia';
@@ -45,8 +42,9 @@ import { useUsersStore } from '@/stores/users';
import { useWorkflowsStore } from '@/stores/workflows';
import { useNodeTypesStore } from '@/stores/nodeTypes';
import { useCredentialsStore } from '@/stores/credentials';
import Vue from 'vue';
export const nodeHelpers = mixins(restApi).extend({
export const nodeHelpers = Vue.extend({
computed: {
...mapStores(
useCredentialsStore,

13
packages/editor-ui/src/mixins/workflowHelpers.ts
View File

@@ -44,7 +44,6 @@ import {
} from '../Interface';
import { externalHooks } from '@/mixins/externalHooks';
import { restApi } from '@/mixins/restApi';
import { nodeHelpers } from '@/mixins/nodeHelpers';
import { showMessage } from '@/mixins/showMessage';
@@ -325,7 +324,7 @@ function executeData(
return executeData;
}
export const workflowHelpers = mixins(externalHooks, nodeHelpers, restApi, showMessage).extend({
export const workflowHelpers = mixins(externalHooks, nodeHelpers, showMessage).extend({
computed: {
...mapStores(
useNodeTypesStore,
@@ -664,7 +663,7 @@ export const workflowHelpers = mixins(externalHooks, nodeHelpers, restApi, showM
if (isCurrentWorkflow) {
data = await this.getWorkflowDataToSave();
} else {
const { versionId } = await this.restApi().getWorkflow(workflowId);
const { versionId } = await this.workflowsStore.fetchWorkflow(workflowId);
data.versionId = versionId;
}
@@ -672,7 +671,7 @@ export const workflowHelpers = mixins(externalHooks, nodeHelpers, restApi, showM
data.active = active;
}
const workflow = await this.restApi().updateWorkflow(workflowId, data);
const workflow = await this.workflowsStore.updateWorkflow(workflowId, data);
this.workflowsStore.setWorkflowVersionId(workflow.versionId);
if (isCurrentWorkflow) {
@@ -714,7 +713,7 @@ export const workflowHelpers = mixins(externalHooks, nodeHelpers, restApi, showM
workflowDataRequest.versionId = this.workflowsStore.workflowVersionId;
const workflowData = await this.restApi().updateWorkflow(
const workflowData = await this.workflowsStore.updateWorkflow(
currentWorkflow,
workflowDataRequest,
forceSave,
@@ -831,7 +830,7 @@ export const workflowHelpers = mixins(externalHooks, nodeHelpers, restApi, showM
if (tags) {
workflowDataRequest.tags = tags;
}
const workflowData = await this.restApi().createNewWorkflow(workflowDataRequest);
const workflowData = await this.workflowsStore.createNewWorkflow(workflowDataRequest);
this.workflowsStore.addWorkflow(workflowData);
@@ -944,7 +943,7 @@ export const workflowHelpers = mixins(externalHooks, nodeHelpers, restApi, showM
async dataHasChanged(id: string) {
const currentData = await this.getWorkflowDataToSave();
const data: IWorkflowDb = await this.restApi().getWorkflow(id);
const data: IWorkflowDb = await this.workflowsStore.fetchWorkflow(id);
if (data !== undefined) {
const x = {

5
packages/editor-ui/src/mixins/workflowRun.ts
View File

@@ -9,7 +9,6 @@ import {
} from 'n8n-workflow';
import { externalHooks } from '@/mixins/externalHooks';
import { restApi } from '@/mixins/restApi';
import { workflowHelpers } from '@/mixins/workflowHelpers';
import { showMessage } from '@/mixins/showMessage';
@@ -20,7 +19,7 @@ import { useUIStore } from '@/stores/ui';
import { useWorkflowsStore } from '@/stores/workflows';
import { useRootStore } from '@/stores/n8nRootStore';
export const workflowRun = mixins(externalHooks, restApi, workflowHelpers, showMessage).extend({
export const workflowRun = mixins(externalHooks, workflowHelpers, showMessage).extend({
setup() {
return {
...useTitleChange(),
@@ -45,7 +44,7 @@ export const workflowRun = mixins(externalHooks, restApi, workflowHelpers, showM
let response: IExecutionPushResponse;
try {
response = await this.restApi().runWorkflow(runData);
response = await this.workflowsStore.runWorkflow(runData);
} catch (error) {
this.uiStore.removeActiveAction('workflowRunning');
throw error;