fix(headless): advanced search queries parameters are not passed along

packages/headless/src/api/knowledge/stream-answer-api.ts

@@ -1,4 +1,5 @@
 import {createSelector, ThunkDispatch, UnknownAction} from '@reduxjs/toolkit';
+import {selectAdvancedSearchQueries} from '../../features/advanced-search-queries/advanced-search-query-selectors.js';
 import {
   setAnswerContentFormat,
   setCannotAnswer,
@@ -276,6 +277,7 @@ export const constructAnswerQueryParams = (
   usage: 'fetch' | 'select'
 ) => {
   const q = selectQuery(state)?.q;
+  const advancedQueryParams = selectAdvancedSearchQueries(state) ?? {};
   const searchHub = selectSearchHub(state);
   const pipeline = selectPipeline(state);
   const citationsFieldToInclude = selectFieldsToIncludeInCitation(state) ?? [];
@@ -286,6 +288,7 @@ export const constructAnswerQueryParams = (
 
   return {
     q,
+    ...advancedQueryParams,
     pipelineRuleParameters: {
       mlGenerativeQuestionAnswering: {
         responseFormat: state.generatedAnswer.responseFormat,

packages/headless/src/api/knowledge/tests/stream-answer-api-state-mock.ts

@@ -186,6 +186,22 @@ export const streamAnswerAPIStateMock: StateNeededByAnswerAPI = {
     q: 'what is the hardest wood',
     enableQuerySyntax: false,
   },
+  advancedSearchQueries: {
+    aq: 'aq-test-query',
+    aqWasSet: true,
+    cq: 'cq-test-query',
+    cqWasSet: true,
+    dq: 'dq-test-query',
+    dqWasSet: true,
+    lq: 'lq-test-query',
+    lqWasSet: true,
+    defaultFilters: {
+      cq: '',
+      aq: '',
+      lq: '',
+      dq: '',
+    },
+  },
   querySuggest: {},
   querySet: {
     'atomic-search-box-ie7ah': 'what is the hardest wood',
@@ -1056,6 +1072,10 @@ export const streamAnswerAPIStateMock: StateNeededByAnswerAPI = {
 
 export const expectedStreamAnswerAPIParam = {
   q: 'what is the hardest wood',
+  aq: 'aq-test-query',
+  cq: 'cq-test-query',
+  dq: 'dq-test-query',
+  lq: 'lq-test-query',
   pipelineRuleParameters: {
     mlGenerativeQuestionAnswering: {
       responseFormat: {

packages/headless/src/features/advanced-search-queries/advanced-search-query-selectors.test.ts

@@ -0,0 +1,49 @@
+import {AdvancedSearchQueriesState} from './advanced-search-queries-state.js';
+import {selectAdvancedSearchQueries} from './advanced-search-query-selectors.js';
+
+describe('advancedQuerySearch Selectors test suite', () => {
+  describe('#selectAdvancedSearchQueries', () => {
+    it('should return an empty object when advancedSearchQueries is undefined', () => {
+      const expectedOutput = {};
+      const state = {advancedSearchQueries: undefined};
+
+      const result = selectAdvancedSearchQueries(state);
+
+      expect(result).toEqual(expectedOutput);
+    });
+
+    it('should return only the properties aq, cq, dq, and lq from the state', () => {
+      const exampleAdvancedSearchQueries: AdvancedSearchQueriesState =
+        newExampleAdvancedSearchQueriesStateFixture();
+      const expectedOutput = {
+        aq: 'aq-parameter-value',
+        cq: 'cq-parameter-value',
+        dq: 'dq-parameter-value',
+        lq: 'lq-parameter-value',
+      };
+      const state = {advancedSearchQueries: exampleAdvancedSearchQueries};
+
+      const result = selectAdvancedSearchQueries(state);
+      expect(result).toEqual(expectedOutput);
+    });
+  });
+});
+
+function newExampleAdvancedSearchQueriesStateFixture() {
+  return {
+    aq: 'aq-parameter-value',
+    cq: 'cq-parameter-value',
+    dq: 'dq-parameter-value',
+    lq: 'lq-parameter-value',
+    aqWasSet: true,
+    cqWasSet: false,
+    dqWasSet: false,
+    lqWasSet: true,
+    defaultFilters: {
+      aq: 'a-default-aq-parameter-value',
+      cq: 'a-default-cq-parameter-value',
+      dq: 'a-default-dq-parameter-value',
+      lq: 'a-default-lq-parameter-value',
+    },
+  };
+}

packages/headless/src/features/advanced-search-queries/advanced-search-query-selectors.ts

@@ -0,0 +1,14 @@
+import {createSelector} from '@reduxjs/toolkit';
+import {AdvancedSearchQueriesState} from './advanced-search-queries-state.js';
+
+export const selectAdvancedSearchQueries = createSelector(
+  (state: {advancedSearchQueries?: AdvancedSearchQueriesState}) =>
+    state.advancedSearchQueries,
+  (advancedSearchQueries) => {
+    if (!advancedSearchQueries) {
+      return {};
+    }
+    const {aq, cq, dq, lq} = advancedSearchQueries;
+    return {aq, cq, dq, lq};
+  }
+);