Merge pull request #4775 from gchq/gh-4692_column_filter_selections

Gh 4692 column filter selections

Author: stroomdev66

gradle/libs.versions.toml

@@ -13,7 +13,7 @@ elasticsearch = "8.12.2"
 httpcore = "4.4.16" # Transient dependency of Elasticsearch
 flyway = "10.0.0"
 guice = "7.0.0"
-gwt = "2.11.0"
+gwt = "2.12.1"
 jackson-swagger = "2.11.1" # Specific version of jackson for use with the swagger plugin
 jmh = "1.37"
 jooq = "3.18.7" # Defined at the top of this file

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/ReportExecutor.java

@@ -390,7 +390,7 @@ private String getFileName(final String baseName,
         String fileName = baseName;
         fileName = NON_BASIC_CHARS.matcher(fileName).replaceAll("");
         fileName = MULTIPLE_SPACE.matcher(fileName).replaceAll(" ");
-        fileName = fileName.replace(" ", "_");
+        fileName = fileName.replace(' ', '_');
         fileName = fileName + "." + extension;
         return fileName;
     }

stroom-analytics/stroom-analytics-impl/src/main/java/stroom/analytics/impl/ScheduledQueryAnalyticExecutor.java

@@ -48,7 +48,7 @@
 import stroom.query.common.v2.OpenGroups;
 import stroom.query.common.v2.ResultStoreManager;
 import stroom.query.common.v2.ResultStoreManager.RequestAndStore;
-import stroom.query.common.v2.SimpleRowCreator;
+import stroom.query.common.v2.RowValueFilter;
 import stroom.query.common.v2.ValFilter;
 import stroom.query.common.v2.format.FormatterFactory;
 import stroom.query.language.SearchRequestFactory;
