Merge pull request #2833 from WISE-Community/issue-2832-filter-globally-pinned-discourse-topics

breity · web-flow · commit 763ece02824f · 2020-12-10T11:52:35.000-08:00
Hide globally-pinned discourse topics from teacher home page latest topics
diff --git a/src/main/webapp/site/src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.ts b/src/main/webapp/site/src/app/teacher/discourse-recent-activity/discourse-recent-activity.component.ts
@@ -11,7 +11,6 @@ export class DiscourseRecentActivityComponent {
 
   discourseURL: string;
   topics: any;
-  users: any;
 
   constructor(private configService: ConfigService, private http: HttpClient) {
   }
@@ -20,8 +19,9 @@ export class DiscourseRecentActivityComponent {
     this.discourseURL = this.configService.getDiscourseURL();
     this.http.get(`${this.discourseURL}/latest.json?order=activity`)
         .subscribe(({topic_list, users}: any)=> {
-      this.topics = topic_list.topics.slice(0,3);
-      this.users = users;
+      this.topics = topic_list.topics
+          .filter(topic => { return !topic.pinned_globally; })
+          .slice(0, 3);
     });
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ export class DiscourseRecentActivityComponent {`
`11`	`11`
`12`	`12`	`discourseURL: string;`
`13`	`13`	`topics: any;`
`14`		`- users: any;`
`15`	`14`
`16`	`15`	`constructor(private configService: ConfigService, private http: HttpClient) {`
`17`	`16`	`}`
`@@ -20,8 +19,9 @@ export class DiscourseRecentActivityComponent {`
`20`	`19`	`this.discourseURL = this.configService.getDiscourseURL();`
`21`	`20`	this.http.get(`${this.discourseURL}/latest.json?order=activity`)
`22`	`21`	`.subscribe(({topic_list, users}: any)=> {`
`23`		`- this.topics = topic_list.topics.slice(0,3);`
`24`		`- this.users = users;`
	`22`	`+ this.topics = topic_list.topics`
	`23`	`+ .filter(topic => { return !topic.pinned_globally; })`
	`24`	`+ .slice(0, 3);`
`25`	`25`	`});`
`26`	`26`	`}`
`27`	`27`	`}`