diff --git a/CHANGELOG.md b/CHANGELOG.md index bfbed771..603b390b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,17 @@ +# [0.1.0](https://github.com/rucken/ionic/compare/0.0.4...0.1.0) (2019-01-27) + + +### Bug Fixes + +* Revert use form-group to without bindIO ([9697fc6](https://github.com/rucken/ionic/commit/9697fc6)) + + +### Features + +* Add ngx-bind-io and update all sources ([4ac5ab6](https://github.com/rucken/ionic/commit/4ac5ab6)) + + + ## [0.0.4](https://github.com/rucken/ionic/compare/0.0.3...0.0.4) (2019-01-12) diff --git a/apps/demo/src/app/app.module.ts b/apps/demo/src/app/app.module.ts index d56a17a9..f82c484a 100644 --- a/apps/demo/src/app/app.module.ts +++ b/apps/demo/src/app/app.module.ts @@ -11,6 +11,7 @@ import { MetaLoader, MetaModule } from '@ngx-meta/core'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { AccountModule, AuthModalModule, AuthModule, BrowserStorage, CONTENT_TYPES_CONFIG_TOKEN, defaultContentTypesConfig, defaultGroupsConfig, defaultPermissionsConfig, defaultUsersConfig, ErrorsExtractor, GROUPS_CONFIG_TOKEN, LangModule, LangService, PermissionsGuard, PERMISSIONS_CONFIG_TOKEN, PipesModule, STORAGE_CONFIG_TOKEN, TokenService, TransferHttpCacheModule, USERS_CONFIG_TOKEN } from '@rucken/core'; import { GroupsListFiltersModalModule, GroupsListFiltersModalService, IonicAuthModalModule, IonicModalsModule, NavbarModule, UsersListFiltersModalModule, UsersListFiltersModalService } from '@rucken/ionic'; +import { NgxBindIOModule } from 'ngx-bind-io'; import { CookieService } from 'ngx-cookie-service'; import { NgxPermissionsModule } from 'ngx-permissions'; import { NgxRepositoryModule } from 'ngx-repository'; @@ -62,7 +63,8 @@ import { initializeApp } from './utils/initialize-app'; NavbarModule, IonicModalsModule, UsersListFiltersModalModule.forRoot(), - GroupsListFiltersModalModule.forRoot() + GroupsListFiltersModalModule.forRoot(), + NgxBindIOModule.forRoot() ], providers: [ { diff --git a/libs/rucken/ionic/package.json b/libs/rucken/ionic/package.json index 4c73caa2..8beb737e 100644 --- a/libs/rucken/ionic/package.json +++ b/libs/rucken/ionic/package.json @@ -1,6 +1,6 @@ { "name": "@rucken/ionic", - "version": "0.0.4", + "version": "0.1.0", "engines": { "node": ">=10", "npm": ">=6.4.0" @@ -35,14 +35,14 @@ } ], "peerDependencies": { - "@angular/common": "~7.2.0", - "@angular/core": "~7.2.0", - "@ionic/angular": "4.0.0-rc.1", - "@rucken/core": "^3.7.1" + "@angular/common": "~7.2.2", + "@angular/core": "~7.2.2", + "@ionic/angular": "4.0.0", + "@rucken/core": "^3.8.1" }, "dependencies": { "@ngx-translate/core": "^11.0.1", - "ngx-dynamic-form-builder": "^0.8.1", + "ngx-dynamic-form-builder": "^0.9.0", "ngx-permissions": "^6.0.4", "ngx-repository": "^0.6.3", "bind-observable": "^1.0.2", diff --git a/libs/rucken/ionic/src/lib/components/entity-list/entity-list.component.ts b/libs/rucken/ionic/src/lib/components/entity-list/entity-list.component.ts index b622e0b0..ffb6b759 100644 --- a/libs/rucken/ionic/src/lib/components/entity-list/entity-list.component.ts +++ b/libs/rucken/ionic/src/lib/components/entity-list/entity-list.component.ts @@ -30,66 +30,61 @@ export class EntityListComponent { defaultEntityListHeaderTemplate: TemplateRef; @Input() - gridFieldTemplate: TemplateRef; + gridFieldTemplate: TemplateRef = undefined; @Input() - gridCellTemplate: TemplateRef; + gridCellTemplate: TemplateRef = undefined; @Input() - gridFieldContent: TemplateRef; + gridFieldContent: TemplateRef = undefined; @Input() - gridFieldActionContent: TemplateRef; + gridFieldActionContent: TemplateRef = undefined; @Input() - gridCellContent: TemplateRef; + gridCellContent: TemplateRef = undefined; @Input() - gridCellTranslatedContent: TemplateRef; + gridCellTranslatedContent: TemplateRef = undefined; @Input() - gridCellActionContent: TemplateRef; + gridCellActionContent: TemplateRef = undefined; @Input() - searchFieldTemplate: TemplateRef; + searchFieldTemplate: TemplateRef = undefined; @Input() - entityListFooterTemplate: TemplateRef; + entityListFooterTemplate: TemplateRef = undefined; @Input() - entityListHeaderTemplate: TemplateRef; + entityListHeaderTemplate: TemplateRef = undefined; @Input() - viewLink: string; + viewLink: string = undefined; @Input() - updateLink: string; + updateLink: string = undefined; @Input() - deleteLink: string; + deleteLink: string = undefined; @Input() showSearchField = false; @Input() - selectFirst?: boolean; + selectFirst?: boolean = undefined; @Input() set processing(value: boolean) { - this._processing = undefined; - if (value) { - this._loadingController.create({ - message: this._translateService.instant('Loading...') - }).then(loading => { - this._processingModal = loading; - loading.present().then(modal => { - if (this._processing === undefined) { - this._processing = value; - } else { - if (this._processingModal && this._processing === false) { - this._processingModal.dismiss().then(() => { - this._processing = false; - this._processingModal = undefined; - }); - } - } - }); - }); - } else { - if (this._processingModal) { - this._processingModal.dismiss().then(() => { - this._processing = false; - this._processingModal = undefined; - }); + this._processing = value; + if (this._processingModal !== null) { + if (this._processingModal === undefined) { + this._processingModal = null; + if (value) { + this._loadingController.create({ + message: this._translateService.instant('Loading...') + }).then(element => { + element.present().then(_ => { + this._processingModal = element; + if (this._processing === false) { + this.processing = false; + } + }); + }); + } } else { - this._processing = false; + if (!value) { + this._processingModal.dismiss().then(() => { + this._processingModal = undefined; + }); + } } } } @@ -99,7 +94,7 @@ export class EntityListComponent { @Input() searchField: FormControl = new FormControl(); @Input() - title: string; + title: string = undefined; @Input() createTitle = translate('Create'); @Input() @@ -107,13 +102,13 @@ export class EntityListComponent { @Input() translatedCells: string[] = []; @Input() - orderColumns: string[]; + orderColumns: string[] = undefined; @Input() - columnsClasses: { [key: string]: string }; + columnsClasses: { [key: string]: string } = undefined; @Input() - orderBy: string; + orderBy: string = undefined; @Input() - multiSelectColumns: string[]; + multiSelectColumns: string[] = undefined; @Input() set columns(columns: string[]) { this._columns = columns; @@ -133,14 +128,11 @@ export class EntityListComponent { } } @Input() - classes: string[]; + classes: string[] = undefined; @Input() - strings: any; + strings: any = undefined; @Input() set items(items: TModel[]) { - if (this._refresher && this._refresher.target) { - this._refresher.target.complete(); - } this._items = items; if ( this.selectFirst !== false && @@ -150,6 +142,9 @@ export class EntityListComponent { ) { this.onSelected([]); } + if (this._refresher && this._refresher.target) { + this._refresher.target.complete(); + } } get items() { return this._items; @@ -182,7 +177,7 @@ export class EntityListComponent { nextPage: EventEmitter = new EventEmitter(); @Input() - readonly: boolean; + readonly: boolean = undefined; @Input() enableCreate = true; @Input() @@ -192,7 +187,7 @@ export class EntityListComponent { @Input() enableAppendFromGrid = true; @Input() - paginationMeta: PaginationMeta; + paginationMeta: PaginationMeta = undefined; get enableOnlyUpdateOrDelete() { return (this.isEnableDelete && !this.isEnableUpdate) || (!this.isEnableDelete && this.isEnableUpdate); @@ -204,12 +199,12 @@ export class EntityListComponent { return this.appendFromGrid.observers.length > 0; } - private _refresher: any; - private _processingModal: any; + private _refresher: any = undefined; + private _processingModal: any = undefined; private _processing = false; - private _selected: TModel[]; - private _items: TModel[]; - private _columns: string[]; + private _selected: TModel[] = undefined; + private _items: TModel[] = undefined; + private _columns: string[] = undefined; constructor( private _viewContainerRef: ViewContainerRef, diff --git a/libs/rucken/ionic/src/lib/components/form-group/form-group.component.ts b/libs/rucken/ionic/src/lib/components/form-group/form-group.component.ts index f50f42b0..7e428e32 100644 --- a/libs/rucken/ionic/src/lib/components/form-group/form-group.component.ts +++ b/libs/rucken/ionic/src/lib/components/form-group/form-group.component.ts @@ -10,9 +10,9 @@ import { map } from 'rxjs/operators'; }) export class FormGroupComponent implements AfterViewInit { @Input() - checkIsDirty?: boolean; + checkIsDirty?: boolean = undefined; @Input() - tooltipPlacement?: string; + tooltipPlacement?: string = undefined; get errors(): Observable { if (this.form && (this.checkIsDirty !== true || this.form.dirty)) { @@ -29,7 +29,7 @@ export class FormGroupComponent implements AfterViewInit { } } @Input() - form: DynamicFormGroup; + form: DynamicFormGroup = undefined; @Input() set name(name: string) { this._name = name; @@ -38,7 +38,7 @@ export class FormGroupComponent implements AfterViewInit { return this._name; } @Input() - title: string; + title: string = undefined; get valid() { return !this.form || this.form.get(this.name).valid; diff --git a/libs/rucken/ionic/src/lib/components/navbar/navbar.component.ts b/libs/rucken/ionic/src/lib/components/navbar/navbar.component.ts index f238efbd..aba9f6c4 100644 --- a/libs/rucken/ionic/src/lib/components/navbar/navbar.component.ts +++ b/libs/rucken/ionic/src/lib/components/navbar/navbar.component.ts @@ -9,11 +9,11 @@ import { BehaviorSubject } from 'rxjs'; }) export class NavbarComponent { @Input() - showSignIn: boolean; + showSignIn: boolean = undefined; @Input() - showSignOut: boolean; + showSignOut: boolean = undefined; @Input() - title: string; + title: string = undefined; @Input() set routes(routes: any[]) { this.allowedRoutes$.next( diff --git a/libs/rucken/ionic/src/lib/components/prompt-form-modal/prompt-form-modal.component.ts b/libs/rucken/ionic/src/lib/components/prompt-form-modal/prompt-form-modal.component.ts index 4535faf2..babc61f7 100644 --- a/libs/rucken/ionic/src/lib/components/prompt-form-modal/prompt-form-modal.component.ts +++ b/libs/rucken/ionic/src/lib/components/prompt-form-modal/prompt-form-modal.component.ts @@ -14,7 +14,7 @@ export class PromptFormModalComponent extends BasePromptModalComponent { @Input() hideFooter = false; @Input() - class: string; + class: string = undefined; @Input() hideTopNo = false; @Input() @@ -26,11 +26,11 @@ export class PromptFormModalComponent extends BasePromptModalComponent { @Input() iconTopInfo = 'information-circle-outline'; @Input() - footerButtonsTemplate: TemplateRef; + footerButtonsTemplate: TemplateRef = undefined; @Input() - readonlyFooterButtonsTemplate: TemplateRef; + readonlyFooterButtonsTemplate: TemplateRef = undefined; @Input() - headerTemplate: TemplateRef; + headerTemplate: TemplateRef = undefined; constructor( protected modalController: ModalController, private _modalsService: ModalsService, diff --git a/libs/rucken/ionic/src/lib/components/select-input/select-input.component.ts b/libs/rucken/ionic/src/lib/components/select-input/select-input.component.ts index 2875bbab..e445d3ae 100644 --- a/libs/rucken/ionic/src/lib/components/select-input/select-input.component.ts +++ b/libs/rucken/ionic/src/lib/components/select-input/select-input.component.ts @@ -29,7 +29,7 @@ export class SelectInputComponent implements ControlValueAccessor, OnDestroy, On titleField = 'title'; @Input() @BindObservable() - items: SelectInput[]; + items: SelectInput[] = undefined; items$!: Observable; @BindObservable() selectedIds: (string | number)[]; @@ -49,8 +49,6 @@ export class SelectInputComponent implements ControlValueAccessor, OnDestroy, On this.selectedIds$.pipe(takeUntil(this._destroyed$)).subscribe(ids => { if (ids !== undefined && !Array.isArray(ids)) { ids = [ids]; - } else { - ids = []; } const selectedItems = this.items.filter(item => ids.filter(id => item.id === id).length > 0); if (this.multiple) { diff --git a/libs/rucken/ionic/src/lib/entities/groups/group-modal/group-modal.component.html b/libs/rucken/ionic/src/lib/entities/groups/group-modal/group-modal.component.html index 6855fcbb..4c6d117d 100644 --- a/libs/rucken/ionic/src/lib/entities/groups/group-modal/group-modal.component.html +++ b/libs/rucken/ionic/src/lib/entities/groups/group-modal/group-modal.component.html @@ -2,22 +2,8 @@ [formGroup]="form" novalidate> + bindIO + [iconTopYes]="data.id?'checkmark':'add'"> { @Input() - class: string; + class: string = undefined; permissions$: Observable; constructor( diff --git a/libs/rucken/ionic/src/lib/entities/groups/group-modal/group-modal.module.ts b/libs/rucken/ionic/src/lib/entities/groups/group-modal/group-modal.module.ts index 7a022fad..2fe80eac 100644 --- a/libs/rucken/ionic/src/lib/entities/groups/group-modal/group-modal.module.ts +++ b/libs/rucken/ionic/src/lib/entities/groups/group-modal/group-modal.module.ts @@ -4,6 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { DirectivesModule, PipesModule } from '@rucken/core'; +import { NgxBindIOModule } from 'ngx-bind-io'; import { FormGroupModule } from '../../../components/form-group/form-group.module'; import { PromptFormModalModule } from '../../../components/prompt-form-modal/prompt-form-modal.module'; import { SelectInputModule } from '../../../components/select-input/select-input.module'; @@ -19,7 +20,8 @@ import { GroupModalComponent } from './group-modal.component'; DirectivesModule, PipesModule, PromptFormModalModule, - SelectInputModule + SelectInputModule, + NgxBindIOModule ], declarations: [GroupModalComponent], entryComponents: [GroupModalComponent], diff --git a/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.component.html b/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.component.html index 155d83eb..6d24a71c 100644 --- a/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.component.html +++ b/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.component.html @@ -2,19 +2,7 @@ [formGroup]="form" novalidate> diff --git a/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.component.ts b/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.component.ts index 962eb86c..9d2a807f 100644 --- a/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.component.ts +++ b/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.component.ts @@ -13,7 +13,7 @@ import { GroupsListFiltersModalService } from './groups-list-filters-modal.servi export class GroupsListFiltersModalComponent extends BasePromptFormModalComponent implements OnInit { @Input() - class: string; + class: string = undefined; sortTypes = GroupsListFiltersModal.sortTypes; sortFields = GroupsListFiltersModal.sortFields; diff --git a/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.module.ts b/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.module.ts index aa9c608d..40719315 100644 --- a/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.module.ts +++ b/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list-filters-modal/groups-list-filters-modal.module.ts @@ -4,6 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { DirectivesModule, PipesModule } from '@rucken/core'; +import { NgxBindIOModule } from 'ngx-bind-io'; import { FormGroupModule } from '../../../../components/form-group/form-group.module'; import { PromptFormModalModule } from '../../../../components/prompt-form-modal/prompt-form-modal.module'; import { SelectInputModule } from '../../../../components/select-input/select-input.module'; @@ -20,7 +21,8 @@ import { GroupsListFiltersModalService } from './groups-list-filters-modal.servi DirectivesModule, PipesModule, PromptFormModalModule, - SelectInputModule + SelectInputModule, + NgxBindIOModule ], declarations: [GroupsListFiltersModalComponent], entryComponents: [GroupsListFiltersModalComponent], diff --git a/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list.component.html b/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list.component.html index 547c16cb..aff2a1cb 100644 --- a/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list.component.html +++ b/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list.component.html @@ -1,26 +1,11 @@ diff --git a/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list.module.ts b/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list.module.ts index b0504c45..540ba6ab 100644 --- a/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list.module.ts +++ b/libs/rucken/ionic/src/lib/entities/groups/groups-list/groups-list.module.ts @@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; +import { NgxBindIOModule } from 'ngx-bind-io'; import { EntityListModule } from '../../../components/entity-list/entity-list.module'; import { IonicModalsModule } from '../../../modules/modals/modals.module'; import { GroupModalModule } from '../group-modal/group-modal.module'; @@ -16,7 +17,8 @@ import { GroupsListComponent } from './groups-list.component'; TranslateModule.forChild(), EntityListModule, GroupModalModule, - GroupsListFiltersModalModule + GroupsListFiltersModalModule, + NgxBindIOModule ], declarations: [GroupsListComponent], exports: [GroupsListComponent] diff --git a/libs/rucken/ionic/src/lib/entities/users/profile-panel/profile-panel.component.ts b/libs/rucken/ionic/src/lib/entities/users/profile-panel/profile-panel.component.ts index d12da1c1..bba08bec 100644 --- a/libs/rucken/ionic/src/lib/entities/users/profile-panel/profile-panel.component.ts +++ b/libs/rucken/ionic/src/lib/entities/users/profile-panel/profile-panel.component.ts @@ -15,9 +15,9 @@ import { GroupsService } from '../../../services/groups.service'; }) export class ProfilePanelComponent extends BasePromptPanelComponent implements OnDestroy { @Input() - class: string; + class: string = undefined; @Input() - apiUrl?: string; + apiUrl?: string = undefined; @Input() enableSave = true; @Input() diff --git a/libs/rucken/ionic/src/lib/entities/users/profile-panel/profile-panel.module.ts b/libs/rucken/ionic/src/lib/entities/users/profile-panel/profile-panel.module.ts index 7abedb2f..b2f233c2 100644 --- a/libs/rucken/ionic/src/lib/entities/users/profile-panel/profile-panel.module.ts +++ b/libs/rucken/ionic/src/lib/entities/users/profile-panel/profile-panel.module.ts @@ -4,6 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { DirectivesModule, PipesModule } from '@rucken/core'; +import { NgxBindIOModule } from 'ngx-bind-io'; import { FormGroupModule } from '../../../components/form-group/form-group.module'; import { SelectInputModule } from '../../../components/select-input/select-input.module'; import { ProfilePanelComponent } from './profile-panel.component'; @@ -17,7 +18,8 @@ import { ProfilePanelComponent } from './profile-panel.component'; TranslateModule.forChild(), DirectivesModule, PipesModule, - SelectInputModule + SelectInputModule, + NgxBindIOModule ], declarations: [ProfilePanelComponent], entryComponents: [ProfilePanelComponent], diff --git a/libs/rucken/ionic/src/lib/entities/users/user-modal/user-modal.component.html b/libs/rucken/ionic/src/lib/entities/users/user-modal/user-modal.component.html index 92af7b2e..95f395e1 100644 --- a/libs/rucken/ionic/src/lib/entities/users/user-modal/user-modal.component.html +++ b/libs/rucken/ionic/src/lib/entities/users/user-modal/user-modal.component.html @@ -2,22 +2,8 @@ [formGroup]="form" novalidate> + bindIO + [iconTopYes]="data.id?'checkmark':'add'"> { @Input() - class: string; + class: string = undefined; groups$: Observable; constructor( diff --git a/libs/rucken/ionic/src/lib/entities/users/user-modal/user-modal.module.ts b/libs/rucken/ionic/src/lib/entities/users/user-modal/user-modal.module.ts index 96116b1f..b95ceaa5 100644 --- a/libs/rucken/ionic/src/lib/entities/users/user-modal/user-modal.module.ts +++ b/libs/rucken/ionic/src/lib/entities/users/user-modal/user-modal.module.ts @@ -4,6 +4,7 @@ import { ReactiveFormsModule } from '@angular/forms'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; import { DirectivesModule, PipesModule } from '@rucken/core'; +import { NgxBindIOModule } from 'ngx-bind-io'; import { FormGroupModule } from '../../../components/form-group/form-group.module'; import { PromptFormModalModule } from '../../../components/prompt-form-modal/prompt-form-modal.module'; import { SelectInputModule } from '../../../components/select-input/select-input.module'; @@ -19,7 +20,8 @@ import { UserModalComponent } from './user-modal.component'; DirectivesModule, PipesModule, PromptFormModalModule, - SelectInputModule + SelectInputModule, + NgxBindIOModule ], declarations: [UserModalComponent], entryComponents: [UserModalComponent], diff --git a/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.component.html b/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.component.html index 7f7cf3cd..278410a2 100644 --- a/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.component.html +++ b/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.component.html @@ -2,19 +2,7 @@ [formGroup]="form" novalidate> diff --git a/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.component.ts b/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.component.ts index bf405a57..1911e330 100644 --- a/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.component.ts +++ b/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.component.ts @@ -17,7 +17,7 @@ import { UsersListFiltersModalService } from './users-list-filters-modal.service export class UsersListFiltersModalComponent extends BasePromptFormModalComponent implements OnInit { @Input() - class: string; + class: string = undefined; groups$: Observable; sortTypes = UsersListFiltersModal.sortTypes; sortFields = UsersListFiltersModal.sortFields; diff --git a/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.module.ts b/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.module.ts index 2fb6b92e..91f31208 100644 --- a/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.module.ts +++ b/libs/rucken/ionic/src/lib/entities/users/users-list/users-list-filters-modal/users-list-filters-modal.module.ts @@ -9,6 +9,7 @@ import { PromptFormModalModule } from '../../../../components/prompt-form-modal/ import { SelectInputModule } from '../../../../components/select-input/select-input.module'; import { UsersListFiltersModalComponent } from './users-list-filters-modal.component'; import { UsersListFiltersModalService } from './users-list-filters-modal.service'; +import { NgxBindIOModule } from 'ngx-bind-io'; @NgModule({ imports: [ @@ -20,7 +21,8 @@ import { UsersListFiltersModalService } from './users-list-filters-modal.service DirectivesModule, PipesModule, PromptFormModalModule, - SelectInputModule + SelectInputModule, + NgxBindIOModule ], declarations: [UsersListFiltersModalComponent], entryComponents: [UsersListFiltersModalComponent], diff --git a/libs/rucken/ionic/src/lib/entities/users/users-list/users-list.component.html b/libs/rucken/ionic/src/lib/entities/users/users-list/users-list.component.html index 10f8f66e..eb315f8d 100644 --- a/libs/rucken/ionic/src/lib/entities/users/users-list/users-list.component.html +++ b/libs/rucken/ionic/src/lib/entities/users/users-list/users-list.component.html @@ -1,26 +1,10 @@ diff --git a/libs/rucken/ionic/src/lib/entities/users/users-list/users-list.module.ts b/libs/rucken/ionic/src/lib/entities/users/users-list/users-list.module.ts index 250baaa8..7f87acca 100644 --- a/libs/rucken/ionic/src/lib/entities/users/users-list/users-list.module.ts +++ b/libs/rucken/ionic/src/lib/entities/users/users-list/users-list.module.ts @@ -2,6 +2,7 @@ import { CommonModule } from '@angular/common'; import { NgModule } from '@angular/core'; import { IonicModule } from '@ionic/angular'; import { TranslateModule } from '@ngx-translate/core'; +import { NgxBindIOModule } from 'ngx-bind-io'; import { EntityListModule } from '../../../components/entity-list/entity-list.module'; import { IonicModalsModule } from '../../../modules/modals/modals.module'; import { UserModalModule } from '../user-modal/user-modal.module'; @@ -16,7 +17,8 @@ import { UsersListComponent } from './users-list.component'; TranslateModule.forChild(), EntityListModule, UserModalModule, - UsersListFiltersModalModule + UsersListFiltersModalModule, + NgxBindIOModule ], declarations: [UsersListComponent], exports: [UsersListComponent] diff --git a/libs/rucken/ionic/src/lib/modules/auth-modal/auth-modal.component.html b/libs/rucken/ionic/src/lib/modules/auth-modal/auth-modal.component.html index 11643442..8b387de7 100644 --- a/libs/rucken/ionic/src/lib/modules/auth-modal/auth-modal.component.html +++ b/libs/rucken/ionic/src/lib/modules/auth-modal/auth-modal.component.html @@ -2,20 +2,8 @@ [formGroup]="form" novalidate> =11", "npm": ">=6.5.0" @@ -71,56 +71,57 @@ "all:build": "run-s github:build android" }, "dependencies": { - "@angular/common": "~7.2.0", - "@angular/core": "~7.2.0", - "@angular/forms": "~7.2.0", - "@angular/http": "~7.2.0", - "@angular/platform-browser": "~7.2.0", - "@angular/platform-browser-dynamic": "~7.2.0", - "@angular/router": "~7.2.0", - "@capacitor/android": "^1.0.0-beta.13", - "@capacitor/core": "1.0.0-beta.13", - "@ionic-native/core": "5.0.0-beta.15", - "@ionic-native/splash-screen": "5.0.0-beta.15", - "@ionic-native/status-bar": "5.0.0-beta.15", - "@ionic/angular": "4.0.0-rc.1", + "@angular/common": "~7.2.2", + "@angular/core": "~7.2.2", + "@angular/forms": "~7.2.2", + "@angular/http": "~7.2.2", + "@angular/platform-browser": "~7.2.2", + "@angular/platform-browser-dynamic": "~7.2.2", + "@angular/router": "~7.2.2", + "@capacitor/android": "^1.0.0-beta.17", + "@capacitor/core": "1.0.0-beta.17", + "@ionic-native/core": "5.0.0", + "@ionic-native/splash-screen": "5.0.0", + "@ionic-native/status-bar": "5.0.0", + "@ionic/angular": "4.0.0", "@ionic/storage": "^2.2.0", - "@nguniversal/express-engine": "^7.0.2", + "@nguniversal/express-engine": "^7.1.0", "@ngx-meta/core": "^7.0.0", - "@rucken/core": "^3.7.1", + "@rucken/core": "^3.8.1", "@types/object-path": "^0.11.0", "bind-observable": "^1.0.2", "cordova-android": "7.1.4", "cordova-plugin-device": "^2.0.2", "cordova-plugin-ionic-keyboard": "^2.1.3", - "cordova-plugin-ionic-webview": "^3.0.0", + "cordova-plugin-ionic-webview": "^3.1.1", "cordova-plugin-splashscreen": "^5.0.2", "cordova-plugin-statusbar": "^2.4.2", "cordova-plugin-whitelist": "^1.3.3", "cordova-sqlite-storage": "^2.6.0", - "core-js": "^2.6.2", + "core-js": "^2.6.3", + "ngx-bind-io": "^0.4.1", "ngx-cookie-service": "^2.1.0", - "ngx-dynamic-form-builder": "^0.8.1", + "ngx-dynamic-form-builder": "^0.9.0", "ngx-repository": "^0.6.3", "object-path": "^0.11.4", "rxjs": "6.3.3", - "zone.js": "^0.8.27" + "zone.js": "^0.8.29" }, "devDependencies": { - "@angular-devkit/architect": "~0.12.1", - "@angular-devkit/build-angular": "~0.12.1", - "@angular-devkit/build-ng-packagr": "~0.12.1", - "@angular-devkit/core": "~7.2.1", - "@angular-devkit/schematics": "~7.2.1", - "@angular/cli": "~7.2.1", - "@angular/compiler": "~7.2.0", - "@angular/compiler-cli": "~7.2.0", - "@angular/language-service": "~7.2.0", - "@capacitor/cli": "1.0.0-beta.13", + "@angular-devkit/architect": "~0.12.3", + "@angular-devkit/build-angular": "~0.12.3", + "@angular-devkit/build-ng-packagr": "~0.12.3", + "@angular-devkit/core": "~7.2.3", + "@angular-devkit/schematics": "~7.2.3", + "@angular/cli": "~7.2.3", + "@angular/compiler": "~7.2.2", + "@angular/compiler-cli": "~7.2.2", + "@angular/language-service": "~7.2.2", + "@capacitor/cli": "1.0.0-beta.17", "@ionic/ng-toolkit": "^1.1.0", "@ionic/schematics-angular": "^1.0.7", "@rucken/cli": "^3.3.0", - "@types/jasmine": "~3.3.5", + "@types/jasmine": "~3.3.8", "@types/jasminewd2": "~2.0.6", "@types/node": "~10.12.18", "codelyzer": "~4.5.0", @@ -134,22 +135,22 @@ "html-loader": "^0.5.5", "jasmine-core": "~3.3.0", "jasmine-spec-reporter": "~4.2.1", - "karma": "~3.1.4", + "karma": "~4.0.0", "karma-chrome-launcher": "~2.2.0", "karma-coverage-istanbul-reporter": "~2.0.4", "karma-jasmine": "~2.0.1", "karma-jasmine-html-reporter": "^1.4.0", "markdown-loader": "^5.0.0", - "ng-packagr": "^4.5.0", + "ng-packagr": "^4.7.0", "npm-run-all": "^4.1.5", - "prettier": "^1.15.3", + "prettier": "^1.16.1", "protractor": "~5.4.2", - "ts-node": "~7.0.1", + "ts-node": "~8.0.2", "tsickle": ">=0.34.0", "tslib": "^1.9.3", "tslint": "~5.12.1", "tslint-config-prettier": "^1.17.0", - "typescript": "~3.2.2" + "typescript": "~3.2.4" }, "cordova": { "plugins": { @@ -174,4 +175,4 @@ "zone.js" ] } -} \ No newline at end of file +}