diff --git a/frontend/app/features/administration/pages/cluster/cluster-page.component.ts b/frontend/app/features/administration/pages/cluster/cluster-page.component.ts index cc13a9700..73cfc022e 100644 --- a/frontend/app/features/administration/pages/cluster/cluster-page.component.ts +++ b/frontend/app/features/administration/pages/cluster/cluster-page.component.ts @@ -6,7 +6,6 @@ */ import { Component } from '@angular/core'; -import { UIState } from '@app/shared'; @Component({ selector: 'sqx-cluster-area', @@ -14,8 +13,4 @@ import { UIState } from '@app/shared'; templateUrl: './cluster-page.component.html' }) export class ClusterPageComponent { - constructor( - public readonly uiState: UIState - ) { - } } \ No newline at end of file diff --git a/frontend/app/features/administration/pages/event-consumers/event-consumer.component.ts b/frontend/app/features/administration/pages/event-consumers/event-consumer.component.ts index 740b3e1e0..73178a1e0 100644 --- a/frontend/app/features/administration/pages/event-consumers/event-consumer.component.ts +++ b/frontend/app/features/administration/pages/event-consumers/event-consumer.component.ts @@ -24,7 +24,7 @@ export class EventConsumerComponent { public eventConsumer: EventConsumerDto; constructor( - public readonly eventConsumersState: EventConsumersState + private readonly eventConsumersState: EventConsumersState ) { } diff --git a/frontend/app/features/administration/pages/users/users-page.component.html b/frontend/app/features/administration/pages/users/users-page.component.html index 4db957e2d..310c64065 100644 --- a/frontend/app/features/administration/pages/users/users-page.component.html +++ b/frontend/app/features/administration/pages/users/users-page.component.html @@ -51,9 +51,7 @@
- - +
diff --git a/frontend/app/features/administration/pages/users/users-page.component.ts b/frontend/app/features/administration/pages/users/users-page.component.ts index ba0f33629..ffead1698 100644 --- a/frontend/app/features/administration/pages/users/users-page.component.ts +++ b/frontend/app/features/administration/pages/users/users-page.component.ts @@ -33,7 +33,14 @@ export class UsersPageComponent extends ResourceOwner implements OnInit { } public ngOnInit() { - this.usersState.loadAndListen(this.usersRoute); + const initial = + this.usersRoute.mapTo(this.usersState) + .withPaging('users', 10) + .withString('query') + .getInitial(); + + this.usersState.load(false, initial); + this.usersRoute.listen(); } public reload() { @@ -44,7 +51,7 @@ export class UsersPageComponent extends ResourceOwner implements OnInit { this.usersState.search(this.usersFilter.value); } - public trackByUser(_ndex: number, user: UserDto) { + public trackByUser(_index: number, user: UserDto) { return user.id; } } \ No newline at end of file diff --git a/frontend/app/features/administration/state/users.state.spec.ts b/frontend/app/features/administration/state/users.state.spec.ts index 24a3a1419..d45ec152b 100644 --- a/frontend/app/features/administration/state/users.state.spec.ts +++ b/frontend/app/features/administration/state/users.state.spec.ts @@ -10,13 +10,10 @@ import { DialogService } from '@app/shared'; import { of, throwError } from 'rxjs'; import { onErrorResumeNext } from 'rxjs/operators'; import { IMock, It, Mock, Times } from 'typemoq'; -import { TestValues } from './../../../shared/state/_test-helpers'; import { createUser } from './../services/users.service.spec'; import { UsersState } from './users.state'; describe('UsersState', () => { - const { buildDummyStateSynchronizer } = TestValues; - const user1 = createUser(1); const user2 = createUser(2); @@ -110,20 +107,6 @@ describe('UsersState', () => { expect(usersState.snapshot.query).toEqual('my-query'); }); - - it('should load when synchronizer triggered', () => { - const { synchronizer, trigger } = buildDummyStateSynchronizer(); - - usersService.setup(x => x.getUsers(10, 0, undefined)) - .returns(() => of(oldUsers)).verifiable(Times.exactly(2)); - - usersState.loadAndListen(synchronizer); - - trigger(); - trigger(); - - expect().nothing(); - }); }); describe('Updates', () => { diff --git a/frontend/app/features/administration/state/users.state.ts b/frontend/app/features/administration/state/users.state.ts index aea22a04e..9c02f5cec 100644 --- a/frontend/app/features/administration/state/users.state.ts +++ b/frontend/app/features/administration/state/users.state.ts @@ -7,7 +7,7 @@ import { Injectable } from '@angular/core'; import '@app/framework/utils/rxjs-extensions'; -import { DialogService, getPagingInfo, ListState, shareSubscribed, State, StateSynchronizer } from '@app/shared'; +import { DialogService, getPagingInfo, ListState, shareSubscribed, State } from '@app/shared'; import { Observable, of } from 'rxjs'; import { catchError, finalize, tap } from 'rxjs/operators'; import { CreateUserDto, UpdateUserDto, UserDto, UsersService } from './../services/users.service'; @@ -83,18 +83,9 @@ export class UsersState extends State { return this.usersService.getUser(id).pipe(catchError(() => of(null))); } - public loadAndListen(synchronizer: StateSynchronizer) { - synchronizer.mapTo(this) - .keep('selectedUser') - .withPaging('users', 10) - .withString('query', 'q') - .whenSynced(() => this.loadInternal(false)) - .build(); - } - - public load(isReload = false): Observable { + public load(isReload = false, update: Partial = {}): Observable { if (!isReload) { - this.resetState({ selectedUser: this.snapshot.selectedUser }); + this.resetState({ selectedUser: this.snapshot.selectedUser, ...update }); } return this.loadInternal(isReload); diff --git a/frontend/app/features/api/pages/graphql/graphql-page.component.ts b/frontend/app/features/api/pages/graphql/graphql-page.component.ts index 8afc0a1b2..e4327e287 100644 --- a/frontend/app/features/api/pages/graphql/graphql-page.component.ts +++ b/frontend/app/features/api/pages/graphql/graphql-page.component.ts @@ -40,6 +40,8 @@ export class GraphQLPageComponent implements AfterViewInit { } private request(params: any) { - return this.graphQlService.query(this.appsState.appName, params).pipe(catchError(response => of(response.error))).toPromise(); + return this.graphQlService.query(this.appsState.appName, params).pipe( + catchError(response => of(response.error))) + .toPromise(); } } \ No newline at end of file diff --git a/frontend/app/features/assets/pages/assets-filters-page.component.ts b/frontend/app/features/assets/pages/assets-filters-page.component.ts index bcd9c5f05..4474ed255 100644 --- a/frontend/app/features/assets/pages/assets-filters-page.component.ts +++ b/frontend/app/features/assets/pages/assets-filters-page.component.ts @@ -14,12 +14,12 @@ import { AssetsState, Queries, Query, UIState } from '@app/shared'; templateUrl: './assets-filters-page.component.html' }) export class AssetsFiltersPageComponent { - public assetsQueries = new Queries(this.uiState, 'assets'); + public assetsQueries: Queries; - constructor( - public readonly assetsState: AssetsState, - private readonly uiState: UIState + constructor(uiState: UIState, + public readonly assetsState: AssetsState ) { + this.assetsQueries = new Queries(uiState, 'assets'); } public search(query: Query) { diff --git a/frontend/app/features/assets/pages/assets-page.component.ts b/frontend/app/features/assets/pages/assets-page.component.ts index 3b5152c4e..4527eda35 100644 --- a/frontend/app/features/assets/pages/assets-page.component.ts +++ b/frontend/app/features/assets/pages/assets-page.component.ts @@ -6,7 +6,7 @@ */ import { Component, OnInit } from '@angular/core'; -import { AssetsState, DialogModel, LocalStoreService, Queries, Query, ResourceOwner, Router2State, UIState } from '@app/shared'; +import { AssetsState, DialogModel, LocalStoreService, Queries, Query, QueryFullTextSynchronizer, ResourceOwner, Router2State, UIState } from '@app/shared'; import { Settings } from '@app/shared/state/settings'; @Component({ @@ -36,7 +36,16 @@ export class AssetsPageComponent extends ResourceOwner implements OnInit { } public ngOnInit() { - this.assetsState.loadAndListen(this.assetsRoute); + const initial = + this.assetsRoute.mapTo(this.assetsState) + .withPaging('assets', 30) + .withString('parentId') + .withStrings('tagsSelected') + .withSynchronizer(QueryFullTextSynchronizer.INSTANCE) + .getInitial(); + + this.assetsState.load(false, initial); + this.assetsRoute.listen(); } public reload() { diff --git a/frontend/app/features/content/pages/content/content-history-page.component.ts b/frontend/app/features/content/pages/content/content-history-page.component.ts index 4ea83adeb..2ac4228ee 100644 --- a/frontend/app/features/content/pages/content/content-history-page.component.ts +++ b/frontend/app/features/content/pages/content/content-history-page.component.ts @@ -8,9 +8,9 @@ // tslint:disable: triple-equals import { Component, OnInit, ViewChild } from '@angular/core'; -import { AppsState, ContentDto, ContentsState, fadeAnimation, HistoryEventDto, HistoryService, ModalModel, ResourceOwner, SchemaDetailsDto, SchemasState, switchSafe } from '@app/shared'; +import { AppsState, ContentDto, ContentsState, defined, fadeAnimation, HistoryEventDto, HistoryService, ModalModel, ResourceOwner, SchemasState, switchSafe } from '@app/shared'; import { Observable, timer } from 'rxjs'; -import { filter, map, onErrorResumeNext, switchMap } from 'rxjs/operators'; +import { map } from 'rxjs/operators'; import { DueTimeSelectorComponent } from './../../shared/due-time-selector.component'; import { ContentPageComponent } from './content-page.component'; @@ -26,8 +26,6 @@ export class ContentHistoryPageComponent extends ResourceOwner implements OnInit @ViewChild('dueTimeSelector', { static: false }) public dueTimeSelector: DueTimeSelectorComponent; - public schema: SchemaDetailsDto; - public content: ContentDto; public contentEvents: Observable>; @@ -46,43 +44,31 @@ export class ContentHistoryPageComponent extends ResourceOwner implements OnInit public ngOnInit() { this.own( - this.schemasState.selectedSchema - .subscribe(schema => { - if (schema) { - this.schema = schema; - } - })); - - this.own( - this.contentsState.selectedContent + this.contentsState.selectedContent.pipe(defined()) .subscribe(content => { - if (content) { - this.content = content; - } + this.content = content; })); this.contentEvents = this.contentsState.selectedContent.pipe( - filter(x => !!x), - map(content => `schemas.${this.schemasState.schemaId}.contents.${content?.id}`), + defined(), + map(content => `schemas.${this.schemasState.schemaId}.contents.${content.id}`), switchSafe(channel => timer(0, 5000).pipe(map(() => channel))), switchSafe(channel => this.historyService.getHistory(this.appsState.appName, channel))); } public changeStatus(status: string) { this.contentPage.checkPendingChangesBeforeChangingStatus().pipe( - filter(x => !!x), - switchMap(_ => this.dueTimeSelector.selectDueTime(status)), - switchMap(d => this.contentsState.changeManyStatus([this.content], status, d)), - onErrorResumeNext()) + defined(), + switchSafe(_ => this.dueTimeSelector.selectDueTime(status)), + switchSafe(d => this.contentsState.changeManyStatus([this.content], status, d))) .subscribe(); } public createDraft() { this.contentPage.checkPendingChangesBeforeChangingStatus().pipe( - filter(x => !!x), - switchMap(d => this.contentsState.createDraft(this.content)), - onErrorResumeNext()) + defined(), + switchSafe(() => this.contentsState.createDraft(this.content))) .subscribe(); } diff --git a/frontend/app/features/content/pages/content/content-page.component.html b/frontend/app/features/content/pages/content/content-page.component.html index 1ea1aa459..90779b4d1 100644 --- a/frontend/app/features/content/pages/content/content-page.component.html +++ b/frontend/app/features/content/pages/content/content-page.component.html @@ -18,9 +18,21 @@ -