mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

⚡ Smaller changes before merge

Browse source
This commit is contained in:
Jan Oberhauser 2019-11-22 07:08:53 +01:00
parent b51c707563
commit 87d1465a9b
3 changed files with 35 additions and 38 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 { export class FileMaker implements ICredentialType {
name = 'FileMaker'; name = 'FileMaker';
displayName = 'FileMaker'; displayName = 'fileMaker';
properties = [ properties = [
{ {
displayName: 'Host', displayName: 'Host',

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

@ -1,6 +1,5 @@
import {IExecuteFunctions} from 'n8n-core'; import {IExecuteFunctions} from 'n8n-core';
import { import {
IDataObject,
ILoadOptionsFunctions, ILoadOptionsFunctions,
INodeExecutionData, INodePropertyOptions, INodeExecutionData, INodePropertyOptions,
INodeType, INodeType,
@ -51,19 +50,19 @@ export class FileMaker implements INodeType {
default: 'record', default: 'record',
options: [ options: [
/*{ /*{
name: 'Login', name: 'Login',
value: 'login', value: 'login',
}, },
{ {
name: 'Logout', name: 'Logout',
value: 'logout', value: 'logout',
},*/ },*/
{ {
name: 'Find Records', name: 'Find Records',
value: 'find', value: 'find',
}, },
{ {
name: 'get Records', name: 'Get Records',
value: 'records', value: 'records',
}, },
{ {
@ -131,7 +130,7 @@ export class FileMaker implements INodeType {
description: 'Internal Record ID returned by get (recordid)', description: 'Internal Record ID returned by get (recordid)',
}, },
{ {
displayName: 'offset', displayName: 'Offset',
name: 'offset', name: 'offset',
placeholder: '0', placeholder: '0',
description: 'The record number of the first record in the range of records.', description: 'The record number of the first record in the range of records.',
@ -147,7 +146,7 @@ export class FileMaker implements INodeType {
} }
}, },
{ {
displayName: 'limit', displayName: 'Limit',
name: 'limit', name: 'limit',
placeholder: '100', placeholder: '100',
description: 'The maximum number of records that should be returned. If not specified, the default value is 100.', description: 'The maximum number of records that should be returned. If not specified, the default value is 100.',
@ -202,7 +201,7 @@ export class FileMaker implements INodeType {
}, },
}, },
placeholder: 'Portals', placeholder: 'Portals',
description: 'The portal result set to return. Use the portal object name or portal table name. If this parameter is omitted, the API will return all portal objects and records in the layout. For best performance, pass the portal object name or portal table name.', description: 'The portal result set to return. Use the portal object name or portal<br />table name. If this parameter is omitted, the API will return all<br />portal objects and records in the layout. For best performance<br />, pass the portal object name or portal table name.',
}, },
// ---------------------------------- // ----------------------------------
// find/records // find/records
@ -294,7 +293,7 @@ export class FileMaker implements INodeType {
], ],
}, },
{ {
displayName: 'Sort data ?', displayName: 'Sort data?',
name: 'setSort', name: 'setSort',
type: 'boolean', type: 'boolean',
default: false, default: false,
@ -557,21 +556,21 @@ export class FileMaker implements INodeType {
// create/edit // create/edit
// ---------------------------------- // ----------------------------------
/*{ /*{
displayName: 'fieldData', displayName: 'fieldData',
name: 'fieldData', name: 'fieldData',
placeholder: '{"field1": "value", "field2": "value", ...}', placeholder: '{"field1": "value", "field2": "value", ...}',
description: 'Additional fields to add.', description: 'Additional fields to add.',
type: 'string', type: 'string',
default: '{}', default: '{}',
displayOptions: { displayOptions: {
show: { show: {
action: [ action: [
'create', 'create',
'edit', 'edit',
], ],
}, },
} }
},*/ },*/
{ {
displayName: 'Mod Id', displayName: 'Mod Id',
name: 'modId', name: 'modId',
@ -779,7 +778,7 @@ export class FileMaker implements INodeType {
const items = this.getInputData(); const items = this.getInputData();
const returnData: INodeExecutionData[] = []; const returnData: INodeExecutionData[] = [];
const credentials = this.getCredentials('FileMaker'); const credentials = this.getCredentials('fileMaker');
if (credentials === undefined) { if (credentials === undefined) {
throw new Error('No credentials got returned!'); throw new Error('No credentials got returned!');

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

@ -5,7 +5,6 @@ import {
} from 'n8n-core'; } from 'n8n-core';
import { import {
ICredentialDataDecryptedObject,
IDataObject, IDataObject,
} from 'n8n-workflow'; } from 'n8n-workflow';
@ -30,7 +29,7 @@ interface ScriptsOptions {
*/ */
export async function layoutsApiRequest(this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions): Promise<any> { // tslint:disable-line:no-any export async function layoutsApiRequest(this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions): Promise<any> { // tslint:disable-line:no-any
const token = await getToken.call(this); const token = await getToken.call(this);
const credentials = this.getCredentials('FileMaker'); const credentials = this.getCredentials('fileMaker');
if (credentials === undefined) { if (credentials === undefined) {
throw new Error('No credentials got returned!'); throw new Error('No credentials got returned!');
@ -65,7 +64,7 @@ export async function layoutsApiRequest(this: ILoadOptionsFunctions | IExecuteFu
*/ */
export async function getFields(this: ILoadOptionsFunctions): Promise<any> { // tslint:disable-line:no-any export async function getFields(this: ILoadOptionsFunctions): Promise<any> { // tslint:disable-line:no-any
const token = await getToken.call(this); const token = await getToken.call(this);
const credentials = this.getCredentials('FileMaker'); const credentials = this.getCredentials('fileMaker');
const layout = this.getCurrentNodeParameter('layout') as string; const layout = this.getCurrentNodeParameter('layout') as string;
if (credentials === undefined) { if (credentials === undefined) {
@ -102,7 +101,7 @@ export async function getFields(this: ILoadOptionsFunctions): Promise<any> { //
*/ */
export async function getPortals(this: ILoadOptionsFunctions): Promise<any> { // tslint:disable-line:no-any export async function getPortals(this: ILoadOptionsFunctions): Promise<any> { // tslint:disable-line:no-any
const token = await getToken.call(this); const token = await getToken.call(this);
const credentials = this.getCredentials('FileMaker'); const credentials = this.getCredentials('fileMaker');
const layout = this.getCurrentNodeParameter('layout') as string; const layout = this.getCurrentNodeParameter('layout') as string;
if (credentials === undefined) { if (credentials === undefined) {
@ -138,7 +137,7 @@ export async function getPortals(this: ILoadOptionsFunctions): Promise<any> { //
*/ */
export async function getScripts(this: ILoadOptionsFunctions): Promise<any> { // tslint:disable-line:no-any export async function getScripts(this: ILoadOptionsFunctions): Promise<any> { // tslint:disable-line:no-any
const token = await getToken.call(this); const token = await getToken.call(this);
const credentials = this.getCredentials('FileMaker'); const credentials = this.getCredentials('fileMaker');
const layout = this.getCurrentNodeParameter('layout') as string; const layout = this.getCurrentNodeParameter('layout') as string;
if (credentials === undefined) { if (credentials === undefined) {
@ -168,7 +167,7 @@ export async function getScripts(this: ILoadOptionsFunctions): Promise<any> { //
} }
export async function getToken(this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions): Promise<any> { // tslint:disable-line:no-any export async function getToken(this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions): Promise<any> { // tslint:disable-line:no-any
const credentials = this.getCredentials('FileMaker'); const credentials = this.getCredentials('fileMaker');
if (credentials === undefined) { if (credentials === undefined) {
throw new Error('No credentials got returned!'); throw new Error('No credentials got returned!');
} }
@ -228,7 +227,7 @@ export async function getToken(this: ILoadOptionsFunctions | IExecuteFunctions |
} }
export async function logout(this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions, token: string): Promise<any> { // tslint:disable-line:no-any export async function logout(this: ILoadOptionsFunctions | IExecuteFunctions | IExecuteSingleFunctions, token: string): Promise<any> { // tslint:disable-line:no-any
const credentials = this.getCredentials('FileMaker'); const credentials = this.getCredentials('fileMaker');
if (credentials === undefined) { if (credentials === undefined) {
throw new Error('No credentials got returned!'); throw new Error('No credentials got returned!');
} }
@ -369,4 +368,3 @@ export function parseFields(this: IExecuteFunctions): object | null {
// @ts-ignore // @ts-ignore
return fieldData; return fieldData;
} }