[pull] dev from opf:dev

.github/dependabot.yml

@@ -15,6 +15,9 @@ updates:
       angular:
         patterns:
           - '@angular*'
+      fullcalendar:
+        patterns:
+          - '@fullcalendar*'          
   - package-ecosystem: "bundler"
     directory: "/"
     schedule:

.rubocop.yml

@@ -27,6 +27,9 @@ AllCops:
   Exclude:
     - '**/node_modules/**/*'
 
+FactoryBot/ConsistentParenthesesStyle:
+  Enabled: false
+
 FactoryBot/SyntaxMethods:
   Enabled: true
 

Gemfile

@@ -57,7 +57,7 @@ gem 'friendly_id', '~> 5.5.0'
 
 gem 'acts_as_list', '~> 1.1.0'
 gem 'acts_as_tree', '~> 2.9.0'
-gem 'awesome_nested_set', '~> 3.5.0'
+gem 'awesome_nested_set', '~> 3.6.0'
 gem 'closure_tree', '~> 7.4.0'
 gem 'rubytree', '~> 2.0.0'
 # Only used in down migrations now.
@@ -157,7 +157,7 @@ gem 'md_to_pdf', git: 'https://github.com/opf/md-to-pdf', ref: 'cc286655dfa2ea2b
 # prawn implicitly depends on matrix gem no longer in ruby core with 3.1
 gem 'matrix', '~> 0.4.2'
 
-gem 'meta-tags', '~> 2.18.0'
+gem 'meta-tags', '~> 2.19.0'
 
 gem "paper_trail", "~> 12.3"
 
@@ -364,6 +364,6 @@ gemfiles.each do |file|
   send(:eval_gemfile, file) if File.readable?(file)
 end
 
-gem "openproject-primer_view_components", '~>0.11.0'
+gem "openproject-primer_view_components", '~>0.12.1'
 gem "openproject-octicons", '~>19.7.0'
 gem "openproject-octicons_helper", '~>19.7.0'

Gemfile.lock

@@ -187,7 +187,7 @@ PATH
   remote: modules/two_factor_authentication
   specs:
     openproject-two_factor_authentication (1.0.0)
-      aws-sdk-sns (~> 1.66.0)
+      aws-sdk-sns (~> 1.67.0)
       messagebird-rest (~> 1.4.2)
       rotp (~> 6.1)
 
@@ -299,32 +299,32 @@ GEM
     afm (0.2.2)
     airbrake (13.0.3)
       airbrake-ruby (~> 6.0)
-    airbrake-ruby (6.2.1)
+    airbrake-ruby (6.2.2)
       rbtree3 (~> 0.6)
-    appsignal (3.4.12)
+    appsignal (3.4.13)
       rack
     ast (2.4.2)
     attr_required (1.0.1)
     auto_strip_attributes (2.6.0)
       activerecord (>= 4.0)
-    awesome_nested_set (3.5.0)
-      activerecord (>= 4.0.0, < 7.1)
+    awesome_nested_set (3.6.0)
+      activerecord (>= 4.0.0, < 7.2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.831.0)
-    aws-sdk-core (3.185.0)
+    aws-partitions (1.834.0)
+    aws-sdk-core (3.185.1)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.71.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-kms (1.72.0)
+      aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
     aws-sdk-s3 (1.136.0)
       aws-sdk-core (~> 3, >= 3.181.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
-    aws-sdk-sns (1.66.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-sns (1.67.0)
+      aws-sdk-core (~> 3, >= 3.184.0)
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.6.0)
       aws-eventstream (~> 1, >= 1.0.2)
@@ -450,7 +450,7 @@ GEM
       rainbow
       rubocop
       smart_properties
-    erblint-github (0.4.1)
+    erblint-github (0.5.0)
     erubi (1.12.0)
     escape_utils (1.3.0)
     et-orbi (1.2.7)
@@ -520,7 +520,7 @@ GEM
       retriable (>= 2.0, < 4.a)
       rexml
       webrick
-    google-apis-gmail_v1 (0.33.0)
+    google-apis-gmail_v1 (0.34.0)
       google-apis-core (>= 0.11.0, < 2.a)
     googleauth (1.8.1)
       faraday (>= 0.17.3, < 3.a)
@@ -588,7 +588,7 @@ GEM
     language_server-protocol (3.17.0.3)
     launchy (2.5.2)
       addressable (~> 2.8)
-    lefthook (1.5.0)
+    lefthook (1.5.2)
     letter_opener (1.8.1)
       launchy (>= 2.2, < 3)
     listen (3.8.0)
@@ -603,7 +603,7 @@ GEM
       activesupport (>= 4)
       railties (>= 4)
       request_store (~> 1.0)
-    loofah (2.21.3)
+    loofah (2.21.4)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lookbook (2.1.1)
@@ -626,12 +626,12 @@ GEM
     marcel (1.0.2)
     matrix (0.4.2)
     messagebird-rest (1.4.2)
-    meta-tags (2.18.0)
-      actionpack (>= 3.2.0, < 7.1)
+    meta-tags (2.19.0)
+      actionpack (>= 3.2.0, < 7.2)
     method_source (1.0.0)
     mime-types (3.5.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2023.0808)
+    mime-types-data (3.2023.1003)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.4)
@@ -642,7 +642,7 @@ GEM
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.2)
       mustermann (>= 1.0.0)
