OpenProject is the leading open source project management software for product, project and portfolio management. A powerful Jira alternative with agile planning, issue tracking, roadmaps, Gantt charts, time tracking, collaboration features, and more. Available on premises or in the cloud. ⭐ Star us on GitHub
Ruby agile-developmentangularbcfboardsbug-trackerganttgantt-chartifcissue-trackerjira-alternativekanbanopenprojectproduct-managementproject-managementproject-planningroadmaprubyscrumtimelineworkflows
Add section autocompleter and refresh logic
Mir Bhatiac6966738bb93
diff --git a/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb b/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erbindex 55e17278d3b..e0a35e54cf0 100644--- a/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb+++ b/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb@@ -4,7 +4,8 @@id: "add-work-package-to-meeting-form",model: @meeting_agenda_item,method: :post,- url: work_package_meeting_agenda_items_path(@work_package)+ url: work_package_meeting_agenda_items_path(@work_package),+ data: data_attributes) do |f|flex_layout(mb: 3) do |flex|flex.with_row do@@ -12,10 +13,16 @@render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { @base_errors.join("\n") }endend- flex.with_row do+ flex.with_row(mb: 3) do+ render(Primer::Beta::Text.new) { I18n.t("text_add_work_package_to_meeting_form") }+ end+ flex.with_row(mb: 3) dorender(MeetingAgendaItem::MeetingForm.new(f, wrapper_id: "add-work-package-to-meeting-dialog"))end- flex.with_row(mt: 3) do+ flex.with_row(mb: 3) do+ render(Meeting::AddToSection.new(f, wrapper_id: "add-work-package-to-meeting-dialog"))+ end+ flex.with_row dorender(MeetingAgendaItem::Notes.new(f))endenddiff --git a/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.rb b/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.rbindex 0f55d0fee19..cbe4b797d49 100644--- a/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.rb+++ b/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.rb@@ -40,5 +40,15 @@ module WorkPackageMeetingsTab@meeting_agenda_item = meeting_agenda_item || MeetingAgendaItem.new(work_package: @work_package)@base_errors = base_errorsend++ private++ def data_attributes+ {+ controller: "refresh-on-form-changes",+ "refresh-on-form-changes-target": "form",+ "refresh-on-form-changes-turbo-stream-url-value": refresh_form_work_package_meeting_agenda_items_path(@work_package)+ }+ endendenddiff --git a/modules/meeting/app/controllers/work_package_meetings_tab_controller.rb b/modules/meeting/app/controllers/work_package_meetings_tab_controller.rbindex 2634fdebc48..985721b2a92 100644--- a/modules/meeting/app/controllers/work_package_meetings_tab_controller.rb+++ b/modules/meeting/app/controllers/work_package_meetings_tab_controller.rb@@ -69,7 +69,7 @@ class WorkPackageMeetingsTabController < ApplicationControllerwork_package_id: @work_package.id,presenter_id: current_user.id,item_type: MeetingAgendaItem::ITEM_TYPES[:work_package],- meeting_section_id: backlog_id+ meeting_section_id: params[:meeting_agenda_item][:meeting_section_id]))@@ -87,6 +87,30 @@ class WorkPackageMeetingsTabController < ApplicationControllerrespond_with_turbo_streamsend+ def refresh_form+ @meeting_agenda_item = MeetingAgendaItem.new(+ meeting: Meeting.find(params[:meeting_agenda_item][:meeting_id]),+ notes: params[:meeting_agenda_item][:notes]+ )++ call = MeetingAgendaItems::SetAttributesService.new(+ user: current_user,+ model: @meeting_agenda_item,+ contract_class: EmptyContract+ ).call++ meeting_agenda_item = call.result++ update_via_turbo_stream(+ component: WorkPackageMeetingsTab::AddWorkPackageToMeetingFormComponent.new(+ work_package: @work_package,+ meeting_agenda_item: meeting_agenda_item+ )+ )++ respond_with_turbo_streams+ end+privatedef set_work_packagediff --git a/modules/meeting/app/forms/meeting/add_to_section.rb b/modules/meeting/app/forms/meeting/add_to_section.rbnew file mode 100644index 00000000000..9d1443a28e5--- /dev/null+++ b/modules/meeting/app/forms/meeting/add_to_section.rb@@ -0,0 +1,107 @@+# frozen_string_literal: true++#-- copyright+# OpenProject is an open source project management software.+# Copyright (C) the OpenProject GmbH+#+# This program is free software; you can redistribute it and/or+# modify it under the terms of the GNU General Public License version 3.+#+# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:+# Copyright (C) 2006-2013 Jean-Philippe Lang+# Copyright (C) 2010-2013 the ChiliProject Team+#+# This program is free software; you can redistribute it and/or+# modify it under the terms of the GNU General Public License+# as published by the Free Software Foundation; either version 2+# of the License, or (at your option) any later version.+#+# This program is distributed in the hope that it will be useful,+# but WITHOUT ANY WARRANTY; without even the implied warranty of+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the+# GNU General Public License for more details.+#+# You should have received a copy of the GNU General Public License+# along with this program; if not, write to the Free Software+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.+#+# See COPYRIGHT and LICENSE files for more details.+#++++class Meeting::AddToSection < ApplicationForm+ form do |meeting_form|+ meeting_form.autocompleter(+ name: :meeting_section_id,+ label: I18n.t("label_add_work_package_to_meeting_section_label"),+ caption: I18n.t("label_section_selection_caption"),+ input_width: :large,+ autocomplete_options: {+ decorated: true,+ defaultData: false,+ multiple: false,+ focus_directly: false,+ disabled: meeting.blank?,+ placeholder: placeholder_text,+ append_to: append_to_container+ }+ ) do |select|+ items.each do |item|+ select.option(+ value: item.id,+ label: option_title(item),+ selected: preselected_option.present? && item.id == preselected_option[:id]+ )+ end+ end+ end++ def initialize(wrapper_id: nil)+ super()++ @wrapper_id = wrapper_id+ end++ private++ delegate :meeting, to: :model++ def append_to_container+ @wrapper_id.nil? ? "body" : "##{@wrapper_id}"+ end++ def items+ items = []+ items.concat(meeting.sections) unless meeting.blank? || any_non_backlog_sections?+ items.push(meeting.backlog) if meeting.present?++ items+ end++ def option_title(item)+ return I18n.t("meeting_section.untitled_title") if item.title.blank?+ return I18n.t("label_series_backlog") if item.backlog? && meeting.recurring?++ item.title+ end++ def preselected_option+ return if meeting.blank?++ if meeting.recurring?+ without_backlog = items.reject(&:backlog?)+ item = without_backlog.last+ else+ item = meeting.backlog+ end++ item+ end++ def any_non_backlog_sections?+ meeting.sections.none? || (meeting.sections.one? && meeting.sections.first.title.blank?)+ end++ def placeholder_text+ I18n.t("placeholder_section_select_meeting_first") if meeting.blank?+ end+enddiff --git a/modules/meeting/app/forms/meeting_agenda_item/meeting_form.rb b/modules/meeting/app/forms/meeting_agenda_item/meeting_form.rbindex 8a4a7699bab..6b4a25c1efc 100644--- a/modules/meeting/app/forms/meeting_agenda_item/meeting_form.rb+++ b/modules/meeting/app/forms/meeting_agenda_item/meeting_form.rb@@ -39,6 +39,7 @@ class MeetingAgendaItem::MeetingForm < ApplicationFormcaption: I18n.t("label_meeting_selection_caption"),autocomplete_options: {component: "opce-meeting-autocompleter",+ hiddenFieldAction: "change->refresh-on-form-changes#triggerTurboStream",items: meeting_options,group_by: "group_label",focus_directly: true,@@ -46,17 +47,23 @@ class MeetingAgendaItem::MeetingForm < ApplicationFormbindLabel: "name",bindValue: "id",multiple: false,- append_to: append_to_container+ append_to: append_to_container,+ model: meeting_options.detect { |option| option[:id] == model.meeting_id },+ inputValue: model.meeting_id,+ virtualScroll: false})enddef initialize(disabled: false, wrapper_id: nil)super()+@disabled = disabled@wrapper_id = wrapper_idend+ private+def meeting_optionsmeetings = MeetingAgendaItems::CreateContract.assignable_meetings(User.current)diff --git a/modules/meeting/app/services/group_meetings_service.rb b/modules/meeting/app/services/group_meetings_service.rbindex c9c5af5135f..95635204d71 100644--- a/modules/meeting/app/services/group_meetings_service.rb+++ b/modules/meeting/app/services/group_meetings_service.rb@@ -81,7 +81,7 @@ class GroupMeetingsServicegroupsend- # Flattens groups into autocompleter options+ # Flatten groups into autocompleter optionsdef build_optionsgroup_meetings.flat_map do |key, meetings|label = I18n.t("label_meeting_index_#{key}")diff --git a/modules/meeting/config/locales/en.yml b/modules/meeting/config/locales/en.ymlindex f6ec6b0c397..cf8228c9bf4 100644--- a/modules/meeting/config/locales/en.yml+++ b/modules/meeting/config/locales/en.yml@@ -610,9 +610,13 @@ en:text_meeting_not_editable_anymore: "This meeting is not editable anymore."text_meeting_not_present_anymore: "This meeting was deleted. Please select another meeting."- label_add_work_package_to_meeting_dialog_title: "Add work package to meeting"+ label_add_work_package_to_meeting_dialog_title: "Select meeting"+ label_add_work_package_to_meeting_section_label: "Add to section"label_add_work_package_to_meeting_dialog_button: "Add to meeting"- label_meeting_selection_caption: "It's only possible to add this work package to upcoming or ongoing open meetings."+ label_meeting_selection_caption: "It is only possible to add this work package to an upcoming or an ongoing meeting."+ label_section_selection_caption: "Choose a particular section of the agenda or add it to the backlog."+ placeholder_section_select_meeting_first: "Meeting selection is required first"+ text_add_work_package_to_meeting_form: "The work package will be added to the selected meeting or backlog as an agenda item."text_add_work_package_to_meeting_description: "A work package can be added to one or multiple meetings for discussion. Any notes concerning it are also visible here."text_agenda_item_no_notes: "No notes provided"diff --git a/modules/meeting/config/routes.rb b/modules/meeting/config/routes.rbindex 76c56540691..986ba535d40 100644--- a/modules/meeting/config/routes.rb+++ b/modules/meeting/config/routes.rb@@ -82,6 +82,7 @@ Rails.application.routes.draw docollection doget :dialog, controller: "work_package_meetings_tab", action: :add_work_package_to_meeting_dialogpost :create, controller: "work_package_meetings_tab", action: :add_work_package_to_meeting+ get :refresh_form, controller: "work_package_meetings_tab", action: :refresh_formendendenddiff --git a/modules/meeting/lib/open_project/meeting/engine.rb b/modules/meeting/lib/open_project/meeting/engine.rbindex 76beb753738..f006219388b 100644--- a/modules/meeting/lib/open_project/meeting/engine.rb+++ b/modules/meeting/lib/open_project/meeting/engine.rb@@ -67,7 +67,7 @@ module OpenProject::Meetingdetails_dialog update_details toggle_notifications],recurring_meetings: %i[edit cancel_edit update update_title details_dialog update_detailsnotify end_series end_series_dialog],- work_package_meetings_tab: %i[add_work_package_to_meeting_dialog add_work_package_to_meeting],+ work_package_meetings_tab: %i[add_work_package_to_meeting_dialog add_work_package_to_meeting refresh_form],meeting_participants: %i[create destroy mark_all_attended toggle_attendance manage_participants_dialog]},permissible_on: :project,