From 2e1dbb671573515b78c273a7731b079ff99c9889 Mon Sep 17 00:00:00 2001
From: mohammad <mohammad.alayoub@mni.thm.de>
Date: Wed, 16 Jun 2021 16:30:22 +0200
Subject: [PATCH] fix showing profanitylist at begin
---
.../topic-cloud-administration.component.ts | 7 ++-----
src/app/services/util/topic-cloud-admin.service.ts | 8 ++------
2 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
index b8eb3339a..c89afd352 100644
--- a/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
+++ b/src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.ts
@@ -75,9 +75,10 @@ export class TopicCloudAdministrationComponent implements OnInit, OnDestroy {
this.deviceType = localStorage.getItem('deviceType');
this.wsCommentServiceService.getCommentStream(localStorage.getItem('roomId')).subscribe(_ => this.updateKeywords());
this.blacklistSubscription = this.topicCloudAdminService.getBlacklist().subscribe(list => this.blacklist = list);
+ this.profanitywordlist = this.topicCloudAdminService.getProfanityListFromStorage();
this.profanitylistSubscription = this.topicCloudAdminService.getCustomProfanityList().subscribe(list => {
- this.profanitywordlist = list;
this.updateKeywords();
+ this.profanitywordlist = list;
});
this.isCreatorOrMod = this.data.user.role !== UserRole.PARTICIPANT;
this.translateService.use(localStorage.getItem('currentLang'));
@@ -171,10 +172,6 @@ export class TopicCloudAdministrationComponent implements OnInit, OnDestroy {
return this.topicCloudAdminService.filterProfanityWords(keyword);
}
- getProfanityList() {
- return this.topicCloudAdminService.getCustomProfanityList();
- }
-
sortQuestions(sortMode?: string) {
if (sortMode !== undefined) {
this.sortMode = sortMode;
diff --git a/src/app/services/util/topic-cloud-admin.service.ts b/src/app/services/util/topic-cloud-admin.service.ts
index a0c2d6fa9..8e0d7c51f 100644
--- a/src/app/services/util/topic-cloud-admin.service.ts
+++ b/src/app/services/util/topic-cloud-admin.service.ts
@@ -63,13 +63,9 @@ export class TopicCloudAdminService {
_adminData.blacklist.concat(list);
}
if (_adminData.profanityFilter){
- this.getCustomProfanityList().subscribe(plist => {
- _adminData.blacklist = plist.concat(this.profanityWords);
- this.adminData.next(_adminData);
- });
- } else {
- this.adminData.next(_adminData);
+ _adminData.blacklist = this.getProfanityListFromStorage().concat(this.profanityWords);
}
+ this.adminData.next(_adminData);
});
}
--
GitLab