Add menu item in builtin menu for templates (#5881)

Author: gmazoyer

backend/infrahub/menu/constants.py

@@ -8,4 +8,3 @@ class MenuSection(InfrahubStringEnum):
 
 DEFAULT_MENU = "Other"
 FULL_DEFAULT_MENU = "BuiltinOther"
-TEMPLATE_MENU = "Object templates"

backend/infrahub/menu/generator.py

@@ -3,11 +3,10 @@
 from typing import TYPE_CHECKING
 
 from infrahub.core import registry
-from infrahub.core.constants import InfrahubKind
 from infrahub.core.protocols import CoreMenuItem
 from infrahub.log import get_logger
 
-from .constants import FULL_DEFAULT_MENU, TEMPLATE_MENU
+from .constants import FULL_DEFAULT_MENU
 from .models import MenuDict, MenuItemDict
 
 if TYPE_CHECKING:
@@ -82,11 +81,6 @@ async def generate_menu(db: InfrahubDatabase, branch: Branch, menu_items: list[C
 
     items_to_add = {schema.kind: False for schema in full_schema.values() if schema.include_in_menu is True}
 
-    # Object templates should go into a dedicated menu item
-    object_templates_menu = MenuItemDict(
-        identifier=InfrahubKind.OBJECTTEMPLATE, label=TEMPLATE_MENU.title(), icon="mdi:pencil-ruler", order_weight=20000
-    )
-
     nbr_remaining_items_last_round = len(items_to_add.values())
     nbr_remaining_items = len([value for value in items_to_add.values() if value is False])
     while not all(items_to_add.values()):
@@ -101,10 +95,7 @@ async def generate_menu(db: InfrahubDatabase, branch: Branch, menu_items: list[C
                 items_to_add[item_name] = True
                 continue
 
-            if schema.namespace == "Template":
-                object_templates_menu.children[menu_item.identifier] = menu_item
-                items_to_add[item_name] = True
-            elif not schema.menu_placement:
+            if not schema.menu_placement:
                 first_element = MenuItemDict.from_schema(model=schema)
                 first_element.identifier = f"{first_element.identifier}Sub"
                 first_element.order_weight = 1
@@ -121,9 +112,6 @@ async def generate_menu(db: InfrahubDatabase, branch: Branch, menu_items: list[C
             break
         nbr_remaining_items_last_round = nbr_remaining_items
 
-    if object_templates_menu.children:
-        structure.data[object_templates_menu.identifier] = object_templates_menu
-
     # ----------------------------------------------------------------------------
     # Assign the remaining items for which we couldn't find the menu_placement to the default menu
     # ----------------------------------------------------------------------------

backend/infrahub/menu/menu.py

@@ -135,6 +135,16 @@ def _extract_node_icon(model: MainSchemaTypes) -> str:
                 section=MenuSection.INTERNAL,
                 order_weight=1500,
             ),
+            MenuItemDefinition(
+                namespace="Builtin",
+                name="Templates",
+                label="Templates",
+                kind=InfrahubKind.OBJECTTEMPLATE,
+                icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.OBJECTTEMPLATE)),
+                protected=True,
+                section=MenuSection.INTERNAL,
+                order_weight=2000,
+            ),
             MenuItemDefinition(
                 namespace="Builtin",
                 name="ResourceManager",
@@ -143,7 +153,7 @@ def _extract_node_icon(model: MainSchemaTypes) -> str:
                 icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.RESOURCEPOOL)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=2000,
+                order_weight=2500,
             ),
             MenuItemDefinition(
                 namespace="Builtin",
@@ -153,7 +163,7 @@ def _extract_node_icon(model: MainSchemaTypes) -> str:
                 icon=_extract_node_icon(infrahub_schema.get(InfrahubKind.ARTIFACT)),
                 protected=True,
                 section=MenuSection.INTERNAL,
-                order_weight=2500,
+                order_weight=3000,
             ),
             MenuItemDefinition(
                 namespace="Builtin",