From 578c2214507bc13a411096f673a9814552eb670f Mon Sep 17 00:00:00 2001 From: eugielimpin Date: Thu, 10 Mar 2022 22:10:10 +0800 Subject: [PATCH] Use checkboxes instead of multi select input --- app/views/admin/broadcast_messages/_form.html.haml | 9 ++++----- spec/features/admin/admin_broadcast_messages_spec.rb | 12 ++++++------ 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/app/views/admin/broadcast_messages/_form.html.haml b/app/views/admin/broadcast_messages/_form.html.haml index d81ebb8a2bbbe9..3e698f0508cd38 100644 --- a/app/views/admin/broadcast_messages/_form.html.haml +++ b/app/views/admin/broadcast_messages/_form.html.haml @@ -16,7 +16,7 @@ - else = _('Your message here') -= form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form js-quick-submit js-requires-input'} do |f| += gitlab_ui_form_for [:admin, @broadcast_message], html: { class: 'broadcast-message-form js-quick-submit js-requires-input'} do |f| = form_errors(@broadcast_message) .form-group.row.mt-4 @@ -52,15 +52,14 @@ .col-sm-2.col-form-label.pt-0 = f.label :starts_at, _("Dismissable") .col-sm-10 - = f.check_box :dismissable - = f.label :dismissable do - = _('Allow users to dismiss the broadcast message') + = f.gitlab_ui_checkbox_component :dismissable, _('Allow users to dismiss the broadcast message') - if Feature.enabled?(:role_targeted_broadcast_messages, default_enabled: :yaml) .form-group.row .col-sm-2.col-form-label = f.label :target_access_levels, _('Target roles') .col-sm-10 - = f.select :target_access_levels, target_access_level_options, { include_hidden: false }, multiple: true, class: 'form-control' + - target_access_level_options.each do |human_access_level, access_level| + = f.gitlab_ui_checkbox_component :target_access_levels, human_access_level, checked_value: access_level, unchecked_value: false, checkbox_options: { multiple: true } .form-text.text-muted = _('The broadcast message displays only to users in projects and groups who have these roles.') .form-group.row.js-toggle-colors-container.toggle-colors.hide diff --git a/spec/features/admin/admin_broadcast_messages_spec.rb b/spec/features/admin/admin_broadcast_messages_spec.rb index 94111841562eeb..e40f4c4678c7c1 100644 --- a/spec/features/admin/admin_broadcast_messages_spec.rb +++ b/spec/features/admin/admin_broadcast_messages_spec.rb @@ -26,8 +26,8 @@ fill_in 'broadcast_message_target_path', with: '*/user_onboarded' fill_in 'broadcast_message_font', with: '#b94a48' select Date.today.next_year.year, from: 'broadcast_message_ends_at_1i' - select 'Guest', from: 'broadcast_message_target_access_levels' - select 'Owner', from: 'broadcast_message_target_access_levels' + check 'Guest' + check 'Owner' click_button 'Add broadcast message' expect(page).to have_current_path admin_broadcast_messages_path, ignore_query: true @@ -43,9 +43,9 @@ fill_in 'broadcast_message_target_path', with: '*/user_onboarded' select 'Notification', from: 'broadcast_message_broadcast_type' select Date.today.next_year.year, from: 'broadcast_message_ends_at_1i' - select 'Reporter', from: 'broadcast_message_target_access_levels' - select 'Developer', from: 'broadcast_message_target_access_levels' - select 'Maintainer', from: 'broadcast_message_target_access_levels' + check 'Reporter' + check 'Developer' + check 'Maintainer' click_button 'Add broadcast message' expect(page).to have_current_path admin_broadcast_messages_path, ignore_query: true @@ -59,7 +59,7 @@ it 'edit an existing broadcast message' do click_link 'Edit' fill_in 'broadcast_message_message', with: 'Application update RIGHT NOW' - select 'Reporter', from: 'broadcast_message_target_access_levels' + check 'Reporter' click_button 'Update broadcast message' expect(page).to have_current_path admin_broadcast_messages_path, ignore_query: true -- GitLab