mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2024-09-20 23:07:32 -07:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

🔀 Merge pull request #136 from airmoi/filemaker-layout-list

Browse source 
Fix FileMaker layout list parsing
This commit is contained in:
Jan 2019-12-01 16:30:27 +01:00 committed by GitHub
parent 6214ce57ec bf8d779e98
commit 8751694680
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 29 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/nodes-base/credentials/FileMaker.credentials.ts
View file

@ -6,7 +6,7 @@ import {
export class FileMaker implements ICredentialType {
name = 'fileMaker';
displayName = 'FileMaker';
displayName = 'FileMaker API';
properties = [
{
displayName: 'Host',

12
packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
View file

@ -676,20 +676,14 @@ export class FileMaker implements INodeType {
// Get all the available topics to display them to user so that he can
// select them easily
async getLayouts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
const returnData: INodePropertyOptions[] = [];
let returnData: INodePropertyOptions[];
let layouts;
try {
layouts = await layoutsApiRequest.call(this);
returnData = await layoutsApiRequest.call(this);
} catch (err) {
throw new Error(`FileMaker Error: ${err}`);
}
for (const layout of layouts) {
returnData.push({
name: layout.name,
value: layout.name,
});
}
return returnData;
},
async getResponseLayouts(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {

30
packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
View file

@ -5,7 +5,7 @@ import {
} from 'n8n-core';
import {
IDataObject,
IDataObject, INodePropertyOptions,
} from 'n8n-workflow';
import {OptionsWithUri} from 'request';
@ -19,6 +19,11 @@ interface ScriptsOptions {
'script.presort'?: any; //tslint:disable-line:no-any
'script.presort.param'?: any; //tslint:disable-line:no-any
}
interface LayoutObject {
name: string;
isFolder?: boolean;
folderLayoutNames?:LayoutObject[];
}
/**
* Make an API request to ActiveCampaign
@ -27,7 +32,7 @@ interface ScriptsOptions {
* @param {string} method
* @returns {Promise<any>}
*/
export async function layoutsApiRequest(this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions): Promise<any> { // tslint:disable-line:no-any
export async function layoutsApiRequest(this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions): Promise<INodePropertyOptions[]> { // tslint:disable-line:no-any
const token = await getToken.call(this);
const credentials = this.getCredentials('fileMaker');
@ -49,14 +54,30 @@ export async function layoutsApiRequest(this: ILoadOptionsFunctions | IExecuteFu
try {
const responseData = await this.helpers.request!(options);
return responseData.response.layouts;
const items = parseLayouts(responseData.response.layouts);
items.sort((a, b) => a.name > b.name ? 0 : 1);
return items;
} catch (error) {
// If that data does not exist for some reason return the actual error
throw error;
}
}
function parseLayouts(layouts: LayoutObject[]): INodePropertyOptions[] {
const returnData: INodePropertyOptions[] = [];
for (const layout of layouts) {
if (layout.isFolder!) {
returnData.push(...parseLayouts(layout.folderLayoutNames!));
} else {
returnData.push({
name: layout.name,
value: layout.name,
});
}
}
return returnData;
}
/**
* Make an API request to ActiveCampaign
*
@ -138,7 +159,6 @@ export async function getPortals(this: ILoadOptionsFunctions): Promise<any> { //
export async function getScripts(this: ILoadOptionsFunctions): Promise<any> { // tslint:disable-line:no-any
const token = await getToken.call(this);
const credentials = this.getCredentials('fileMaker');
const layout = this.getCurrentNodeParameter('layout') as string;
if (credentials === undefined) {
throw new Error('No credentials got returned!');