Adding specific types for ViewInfo element values plus some missing B…

…lockAction types
soxtoby · Mar 29, 2020 · 4565348 · 4565348
1 parent 13ebce3
commit 4565348
Show file tree

Hide file tree

Showing 33 changed files with 288 additions and 124 deletions.
diff --git a/SlackNet.EventsExample/AppHome.cs b/SlackNet.EventsExample/AppHome.cs
@@ -1,3 +1,5 @@
+using System.Collections;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using SlackNet.Blocks;
 using SlackNet.Events;
@@ -10,6 +12,7 @@ namespace SlackNet.EventsExample
     public class AppHome : IEventHandler<AppHomeOpened>, IBlockActionHandler<ButtonAction>, IViewSubmissionHandler
     {
         private const string OpenModal = "open_modal";
+        private const string InlineCheckboxes = "checkboxes";
         private const string InputBlockId = "input_block";
         private const string InputActionId = "text_input";
         public static readonly string ModalCallbackId = "home_modal";
@@ -58,19 +61,84 @@ public async Task Handle(ButtonAction action, BlockActionRequest request)
                                                 ActionId = InputActionId,
                                                 Placeholder = "Enter some text"
                                             }
+                                    },
+                                new InputBlock
+                                    {
+                                        Label = "Single-select",
+                                        BlockId = "single_select_block",
+                                        Element = new StaticSelectMenu
+                                            {
+                                                ActionId = "single_select",
+                                                Options = ExampleOptions()
+                                            }
+                                    },
+                                new InputBlock
+                                    {
+                                        Label = "Multi-select",
+                                        BlockId = "multi_select_block",
+                                        Element = new StaticMultiSelectMenu
+                                            {
+                                                ActionId = "multi_select",
+                                                Options = ExampleOptions()
+                                            }
+                                    },
+                                new InputBlock
+                                    {
+                                        Label = "Date",
+                                        BlockId = "date_block",
+                                        Element = new DatePicker { ActionId = "date_picker" }
+                                    },
+                                new InputBlock
+                                    {
+                                        Label = "Radio options",
+                                        BlockId = "radio_block",
+                                        Element = new RadioButtonGroup
+                                            {
+                                                ActionId = "radio",
+                                                Options = ExampleOptions()
+                                            }
+                                    },
+                                new InputBlock
+                                    {
+                                        Label = "Checkbox options",
+                                        BlockId = "checkbox_block",
+                                        Element = new CheckboxGroup
+                                            {
+                                                ActionId = "checkbox",
+                                                Options = ExampleOptions()
+                                            }
+                                    },
+                                new InputBlock
+                                    {
+                                        Label = "Single user select",
+                                        BlockId = "single_user_block",
+                                        Element = new UserSelectMenu
+                                            {
+                                                ActionId = "single_user"
+                                            }
                                     }
                             },
                         Submit = "Submit",
                         NotifyOnClose = true
                     }).ConfigureAwait(false);
         }
 
+        private IList<Blocks.Option> ExampleOptions()
+        {
+            return new List<Blocks.Option>
+                {
+                    new Blocks.Option { Text = "One", Value = "1" },
+                    new Blocks.Option { Text = "Two", Value = "2" },
+                    new Blocks.Option { Text = "Three", Value = "3" }
+                };
+        }
+
         public async Task<ViewSubmissionResponse> Handle(ViewSubmission viewSubmission)
         {
             await _slack.Chat.PostMessage(new Message
                 {
                     Channel = await UserIm(viewSubmission.User).ConfigureAwait(false),
-                    Text = $"You entered: {viewSubmission.View.State.Values[InputBlockId][InputActionId].Value}"
+                    Text = $"You entered: {viewSubmission.View.State.GetValue<PlainTextInputValue>(InputActionId).Value}"
                 }).ConfigureAwait(false);
 
             return ViewSubmissionResponse.Null;

diff --git a/SlackNet.sln.DotSettings b/SlackNet.sln.DotSettings
@@ -3,10 +3,16 @@
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FBuiltInTypes/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FElsewhere/@EntryIndexedValue">ERROR</s:String>
 	<s:String x:Key="/Default/CodeInspection/Highlighting/InspectionSeverities/=SuggestVarOrType_005FSimpleTypes/@EntryIndexedValue">ERROR</s:String>
+	<s:String x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/INITIALIZER_BRACES/@EntryValue">NEXT_LINE_SHIFTED_2</s:String>
+	<s:Boolean x:Key="/Default/CodeStyle/CodeFormatting/CSharpFormat/SPACE_WITHIN_SINGLE_LINE_ARRAY_INITIALIZER_BRACES/@EntryValue">True</s:Boolean>
 	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForBuiltInTypes/@EntryValue">UseVar</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForOtherTypes/@EntryValue">UseVar</s:String>
 	<s:String x:Key="/Default/CodeStyle/CSharpVarKeywordUsage/ForSimpleTypes/@EntryValue">UseVar</s:String>
 	<s:String x:Key="/Default/Environment/Hierarchy/PsiConfigurationSettingsKey/CustomLocation/@EntryValue">C:\Users\Simon\AppData\Local\JetBrains\Transient\ReSharperPlatformVs15\v08_a19e333b\SolutionCaches</s:String>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpKeepExistingMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpPlaceEmbeddedOnSameLineMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ECSharpUseContinuousIndentInsideBracesMigration/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002ECSharp_002ECodeStyle_002ESettingsUpgrade_002EMigrateBlankLinesAroundFieldToBlankLinesAroundProperty/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=authed/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Endtime/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Filetype/@EntryIndexedValue">True</s:Boolean>

diff --git a/SlackNet/Blocks/Button.cs b/SlackNet/Blocks/Button.cs
@@ -49,4 +49,11 @@ public enum ButtonStyle
         /// </summary>
         Danger
     }
