loader in expressions

Author: mbondyra

src/platform/plugins/shared/data/common/search/expressions/esaggs/request_handler.ts

@@ -13,7 +13,7 @@ import { defer } from 'rxjs';
 import { map, switchMap } from 'rxjs';
 import type { Adapters } from '@kbn/inspector-plugin/common';
 import type { DataView } from '@kbn/data-views-plugin/common';
-import type { Filter, TimeRange } from '@kbn/es-query';
+import type { Filter, ProjectRouting, TimeRange } from '@kbn/es-query';
 
 import type { Query } from '../../..';
 import { calculateBounds } from '../../..';
@@ -38,6 +38,7 @@ export interface RequestHandlerParams {
   executionContext?: KibanaExecutionContext;
   title?: string;
   description?: string;
+  projectRouting?: ProjectRouting;
 }
 
 export const handleRequest = ({
@@ -56,6 +57,7 @@ export const handleRequest = ({
   executionContext,
   title,
   description,
+  projectRouting,
 }: RequestHandlerParams) => {
   return defer(async () => {
     const forceNow = getNow?.();
@@ -107,6 +109,10 @@ export const handleRequest = ({
     requestSearchSource.setField('filter', filters);
     requestSearchSource.setField('query', query);
 
+    if (projectRouting) {
+      requestSearchSource.setField('projectRouting', projectRouting);
+    }
+
     return { allTimeFields, forceNow, requestSearchSource };
   }).pipe(
     switchMap(({ allTimeFields, forceNow, requestSearchSource }) =>

src/platform/plugins/shared/data/common/search/search_source/search_source.ts

@@ -680,6 +680,8 @@ export class SearchSource {
         return addToBody(key, sort);
       case 'pit':
         return addToRoot(key, val);
+      case 'projectRouting':
+        return addToRoot('project_routing', val);
       case 'aggs':
         if ((val as unknown) instanceof AggConfigs) {
           return addToBody('aggs', val.toDsl());

src/platform/plugins/shared/data/common/search/search_source/types.ts

@@ -9,7 +9,7 @@
 
 import type { estypes } from '@elastic/elasticsearch';
 import type { RequestAdapter } from '@kbn/inspector-plugin/common';
-import type { AggregateQuery, Filter, Query } from '@kbn/es-query';
+import type { AggregateQuery, Filter, ProjectRouting, Query } from '@kbn/es-query';
 import type { Serializable, SerializableRecord } from '@kbn/utility-types';
 import type { PersistableStateService } from '@kbn/kibana-utils-plugin/common';
 import type { ISearchOptions } from '@kbn/search-types';
@@ -116,6 +116,10 @@ export interface SearchSourceFields {
    * Allow querying to use a point-in-time ID for paging results
    */
   pit?: estypes.SearchPointInTimeReference;
+  /**
+   * {@link ProjectRouting}
+   */
+  projectRouting?: ProjectRouting;
 
   parent?: SearchSourceFields;
 }
@@ -164,6 +168,10 @@ export type SerializedSearchSourceFields = {
   searchAfter?: estypes.SortResults;
   timeout?: string;
   terminate_after?: number;
+  /**
+   * {@link ProjectRouting}
+   */
+  projectRouting?: ProjectRouting;
 
   parent?: SerializedSearchSourceFields;
 };

src/platform/plugins/shared/data/public/search/expressions/esaggs.ts

@@ -67,6 +67,7 @@ export function getFunctionDefinition({
       }).pipe(
         switchMap(({ aggConfigs, indexPattern, searchSource, getNow, handleEsaggsRequest }) => {
           const { disableWarningToasts } = getSearchContext();
+          const projectRouting = get(input, 'projectRouting', undefined);
 
           return handleEsaggsRequest({
             abortSignal,
@@ -82,6 +83,7 @@ export function getFunctionDefinition({
             disableWarningToasts: (disableWarningToasts || false) as boolean,
             getNow,
             executionContext: getExecutionContext(),
+            projectRouting,
           });
         })
       );

src/platform/plugins/shared/data/server/search/expressions/esaggs.ts

@@ -75,6 +75,7 @@ export function getFunctionDefinition({
             disableWarningToasts: false,
             timeFields: args.timeFields,
             timeRange: get(input, 'timeRange', undefined),
+            projectRouting: get(input, 'projectRouting', undefined),
           })
         )
       );

src/platform/plugins/shared/expressions/public/loader.ts

@@ -172,11 +172,18 @@ export class ExpressionLoader {
     }
 
     if (params.searchContext) {
-      this.params.searchContext = defaults(
-        {},
-        params.searchContext,
-        this.params.searchContext || {}
-      );
+      console.log('searchContext in setParams:',   {}, params.searchContext, this.params.searchContext);
+      console.log('searchContext in setParams:',   defaults(
+          {},
+          params.searchContext,
+          this.params.searchContext || {}
+        ));
+
+        this.params.searchContext = defaults(
+          {},
+          params.searchContext,
+          this.params.searchContext || {}
+        );
     }
     if (params.uiState && this.params) {
       this.params.uiState = params.uiState;

src/platform/plugins/shared/unified_search/public/project_picker/project_picker.tsx

@@ -195,7 +195,11 @@ export const ProjectPicker = ({ projectRouting, onProjectRoutingChange }: Projec
   const originProject: Project = Object.values(response.origin)[0];
 
   const projects =
-    projectRouting === '_alias:_origin' ? [originProject] : [originProject, ...linkedProjects];
+    projectRouting === '_alias:_origin'
+      ? [originProject]
+      : projectRouting === '_alias:*' || projectRouting === undefined
+      ? [originProject, ...linkedProjects]
+      : [originProject, ...linkedProjects];
 
   useEffect(() => {
     // TODO: replace with fetch linked projects from cross project API
@@ -293,25 +297,39 @@ export const ProjectPicker = ({ projectRouting, onProjectRoutingChange }: Projec
           <EuiButtonGroup
             isFullWidth
             legend={strings.getProjectPickerButtonAriaLabel()}
-            idSelected={projectRouting ?? '_alias:*'}
+            idSelected={projectRouting ?? 'undefined'}
             options={[
               {
                 id: '_alias:*',
                 value: '_alias:*',
                 label: i18n.translate('unifiedSearch.projectPicker.allProjectsLabel', {
-                  defaultMessage: 'All projects',
+                  defaultMessage: 'All projects (explicit)',
                 }),
               },
               {
                 id: '_alias:_origin',
                 value: '_alias:_origin',
                 label: strings.getOriginProjectLabel(),
               },
+              {
+                id: 'undefined',
+                value: 'undefined',
+                label: i18n.translate('unifiedSearch.projectPicker.undefinedLabel', {
+                  defaultMessage: 'Undefined (test)',
+                }),
+              },
             ]}
             onChange={(value: string) => {
               // TODO: add telemetry for project scope change?
-              const newProjectRouting: ProjectRouting =
-                value === '_alias:_origin' ? '_alias:_origin' : '_alias:*';
+              let newProjectRouting: ProjectRouting | undefined;
+              if (value === '_alias:_origin') {
+                newProjectRouting = '_alias:_origin';
+              } else if (value === '_alias:*') {
+                newProjectRouting = '_alias:*';
+              } else {
+                newProjectRouting = undefined;
+              }
+              console.log('[ProjectPicker] onChange:', { value, newProjectRouting });
               onProjectRoutingChange?.(newProjectRouting);
             }}
             css={{ margin: '8px' }}
@@ -333,7 +351,9 @@ export const ProjectPicker = ({ projectRouting, onProjectRoutingChange }: Projec
                 defaultMessage="Searching across {numberOfProjects, plural, one {# project} other {# projects}}"
                 values={{
                   numberOfProjects:
-                    projectRouting === '_alias:_origin' ? 1 : linkedProjects.length + 1,
+                    projectRouting === '_alias:_origin'
+                      ? 1
+                      : linkedProjects.length + 1,
                 }}
               />
             </h6>

x-pack/platform/plugins/shared/lens/public/app_plugin/lens_top_nav.tsx

@@ -1008,9 +1008,9 @@ export const LensTopNavMenu = ({
       if (value !== projectRouting) {
         const newProjectRouting = value === '_alias:*' ? undefined : value;
         // Start a new search session when project routing changes
-        console.log('Project routing changed from:', projectRouting, 'to:', newProjectRouting);
+        console.log('Project routing changed from:', projectRouting, 'to:', value);
         dispatchSetState({ 
-          projectRouting: newProjectRouting,
+          projectRouting: value,
           searchSessionId: data.search.session.start(),
           resolvedDateRange: getResolvedDateRange(data.query.timefilter.timefilter),
         });

x-pack/platform/plugins/shared/lens/public/react_embeddable/expressions/merged_search_context.ts

@@ -26,6 +26,7 @@ export interface MergedSearchContext {
   filters: Filter[];
   disableWarningToasts: boolean;
   esqlVariables?: ESQLControlVariable[];
+  projectRouting?: ProjectRouting;
 }
 
 export function getMergedSearchContext(
@@ -35,11 +36,13 @@ export function getMergedSearchContext(
     query,
     timeRange,
     esqlVariables,
+    projectRouting,
   }: {
     filters?: Filter[];
     query?: Query | AggregateQuery;
     timeRange?: TimeRange;
     esqlVariables?: ESQLControlVariable[];
+    projectRouting?: ProjectRouting;
   },
   customTimeRange$: PublishingSubject<TimeRange | undefined>,
   parentApi: unknown,
@@ -70,6 +73,7 @@ export function getMergedSearchContext(
     query: [attributes.state.query].filter(nonNullable),
     filters: injectFilterReferences(attributes.state.filters || [], attributes.references),
     disableWarningToasts: true,
+    projectRouting,
   };
   // Prepend query and filters from dashboard to the visualization ones
   if (query) {

x-pack/platform/plugins/shared/lens/public/state_management/selectors.ts

@@ -60,17 +60,21 @@ export const selectExecutionContext = createSelector(
   })
 );
 
-export const selectExecutionContextSearch = createSelector(selectExecutionContext, (res) => ({
-  now: res.now,
-  query: isOfAggregateQueryType(res.query) ? undefined : res.query,
-  timeRange: {
-    from: res.dateRange.fromDate,
-    to: res.dateRange.toDate,
-  },
-  filters: res.filters,
-  disableWarningToasts: true,
-  projectRouting: res.projectRouting,
-}));
+export const selectExecutionContextSearch = createSelector(selectExecutionContext, (res) => {
+  const result = {
+    now: res.now,
+    query: isOfAggregateQueryType(res.query) ? undefined : res.query,
+    timeRange: {
+      from: res.dateRange.fromDate,
+      to: res.dateRange.toDate,
+    },
+    filters: res.filters,
+    disableWarningToasts: true,
+    projectRouting: res.projectRouting,
+  };
+  console.log('[selectExecutionContextSearch] projectRouting:', res.projectRouting);
+  return result;
+});
 
 const selectInjectedDependencies = (_state: LensState, dependencies: unknown) => dependencies;