Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -147,4 +147,10 @@ public static CarouselBlock carousel(ModelConfigurator<CarouselBlock.CarouselBlo
return configurator.configure(CarouselBlock.builder()).build();
}

// TaskCardBlock

public static TaskCardBlock taskCard(ModelConfigurator<TaskCardBlock.TaskCardBlockBuilder> configurator) {
return configurator.configure(TaskCardBlock.builder()).build();
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.slack.api.model.block;

import com.slack.api.model.block.composition.SlackIconObject;
import com.slack.api.model.block.element.UrlSourceElement;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.util.List;

/**
* https://docs.slack.dev/reference/block-kit/blocks/task-card-block
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class TaskCardBlock implements LayoutBlock {
public static final String TYPE = "task_card";
private final String type = TYPE;

private String taskId;
private String title;
private String status;
private RichTextBlock details;
private RichTextBlock output;
Comment on lines +26 to +27

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💸 praise: Nice!

private List<UrlSourceElement> sources;
private String blockId;
private SlackIconObject icon;
private Boolean hideTitle;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.slack.api.model.block.element;

import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

/**
* https://docs.slack.dev/reference/block-kit/block-elements/url-source-element
*/
@Data
@Builder
@NoArgsConstructor
@AllArgsConstructor
public class UrlSourceElement {
public static final String TYPE = "url";
private final String type = TYPE;

private String url;
private String text;
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,40 +33,42 @@ public LayoutBlock deserialize(JsonElement json, Type typeOfT, JsonDeserializati

private Class<? extends LayoutBlock> getLayoutClassInstance(String typeName) {
switch (typeName) {
case SectionBlock.TYPE:
return SectionBlock.class;
case DividerBlock.TYPE:
return DividerBlock.class;
case ImageBlock.TYPE:
return ImageBlock.class;
case ContextBlock.TYPE:
return ContextBlock.class;
case ContextActionsBlock.TYPE:
return ContextActionsBlock.class;
case CallBlock.TYPE:
return CallBlock.class;
case ActionsBlock.TYPE:
return ActionsBlock.class;
case AlertBlock.TYPE:
return AlertBlock.class;
case CallBlock.TYPE:
return CallBlock.class;
case CardBlock.TYPE:
return CardBlock.class;
case CarouselBlock.TYPE:
return CarouselBlock.class;
case ContextActionsBlock.TYPE:
return ContextActionsBlock.class;
case ContextBlock.TYPE:
return ContextBlock.class;
case DividerBlock.TYPE:
return DividerBlock.class;
case FileBlock.TYPE:
return FileBlock.class;
case InputBlock.TYPE:
return InputBlock.class;
case HeaderBlock.TYPE:
return HeaderBlock.class;
case ImageBlock.TYPE:
return ImageBlock.class;
case InputBlock.TYPE:
return InputBlock.class;
case MarkdownBlock.TYPE:
return MarkdownBlock.class;
case VideoBlock.TYPE:
return VideoBlock.class;
case RichTextBlock.TYPE:
return RichTextBlock.class;
case SectionBlock.TYPE:
return SectionBlock.class;
case ShareShortcutBlock.TYPE:
return ShareShortcutBlock.class;
case AlertBlock.TYPE:
return AlertBlock.class;
case CardBlock.TYPE:
return CardBlock.class;
case CarouselBlock.TYPE:
return CarouselBlock.class;
case TaskCardBlock.TYPE:
return TaskCardBlock.class;
Comment on lines +68 to +69

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎲 note: Similar suggestion to alphabetical ordering but no blocker if this is a significant change!

case VideoBlock.TYPE:
return VideoBlock.class;
default:
if (failOnUnknownProperties) {
throw new JsonParseException("Unsupported layout block type: " + typeName);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2202,4 +2202,80 @@ public void buildCarouselBlock() {
assertThat(parsedCarousel.getElements().get(0).getBlockId(), is("card1"));
assertThat(parsedCarousel.getElements().get(0).getActions().size(), is(1));
}

@Test
public void parseTaskCardBlock() {
String json = "{\n" +
" \"blocks\": [\n" +
" {\n" +
" \"type\": \"task_card\",\n" +
" \"task_id\": \"task_1\",\n" +
" \"title\": \"Fetching weather data\",\n" +
" \"status\": \"in_progress\",\n" +
" \"output\": {\n" +
" \"type\": \"rich_text\",\n" +
" \"elements\": [\n" +
" {\n" +
" \"type\": \"rich_text_section\",\n" +
" \"elements\": [\n" +
" {\n" +
" \"type\": \"text\",\n" +
" \"text\": \"Found weather data for Chicago from 2 sources\"\n" +
" }\n" +
" ]\n" +
" }\n" +
" ]\n" +
" },\n" +
" \"sources\": [\n" +
" {\n" +
" \"type\": \"url\",\n" +
" \"url\": \"https://weather.com/\",\n" +
" \"text\": \"weather.com\"\n" +
" },\n" +
" {\n" +
" \"type\": \"url\",\n" +
" \"url\": \"https://www.accuweather.com/\",\n" +
" \"text\": \"accuweather.com\"\n" +
" }\n" +
" ]\n" +
" }\n" +
" ]\n" +
"}";
Gson gson = GsonFactory.createSnakeCase();
Message message = gson.fromJson(json, Message.class);
assertThat(message, is(notNullValue()));
assertThat(message.getBlocks().size(), is(1));

TaskCardBlock taskCard = (TaskCardBlock) message.getBlocks().get(0);
assertThat(taskCard.getType(), is("task_card"));
assertThat(taskCard.getTaskId(), is("task_1"));
assertThat(taskCard.getTitle(), is("Fetching weather data"));
assertThat(taskCard.getStatus(), is("in_progress"));

assertThat(taskCard.getOutput(), is(notNullValue()));
assertThat(taskCard.getOutput().getType(), is("rich_text"));

assertThat(taskCard.getSources().size(), is(2));
assertThat(taskCard.getSources().get(0).getType(), is("url"));
assertThat(taskCard.getSources().get(0).getUrl(), is("https://weather.com/"));
assertThat(taskCard.getSources().get(0).getText(), is("weather.com"));
assertThat(taskCard.getSources().get(1).getUrl(), is("https://www.accuweather.com/"));
assertThat(taskCard.getSources().get(1).getText(), is("accuweather.com"));
}

@Test
public void buildTaskCardBlock() {
TaskCardBlock taskCard = Blocks.taskCard(t -> t
.taskId("task_42")
.title("Processing data")
.status("in_progress")
.sources(Arrays.asList(
UrlSourceElement.builder().url("https://example.com").text("example").build())));
assertThat(taskCard, is(notNullValue()));
assertThat(taskCard.getType(), is("task_card"));
assertThat(taskCard.getTaskId(), is("task_42"));
assertThat(taskCard.getTitle(), is("Processing data"));
assertThat(taskCard.getStatus(), is("in_progress"));
assertThat(taskCard.getSources().size(), is(1));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,11 @@ public void testRichText() {
), is(notNullValue()));
}

@Test
public void testTaskCard() {
assertThat(taskCard(t -> t.taskId("task_1").title("Do thing").status("complete")), is(notNullValue()));
}

@Test
public void testDateTimePicker() {
assertThat(datetimePicker(h -> h.actionId("block-id").initialDateTime(12345)), is(notNullValue()));
Expand Down
Loading