feat(Todoist Node): Add support for specifying the parent task when adding and listing tasks (#3161)

* Todoist: Update parent field to parent_id

`parent` is deprecated.

* Todoist: Move Labels to "additional fields" when adding a task

Improves consistency with other operations.

* Todoist: Improve section re-load when switching projects

It only worked when creating tasks, due to naming and nesting
inconsistencies between different operations. Making it consistent
adds predictability and allows reuse between operations.

* Todoist: Add support for parent_id when creating and listing tasks

*  fixes

*  test credentials fix

*  parameters naming fix

*  undo for breaking change

* feat(Salesforce Node): Add country field (#3314)

* fix(Slack Node): Fix Channel->Kick (#3365)

* feat(core): Allow credential reuse on HTTP Request node (#3228)

*  Create controller

*  Mount controller

* ✏️ Add error messages

*  Create scopes fetcher

*  Account for non-existent credential type

* 📘 Type scopes request

*  Adjust error message

* 🧪 Add tests

*  Introduce simple node versioning

*  Add example how to read version in node-code for custom logic

* 🐛 Fix setting of parameters

* 🐛 Fix another instance where it sets the wrong parameter

*  Remove unnecessary TOODs

*  Re-version HTTP Request node

* 👕 Satisfy linter

*  Retrieve node version

*  Undo Jan's changes to Set node

* 🧪 Fix CI/CD for `/oauth2-credential` tests (#3230)

* 🐛 Fix notice warning missing background color (#3231)

* 🐛 Check for generic auth in node cred types

*  Refactor credentials dropdown for HTTP Request node (#3222)

*  Discoverability flow (#3229)

*  Added node credentials type proxy. Changed node credentials input order.

*  Add computed property from versioning branch

* 🐛 Fix cred ref lost and unsaved

*  Make options consistent with cred type names

*  Use prop to set component order

*  Use constant and version

*  Fix rendering for generic auth creds

*  Mark as required on first selection

*  Implement discoverability flow

*  Mark as required on subsequent selections

*  Fix marking as required after cred deletion

*  Refactor to clean up

*  Detect position automatically

*  Add i18n to option label

*  Hide subtitle for custom action

*  Detect active credential type

*  Prop drilling to re-render select

* 🔥 Remove unneeded property

* ✏️ Rename arg

* 🔥 Remove unused import

* 🔥 Remove unneeded getters

* 🔥 Remove unused import

*  Generalize cred component positioning

*  Set up request

* 🐛 Fix edge case in endpoint

*  Display scopes alert box

*  Revert "Generalize cred comp positioning"

This reverts commit 75eea89273.

*  Consolidate HTTPRN check

*  Fix hue percentage to degree

* 🔥 Remove unused import

* 🔥 Remove unused import

* 🔥 Remove unused class

* 🔥 Remove unused import

* 📘 Create type for HTTPRN v2 auth params

* ✏️ Rename check

* 🔥 Remove unused import

* ✏️ Add i18n to `reportUnsetCredential()`

*  Refactor Alex's spacing changes

*  Post-merge fixes

*  Add docs link

* 🔥 Exclude Notion OAuth cred

* ✏️ Update copy

* ✏️ Rename param

* 🎨 Reposition notice and simplify styling

* ✏️ Update copy

* ✏️ Update copy

*  Hide params during custom action

*  Show notice if any cred type supported

* 🐛 Prevent scopes text overflow

* 🔥 Remove superfluous check

* ✏️ Break up docstring

* 🎨 Tweak notice styling

*  Reorder cred param in Webhook node

* ✏️ Shorten cred name in scopes notice

* 🧪 Update Notice snapshots

* 🐛 Fix check when `globalRole` is `undefined`

*  Revert 3f2c4a6

*  Apply feedback from Product

* 🧪 Update snapshot

*  Adjust regex expansion pattern for singular

* 🔥 Remove unused import

* 🔥 Remove logging

*  Make `somethingElse` key more unique

*  Move something else to constants

*  Consolidate notice component

*  Apply latest feedback

* 🧪 Update tests

* 🧪 Update snapshot

* ✏️ Fix singular version

* 🧪 Finalize tests

* ✏️ Rename constant

* 🧪 Expand tests

* 🔥 Remove `truncate` prop

* 🚚 Move scopes fetching to store

* 🚚 Move method to component

*  Use constant

*  Refactor `Notice` component

* 🧪 Update tests

* 🔥 Remove unused keys

*  Inject custom API call option

* 🔥 Remove unused props

* 🎨 Use `compact` prop

* 🧪 Update snapshots

* 🚚 Move scopes to store

* 🚚 Move `nodeCredentialTypes` to parent

* ✏️ Rename cred types per branding

* 🐛 Clear scopes when none

*  Add default

* 🚚 Move `newHttpRequestNodeCredentialType` to parent

* 🔥 Remove test data

*  Separate lines for readability

*  Change reference from node to node name

* ✏️ Rename i18n keys

*  Refactor OAuth check

* 🔥 Remove unused key

* 🚚 Move `OAuth1/2 API` to i18n

*  Refactor `skipCheck`

*  Add `stopPropagation` and `preventDefault`

* 🚚 Move active credential scopes logic to store

* 🎨 Fix spacing for `NodeWebhooks` component

*  Implement feedback

*  Update HTTPRN default and issue copy

* Refactor to use `CredentialsSelect` param (#3304)

*  Refactor into cred type param

*  Componentize scopes notice

* 🔥 Remove unused data

* 🔥 Remove unused `loadOptions`

*  Componentize `NodeCredentialType`

* 🐛 Fix param validation

* 🔥 Remove dup methods

*  Refactor all references to `isHttpRequestNodeV2`

* 🎨 Fix styling

* 🔥 Remove unused import

* 🔥 Remove unused properties

* 🎨 Fix spacing for Pipedrive Trigger node

* 🎨 Undo Webhook node styling change

* 🔥 Remove unused style

*  Cover `httpHeaderAuth` edge case

* 🐛 Fix `this.node` reference

* 🚚 Rename to `credentialsSelect`

* 🐛 Fix mistaken renaming

*  Set one attribute per line

*  Move condition to instantiation site

* 🚚 Rename prop

*  Refactor away `prepareScopesNotice`

* ✏️ Rename i18n keys

* ✏️ Update i18n calls

* ✏️ Add more i18n keys

* 🔥 Remove unused props

* ✏️ Add explanatory comment

*  Adjust check in `hasProxyAuth`

*  Refactor `credentialSelected` from prop to event

*  Eventify `valueChanged`, `setFocus`, `onBlur`

*  Eventify `optionSelected`

*  Add `noDataExpression`

* 🔥 Remove logging

* 🔥 Remove URL from scopes

*  Disregard expressions for display

* 🎨 Use CSS modules

* 📘 Tigthen interface

* 🐛 Fix generic auth display

* 🐛 Fix generic auth validation

* 📘 Loosen type

* 🚚 Move event params to end

*  Generalize reference

*  Refactor generic auth as `credentialsSelect` param

*  Restore check for `httpHeaderAuth `

* 🚚 Rename `existing` to `predefined`

* Extend metrics for HTTP Request node (#3282)

*  Extend metrics

* 🧪 Add tests

*  Update param names

Co-authored-by: Alex Grozav <alex@grozav.com>

*  Update check per new branch

*  Include generic auth check

*  Adjust telemetry (#3359)

*  Filter credential types by label

Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
Co-authored-by: Alex Grozav <alex@grozav.com>

* ⬆️ Update package-lock.json file

* 🔖 Release n8n-workflow@0.100.0

* ⬆️ Set n8n-workflow@0.100.0 on n8n-core

* 🔖 Release n8n-core@0.118.0

* ⬆️ Set n8n-core@0.118.0 and n8n-workflow@0.100.0 on n8n-node-dev

* 🔖 Release n8n-node-dev@0.57.0

* ⬆️ Set n8n-core@0.118.0 and n8n-workflow@0.100.0 on n8n-nodes-base

* 🔖 Release n8n-nodes-base@0.176.0

* 🔖 Release n8n-design-system@0.21.0

* ⬆️ Set n8n-design-system@0.21.0 and n8n-workflow@0.100.0 on n8n-editor-ui

* 🔖 Release n8n-editor-ui@0.144.0

* ⬆️ Set n8n-core@0.118.0, n8n-editor-ui@0.144.0, n8n-nodes-base@0.176.0 and n8n-workflow@0.100.0 on n8n

* 🔖 Release n8n@0.178.0

* 🔖 Update main package.json to 0.178.0

* 📚 Update CHANGELOG.md with version 0.178.0

* fix(editor): Fix problem with HTTP Request Node 1 credentials to be set (#3371)

* 🔖 Release n8n-editor-ui@0.144.1

* ⬆️ Set n8n-editor-ui@0.144.1 on n8n

* 🔖 Release n8n@0.178.1

* 🔖 Update main package.json to 0.178.1

* 📚 Update CHANGELOG.md with version 0.178.1

* fix(editor): Fix parameter loading bug (#3374)

* fix parameter loading bug

* remove duplicate check

* 🔖 Release n8n-editor-ui@0.144.2

* ⬆️ Set n8n-editor-ui@0.144.2 on n8n

* 🔖 Release n8n@0.178.2

* 🔖 Update main package.json to 0.178.2

* 📚 Update CHANGELOG.md with version 0.178.2

*  Improvements

* fix(core): Fix issue that "closeFunction" got called twice

* fix(core): Prevent expressions XSS (#3366)

*  Added checks for window object access in template strings.

*  Added self, prompt and confirm to blocklist. Changed window usage condition.

* fix(editor): Fix conflicting hover states between sticky button and node view (#3368)

* 🐛 Fixing conflicting hover states between sticky button and node view.

* 🔨 Updating and optimizing sticky menu hover logic

* 📇 Removing redundant comments from `NodeView`.

* fix(editor): Fix credential display bug (#3372)

*  Filter credentials by version

*  Reuse helper

* fix(NextCloud Node): Fix folder list with Nextcloud v24 (#3386)

* initial fix for v24 folder listing

* implemented new credential methods

* Nodelinter fixes

* feat(PostBin Node): Add PostBin node  (#3236)

* 🚧 Initial progress on PostBin node.

*  Implemented Bin and Request operations for PostBin node.

* 🚧 Reworked the node in the declarative way.

* 🚧 PosBin node refactoring after reworking it.

*  Implemented Bin id parsing in PostBin node. Done some final refactoring and documentation.

*  Improvements

*  Add comments

* 👌Updating the PostBin node based on the product review

* 💄Updating PostBin node Bin ID validation logic

*  Small improvements

*  Transform the bin requests and add additional properties

Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>

*  Simplify auth

* 👕 Fix lint issue

Co-authored-by: Michael Kret <michael.k@radency.com>
Co-authored-by: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Co-authored-by: Jan Oberhauser <janober@users.noreply.github.com>
Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
Co-authored-by: Alex Grozav <alex@grozav.com>
Co-authored-by: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Co-authored-by: ricardo <ricardoespinoza105@gmail.com>
Co-authored-by: Milorad FIlipović <miloradfilipovic19@gmail.com>
Co-authored-by: Jonathan Bennetts <jonathan.bennetts@gmail.com>
This commit is contained in:
Gonçalo Silva 2022-05-27 17:15:05 +01:00 committed by GitHub
parent 06c407def8
commit dc77594a1e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 135 additions and 36 deletions

View file

@ -1,4 +1,6 @@
import {
IAuthenticateBearer,
ICredentialTestRequest,
ICredentialType,
INodeProperties,
} from 'n8n-workflow';
@ -16,4 +18,18 @@ export class TodoistApi implements ICredentialType {
default: '',
},
];
authenticate = {
type: 'bearer',
properties: {
tokenPropertyName: 'apiKey',
},
} as IAuthenticateBearer;
test: ICredentialTestRequest = {
request: {
baseURL: 'https://api.todoist.com/rest/v1',
url: '/labels',
},
};
}

View file

@ -34,7 +34,7 @@ export async function nextCloudApiRequest(this: IHookFunctions | IExecuteFunctio
credentials = await this.getCredentials('nextCloudOAuth2Api') as { webDavUrl: string };
}
let options: OptionsWithUri = {
const options: OptionsWithUri = {
headers,
method,
body,

View file

@ -28,12 +28,11 @@ export async function todoistApiRequest(
body: any = {}, // tslint:disable-line:no-any
qs: IDataObject = {},
): Promise<any> { // tslint:disable-line:no-any
const authentication = this.getNodeParameter('authentication', 0, 'apiKey');
const authentication = this.getNodeParameter('authentication', 0) as string;
const endpoint = 'api.todoist.com/rest/v1';
const options: OptionsWithUri = {
headers: {},
method,
qs,
uri: `https://${endpoint}${resource}`,
@ -45,16 +44,8 @@ export async function todoistApiRequest(
}
try {
if (authentication === 'apiKey') {
const credentials = await this.getCredentials('todoistApi');
//@ts-ignore
options.headers['Authorization'] = `Bearer ${credentials.apiKey}`;
return this.helpers.request!(options);
} else {
//@ts-ignore
return await this.helpers.requestOAuth2.call(this, 'todoistOAuth2Api', options);
}
const credentialType = authentication === 'apiKey' ? 'todoistApi' : 'todoistOAuth2Api';
return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
} catch (error) {
throw new NodeApiError(this.getNode(), error);

View file

@ -21,7 +21,7 @@ interface IBodyCreateTask {
description?: string;
project_id?: number;
section_id?: number;
parent?: number;
parent_id?: number;
order?: number;
label_ids?: number[];
priority?: number;
@ -116,16 +116,16 @@ export class Todoist implements INodeType {
},
},
options: [
{
name: 'Create',
value: 'create',
description: 'Create a new task',
},
{
name: 'Close',
value: 'close',
description: 'Close a task',
},
{
name: 'Create',
value: 'create',
description: 'Create a new task',
},
{
name: 'Delete',
value: 'delete',
@ -192,6 +192,7 @@ export class Todoist implements INodeType {
},
},
default: [],
description: 'Optional labels that will be assigned to a created task',
},
{
displayName: 'Content',
@ -266,6 +267,13 @@ export class Todoist implements INodeType {
default: '',
description: 'Specific date and time in RFC3339 format in UTC',
},
{
displayName: 'Due String Locale',
name: 'dueLang',
type: 'string',
default: '',
description: '2-letter code specifying language in case due_string is not written in English',
},
{
displayName: 'Due String',
name: 'dueString',
@ -274,11 +282,18 @@ export class Todoist implements INodeType {
description: 'Human defined task due date (ex.: “next Monday”, “Tomorrow”). Value is set using local (not UTC) time.',
},
{
displayName: 'Due String Locale',
name: 'dueLang',
type: 'string',
default: '',
description: '2-letter code specifying language in case due_string is not written in English',
displayName: 'Parent ID',
name: 'parentId',
type: 'options',
typeOptions: {
loadOptionsMethod: 'getItems',
loadOptionsDependsOn: [
'project',
'options.section',
],
},
default: {},
description: 'The parent task you want to operate on',
},
{
displayName: 'Priority',
@ -292,7 +307,7 @@ export class Todoist implements INodeType {
description: 'Task priority from 1 (normal) to 4 (urgent)',
},
{
displayName: 'Section',
displayName: 'Section ID',
name: 'section',
type: 'options',
typeOptions: {
@ -344,7 +359,7 @@ export class Todoist implements INodeType {
minValue: 1,
maxValue: 500,
},
default: 100,
default: 50,
description: 'Max number of results to return',
},
{
@ -395,6 +410,20 @@ export class Todoist implements INodeType {
default: '',
description: 'IETF language tag defining what language filter is written in, if differs from default English',
},
{
displayName: 'Parent ID',
name: 'parentId',
type: 'options',
typeOptions: {
loadOptionsMethod: 'getItems',
loadOptionsDependsOn: [
'filters.projectId',
'filters.sectionId',
],
},
default: '',
description: 'Filter tasks by parent task ID',
},
{
displayName: 'Project ID',
name: 'projectId',
@ -405,6 +434,19 @@ export class Todoist implements INodeType {
default: '',
description: 'Filter tasks by project ID',
},
{
displayName: 'Section ID',
name: 'sectionId',
type: 'options',
typeOptions: {
loadOptionsMethod: 'getSections',
loadOptionsDependsOn: [
'filters.projectId',
],
},
default: '',
description: 'Filter tasks by section ID',
},
],
},
{
@ -445,13 +487,6 @@ export class Todoist implements INodeType {
default: '',
description: 'Specific date and time in RFC3339 format in UTC',
},
{
displayName: 'Due String',
name: 'dueString',
type: 'string',
default: '',
description: 'Human defined task due date (ex.: “next Monday”, “Tomorrow”). Value is set using local (not UTC) time.',
},
{
displayName: 'Due String Locale',
name: 'dueLang',
@ -459,6 +494,13 @@ export class Todoist implements INodeType {
default: '',
description: '2-letter code specifying language in case due_string is not written in English',
},
{
displayName: 'Due String',
name: 'dueString',
type: 'string',
default: '',
description: 'Human defined task due date (ex.: “next Monday”, “Tomorrow”). Value is set using local (not UTC) time.',
},
{
displayName: 'Labels',
name: 'labels',
@ -509,7 +551,13 @@ export class Todoist implements INodeType {
async getSections(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
const returnData: INodePropertyOptions[] = [];
const projectId = this.getCurrentNodeParameter('project') as number;
const options = Object.assign({},
this.getNodeParameter('options', {}),
this.getNodeParameter('filters', {}),
) as IDataObject;
const projectId = options.projectId as number ??
this.getCurrentNodeParameter('project') as number;
if (projectId) {
const qs: IDataObject = {project_id: projectId};
const sections = await todoistApiRequest.call(this, 'GET', '/sections', {}, qs);
@ -527,6 +575,41 @@ export class Todoist implements INodeType {
return returnData;
},
// Get all the available parents in the selected project and section,
// to display them to user so that they can select one easily
async getItems(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
const returnData: INodePropertyOptions[] = [];
const options = Object.assign({},
this.getNodeParameter('options', {}),
this.getNodeParameter('filters', {}),
) as IDataObject;
const projectId = options.projectId as number ??
this.getCurrentNodeParameter('project') as number;
const sectionId = options.sectionId as number || options.section as number ||
this.getCurrentNodeParameter('sectionId') as number;
if (projectId) {
const qs: IDataObject = sectionId ?
{project_id: projectId, section_id: sectionId} : {project_id: projectId};
const items = await todoistApiRequest.call(this, 'GET', '/tasks', {}, qs);
for (const item of items) {
const itemContent = item.content;
const itemId = item.id;
returnData.push({
name: itemContent,
value: itemId,
});
}
}
return returnData;
},
// Get all the available labels to display them to user so that he can
// select them easily
async getLabels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
@ -592,13 +675,16 @@ export class Todoist implements INodeType {
}
if (labels !== undefined && labels.length !== 0) {
body.label_ids = labels;
body.label_ids = labels as number[];
}
if (options.section) {
body.section_id = options.section as number;
}
if (options.parentId) {
body.parent_id = options.parentId as number;
}
responseData = await todoistApiRequest.call(this, 'POST', '/tasks', body);
}
if (operation === 'close') {
@ -628,10 +714,16 @@ export class Todoist implements INodeType {
if (operation === 'getAll') {
//https://developer.todoist.com/rest/v1/#get-active-tasks
const returnAll = this.getNodeParameter('returnAll', i) as boolean;
const filters = this.getNodeParameter('filters', i) as IDataObject;
const filters = this.getNodeParameter('filters', i, {}) as IDataObject;
if (filters.projectId) {
qs.project_id = filters.projectId as string;
}
if (filters.sectionId) {
qs.section_id = filters.sectionId as string;
}
if (filters.parentId) {
qs.parent_id = filters.parentId as string;
}
if (filters.labelId) {
qs.label_id = filters.labelId as string;
}