-    net-imap (0.3.7)
+    net-imap (0.4.0)
       date
       net-protocol
     net-ldap (0.18.0)
@@ -680,7 +680,7 @@ GEM
       actionview
       openproject-octicons (= 19.7.0)
       railties
-    openproject-primer_view_components (0.11.0)
+    openproject-primer_view_components (0.12.1)
       actionview (>= 5.0.0)
       activesupport (>= 5.0.0)
       openproject-octicons (>= 19.7.0)
@@ -693,9 +693,9 @@ GEM
       activerecord (>= 5.2)
       request_store (~> 1.1)
     parallel (1.23.0)
-    parallel_tests (4.2.2)
+    parallel_tests (4.3.0)
       parallel
-    parser (3.2.2.3)
+    parser (3.2.2.4)
       ast (~> 2.4.1)
       racc
     pdf-core (0.9.0)
@@ -814,16 +814,16 @@ GEM
       psych (>= 4.0.0)
     recaptcha (5.15.0)
     redcarpet (3.6.0)
-    regexp_parser (2.8.1)
-    reline (0.3.8)
+    regexp_parser (2.8.2)
+    reline (0.3.9)
       io-console (~> 0.5)
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     request_store (1.5.1)
       rack (>= 1.4)
-    responders (3.1.0)
+    responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
     retriable (3.1.2)
@@ -856,12 +856,12 @@ GEM
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
     rspec-support (3.12.1)
-    rubocop (1.56.4)
+    rubocop (1.57.0)
       base64 (~> 0.1.1)
       json (~> 2.3)
       language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.2.2.3)
+      parser (>= 3.2.2.4)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
@@ -961,7 +961,7 @@ GEM
     timeout (0.4.0)
     trailblazer-option (0.1.2)
     ttfunk (1.7.0)
-    turbo-rails (1.4.0)
+    turbo-rails (1.5.0)
       actionpack (>= 6.0.0)
       activejob (>= 6.0.0)
       railties (>= 6.0.0)
@@ -1027,7 +1027,7 @@ DEPENDENCIES
   airbrake (~> 13.0.0)
   appsignal (~> 3.0)
   auto_strip_attributes (~> 2.5)
-  awesome_nested_set (~> 3.5.0)
+  awesome_nested_set (~> 3.6.0)
   aws-sdk-core (~> 3.107)
   aws-sdk-s3 (~> 1.91)
   bcrypt (~> 3.1.6)
@@ -1091,7 +1091,7 @@ DEPENDENCIES
   mail (= 2.8.1)
   matrix (~> 0.4.2)
   md_to_pdf!
-  meta-tags (~> 2.18.0)
+  meta-tags (~> 2.19.0)
   mini_magick (~> 4.12.0)
   multi_json (~> 1.15.0)
   my_page!
