[#48114] Create Meetings outside of a Project #12783

aaron-contreras · 2023-06-05T14:46:37Z

See: https://community.openproject.org/work_packages/48114

modules/meeting/config/routes.rb

dombesz

I'm not entirely sure if the two controllers are required, to simplify the code we could create a meetings_scope like:

def meetings
  @projects = Project.allowed_to(User.current, :view_meetings)
  @projects = @projects.where(project_id:) if project_id   
  @meetings = Meeting.where(project: projects).from_today
end

This could be used in both of the index pages, without further ado.
The scope can be used to build the Meeting in the create action and it will automatically assign the project_id:

def create
  @meeting = @meetings.build(meeting_params)
end

Submitting the meeting form without selecting a project results in an error page.

modules/meeting/app/controllers/projects/meetings_controller.rb

app/views/layouts/_common_head.html.erb

app/views/layouts/base.html.erb

modules/meeting/app/controllers/meetings_controller.rb

aaron-contreras · 2023-07-07T15:05:33Z

As discussed, I've moved the PR back to a draft state in order to modify the form implementation to use turbo-streams instead of turbo-frames.

Thanks for the catch Attila!

Adds a `turbo-frame` elemenet that dynamically fetches the participants section upon a change to the selected project from the dropdown.

Thanks :)

