feat: display subgroups in plugin home page

core/src/main/java/io/kestra/core/docs/Plugin.java

@@ -2,6 +2,7 @@
 
 import io.kestra.core.models.annotations.PluginSubGroup;
 import io.kestra.core.plugins.RegisteredPlugin;
+import io.micronaut.core.annotation.Nullable;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -29,11 +30,16 @@ public class Plugin {
     private List<String> taskRunners;
     private List<String> guides;
     private List<PluginSubGroup.PluginCategory> categories;
+    private String subGroup;
 
-    public static Plugin of(RegisteredPlugin registeredPlugin) {
+    public static Plugin of(RegisteredPlugin registeredPlugin, @Nullable String subgroup) {
         Plugin plugin = new Plugin();
         plugin.name = registeredPlugin.name();
-        plugin.title = registeredPlugin.title();
+        if (subgroup == null) {
+            plugin.title = registeredPlugin.title();
+        } else {
+            plugin.title = subgroup.substring(subgroup.lastIndexOf('.') + 1);
+        }
         plugin.group = registeredPlugin.group();
         plugin.description = registeredPlugin.description();
         plugin.longDescription = registeredPlugin.longDescription();
@@ -58,12 +64,15 @@ public static Plugin of(RegisteredPlugin registeredPlugin) {
             .distinct()
             .toList();
 
-        plugin.tasks = filterAndGetClassName(registeredPlugin.getTasks());
-        plugin.triggers = filterAndGetClassName(registeredPlugin.getTriggers());
-        plugin.conditions = filterAndGetClassName(registeredPlugin.getConditions());
-        plugin.storages = filterAndGetClassName(registeredPlugin.getStorages());
-        plugin.secrets = filterAndGetClassName(registeredPlugin.getSecrets());
-        plugin.taskRunners = filterAndGetClassName(registeredPlugin.getTaskRunners());
+        plugin.subGroup = subgroup;
+
+        plugin.tasks = filterAndGetClassName(registeredPlugin.getTasks()).stream().filter(c -> subgroup == null || c.startsWith(subgroup)).toList();
+        plugin.triggers = filterAndGetClassName(registeredPlugin.getTriggers()).stream().filter(c -> subgroup == null || c.startsWith(subgroup)).toList();
+        plugin.conditions = filterAndGetClassName(registeredPlugin.getConditions()).stream().filter(c -> subgroup == null || c.startsWith(subgroup)).toList();
+        plugin.storages = filterAndGetClassName(registeredPlugin.getStorages()).stream().filter(c -> subgroup == null || c.startsWith(subgroup)).toList();
+        plugin.secrets = filterAndGetClassName(registeredPlugin.getSecrets()).stream().filter(c -> subgroup == null || c.startsWith(subgroup)).toList();
+        plugin.taskRunners = filterAndGetClassName(registeredPlugin.getTaskRunners()).stream().filter(c -> subgroup == null || c.startsWith(subgroup)).toList();
+
 
         return plugin;
     }

core/src/main/java/io/kestra/core/models/triggers/types/package-info.java

@@ -0,0 +1,4 @@
+@PluginSubGroup(categories = { PluginSubGroup.PluginCategory.STORAGE, PluginSubGroup.PluginCategory.CORE})
+package io.kestra.core.models.triggers.types;
+
+import io.kestra.core.models.annotations.PluginSubGroup;

core/src/main/java/io/kestra/core/plugins/RegisteredPlugin.java

@@ -1,5 +1,6 @@
 package io.kestra.core.plugins;
 
+import io.kestra.core.models.annotations.PluginSubGroup;
 import io.kestra.core.models.conditions.Condition;
 import io.kestra.core.models.tasks.runners.TaskRunner;
 import io.kestra.core.models.tasks.Task;
@@ -114,6 +115,31 @@ public Map<String, List<Class>> allClassGrouped() {
         return result;
     }
 
+//    public Map<String, Map<String,List<Class>>> allClassGroupedBySubGroup() {
+//
+//    }
+
+    public Set<String> subGroupNames() {
+        return allClass()
+            .stream()
+            .map(clazz -> {
+                var pluginSubGroup = clazz.getPackage().getDeclaredAnnotation(PluginSubGroup.class);
+
+                // some plugins declare subgroup for main plugins
+                if (clazz.getPackageName().length() == this.group().length()) {
+                    pluginSubGroup = null;
+                }
+
+                if (pluginSubGroup != null && clazz.getPackageName().startsWith(this.group()) ) {
+                    return this.group() + "." + clazz.getPackageName().substring(this.group().length() + 1);
+                } else {
+                    return null;
+                }
+            })
+            .filter(Objects::nonNull)
+            .collect(Collectors.toSet());
+    }
+
     public String name() {
         return ObjectUtils.firstNonNull(
             this.getManifest() == null ? "core" : null,

core/src/main/java/io/kestra/core/tasks/outputs/package-info.java

@@ -0,0 +1,4 @@
+@PluginSubGroup(categories = { PluginSubGroup.PluginCategory.CORE})
+package io.kestra.core.tasks.outputs;
+
+import io.kestra.core.models.annotations.PluginSubGroup;

core/src/main/java/io/kestra/core/tasks/templating/package-info.java

@@ -0,0 +1,4 @@
+@PluginSubGroup(categories = { PluginSubGroup.PluginCategory.CORE})
+package io.kestra.core.tasks.templating;
+
+import io.kestra.core.models.annotations.PluginSubGroup;

ui/src/components/plugins/Plugin.vue

@@ -1,9 +1,9 @@
 <template>
-    <top-nav-bar :title="routeInfo.title" />
+    <top-nav-bar :title="routeInfo.title" :breadcrumb="routeInfo.breadcrumb" />
     <section :class="pluginIsSelected ? 'mt-4': ''">
         <el-row :gutter="15">
             <el-col :span="4" v-if="pluginIsSelected">
-                <Toc @router-change="onRouterChange" v-if="plugins" :plugins="plugins" />
+                <Toc @router-change="onRouterChange" v-if="plugins" :plugins="plugins.filter(p => !p.subGroup)" />
             </el-col>
             <el-col :span="(pluginIsSelected) ? 18 : 24" class="markdown" v-loading="isLoading">
                 <markdown v-if="pluginIsSelected" :source="plugin.markdown" :permalink="true" />
@@ -68,7 +68,7 @@
         },
         methods: {
             loadToc() {
-                this.$store.dispatch("plugin/list")
+                this.$store.dispatch("plugin/listWithSubgroup")
             },
 
             loadPlugin() {

ui/src/components/plugins/PluginHome.vue

@@ -68,7 +68,7 @@
                 </div>
             </template>
             <div v-if="isVisible(plugin)" class="plugin-card" @click="openGroup(plugin)">
-                <task-icon class="size" :only-icon="true" :cls="plugin.group" :icons="icons" />
+                <task-icon class="size" :only-icon="true" :cls="hasIcon(plugin.subGroup) ? plugin.subGroup : plugin.group" :icons="icons" />
                 <span class="text-truncate">{{ plugin.title.capitalize() }}</span>
             </div>
         </el-tooltip>
@@ -103,9 +103,23 @@
         },
         computed: {
             countPlugin() {
-                return this.plugins.reduce((acc, plugin) => {
-                    return acc + plugin.tasks.length + plugin.triggers.length + plugin.conditions.length + plugin.taskRunners.length
-                }, 0)
+                let allTasks = [];
+                let allTriggers = [];
+                let allConditions = [];
+                let allTaskRunners = [];
+
+                // avoid duplicate across groups and subgroups
+                this.plugins.forEach(plugin => {
+                    allTasks = [...allTasks, ...plugin.tasks];
+                    allTriggers = [...allTriggers, ...plugin.triggers];
+                    allConditions = [...allConditions, ...plugin.conditions];
+                    allTaskRunners = [...allTaskRunners, ...plugin.taskRunners];
+                });
+
+                return (new Set(allTasks)).size +
+                    (new Set(allTriggers)).size +
+                    (new Set(allConditions)).size +
+                    (new Set(allTaskRunners)).size;
             },
             pluginsList() {
                 return this.plugins
@@ -140,6 +154,9 @@
             },
             isVisible(plugin) {
                 return [...plugin.tasks, ...plugin.triggers, ...plugin.conditions, ...plugin.taskRunners].length > 0
+            },
+            hasIcon(cls) {
+                return this.icons[cls] !== undefined;
             }
 
         }

ui/src/stores/plugins.js

@@ -21,6 +21,13 @@ export default {
                 return response.data;
             })
         },
+        listWithSubgroup({commit}) {
+            return this.$http.get(`${apiUrl(this)}/plugins/groups/subgroups`, {}).then(response => {
+                commit("setPlugins", response.data)
+                commit("setPluginSingleList", response.data.map(plugin => plugin.tasks.concat(plugin.triggers, plugin.conditions, plugin.controllers, plugin.storages, plugin.taskRunners)).flat())
+                return response.data;
+            })
+        },
         load({commit, state}, options) {
             if (options.cls === undefined) {
                 throw new Error("missing required cls");

webserver/src/main/java/io/kestra/webserver/controllers/api/PluginController.java

@@ -120,7 +120,7 @@ protected ClassInputDocumentation inputDocumentation(Type type) throws ClassNotF
     public List<Plugin> search() {
         return pluginRegistry.plugins()
             .stream()
-            .map(Plugin::of)
+            .map(p -> Plugin.of(p, null))
             .collect(Collectors.toList());
     }
 
@@ -159,15 +159,21 @@ public MutableHttpResponse<Map<String, PluginIcon>> icons() {
     @ExecuteOn(TaskExecutors.IO)
     @Operation(tags = {"Plugins"}, summary = "Get plugins icons")
     public MutableHttpResponse<Map<String, PluginIcon>> pluginGroupIcons() {
-        Map<String, PluginIcon> icons = pluginRegistry
-            .plugins()
-            .stream()
+        Map<String, PluginIcon> icons = new HashMap<>();
+
+        pluginRegistry.plugins().stream()
             .filter(plugin -> plugin.group() != null)
-            .collect(Collectors.toMap(
-                RegisteredPlugin::group,
-                plugin -> new PluginIcon("plugin-icon", plugin.icon("plugin-icon"), false),
-                (a1, a2) -> a1
-            ));
+            .forEach(plugin -> {
+                String group = plugin.group();
+                if (group != null) {
+                    icons.put(group, new PluginIcon("plugin-icon", plugin.icon("plugin-icon"), false));
+                }
+
+                plugin.subGroupNames().forEach(subgroup -> {
+                    icons.put(subgroup, new PluginIcon("plugin-icon", plugin.icon(subgroup), false));
+                });
+            });
+
         return HttpResponse.ok(icons).header(HttpHeaders.CACHE_CONTROL, CACHE_DIRECTIVE);
     }
 
@@ -199,6 +205,26 @@ public HttpResponse<DocumentationWithSchema> pluginDocumentation(
             .header(HttpHeaders.CACHE_CONTROL, CACHE_DIRECTIVE);
     }
 
+    @Get("/groups/subgroups")
+    @ExecuteOn(TaskExecutors.IO)
+    @Operation(tags = {"Plugins"}, summary = "Get plugins group by subgroups")
+    public List<Plugin> subgroups() {
+        return Stream.concat(
+                pluginRegistry.plugins()
+                    .stream()
+                    .map(p -> Plugin.of(p, null)),
+                pluginRegistry.plugins()
+                    .stream()
+                    .flatMap(p -> p.subGroupNames()
+                        .stream()
+                        .map(subgroup -> Plugin.of(p, subgroup))
+                    )
+            )
+            .distinct()
+            .toList();
+    }
+
+
     @SuppressWarnings({"rawtypes", "unchecked"})
     @Cacheable("default")
     protected ClassPluginDocumentation<?> pluginDocumentation(List<RegisteredPlugin> plugins, String className, Boolean allProperties) {