@@ -74,7 +74,6 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Optional;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
@@ -274,37 +273,28 @@ boolean process(final AnalyticRuleDoc analytic,
                         final FormatterFactory formatterFactory =
                                 new FormatterFactory(sampleRequest.getDateTimeSettings());
 
-                        // Create the row creator.
-                        Optional<ItemMapper<Row>> optionalRowCreator = FilteredRowCreator.create(
-                                dataStore.getColumns(),
-                                columns,
-                                false,
-                                formatterFactory,
-                                keyFactory,
-                                tableSettings.getAggregateFilter(),
-                                expressionContext.getDateTimeSettings(),
-                                errorConsumer,
-                                expressionPredicateFactory);
-
-                        if (optionalRowCreator.isEmpty()) {
-                            optionalRowCreator = SimpleRowCreator.create(
+                        if (RowValueFilter.matches(columns)) {
+                            // Create the row creator.
+                            final ItemMapper<Row> rowCreator = FilteredRowCreator.create(
                                     dataStore.getColumns(),
                                     columns,
+                                    false,
                                     formatterFactory,
                                     keyFactory,
-                                    errorConsumer);
-                        }
-
-                        final ItemMapper<Row> rowCreator = optionalRowCreator.orElse(null);
+                                    tableSettings.getAggregateFilter(),
+                                    expressionContext.getDateTimeSettings(),
+                                    errorConsumer,
+                                    expressionPredicateFactory);
 
-                        dataStore.fetch(
-                                columns,
-                                OffsetRange.UNBOUNDED,
-                                OpenGroups.NONE,
-                                resultRequest.getTimeFilter(),
-                                rowCreator,
-                                itemConsumer,
-                                countConsumer);
+                            dataStore.fetch(
+                                    columns,
+                                    OffsetRange.UNBOUNDED,
+                                    OpenGroups.NONE,
+                                    resultRequest.getTimeFilter(),
+                                    rowCreator,
+                                    itemConsumer,
+                                    countConsumer);
+                        }
 
                     } finally {
                         final List<String> errors = errorConsumer.getErrors();

stroom-app-gwt/build.gradle

@@ -315,6 +315,7 @@ tasks.register('gwtCompile', JavaExec) {
     }
 
     args = [
+            '-sourceLevel', '17',
             '-logLevel', 'INFO',
             '-workDir', workDir,
             '-XfragmentCount', '5',
@@ -376,6 +377,7 @@ tasks.register('gwtDraftCompile', JavaExec) {
     }
 
     args = [
+            '-sourceLevel', '17',
             '-logLevel', 'INFO',
             '-workDir', workDir,
             '-draftCompile',                        // Speeds up compile with 25%
@@ -444,6 +446,7 @@ tasks.register('gwtSuperDevMode', JavaExec) {
     }
 
     args = [
+            '-sourceLevel', '17',
             '-logLevel', 'INFO',
             '-workDir', workDir,
             '-failOnError',

stroom-app/src/main/java/stroom/app/App.java

@@ -75,6 +75,8 @@
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.FilterRegistration;
 import jakarta.validation.ValidatorFactory;
+import org.eclipse.jetty.http.HttpCookie;
+import org.eclipse.jetty.server.handler.ContextHandler;
 import org.eclipse.jetty.server.session.SessionHandler;
 import org.eclipse.jetty.servlets.CrossOriginFilter;
 
@@ -385,13 +387,17 @@ private void configureSessionHandling(final Environment environment,
     private void configureSessionCookie(final Environment environment,
                                         final SessionCookieConfig sessionCookieConfig) {
         // Ensure the session cookie that provides JSESSIONID is secure.
-        final jakarta.servlet.SessionCookieConfig servletSessionCookieConfig = environment
+        final ContextHandler.Context context = environment
                 .getApplicationContext()
-                .getServletContext()
+                .getServletContext();
+
+        final jakarta.servlet.SessionCookieConfig servletSessionCookieConfig = context
                 .getSessionCookieConfig();
         servletSessionCookieConfig.setSecure(sessionCookieConfig.isSecure());
         servletSessionCookieConfig.setHttpOnly(sessionCookieConfig.isHttpOnly());
-        // TODO : Add `SameSite=Strict` when supported by JEE
+        context.setAttribute(
+                HttpCookie.SAME_SITE_DEFAULT_ATTRIBUTE,
+                sessionCookieConfig.getSameSite().getAttributeValue());
     }
 
     private static void configureCors(io.dropwizard.core.setup.Environment environment) {

stroom-app/src/main/resources/ui/css/components.css

@@ -2431,3 +2431,41 @@ button.main-menu svg {
 .permissionDetails {
     overflow-y: scroll;
 }
+
+.ColumnValuesFilterViewImpl {
+    min-width: 200px;
+    max-width: 600px;
+    min-height: 200px;
+    max-height: 600px;
+    display: flex;
+    flex-direction: column;
+    gap: var(--control__padding--vertical);
+}
+
+.ColumnValuesFilterViewImpl .bar {
+	display: flex;
+    gap: var(--control__padding--horizontal);
+}
+
+.ColumnValuesFilterViewImpl .link {
+	display: inline-block;
+	cursor: pointer;
+	padding: 2px 5px;
+    text-decoration: underline;
+}
+
+.ColumnValuesFilterViewImpl .listContainer {
+    height: 300px;
+}
+
+.columnValueCell {
+    display: flex;
+    align-items: center;
+    cursor: pointer;
+    gap: var(--row__gap--horizontal);
+    padding: var(--row__padding--vertical) var(--row__padding--horizontal);
+}
+
+.columnValueCell-text {
+	white-space: nowrap;
+}

stroom-app/src/main/resources/ui/css/dashboard.css

@@ -428,6 +428,7 @@
 
 .column-top {
     display: flex;
+    width: 100%;
     flex-direction: row;
 	cursor: pointer;
 	opacity: 0.9;
@@ -464,6 +465,13 @@
 	text-decoration: none;
 }
 
+.column-valueFilter {
+    display: flex;
+    flex-grow: 1;
+    flex-direction: row-reverse;
+    padding-right: 5px;
+}
+
 .TablePresenter input {
     width: 100%;
     display: none;

stroom-app/src/main/resources/ui/css/stroom.css

@@ -21,7 +21,7 @@ html,body {
 	width: 100%;
 	height: 100%;
 	overflow: hidden;
-	background: white;
+	background: transparent;
 	color: var(--text-color);
 	direction: ltr;
 
@@ -644,7 +644,6 @@ select option:disabled {
 }
 
 .info-page {
-	background-color: var(--page__background-color);
 	color: var(--text-color);
 	padding: 5px;
 	padding-top: 0;