Merge commit 'refs/pull/5083/head' of github.com:gchq/stroom

Author: stroomdev66

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

@@ -320,7 +320,7 @@ public ResultPage<ResultStoreInfo> find(final FindResultStoreCriteria criteria)
                         list.add(new ResultStoreInfo(
                                 new SearchRequestSource(SourceType.TABLE_BUILDER_ANALYTIC,
                                         docRef,
-                                        null),
+                                        null, null),
                                 searchRequest.getKey(),
                                 null,
                                 analyticRuleDoc.getCreateTimeMs(),

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

@@ -287,7 +287,9 @@ boolean process(final AnalyticRuleDoc analytic,
                                     errorConsumer,
                                     expressionPredicateFactory,
                                     mapper);
-                            mapper = ConditionalFormattingMapper.create(
+
+                            mapper = ConditionalFormattingMapper.create(resultRequest.getSourceComponentId(),
+                                    resultRequest.getSourceComponentName(),
                                     columns,
                                     tableSettings.getConditionalFormattingRules(),
                                     expressionContext.getDateTimeSettings(),

stroom-app/src/test/java/stroom/search/AbstractSearchTest.java

@@ -91,13 +91,14 @@ public static void testInteractive(
         for (final String componentId : componentIds) {
             final TableSettings tableSettings = tableSettingsCreator.apply(extractValues);
 
-            final ResultRequest tableResultRequest = new ResultRequest(componentId,
+            final ResultRequest tableResultRequest = new ResultRequest(componentId, null,
                     Collections.singletonList(tableSettings),
                     null,
                     null,
                     null,
                     ResultRequest.ResultStyle.TABLE,
                     Fetch.CHANGES,
+                    null,
                     null);
             resultRequests.add(tableResultRequest);
         }

stroom-app/src/test/java/stroom/search/TestEventSearch.java

@@ -101,13 +101,14 @@ private void test(final ExpressionOperator.Builder expressionIn,
         for (final String componentId : componentIds) {
             final TableSettings tableSettings = createTableSettings(index, extractValues);
 
-            final ResultRequest tableResultRequest = new ResultRequest(componentId,
+            final ResultRequest tableResultRequest = new ResultRequest(componentId, null,
                     Collections.singletonList(tableSettings),
                     null,
                     null,
                     null,
                     ResultRequest.ResultStyle.TABLE,
                     Fetch.CHANGES,
+                    null,
                     null);
             resultRequests.add(tableResultRequest);
         }

stroom-app/src/test/java/stroom/search/TestTagCloudSearch.java

@@ -106,13 +106,14 @@ void test() {
                 "2016-01-02T00:00:00.000Z");
         final Query query = Query.builder().dataSource(indexRef).expression(expression.build()).build();
 
-        final ResultRequest tableResultRequest = new ResultRequest(componentId,
+        final ResultRequest tableResultRequest = new ResultRequest(componentId, null,
                 Collections.singletonList(tableSettings),
                 null,
                 null,
                 null,
                 ResultRequest.ResultStyle.TABLE,
                 Fetch.CHANGES,
+                null,
                 null);
 
         final List<ResultRequest> resultRequests = Collections.singletonList(tableResultRequest);

stroom-core-client/src/main/java/stroom/dashboard/client/embeddedquery/EmbeddedQueryPresenter.java

@@ -575,7 +575,7 @@ private void run(final boolean incremental,
 
             // Start search.
             final DashboardContext dashboardContext = getDashboardContext();
-            queryModel.startNewSearch(
+            queryModel.startNewSearch(getComponentConfig().getId(), getComponentConfig().getName(),
                     replaced,
                     dashboardContext.getParams(),
                     dashboardContext.getResolvedTimeRange(),
@@ -851,7 +851,9 @@ public QueryResultTablePresenter getCurrentTablePresenter() {
 
     @Override
     public void onContentTabVisible(final boolean visible) {
-        currentTablePresenter.onContentTabVisible(visible);
+        if (currentTablePresenter != null) {
+            currentTablePresenter.onContentTabVisible(visible);
+        }
     }
 
     public interface EmbeddedQueryView extends View, RequiresResize {

stroom-core-client/src/main/java/stroom/dashboard/client/table/TablePresenter.java

@@ -1010,6 +1010,7 @@ public void read(final ComponentConfig componentConfig) {
         tableResultRequest = tableResultRequest
                 .copy()
                 .componentId(componentConfig.getId())
+                .tableName(componentConfig.getName())
                 .build();
 
         final ComponentSettings settings = componentConfig.getSettings();

stroom-core-client/src/main/java/stroom/query/client/presenter/QueryEditPresenter.java

@@ -396,6 +396,8 @@ private void run(final boolean incremental,
 
         // Start search.
         queryModel.startNewSearch(
+                null,
+                null,
                 editorPresenter.getText(),
                 null, //getDashboardContext().getCombinedParams(),
                 queryToolbarPresenter.getTimeRange(),

stroom-core-client/src/main/java/stroom/query/client/presenter/QueryModel.java

@@ -147,7 +147,9 @@ public void reset(final DestroyReason destroyReason) {
     /**
      * Begin executing a new search using the supplied query expression.
      */
-    public void startNewSearch(final String query,
+    public void startNewSearch(final String componentId,
+                               final String componentName,
+                               final String query,
                                final List<Param> params,
                                final TimeRange timeRange,
                                final boolean incremental,
@@ -173,6 +175,8 @@ public void startNewSearch(final String query,
                 .searchRequestSource(
                         SearchRequestSource
                                 .builder()
+                                .componentId(componentId)
+                                .componentName(componentName)
                                 .sourceType(sourceType)
                                 .ownerDocRef(queryDocRef)
                                 .build())

stroom-dashboard/stroom-dashboard-impl/src/main/java/stroom/dashboard/impl/SearchRequestMapper.java

@@ -148,6 +148,8 @@ private List<ResultRequest> mapResultRequests(final DashboardSearchRequest searc
 
                 final ResultRequest copy = ResultRequest.builder()
                         .componentId(tableResultRequest.getComponentId())
+                        .searchRequestSource(searchRequest.getSearchRequestSource())
+                        .tableName(tableResultRequest.getTableName())
                         .addMappings(tableResultRequest.getTableSettings())
                         .requestedRange(tableResultRequest.getRequestedRange())
                         .resultStyle(ResultStyle.TABLE)