@intellegens/cornerstone-client 0.0.9999-alpha-22 → 0.0.9999-alpha-24

package/dist/adapters/CollectionViewAdapter/index.d.ts

@@ -98,6 +98,10 @@ export declare class CollectionViewAdapter<TKey, TDto extends IIdentifiable<TKey
      * @param pageSize
      */
     setPageSize(pageSize: number): Promise<TDto[]>;
+    /**
+     * Refreshes the data by re-fetching the current page
+     */
+    refreshData(): Promise<TDto[]>;
     private _totalItemCount;
     /**
      * Returns the total count value of the collection.

package/dist/adapters/CollectionViewAdapter/index.js

@@ -133,6 +133,12 @@ export class CollectionViewAdapter {
         this._currentOptions.pagination.pageNumber = 1; // Reset to first page
         return this._fetchCurrentPageData();
     }
+    /**
+     * Refreshes the data by re-fetching the current page
+     */
+    refreshData() {
+        return this._fetchCurrentPageData();
+    }
     _totalItemCount = -1;
     /**
      * Returns the total count value of the collection.

package/dist/adapters/SearchAdapter/index.d.ts

@@ -1,5 +1,5 @@
-import { IIdentifiable } from '../../data';
-export type SearchAdapterOptions = {
+import { IIdentifiable, ReadSelectedSearchDefinitionDto } from '../../data';
+export type SearchAdapterOptions<T> = {
     controllerName: string;
     typesToSearch: string[];
     multiselect: boolean;
@@ -7,6 +7,7 @@ export type SearchAdapterOptions = {
     searchDebounceDelay: number;
     limitSearchToSelectedType: boolean;
     resultsLimit: number;
+    additionalSearchDefinitions?: ReadSelectedSearchDefinitionDto<T>[];
 };
 declare class SingularEventTarget<T> {
     private _target;
@@ -17,13 +18,16 @@ export interface IGlobalSearchable<TKey> extends IIdentifiable<TKey> {
     type: string;
 }
 export declare class SearchAdapter<TKey, TDto extends IGlobalSearchable<TKey>> {
+    onChange: SingularEventTarget<string>;
     private _readClient;
     private _options;
     private _isLoading;
     private _currentAbortController?;
-    constructor(options: SearchAdapterOptions);
-    onChange: SingularEventTarget<string>;
-    private _emitChange;
+    private _lastSearchedValue;
+    private _typesToSearch;
+    private _fetchResultsDataTimeout?;
+    private _fetchResultsPromises;
+    constructor(options: SearchAdapterOptions<TDto>);
     get multiselect(): boolean;
     private _searchText;
     get searchText(): string;
@@ -36,11 +40,8 @@ export declare class SearchAdapter<TKey, TDto extends IGlobalSearchable<TKey>> {
     set selectedItems(selectedItems: TDto[]);
     addToSelection(item: TDto): void;
     removeFromSelection(item: TDto): void;
-    private _lastSearchedValue;
-    private _typesToSearch;
+    private _emitChange;
     private _trySearch;
-    private _fetchResultsDataTimeout?;
-    private _fetchResultsPromises;
     private _fetchResults;
     private _fetchResultsDebounced;
     private _parseToSearchDefinition;

package/dist/adapters/SearchAdapter/index.js

@@ -10,19 +10,20 @@ class SingularEventTarget {
     }
 }
 export class SearchAdapter {
+    onChange = new SingularEventTarget();
     // inputs
     _readClient;
     _options;
     _isLoading = false;
     _currentAbortController;
+    _lastSearchedValue = '';
+    _typesToSearch = [];
+    _fetchResultsDataTimeout;
+    _fetchResultsPromises = [];
     constructor(options) {
         this._options = options;
         this._readClient = new ApiReadControllerClient(options.controllerName);
     }
-    onChange = new SingularEventTarget();
-    _emitChange() {
-        this.onChange.dispatchEvent('onChange');
-    }
     get multiselect() {
         return this._options.multiselect;
     }
@@ -78,8 +79,9 @@ export class SearchAdapter {
         this.selectedItems = this._selectedItems.filter(s => s.id !== item.id);
         this.searchResults = this._sortByName([...this._searchResults, item]);
     }
-    _lastSearchedValue = '';
-    _typesToSearch = [];
+    _emitChange() {
+        this.onChange.dispatchEvent('onChange');
+    }
     async _trySearch() {
         const options = this._options;
         this.searchResults = [];
@@ -92,8 +94,6 @@ export class SearchAdapter {
             options.limitSearchToSelectedType && this._selectedItems.length ? [this._selectedItems[0].type] : this._options.typesToSearch;
         this.searchResults = this._sortByName(await this._fetchResults(options.searchDebounceDelay));
     }
-    _fetchResultsDataTimeout;
-    _fetchResultsPromises = [];
     async _fetchResults(debounceDelay) {
         return new Promise((resolve, reject) => {
             this._fetchResultsPromises.push({ resolve, reject });
@@ -203,6 +203,9 @@ export class SearchAdapter {
                 },
             ];
         }
+        if (this._options.additionalSearchDefinitions && this._options.additionalSearchDefinitions.length > 0) {
+            definition.searchDefinition.searches = [...(definition.searchDefinition.searches ?? []), ...this._options.additionalSearchDefinitions];
+        }
         return definition;
     }
     _sortByName(array) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intellegens/cornerstone-client",
-  "version": "0.0.9999-alpha-22",
+  "version": "0.0.9999-alpha-24",
   "private": false,
   "publishable": true,
   "main": "./dist/index.js",

package/src/adapters/CollectionViewAdapter/index.ts

@@ -204,6 +204,13 @@ export class CollectionViewAdapter<TKey, TDto extends IIdentifiable<TKey>, TDeta
     return this._fetchCurrentPageData();
   }
 
+  /**
+   * Refreshes the data by re-fetching the current page
+   */
+  public refreshData() {
+    return this._fetchCurrentPageData();
+  }
+
   private _totalItemCount = -1;
 
   /**

package/src/adapters/SearchAdapter/index.ts

@@ -10,7 +10,7 @@ import {
 } from '@data';
 import { ApiReadControllerClient } from '@services';
 
-export type SearchAdapterOptions = {
+export type SearchAdapterOptions<T> = {
   controllerName: string;
   typesToSearch: string[]; // provide known searchable types
   multiselect: boolean;
@@ -18,6 +18,7 @@ export type SearchAdapterOptions = {
   searchDebounceDelay: number;
   limitSearchToSelectedType: boolean; // when item is selected, limit results to items of same type
   resultsLimit: number;
+  additionalSearchDefinitions?: ReadSelectedSearchDefinitionDto<T>[];
 };
 
 class SingularEventTarget<T> {
@@ -37,31 +38,35 @@ export interface IGlobalSearchable<TKey> extends IIdentifiable<TKey> {
 }
 
 export class SearchAdapter<TKey, TDto extends IGlobalSearchable<TKey>> {
+  public onChange = new SingularEventTarget<string>();
   // inputs
   private _readClient!: ApiReadControllerClient<TKey, TDto, TDto>;
-  private _options!: SearchAdapterOptions;
-
+  private _options!: SearchAdapterOptions<TDto>;
   private _isLoading = false;
   private _currentAbortController?: AbortController;
+  private _lastSearchedValue = '';
+  private _typesToSearch: string[] = [];
+  private _fetchResultsDataTimeout?: any;
+  private _fetchResultsPromises: {
+    resolve: (value: TDto[] | PromiseLike<TDto[]>) => void;
+    reject: (reason?: unknown) => void;
+  }[] = [];
 
-  constructor(options: SearchAdapterOptions) {
+  constructor(options: SearchAdapterOptions<TDto>) {
     this._options = options;
     this._readClient = new ApiReadControllerClient<TKey, TDto, TDto>(options.controllerName);
   }
 
-  public onChange = new SingularEventTarget<string>();
-  private _emitChange() {
-    this.onChange.dispatchEvent('onChange');
-  }
-
   public get multiselect() {
     return this._options.multiselect;
   }
 
   private _searchText: string = '';
+
   public get searchText() {
     return this._searchText;
   }
+
   public set searchText(searchText: string) {
     this._searchText = searchText;
     this._trySearch();
@@ -69,18 +74,22 @@ export class SearchAdapter<TKey, TDto extends IGlobalSearchable<TKey>> {
   }
 
   private _searchResults: TDto[] = [];
+
   public get searchResults() {
     return this._searchResults;
   }
+
   protected set searchResults(searchResults: TDto[]) {
     this._searchResults = [...searchResults];
     this._emitChange();
   }
 
   private _selectedItems: TDto[] = [];
+
   public get selectedItems() {
     return this._selectedItems;
   }
+
   public set selectedItems(selectedItems: TDto[]) {
     this._selectedItems = [...selectedItems];
     this._emitChange();
@@ -116,8 +125,9 @@ export class SearchAdapter<TKey, TDto extends IGlobalSearchable<TKey>> {
     this.searchResults = this._sortByName([...this._searchResults, item]);
   }
 
-  private _lastSearchedValue = '';
-  private _typesToSearch: string[] = [];
+  private _emitChange() {
+    this.onChange.dispatchEvent('onChange');
+  }
 
   private async _trySearch() {
     const options = this._options;
@@ -133,13 +143,6 @@ export class SearchAdapter<TKey, TDto extends IGlobalSearchable<TKey>> {
     this.searchResults = this._sortByName(await this._fetchResults(options.searchDebounceDelay));
   }
 
-  private _fetchResultsDataTimeout?: any;
-
-  private _fetchResultsPromises: {
-    resolve: (value: TDto[] | PromiseLike<TDto[]>) => void;
-    reject: (reason?: unknown) => void;
-  }[] = [];
-
   private async _fetchResults(debounceDelay: number): Promise<TDto[]> {
     return new Promise((resolve, reject) => {
       this._fetchResultsPromises.push({ resolve, reject });
@@ -261,6 +264,10 @@ export class SearchAdapter<TKey, TDto extends IGlobalSearchable<TKey>> {
       ];
     }
 
+    if (this._options.additionalSearchDefinitions && this._options.additionalSearchDefinitions.length > 0) {
+      definition.searchDefinition.searches = [...(definition.searchDefinition.searches ?? []), ...this._options.additionalSearchDefinitions];
+    }
+
     return definition;
   }