Revamp/server input pagination

changelog/unreleased/issue-12248.toml

@@ -0,0 +1,5 @@
+type = "a"
+message = "Improved Inputs Overview Page: The page has been revamped with pagination and various UI enhancements to improve navigation."
+
+pulls = ["24245", "Graylog2/graylog-plugin-enterprise#12538"]
+issues = ["12248"]

graylog2-server/src/main/java/org/graylog2/contentpacks/facades/InputFacade.java

@@ -476,7 +476,7 @@ public Optional<Entity> exportEntity(EntityDescriptor entityDescriptor, EntityDe
 
         try {
             final Input input = inputService.find(modelId.id());
-            final InputWithExtractors inputWithExtractors = InputWithExtractors.create(input, inputService.getExtractors(input));
+            final InputWithExtractors inputWithExtractors = InputWithExtractors.create(input, inputService.getExtractors(input.getId()));
             return Optional.of(exportNativeEntity(inputWithExtractors, entityDescriptorIds));
         } catch (NotFoundException e) {
             return Optional.empty();
@@ -491,7 +491,7 @@ public Graph<EntityDescriptor> resolveNativeEntity(EntityDescriptor entityDescri
         final ModelId modelId = entityDescriptor.id();
         try {
             final Input input = inputService.find(modelId.toString());
-            final InputWithExtractors inputWithExtractors = InputWithExtractors.create(input, inputService.getExtractors(input));
+            final InputWithExtractors inputWithExtractors = InputWithExtractors.create(input, inputService.getExtractors(input.getId()));
 
             resolveNativeEntityLookupTable(entityDescriptor, inputWithExtractors, mutableGraph);
             resolveNativeEntityGrokPattern(entityDescriptor, inputWithExtractors, mutableGraph);

graylog2-server/src/main/java/org/graylog2/database/utils/MongoUtils.java

@@ -26,6 +26,7 @@
 import com.mongodb.client.model.Aggregates;
 import com.mongodb.client.model.Filters;
 import com.mongodb.client.model.ReplaceOptions;
+import com.mongodb.client.model.Updates;
 import com.mongodb.client.result.InsertOneResult;
 import jakarta.annotation.Nonnull;
 import org.bson.BsonValue;
@@ -266,4 +267,8 @@ public Map<String, Long> countByField(String field) {
         });
         return counts;
     }
+
+    public static Bson removeEmbedded(String fieldName, String key, String value) {
+        return Updates.pull(fieldName, new Document(key, value));
+    }
 }

graylog2-server/src/main/java/org/graylog2/filters/ExtractorFilter.java

@@ -156,7 +156,7 @@ private void loadExtractors(final String inputId) {
 
         try {
             final Input input = inputService.find(inputId);
-            final List<Extractor> sortedExtractors = inputService.getExtractors(input).stream()
+            final List<Extractor> sortedExtractors = inputService.getExtractors(input.getId()).stream()
                     .sorted(Comparator.comparingLong(Extractor::getOrder))
                     .collect(Collectors.toList());
 

graylog2-server/src/main/java/org/graylog2/filters/StaticFieldFilter.java

@@ -19,8 +19,8 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
-import org.graylog2.database.NotFoundException;
-import org.graylog2.inputs.Input;
+import jakarta.inject.Inject;
+import jakarta.inject.Named;
 import org.graylog2.inputs.InputService;
 import org.graylog2.plugin.Message;
 import org.graylog2.plugin.filters.MessageFilter;
@@ -31,9 +31,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import jakarta.inject.Inject;
-import jakarta.inject.Named;
-
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
@@ -121,12 +118,7 @@ private void loadAllStaticFields() {
 
     private void loadStaticFields(final String inputId) {
         LOG.debug("Re-loading static fields for input <{}> into cache.", inputId);
-        try {
-            final Input input = inputService.find(inputId);
-            staticFields.put(inputId, ImmutableList.copyOf(inputService.getStaticFields(input)));
-        } catch (NotFoundException e) {
-            LOG.warn("Unable to load input: {}", e.getMessage());
-        }
+        staticFields.put(inputId, ImmutableList.copyOf(inputService.getStaticFields(inputId)));
     }
 
     @Override

graylog2-server/src/main/java/org/graylog2/inputs/Input.java

@@ -17,12 +17,13 @@
 package org.graylog2.inputs;
 
 import org.graylog2.plugin.IOState;
-import org.graylog2.plugin.database.Persisted;
 import org.joda.time.DateTime;
 
 import java.util.Map;
 
-public interface Input extends Persisted {
+public interface Input {
+    String getId();
+
     String getTitle();
 
     DateTime getCreatedAt();
@@ -35,18 +36,19 @@ public interface Input extends Persisted {
 
     String getCreatorUserId();
 
-    Boolean isGlobal();
+    boolean isGlobal();
 
     String getContentPack();
 
     String getNodeId();
 
     IOState.Type getDesiredState();
 
-    void setDesiredState(IOState.Type desiredState);
+    Input withDesiredState(IOState.Type desiredState);
 
     default String toIdentifier() {
         return "[" + getType() + "/" + getTitle() + "/" + getId() + "]";
     }
 
+    Map<String, Object> getFields();
 }