slack-ruby-block-kit 0.10.0 → 0.14.1

data/lib/slack/block_kit/composition/option_group.rb

@@ -17,8 +17,8 @@ module Slack
           yield(self) if block_given?
         end
 
-        def option(text:, value:, emoji: nil)
-          @options << Option.new(text: text, value: value, emoji: emoji)
+        def option(text:, value:, emoji: nil, initial: false)
+          @options << Option.new(text: text, value: value, emoji: emoji, initial: initial)
 
           self
         end

data/lib/slack/block_kit/element/button.rb

@@ -9,9 +9,9 @@ module Slack
       #
       # https://api.slack.com/reference/messaging/block-elements#button
       class Button
-        TYPE = 'button'
+        include Composition::ConfirmationDialog::Confirmable
 
-        attr_accessor :confirm
+        TYPE = 'button'
 
         def initialize(text:, action_id:, style: nil, emoji: nil, url: nil, value: nil)
           @text = Composition::PlainText.new(text: text, emoji: emoji)
@@ -23,14 +23,6 @@ module Slack
           yield(self) if block_given?
         end
 
-        def confirmation_dialog
-          @confirm = Composition::ConfirmationDialog.new
-
-          yield(@confirm) if block_given?
-
-          @confirm
-        end
-
         def as_json(*)
           {
             type: TYPE,
@@ -39,7 +31,7 @@ module Slack
             url: @url,
             value: @value,
             style: @style,
-            confirm: @confirm&.as_json
+            confirm: confirm&.as_json
           }.compact
         end
       end

data/lib/slack/block_kit/element/channels_select.rb

@@ -13,9 +13,9 @@ module Slack
       #
       # https://api.slack.com/reference/messaging/block-elements#channel-select
       class ChannelsSelect
-        TYPE = 'channels_select'
+        include Composition::ConfirmationDialog::Confirmable
 
-        attr_accessor :confirm
+        TYPE = 'channels_select'
 
         def initialize(placeholder:, action_id:, initial: nil, emoji: nil)
           @placeholder = Composition::PlainText.new(text: placeholder, emoji: emoji)
@@ -25,21 +25,13 @@ module Slack
           yield(self) if block_given?
         end
 
-        def confirmation_dialog
-          @confirm = Composition::ConfirmationDialog.new
-
-          yield(@confirm) if block_given?
-
-          self
-        end
-
         def as_json(*)
           {
             type: TYPE,
             placeholder: @placeholder.as_json,
             action_id: @action_id,
             initial_channel: @initial_channel,
-            confirm: @confirm&.as_json
+            confirm: confirm&.as_json
           }.compact
         end
       end

data/lib/slack/block_kit/element/checkboxes.rb

@@ -8,56 +8,45 @@ module Slack
       #
       # https://api.slack.com/reference/messaging/block-elements#checkboxes
       class Checkboxes
-        TYPE = 'checkboxes'
+        include Composition::ConfirmationDialog::Confirmable
 
-        attr_accessor :confirm
+        TYPE = 'checkboxes'
 
         def initialize(action_id:)
           @action_id = action_id
           @options = []
-          @initial_options = []
-          @confirm = nil
 
           yield(self) if block_given?
         end
 
-        def option(value:, text:, description: nil)
+        def option(value:, text:, initial: false, description: nil)
           @options << Composition::Option.new(
             value: value,
             text: text,
-            description: description
-          )
-
-          self
-        end
-
-        def initial(value:, text:, description: nil)
-          @initial_options << Composition::Option.new(
-            value: value,
-            text: text,
-            description: description
+            description: description,
+            initial: initial
           )
 
           self
         end
 
-        def confirmation_dialog
-          @confirm = Composition::ConfirmationDialog.new
-
-          yield(@confirm) if block_given?
-
-          @confirm
-        end
-
         def as_json(*)
           {
             type: TYPE,
             action_id: @action_id,
             options: @options.map(&:as_json),
-            initial_options: @initial_options.any? ? @initial_options.map(&:as_json) : nil,
-            confirm: @confirm&.as_json
+            initial_options: initial_options&.map(&:as_json),
+            confirm: confirm&.as_json
           }.compact
         end
+
+        private
+
+        def initial_options
+          initial = @options.select(&:initial?)
+
+          initial.empty? ? nil : initial
+        end
       end
     end
   end

data/lib/slack/block_kit/element/conversations_select.rb

@@ -14,9 +14,9 @@ module Slack
       #
       # https://api.slack.com/reference/messaging/block-elements#conversation-select
       class ConversationsSelect
-        TYPE = 'conversations_select'
+        include Composition::ConfirmationDialog::Confirmable
 
