@flarehr/apollo-super-selection 4.9.20170 → 4.10.22178

package/dist/lib/cjs/sss-button_29.cjs.entry.js

@@ -264,7 +264,7 @@ class TapSubscriber extends datoramaAkita.Subscriber {
     }
 }
 
-const AppVersion = '4.9.20170';
+const AppVersion = '4.10.22178';
 
 // -------------------------------------------------------------------------------------
 // guards
@@ -3279,13 +3279,23 @@ function e(e){this.message=e;}e.prototype=new Error,e.prototype.name="InvalidCha
 class SuperSelectionApi {
   async getAustralianFundsAsync(searchFilter, includeInactive = false) {
     return buildBackendApiClient()
-      .url(`super-choice/australian-funds?${this.toQueryString(includeInactive, searchFilter)}`)
+      .url(`super-choice/australian-funds-v2?${this.toQueryString(includeInactive, searchFilter)}`)
       .get()
       .notFound(() => {
       throw new Error('Failed to fetch the list of australian super funds.');
     })
       .json();
   }
+  async getAustralianFundAsync(usi, includeInactive) {
+    const queryStr = includeInactive ? '?includeInactive=true' : '';
+    return buildBackendApiClient()
+      .url(`super-choice/australian-funds/${usi}${queryStr}`)
+      .get()
+      .notFound(() => {
+      throw new Error('Failed to fetch australian super fund.');
+    })
+      .json();
+  }
   async getAppStateAsync() {
     return buildBackendApiClient()
       .url('client-app-state')
@@ -3296,12 +3306,8 @@ class SuperSelectionApi {
       .json();
   }
   toSearchFilterQueryString(searchFilter) {
-    switch (searchFilter.type) {
-      case 'partialMatch':
-        return `search=${searchFilter.searchString}&maxRecordCount=${searchFilter.maxRecordCount}`;
-      case 'usiMatch':
-        return `usi=${searchFilter.usi}`;
-    }
+    return (`search=${searchFilter.searchString}` +
+      (searchFilter.maxRecordCount > 0 ? '&maxRecordCount=' + searchFilter.maxRecordCount : ''));
   }
   toQueryString(includeInactive, searchFilter) {
     const search = this.toSearchFilterQueryString(searchFilter);
@@ -3727,26 +3733,15 @@ const CustomFund = class {
 injectHistory(CustomFund);
 
 class AustralianFundLookupService {
-  searchFundsAsync(searchString, maxRecordCount) {
+  async searchFundsAsync(searchString, maxRecordCount) {
     return superSelectionApi.getAustralianFundsAsync({
-      type: 'partialMatch',
       searchString,
       maxRecordCount
     });
   }
-  async getActiveFundByUsiAsync(usi) {
-    const results = await superSelectionApi.getAustralianFundsAsync({ type: 'usiMatch', usi });
-    if (results.length === 1) {
-      return Option.some(results[0]);
-    }
-    return Option.none;
-  }
-  async getFundByUsiAsync(usi) {
-    const results = await superSelectionApi.getAustralianFundsAsync({ type: 'usiMatch', usi }, true);
-    if (results.length === 1) {
-      return Option.some(results[0]);
-    }
-    return Option.none;
+  async getFundAsync(usi, includeInactive) {
+    const result = await superSelectionApi.getAustralianFundAsync(usi, includeInactive);
+    return Option.some(result);
   }
 }
 const australianFundLookupService = new AustralianFundLookupService();
@@ -3804,7 +3799,7 @@ const DefaultFund = class {
       return;
     }
     this.isDefaultFundExists = true;
-    const defaultFundSearchResult = await australianFundLookupService.getActiveFundByUsiAsync(defaultFundUsi.value);
+    const defaultFundSearchResult = await australianFundLookupService.getFundAsync(defaultFundUsi.value, true);
     if (Option.isNone(defaultFundSearchResult)) {
       this.isInvalidDefaultFund = true;
       return;
@@ -3863,10 +3858,22 @@ const SelectInputAsync = class {
       this.inputValue = searchQuery;
       this.searchState = 'in progress';
     };
-    this.onCompleteSearch = (results) => {
-      this.filteredOptions = results;
+    this.onCompleteSearch = (result) => {
       this.highlightedOptionIndex = undefined;
-      this.searchState = 'done';
+      switch (result.kind) {
+        case 'too-many-results':
+          this.searchState = 'too many results';
+          this.filteredOptions = [];
+          break;
+        case 'success':
+          this.searchState = 'done';
+          this.filteredOptions = result.value;
+          break;
+        default:
+          this.searchState = 'done';
+          this.filteredOptions = [];
+          break;
+      }
     };
     this.renderFilteredResults = () => {
       if (this.searchState === 'pristine') {
@@ -3875,6 +3882,9 @@ const SelectInputAsync = class {
       if (this.searchState === 'in progress') {
         return index.h("span", { class: "cursor-pointer text-gray-500 py-1.5 pl-4" }, "Searching...");
       }
+      if (this.searchState === 'too many results') {
+        return (index.h("span", { class: "cursor-pointer text-gray-500 py-1.5 pl-4" }, "Keep typing to narrow down your search."));
+      }
       if (this.filteredOptions.length === 0) {
         return (index.h("span", { class: "cursor-pointer text-gray-500 py-1.5 pl-4" }, "No items match your search"));
       }
@@ -4283,7 +4293,7 @@ class ExistingFundService {
       .text();
   }
   getFundByUsiAsync(usi) {
-    return australianFundLookupService.getFundByUsiAsync(usi);
+    return australianFundLookupService.getFundAsync(usi, true);
   }
   toFundValidState(fund) {
     if (isSome(fund)) {
@@ -4496,15 +4506,23 @@ const MyOwnFundInputs = class {
     index.registerInstance(this, hostRef);
     this.formChanged = index.createEvent(this, "formChanged", 7);
     this.MIN_SEARCH_STRING_LENGTH = 3;
-    this.MAX_RECORD_COUNT = 10;
+    this.MAX_RECORD_COUNT = 25;
     this.searchFundsAsync = async (searchBy) => {
-      const funds = await australianFundLookupService.searchFundsAsync(searchBy, this.MAX_RECORD_COUNT);
-      return funds
-        .sort((a, b) => a.productName.localeCompare(b.productName))
-        .map((fund) => ({
-        label: `${fund.productName} (${fund.usi})`,
-        value: fund.usi
-      }));
+      const response = await australianFundLookupService.searchFundsAsync(searchBy, this.MAX_RECORD_COUNT);
+      switch (response.result) {
+        case 'TooManyResults': {
+          return { kind: 'too-many-results' };
+        }
+        default: {
+          const funds = response.data
+            .sort((a, b) => a.productName.localeCompare(b.productName))
+            .map((fund) => ({
+            label: `${fund.productName} (${fund.usi})`,
+            value: fund.usi
+          }));
+          return { kind: 'success', value: funds };
+        }
+      }
     };
   }
   render() {

package/dist/lib/collection/components/super-selection-app/api/super-selection.api.js

@@ -2,13 +2,23 @@ import { buildBackendApiClient } from './api-client';
 export class SuperSelectionApi {
   async getAustralianFundsAsync(searchFilter, includeInactive = false) {
     return buildBackendApiClient()
-      .url(`super-choice/australian-funds?${this.toQueryString(includeInactive, searchFilter)}`)
+      .url(`super-choice/australian-funds-v2?${this.toQueryString(includeInactive, searchFilter)}`)
       .get()
       .notFound(() => {
       throw new Error('Failed to fetch the list of australian super funds.');
     })
       .json();
   }
+  async getAustralianFundAsync(usi, includeInactive) {
+    const queryStr = includeInactive ? '?includeInactive=true' : '';
+    return buildBackendApiClient()
+      .url(`super-choice/australian-funds/${usi}${queryStr}`)
+      .get()
+      .notFound(() => {
+      throw new Error('Failed to fetch australian super fund.');
+    })
+      .json();
+  }
   async getAppStateAsync() {
     return buildBackendApiClient()
       .url('client-app-state')
@@ -19,12 +29,8 @@ export class SuperSelectionApi {
       .json();
   }
   toSearchFilterQueryString(searchFilter) {
-    switch (searchFilter.type) {
-      case 'partialMatch':
-        return `search=${searchFilter.searchString}&maxRecordCount=${searchFilter.maxRecordCount}`;
-      case 'usiMatch':
-        return `usi=${searchFilter.usi}`;
-    }
+    return (`search=${searchFilter.searchString}` +
+      (searchFilter.maxRecordCount > 0 ? '&maxRecordCount=' + searchFilter.maxRecordCount : ''));
   }
   toQueryString(includeInactive, searchFilter) {
     const search = this.toSearchFilterQueryString(searchFilter);

package/dist/lib/collection/components/super-selection-app/funds/custom-fund/default-fund/default-fund.js

@@ -17,7 +17,7 @@ export class DefaultFund {
       return;
     }
     this.isDefaultFundExists = true;
-    const defaultFundSearchResult = await australianFundLookupService.getActiveFundByUsiAsync(defaultFundUsi.value);
+    const defaultFundSearchResult = await australianFundLookupService.getFundAsync(defaultFundUsi.value, true);
     if (O.isNone(defaultFundSearchResult)) {
       this.isInvalidDefaultFund = true;
       return;

package/dist/lib/collection/components/super-selection-app/funds/custom-fund/my-own-fund/my-own-fund-inputs.js

@@ -5,15 +5,23 @@ import customFundState from '../custom-fund.store';
 export class MyOwnFundInputs {
   constructor() {
     this.MIN_SEARCH_STRING_LENGTH = 3;
-    this.MAX_RECORD_COUNT = 10;
+    this.MAX_RECORD_COUNT = 25;
     this.searchFundsAsync = async (searchBy) => {
-      const funds = await australianFundLookupService.searchFundsAsync(searchBy, this.MAX_RECORD_COUNT);
-      return funds
-        .sort((a, b) => a.productName.localeCompare(b.productName))
-        .map((fund) => ({
-        label: `${fund.productName} (${fund.usi})`,
-        value: fund.usi
-      }));
+      const response = await australianFundLookupService.searchFundsAsync(searchBy, this.MAX_RECORD_COUNT);
+      switch (response.result) {
+        case 'TooManyResults': {
+          return { kind: 'too-many-results' };
+        }
+        default: {
+          const funds = response.data
+            .sort((a, b) => a.productName.localeCompare(b.productName))
+            .map((fund) => ({
+            label: `${fund.productName} (${fund.usi})`,
+            value: fund.usi
+          }));
+          return { kind: 'success', value: funds };
+        }
+      }
     };
   }
   render() {

package/dist/lib/collection/components/super-selection-app/misc/dropdown-async.js

@@ -22,10 +22,22 @@ export class SelectInputAsync {
       this.inputValue = searchQuery;
       this.searchState = 'in progress';
     };
-    this.onCompleteSearch = (results) => {
-      this.filteredOptions = results;
+    this.onCompleteSearch = (result) => {
       this.highlightedOptionIndex = undefined;
-      this.searchState = 'done';
+      switch (result.kind) {
+        case 'too-many-results':
+          this.searchState = 'too many results';
+          this.filteredOptions = [];
+          break;
+        case 'success':
+          this.searchState = 'done';
+          this.filteredOptions = result.value;
+          break;
+        default:
+          this.searchState = 'done';
+          this.filteredOptions = [];
+          break;
+      }
     };
     this.renderFilteredResults = () => {
       if (this.searchState === 'pristine') {
@@ -34,6 +46,9 @@ export class SelectInputAsync {
       if (this.searchState === 'in progress') {
         return h("span", { class: "cursor-pointer text-gray-500 py-1.5 pl-4" }, "Searching...");
       }
+      if (this.searchState === 'too many results') {
+        return (h("span", { class: "cursor-pointer text-gray-500 py-1.5 pl-4" }, "Keep typing to narrow down your search."));
+      }
       if (this.filteredOptions.length === 0) {
         return (h("span", { class: "cursor-pointer text-gray-500 py-1.5 pl-4" }, "No items match your search"));
       }
@@ -179,13 +194,13 @@ export class SelectInputAsync {
       "type": "unknown",
       "mutable": false,
       "complexType": {
-        "original": "(query: string) => Promise<SelectInputOption<unknown>[]>",
-        "resolved": "((query: string) => Promise<SelectInputOption<unknown>[]>) | undefined",
+        "original": "(query: string) => Promise<SearchResult<unknown>>",
+        "resolved": "((query: string) => Promise<SearchResult<unknown>>) | undefined",
         "references": {
           "Promise": {
             "location": "global"
           },
-          "SelectInputOption": {
+          "SearchResult": {
             "location": "local"
           }
         }

package/dist/lib/collection/components/super-selection-app/services/australian-fund-lookup.service.js

@@ -1,26 +1,15 @@
-import { none, some } from 'fp-ts/lib/Option';
+import { some } from 'fp-ts/lib/Option';
 import superSelectionApi from '../api/super-selection.api';
 export class AustralianFundLookupService {
-  searchFundsAsync(searchString, maxRecordCount) {
+  async searchFundsAsync(searchString, maxRecordCount) {
     return superSelectionApi.getAustralianFundsAsync({
-      type: 'partialMatch',
       searchString,
       maxRecordCount
     });
   }
-  async getActiveFundByUsiAsync(usi) {
-    const results = await superSelectionApi.getAustralianFundsAsync({ type: 'usiMatch', usi });
-    if (results.length === 1) {
-      return some(results[0]);
-    }
-    return none;
-  }
-  async getFundByUsiAsync(usi) {
-    const results = await superSelectionApi.getAustralianFundsAsync({ type: 'usiMatch', usi }, true);
-    if (results.length === 1) {
-      return some(results[0]);
-    }
-    return none;
+  async getFundAsync(usi, includeInactive) {
+    const result = await superSelectionApi.getAustralianFundAsync(usi, includeInactive);
+    return some(result);
   }
 }
 export default new AustralianFundLookupService();

package/dist/lib/collection/components/super-selection-app/services/existing-super-choice-info.service.js

@@ -81,7 +81,7 @@ export class ExistingFundService {
       .text();
   }
   getFundByUsiAsync(usi) {
-    return australianFundLookupService.getFundByUsiAsync(usi);
+    return australianFundLookupService.getFundAsync(usi, true);
   }
   toFundValidState(fund) {
     if (isSome(fund)) {

package/dist/lib/esm/sss-button_29.entry.js

@@ -260,7 +260,7 @@ class TapSubscriber extends Subscriber {
     }
 }
 
-const AppVersion = '4.9.20170';
+const AppVersion = '4.10.22178';
 
 // -------------------------------------------------------------------------------------
 // guards
@@ -3275,13 +3275,23 @@ function e(e){this.message=e;}e.prototype=new Error,e.prototype.name="InvalidCha
 class SuperSelectionApi {
   async getAustralianFundsAsync(searchFilter, includeInactive = false) {
     return buildBackendApiClient()
-      .url(`super-choice/australian-funds?${this.toQueryString(includeInactive, searchFilter)}`)
+      .url(`super-choice/australian-funds-v2?${this.toQueryString(includeInactive, searchFilter)}`)
       .get()
       .notFound(() => {
       throw new Error('Failed to fetch the list of australian super funds.');
     })
       .json();
   }
+  async getAustralianFundAsync(usi, includeInactive) {
+    const queryStr = includeInactive ? '?includeInactive=true' : '';
+    return buildBackendApiClient()
+      .url(`super-choice/australian-funds/${usi}${queryStr}`)
+      .get()
+      .notFound(() => {
+      throw new Error('Failed to fetch australian super fund.');
+    })
+      .json();
+  }
   async getAppStateAsync() {
     return buildBackendApiClient()
       .url('client-app-state')
@@ -3292,12 +3302,8 @@ class SuperSelectionApi {
       .json();
   }
   toSearchFilterQueryString(searchFilter) {
-    switch (searchFilter.type) {
-      case 'partialMatch':
-        return `search=${searchFilter.searchString}&maxRecordCount=${searchFilter.maxRecordCount}`;
-      case 'usiMatch':
-        return `usi=${searchFilter.usi}`;
-    }
+    return (`search=${searchFilter.searchString}` +
+      (searchFilter.maxRecordCount > 0 ? '&maxRecordCount=' + searchFilter.maxRecordCount : ''));
   }
   toQueryString(includeInactive, searchFilter) {
     const search = this.toSearchFilterQueryString(searchFilter);
@@ -3723,26 +3729,15 @@ const CustomFund = class {
 injectHistory(CustomFund);
 
 class AustralianFundLookupService {
-  searchFundsAsync(searchString, maxRecordCount) {
+  async searchFundsAsync(searchString, maxRecordCount) {
     return superSelectionApi.getAustralianFundsAsync({
-      type: 'partialMatch',
       searchString,
       maxRecordCount
     });
   }
-  async getActiveFundByUsiAsync(usi) {
-    const results = await superSelectionApi.getAustralianFundsAsync({ type: 'usiMatch', usi });
-    if (results.length === 1) {
-      return Option.some(results[0]);
-    }
-    return Option.none;
-  }
-  async getFundByUsiAsync(usi) {
-    const results = await superSelectionApi.getAustralianFundsAsync({ type: 'usiMatch', usi }, true);
-    if (results.length === 1) {
-      return Option.some(results[0]);
-    }
-    return Option.none;
+  async getFundAsync(usi, includeInactive) {
+    const result = await superSelectionApi.getAustralianFundAsync(usi, includeInactive);
+    return Option.some(result);
   }
 }
 const australianFundLookupService = new AustralianFundLookupService();
@@ -3800,7 +3795,7 @@ const DefaultFund = class {
       return;
     }
     this.isDefaultFundExists = true;
-    const defaultFundSearchResult = await australianFundLookupService.getActiveFundByUsiAsync(defaultFundUsi.value);
+    const defaultFundSearchResult = await australianFundLookupService.getFundAsync(defaultFundUsi.value, true);
     if (Option.isNone(defaultFundSearchResult)) {
       this.isInvalidDefaultFund = true;
       return;
@@ -3859,10 +3854,22 @@ const SelectInputAsync = class {
       this.inputValue = searchQuery;
       this.searchState = 'in progress';
     };
-    this.onCompleteSearch = (results) => {
-      this.filteredOptions = results;
+    this.onCompleteSearch = (result) => {
       this.highlightedOptionIndex = undefined;
-      this.searchState = 'done';
+      switch (result.kind) {
+        case 'too-many-results':
+          this.searchState = 'too many results';
+          this.filteredOptions = [];
+          break;
+        case 'success':
+          this.searchState = 'done';
+          this.filteredOptions = result.value;
+          break;
+        default:
+          this.searchState = 'done';
+          this.filteredOptions = [];
+          break;
+      }
     };
     this.renderFilteredResults = () => {
       if (this.searchState === 'pristine') {
@@ -3871,6 +3878,9 @@ const SelectInputAsync = class {
       if (this.searchState === 'in progress') {
         return h("span", { class: "cursor-pointer text-gray-500 py-1.5 pl-4" }, "Searching...");
       }
+      if (this.searchState === 'too many results') {
+        return (h("span", { class: "cursor-pointer text-gray-500 py-1.5 pl-4" }, "Keep typing to narrow down your search."));
+      }
       if (this.filteredOptions.length === 0) {
         return (h("span", { class: "cursor-pointer text-gray-500 py-1.5 pl-4" }, "No items match your search"));
       }
@@ -4279,7 +4289,7 @@ class ExistingFundService {
       .text();
   }
   getFundByUsiAsync(usi) {
-    return australianFundLookupService.getFundByUsiAsync(usi);
+    return australianFundLookupService.getFundAsync(usi, true);
   }
   toFundValidState(fund) {
     if (isSome(fund)) {
@@ -4492,15 +4502,23 @@ const MyOwnFundInputs = class {
     registerInstance(this, hostRef);
     this.formChanged = createEvent(this, "formChanged", 7);
     this.MIN_SEARCH_STRING_LENGTH = 3;
-    this.MAX_RECORD_COUNT = 10;
+    this.MAX_RECORD_COUNT = 25;
     this.searchFundsAsync = async (searchBy) => {
-      const funds = await australianFundLookupService.searchFundsAsync(searchBy, this.MAX_RECORD_COUNT);
-      return funds
-        .sort((a, b) => a.productName.localeCompare(b.productName))
-        .map((fund) => ({
-        label: `${fund.productName} (${fund.usi})`,
-        value: fund.usi
-      }));
+      const response = await australianFundLookupService.searchFundsAsync(searchBy, this.MAX_RECORD_COUNT);
+      switch (response.result) {
+        case 'TooManyResults': {
+          return { kind: 'too-many-results' };
+        }
+        default: {
+          const funds = response.data
+            .sort((a, b) => a.productName.localeCompare(b.productName))
+            .map((fund) => ({
+            label: `${fund.productName} (${fund.usi})`,
+            value: fund.usi
+          }));
+          return { kind: 'success', value: funds };
+        }
+      }
     };
   }
   render() {