overflow_cloud/member_webapp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

notification in progress

Browse Source
This commit is contained in:
insanity
2018-05-25 12:31:08 +09:00
parent d8e0420876
commit a958109e2a
32 changed files with 422 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
@overflow/notification/component/index.ts
View File

@@ -1,5 +1,5 @@
import { NotificationComponent } from './notification/notification.component';
import { NotificationListComponent } from './list/list.component';
export const COMPONENTS = [
NotificationComponent,
NotificationListComponent,
];

0
@overflow/notification/component/notification/notification.component.html → @overflow/notification/component/list/list.component.html
View File

12
@overflow/notification/component/notification/notification.component.spec.ts → @overflow/notification/component/list/list.component.spec.ts
View File

@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { NotificationComponent } from './notification.component';
import { NotificationListComponent } from './list.component';
describe('NotificationComponent', () => {
let component: NotificationComponent;
let fixture: ComponentFixture<NotificationComponent>;
describe('NotificationListComponent', () => {
let component: NotificationListComponent;
let fixture: ComponentFixture<NotificationListComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ NotificationComponent ]
declarations: [ NotificationListComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(NotificationComponent);
fixture = TestBed.createComponent(NotificationListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});

104
@overflow/notification/component/list/list.component.ts Normal file
View File

@@ -0,0 +1,104 @@
import { Component, Input } from '@angular/core';
import { Notification } from '@overflow/commons-typescript/model/notification';
@Component({
selector: 'of-notification-list',
templateUrl: './list.component.html',
})
export class NotificationListComponent {
@Input() notifications: Notification[];
constructor(
) { }
// ngOnInit() {
// // this.notificationSubscription$ = this.notification$.subscribe(
// // (page: Page) => {
// // if (page !== null) {
// // this.notifications = page.content;
// // this.totalLength = page.totalElements;
// // }
// // },
// // (error: RPCClientError) => {
// // console.log(error.response.message);
// // }
// // );
// this.readSuccess$.subscribe(
// (noti: Notification) => {
// if (noti) {
// this.getNotifications(this.currPage);
// }
// },
// (error: RPCClientError) => {
// console.log(error.response.message);
// }
// );
// }
// ngAfterContentInit() {
// this.getNotifications(this.currPage);
// }
// ngOnDestroy() {
// if (this.notificationSubscription$) {
// this.notificationSubscription$.unsubscribe();
// }
// }
// // updateData(noti: Notification) {
// // for (let i = 0; i < this.notifications.length; i++) {
// // const exist = this.notifications[i];
// // if (exist.id === noti.id) {
// // this.notifications[i] = noti;
// // return;
// // }
// // }
// // }
// getNotifications(pageIndex: number) {
// // this.listStore.select(AuthSelector.select('member')).subscribe(
// // (member: Member) => {
// // const pageParams: PageParams = {
// // pageNo: pageIndex + '',
// // countPerPage: this.pageSize,
// // sortCol: 'id',
// // sortDirection: 'descending'
// // };
// // this.listStore.dispatch(new ListStore.ReadAllByMember({ member, pageParams }));
// // this.currPage = pageIndex;
// // },
// // (error) => {
// // console.log(error);
// // }
// // );
// }
// onRowSelect(event) {
// this.detailStore.dispatch(new DetailStore.MarkAsRead(event.data));
// alert('Will redirect to ' + event.data.url);
// // this.router.navigate([n.url]);
// }
// onPaging(e) {
// this.getNotifications(e.page);
// }
// onMarkAllAsRead() {
// // this.listStore.select(AuthSelector.select('member')).subscribe(
// // (member: Member) => {
// // const pageParams: PageParams = {
// // pageNo: this.currPage + '',
// // countPerPage: this.pageSize,
// // sortCol: 'id',
// // sortDirection: 'descending'
// // };
// // this.listStore.dispatch(new ListStore.MarkAllAsRead({ member, pageParams }));
// // },
// // (error) => {
// // console.log(error);
// // }
// // );
// }
}

124
@overflow/notification/component/notification/notification.component.ts
View File

@@ -1,124 +0,0 @@
import { Component, OnInit, Input, ViewChild, AfterContentInit, OnDestroy } from '@angular/core';
import { Router } from '@angular/router';
import { Store, select } from '@ngrx/store';
import { RPCClientError } from '@loafer/ng-rpc';
import { Notification } from '@overflow/commons-typescript/model/notification';
import * as DetailStore from '../../store/detail';
import * as ListStore from '../../store/list';
import { ReadAllByMemberSelector, ReadSelector } from '../../store';
import { AuthSelector } from '@overflow/member/store';
import { Member } from '@overflow/commons-typescript/model/member';
// import { PageParams, Page } from 'app/commons/model';
import { Subscription } from 'rxjs/Subscription';
@Component({
selector: 'of-notification',
templateUrl: './notification.component.html',
})
export class NotificationComponent implements OnInit, AfterContentInit, OnDestroy {
notificationSubscription$: Subscription;
notification$ = this.listStore.pipe(select(ReadAllByMemberSelector.select('page')));
notifications: Notification[];
readSuccess$ = this.detailStore.pipe(select(ReadSelector.select('notification')));
pageSize = '10';
totalLength = 0;
currPage = 0;
constructor(
private router: Router,
private listStore: Store<ListStore.State>,
private detailStore: Store<DetailStore.State>
) { }
ngOnInit() {
// this.notificationSubscription$ = this.notification$.subscribe(
// (page: Page) => {
// if (page !== null) {
// this.notifications = page.content;
// this.totalLength = page.totalElements;
// }
// },
// (error: RPCClientError) => {
// console.log(error.response.message);
// }
// );
this.readSuccess$.subscribe(
(noti: Notification) => {
if (noti) {
this.getNotifications(this.currPage);
}
},
(error: RPCClientError) => {
console.log(error.response.message);
}
);
}
ngAfterContentInit() {
this.getNotifications(this.currPage);
}
ngOnDestroy() {
if (this.notificationSubscription$) {
this.notificationSubscription$.unsubscribe();
}
}
// updateData(noti: Notification) {
// for (let i = 0; i < this.notifications.length; i++) {
// const exist = this.notifications[i];
// if (exist.id === noti.id) {
// this.notifications[i] = noti;
// return;
// }
// }
// }
getNotifications(pageIndex: number) {
// this.listStore.select(AuthSelector.select('member')).subscribe(
// (member: Member) => {
// const pageParams: PageParams = {
// pageNo: pageIndex + '',
// countPerPage: this.pageSize,
// sortCol: 'id',
// sortDirection: 'descending'
// };
// this.listStore.dispatch(new ListStore.ReadAllByMember({ member, pageParams }));
// this.currPage = pageIndex;
// },
// (error) => {
// console.log(error);
// }
// );
}
onRowSelect(event) {
this.detailStore.dispatch(new DetailStore.MarkAsRead(event.data));
alert('Will redirect to ' + event.data.url);
// this.router.navigate([n.url]);
}
onPaging(e) {
this.getNotifications(e.page);
}
onMarkAllAsRead() {
// this.listStore.select(AuthSelector.select('member')).subscribe(
// (member: Member) => {
// const pageParams: PageParams = {
// pageNo: this.currPage + '',
// countPerPage: this.pageSize,
// sortCol: 'id',
// sortDirection: 'descending'
// };
// this.listStore.dispatch(new ListStore.MarkAllAsRead({ member, pageParams }));
// },
// (error) => {
// console.log(error);
// }
// );
}
}