@servicetitan/titan-chatbot-api 4.4.1 → 4.4.3

package/src/api-client/utils/model-utils.ts

@@ -16,6 +16,7 @@ export function createSelectionsModel(
                     subOptions: {},
                 });
             }
+            return result.subOptions!;
         };
 
         const filterList = filters.filter(
@@ -25,8 +26,7 @@ export function createSelectionsModel(
             const selectedLeafOptions = filter.subOptions!.filter(
                 x =>
                     x.type === Models.OptionType.Selectable &&
-                    selected.get(filter.key)?.includes(x.key!) &&
-                    !x.subOptions?.length
+                    selected.get(filter.key)?.includes(x.key!)
             );
             let values: string[] | undefined;
             if (selectedLeafOptions.length) {
@@ -35,10 +35,14 @@ export function createSelectionsModel(
                     ?.map(o => o.key)
                     .filter(o => selected.get(filter.key)?.includes(o));
                 if (values?.length) {
-                    ensureResult();
-                    result!.subOptions![filter.key] = new Models.Selections({ values });
+                    const subOptions = ensureResult();
+                    subOptions[filter.key] = new Models.Selections({ values });
                 }
             }
+            if (!selectedLeafOptions.length) {
+                continue;
+            }
+
             // Non-leaf filter: add selected options as selectables and process sub-filters
             const selectedNonLeafOptions = filter.subOptions!.filter(
                 x =>
@@ -49,21 +53,32 @@ export function createSelectionsModel(
             if (!selectedNonLeafOptions.length) {
                 continue;
             }
-            ensureResult();
-            const filterResult = new Models.Selections({
-                values,
-                subOptions: {},
-            });
-            result!.subOptions![filter.key] = filterResult;
-            for (const noneLeafOption of selectedNonLeafOptions) {
-                // Process sub-filters: if any sub-filters selected, add them to the result
-                const subFilters = noneLeafOption.subOptions!;
+
+            // We have some sub-filters to process: collect their results
+            const subFilterResults = new Map<string, Models.Selections>();
+            for (const nonLeafOption of selectedNonLeafOptions) {
+                const subFilters = nonLeafOption.subOptions!;
                 const resultSubFilters = process(subFilters);
-                filterResult.subOptions![noneLeafOption.key] =
-                    resultSubFilters ??
-                    new Models.Selections({
-                        subOptions: {},
-                    });
+                if (!resultSubFilters) {
+                    continue;
+                }
+                subFilterResults.set(nonLeafOption.key!, resultSubFilters);
+            }
+
+            // If any sub-filters selected, ensure result and add them to the current subOptions
+            if (subFilterResults.size) {
+                const subOptions = ensureResult();
+                for (const [key, value] of subFilterResults) {
+                    let subFilterSelection = subOptions[filter.key];
+                    if (!subFilterSelection) {
+                        subFilterSelection = new Models.Selections({});
+                        subOptions[filter.key] = subFilterSelection;
+                    }
+                    if (!subFilterSelection.subOptions) {
+                        subFilterSelection.subOptions = {};
+                    }
+                    subFilterSelection.subOptions![key] = value;
+                }
             }
         }
         return result;

package/src/stores/__tests__/filter.store.test.ts

@@ -277,6 +277,7 @@ describe('[FilterStore]', () => {
         expect(exported).toEqual({
             subOptions: {
                 Sources: {
+                    values: ['KnowledgeBase', 'Jarvis'],
                     subOptions: {
                         KnowledgeBase: {
                             subOptions: {
@@ -314,11 +315,7 @@ describe('[FilterStore]', () => {
         expect(exported).toEqual({
             subOptions: {
                 Sources: {
-                    subOptions: {
-                        KnowledgeBase: {
-                            subOptions: {},
-                        },
-                    },
+                    values: ['KnowledgeBase'],
                 },
             },
         });
@@ -335,6 +332,7 @@ describe('[FilterStore]', () => {
         expect(exported).toEqual({
             subOptions: {
                 Sources: {
+                    values: ['KnowledgeBase'],
                     subOptions: {
                         KnowledgeBase: {
                             subOptions: {
@@ -359,6 +357,7 @@ describe('[FilterStore]', () => {
         expect(exported).toEqual({
             subOptions: {
                 Sources: {
+                    values: ['KnowledgeBase', 'Jarvis'],
                     subOptions: {
                         KnowledgeBase: {
                             subOptions: {