From 474390c88940e99742e41ff0591adf9cd16364da Mon Sep 17 00:00:00 2001 From: Peter Krzyzek Date: Tue, 25 Feb 2025 15:56:57 -0600 Subject: [PATCH] fixed up get and create Clickup task to use the clickup type --- .idea/.gitignore | 8 + .idea/modules.xml | 8 + .idea/php.xml | 19 ++ .idea/vcs.xml | 6 + .idea/windmill.iml | 8 + f/cklph/folder.meta.yaml | 6 + f/clickup/get_task.deno.ts | 191 +-------------------- f/clickup/get_task.script.lock | 7 + f/clickup/get_task.script.yaml | 2 +- f/clickup/utils/filter-task-fields.deno.ts | 2 +- f/types/clickup.deno.ts | 29 ++-- f/types/folder.meta.yaml | 3 +- wmill-lock.yaml | 4 +- 13 files changed, 96 insertions(+), 197 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/modules.xml create mode 100644 .idea/php.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/windmill.iml create mode 100644 f/cklph/folder.meta.yaml create mode 100644 f/clickup/get_task.script.lock diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..347089b --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/php.xml b/.idea/php.xml new file mode 100644 index 0000000..f324872 --- /dev/null +++ b/.idea/php.xml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/windmill.iml b/.idea/windmill.iml new file mode 100644 index 0000000..c956989 --- /dev/null +++ b/.idea/windmill.iml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/f/cklph/folder.meta.yaml b/f/cklph/folder.meta.yaml new file mode 100644 index 0000000..8dd36db --- /dev/null +++ b/f/cklph/folder.meta.yaml @@ -0,0 +1,6 @@ +summary: null +display_name: cklph +extra_perms: + u/peter: true +owners: + - u/peter diff --git a/f/clickup/get_task.deno.ts b/f/clickup/get_task.deno.ts index 24aae88..374a09c 100644 --- a/f/clickup/get_task.deno.ts +++ b/f/clickup/get_task.deno.ts @@ -1,166 +1,10 @@ -// clickup/get_task.ts -interface TaskResponse { - id: string; - name: string; - description?: string; - text_content?: string; - status?: { - status: string; - color: string; - orderindex: number; - type: "open" | "closed" | "custom"; - }; - orderindex?: string; - date_created?: string; - date_updated?: string; - date_closed?: string | null; - date_done?: string | null; - archived?: boolean; - creator?: { - id: number; - username: string; - email: string; - color: string; - profilePicture?: string; - }; - assignees?: Array<{ - id: number; - username: string; - email: string; - color: string; - initials: string; - profilePicture?: string; - }>; - watchers?: Array<{ - id: number; - username: string; - email: string; - color: string; - initials: string; - profilePicture?: string; - }>; - checklists?: Array<{ - id: string; - name: string; - orderindex: number; - resolved: number; - unresolved: number; - items: Array<{ - id: string; - name: string; - orderindex: number; - assignee?: number; - resolved: boolean; - parent?: string; - date_created: string; - children?: string[]; - }>; - }>; - tags?: Array<{ - name: string; - tag_fg: string; - tag_bg: string; - creator?: number; - }>; - parent?: string | null; - priority?: { - id: string; - priority: "urgent" | "high" | "normal" | "low"; - color: string; - }; - due_date?: string | null; - start_date?: string | null; - time_estimate?: number | null; - time_spent?: number | null; - custom_fields?: Array<{ - id: string; - name: string; - type: string; - type_config: Record; - value: any; - }>; - list?: { - id: string; - name: string; - access: boolean; - }; - project?: { - id: string; - name: string; - hidden: boolean; - access: boolean; - }; - folder?: { - id: string; - name: string; - hidden: boolean; - access: boolean; - }; - space?: { - id: string; - name: string; - }; - url?: string; - permission_level?: string; - custom_item_id?: number | null; - custom_task_ids?: Array<{ - custom_task_id: string; - team_id: string; - }>; - dependencies?: Array<{ - task_id: string; - depends_on: string; - type: number; - date_created: string; - userid: string; - }>; - linked_tasks?: Array<{ - task_id: string; - link_id: string; - date_created: string; - userid: string; - }>; - team_id?: string; - custom_id?: string | null; - attachments?: Array<{ - id: string; - version: string; - date: string; - title: string; - extension: string; - thumbnail_small: string; - thumbnail_large: string; - size: number; - }>; - shared?: Array<{ - id: string; - name: string; - type: string; - access_level: string; - team_id: string; - }>; - followers?: Array<{ - id: number; - username: string; - email: string; - color: string; - initials: string; - profilePicture?: string; - }>; - [key: string]: any; // For future API additions -} - -type FieldSelector = Array; - -// All we need here is the access token. -type ClickupCredentials = { - access_token: string; -}; +import { TaskResponse, ClickupCredentials, ClickUpError } from "/f/types/clickup.deno.ts"; +import { filterTaskFields, FieldSelector } from "/f/clickup/utils/filter-task-fields.deno.ts"; export async function main( task_id: string, fields: FieldSelector = ["id", "name", "status", "date_created"], - credentials: ClickupCredentials, + credentials: ClickupCredentials ) { // Input validation if (!task_id?.trim()) throw new Error("Task ID is required"); @@ -172,34 +16,17 @@ export async function main( headers: { "Authorization": credentials.access_token, }, - }, + } ); if (!response.ok) { - const error = await response.text(); - throw new Error(`ClickUp Error ${response.status}: ${error}`); + const error: ClickUpError = await response.json(); + throw new Error(`ClickUp Error ${error.code}: ${error.err}`); } // Full response parsing - const fullTask = await response.json(); + const fullTask: TaskResponse = await response.json(); // Field filtering - return fields.length > 0 ? filterFields(fullTask, fields) : fullTask; -} - -// Recursive field filtering function -function filterFields(obj: any, fields: FieldSelector): any { - return fields.reduce((acc, field) => { - const [root, ...nested] = (field as string).split("."); - - if (obj[root] !== undefined) { - if (nested.length > 0 && typeof obj[root] === "object") { - acc[root] = filterFields(obj[root], [nested.join(".")]); - } else { - acc[root] = obj[root]; - } - } - - return acc; - }, {} as Record); -} + return fields.length > 0 ? filterTaskFields(fullTask, fields) : fullTask; +} \ No newline at end of file diff --git a/f/clickup/get_task.script.lock b/f/clickup/get_task.script.lock new file mode 100644 index 0000000..9585163 --- /dev/null +++ b/f/clickup/get_task.script.lock @@ -0,0 +1,7 @@ +{ + "version": "4", + "remote": { + "http://localhost:37649/api/scripts_u/empty_ts/f/clickup/utils/filter-task-fields.deno.ts": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", + "http://localhost:37649/api/scripts_u/empty_ts/f/types/clickup.deno.ts": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" + } +} diff --git a/f/clickup/get_task.script.yaml b/f/clickup/get_task.script.yaml index 6e81a29..4fbc623 100644 --- a/f/clickup/get_task.script.yaml +++ b/f/clickup/get_task.script.yaml @@ -1,6 +1,6 @@ summary: Get Task description: '' -lock: '' +lock: '!inline f/clickup/get_task.script.lock' kind: script schema: $schema: 'https://json-schema.org/draft/2020-12/schema' diff --git a/f/clickup/utils/filter-task-fields.deno.ts b/f/clickup/utils/filter-task-fields.deno.ts index 32e8dca..350267f 100644 --- a/f/clickup/utils/filter-task-fields.deno.ts +++ b/f/clickup/utils/filter-task-fields.deno.ts @@ -1,5 +1,5 @@ // utils/filter-task-fields.ts -import type { TaskResponse } from '../types/clickup'; +import type { TaskResponse } from '/f/types/clickup'; type FieldSelector = Array; type NestedField = { diff --git a/f/types/clickup.deno.ts b/f/types/clickup.deno.ts index 523ee08..5770ac7 100644 --- a/f/types/clickup.deno.ts +++ b/f/types/clickup.deno.ts @@ -12,8 +12,17 @@ interface TaskBase { text_content?: string; // Status & Priority - status?: string; - priority?: 1 | 2 | 3 | 4; + status?: string | { + status: string; + color: string; + orderindex: number; + type: 'open' | 'closed' | 'custom'; + }; + priority?: 1 | 2 | 3 | 4 | { + id: string; + priority: 'urgent' | 'high' | 'normal' | 'low'; + color: string; + }; // Time Management due_date?: number | null; @@ -84,6 +93,14 @@ interface TaskResponse extends TaskBase { date_done?: string | null; archived: boolean; + // Override the status property to be more specific + status: { + status: string; + color: string; + orderindex: number; + type: 'open' | 'closed' | 'custom'; + }; + /** System Relationships */ list: { id: string; @@ -115,14 +132,6 @@ interface TaskResponse extends TaskBase { subtasks: TaskResponse[]; attachments: Attachment[]; - /** Status Details */ - status: { - status: string; - color: string; - orderindex: number; - type: 'open' | 'closed' | 'custom'; - }; - /** Priority Details */ priority: { id: string; diff --git a/f/types/folder.meta.yaml b/f/types/folder.meta.yaml index 3f4c6d1..0216a0c 100644 --- a/f/types/folder.meta.yaml +++ b/f/types/folder.meta.yaml @@ -1,6 +1,7 @@ -summary: null +summary: '' display_name: types extra_perms: + g/all: false u/peter: true owners: - u/peter diff --git a/wmill-lock.yaml b/wmill-lock.yaml index f97633f..fc75c05 100644 --- a/wmill-lock.yaml +++ b/wmill-lock.yaml @@ -1,6 +1,6 @@ locks: f/clickup/create_task: 43a306643623f8d42f2e9432175d2061cb05bd4ac0825972c93559163b773ad0 - f/clickup/get_task: e1ac7c952de428bd53df01621c05ecb3995e38cf5f78de1ab03c6baeda9da760 + f/clickup/get_task: dfe52f7476a8674d08206fc27611dd19e04f8dfc3d02f7c2c0f8525d0ec9a8b9 f/clickup/rotate_tokens: d0a53e8f1855ab682ebf0cc89d093e8e98db761d9225831c7c9c2d0014f4f6bb - f/clickup/utils/filter-task-fields: a160d19c2fa752fa3828f2c87b498be1e79f383ac271678a7dc51c63a4237b4a + f/clickup/utils/filter-task-fields: 2307c078b6b1dca98802217241644a3c743ba1c00194729ef0cc9fb959c8421b f/types/clickup: eb03485311a666b6410b7a621f063dcc84aee0e3a198a721165abdccdf690fa4