From f48b5d4886d7258b98dd52e6e52c6029b4277a1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lukas=20Mau=C3=9F?= <lukas.mauss@mni.thm.de>
Date: Thu, 16 May 2019 20:25:55 +0200
Subject: [PATCH] Several fixes
---
.../_dialogs/room-edit/room-edit.component.ts | 14 +++++---------
.../room-creator-page.component.html | 2 +-
.../room-creator-page.component.ts | 4 ++--
.../create-comment.component.html} | 0
.../create-comment.component.scss} | 0
.../create-comment.component.spec.ts} | 12 ++++++------
.../create-comment.component.ts} | 6 +++---
.../comment-list/comment-list.component.html | 10 +++-------
.../comment-list/comment-list.component.ts | 16 ++++------------
src/app/components/shared/shared.module.ts | 8 ++++----
10 files changed, 28 insertions(+), 44 deletions(-)
rename src/app/components/shared/_dialogs/{submit-comment/submit-comment.component.html => create-comment/create-comment.component.html} (100%)
rename src/app/components/shared/_dialogs/{submit-comment/submit-comment.component.scss => create-comment/create-comment.component.scss} (100%)
rename src/app/components/shared/_dialogs/{submit-comment/submit-comment.component.spec.ts => create-comment/create-comment.component.spec.ts} (53%)
rename src/app/components/shared/_dialogs/{submit-comment/submit-comment.component.ts => create-comment/create-comment.component.ts} (92%)
diff --git a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
index e4f337a03..e1a33d33e 100644
--- a/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
+++ b/src/app/components/creator/_dialogs/room-edit/room-edit.component.ts
@@ -1,12 +1,12 @@
import { Component, Inject, OnInit } from '@angular/core';
import { Room } from '../../../../models/room';
-import { RoomCreateComponent } from '../../../shared/_dialogs/room-create/room-create.component';
import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from '@angular/material';
import { RoomDeleteComponent } from '../room-delete/room-delete.component';
import { NotificationService } from '../../../../services/util/notification.service';
import { TranslateService } from '@ngx-translate/core';
import { RoomService } from '../../../../services/http/room.service';
import { Router } from '@angular/router';
+import { RoomCreatorPageComponent } from '../../room-creator-page/room-creator-page.component';
@Component({
selector: 'app-room-edit',
@@ -17,7 +17,7 @@ export class RoomEditComponent implements OnInit {
editRoom: Room;
commentThreshold: number;
- constructor(public dialogRef: MatDialogRef<RoomCreateComponent>,
+ constructor(public dialogRef: MatDialogRef<RoomCreatorPageComponent>,
public dialog: MatDialog,
public notificationService: NotificationService,
public translationService: TranslateService,
@@ -49,7 +49,9 @@ export class RoomEditComponent implements OnInit {
dialogRef.componentInstance.room = this.editRoom;
dialogRef.afterClosed()
.subscribe(result => {
- this.confirmDeletion(result);
+ if (result === 'delete') {
+ this.deleteRoom(this.editRoom);
+ }
});
}
@@ -61,10 +63,4 @@ export class RoomEditComponent implements OnInit {
this.dialogRef.close();
this.router.navigate([`/creator`]);
}
-
- confirmDeletion(dialogAnswer: string): void {
- if (dialogAnswer === 'delete') {
- this.deleteRoom(this.editRoom);
- }
- }
}
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.html b/src/app/components/creator/room-creator-page/room-creator-page.component.html
index 142c359d1..e7bc4b509 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.html
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.html
@@ -15,7 +15,7 @@
</mat-card-subtitle>
</mat-card-header>
<span class="fill-remaining-space"></span>
- <button mat-icon-button id="settings" (click)="showEditDialog()">
+ <button mat-icon-button id="settings" (click)="showSettingsDialog()">
<mat-icon id="settings-icon" matTooltip="{{ 'room-page.session-settings' | translate}}">settings</mat-icon>
</button>
</div>
diff --git a/src/app/components/creator/room-creator-page/room-creator-page.component.ts b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
index 8f85d6e28..9437f1d71 100644
--- a/src/app/components/creator/room-creator-page/room-creator-page.component.ts
+++ b/src/app/components/creator/room-creator-page/room-creator-page.component.ts
@@ -59,8 +59,8 @@ export class RoomCreatorPageComponent extends RoomPageComponent implements OnIni
});
}
- showEditDialog(): void {
- this.updRoom = this.room;
+ showSettingsDialog(): void {
+ this.updRoom = JSON.parse(JSON.stringify(this.room));
const dialogRef = this.dialog.open(RoomEditComponent, {
width: '400px'
});
diff --git a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.html b/src/app/components/shared/_dialogs/create-comment/create-comment.component.html
similarity index 100%
rename from src/app/components/shared/_dialogs/submit-comment/submit-comment.component.html
rename to src/app/components/shared/_dialogs/create-comment/create-comment.component.html
diff --git a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.scss b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
similarity index 100%
rename from src/app/components/shared/_dialogs/submit-comment/submit-comment.component.scss
rename to src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
diff --git a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.spec.ts b/src/app/components/shared/_dialogs/create-comment/create-comment.component.spec.ts
similarity index 53%
rename from src/app/components/shared/_dialogs/submit-comment/submit-comment.component.spec.ts
rename to src/app/components/shared/_dialogs/create-comment/create-comment.component.spec.ts
index 730881f3d..6d6dbdc0e 100644
--- a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.spec.ts
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.spec.ts
@@ -1,21 +1,21 @@
/*
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { SubmitCommentComponent } from './submit-comment.component';
+import { CreateCommentComponent } from './create-comment.component';
-describe('SubmitCommentComponent', () => {
- let component: SubmitCommentComponent;
- let fixture: ComponentFixture<SubmitCommentComponent>;
+describe('CreateCommentComponent', () => {
+ let component: CreateCommentComponent;
+ let fixture: ComponentFixture<CreateCommentComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ SubmitCommentComponent ]
+ declarations: [ CreateCommentComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(SubmitCommentComponent);
+ fixture = TestBed.createComponent(CreateCommentComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.ts b/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
similarity index 92%
rename from src/app/components/shared/_dialogs/submit-comment/submit-comment.component.ts
rename to src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
index 52aa288d8..42965ca08 100644
--- a/src/app/components/shared/_dialogs/submit-comment/submit-comment.component.ts
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
@@ -10,10 +10,10 @@ import { CommentListComponent } from '../../comment-list/comment-list.component'
@Component({
selector: 'app-submit-comment',
- templateUrl: './submit-comment.component.html',
- styleUrls: ['./submit-comment.component.scss']
+ templateUrl: './create-comment.component.html',
+ styleUrls: ['./create-comment.component.scss']
})
-export class SubmitCommentComponent implements OnInit {
+export class CreateCommentComponent implements OnInit {
comment: Comment;
diff --git a/src/app/components/shared/comment-list/comment-list.component.html b/src/app/components/shared/comment-list/comment-list.component.html
index 9187f1a08..fdb59baaf 100644
--- a/src/app/components/shared/comment-list/comment-list.component.html
+++ b/src/app/components/shared/comment-list/comment-list.component.html
@@ -15,7 +15,7 @@
</button>
<button mat-icon-button class="searchBarButton" *ngIf="!searchBox.value"
- color="accent" (click)="openSubmitDialog()">
+ color="accent" (click)="openCreateDialog()">
<mat-icon class="searchBarIcon">add_circle</mat-icon>
</button>
@@ -56,10 +56,6 @@
</mat-menu>
</div>
-<mat-card class="outer-card" *ngIf="user.role === 0">
- <app-comment *ngFor="let current of getCommentsParticipant()" [comment]="current"></app-comment>
+<mat-card class="outer-card">
+ <app-comment *ngFor="let current of showComments()" [comment]="current"></app-comment>
</mat-card>
-<mat-card class="outer-card" *ngIf="user.role === 1">
- <app-comment *ngFor="let current of getCommentsCreator()" [comment]="current"></app-comment>
-</mat-card>
-
diff --git a/src/app/components/shared/comment-list/comment-list.component.ts b/src/app/components/shared/comment-list/comment-list.component.ts
index b203f63ae..cb4e62089 100644
--- a/src/app/components/shared/comment-list/comment-list.component.ts
+++ b/src/app/components/shared/comment-list/comment-list.component.ts
@@ -4,7 +4,7 @@ import { CommentService } from '../../../services/http/comment.service';
import { TranslateService } from '@ngx-translate/core';
import { LanguageService } from '../../../services/util/language.service';
import { Message } from '@stomp/stompjs';
-import { SubmitCommentComponent } from '../_dialogs/submit-comment/submit-comment.component';
+import { CreateCommentComponent } from '../_dialogs/create-comment/create-comment.component';
import { MatDialog } from '@angular/material';
import { WsCommentServiceService } from '../../../services/websockets/ws-comment-service.service';
import { User } from '../../../models/user';
@@ -70,7 +70,7 @@ export class CommentListComponent implements OnInit {
}
}
- getCommentsCreator(): Comment[] {
+ showComments(): Comment[] {
let commentThreshold = -10;
if (this.room.extensions && this.room.extensions['comments']) {
commentThreshold = this.room.extensions['comments'].commentThreshold;
@@ -88,14 +88,6 @@ export class CommentListComponent implements OnInit {
}
}
- getCommentsParticipant(): Comment[] {
- if (this.hideCommentsList) {
- return this.filteredComments;
- } else {
- return this.comments;
- }
- }
-
parseIncomingMessage(message: Message) {
const msg = JSON.parse(message.body);
const payload = msg.payload;
@@ -149,8 +141,8 @@ export class CommentListComponent implements OnInit {
}
}
- openSubmitDialog(): void {
- const dialogRef = this.dialog.open(SubmitCommentComponent, {
+ openCreateDialog(): void {
+ const dialogRef = this.dialog.open(CreateCommentComponent, {
width: '400px'
});
dialogRef.componentInstance.user = this.user;
diff --git a/src/app/components/shared/shared.module.ts b/src/app/components/shared/shared.module.ts
index 13a09ef9f..6177977e4 100644
--- a/src/app/components/shared/shared.module.ts
+++ b/src/app/components/shared/shared.module.ts
@@ -22,7 +22,7 @@ import { RoomCreateComponent } from './_dialogs/room-create/room-create.componen
import { LoginComponent } from './login/login.component';
import { StatisticHelpComponent } from './_dialogs/statistic-help/statistic-help.component';
import { CommentComponent } from './comment/comment.component';
-import { SubmitCommentComponent } from './_dialogs/submit-comment/submit-comment.component';
+import { CreateCommentComponent } from './_dialogs/create-comment/create-comment.component';
import { PresentCommentComponent } from './_dialogs/present-comment/present-comment.component';
@NgModule({
@@ -53,7 +53,7 @@ import { PresentCommentComponent } from './_dialogs/present-comment/present-comm
LoginComponent,
StatisticHelpComponent,
CommentComponent,
- SubmitCommentComponent,
+ CreateCommentComponent,
PresentCommentComponent
],
exports: [
@@ -71,14 +71,14 @@ import { PresentCommentComponent } from './_dialogs/present-comment/present-comm
CommentPageComponent,
CommentListComponent,
StatisticsPageComponent,
- SubmitCommentComponent,
+ CreateCommentComponent,
PresentCommentComponent
],
entryComponents: [
RoomCreateComponent,
LoginComponent,
StatisticHelpComponent,
- SubmitCommentComponent,
+ CreateCommentComponent,
PresentCommentComponent
]
})
--
GitLab