@@ -1118,7 +1118,7 @@ DEPENDENCIES
   openproject-octicons (~> 19.7.0)
   openproject-octicons_helper (~> 19.7.0)
   openproject-openid_connect!
-  openproject-primer_view_components (~> 0.11.0)
+  openproject-primer_view_components (~> 0.12.1)
   openproject-recaptcha!
   openproject-reporting!
   openproject-storages!

app/components/concerns/op_turbo/streamable.rb

@@ -28,6 +28,10 @@
 
 module OpTurbo
   module Streamable
+    # rubocop:disable OpenProject/AddPreviewForViewComponent
+    class MissingComponentWrapper < StandardError; end
+    # rubocop:enable OpenProject/AddPreviewForViewComponent
+
     extend ActiveSupport::Concern
 
     class_methods do
@@ -49,11 +53,12 @@ def render_as_turbo_stream(view_context:, action: :update)
           render_in(view_context)
           template = nil
         else
-          raise "Unsupported action #{action}"
+          raise ArgumentError, "Unsupported action #{action}"
         end
 
-        unless @component_wrapper_used
-          raise "You need to wrap your component in a `component_wrapper` block in order to use the turbo-stream methods"
+        unless wrapped?
+          raise MissingComponentWrapper,
+                "Wrap your component in a `component_wrapper` block in order to use turbo-stream methods"
         end
 
         OpTurbo::StreamWrapperComponent.new(
@@ -66,8 +71,12 @@ def render_as_turbo_stream(view_context:, action: :update)
       def insert_as_turbo_stream(component:, view_context:, action: :append)
         template = component.render_in(view_context)
 
-        unless @component_wrapper_used
-          raise "You need to wrap your component in a `component_wrapper` block in order to use the turbo-stream methods"
+        # The component being inserted into the target component
+        # needs wrapping, not the target since it isn't the one
+        # that needs to be rendered to perform this turbo stream action.
+        unless component.wrapped?
+          raise MissingComponentWrapper,
+                "Wrap your component in a `component_wrapper` block in order to use turbo-stream methods"
         end
 
         OpTurbo::StreamWrapperComponent.new(
@@ -77,17 +86,24 @@ def insert_as_turbo_stream(component:, view_context:, action: :append)
         ).render_in(view_context)
       end
 
-      def component_wrapper(tag: "div", class: nil, data: nil, style: nil, &block)
-        @component_wrapper_used = true
+      def component_wrapper(method = nil, tag: "div", class: nil, data: nil, style: nil, &block)
+        @wrapped = true
+
+        wrapper_arguments = { id: wrapper_key, class:, data:, style: }
+
         if inner_html_only?
           capture(&block)
         elsif wrapper_only?
-          content_tag(tag, id: wrapper_key, class:, data:, style:)
+          method ? send(method, wrapper_arguments) : content_tag(tag, wrapper_arguments)
         else
-          content_tag(tag, id: wrapper_key, class:, data:, style:, &block)
+          method ? send(method, wrapper_arguments, &block) : content_tag(tag, wrapper_arguments, &block)
         end
       end
 
+      def wrapped?
+        !!@wrapped
+      end
+
       def inner_html_only?
         !!@inner_html_only
       end
@@ -117,7 +133,8 @@ def insert_target_modified?
 
       def insert_target_container(tag: "div", class: nil, data: nil, style: nil, &block)
         unless insert_target_modified?
-          raise "`insert_target_modified?` needs to be implemented and return true if `insert_target_container` is " \
+          raise NotImplementedError,
+                "#insert_target_modified? needs to be implemented and return true if #insert_target_container is " \
                 "used in this component"
         end
 

app/components/op_primer/component_helpers.rb

@@ -29,11 +29,11 @@
 module OpPrimer
   module ComponentHelpers
     def flex_layout(**, &)
-      render(OpPrimer::FlexLayoutComponent.new(**), &)
+      render(Primer::OpenProject::FlexLayout.new(**), &)
     end
 
     def grid_layout(css_class, **, &)
-      render(OpPrimer::GridLayoutComponent.new(css_class, **), &)
+      render(Primer::OpenProject::GridLayout.new(css_class:, **), &)
     end
 
     def box_collection(**, &)