diff --git a/src/app/admin/slide-editor/slide-editor.component.ts b/src/app/admin/slide-editor/slide-editor.component.ts
old mode 100644
new mode 100755
index 5f5eb51..191a08c
--- a/src/app/admin/slide-editor/slide-editor.component.ts
+++ b/src/app/admin/slide-editor/slide-editor.component.ts
@@ -1,11 +1,11 @@
-import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
-import { Title } from '@angular/platform-browser';
+import {Component, OnInit} from '@angular/core';
+import {ActivatedRoute, Router} from '@angular/router';
+import {Title} from '@angular/platform-browser';
import * as marked from 'marked';
-import { Slide } from '../../shared/slide';
-import { SlideService } from '../../shared/service/slide.service';
-import { Team } from '../../shared/team';
+import {Slide, SlideType, SlideVisibility} from '../../shared/slide';
+import {SlideService} from '../../shared/service/slide.service';
+import {Team} from '../../shared/team';
@Component({
selector: 'app-slide-editor',
@@ -14,7 +14,6 @@ import { Team } from '../../shared/team';
})
export class SlideEditorComponent implements OnInit {
private md;
- public emptyTeam: Team = new Team();
public slide: Slide;
public teams: Array
= [];
public renderedPreview: String = '';
@@ -25,7 +24,6 @@ export class SlideEditorComponent implements OnInit {
private route: ActivatedRoute,
private router: Router) {
this.md = marked.setOptions({});
- this.emptyTeam.name = 'All teams';
}
ngOnInit() {
@@ -36,9 +34,11 @@ export class SlideEditorComponent implements OnInit {
}) => {
this.teams = data.teams;
this.slide = data.slide ? data.slide : new Slide;
- this.slide.team = this.slide.team === null
- ? this.emptyTeam
- : this.teams.find(team => team.id === this.slide.team.id);
+ this.slide.teams = this.teams.filter(
+ team => this.slide.teams.some(
+ st => team.id === st.id
+ )
+ );
});
}
@@ -53,16 +53,27 @@ export class SlideEditorComponent implements OnInit {
get canSave(): boolean {
return [
this.slide.title,
- this.slide.slideData
- ].every(field => field.trim().length > 0);
+ this.isMarkdown ? this.slide.slideData : this.slide.slideUrl
+ ].every(field => field.trim().length > 0) && (
+ this.slide.visibility === SlideVisibility.Public ||
+ this.slide.visibility === SlideVisibility.Team && this.slide.teams.length > 0
+ );
}
get canPreview(): boolean {
- return this.slide.slideData.trim().length > 0;
+ return this.isMarkdown && this.slide.slideData.trim().length > 0 || this.isIframe && this.slide.slideUrl.trim().length > 0;
}
public preview() {
this.previewVisible = true;
this.renderedPreview = this.md.parse(this.slide.slideData);
}
+
+ get isMarkdown(): boolean {
+ return this.slide.type === SlideType.MarkDown;
+ }
+
+ get isIframe(): boolean {
+ return this.slide.type === SlideType.IFrame;
+ }
}
diff --git a/src/app/admin/slide-list/slide-list.component.html b/src/app/admin/slide-list/slide-list.component.html
old mode 100644
new mode 100755
index ecaeac9..df48a5c
--- a/src/app/admin/slide-list/slide-list.component.html
+++ b/src/app/admin/slide-list/slide-list.component.html
@@ -19,8 +19,8 @@
|
Slide title |
- Owner team |
- Visible |
+ Visible to |
+ Active |
Order |
@@ -33,7 +33,7 @@
class="large link red fitted trash alternate outline icon">
{{slide.title}} |
- {{slideTeam(slide.team)}} |
+ {{slideTeam(slide)}} |
|
slide.team == null || slide.team.id === this.selectedTeam.id
+ slide => slide.teams == null || slide.teams.some(s => s.id === this.selectedTeam.id)
);
}
@@ -46,8 +46,10 @@ export class SlideListComponent implements OnInit {
this.slideService.slides = slides;
}
- public slideTeam(team: Team): String {
- return team === null ? 'All teams' : team.name;
+ public slideTeam(slide: Slide): string {
+ return slide.visibility === SlideVisibility.Team && slide.teams.length > 0
+ ? slide.teams.map(team => team.name).join(', ')
+ : 'All teams';
}
public moveUp(slide: Slide) {
@@ -106,4 +108,11 @@ export class SlideListComponent implements OnInit {
'red times': !slide.isVisible
};
}
+
+ public visibilityIcon(slide: Slide) {
+ return {
+ 'green globe': slide.visibility === SlideVisibility.Public,
+ 'green users': slide.visibility === SlideVisibility.Team
+ };
+ }
}
diff --git a/src/app/admin/slide-resolver.service.ts b/src/app/admin/slide-resolver.service.ts
old mode 100644
new mode 100755
index f82fce2..75bc250
--- a/src/app/admin/slide-resolver.service.ts
+++ b/src/app/admin/slide-resolver.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { environment } from '../../environments/environment';
import { Slide } from '../shared/slide';
diff --git a/src/app/admin/team-resolver.service.ts b/src/app/admin/team-resolver.service.ts
old mode 100644
new mode 100755
index 84c2060..10b3194
--- a/src/app/admin/team-resolver.service.ts
+++ b/src/app/admin/team-resolver.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { Team } from '../shared/team';
import { environment } from '../../environments/environment';
diff --git a/src/app/display/commit-tracker/commit-tracker.component.css b/src/app/display/commit-tracker/commit-tracker.component.css
old mode 100644
new mode 100755
index a6a5e19..fe2b29d
--- a/src/app/display/commit-tracker/commit-tracker.component.css
+++ b/src/app/display/commit-tracker/commit-tracker.component.css
@@ -43,6 +43,8 @@
.ui.jira-avatar.image > img {
border-radius: 4px;
+ max-width: 45px;
+ height: auto;
}
@@ -56,4 +58,4 @@
opacity: 0;
width: 100%;
}
-}
\ No newline at end of file
+}
diff --git a/src/app/display/commit-tracker/commit-tracker.component.ts b/src/app/display/commit-tracker/commit-tracker.component.ts
old mode 100644
new mode 100755
index d448572..fc0fb8a
--- a/src/app/display/commit-tracker/commit-tracker.component.ts
+++ b/src/app/display/commit-tracker/commit-tracker.component.ts
@@ -1,8 +1,7 @@
import { Component, HostBinding, OnDestroy, OnInit } from '@angular/core';
import { Title } from '@angular/platform-browser';
import { ActivatedRoute } from '@angular/router';
-import { Subscription } from 'rxjs/Subscription';
-import { TimerObservable } from 'rxjs/observable/TimerObservable';
+import { Subscription, timer } from 'rxjs';
import { slideInOutAnimation } from '../../shared/slide-in-out-animation';
import { CommitTrackerService } from '../../shared/service/commit-tracker.service';
@@ -40,7 +39,7 @@ export class CommitTrackerComponent implements OnInit, OnDestroy {
this.titleService.setTitle('Commit-tracker : MTAStv');
this.route.data.subscribe((data: { commits: Array }) => this.commits = data.commits);
- const timerCT = TimerObservable.create(TIMER_COMMITTRACKER_REFRESH, TIMER_COMMITTRACKER_REFRESH);
+ const timerCT = timer(TIMER_COMMITTRACKER_REFRESH, TIMER_COMMITTRACKER_REFRESH);
this.refreshCommitTrackerTimer = timerCT.subscribe(() => {
this.commitTrackerService.getTeamCommits(this.settings.team.members.map(member => member.signum))
.subscribe(commits => this.commits = commits);
diff --git a/src/app/display/display.module.ts b/src/app/display/display.module.ts
old mode 100644
new mode 100755
index fab0336..c4e9c22
--- a/src/app/display/display.module.ts
+++ b/src/app/display/display.module.ts
@@ -16,6 +16,7 @@ import { PrefixJiraIdPipe } from './shared/prefix-jira-id.pipe';
import { PriorityColorPipe } from './shared/priority-color.pipe';
import { ShortenTextPipe } from './shared/shorten-text.pipe';
import { KanbanService } from './shared';
+import { SlideIframeComponent } from './slide-iframe/slide-iframe.component';
@NgModule({
imports: [
@@ -24,7 +25,7 @@ import { KanbanService } from './shared';
SuiModule,
DisplayRoutingModule
],
- exports: [SlideComponent],
+ exports: [SlideComponent, SlideIframeComponent],
declarations: [
CommitTrackerComponent,
SettingsComponent,
@@ -37,6 +38,7 @@ import { KanbanService } from './shared';
PrefixJiraIdPipe,
PriorityColorPipe,
ShortenTextPipe,
+ SlideIframeComponent,
],
providers: [
SlideShowService,
diff --git a/src/app/display/kanban-board/kanban-board.component.html b/src/app/display/kanban-board/kanban-board.component.html
old mode 100644
new mode 100755
index 435b752..584f834
--- a/src/app/display/kanban-board/kanban-board.component.html
+++ b/src/app/display/kanban-board/kanban-board.component.html
@@ -1,18 +1,18 @@
diff --git a/src/app/display/kanban-board/kanban-board.component.ts b/src/app/display/kanban-board/kanban-board.component.ts
old mode 100644
new mode 100755
index 0ee329e..83840ce
--- a/src/app/display/kanban-board/kanban-board.component.ts
+++ b/src/app/display/kanban-board/kanban-board.component.ts
@@ -4,9 +4,7 @@ import { ActivatedRoute } from '@angular/router';
import { KanbanBoard, KanbanEntry, KanbanService, } from '../shared';
import { slideInOutAnimation } from '../../shared/slide-in-out-animation';
-
-const WIP_LIMIT_INPROGRESS = 12;
-const WIP_LIMIT_VERIFICATION = 8;
+import { SettingsService } from '../../shared/service/settings.service';
@Component({
selector: 'app-kanban-board',
@@ -21,7 +19,8 @@ export class KanbanBoardComponent implements OnInit {
constructor(private titleService: Title,
private route: ActivatedRoute,
- private kanbanService: KanbanService) {
+ private kanbanService: KanbanService,
+ private settingService: SettingsService) {
}
/**
@@ -45,7 +44,7 @@ export class KanbanBoardComponent implements OnInit {
}
get inprogressWipLimit(): number {
- return WIP_LIMIT_INPROGRESS;
+ return this.settingService.team.inprogressColumn.wipLimit;
}
get inprogressWipCount(): number {
@@ -64,12 +63,12 @@ export class KanbanBoardComponent implements OnInit {
*/
get inprogressWipClass() {
return {
- 'over-wip': this.inprogressWipCount > WIP_LIMIT_INPROGRESS,
+ 'over-wip': this.inprogressWipCount > this.settingService.team.inprogressColumn.wipLimit,
};
}
get verificationWipLimit(): number {
- return WIP_LIMIT_VERIFICATION;
+ return this.settingService.team.verificationColumn.wipLimit;
}
get verificationWipCount(): number {
@@ -88,7 +87,23 @@ export class KanbanBoardComponent implements OnInit {
*/
get verificationWipClass() {
return {
- 'over-wip': this.verificationWipCount > WIP_LIMIT_VERIFICATION,
+ 'over-wip': this.verificationWipCount > this.settingService.team.verificationColumn.wipLimit,
};
}
+
+ get backlogLabel(): string {
+ return this.settingService.team.backlogColumn.label;
+ }
+
+ get inProgressLabel(): string {
+ return this.settingService.team.inprogressColumn.label;
+ }
+
+ get verificationLabel(): string {
+ return this.settingService.team.verificationColumn.label;
+ }
+
+ get doneLabel(): string {
+ return this.settingService.team.doneColumn.label;
+ }
}
diff --git a/src/app/display/kanban-entry-item/kanban-entry-item.component.html b/src/app/display/kanban-entry-item/kanban-entry-item.component.html
old mode 100644
new mode 100755
index 2f58d4f..c08d372
--- a/src/app/display/kanban-entry-item/kanban-entry-item.component.html
+++ b/src/app/display/kanban-entry-item/kanban-entry-item.component.html
@@ -10,6 +10,8 @@
[ngClass]="entryClass(kanbanEntry)">
+ {{kanbanEntry.epicName}}
{{label|uppercase|blockedDays:kanbanEntry.daysBlocked}}
diff --git a/src/app/display/kanban-entry-item/kanban-entry-item.component.ts b/src/app/display/kanban-entry-item/kanban-entry-item.component.ts
old mode 100644
new mode 100755
index 175274a..0702f3c
--- a/src/app/display/kanban-entry-item/kanban-entry-item.component.ts
+++ b/src/app/display/kanban-entry-item/kanban-entry-item.component.ts
@@ -4,7 +4,7 @@ import { environment } from '../../../environments/environment';
import { JiraAssignee, KanbanEntry } from '../shared';
const DEFAULT_AVATAR = '/assets/riddler.png';
-const JIRA_BOARD_BASE_HREF = 'https://jirapducc.mo.ca.am.ericsson.se/browse/';
+const JIRA_BOARD_BASE_HREF = 'https://cc-jira.rnd.ki.sw.ericsson.se/browse/';
const labelColors = {
TSP: 'teal',
@@ -14,6 +14,9 @@ const labelColors = {
BLOCKED: 'red',
SPIKE: 'purple',
EXPEDITE: 'pink',
+
+ 'MTAS-GUARDIAN': 'pink',
+ 'MTAS-GUARDIANACTIVE': 'yellow',
};
@Component({
diff --git a/src/app/display/shared/kanban-entry.model.ts b/src/app/display/shared/kanban-entry.model.ts
old mode 100644
new mode 100755
index b97a2db..3b0049c
--- a/src/app/display/shared/kanban-entry.model.ts
+++ b/src/app/display/shared/kanban-entry.model.ts
@@ -1,12 +1,13 @@
-import {JiraIssueType} from "./jira-issue-type.model";
-import {JiraStatus} from "./jira-status.model";
-import {JiraAssignee} from "./jira-assignee.model";
+import {JiraIssueType} from './jira-issue-type.model';
+import {JiraStatus} from './jira-status.model';
+import {JiraAssignee} from './jira-assignee.model';
export class KanbanEntry {
public id: number;
public key: string;
public summary: string;
public issueType: JiraIssueType;
+ public epicName: string;
public status: JiraStatus;
public assignee: JiraAssignee;
public additionalAssignees: Array = [];
diff --git a/src/app/display/shared/kanban.service.ts b/src/app/display/shared/kanban.service.ts
old mode 100644
new mode 100755
index 192048e..0edac5d
--- a/src/app/display/shared/kanban.service.ts
+++ b/src/app/display/shared/kanban.service.ts
@@ -1,10 +1,13 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { ActivatedRouteSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { environment } from '../../../environments/environment';
import { KanbanBoard } from './kanban-board.model';
+import { SettingsService } from '../../shared/service/settings.service';
+import { TeamService } from '../../shared/service/team.service';
+import { flatMap } from 'rxjs/operators';
@Injectable()
export class KanbanService {
@@ -12,16 +15,21 @@ export class KanbanService {
private cachedKanbanBoard: KanbanBoard = new KanbanBoard();
- constructor(private httpService: HttpClient) {
+ constructor(private httpService: HttpClient,
+ private teamService: TeamService,
+ private settingService: SettingsService) {
}
/**
* Returns an observable instance to the kanban board api
+ * Reloads team data before, to refresh team config
*
* @returns {Observable}
*/
public getList(): Observable {
- return this.httpService.get(this.url);
+ return this.teamService.get(this.settingService.team.id).pipe(
+ flatMap(() => this.httpService.get(`${this.url}/${this.settingService.team.id}`))
+ );
}
/**
diff --git a/src/app/display/slide-iframe/slide-iframe.component.css b/src/app/display/slide-iframe/slide-iframe.component.css
new file mode 100755
index 0000000..a982899
--- /dev/null
+++ b/src/app/display/slide-iframe/slide-iframe.component.css
@@ -0,0 +1,20 @@
+:host {
+ display: block;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ width: 100%;
+ height: 100%;
+ padding: 3px;
+ background: #222;
+}
+:host.preview {
+ position: absolute;
+ z-index: 1;
+}
+iframe {
+ width: 100%;
+ height: 100%;
+ border: 0;
+}
diff --git a/src/app/display/slide-iframe/slide-iframe.component.html b/src/app/display/slide-iframe/slide-iframe.component.html
new file mode 100755
index 0000000..72cfad8
--- /dev/null
+++ b/src/app/display/slide-iframe/slide-iframe.component.html
@@ -0,0 +1 @@
+
diff --git a/src/app/display/slide-iframe/slide-iframe.component.spec.ts b/src/app/display/slide-iframe/slide-iframe.component.spec.ts
new file mode 100644
index 0000000..e20c9ac
--- /dev/null
+++ b/src/app/display/slide-iframe/slide-iframe.component.spec.ts
@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { SlideIframeComponent } from './slide-iframe.component';
+
+describe('SlideIframeComponent', () => {
+ let component: SlideIframeComponent;
+ let fixture: ComponentFixture;
+
+ beforeEach(async(() => {
+ TestBed.configureTestingModule({
+ declarations: [ SlideIframeComponent ]
+ })
+ .compileComponents();
+ }));
+
+ beforeEach(() => {
+ fixture = TestBed.createComponent(SlideIframeComponent);
+ component = fixture.componentInstance;
+ fixture.detectChanges();
+ });
+
+ it('should create', () => {
+ expect(component).toBeTruthy();
+ });
+});
diff --git a/src/app/display/slide-iframe/slide-iframe.component.ts b/src/app/display/slide-iframe/slide-iframe.component.ts
new file mode 100755
index 0000000..2f90d48
--- /dev/null
+++ b/src/app/display/slide-iframe/slide-iframe.component.ts
@@ -0,0 +1,29 @@
+import {Component, EventEmitter, HostListener, Input, OnInit, Output} from '@angular/core';
+import {DomSanitizer, SafeResourceUrl} from '@angular/platform-browser';
+
+@Component({
+ selector: 'app-slide-iframe',
+ templateUrl: './slide-iframe.component.html',
+ styleUrls: ['./slide-iframe.component.css']
+})
+export class SlideIframeComponent implements OnInit {
+ @Input() data = '';
+ @Input() preview = false;
+
+ @Input() visible = true;
+ @Output() visibleChange = new EventEmitter();
+
+ constructor(private sanitizer: DomSanitizer) {}
+ ngOnInit() {}
+
+ @HostListener('click')
+ public hide() {
+ if (this.preview) {
+ this.visibleChange.emit(false);
+ }
+ }
+
+ get sanitizedUrl(): SafeResourceUrl {
+ return this.sanitizer.bypassSecurityTrustResourceUrl(this.data);
+ }
+}
diff --git a/src/app/display/slide-show.service.ts b/src/app/display/slide-show.service.ts
old mode 100644
new mode 100755
index 6a82cdb..7789a8c
--- a/src/app/display/slide-show.service.ts
+++ b/src/app/display/slide-show.service.ts
@@ -19,9 +19,9 @@ export class SlideShowService {
public nextSlide() {
if (this.currentSlideIndex === this.slides.length - 1) {
- // this.currentSlideIndex++;
- // this.router.navigate(['/kanban']);
- // } else if (this.currentSlideIndex === this.slides.length) {
+ this.currentSlideIndex++;
+ this.router.navigate(['/kanban']);
+ } else if (this.currentSlideIndex === this.slides.length) {
this.currentSlideIndex = -1;
this.reloadSlides();
this.router.navigate(['/commit-tracker']);
@@ -39,7 +39,7 @@ export class SlideShowService {
const team = this.settingsService.team;
this.slideService.list().subscribe(
slides => this.slides = slides.filter(
- slide => slide.team === null || slide.team.id === team.id
+ slide => slide.teams === null || slide.teams.some(s => s.id === team.id) && slide.isVisible
)
);
}
diff --git a/src/app/display/slide-show/slide-show.component.html b/src/app/display/slide-show/slide-show.component.html
old mode 100644
new mode 100755
index 88cebed..18165b7
--- a/src/app/display/slide-show/slide-show.component.html
+++ b/src/app/display/slide-show/slide-show.component.html
@@ -1 +1,2 @@
-
+
+
diff --git a/src/app/display/slide-show/slide-show.component.ts b/src/app/display/slide-show/slide-show.component.ts
old mode 100644
new mode 100755
index 297efac..5ecc406
--- a/src/app/display/slide-show/slide-show.component.ts
+++ b/src/app/display/slide-show/slide-show.component.ts
@@ -1,10 +1,10 @@
-import { Component, HostBinding, OnInit } from '@angular/core';
-import { ActivatedRoute } from '@angular/router';
-import { Title } from '@angular/platform-browser';
+import {Component, HostBinding, OnInit} from '@angular/core';
+import {ActivatedRoute} from '@angular/router';
+import {Title} from '@angular/platform-browser';
import * as marked from 'marked';
-import { slideInOutAnimation } from '../../shared/slide-in-out-animation';
-import { Slide } from '../../shared/slide';
+import {slideInOutAnimation} from '../../shared/slide-in-out-animation';
+import {Slide, SlideType} from '../../shared/slide';
@Component({
selector: 'app-slide-show',
@@ -34,4 +34,12 @@ export class SlideShowComponent implements OnInit {
get renderedSlide(): String {
return this.md.parse(this.slide.slideData);
}
+
+ get isMarkdown(): boolean {
+ return this.slide.type === SlideType.MarkDown;
+ }
+
+ get isIframe(): boolean {
+ return this.slide.type === SlideType.IFrame;
+ }
}
diff --git a/src/app/display/slide/slide.component.ts b/src/app/display/slide/slide.component.ts
old mode 100644
new mode 100755
index 6db9cc8..e33e07b
--- a/src/app/display/slide/slide.component.ts
+++ b/src/app/display/slide/slide.component.ts
@@ -12,7 +12,6 @@ export class SlideComponent implements OnInit {
@Input() visible = true;
@Output() visibleChange = new EventEmitter();
-
constructor() {}
ngOnInit() {}
diff --git a/src/app/shared/service/commit-tracker.service.ts b/src/app/shared/service/commit-tracker.service.ts
old mode 100644
new mode 100755
index 3271e47..5c9f1d8
--- a/src/app/shared/service/commit-tracker.service.ts
+++ b/src/app/shared/service/commit-tracker.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { environment } from '../../../environments/environment';
import { Commit } from '../commit';
diff --git a/src/app/shared/service/self-updater.service.ts b/src/app/shared/service/self-updater.service.ts
old mode 100644
new mode 100755
index 0e203f0..2474613
--- a/src/app/shared/service/self-updater.service.ts
+++ b/src/app/shared/service/self-updater.service.ts
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { Location } from '@angular/common';
@Injectable()
diff --git a/src/app/shared/service/settings.service.ts b/src/app/shared/service/settings.service.ts
old mode 100644
new mode 100755
index 727a3eb..c46c4f8
--- a/src/app/shared/service/settings.service.ts
+++ b/src/app/shared/service/settings.service.ts
@@ -1,6 +1,5 @@
import { Injectable } from '@angular/core';
-import { Observable } from 'rxjs/Observable';
-import { Subject } from 'rxjs/Subject';
+import { Observable, Subject } from 'rxjs';
import { Team } from '../team';
const DEFAULT_SLIDE_INTERVAL = 30000;
diff --git a/src/app/shared/service/slide.service.ts b/src/app/shared/service/slide.service.ts
old mode 100644
new mode 100755
index c3495ba..1772bf2
--- a/src/app/shared/service/slide.service.ts
+++ b/src/app/shared/service/slide.service.ts
@@ -1,7 +1,7 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { environment } from '../../../environments/environment';
import { Slide } from '../slide';
@@ -18,9 +18,7 @@ export class SlideService implements Resolve>{
private static prepareSlideData(slide: Slide) {
const slideToSave = Object.assign({}, slide);
try {
- slideToSave.team = slideToSave.team.id === null
- ? null
- : slideToSave.team.id;
+ slideToSave.teams = slide.teams.map(team => team.id);
} catch (e) {}
return slideToSave;
}
diff --git a/src/app/shared/service/team.service.ts b/src/app/shared/service/team.service.ts
old mode 100644
new mode 100755
index 4c5b6d0..36f6a49
--- a/src/app/shared/service/team.service.ts
+++ b/src/app/shared/service/team.service.ts
@@ -1,10 +1,12 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { ActivatedRouteSnapshot, Resolve, RouterStateSnapshot } from '@angular/router';
-import { Observable } from 'rxjs/Observable';
+import { Observable } from 'rxjs';
import { environment } from '../../../environments/environment';
import { Team } from '../team';
+import {SettingsService} from './settings.service';
+import {map} from 'rxjs/operators';
@Injectable()
export class TeamService implements Resolve> {
@@ -12,7 +14,8 @@ export class TeamService implements Resolve> {
private apiEndPoint = environment.apiUrl + '/api/team';
private cachedTeams: Array = [];
- constructor(private httpClient: HttpClient) { }
+ constructor(private httpClient: HttpClient,
+ private settingsService: SettingsService) { }
public resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise> {
return this.list().toPromise();
@@ -22,6 +25,12 @@ export class TeamService implements Resolve> {
return this.httpClient.get>(this.apiEndPoint);
}
+ public get(id: number): Observable {
+ return this.httpClient.get(`${this.apiEndPoint}/${id}`).pipe(
+ map(team => this.updateSettingsWhenSelected(team))
+ );
+ }
+
public persist(team: Team): Observable {
return team.id === null
? this.create(team)
@@ -47,4 +56,11 @@ export class TeamService implements Resolve> {
set teams(teams: Array) {
this.cachedTeams = teams;
}
+
+ private updateSettingsWhenSelected(team: Team): Team {
+ if (this.settingsService.team.id === team.id) {
+ this.settingsService.team = team;
+ }
+ return team;
+ }
}
diff --git a/src/app/shared/service/timer.service.ts b/src/app/shared/service/timer.service.ts
old mode 100644
new mode 100755
index 0443a7c..641fe07
--- a/src/app/shared/service/timer.service.ts
+++ b/src/app/shared/service/timer.service.ts
@@ -1,13 +1,10 @@
import { Injectable, OnDestroy } from '@angular/core';
-import { Subject } from 'rxjs/Subject';
import { SettingsService } from './settings.service';
import { SelfUpdaterService } from './self-updater.service';
-import { TimerObservable } from 'rxjs/observable/TimerObservable';
-import { Subscription } from 'rxjs/Subscription';
+import { Subject, timer, Subscription } from 'rxjs';
import { ActivationStart, Router } from '@angular/router';
import { SlideShowService } from '../../display/slide-show.service';
-import 'rxjs/add/operator/filter';
-import 'rxjs/add/operator/switchMap';
+import { filter, switchMap } from 'rxjs/operators';
const TIMER_UPDATE_POLL_INTERVAL = 30000;
@@ -24,18 +21,19 @@ export class TimerService implements OnDestroy {
private router: Router,
private slideShowService: SlideShowService) {
- const timerSUC = TimerObservable.create(TIMER_UPDATE_POLL_INTERVAL, TIMER_UPDATE_POLL_INTERVAL);
+ const timerSUC = timer(TIMER_UPDATE_POLL_INTERVAL, TIMER_UPDATE_POLL_INTERVAL);
this.selfUpdateCheckerTimer = timerSUC.subscribe(() => {
this.selfUpdaterService.checkAndReloadIfNecessary();
});
- this.slideShowTimer = this.slideTimerSubject.switchMap((period: number) => TimerObservable.create(period))
+ this.slideShowTimer = this.slideTimerSubject
+ .pipe(switchMap((period: number) => timer(period)))
.subscribe(() => this.changeSlide());
this.setSlideTimer(this.settings.slideInterval);
this.autoSwitch = false;
this.router.events
- .filter(event => event instanceof ActivationStart)
+ .pipe(filter(event => event instanceof ActivationStart))
.subscribe((event: ActivationStart) => this.autoSwitch = !!event.snapshot.data.autoSwitchable);
this.slideIntervalSubscription = this.settings.slideIntervalChanged.subscribe(
diff --git a/src/app/shared/slide.ts b/src/app/shared/slide.ts
old mode 100644
new mode 100755
index 095bcad..57c51ae
--- a/src/app/shared/slide.ts
+++ b/src/app/shared/slide.ts
@@ -2,11 +2,24 @@ import { Team } from './team';
export class Slide {
id: number = null;
- title: String = '';
- team: Team = null;
- slideData: String = '';
+ title = '';
+ type: SlideType = SlideType.MarkDown;
+ visibility: SlideVisibility = SlideVisibility.Public;
+ teams: Array = [];
+ slideData = '';
+ slideUrl = '';
isVisible = true;
- createdAt: String = null;
- updatedAt: String = null;
+ createdAt: string = null;
+ updatedAt: string = null;
position = 0;
}
+
+export enum SlideType {
+ MarkDown = 'markdown',
+ IFrame = 'iframe',
+}
+
+export enum SlideVisibility {
+ Public = 'public',
+ Team = 'team',
+}
diff --git a/src/tsconfig.spec.json b/src/tsconfig.spec.json
index ac22a29..1a18e6d 100644
--- a/src/tsconfig.spec.json
+++ b/src/tsconfig.spec.json
@@ -10,7 +10,8 @@
]
},
"files": [
- "test.ts"
+ "test.ts",
+ "polyfills.ts"
],
"include": [
"**/*.spec.ts",
diff --git a/tsconfig.json b/tsconfig.json
index a6c016b..7168743 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -14,6 +14,8 @@
"lib": [
"es2017",
"dom"
- ]
+ ],
+ "module": "es2015",
+ "baseUrl": "./"
}
-}
+}
\ No newline at end of file
diff --git a/tslint.json b/tslint.json
index 9963d6c..d8d3956 100644
--- a/tslint.json
+++ b/tslint.json
@@ -18,7 +18,6 @@
"forin": true,
"import-blacklist": [
true,
- "rxjs",
"rxjs/Rx"
],
"import-spacing": true,
|