fix api erasing plugininfo and ingest plugins filtering necessary inf…

…o out
keeps · Feb 3, 2025 · 6338e89 · 6338e89
1 parent a712e74
commit 6338e89
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/roda-core/roda-core/src/main/java/org/roda/core/plugins/PluginManager.java b/roda-core/roda-core/src/main/java/org/roda/core/plugins/PluginManager.java
@@ -409,11 +409,17 @@ public List<PluginInfo> getPluginsInfo(PluginType pluginType) {
   }
 
   public PluginInfoList getPluginsInfo(List<PluginType> pluginTypes) {
+    return getPluginsInfo(pluginTypes, true);
+  }
+
+  public PluginInfoList getPluginsInfo(List<PluginType> pluginTypes, boolean removeNotListable) {
     PluginInfoList pluginsInfo = new PluginInfoList();
 
     for (PluginType pluginType : pluginTypes) {
-      List<PluginInfo> orDefault = pluginInfoPerType.getOrDefault(pluginType, Collections.emptyList());
-      orDefault.removeIf(p -> p.getCategories().contains(RodaConstants.PLUGIN_CATEGORY_NOT_LISTABLE));
+      List<PluginInfo> orDefault = new ArrayList<>(pluginInfoPerType.getOrDefault(pluginType, Collections.emptyList()));
+      if (removeNotListable) {
+        orDefault.removeIf(p -> p.getCategories().contains(RodaConstants.PLUGIN_CATEGORY_NOT_LISTABLE));
+      }
       pluginsInfo.addObjects(orDefault);
     }
 

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/ConfigurationController.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/api/v2/controller/ConfigurationController.java
@@ -123,14 +123,14 @@ public ObjectClassFields retrieveObjectClassFields(String localeString) {
   }
 
   @Override
-  public PluginInfoList retrievePluginsInfo(List<PluginType> types) {
+  public PluginInfoList retrievePluginsInfo(List<PluginType> types, boolean removeNotListable) {
     final ControllerAssistant controllerAssistant = new ControllerAssistant() {};
     RequestContext requestContext = RequestUtils.parseHTTPRequest(request);
     LogEntryState state = LogEntryState.SUCCESS;
     try {
       controllerAssistant.checkRoles(requestContext.getUser());
 
-      return RodaCoreFactory.getPluginManager().getPluginsInfo(types);
+      return RodaCoreFactory.getPluginManager().getPluginsInfo(types, removeNotListable);
     } catch (AuthorizationDeniedException e) {
       state = LogEntryState.UNAUTHORIZED;
       throw new RESTException(e);

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/ingest/process/PluginParameterPanel.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/ingest/process/PluginParameterPanel.java
@@ -638,7 +638,7 @@ private void createPermissionTypesLayout() {
   private void createPluginSipToAipLayout() {
     List<PluginType> plugins = Arrays.asList(PluginType.SIP_TO_AIP);
     Services services = new Services("Retrieve plugin information", "get");
-    services.configurationsResource(s -> s.retrievePluginsInfo(plugins)).whenComplete((pluginInfoList, throwable) -> {
+    services.configurationsResource(s -> s.retrievePluginsInfo(plugins, false)).whenComplete((pluginInfoList, throwable) -> {
       if (throwable == null) {
         Label parameterName = new Label(parameter.getName());
         layout.add(parameterName);

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/process/CreateDefaultJob.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/process/CreateDefaultJob.java
@@ -202,7 +202,7 @@ public CreateDefaultJob() {
 
     Services services = new Services("Retrieve plugin information", "get");
     pluginTypes.remove(PluginType.INTERNAL);
-    services.configurationsResource(s -> s.retrievePluginsInfo(pluginTypes))
+    services.configurationsResource(s -> s.retrievePluginsInfo(pluginTypes, true))
       .whenComplete((pluginInfoList, throwable) -> {
         if (throwable == null) {
           init(pluginInfoList.getPluginInfoList());

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/process/CreateSelectedJob.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/process/CreateSelectedJob.java
@@ -182,7 +182,7 @@ public CreateSelectedJob(final List<PluginType> pluginType) {
     }
 
     Services services = new Services("Retrieve plugin information", "get");
-    services.configurationsResource(s -> s.retrievePluginsInfo(pluginType))
+    services.configurationsResource(s -> s.retrievePluginsInfo(pluginType, true))
       .whenComplete((pluginInfoList, throwable) -> {
         if (throwable == null) {
           init(pluginInfoList.getPluginInfoList());

diff --git a/roda-ui/roda-wui/src/main/java/org/roda/wui/client/services/ConfigurationRestService.java b/roda-ui/roda-wui/src/main/java/org/roda/wui/client/services/ConfigurationRestService.java
@@ -68,7 +68,8 @@ ObjectClassFields retrieveObjectClassFields(
     @ApiResponse(responseCode = "200", description = "Returns a set of plugin information", content = @Content(schema = @Schema(implementation = PluginInfoList.class))),
     @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(schema = @Schema(implementation = ErrorResponseMessage.class))),
     @ApiResponse(responseCode = "403", description = "Access forbidden", content = @Content(schema = @Schema(implementation = ErrorResponseMessage.class)))})
-  PluginInfoList retrievePluginsInfo(@RequestParam(name = "type") List<PluginType> types);
+  PluginInfoList retrievePluginsInfo(@RequestParam(name = "type") List<PluginType> types,
+    @RequestParam(name = "removeNotListable", defaultValue = "true", required = false) boolean removeNotListable);
 
   @RequestMapping(method = RequestMethod.GET, path = "/plugins/reindex", produces = MediaType.APPLICATION_JSON_VALUE)
   @Operation(summary = "Retrieves a list of resources that are used by reindex plugins", responses = {