fix: fixed tasks returning less items than it should due to a page not containing 100 items, other misc

Author: graza-io

clickup/table_folder.go

@@ -13,8 +13,17 @@ func tableClickupFolder() *plugin.Table {
 		Name:        "clickup_folder",
 		Description: "Obtain folders by specifying either an id or a space_id.",
 		List: &plugin.ListConfig{
-			Hydrate:    listFolders,
-			KeyColumns: plugin.SingleColumn("space_id"),
+			Hydrate: listFolders,
+			KeyColumns: []*plugin.KeyColumn{
+				{
+					Name:    "space_id",
+					Require: plugin.Required,
+				},
+				{
+					Name:    "archived",
+					Require: plugin.Optional,
+				},
+			},
 		},
 		Get: &plugin.GetConfig{
 			Hydrate:    getFolder,
@@ -31,9 +40,13 @@ func listFolders(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData
 	}
 
 	spaceId := d.EqualsQuals["space_id"].GetStringValue()
-	plugin.Logger(ctx).Debug("listFolders", "spaceId", spaceId)
+	archived := false
+	if d.EqualsQuals["archived"] != nil {
+		archived = d.EqualsQuals["archived"].GetBoolValue()
+	}
+	plugin.Logger(ctx).Debug("listFolders", "spaceId", spaceId, "archived", archived)
 
-	folders, _, err := client.Folders.GetFolders(ctx, spaceId, true)
+	folders, _, err := client.Folders.GetFolders(ctx, spaceId, archived)
 	if err != nil {
 		plugin.Logger(ctx).Error(fmt.Sprintf("unable to obtain folders for space id '%s': %v", spaceId, err))
 		return nil, fmt.Errorf("unable to obtain folders for space id '%s': %v", spaceId, err)

clickup/table_folderless_list.go

@@ -11,8 +11,17 @@ func tableClickupFolderlessList() *plugin.Table {
 		Name:        "clickup_folderless_list",
 		Description: "Obtain lists not associated to a folder by providing a space_id.",
 		List: &plugin.ListConfig{
-			KeyColumns: plugin.SingleColumn("space_id"),
-			Hydrate:    listFolderlessLists,
+			KeyColumns: []*plugin.KeyColumn{
+				{
+					Name:    "space_id",
+					Require: plugin.Required,
+				},
+				{
+					Name:    "archived",
+					Require: plugin.Optional,
+				},
+			},
+			Hydrate: listFolderlessLists,
 		},
 		Columns: listColumns(),
 	}
@@ -25,9 +34,13 @@ func listFolderlessLists(ctx context.Context, d *plugin.QueryData, h *plugin.Hyd
 	}
 
 	spaceId := d.EqualsQuals["space_id"].GetStringValue()
-	plugin.Logger(ctx).Debug("listFolderlessLists", "spaceId", spaceId)
+	archived := false
+	if d.EqualsQuals["archived"] != nil {
+		archived = d.EqualsQuals["archived"].GetBoolValue()
+	}
+	plugin.Logger(ctx).Debug("listFolderlessLists", "spaceId", spaceId, "archived", archived)
 
-	lists, _, err := client.Lists.GetFolderlessLists(ctx, spaceId, true)
+	lists, _, err := client.Lists.GetFolderlessLists(ctx, spaceId, archived)
 	if err != nil {
 		plugin.Logger(ctx).Error(fmt.Sprintf("unable to obtain folderless lists for space id '%s': %v", spaceId, err))
 		return nil, fmt.Errorf("unable to obtain folderless lists for space id '%s': %v", spaceId, err)

clickup/table_list.go

@@ -13,8 +13,17 @@ func tableClickupList() *plugin.Table {
 		Name:        "clickup_list",
 		Description: "Obtain lists that are associated to a folder by specifying either an id or a folder_id.",
 		List: &plugin.ListConfig{
-			KeyColumns: plugin.SingleColumn("folder_id"),
-			Hydrate:    listLists,
+			KeyColumns: []*plugin.KeyColumn{
+				{
+					Name:    "folder_id",
+					Require: plugin.Required,
+				},
+				{
+					Name:    "archived",
+					Require: plugin.Optional,
+				},
+			},
+			Hydrate: listLists,
 		},
 		Get: &plugin.GetConfig{
 			KeyColumns: plugin.SingleColumn("id"),
@@ -31,9 +40,13 @@ func listLists(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData)
 	}
 
 	folderId := d.EqualsQuals["folder_id"].GetStringValue()
-	plugin.Logger(ctx).Debug("listLists", "folderId", folderId)
+	archived := false
+	if d.EqualsQuals["archived"] != nil {
+		archived = d.EqualsQuals["archived"].GetBoolValue()
+	}
+	plugin.Logger(ctx).Debug("listLists", "folderId", folderId, "archived", archived)
 
-	lists, _, err := client.Lists.GetLists(ctx, folderId, true)
+	lists, _, err := client.Lists.GetLists(ctx, folderId, archived)
 	if err != nil {
 		plugin.Logger(ctx).Error(fmt.Sprintf("unable to obtain lists for folder id '%s': %v", folderId, err))
 		return nil, fmt.Errorf("unable to obtain lists for folder id '%s': %v", folderId, err)

clickup/table_task.go

@@ -28,6 +28,10 @@ func tableClickupTask() *plugin.Table {
 					Name:    "status",
 					Require: plugin.Optional,
 				},
+				{
+					Name:    "archived",
+					Require: plugin.Optional,
+				},
 			},
 		},
 		Get: &plugin.GetConfig{
@@ -49,7 +53,7 @@ func listTasks(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData)
 	// Default options
 	opts := &clickup.GetTasksOptions{
 		Page:          0,
-		Archived:      true,
+		Archived:      false,
 		IncludeClosed: true,
 		Subtasks:      true,
 	}
@@ -62,6 +66,10 @@ func listTasks(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData)
 		plugin.Logger(ctx).Debug("listTasks", "status", q["status"].GetStringValue())
 		opts.Statuses = []string{q["status"].GetStringValue()}
 	}
+	if q["archived"] != nil {
+		plugin.Logger(ctx).Debug("listTasks", "archived", q["archived"].GetBoolValue())
+		opts.Archived = q["archived"].GetBoolValue()
+	}
 
 	var ts []clickup.Task
 	for {
@@ -89,8 +97,8 @@ func listTasks(ctx context.Context, d *plugin.QueryData, h *plugin.HydrateData)
 			d.StreamListItem(ctx, t)
 		}
 
-		if len(ts) < 100 {
-			plugin.Logger(ctx).Debug("listTasks - exiting as page returned < 100 items", "page", opts.Page, "results", len(ts))
+		if len(ts) == 0 {
+			plugin.Logger(ctx).Debug("listTasks", "teamId", teamId, "exiting, page returned 0 results.")
 			break
 		}
 

docs/tables/clickup_folder.md

@@ -4,6 +4,8 @@ Obtain information about folders within your ClickUp environment.
 
 However you **MUST** specify either an `id` (single) or `space_id` (for multiple tasks) in the WHERE or JOIN clause.
 
+> Note: by default `archived` items won't be returned, to return archived items only set `archived = true` in the where clause.
+
 ## Examples
 
 ### Get a folder by id

docs/tables/clickup_folderless_list.md

@@ -4,6 +4,8 @@ Obtain information about lists that aren't associated to folders within your Cli
 
 However you **MUST** specify a `space_id` in the WHERE or JOIN clause.
 
+> Note: by default `archived` items won't be returned, to return archived items only set `archived = true` in the where clause.
+
 ## Examples
 
 ### List lists for a space that are not associated with a folder.

docs/tables/clickup_list.md

@@ -4,6 +4,8 @@ Obtain information about lists within your ClickUp environment.
 
 However you **MUST** specify either an `id` (single) or `folder_id` (for multiple tasks) in the WHERE or JOIN clause.
 
+> Note: by default `archived` items won't be returned, to return archived items only set `archived = true` in the where clause.
+
 ## Examples
 
 ### Get a list by id

docs/tables/clickup_task.md

@@ -4,6 +4,8 @@ Obtain information about tasks assigned to a specific team within your ClickUp e
 
 However you **MUST** specify either an `id` (single) or either a `list_id` or `team_id` (for multiple tasks) in the WHERE or JOIN clause.
 
+> Note: by default `archived` items won't be returned, to return archived items only set `archived = true` in the where clause.
+
 ## Examples
 
 ### Get a task by id