diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 1310ec6..9565cc0 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -30,26 +30,42 @@ export class AppComponent {
this.pauseOnlyHoveredMessage = !this.pauseOnlyHoveredMessage
}
- public createInfoMessage(): void {
- this.advMessagesService.createInfoMessage('Awesome success message content', 'Awesome info');
- }
-
public createSuccessMessage(): void {
- this.advMessagesService.createSuccessMessage('Awesome success message content', 'Awesome success');
+ this.advMessagesService.createSuccessMessage('Awesome success message', 'Awesome success');
}
- public createSuccessMessageWithAdditionalInfos(): void {
- this.advMessagesService.createSuccessMessage('Awesome success message content', 'Awesome success', {
- clickMessage: 'Awesome click'
- });
+ public createInfoMessage(): void {
+ this.advMessagesService.createInfoMessage('Awesome info message', 'Awesome info', 3000);
}
public createWarningMessage(): void {
- this.advMessagesService.createWarningMessage('Important warning content', 'Important warning');
+ this.advMessagesService.createWarningMessage('Important warning message', 'Important warning', 6000);
}
public createErrorMessage(): void {
- this.advMessagesService.createErrorMessage('Awful error message', 'Error summary');
+ this.advMessagesService.createTimedErrorMessage('Awful error message', 'Error summary', 0);
+ }
+
+ public createTimedSuccessMessage(lifeTime: number) {
+ this.advMessagesService.createTimedSuccessMessage('Awesome timed success message', 'Timed success', lifeTime);
+ }
+
+ public createTimedInfoMessage(lifeTime: number) {
+ this.advMessagesService.createTimedInfoMessage('Awesome timed info message', 'Timed info', lifeTime);
+ }
+
+ public createTimedWarningMessage(lifeTime: number) {
+ this.advMessagesService.createTimedWarningMessage('Awesome timed warning message', 'Timed warning', lifeTime);
+ }
+
+ public createTimedErrorMessage(lifeTime: number) {
+ this.advMessagesService.createTimedErrorMessage('Awesome error message', 'Timed error', lifeTime);
+ }
+
+ public createSuccessMessageWithAdditionalInfos(): void {
+ this.advMessagesService.createSuccessMessage('Awesome success message content', 'Awesome success', {
+ clickMessage: 'Awesome click'
+ });
}
public clearMessages(): void {
diff --git a/src/app/app.styles.css b/src/app/app.styles.css
index d4e8612..8770db4 100644
--- a/src/app/app.styles.css
+++ b/src/app/app.styles.css
@@ -45,3 +45,12 @@ small {
background-color: white;
opacity: 0.95;
}
+
+.lifetime-input {
+ max-width: 20%;
+ display: inline;
+}
+
+.lifetime-button {
+ width: auto;
+}
diff --git a/src/app/lib/adv-growl.component.spec.ts b/src/app/lib/adv-growl.component.spec.ts
index a620828..3685f68 100644
--- a/src/app/lib/adv-growl.component.spec.ts
+++ b/src/app/lib/adv-growl.component.spec.ts
@@ -230,18 +230,18 @@ describe('Message Component', () => {
it('should have a lifeTime if the lifeTime property is bigger than the DEFAULT_LIFETIME', () => {
// given
- component.lifeTime = 2000
+ const lifeTime = 2000
// when
- const hasLifeTime = component.hasLifeTime()
+ const hasLifeTime = component.hasLifeTime(lifeTime)
// then
expect(hasLifeTime).toBeTruthy()
})
it('should not have a lifeTime if the lifeTime property is small or equal to the DEFAULT_LIFETIME', () => {
// given
- component.lifeTime = 0
+ const lifeTime = 0
// when
- const hasLifeTime = component.hasLifeTime()
+ const hasLifeTime = component.hasLifeTime(lifeTime)
// then
expect(hasLifeTime).toBeFalsy()
})
@@ -281,7 +281,6 @@ describe('Message Component', () => {
const lifeTime = 2000
const pauseOnlyHovered = false
component.freezeMessagesOnHover = freezeMessagesOnHover
- component.lifeTime = lifeTime
component.pauseOnlyHoveredMessage = pauseOnlyHovered
component.hoverHelper = {
@@ -289,33 +288,37 @@ describe('Message Component', () => {
} as any
spyOn(component.hoverHelper, 'getPausableMessageStream').and.returnValue(Observable.of(1))
+ const asserter = {
+ next: hoveredMessageId => expect(hoveredMessageId).toBe(messageId)
+ }
+
// when
- const finitStream = component.getFinitStream(messageId)
+ const finitStream = component.getFinitStream(messageId, lifeTime)
// then
expect(component.hoverHelper.getPausableMessageStream).toHaveBeenCalledWith(messageId, lifeTime, pauseOnlyHovered)
- expect(finitStream.subscribe(hoveredMessageId => expect(hoveredMessageId).toBe(messageId)))
+ expect(finitStream.subscribe(asserter));
})
it('should get an unpausable stream if freezeMessagesOnHover is set to false', () => {
// given
const messageId = '42'
const freezeMessagesOnHover = false
+ const lifeTime = 3000;
component.freezeMessagesOnHover = freezeMessagesOnHover
spyOn(component, 'getUnPausableMessageStream').and.returnValue(Observable.of(1))
// when
- const finitStream = component.getFinitStream(messageId)
+ const finitStream = component.getFinitStream(messageId, lifeTime)
// then
- expect(component.getUnPausableMessageStream).toHaveBeenCalled()
+ expect(component.getUnPausableMessageStream).toHaveBeenCalledWith(lifeTime)
expect(finitStream.subscribe(hoveredMessageId => expect(hoveredMessageId).toBe(messageId)))
})
it('should return a timed observable when we call getUnpausable message stream', () => {
// given
const lifeTime = 3000
- component.lifeTime = lifeTime
spyOn(Observable, 'timer')
// when
- component.getUnPausableMessageStream()
+ component.getUnPausableMessageStream(lifeTime)
// then
expect(Observable.timer).toHaveBeenCalledWith(lifeTime)
})
@@ -360,13 +363,26 @@ describe('Message Component', () => {
it('should call emit with the event and the onClose emitter when a message is closed', () => {
// given
+ component.ngOnInit()
const $event = {message: 'Sample Message'}
spyOn(component, 'emitMessage')
+ spyOn(component.messageCache, 'deallocateMessageSpot')
// when
component.messageClosed($event)
// then
expect(component.emitMessage).toHaveBeenCalledWith($event, component.onClose)
})
+
+ it('must deallocate a message spot when a message is closed', () => {
+ // given
+ component.ngOnInit()
+ const $event = {message: 'Sample Message'}
+ spyOn(component.messageCache, 'deallocateMessageSpot')
+ // when
+ component.messageClosed($event)
+ // then
+ expect(component.messageCache.deallocateMessageSpot).toHaveBeenCalled()
+ })
})
describe('Emiting hover events', () => {
diff --git a/src/app/lib/adv-growl.component.ts b/src/app/lib/adv-growl.component.ts
index dfabac1..0251ef7 100644
--- a/src/app/lib/adv-growl.component.ts
+++ b/src/app/lib/adv-growl.component.ts
@@ -3,7 +3,6 @@
*/
import {
Component,
- ElementRef,
EventEmitter,
Input,
OnChanges,
@@ -28,7 +27,7 @@ import {AdvGrowlHoverHelper} from './adv-growl.hoverHelper';
import {AdvGrowlMessageCache} from './adv-growl.messageCache';
import {Observer} from 'rxjs/Observer';
-const DEFAULT_LIFETIME = 0
+const NO_LIFETIME = 0
const FREEZE_MESSAGES_DEFAULT = false
const PAUSE_ONLY_HOVERED_DEFAULT = false
const DEFAULT_MESSAGE_SPOTS = 0
@@ -42,7 +41,7 @@ export class AdvGrowlComponent implements OnInit, OnChanges {
@Input() style: any
@Input() styleClass: any
- @Input('life') lifeTime = DEFAULT_LIFETIME
+ @Input('life') lifeTime = NO_LIFETIME
@Input() freezeMessagesOnHover = FREEZE_MESSAGES_DEFAULT
@Input() messageSpots = DEFAULT_MESSAGE_SPOTS
@Input() pauseOnlyHoveredMessage = PAUSE_ONLY_HOVERED_DEFAULT;
@@ -107,11 +106,11 @@ export class AdvGrowlComponent implements OnInit, OnChanges {
public subscribeForMessages() {
this.messages = [];
this.messageCache.getMessages(this.messageService.getMessageStream(), this.messageSpots)
- .do(message => {
+ .do((message: AdvPrimeMessage) => {
this.messages.push(message);
this.onMessagesChanges.emit(this.messages);
})
- .mergeMap(message => this.getLifeTimeStream(message.id))
+ .mergeMap(message => this.getLifeTimeStream(message.id, message.lifeTime))
.takeUntil(Observable.merge(
this.messageService.getCancelStream(),
this.messageSpotChange$)
@@ -127,36 +126,37 @@ export class AdvGrowlComponent implements OnInit, OnChanges {
}
}
- getLifeTimeStream(messageId: string): Observable
{
- if (this.hasLifeTime()) {
- return this.getFinitStream(messageId)
+ getLifeTimeStream(messageId: string, lifeTime = this.lifeTime): Observable {
+ if (this.hasLifeTime(lifeTime)) {
+ return this.getFinitStream(messageId, lifeTime)
}
return this.getInifiniteStream();
}
- hasLifeTime(): boolean {
- return this.lifeTime > DEFAULT_LIFETIME
+ hasLifeTime(lifeTime: number): boolean {
+ return lifeTime > NO_LIFETIME
}
getInifiniteStream(): Observable {
return Observable.never();
}
- getFinitStream(messageId: string): Observable {
+ getFinitStream(messageId: string, lifeTime: number): Observable {
let finitStream: Observable
if (this.freezeMessagesOnHover) {
- finitStream = this.hoverHelper.getPausableMessageStream(messageId, this.lifeTime, this.pauseOnlyHoveredMessage)
+ finitStream = this.hoverHelper.getPausableMessageStream(messageId, lifeTime, this.pauseOnlyHoveredMessage)
} else {
- finitStream = this.getUnPausableMessageStream()
+ finitStream = this.getUnPausableMessageStream(lifeTime)
}
return finitStream.mapTo(messageId)
}
- getUnPausableMessageStream() {
- return Observable.timer(this.lifeTime)
+ getUnPausableMessageStream(lifeTime: number) {
+ return Observable.timer(lifeTime)
}
public messageClosed($event) {
+ this.messageCache.deallocateMessageSpot()
this.emitMessage($event, this.onClose)
}
diff --git a/src/app/lib/adv-growl.model.ts b/src/app/lib/adv-growl.model.ts
index daa3efd..3fefd5c 100644
--- a/src/app/lib/adv-growl.model.ts
+++ b/src/app/lib/adv-growl.model.ts
@@ -6,5 +6,6 @@ export interface AdvPrimeMessage {
severity: string;
summary: string;
detail: string;
+ lifeTime ?: number;
additionalProperties?: any;
}
diff --git a/src/app/lib/adv-growl.service.spec.ts b/src/app/lib/adv-growl.service.spec.ts
index 4deaca5..730c7c4 100644
--- a/src/app/lib/adv-growl.service.spec.ts
+++ b/src/app/lib/adv-growl.service.spec.ts
@@ -11,7 +11,7 @@ describe('Message Service', () => {
});
});
- describe('Creating simple messages', () => {
+ describe('createSuccessMessage', () => {
it('should create a successmessage and stream it into the message subject', done => {
// given
@@ -24,7 +24,9 @@ describe('Message Service', () => {
id,
severity: 'success',
summary: messageSummary,
- detail: messageContent
+ detail: messageContent,
+ lifeTime: undefined,
+ additionalProperties: undefined
};
sut.getMessageStream()
.subscribe(message => {
@@ -35,6 +37,34 @@ describe('Message Service', () => {
sut.createSuccessMessage(messageContent, messageSummary);
});
+ it('should create a successmessage with additional properties and stream it into the message subject', done => {
+ // given
+ const sut = TestBed.get(AdvGrowlService);
+ const messageContent = 'Awesome Message';
+ const messageSummary = 'Success';
+ const additionalProperties = {title: 'test', description: 'Test message'}
+ const id = 1;
+ spyOn(sut, 'getTimeStamp').and.returnValue(id);
+ const expectedMessage = {
+ id,
+ severity: 'success',
+ summary: messageSummary,
+ detail: messageContent,
+ lifeTime: undefined,
+ additionalProperties
+ };
+ sut.getMessageStream()
+ .subscribe(message => {
+ expect(message).toEqual(expectedMessage)
+ done();
+ });
+ // when
+ sut.createSuccessMessage(messageContent, messageSummary, additionalProperties);
+ })
+ })
+
+ describe('createErrorMessage', () => {
+
it('should create a errormessage and stream it into the message subject', done => {
// given
const sut = TestBed.get(AdvGrowlService);
@@ -46,7 +76,9 @@ describe('Message Service', () => {
id,
severity: 'error',
summary: messageSummary,
- detail: messageContent
+ detail: messageContent,
+ lifeTime: undefined,
+ additionalProperties: undefined
};
sut.getMessageStream()
.subscribe(message => {
@@ -57,6 +89,34 @@ describe('Message Service', () => {
sut.createErrorMessage(messageContent, messageSummary);
});
+ it('should create a errormessage with additional properties and stream it into the message subject', done => {
+ // given
+ const sut = TestBed.get(AdvGrowlService);
+ const messageContent = 'Awful Error';
+ const messageSummary = 'Error';
+ const additionalProperties = {title: 'Error message', description: 'something went wrong'}
+ const id = 1;
+ spyOn(sut, 'getTimeStamp').and.returnValue(id);
+ const expectedMessage = {
+ id,
+ severity: 'error',
+ summary: messageSummary,
+ detail: messageContent,
+ lifeTime: undefined,
+ additionalProperties
+ };
+ sut.getMessageStream()
+ .subscribe(message => {
+ expect(message).toEqual(expectedMessage);
+ done();
+ });
+ // when
+ sut.createErrorMessage(messageContent, messageSummary, additionalProperties);
+ })
+ })
+
+ describe('createInfoMessage', () => {
+
it('should create a infomessage and stream it into the message subject', done => {
// given
const sut = TestBed.get(AdvGrowlService);
@@ -68,7 +128,9 @@ describe('Message Service', () => {
id,
severity: 'info',
summary: messageSummary,
- detail: messageContent
+ detail: messageContent,
+ lifeTime: undefined,
+ additionalProperties: undefined
};
sut.getMessageStream()
.subscribe(message => {
@@ -79,6 +141,34 @@ describe('Message Service', () => {
sut.createInfoMessage(messageContent, messageSummary);
});
+ it('should create a infomessage with additonal properties and stream it into the message subject', done => {
+ // given
+ const sut = TestBed.get(AdvGrowlService);
+ const messageContent = 'Super important information';
+ const messageSummary = 'Information';
+ const additionalProperties = {title: 'Info message', description: 'Just some information'}
+ const id = 1;
+ spyOn(sut, 'getTimeStamp').and.returnValue(id);
+ const expectedMessage = {
+ id,
+ severity: 'info',
+ summary: messageSummary,
+ detail: messageContent,
+ lifeTime: undefined,
+ additionalProperties
+ };
+ sut.getMessageStream()
+ .subscribe(message => {
+ expect(message).toEqual(expectedMessage);
+ done();
+ });
+ // when
+ sut.createInfoMessage(messageContent, messageSummary, additionalProperties);
+ })
+ })
+
+ describe('createWarningMessage', () => {
+
it('should create a warningmessage and stream it into the message subject', done => {
// given
const sut = TestBed.get(AdvGrowlService);
@@ -90,7 +180,9 @@ describe('Message Service', () => {
id,
severity: 'warn',
summary: messageSummary,
- detail: messageContent
+ detail: messageContent,
+ lifeTime: undefined,
+ additionalProperties: undefined
};
sut.getMessageStream()
.subscribe(message => {
@@ -100,18 +192,78 @@ describe('Message Service', () => {
// when
sut.createWarningMessage(messageContent, messageSummary);
});
+
+ it('should create a warningmessage with additional properties and stream it into the message subject', done => {
+ // given
+ const sut = TestBed.get(AdvGrowlService);
+ const messageContent = 'Super important warning';
+ const messageSummary = 'Warning';
+ const additionalProperties = {title: 'Warning message', description: 'Some warnings'}
+ const id = 1;
+ spyOn(sut, 'getTimeStamp').and.returnValue(id);
+ const expectedMessage = {
+ id,
+ severity: 'warn',
+ summary: messageSummary,
+ detail: messageContent,
+ lifeTime: undefined,
+ additionalProperties
+ };
+ sut.getMessageStream()
+ .subscribe(message => {
+ expect(message).toEqual(expectedMessage);
+ done();
+ });
+ // when
+ sut.createWarningMessage(messageContent, messageSummary, additionalProperties);
+ });
+ })
+
+ describe('clearMessages', () => {
+ it('should stream a new message in the clearStream when calling clearMessages', done => {
+ // given
+ const sut = TestBed.get(AdvGrowlService);
+ sut.getCancelStream()
+ .subscribe(e => done());
+ // when
+ sut.clearMessages();
+ });
})
- describe('Streaming messages with additional properties', () => {
+ describe('createTimedSuccessMessage', () => {
- it('should create a successmessage and stream it into the message subject', done => {
+ it('should create a timed successmessage and stream it into the message subject', done => {
// given
const sut = TestBed.get(AdvGrowlService);
const messageContent = 'Awesome Message';
const messageSummary = 'Success';
- const additionalProperties = {
- clickMessage: 'Awesome click'
+ const lifeTime = 2000;
+ const id = 1;
+ spyOn(sut, 'getTimeStamp').and.returnValue(id);
+ const expectedMessage = {
+ id,
+ severity: 'success',
+ summary: messageSummary,
+ detail: messageContent,
+ lifeTime,
+ additionalProperties: undefined
};
+ sut.getMessageStream()
+ .subscribe(message => {
+ expect(message).toEqual(expectedMessage)
+ done();
+ });
+ // when
+ sut.createTimedSuccessMessage(messageContent, messageSummary, lifeTime);
+ });
+
+ it('should create a timed successmessage with additional properties and stream it into the message subject', done => {
+ // given
+ const sut = TestBed.get(AdvGrowlService)
+ const messageContent = 'Awesome Message'
+ const messageSummary = 'Success'
+ const lifeTime = 2000
+ const additionalProperties = {title: 'test', description: 'Test message'}
const id = 1;
spyOn(sut, 'getTimeStamp').and.returnValue(id);
const expectedMessage = {
@@ -119,25 +271,27 @@ describe('Message Service', () => {
severity: 'success',
summary: messageSummary,
detail: messageContent,
+ lifeTime,
additionalProperties
};
sut.getMessageStream()
.subscribe(message => {
- expect(message).toEqual(expectedMessage);
+ expect(message).toEqual(expectedMessage)
done();
});
// when
- sut.createSuccessMessage(messageContent, messageSummary, additionalProperties);
- });
+ sut.createTimedSuccessMessage(messageContent, messageSummary, lifeTime, additionalProperties);
+ })
+ })
- it('should create a errormessage and stream it into the message subject', done => {
+ describe('createTimedErrorMessage', () => {
+
+ it('should create a timed errormessage and stream it into the message subject', done => {
// given
const sut = TestBed.get(AdvGrowlService);
const messageContent = 'Awful Error';
const messageSummary = 'Error';
- const additionalProperties = {
- clickMessage: 'Awesome click'
- };
+ const lifeTime = 2000;
const id = 1;
spyOn(sut, 'getTimeStamp').and.returnValue(id);
const expectedMessage = {
@@ -145,7 +299,8 @@ describe('Message Service', () => {
severity: 'error',
summary: messageSummary,
detail: messageContent,
- additionalProperties
+ lifeTime,
+ additionalProperties: undefined
};
sut.getMessageStream()
.subscribe(message => {
@@ -153,17 +308,44 @@ describe('Message Service', () => {
done();
});
// when
- sut.createErrorMessage(messageContent, messageSummary, additionalProperties);
+ sut.createTimedErrorMessage(messageContent, messageSummary, lifeTime);
});
- it('should create a infomessage and stream it into the message subject', done => {
+ it('should create a timed errormessage with additional properties and stream it into the message subject', done => {
// given
- const sut = TestBed.get(AdvGrowlService);
- const messageContent = 'Super important information';
- const messageSummary = 'Information';
- const additionalProperties = {
- clickMessage: 'Awesome click'
+ const sut = TestBed.get(AdvGrowlService)
+ const messageContent = 'Awful Error'
+ const messageSummary = 'Error'
+ const lifeTime = 2000
+ const additionalProperties = {title: 'Error message', description: 'something went wrong'}
+ const id = 1;
+ spyOn(sut, 'getTimeStamp').and.returnValue(id);
+ const expectedMessage = {
+ id,
+ severity: 'error',
+ summary: messageSummary,
+ detail: messageContent,
+ lifeTime,
+ additionalProperties
};
+ sut.getMessageStream()
+ .subscribe(message => {
+ expect(message).toEqual(expectedMessage);
+ done();
+ });
+ // when
+ sut.createTimedErrorMessage(messageContent, messageSummary, lifeTime, additionalProperties);
+ })
+ })
+
+ describe('createTimedInfoMessage', () => {
+
+ it('should create a timed infomessage and stream it into the message subject', done => {
+ // given
+ const sut = TestBed.get(AdvGrowlService)
+ const messageContent = 'Super important information'
+ const messageSummary = 'Information'
+ const lifeTime = 2000
const id = 1;
spyOn(sut, 'getTimeStamp').and.returnValue(id);
const expectedMessage = {
@@ -171,7 +353,8 @@ describe('Message Service', () => {
severity: 'info',
summary: messageSummary,
detail: messageContent,
- additionalProperties
+ lifeTime,
+ additionalProperties: undefined
};
sut.getMessageStream()
.subscribe(message => {
@@ -179,24 +362,24 @@ describe('Message Service', () => {
done();
});
// when
- sut.createInfoMessage(messageContent, messageSummary, additionalProperties);
+ sut.createTimedInfoMessage(messageContent, messageSummary, lifeTime);
});
- it('should create a warningmessage and stream it into the message subject', done => {
+ it('should create a timed infomessage with additonal properties and stream it into the message subject', done => {
// given
- const sut = TestBed.get(AdvGrowlService);
- const messageContent = 'Super important warning';
- const messageSummary = 'Warning';
- const additionalProperties = {
- clickMessage: 'Awesome click'
- };
+ const sut = TestBed.get(AdvGrowlService)
+ const messageContent = 'Super important information'
+ const messageSummary = 'Information'
+ const lifeTime = 2000
+ const additionalProperties = {title: 'Info message', description: 'Just some information'}
const id = 1;
spyOn(sut, 'getTimeStamp').and.returnValue(id);
const expectedMessage = {
id,
- severity: 'warn',
+ severity: 'info',
summary: messageSummary,
detail: messageContent,
+ lifeTime,
additionalProperties
};
sut.getMessageStream()
@@ -205,18 +388,61 @@ describe('Message Service', () => {
done();
});
// when
- sut.createWarningMessage(messageContent, messageSummary, additionalProperties);
- });
+ sut.createTimedInfoMessage(messageContent, messageSummary, lifeTime, additionalProperties);
+ })
})
- describe('Clearing messages', () => {
- it('should stream a new message in the clearStream when calling clearMessages', done => {
+ describe('createTimedWarningMessage', () => {
+
+ it('should create a timed warningmessage and stream it into the message subject', done => {
// given
- const sut = TestBed.get(AdvGrowlService);
- sut.getCancelStream()
- .subscribe(e => done());
+ const sut = TestBed.get(AdvGrowlService)
+ const messageContent = 'Super important warning'
+ const messageSummary = 'Warning'
+ const lifeTime = 2000
+ const id = 1;
+ spyOn(sut, 'getTimeStamp').and.returnValue(id);
+ const expectedMessage = {
+ id,
+ severity: 'warn',
+ summary: messageSummary,
+ detail: messageContent,
+ lifeTime,
+ additionalProperties: undefined
+ };
+ sut.getMessageStream()
+ .subscribe(message => {
+ expect(message).toEqual(expectedMessage);
+ done();
+ });
// when
- sut.clearMessages();
+ sut.createTimedWarningMessage(messageContent, messageSummary, lifeTime);
});
+
+ it('should create a timed warningmessage with additional properties and stream it into the message subject', done => {
+ // given
+ const sut = TestBed.get(AdvGrowlService)
+ const messageContent = 'Super important warning'
+ const messageSummary = 'Warning'
+ const lifeTime = 2000
+ const additionalProperties = {title: 'Warning message', description: 'Some warnings'}
+ const id = 1;
+ spyOn(sut, 'getTimeStamp').and.returnValue(id);
+ const expectedMessage = {
+ id,
+ severity: 'warn',
+ summary: messageSummary,
+ detail: messageContent,
+ lifeTime,
+ additionalProperties
+ };
+ sut.getMessageStream()
+ .subscribe(message => {
+ expect(message).toEqual(expectedMessage);
+ done();
+ })
+ // when
+ sut.createTimedWarningMessage(messageContent, messageSummary, lifeTime, additionalProperties);
+ })
})
-});
+})
diff --git a/src/app/lib/adv-growl.service.ts b/src/app/lib/adv-growl.service.ts
index 4464b4b..37946c5 100644
--- a/src/app/lib/adv-growl.service.ts
+++ b/src/app/lib/adv-growl.service.ts
@@ -24,32 +24,45 @@ export class AdvGrowlService {
private message$: Subject = new Subject();
private cancel$: Subject = new Subject();
+ private readonly USE_DEFAULT_LIFETIME = undefined;
constructor() {
}
public createSuccessMessage(messageContent: string, summary: string, additionalProperties?: any): void {
- this.createMessage(MessageSeverities.SUCCESS, summary, messageContent, additionalProperties);
+ this.createMessage(MessageSeverities.SUCCESS, summary, messageContent, this.USE_DEFAULT_LIFETIME, additionalProperties);
+ }
+
+ public createTimedSuccessMessage(messageContent: string, summary: string, lifeTime: number, additionalProperties?: any): void {
+ this.createMessage(MessageSeverities.SUCCESS, summary, messageContent, lifeTime, additionalProperties);
}
public createInfoMessage(messageContent: string, summary: string, additionalProperties?: any): void {
- this.createMessage(MessageSeverities.INFO, summary, messageContent, additionalProperties);
+ this.createMessage(MessageSeverities.INFO, summary, messageContent, this.USE_DEFAULT_LIFETIME, additionalProperties);
+ }
+
+ public createTimedInfoMessage(messageContent: string, summary: string, lifeTime: number, additionalProperties?: any): void {
+ this.createMessage(MessageSeverities.INFO, summary, messageContent, lifeTime, additionalProperties);
}
public createWarningMessage(messageContent: string, summary: string, additionalProperties?: any): void {
- this.createMessage(MessageSeverities.WARN, summary, messageContent, additionalProperties);
+ this.createMessage(MessageSeverities.WARN, summary, messageContent, this.USE_DEFAULT_LIFETIME, additionalProperties);
+ }
+
+ public createTimedWarningMessage(messageContent: string, summary: string, lifeTime: number, additionalProperties?: any): void {
+ this.createMessage(MessageSeverities.WARN, summary, messageContent, lifeTime, additionalProperties);
}
public createErrorMessage(messageContent: string, summary: string, additionalProperties?: any): void {
- this.createMessage(MessageSeverities.ERROR, summary, messageContent, additionalProperties);
+ this.createMessage(MessageSeverities.ERROR, summary, messageContent, this.USE_DEFAULT_LIFETIME, additionalProperties);
+ }
+
+ public createTimedErrorMessage(messageContent: string, summary: string, lifeTime: number, additionalProperties?: any): void {
+ this.createMessage(MessageSeverities.ERROR, summary, messageContent, lifeTime, additionalProperties);
}
- private createMessage(severity: string, summary: string, detail: string, additionalProperties?: any): void {
- if (additionalProperties) {
- this.message$.next({id: this.getTimeStamp(), severity, summary, detail, additionalProperties});
- } else {
- this.message$.next({id: this.getTimeStamp(), severity, summary, detail});
- }
+ private createMessage(severity: string, summary: string, detail: string, lifeTime?: number, additionalProperties?: any): void {
+ this.message$.next({id: this.getTimeStamp(), severity, summary, detail, lifeTime, additionalProperties});
}
private getTimeStamp(): string {