-        attr_accessor :confirm
+        TYPE = 'conversations_select'
 
         def initialize(placeholder:, action_id:, initial: nil, emoji: nil)
           @placeholder = Composition::PlainText.new(text: placeholder, emoji: emoji)
@@ -27,14 +27,6 @@ module Slack
           yield(self) if block_given?
         end
 
-        def confirmation_dialog
-          @confirm = Composition::ConfirmationDialog.new
-
-          yield(@confirm) if block_given?
-
-          self
-        end
-
         def filter(only: nil,
                    exclude_external_shared_channels: nil,
                    exclude_bot_users: nil)
@@ -53,7 +45,7 @@ module Slack
             placeholder: @placeholder.as_json,
             action_id: @action_id,
             initial_conversation: @initial_conversation,
-            confirm: @confirm&.as_json,
+            confirm: confirm&.as_json,
             filter: @filter&.as_json
           }.compact
         end

data/lib/slack/block_kit/element/date_picker.rb

@@ -10,6 +10,8 @@ module Slack
       #
       # https://api.slack.com/reference/messaging/block-elements#datepicker
       class DatePicker
+        include Composition::ConfirmationDialog::Confirmable
+
         TYPE = 'datepicker'
 
         def initialize(action_id:, placeholder: nil, initial: nil, emoji: nil)
@@ -25,21 +27,13 @@ module Slack
           yield(self) if block_given?
         end
 
-        def confirmation_dialog
-          @confirm = Composition::ConfirmationDialog.new
-
-          yield(@confirm) if block_given?
-
-          self
-        end
-
         def as_json(*)
           {
             type: TYPE,
             action_id: @action_id,
             placeholder: @placeholder&.as_json,
             initial_date: @initial_date,
-            confirm: @confirm&.as_json
+            confirm: confirm&.as_json
           }.compact
         end
       end

data/lib/slack/block_kit/element/external_select.rb

@@ -19,28 +19,19 @@ module Slack
       #
       # https://api.slack.com/reference/messaging/block-elements#external-select
       class ExternalSelect
-        TYPE = 'external_select'
+        include Composition::ConfirmationDialog::Confirmable
 
-        attr_accessor :confirm
+        TYPE = 'external_select'
 
         def initialize(placeholder:, action_id:, initial: nil, min_query_length: nil, emoji: nil)
           @placeholder = Composition::PlainText.new(text: placeholder, emoji: emoji)
           @action_id = action_id
           @initial_option = initial
           @min_query_length = min_query_length
-          @confirm = nil
 
           yield(self) if block_given?
         end
 
-        def confirmation_dialog
-          @confirm = Composition::ConfirmationDialog.new
-
-          yield(@confirm) if block_given?
-
-          self
-        end
-
         def as_json(*)
           {
             type: TYPE,
@@ -48,7 +39,7 @@ module Slack
             action_id: @action_id,
             initial_option: @initial_option&.as_json,
             min_query_length: @min_query_length,
-            confirm: @confirm&.as_json
+            confirm: confirm&.as_json
           }.compact
         end
       end

data/lib/slack/block_kit/element/multi_channels_select.rb

@@ -13,35 +13,26 @@ module Slack
       #
       # https://api.slack.com/reference/block-kit/block-elements#channel_multi_select
       class MultiChannelsSelect
-        TYPE = 'multi_channels_select'
+        include Composition::ConfirmationDialog::Confirmable
 
-        attr_accessor :confirm
+        TYPE = 'multi_channels_select'
 
         def initialize(placeholder:, action_id:, initial: nil, emoji: nil, max_selected_items: nil)
           @placeholder = Composition::PlainText.new(text: placeholder, emoji: emoji)
           @action_id = action_id
           @initial_channels = initial
-          @confirm = nil
           @max_selected_items = max_selected_items
 
           yield(self) if block_given?
         end
 
-        def confirmation_dialog
-          @confirm = Composition::ConfirmationDialog.new
-
-          yield(@confirm) if block_given?
-
-          self
-        end
-
         def as_json(*)
           {
             type: TYPE,
             placeholder: @placeholder.as_json,
             action_id: @action_id,
             initial_channels: @initial_channels,
-            confirm: @confirm&.as_json,
+            confirm: confirm&.as_json,
             max_selected_items: @max_selected_items
           }.compact
         end

data/lib/slack/block_kit/element/multi_conversations_select.rb

@@ -14,29 +14,20 @@ module Slack
       #
       # https://api.slack.com/reference/block-kit/block-elements#conversation_multi_select
       class MultiConversationsSelect
-        TYPE = 'multi_conversations_select'
+        include Composition::ConfirmationDialog::Confirmable
 