+
+    [SlackType("button")]
+    public class ButtonAction : BlockAction
+    {
+        public TextObject Text { get; set; }
+        public string Value { get; set; }
+    }
 }
diff --git a/SlackNet/Blocks/ButtonAction.cs b/SlackNet/Blocks/ButtonAction.cs
diff --git a/SlackNet/Blocks/ChannelMultiSelectAction.cs b/SlackNet/Blocks/ChannelMultiSelectAction.cs
diff --git a/SlackNet/Blocks/ChannelMultiSelectMenu.cs b/SlackNet/Blocks/ChannelMultiSelectMenu.cs
@@ -20,4 +20,16 @@ public ChannelMultiSelectMenu() : base("multi_channels_select") { }
         /// </summary>
         public int? MaxSelectedItems { get; set; }
     }
+
+    [SlackType("multi_channels_select")]
+    public class ChannelMultiSelectAction : BlockAction
+    {
+        public IList<string> SelectedChannels { get; set; } = new List<string>();
+    }
+
+    [SlackType("multi_channels_select")]
+    public class ChannelMultiSelectValue : ElementValue
+    {
+        public IList<string> SelectedChannels { get; set; } = new List<string>();
+    }
 }
diff --git a/SlackNet/Blocks/ChannelSelectAction.cs b/SlackNet/Blocks/ChannelSelectAction.cs
diff --git a/SlackNet/Blocks/ChannelSelectMenu.cs b/SlackNet/Blocks/ChannelSelectMenu.cs
@@ -13,4 +13,16 @@ public ChannelSelectMenu() : base("channels_select") { }
         /// </summary>
         public string InitialChannel { get; set; }
     }
+
+    [SlackType("channels_select")]
+    public class ChannelSelectAction : BlockAction
+    {
+        public string SelectedChannel { get; set; }
+    }
+
+    [SlackType("channels_select")]
+    public class ChannelSelectValue : ElementValue
+    {
+        public string SelectedChannel { get; set; }
+    }
 }
diff --git a/SlackNet/Blocks/CheckboxGroup.cs b/SlackNet/Blocks/CheckboxGroup.cs
@@ -22,4 +22,16 @@ public CheckboxGroup() : base("checkboxes") { }
         [IgnoreIfEmpty]
         public IList<Option> InitialOptions { get; set; } = new List<Option>();
     }
+
+    [SlackType("checkboxes")]
+    public class CheckboxGroupAction : BlockAction
+    {
+        public IList<Option> SelectedOptions { get; set; } = new List<Option>();
+    }
+
+    [SlackType("checkboxes")]
+    public class CheckboxGroupValue : ElementValue
+    {
+        public IList<Option> SelectedOptions { get; set; } = new List<Option>();
+    }
 }
diff --git a/SlackNet/Blocks/ConversationMultiSelectAction.cs b/SlackNet/Blocks/ConversationMultiSelectAction.cs
diff --git a/SlackNet/Blocks/ConversationMultiSelectMenu.cs b/SlackNet/Blocks/ConversationMultiSelectMenu.cs
@@ -20,4 +20,16 @@ public ConversationMultiSelectMenu() : base("multi_conversations_select") { }
         /// </summary>
         public int? MaxSelectedItems { get; set; }
     }