…eter` **NOTE**: `typeToSearchText` was not an accepted option by `ng-select` according to its docs. Removing it as it's dead code and the `placeholder` property was already provided and this is where the "Type to search" placeholder was actually being fetched from.

As suggested by Jonas, this is much cleaner and extensible of an approach. The `src` attribute hack of the prior `turbo-frame` approach is not really of my liking for this anymore. As a side-benefit, this is quite a reusable Stimulus action now.

ulferts

The things I am complaining about are leftovers of the pervious attempt. Feel free to merge this PR yourself, @aaron-contreras after those have been removed since the overall change is good.

ulferts · 2023-07-17T07:25:32Z

modules/meeting/app/helpers/meetings_helper.rb

+    request.path == new_meeting_path
+  end
+
+  def options_for_project_selection


This can now be removed since the functionality is now provided by the filters passed into the autocompleter.

ulferts · 2023-07-17T07:28:19Z

modules/meeting/config/locales/en.yml

@@ -99,6 +101,8 @@ en:

  project_module_meetings: "Meetings"

+  project_selection_placeholder: "Select project"


Can be removed since the autocompleter is implemented in Angular now.

ulferts · 2023-07-17T07:39:03Z

modules/meeting/app/controllers/meetings_controller.rb

-  rescue ActiveRecord::RecordNotFound
-    render_404
-  end
-


Always good to get rid of those controller specific overrides if they are not needed. 🙇

ulferts · 2023-07-17T07:44:25Z

modules/meeting/lib/open_project/meeting/engine.rb

@@ -40,7 +40,10 @@ class Engine < ::Rails::Engine
      project_module :meetings do
        permission :view_meetings, meetings: %i[index show], meeting_agendas: %i[history show diff],
                                   meeting_minutes: %i[history show diff]
-        permission :create_meetings, { meetings: %i[new create copy] }, require: :member
+        permission :create_meetings,
+                   { meetings: %i[new participants_section create copy] },


With the change to turbo-stream, there no longer is a participants_section method added to the controller so this addition can be reverted.

…of-a-project

aaron-contreras force-pushed the implementation/48114-create-meetings-outside-of-a-project branch 2 times, most recently from f192fd8 to a1dbbaf Compare June 5, 2023 23:18

aaron-contreras self-assigned this Jun 6, 2023

aaron-contreras force-pushed the implementation/48114-create-meetings-outside-of-a-project branch 2 times, most recently from d0df4fe to 74bd38d Compare June 7, 2023 15:29

aaron-contreras marked this pull request as ready for review June 7, 2023 15:47

aaron-contreras requested a review from a team June 7, 2023 15:49

aaron-contreras removed their assignment Jun 7, 2023

aaron-contreras added the needs review label Jun 7, 2023

aaron-contreras force-pushed the implementation/48114-create-meetings-outside-of-a-project branch 2 times, most recently from 8d5382f to 20a883f Compare June 7, 2023 18:17

aaron-contreras removed the request for review from a team June 8, 2023 20:49

aaron-contreras marked this pull request as draft June 8, 2023 20:49

aaron-contreras force-pushed the implementation/48114-create-meetings-outside-of-a-project branch 2 times, most recently from f158c9c to 49e0ca8 Compare June 8, 2023 22:19

aaron-contreras marked this pull request as ready for review June 8, 2023 22:20

aaron-contreras requested a review from a team June 8, 2023 22:20

lindenthal added the pullpreview label Jun 9, 2023

dombesz requested review from dombesz and removed request for a team June 12, 2023 09:10

dombesz reviewed Jun 15, 2023

View reviewed changes

modules/meeting/config/routes.rb Show resolved Hide resolved

dombesz requested changes Jun 15, 2023

View reviewed changes

modules/meeting/app/controllers/projects/meetings_controller.rb Outdated Show resolved Hide resolved

aaron-contreras force-pushed the implementation/48114-create-meetings-outside-of-a-project branch 2 times, most recently from 5c26e2f to 3116e45 Compare June 16, 2023 14:14

aaron-contreras removed the needs review label Jun 16, 2023

aaron-contreras requested a review from dombesz June 16, 2023 14:32

aaron-contreras force-pushed the implementation/48114-create-meetings-outside-of-a-project branch from 3116e45 to ce7da24 Compare June 16, 2023 14:34

aaron-contreras commented Jun 16, 2023

View reviewed changes

app/views/layouts/_common_head.html.erb Outdated Show resolved Hide resolved

aaron-contreras commented Jun 16, 2023

View reviewed changes

app/views/layouts/base.html.erb Outdated Show resolved Hide resolved

aaron-contreras commented Jun 16, 2023

View reviewed changes

modules/meeting/app/controllers/meetings_controller.rb Outdated Show resolved Hide resolved

aaron-contreras force-pushed the implementation/48114-create-meetings-outside-of-a-project branch from 1a4b5b3 to 70de795 Compare July 5, 2023 17:08

aaron-contreras added the needs review label Jul 5, 2023

aaron-contreras requested a review from ulferts July 5, 2023 18:35

aaron-contreras force-pushed the implementation/48114-create-meetings-outside-of-a-project branch 2 times, most recently from 75606d8 to 8c1467e Compare July 7, 2023 15:04

aaron-contreras marked this pull request as draft July 7, 2023 15:04

aaron-contreras removed the needs review label Jul 7, 2023

aaron-contreras added 10 commits July 7, 2023 11:15

[REFACTOR] Prefix project-scoped routes with project

b99909c

Fix typo on Stimulus RefreshOnFormChangesController

dd0f655

Add Create Global Meetings Page

ad1a9d5

Refactor/add spec coverage

5ad5c6a

Remove dead code

0d3b9f5

Thanks for the catch Attila!

Spice things up with Hotwire ;)

c15c2e5

Adds a `turbo-frame` elemenet that dynamically fetches the participants section upon a change to the selected project from the dropdown.

Address Jens's PR feedback

2fc089e

Thanks :)

Appease Rubocop!

f7ae9fb

Fix specs that didn't require a project to be present

afe7712

aaron-contreras force-pushed the implementation/48114-create-meetings-outside-of-a-project branch 2 times, most recently from fd9693d to d971435 Compare July 7, 2023 16:30

aaron-contreras force-pushed the implementation/48114-create-meetings-outside-of-a-project branch from d971435 to 4309282 Compare July 7, 2023 16:52

aaron-contreras added the needs review label Jul 7, 2023

aaron-contreras marked this pull request as ready for review July 10, 2023 10:30

ulferts requested changes Jul 17, 2023

View reviewed changes

aaron-contreras and others added 2 commits July 17, 2023 09:21

Remove leftover code from a previous implementation

7c6dfb3

Merge branch 'dev' into implementation/48114-create-meetings-outside-…

32e6f9e

…of-a-project

aaron-contreras merged commit 7cdc930 into dev Jul 17, 2023
12 checks passed

aaron-contreras deleted the implementation/48114-create-meetings-outside-of-a-project branch July 17, 2023 14:42

github-actions bot removed the pullpreview label Jul 17, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[#48114] Create Meetings outside of a Project #12783

[#48114] Create Meetings outside of a Project #12783

aaron-contreras commented Jun 5, 2023

dombesz left a comment •

edited

Loading

aaron-contreras commented Jul 7, 2023

ulferts left a comment

ulferts Jul 17, 2023

ulferts Jul 17, 2023

ulferts Jul 17, 2023

ulferts Jul 17, 2023

		@@ -99,6 +101,8 @@ en:

		project_module_meetings: "Meetings"

		project_selection_placeholder: "Select project"

[#48114] Create Meetings outside of a Project #12783

[#48114] Create Meetings outside of a Project #12783

Conversation

aaron-contreras commented Jun 5, 2023

dombesz left a comment • edited Loading

Choose a reason for hiding this comment

aaron-contreras commented Jul 7, 2023

ulferts left a comment

Choose a reason for hiding this comment

ulferts Jul 17, 2023

Choose a reason for hiding this comment

ulferts Jul 17, 2023

Choose a reason for hiding this comment

ulferts Jul 17, 2023

Choose a reason for hiding this comment

ulferts Jul 17, 2023

Choose a reason for hiding this comment

dombesz left a comment •

edited

Loading