Merge pull request opf#17604 from opf/58427-indicate-that-there-are-work-package-relations-which-the-user-has-no-permission-to-see

[58427] Indicate that there are work package relations which the user has no permission to see

Author: cbliard

app/components/work_package_relations_tab/index_component.html.erb

@@ -47,34 +47,47 @@
         key_namespace = "#{I18N_NAMESPACE}.relations"
 
         # Relations
-        directionally_aware_grouped_relations.each do |relation_type, relations_of_type|
-          base_key = "#{key_namespace}.label_#{relation_type}"
+        directionally_aware_grouped_relations.each do |relation_group|
+          base_key = "#{I18N_NAMESPACE}.relations.label_#{relation_group.type}"
+
+          # Combine visible and invisible relations into a single list
+          all_relations = relation_group.visible_relations.map { |r| [r, :visible] } +
+            relation_group.ghost_relations.map { |r| [r, :ghost] }
 
           flex.with_row(mb: 4) do
             render_relation_group(
               title: t("#{base_key}_plural").upcase_first,
-              relation_type:,
-              items: relations_of_type
-            ) do |relation|
-              render(WorkPackageRelationsTab::RelationComponent.new(work_package:,
-                                                                    relation:))
+              relation_type: relation_group.type,
+              items: all_relations
+            ) do |relation, visibility|
+              # Render each relation with its visibility
+              render(WorkPackageRelationsTab::RelationComponent.new(
+                work_package: work_package,
+                relation: relation,
+                visibility: visibility
+              ))
             end
           end
         end
 
         # Children
-        if children.any?
+        if any_children?
           base_key = "#{key_namespace}.label_child"
 
+          # Combine visible and invisible children into a single list
+          all_children = visible_children.map { |r| [r, :visible] } +
+            ghost_children.map { |r| [r, :ghost] }
+
           flex.with_row do
             render_relation_group(
               title: t("#{base_key}_plural").upcase_first,
               relation_type: :children,
-              items: children
-            ) do |child|
+              items: all_children
+            ) do |child, visibility|
               render(WorkPackageRelationsTab::RelationComponent.new(work_package:,
                                                                     relation: nil,
-                                                                    child:))
+                                                                    child:,
+                                                                    visibility: visibility))
             end
           end
         end

app/components/work_package_relations_tab/index_component.rb

@@ -16,9 +16,15 @@ class WorkPackageRelationsTab::IndexComponent < ApplicationComponent
   include Turbo::FramesHelper
   include OpTurbo::Streamable
 
-  attr_reader :relations_mediator, :directionally_aware_grouped_relations, :relation_to_scroll_to
+  attr_reader :relations_mediator, :relation_to_scroll_to
 
-  delegate :work_package, :relations, :children, :any_relations?, to: :relations_mediator
+  delegate :work_package,
+           :visible_children,
+           :ghost_children,
+           :directionally_aware_grouped_relations,
+           :any_relations?,
+           :any_children?,
+           to: :relations_mediator
 
   # Initialize the component with required data
   #
@@ -28,7 +34,6 @@ def initialize(work_package: nil, relation_to_scroll_to: nil)
     super()
 
     @relations_mediator = WorkPackageRelationsTab::RelationsMediator.new(work_package:)
-    @directionally_aware_grouped_relations = group_relations_by_directional_context
     @relation_to_scroll_to = relation_to_scroll_to
   end
 
@@ -52,12 +57,6 @@ def should_render_create_button?
     should_render_add_child? || should_render_add_relations?
   end
 
