add annotations on summary pages with labels

liu-samuel · liu-samuel · commit 0752e69c2de4 · 2024-06-28T13:47:25.000-04:00
diff --git a/app/controllers/container_build_controller.rb b/app/controllers/container_build_controller.rb
@@ -10,7 +10,7 @@ class ContainerBuildController < ApplicationController
   private
 
   def textual_group_list
-    [%i[properties container_labels], %i[relationships smart_management], %i[build_instances]]
+    [%i[properties container_labels], %i[relationships smart_management], %i[build_instances annotations]]
   end
   helper_method :textual_group_list
 
diff --git a/app/controllers/container_controller.rb b/app/controllers/container_controller.rb
@@ -14,7 +14,7 @@ def show_list
   private
 
   def textual_group_list
-    [%i[properties relationships smart_management], %i[env limits]]
+    [%i[properties relationships smart_management], %i[env limits annotations]]
   end
   helper_method :textual_group_list
 
diff --git a/app/controllers/container_group_controller.rb b/app/controllers/container_group_controller.rb
@@ -16,7 +16,7 @@ def show_list
   def textual_group_list
     [
       %i[properties container_labels container_node_selectors volumes],
-      %i[relationships conditions smart_management]
+      %i[relationships conditions smart_management annotations]
     ]
   end
   helper_method :textual_group_list
diff --git a/app/controllers/container_image_controller.rb b/app/controllers/container_image_controller.rb
@@ -11,7 +11,7 @@ def textual_group_list
     [
       %i[properties container_labels compliance],
       %i[relationships smart_management configuration openscap_failed_rules],
-      %i[env container_docker_labels]
+      %i[env container_docker_labels annotations]
     ]
   end
   helper_method :textual_group_list
diff --git a/app/controllers/container_image_registry_controller.rb b/app/controllers/container_image_registry_controller.rb
@@ -24,7 +24,7 @@ def download_summary_pdf
   private
 
   def textual_group_list
-    [%i[properties], %i[relationships smart_management]]
+    [%i[properties], %i[relationships smart_management annotations]]
   end
   helper_method :textual_group_list
 
diff --git a/app/controllers/container_node_controller.rb b/app/controllers/container_node_controller.rb
@@ -14,8 +14,8 @@ def show_list
 
   def textual_group_list
     [
-      %i[properties container_labels compliance miq_custom_attributes],
-      %i[relationships conditions smart_management]
+      %i[properties container_labels compliance],
+      %i[relationships conditions smart_management annotations]
     ]
   end
   helper_method :textual_group_list
diff --git a/app/controllers/container_project_controller.rb b/app/controllers/container_project_controller.rb
@@ -26,7 +26,7 @@ def download_summary_pdf
   private
 
   def textual_group_list
-    [%i[properties quota limits container_labels], %i[relationships smart_management]]
+    [%i[properties quota limits container_labels], %i[relationships smart_management annotations]]
   end
   helper_method :textual_group_list
 
diff --git a/app/controllers/container_replicator_controller.rb b/app/controllers/container_replicator_controller.rb
@@ -26,7 +26,7 @@ def download_summary_pdf
   private
 
   def textual_group_list
-    [%i[properties container_labels container_selectors compliance], %i[relationships smart_management]]
+    [%i[properties container_labels container_selectors compliance], %i[relationships smart_management annotations]]
   end
   helper_method :textual_group_list
 
diff --git a/app/controllers/container_route_controller.rb b/app/controllers/container_route_controller.rb
@@ -20,7 +20,7 @@ def download_summary_pdf
   private
 
   def textual_group_list
-    [%i[properties container_labels], %i[relationships smart_management]]
+    [%i[properties container_labels annotations], %i[relationships smart_management]]
   end
   helper_method :textual_group_list
 
diff --git a/app/controllers/container_service_controller.rb b/app/controllers/container_service_controller.rb
@@ -25,7 +25,7 @@ def download_summary_pdf
   private
 
   def textual_group_list
-    [%i[properties port_configs container_labels container_selectors], %i[relationships smart_management]]
+    [%i[properties port_configs container_labels container_selectors], %i[relationships smart_management annotations]]
   end
   helper_method :textual_group_list
 
diff --git a/app/controllers/container_template_controller.rb b/app/controllers/container_template_controller.rb
@@ -20,7 +20,7 @@ def download_summary_pdf
   private
 
   def textual_group_list
-    [%i[properties parameters objects], %i[relationships container_labels smart_management]]
+    [%i[properties parameters objects], %i[relationships container_labels smart_management annotations]]
   end
   helper_method :textual_group_list
 
diff --git a/app/controllers/persistent_volume_controller.rb b/app/controllers/persistent_volume_controller.rb
@@ -20,7 +20,7 @@ def download_summary_pdf
   private
 
   def textual_group_list
-    [%i[properties claim_properties], %i[relationships smart_management capacity]]
+    [%i[properties claim_properties annotations], %i[relationships smart_management capacity]]
   end
   helper_method :textual_group_list
 
diff --git a/app/helpers/container_summary_helper.rb b/app/helpers/container_summary_helper.rb
@@ -73,6 +73,10 @@ def textual_group_container_labels
     TextualGroup.new(_("Labels"), textual_key_value_group(@record.labels.to_a))
   end
 
+  def textual_group_annotations
+    TextualGroup.new(_("Annotations"), textual_key_value_group(@record.annotations))
+  end
+
   def textual_group_miq_custom_attributes
     TextualGroup.new(_("Custom Attributes"), textual_miq_custom_attributes)
   end

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ def show_list`
`16`	`16`	`def textual_group_list`
`17`	`17`	`[`
`18`	`18`	`%i[properties container_labels container_node_selectors volumes],`
`19`		`- %i[relationships conditions smart_management]`
	`19`	`+ %i[relationships conditions smart_management annotations]`
`20`	`20`	`]`
`21`	`21`	`end`
`22`	`22`	`helper_method :textual_group_list`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ def textual_group_list`
`11`	`11`	`[`
`12`	`12`	`%i[properties container_labels compliance],`
`13`	`13`	`%i[relationships smart_management configuration openscap_failed_rules],`
`14`		`- %i[env container_docker_labels]`
	`14`	`+ %i[env container_docker_labels annotations]`
`15`	`15`	`]`
`16`	`16`	`end`
`17`	`17`	`helper_method :textual_group_list`
Original file line number	Diff line number	Diff line change
`@@ -14,8 +14,8 @@ def show_list`
`14`	`14`
`15`	`15`	`def textual_group_list`
`16`	`16`	`[`
`17`		`- %i[properties container_labels compliance miq_custom_attributes],`
`18`		`- %i[relationships conditions smart_management]`
	`17`	`+ %i[properties container_labels compliance],`
	`18`	`+ %i[relationships conditions smart_management annotations]`
`19`	`19`	`]`
`20`	`20`	`end`
`21`	`21`	`helper_method :textual_group_list`