ichec-angular-core 0.3.10 → 0.3.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ichec-angular-core",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "exports": {
     "./styles/": "./styles",
     "./package.json": {

package/types/ichec-angular-core.d.ts

@@ -1,5 +1,5 @@
 import * as _angular_forms from '@angular/forms';
-import { FormGroup, FormControl, FormArray, FormBuilder, AbstractControl } from '@angular/forms';
+import { FormGroup, FormControl, FormBuilder, FormArray, AbstractControl } from '@angular/forms';
 import * as ichec_angular_core from 'ichec-angular-core';
 import { BehaviorSubject, Observable } from 'rxjs';
 import { HttpClient, HttpParams, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
@@ -157,7 +157,6 @@ interface IItemQuery {
     page_size: number;
     sort_field: string;
     sort_order: string;
-    filter_field: string;
     filter: string;
 }
 declare class ItemQuery {
@@ -166,7 +165,6 @@ declare class ItemQuery {
     page_size: number;
     sort_field: string;
     sort_order: string;
-    filter_field: string;
     filter: string;
     constructor(params?: Partial<IItemQuery>);
 }
@@ -305,13 +303,21 @@ interface IPopulatedFormUpdate {
     id: number;
     values: IFormFieldValueUpdate[];
 }
+interface IFilterChoice {
+    display_name: string;
+    value: string;
+}
+interface ISortField {
+    display_name: string;
+    value: string;
+}
 interface IFilter {
     display_name: string;
     key: string;
     type: string;
     tooltip: string;
-    choices: string[];
-    default: string;
+    choices: IFilterChoice[];
+    default: string | null;
     include_if_null: boolean;
 }
 interface IFilterRow {
@@ -320,6 +326,28 @@ interface IFilterRow {
 interface IFilters {
     rows: IFilterRow[];
 }
+interface IQuery {
+    key: string;
+    value: string;
+}
+interface ISearchFields {
+    filter: IFilters;
+    sortFields: ISortField[];
+    defaultQueries: IQuery[];
+    pageSize: number;
+    pageSizeOptions: number[];
+}
+declare class SearchFields {
+    filter: {
+        rows: never[];
+    };
+    sortFields: never[];
+    defaultQueries: never[];
+    pageSize: number;
+    pageSizeOptions: number[];
+    constructor(params?: Partial<ISearchFields>);
+}
+declare function getFilter(filters: IFilters, key: string): IFilter | null;
 
 interface LeftNavOption {
     name: string;
@@ -643,23 +671,36 @@ declare class DetailHeaderComponent {
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<DetailHeaderComponent, "lib-detail-header", never, { "id": { "alias": "id"; "required": false; "isSignal": true; }; "text": { "alias": "text"; "required": false; "isSignal": true; }; "route": { "alias": "route"; "required": false; "isSignal": true; }; "canEdit": { "alias": "canEdit"; "required": false; "isSignal": true; }; "canDelete": { "alias": "canDelete"; "required": false; "isSignal": true; }; }, { "deleteClicked": "deleteClicked"; }, never, never, true, never>;
 }
 
-declare class SearchBarComponent implements OnInit, AfterViewInit {
+interface ISearchForm {
+    sortAscending: FormControl<boolean | null>;
+    sortField: FormControl<string | null>;
+    search: FormControl<string | null>;
+    pageSize: FormControl<number | null>;
+    filters: FormGroup;
+}
+declare class SearchForm {
+    form: FormGroup<ISearchForm>;
+    searchFields: ISearchFields;
+    constructor(searchFields: ISearchFields, fb: FormBuilder);
+    get filterControls(): {
+        [key: string]: _angular_forms.AbstractControl<any, any, any>;
+    };
+    resetFilters(): void;
+    toQuery(): IItemQuery;
+}
+
+declare class SearchBarComponent {
     itemType: _angular_core.InputSignal<string>;
-    sortFields: _angular_core.InputSignal<string[]>;
-    sortAscending: _angular_core.WritableSignal<boolean>;
-    filters: _angular_core.InputSignal<IFilters | null>;
-    searchChanged: _angular_core.OutputEmitterRef<string>;
-    searchFilter: FormControl<any>;
     showFilters: _angular_core.WritableSignal<boolean>;
-    private fb;
-    filterForm: FormGroup | null;
-    ngOnInit(): void;
-    ngAfterViewInit(): void;
+    form: _angular_core.InputSignal<SearchForm>;
+    get searchControl(): FormControl;
+    get sortControl(): FormControl;
+    clearFilters(): void;
     toggleFilterVisibility(): void;
     clearSearch(): void;
-    searchEntered(): void;
+    toggleSortOrder(): void;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<SearchBarComponent, never>;
-    static ɵcmp: _angular_core.ɵɵComponentDeclaration<SearchBarComponent, "lib-search-bar", never, { "itemType": { "alias": "itemType"; "required": false; "isSignal": true; }; "sortFields": { "alias": "sortFields"; "required": false; "isSignal": true; }; "filters": { "alias": "filters"; "required": false; "isSignal": true; }; }, { "searchChanged": "searchChanged"; }, never, never, true, never>;
+    static ɵcmp: _angular_core.ɵɵComponentDeclaration<SearchBarComponent, "lib-search-bar", never, { "itemType": { "alias": "itemType"; "required": false; "isSignal": true; }; "form": { "alias": "form"; "required": true; "isSignal": true; }; }, {}, never, never, true, never>;
 }
 
 declare class FileUploadComponent {
@@ -853,15 +894,10 @@ declare class PopulatedFormComponent {
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<PopulatedFormComponent, "lib-populated-form", never, { "form": { "alias": "form"; "required": true; "isSignal": true; }; }, {}, never, never, true, never>;
 }
 
-interface IQuery {
-    key: string;
-    value: string;
-}
 declare class ListDataSource<D extends Identifiable, L extends Identifiable, C = D, U extends Identifiable = D> extends DataSource<L> {
     length: _angular_core.WritableSignal<number>;
     loading: _angular_core.WritableSignal<boolean>;
-    searchTerm: _angular_core.WritableSignal<string>;
-    pageSize: _angular_core.WritableSignal<number>;
+    activeQuery: _angular_core.WritableSignal<IItemQuery>;
     hasFetched: _angular_core.WritableSignal<boolean>;
     sourceIsEmpty: _angular_core.Signal<boolean>;
     private consumerType;
@@ -874,7 +910,7 @@ declare class ListDataSource<D extends Identifiable, L extends Identifiable, C =
     connect(collectionViewer: CollectionViewer): Observable<L[]>;
     hasTableConsumer(): boolean;
     onRange(range: ListRange): void;
-    reset(searchTerm?: string, pageSize?: number): void;
+    reset(query: IItemQuery): void;
     fetchPage(idx: number): void;
     fetch(query: IItemQuery): void;
     onResponse(response: IPaginated<L>): void;
@@ -889,27 +925,23 @@ declare class ListViewComponent<D extends Identifiable, L extends Identifiable,
     itemHeight: _angular_core.InputSignal<number>;
     itemWidth: _angular_core.InputSignal<number>;
     columns: _angular_core.InputSignal<TableColumn[]>;
-    sortFields: _angular_core.InputSignal<string[]>;
     noSelfItemsMessage: _angular_core.InputSignal<string | undefined>;
     noItemsCanCreateMessage: _angular_core.InputSignal<string | undefined>;
     noItemsMessage: _angular_core.InputSignal<string | undefined>;
-    defaultQueries: _angular_core.InputSignal<IQuery[]>;
-    filters: _angular_core.InputSignal<IFilters | null>;
+    searchFields: _angular_core.InputSignal<ISearchFields>;
     embeddedMode: _angular_core.InputSignal<boolean>;
     selectedViewType: _angular_core.WritableSignal<string>;
     selected: _angular_core.OutputEmitterRef<number | null>;
-    pageSize: number;
-    pageSizeOptions: number[];
     protected route: ActivatedRoute;
     dataSource: ListDataSource<D, L, C, U> | undefined;
     sort: _angular_core.Signal<MatSort | undefined>;
     columnNames: _angular_core.Signal<string[]>;
-    searchTerm: string;
+    fb: FormBuilder;
+    searchForm: _angular_core.WritableSignal<SearchForm>;
     get resolvedItemWidth(): string;
     ngOnInit(): void;
     ngAfterViewInit(): void;
     showControls(): boolean;
-    onSearchChange(value: string): void;
     canCreate(): boolean;
     itemType(): string;
     title(): string;
@@ -920,7 +952,7 @@ declare class ListViewComponent<D extends Identifiable, L extends Identifiable,
     onSelection(id: number): void;
     protected isSelfList(): boolean;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<ListViewComponent<any, any, any, any>, never>;
-    static ɵcmp: _angular_core.ɵɵComponentDeclaration<ListViewComponent<any, any, any, any>, "lib-list-view", never, { "viewType": { "alias": "viewType"; "required": false; "isSignal": true; }; "itemService": { "alias": "itemService"; "required": false; "isSignal": true; }; "listItemTemplate": { "alias": "listItemTemplate"; "required": false; "isSignal": true; }; "itemDetailTemplate": { "alias": "itemDetailTemplate"; "required": false; "isSignal": true; }; "itemHeight": { "alias": "itemHeight"; "required": false; "isSignal": true; }; "itemWidth": { "alias": "itemWidth"; "required": false; "isSignal": true; }; "columns": { "alias": "columns"; "required": false; "isSignal": true; }; "sortFields": { "alias": "sortFields"; "required": false; "isSignal": true; }; "noSelfItemsMessage": { "alias": "noSelfItemsMessage"; "required": false; "isSignal": true; }; "noItemsCanCreateMessage": { "alias": "noItemsCanCreateMessage"; "required": false; "isSignal": true; }; "noItemsMessage": { "alias": "noItemsMessage"; "required": false; "isSignal": true; }; "defaultQueries": { "alias": "defaultQueries"; "required": false; "isSignal": true; }; "filters": { "alias": "filters"; "required": false; "isSignal": true; }; "embeddedMode": { "alias": "embeddedMode"; "required": false; "isSignal": true; }; }, { "selected": "selected"; }, never, never, true, never>;
+    static ɵcmp: _angular_core.ɵɵComponentDeclaration<ListViewComponent<any, any, any, any>, "lib-list-view", never, { "viewType": { "alias": "viewType"; "required": false; "isSignal": true; }; "itemService": { "alias": "itemService"; "required": false; "isSignal": true; }; "listItemTemplate": { "alias": "listItemTemplate"; "required": false; "isSignal": true; }; "itemDetailTemplate": { "alias": "itemDetailTemplate"; "required": false; "isSignal": true; }; "itemHeight": { "alias": "itemHeight"; "required": false; "isSignal": true; }; "itemWidth": { "alias": "itemWidth"; "required": false; "isSignal": true; }; "columns": { "alias": "columns"; "required": false; "isSignal": true; }; "noSelfItemsMessage": { "alias": "noSelfItemsMessage"; "required": false; "isSignal": true; }; "noItemsCanCreateMessage": { "alias": "noItemsCanCreateMessage"; "required": false; "isSignal": true; }; "noItemsMessage": { "alias": "noItemsMessage"; "required": false; "isSignal": true; }; "searchFields": { "alias": "searchFields"; "required": true; "isSignal": true; }; "embeddedMode": { "alias": "embeddedMode"; "required": false; "isSignal": true; }; }, { "selected": "selected"; }, never, never, true, never>;
 }
 
 declare class ListTableViewComponent implements AfterViewInit {
@@ -1034,6 +1066,7 @@ declare class UserCreateComponent {
 declare class UserComponent {
     itemService: UserService;
     detailView: _angular_core.Signal<UserDetailComponent | undefined>;
+    searchFields: ISearchFields;
     onSelected(id: number | null): void;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<UserComponent, never>;
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<UserComponent, "lib-user", never, {}, {}, never, never, true, never>;
@@ -1062,6 +1095,7 @@ declare class GroupEditComponent extends EditView<IGroupDetail, IGroupList, IGro
 declare class GroupComponent {
     itemService: GroupService;
     detailView: _angular_core.Signal<GroupDetailComponent | undefined>;
+    searchFields: ISearchFields;
     onSelected(id: number | null): void;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<GroupComponent, never>;
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<GroupComponent, "lib-group", never, {}, {}, never, never, true, never>;
@@ -1106,13 +1140,14 @@ declare class OrganizationDetailComponent extends DetailView<IOrganizationDetail
 }
 
 declare class OrganizationComponent {
+    embedded: _angular_core.InputSignal<boolean>;
     itemService: OrganizationService;
     columns: TableColumn[];
-    filters: IFilters | null;
+    searchFields: _angular_core.InputSignal<ISearchFields>;
     detailView: _angular_core.Signal<OrganizationDetailComponent | undefined>;
     onSelected(id: number | null): void;
     static ɵfac: _angular_core.ɵɵFactoryDeclaration<OrganizationComponent, never>;
-    static ɵcmp: _angular_core.ɵɵComponentDeclaration<OrganizationComponent, "lib-organization", never, {}, {}, never, never, true, never>;
+    static ɵcmp: _angular_core.ɵɵComponentDeclaration<OrganizationComponent, "lib-organization", never, { "embedded": { "alias": "embedded"; "required": false; "isSignal": true; }; "searchFields": { "alias": "searchFields"; "required": false; "isSignal": true; }; }, {}, never, never, true, never>;
 }
 
 declare class OrganizationEditComponent extends EditView<IOrganizationDetail, IOrganizationList, IOrganizationCreate> implements OnInit {
@@ -1129,5 +1164,5 @@ declare class OrganizationEditComponent extends EditView<IOrganizationDetail, IO
     static ɵcmp: _angular_core.ɵɵComponentDeclaration<OrganizationEditComponent, "lib-organization-edit", never, {}, {}, never, never, true, never>;
 }
 
-export { Address, AddressDetailComponent, AddressEditComponent, AddressForm, ApiError, AvatarComponent, BackButtonComponent, DetailHeaderComponent, DetailView, DynamicFormBuilderComponent, DynamicFormComponent, DynamicFormForm, EditView, ErrorCode, FORM_FIELD_CHOICES, FeedbackComponent, FieldType, FileRecord, FileUploadComponent, FormFieldDetailComponent, FormFieldEditComponent, FormFieldValueForm, FormService, Group, GroupComponent, GroupDetailComponent, GroupEditComponent, GroupService, ItemQuery, ItemService, ItemWithUserService, LeftNavComponent, LeftNavService, ListTableViewComponent, ListViewComponent, MemberSelectionManager, MockItemService, Organization, OrganizationComponent, OrganizationDetailComponent, OrganizationEditComponent, OrganizationService, Paginated, Permission, PopulatedFormComponent, PopulatedFormForm, PortalMember, REST_SERVICE_CONFIG, ResolvedPermission, RestService, SearchBarComponent, SelectTableComponent, SelectionManager, TopBarComponent, UserComponent, UserCreateComponent, UserCreateForm, UserDetailComponent, UserEditComponent, UserService, getFieldTypeFromKey, getFileFieldIds };
-export type { IAddressBase, IAddressCreate, IAddressDetail, IAddressForm, IAddressList, ICountry, IDynamicFormForm, IFieldFile, IFileField, IFileRecord, IFilter, IFilterRow, IFilters, IForm, IFormCreate, IFormDetail, IFormFieldBase, IFormFieldCreate, IFormFieldDetail, IFormFieldValueBase, IFormFieldValueCreate, IFormFieldValueDetail, IFormFieldValueForm, IFormFieldValueUpdate, IFormGroupBase, IFormGroupCreate, IFormGroupDetail, IFormGroupUpdate, IFormUpdate, IGroupBase, IGroupCreate, IGroupDetail, IGroupList, IItemQuery, IMemberIdentifierBase, IMemberIdentifierCreate, IMemberIdentifierDetail, IMemberInvitation, IOrganizationBase, IOrganizationCreate, IOrganizationDetail, IOrganizationList, IPaginated, IPermission, IPopulatedFormCreate, IPopulatedFormDetail, IPopulatedFormForm, IPopulatedFormUpdate, IPortalMemberBase, IPortalMemberCreate, IPortalMemberDetail, IPortalMemberList, IPreferences, IRestOptions, IServerManifest, IUserCreateForm, Identifiable, LeftNavCategory, LeftNavOption, NavGroup, NavGrouping, NavOption, OptionAction, OptionActionChoice, RestServiceConfig, Selectable, TableColumn, TypeChoice };
+export { Address, AddressDetailComponent, AddressEditComponent, AddressForm, ApiError, AvatarComponent, BackButtonComponent, DetailHeaderComponent, DetailView, DynamicFormBuilderComponent, DynamicFormComponent, DynamicFormForm, EditView, ErrorCode, FORM_FIELD_CHOICES, FeedbackComponent, FieldType, FileRecord, FileUploadComponent, FormFieldDetailComponent, FormFieldEditComponent, FormFieldValueForm, FormService, Group, GroupComponent, GroupDetailComponent, GroupEditComponent, GroupService, ItemQuery, ItemService, ItemWithUserService, LeftNavComponent, LeftNavService, ListTableViewComponent, ListViewComponent, MemberSelectionManager, MockItemService, Organization, OrganizationComponent, OrganizationDetailComponent, OrganizationEditComponent, OrganizationService, Paginated, Permission, PopulatedFormComponent, PopulatedFormForm, PortalMember, REST_SERVICE_CONFIG, ResolvedPermission, RestService, SearchBarComponent, SearchFields, SelectTableComponent, SelectionManager, TopBarComponent, UserComponent, UserCreateComponent, UserCreateForm, UserDetailComponent, UserEditComponent, UserService, getFieldTypeFromKey, getFileFieldIds, getFilter };
+export type { IAddressBase, IAddressCreate, IAddressDetail, IAddressForm, IAddressList, ICountry, IDynamicFormForm, IFieldFile, IFileField, IFileRecord, IFilter, IFilterChoice, IFilterRow, IFilters, IForm, IFormCreate, IFormDetail, IFormFieldBase, IFormFieldCreate, IFormFieldDetail, IFormFieldValueBase, IFormFieldValueCreate, IFormFieldValueDetail, IFormFieldValueForm, IFormFieldValueUpdate, IFormGroupBase, IFormGroupCreate, IFormGroupDetail, IFormGroupUpdate, IFormUpdate, IGroupBase, IGroupCreate, IGroupDetail, IGroupList, IItemQuery, IMemberIdentifierBase, IMemberIdentifierCreate, IMemberIdentifierDetail, IMemberInvitation, IOrganizationBase, IOrganizationCreate, IOrganizationDetail, IOrganizationList, IPaginated, IPermission, IPopulatedFormCreate, IPopulatedFormDetail, IPopulatedFormForm, IPopulatedFormUpdate, IPortalMemberBase, IPortalMemberCreate, IPortalMemberDetail, IPortalMemberList, IPreferences, IQuery, IRestOptions, ISearchFields, IServerManifest, ISortField, IUserCreateForm, Identifiable, LeftNavCategory, LeftNavOption, NavGroup, NavGrouping, NavOption, OptionAction, OptionActionChoice, RestServiceConfig, Selectable, TableColumn, TypeChoice };