-  def group_relations_by_directional_context
-    relations.group_by do |relation|
-      relation.relation_type_for(work_package)
-    end
-  end
-
   def render_relation_group(title:, relation_type:, items:, &_block)
     render(border_box_container(
              padding: :condensed,
@@ -129,12 +128,12 @@ def render_child_menu_items(menu) # rubocop:disable Metrics/AbcSize
   end
 
   def render_items(border_box, items)
-    items.each do |item|
+    items.each do |relation, visibility|
       border_box.with_row(
-        test_selector: row_test_selector(item),
-        data: data_attribute(item)
+        test_selector: row_test_selector(relation, visibility),
+        data: data_attribute(relation)
       ) do
-        yield(item)
+        yield(relation, visibility)
       end
     end
   end
@@ -169,9 +168,9 @@ def new_button_test_selector(relation_type:)
     "op-new-relation-button-#{relation_type}"
   end
 
-  def row_test_selector(item)
+  def row_test_selector(item, visibility)
     related_work_package_id = find_related_work_package_id(item)
-    "op-relation-row-#{related_work_package_id}"
+    "op-relation-row-#{visibility}-#{related_work_package_id}"
   end
 
   def find_related_work_package_id(item)

app/components/work_package_relations_tab/relation_component.html.erb

@@ -1,104 +1,97 @@
 <%=
-flex_layout do |flex|
-  flex.with_row(flex_layout: true, justify_content: :space_between, align_items: :center) do |row|
-    row.with_column do
-      render(WorkPackages::InfoLineComponent.new(work_package: related_work_package))
-    end
+  flex_layout do |flex|
+    if visible?
+      flex.with_row(flex_layout: true, justify_content: :space_between, align_items: :center) do |row|
+        row.with_column do
+          render(WorkPackages::InfoLineComponent.new(work_package: related_work_package))
+        end
 
-    if should_render_action_menu?
-      row.with_column do
-        render(Primer::Alpha::ActionMenu.new(test_selector: action_menu_test_selector)) do |menu|
-          menu.with_show_button(icon: "kebab-horizontal",
-                                "aria-label": I18n.t(:label_relation_actions),
-                                scheme: :invisible,
-                                ml: 2)
+        if should_render_action_menu?
+          row.with_column do
+            render(Primer::Alpha::ActionMenu.new(test_selector: action_menu_test_selector)) do |menu|
+              menu.with_show_button(icon: "kebab-horizontal",
+                                    "aria-label": I18n.t(:label_relation_actions),
+                                    scheme: :invisible,
+                                    ml: 2)
 
-          if should_render_edit_option?
-            menu.with_item(label: I18n.t(:label_relation_edit),
-                           href: edit_path,
-                           test_selector: edit_button_test_selector,
-                           content_arguments: {
-                             data: { turbo_stream: true }
-                           }) do |item|
-              item.with_leading_visual_icon(icon: :pencil)
-            end
-          end
+              if should_render_edit_option?
+                menu.with_item(label: I18n.t(:label_relation_edit),
+                               href: edit_path,
+                               test_selector: edit_button_test_selector,
+                               content_arguments: {
+                                 data: { turbo_stream: true }
+                               }) do |item|
+                  item.with_leading_visual_icon(icon: :pencil)
+                end
+              end
 
-          menu.with_item(label: I18n.t(:label_relation_delete),
-                         scheme: :danger,
-                         href: destroy_path,
-                         form_arguments: {
-                           method: :delete,
-                           data: {
-                             confirm: t("text_are_you_sure"),
-                             turbo_stream: true,
-                             update_work_package: true
-                           }
-                         },
-                         test_selector: delete_button_test_selector) do |item|
-            item.with_leading_visual_icon(icon: :trash)
+              menu.with_item(label: I18n.t(:label_relation_delete),
+                             scheme: :danger,
+                             href: destroy_path,
+                             form_arguments: {
+                               method: :delete,
+                               data: {
+                                 confirm: t("text_are_you_sure"),
+                                 turbo_stream: true,
+                                 update_work_package: true
+                               }
+                             },
+                             test_selector: delete_button_test_selector) do |item|
+                item.with_leading_visual_icon(icon: :trash)
+              end
+            end
           end
         end
       end
-    end
-  end
 
-  flex.with_row(mb: 2) do
-    render(Primer::Beta::Link.new(href: work_package_path(related_work_package),
-                                  color: :default,
-                                  underline: false,
-                                  font_size: :normal,
-                                  font_weight: :bold,
-                                  target: "_blank")) { related_work_package.subject }
-  end
-
-  if should_display_description?
-    flex.with_row(mb: 2) do
-      render(Primer::Beta::Text.new(font_size: :small, color: :muted)) { format_text(relation, :description) }
-    end
-  end
+      flex.with_row(mb: 2) do
+        render(Primer::Beta::Link.new(href: work_package_path(related_work_package),
+                                      color: :default,
+                                      underline: false,
+                                      font_size: :normal,
+                                      font_weight: :bold,
+                                      target: "_blank")) { related_work_package.subject }
+      end
 
-  if should_display_dates_row?
-    flex.with_row(flex_layout: true, align_items: :center, color: :muted, mb: 2) do |dates_row|
-      if precedes? && lag_present?
-        dates_row.with_column(mr: 1) do
-          render(Primer::Beta::Octicon.new(icon: "arrow-both"))
+      if should_display_description?
+        flex.with_row(mb: 2) do
+          render(Primer::Beta::Text.new(font_size: :small, color: :muted)) { format_text(relation, :description) }
         end
-        dates_row.with_column(mr: 3) do
-          render(Primer::Beta::Text.new) do
-            lag_as_text(relation.lag)
-          end
+      end
+    else
+      flex.with_row(mb: 2) do
+        render(Primer::Beta::Text.new(font_weight: :bold, color: :muted)) { I18n.t("work_package_relations_tab.relations.ghost_relation_title") }
+      end
+      flex.with_row(flex_layout: true, align_items: :center, color: :muted, mb: 2) do |ghost_description_row|
+        ghost_description_row.with_column(mr: 1) do
+          render(Primer::Beta::Octicon.new(icon: "alert"))
+        end
+        ghost_description_row.with_column do
+          render(Primer::Beta::Text.new) { I18n.t("work_package_relations_tab.relations.ghost_relation_description") }
         end
       end
+    end
 
-      if related_work_package.start_date.present? || related_work_package.due_date.present?
-        dates_row.with_column(mr: 1) do
-          icon = if follows?
-                   :calendar
-                 elsif precedes?
-                   :pin
-                 end
+    # Show dates for both visible and ghost relation
+    if should_display_dates_row?
+      flex.with_row(flex_layout: true, align_items: :center, color: :muted, mb: 2) do |dates_row|
+        if precedes? && lag_present?
+          dates_row.with_column(mr: 1) { render(Primer::Beta::Octicon.new(icon: "arrow-both")) }
+          dates_row.with_column(mr: 2) { render(Primer::Beta::Text.new) { lag_as_text(relation.lag) } }
+        end
 
-          render(Primer::Beta::Octicon.new(icon:))
+        dates_row.with_column(mr: 1) do
+          render(Primer::Beta::Octicon.new(icon: helpers.work_package_dates_icon(related_work_package)))
         end
         dates_row.with_column do
-          render(Primer::Beta::Text.new) do
-            "#{format_date(related_work_package.start_date)} - #{format_date(related_work_package.due_date)}"
-          end
+          render(Primer::Beta::Text.new) { helpers.work_package_formatted_dates(related_work_package) }
         end
-      end
 
-      if follows? && lag_present?
-        dates_row.with_column(ml: 3, mr: 1) do
-          render(Primer::Beta::Octicon.new(icon: "arrow-both"))
-        end
-        dates_row.with_column(mr: 1) do
-          render(Primer::Beta::Text.new) do
-            lag_as_text(relation.lag)
-          end
+        if follows? && lag_present?
+          dates_row.with_column(ml: 2, mr: 1) { render(Primer::Beta::Octicon.new(icon: "arrow-both")) }
+          dates_row.with_column(mr: 1) { render(Primer::Beta::Text.new) { lag_as_text(relation.lag) } }
         end
       end
     end
   end
-end
 %>

app/components/work_package_relations_tab/relation_component.rb

@@ -2,15 +2,17 @@ class WorkPackageRelationsTab::RelationComponent < ApplicationComponent
   include ApplicationHelper
   include OpPrimer::ComponentHelpers
 
-  attr_reader :work_package, :relation, :child
+  attr_reader :work_package, :relation, :child, :visibility
 
   def initialize(work_package:,
                  relation:,
+                 visibility:,
                  child: nil)
     super()
 
     @work_package = work_package
     @relation = relation
+    @visibility = visibility
     @child = child
   end
 
@@ -47,6 +49,10 @@ def allowed_to_manage_relations?
     helpers.current_user.allowed_in_project?(:manage_work_package_relations, @work_package.project)
   end
 
+  def visible?
+    @visibility == :visible
+  end
+
   def underlying_resource_id
     @underlying_resource_id ||= if parent_child_relationship?
                                   @child.id
@@ -66,16 +72,18 @@ def lag_present?
   end
 
   def should_display_dates_row?
-    return false if parent_child_relationship?
-
-    relation.follows? || relation.precedes?
+    parent_child_relationship? || relation.follows? || relation.precedes?
   end
 
   def follows?
+    return false if parent_child_relationship?
+
     relation.relation_type_for(work_package) == Relation::TYPE_FOLLOWS
   end
 
   def precedes?
+    return false if parent_child_relationship?
+
     relation.relation_type_for(work_package) == Relation::TYPE_PRECEDES
   end