This commit is contained in:
insanity 2018-05-24 16:21:02 +09:00
parent ab75105f46
commit 9370c2c964
6 changed files with 7 additions and 25 deletions

View File

@ -3,7 +3,8 @@ import * as ListStore from '@overflow/notification/store/list';
import * as DetailStore from '@overflow/notification/store/detail'; import * as DetailStore from '@overflow/notification/store/detail';
import { Store, select } from '@ngrx/store'; import { Store, select } from '@ngrx/store';
import { ReadAllByMemberSelector, ReadSelector } from '@overflow/notification/store'; import { ReadAllByMemberSelector, ReadSelector } from '@overflow/notification/store';
import { Page, PageParams } from '../../../model'; import { Page } from '@overflow/commons-typescript/model/commons/Page';
import { PageParams } from '@overflow/commons-typescript/model/commons/PageParams';
import { RPCClientError } from '@loafer/ng-rpc'; import { RPCClientError } from '@loafer/ng-rpc';
import { AuthSelector } from '@overflow/member/store'; import { AuthSelector } from '@overflow/member/store';
import { Member } from '@overflow/commons-typescript/model/member'; import { Member } from '@overflow/commons-typescript/model/member';
@ -36,7 +37,7 @@ export class AppNotificationComponent implements OnInit, AfterContentInit, OnDes
ngOnInit() { ngOnInit() {
this.notificationSubscription$ = this.notification$.subscribe( this.notificationSubscription$ = this.notification$.subscribe(
(page: Page) => { (page: Page) => {
if (page !== null) { if (page !== null && page !== undefined) {
this.notifications = page.content; this.notifications = page.content;
this.getUnconfirmedCount(); this.getUnconfirmedCount();
} }

View File

@ -1,13 +0,0 @@
export interface Page {
content: any;
first: boolean;
last: boolean;
number: number;
numberOfElements: number;
size: number;
sort: any;
totalElements: number;
totalPages: number;
}
// export default Page;

View File

@ -1,8 +0,0 @@
export interface PageParams {
pageNo: string;
countPerPage: string;
sortCol?: string;
sortDirection?: string;
}
// export default PageParams;

View File

@ -1,2 +0,0 @@
export * from './Page';
export * from './PageParams';

View File

@ -5,6 +5,7 @@ import { InfraPageRoutingModule } from './infra-page-routing.module';
import { InfraModule } from '@overflow/infra/infra.module'; import { InfraModule } from '@overflow/infra/infra.module';
import { InfraPageComponent } from './infra-page.component'; import { InfraPageComponent } from './infra-page.component';
import { KeyValueModule } from '../../commons/component/key-value/key-value.module';
// import { DiscoveryModule } from '@overflow/discovery/discovery.module'; // import { DiscoveryModule } from '@overflow/discovery/discovery.module';
@NgModule({ @NgModule({
@ -12,6 +13,7 @@ import { InfraPageComponent } from './infra-page.component';
CommonModule, CommonModule,
InfraPageRoutingModule, InfraPageRoutingModule,
InfraModule, InfraModule,
KeyValueModule
// DiscoveryModule // DiscoveryModule
], ],
declarations: [ declarations: [

View File

@ -6,6 +6,7 @@ import { ProbeTabPageRoutingModule } from './probe-tab-page-routing.module';
import { PrimeNGModules } from '@overflow/commons/prime-ng/prime-ng.module'; import { PrimeNGModules } from '@overflow/commons/prime-ng/prime-ng.module';
import { ProbeModule } from '@overflow/probe/probe.module'; import { ProbeModule } from '@overflow/probe/probe.module';
import { TabbarModule } from '../../commons/component/layout/tabbar/app.tabbar.module'; import { TabbarModule } from '../../commons/component/layout/tabbar/app.tabbar.module';
import { KeyValueModule } from '../../commons/component/key-value/key-value.module';
@NgModule({ @NgModule({
imports: [ imports: [
@ -14,6 +15,7 @@ import { TabbarModule } from '../../commons/component/layout/tabbar/app.tabbar.m
PrimeNGModules, PrimeNGModules,
ProbeModule, ProbeModule,
TabbarModule, TabbarModule,
KeyValueModule
], ],
declarations: [ declarations: [
ProbeTabPageComponent, ProbeTabPageComponent,