Merge pull request #588 from Afzal84/topicMsg-issue

Fixes Topic duplicacy & Topic toast msg
sunbird-cb · Oct 14, 2022 · d48fca8 · d48fca8
2 parents 2f610a1 + 6f60af3
commit d48fca8
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 9 deletions.
diff --git a/project/ws/app/src/lib/routes/profile-v3/components/topic-card/topic-card.component.ts b/project/ws/app/src/lib/routes/profile-v3/components/topic-card/topic-card.component.ts
@@ -1,4 +1,5 @@
 import { Component, Input, OnInit } from '@angular/core'
+import { MatSnackBar } from '@angular/material'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { NSProfileDataV3 } from '../../models/profile-v3.models'
@@ -8,15 +9,15 @@ import { TopicService } from '../../services/topics.service'
   selector: 'ws-app-topic-card',
   templateUrl: './topic-card.component.html',
   styleUrls: ['./topic-card.component.scss'],
-  /* tslint:disable */
+    /* tslint:disable */
   host: { class: 'flex flex-1 top_main flex-col' },
   /* tslint:enable */
 })
 export class TopicCardComponent implements OnInit {
   @Input() topic!: NSProfileDataV3.ITopic
   show = 6
   // selectedTopics: Subscription | null = null
-  constructor(private topicService: TopicService) { }
+  constructor(private topicService: TopicService, private snackBar: MatSnackBar) { }
 
   ngOnInit() {
 
@@ -28,9 +29,11 @@ export class TopicCardComponent implements OnInit {
       if (index !== -1) {
         /// remove from store
         this.topicService.removeSystemTopics(top)
+        this.snackBar.open('Removed successfully!')
       } else {
         /// add to store
         this.topicService.addSystemTopics(top)
+        this.snackBar.open('Added successfully!')
       }
     } else {
       const index = _.indexOf(this.topicService.getCurrentSelectedDesTopics, top)

diff --git a/project/ws/app/src/lib/routes/profile-v3/routes/topics/topic.component.ts b/project/ws/app/src/lib/routes/profile-v3/routes/topics/topic.component.ts
@@ -140,9 +140,11 @@ export class TopicComponent implements OnInit, OnDestroy {
       this.topicService.saveDesiredTopic(reqObj).subscribe(res => {
         if (res) {
           this.configSvc.updateGlobalProfile(true)
-          this.snackBar.open('Updated!')
         }
-      })
+      },                                                   (_error: any) => {
+        this.snackBar.open('Server error!')
+      }
+      )
     }
   }
 
@@ -165,9 +167,11 @@ export class TopicComponent implements OnInit, OnDestroy {
       this.topicService.saveSystemTopic(reqObj).subscribe(res => {
         if (res) {
           this.configSvc.updateGlobalProfile(true)
-          this.snackBar.open('Updated!')
         }
-      })
+      },                                                  (_error: any) => {
+        this.snackBar.open('Server error!')
+      }
+      )
     }
   }
 }
diff --git a/project/ws/app/src/lib/routes/profile-v3/services/topics.service.ts b/project/ws/app/src/lib/routes/profile-v3/services/topics.service.ts
@@ -1,5 +1,6 @@
 import { HttpClient } from '@angular/common/http'
 import { Injectable } from '@angular/core'
+import { MatSnackBar } from '@angular/material'
 // tslint:disable-next-line
 import _ from 'lodash'
 import { BehaviorSubject, Observable } from 'rxjs'
@@ -17,7 +18,7 @@ export class TopicService {
     public desiredTopics = new BehaviorSubject<string[]>([])
     public autoSave = new BehaviorSubject<boolean>(false)
     constructor(
-        private http: HttpClient) {
+        private http: HttpClient, private snackBar: MatSnackBar) {
     }
     loadTopics(): Observable<any> {
         return this.http.get<any>(API_END_POINTS.getTopics)
@@ -29,8 +30,15 @@ export class TopicService {
     }
     addDesiredTopics(topic: string) {
         const topics = this.desiredTopics.value
-        topics.push(topic)
-        this.desiredTopics.next(topics)
+        const index = _.indexOf(topics, topic)
+        if (index === -1) {
+            topics.push(topic)
+            this.snackBar.open('Added successfully!')
+            this.desiredTopics.next(topics)
+        } else {
+            this.snackBar.open('Alredy exist!')
+        }
+
     }
     /**
      * this method will fill all already added topics from users Profile.
@@ -58,6 +66,7 @@ export class TopicService {
         if (index !== -1) {
             topics.splice(index, 1)
             this.desiredTopics.next(topics)
+            this.snackBar.open('Removed successfully!')
         }
     }
     // removeDesiredTopics(topic: string) {