-        attr_accessor :confirm
+        TYPE = 'multi_conversations_select'
 
         def initialize(placeholder:, action_id:, initial: nil, emoji: nil, max_selected_items: nil)
           @placeholder = Composition::PlainText.new(text: placeholder, emoji: emoji)
           @action_id = action_id
           @initial_conversations = initial
-          @confirm = nil
           @max_selected_items = max_selected_items
           @filter = nil
 
           yield(self) if block_given?
         end
 
-        def confirmation_dialog
-          @confirm = Composition::ConfirmationDialog.new
-
-          yield(@confirm) if block_given?
-
-          self
-        end
-
         def filter(only: nil,
                    exclude_external_shared_channels: nil,
                    exclude_bot_users: nil)
@@ -55,7 +46,7 @@ module Slack
             placeholder: @placeholder.as_json,
             action_id: @action_id,
             initial_conversations: @initial_conversations,
-            confirm: @confirm&.as_json,
+            confirm: confirm&.as_json,
             max_selected_items: @max_selected_items,
             filter: @filter&.as_json
           }.compact

data/lib/slack/block_kit/element/multi_external_select.rb

@@ -19,9 +19,9 @@ module Slack
       #
       # https://api.slack.com/reference/block-kit/block-elements#external_multi_select
       class MultiExternalSelect
-        TYPE = 'multi_external_select'
+        include Composition::ConfirmationDialog::Confirmable
 
-        attr_accessor :confirm
+        TYPE = 'multi_external_select'
 
         def initialize(placeholder:, action_id:,
                        initial: nil, min_query_length: nil, emoji: nil, max_selected_items: nil)
@@ -30,20 +30,11 @@ module Slack
           @action_id = action_id
           @initial_options = initial
           @min_query_length = min_query_length
-          @confirm = nil
           @max_selected_items = max_selected_items
 
           yield(self) if block_given?
         end
 
-        def confirmation_dialog
-          @confirm = Composition::ConfirmationDialog.new
-
-          yield(@confirm) if block_given?
-
-          self
-        end
-
         def as_json(*)
           {
             type: TYPE,
@@ -51,7 +42,7 @@ module Slack
             action_id: @action_id,
             initial_options: @initial_options&.map(&:as_json),
             min_query_length: @min_query_length,
-            confirm: @confirm&.as_json,
+            confirm: confirm&.as_json,
             max_selected_items: @max_selected_items
           }.compact
         end

data/lib/slack/block_kit/element/multi_static_select.rb

@@ -13,37 +13,30 @@ module Slack
       #
       # https://api.slack.com/reference/block-kit/block-elements#static_multi_select
       class MultiStaticSelect
+        include Composition::ConfirmationDialog::Confirmable
+
         TYPE = 'multi_static_select'
 
-        attr_accessor :confirm, :options, :option_groups, :initial_options
+        attr_accessor :options, :option_groups
 
         def initialize(placeholder:, action_id:, emoji: nil, max_selected_items: nil)
           @placeholder = Composition::PlainText.new(text: placeholder, emoji: emoji)
           @action_id = action_id
-          @confirm = nil
           @max_selected_items = max_selected_items
 
           @options = nil
           @option_groups = nil
-          @initial_options = nil
 
           yield(self) if block_given?
         end
 
-        def confirmation_dialog
-          @confirm = Composition::ConfirmationDialog.new
-
-          yield(@confirm) if block_given?
-
-          self
-        end
-
-        def option(value:, text:, emoji: nil)
+        def option(value:, text:, initial: false, emoji: nil)
           @options ||= []
           @options << Composition::Option.new(
             value: value,
             text: text,
-            emoji: emoji
+            emoji: emoji,
+            initial: initial
           )
 
           self
@@ -60,17 +53,6 @@ module Slack
           self
         end
 
-        def initial(value:, text:, emoji: nil)
-          @initial_options ||= []
-          @initial_options << Composition::Option.new(
-            value: value,
-            text: text,
-            emoji: emoji
-          )
-
-          self
-        end
-
         def as_json(*)
           {
             type: TYPE,
@@ -78,11 +60,21 @@ module Slack
             action_id: @action_id,
             options: @options&.map(&:as_json),
             option_groups: @option_groups&.map(&:as_json),
-            initial_options: @initial_options&.map(&:as_json),
-            confirm: @confirm&.as_json,
+            initial_options: initial_options&.map(&:as_json),
+            confirm: confirm&.as_json,
             max_selected_items: @max_selected_items
           }.compact
         end
+
+        private
+
+        def initial_options
+          all_options = options || option_groups&.flat_map(&:options)
+
+          initial = all_options&.select(&:initial?)
+
+          initial&.empty? ? nil : initial
+        end
       end
     end
   end