+
+    [SlackType("multi_conversations_select")]
+    public class ConversationMultiSelectAction : BlockAction
+    {
+        public IList<string> SelectedConversations { get; set; } = new List<string>();
+    }
+
+    [SlackType("multi_conversations_select")]
+    public class ConversationMultiSelectValue : ElementValue
+    {
+        public IList<string> SelectedConversations { get; set; } = new List<string>();
+    }
 }
diff --git a/SlackNet/Blocks/ConversationSelectAction.cs b/SlackNet/Blocks/ConversationSelectAction.cs
diff --git a/SlackNet/Blocks/ConversationSelectMenu.cs b/SlackNet/Blocks/ConversationSelectMenu.cs
@@ -13,4 +13,16 @@ public ConversationSelectMenu() : base("conversations_select") { }
         /// </summary>
         public string InitialConversation { get; set; }
     }
+
+    [SlackType("conversations_select")]
+    public class ConversationSelectAction : BlockAction
+    {
+        public string SelectedConversation { get; set; }
+    }
+
+    [SlackType("conversations_select")]
+    public class ConversationSelectValue : ElementValue
+    {
+        public string SelectedConversation { get; set; }
+    }
 }
diff --git a/SlackNet/Blocks/DatePicker.cs b/SlackNet/Blocks/DatePicker.cs
@@ -21,4 +21,16 @@ public DatePicker() : base("datepicker") { }
         /// </summary>
         public DateTime? InitialDate { get; set; }
     }
+
+    [SlackType("datepicker")]
+    public class DatePickerAction : BlockAction
+    {
+        public DateTime SelectedDate { get; set; }
+    }
+
+    [SlackType("datepicker")]
+    public class DatePickerValue : ElementValue
+    {
+        public DateTime SelectedDate { get; set; }
+    }
 }
diff --git a/SlackNet/Blocks/DatePickerAction.cs b/SlackNet/Blocks/DatePickerAction.cs
diff --git a/SlackNet/Blocks/ExternalMultiSelectAction.cs b/SlackNet/Blocks/ExternalMultiSelectAction.cs
diff --git a/SlackNet/Blocks/ExternalMultiSelectMenu.cs b/SlackNet/Blocks/ExternalMultiSelectMenu.cs
@@ -23,4 +23,16 @@ public ExternalMultiSelectMenu() : base("multi_external_select") { }
         /// </summary>
         public int? MaxSelectedItems { get; set; }
     }
+
+    [SlackType("multi_external_select")]
+    public class ExternalMultiSelectAction
+    {
+        public IList<Option> SelectedOptions { get; set; } = new List<Option>();
+    }
+
+    [SlackType("multi_external_select")]
+    public class ExternalMultiSelectValue
+    {
+        public IList<Option> SelectedOptions { get; set; } = new List<Option>();
+    }
 }
diff --git a/SlackNet/Blocks/ExternalSelectAction.cs b/SlackNet/Blocks/ExternalSelectAction.cs
diff --git a/SlackNet/Blocks/ExternalSelectMenu.cs b/SlackNet/Blocks/ExternalSelectMenu.cs
@@ -17,4 +17,16 @@ public ExternalSelectMenu() : base("external_select") { }
         /// </summary>
         public Option InitialOption { get; set; }
     }
+
+    [SlackType("external_select")]
+    public class ExternalSelectAction : BlockAction
+    {
+        public Option SelectedOption { get; set; }
+    }
+
+    [SlackType("external_select")]
+    public class ExternalSelectValue : ElementValue
+    {
+        public Option SelectedOption { get; set; }
+    }
 }
diff --git a/SlackNet/Blocks/OverflowAction.cs b/SlackNet/Blocks/OverflowAction.cs
diff --git a/SlackNet/Blocks/OverflowMenu.cs b/SlackNet/Blocks/OverflowMenu.cs
@@ -21,4 +21,16 @@ public OverflowMenu() : base("overflow") { }
         /// </summary>
         public IList<OverflowOption> Options { get; set; } = new List<OverflowOption>();
     }
+
+    [SlackType("overflow")]
+    public class OverflowAction : BlockAction
+    {
+        public Option SelectedOption { get; set; }
+    }
+
+    [SlackType("overflow")]
+    public class OverflowValue : ElementValue
+    {
+        public Option SelectedOption { get; set; }
+    }
 }