Add initial thread component

tschaffter · tschaffter · commit 55fe57d48676 · 2019-09-25T13:43:09.000-07:00
diff --git a/client/app/discussion/app-thread/app-thread.component.ts b/client/app/discussion/app-thread/app-thread.component.ts
@@ -0,0 +1,31 @@
+import { Component, OnInit } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { App } from 'models/entities/app.model';
+import { Thread } from 'models/messaging/thread.model';
+import { AppService } from './../../app.service';
+import config from '../../app.constants';
+import { switchMap } from 'rxjs/operators';
+import { MessagingService } from 'components/messaging/messaging.service';
+
+@Component({
+    selector: 'app-thread',
+    template: require('./app-thread.html'),
+    styles: [require('./app-thread.scss')],
+})
+export class AppThreadComponent implements OnInit {
+    private thread$: Observable<Thread>;
+
+    static parameters = [Router, ActivatedRoute, MessagingService];
+    constructor(
+        private router: Router,
+        private route: ActivatedRoute,
+        private messagingService: MessagingService
+    ) {
+        this.thread$ = this.route.params.pipe(switchMap(res => this.messagingService.getThread(res.id)));
+    }
+
+    ngOnInit() {
+        // this.app$ = this.appService.getApp();
+    }
+}
diff --git a/client/app/discussion/app-thread/app-thread.html b/client/app/discussion/app-thread/app-thread.html
@@ -0,0 +1,6 @@
+<div class="app-primary-header">
+    <mat-icon class="app-nav-back-icon" routerLink="/discussion">keyboard_arrow_left</mat-icon>
+    <h1 *ngIf="thread$ | async as thread">{{ thread.title }}</h1>
+</div>
+
+<thread [thread$]="thread$"></thread>
diff --git a/client/app/discussion/app-thread/app-thread.scss b/client/app/discussion/app-thread/app-thread.scss
diff --git a/client/app/discussion/discussion-new/discussion-new.component.ts b/client/app/discussion/discussion-new/discussion-new.component.ts
@@ -1,10 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
 import { Observable } from 'rxjs';
-// import { Router, ActivatedRoute } from '@angular/router';
-// import { AppService } from '../app.service';
-// import { App } from 'models/entities/app.model';
-// import { PageTitleService } from 'components/page-title/page-title.service';
 import { App } from 'models/entities/app.model';
 import { Thread } from 'models/messaging/thread.model';
 import { AppService } from './../../app.service';
diff --git a/client/app/discussion/discussion.component.ts b/client/app/discussion/discussion.component.ts
@@ -35,10 +35,4 @@ export class DiscussionComponent implements OnInit {
                 err => console.error(err)
             );
     }
-
-    newThread(thread: Thread): void {
-        // if (thread) {
-        //     this.router.navigate(['/discussion', thread._id]);
-        // }
-    }
 }
diff --git a/client/app/discussion/discussion.html b/client/app/discussion/discussion.html
@@ -1,8 +1,13 @@
 <div class="app-primary-header app-thread-list-header">
     <h1 class="app-primary-header-title">General Discussion</h1>
-    <a mat-raised-button color="warn" class="app-thread-list-new-thread-btn" routerLink="/discussion/new" aria-label="Create a new thread">New Thread</a>
+    <a
+        mat-raised-button
+        color="warn"
+        class="app-thread-list-new-thread-btn"
+        routerLink="/discussion/new"
+        aria-label="Create a new thread"
+        >New Thread</a
+    >
 </div>
 
 <thread-list *ngIf="app" [entityId]="app._id" [entityType]="appEntityType"></thread-list>
-
-<!-- <entity-discussion *ngIf="app" [entity]="app" [entityType]="entityType"></entity-discussion> -->
diff --git a/client/app/discussion/discussion.module.ts b/client/app/discussion/discussion.module.ts
@@ -13,6 +13,7 @@ import { AppService } from '../app.service';
 
 import { DiscussionComponent } from './discussion.component';
 import { DiscussionNewComponent } from './discussion-new/discussion-new.component';
+import { AppThreadComponent } from './app-thread/app-thread.component';
 
 export const ROUTES: Routes = [
     {
@@ -25,6 +26,11 @@ export const ROUTES: Routes = [
         component: DiscussionNewComponent,
         canActivate: [AuthGuard],
     },
+    {
+        path: 'discussion/:id',
+        component: AppThreadComponent,
+        canActivate: [AuthGuard],
+    },
 ];
 
 @NgModule({
@@ -37,7 +43,7 @@ export const ROUTES: Routes = [
         MessagingModule,
         RouterModule.forChild(ROUTES),
     ],
-    declarations: [DiscussionComponent, DiscussionNewComponent],
+    declarations: [DiscussionComponent, DiscussionNewComponent, AppThreadComponent],
     providers: [AppService, SocketService],
     exports: [],
 })
diff --git a/client/components/messaging/messaging.module.ts b/client/components/messaging/messaging.module.ts
@@ -22,6 +22,7 @@ import { MessagingDataService } from './messaging-data.service';
 import { MessageDateSeparatorComponent } from './message-date-separator/message-date-separator.component';
 import { AppQuillModule } from '../quill/app-quill.module';
 import { SocketService } from 'components/socket/socket.service';
+import { ThreadComponent } from './thread/thread.component';
 
 @NgModule({
     imports: [
@@ -60,15 +61,17 @@ import { SocketService } from 'components/socket/socket.service';
         ThreadListComponent,
         ThreadDateSeparatorComponent,
         StarredMessageListComponent,
-        MessageDateSeparatorComponent
+        MessageDateSeparatorComponent,
+        ThreadComponent
     ],
     exports: [
         ThreadNewComponent,
         ThreadEditComponent,
         MessageComponent,
         MessageNewComponent,
         ThreadListComponent,
-        StarredMessageListComponent
+        StarredMessageListComponent,
+        ThreadComponent
     ],
     entryComponents: [
         // MessageThreadComponent
diff --git a/client/components/messaging/messaging.service.ts b/client/components/messaging/messaging.service.ts
@@ -16,9 +16,15 @@ export class MessagingService {
     static parameters = [HttpClient, SecondarySidenavService];
     constructor(private httpClient: HttpClient, private secondarySidenavService: SecondarySidenavService) {}
 
-    /**
-     * Threads
-     */
+    // THEADS FUNCTIONS
+
+     /**
+      * Returns the thread specified.
+      * @param id
+      */
+    getThread(id: string): Observable<Thread> {
+        return this.httpClient.get<Thread>(`/api/threads/${id}`);
+    }
 
     /**
      * Creates a new thread.
@@ -38,9 +44,7 @@ export class MessagingService {
             .pipe(map(threads => orderBy(['createdAt'], ['desc'], threads)));
     }
 
-    /**
-     * Messages
-     */
+    // MESSAGES FUNCTIONS
 
     /**
      * Creates a new message and associates it to the thread specified.
@@ -66,6 +70,8 @@ export class MessagingService {
 
 
 
+
+
     getThreads(): Observable<Thread[]> {
         return this.httpClient.get<Thread[]>(`/api/threads`);
         // .pipe(
diff --git a/client/components/messaging/thread-new/thread-new.component.ts b/client/components/messaging/thread-new/thread-new.component.ts
@@ -89,7 +89,6 @@ export class ThreadNewComponent implements OnInit {
 
     createMessage(thread: Thread): Observable<Message> {
         let newMessage = {
-            thread: thread._id,
             body: JSON.stringify(this.form.controls.body.value),
         };
         return this.messagingService.createMessage(thread, newMessage);
diff --git a/client/components/messaging/thread/thread.component.ts b/client/components/messaging/thread/thread.component.ts
@@ -0,0 +1,30 @@
+import { Component, OnInit, Input } from '@angular/core';
+import { Router, ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { App } from 'models/entities/app.model';
+import { Thread } from 'models/messaging/thread.model';
+// import { AppService } from './../../app.service';
+// import config from '../../app.constants';
+import { switchMap } from 'rxjs/operators';
+
+@Component({
+    selector: 'thread',
+    template: require('./thread.html'),
+    styles: [require('./thread.scss')],
+})
+export class ThreadComponent implements OnInit {
+    @Input() private thread$: Observable<Thread>;
+    private showThreadEditTemplate = false;
+
+    static parameters = [Router, ActivatedRoute];
+    constructor(private router: Router, private route: ActivatedRoute) {
+
+        // this.thread$ = this.route.params.pipe(
+        //     switchMap(res => this.dataCatalogService.get(res.id))
+        // );
+    }
+
+    ngOnInit() {
+        // this.app$ = this.appService.getApp();
+    }
+}
diff --git a/client/components/messaging/thread/thread.html b/client/components/messaging/thread/thread.html
@@ -0,0 +1,5 @@
+<mat-card *ngIf="!showThreadEditTemplate; else showThreadEditForm">
+
+
+
+</mat-card>
diff --git a/client/components/messaging/thread/thread.scss b/client/components/messaging/thread/thread.scss
diff --git a/server/api/thread/index.js b/server/api/thread/index.js
@@ -8,6 +8,9 @@ var router = Router();
 // Creates a new thread associated to the entity specified.
 router.post('/', auth.isAuthenticated(), controller.create);
 
+// Returns the thread specified
+router.get('/:id', auth.isAuthenticated(), controller.show);
+
 // Returns the threads associated with the entity specified.
 router.get('/entity/:entityId', auth.isAuthenticated(), controller.indexByEntity);
 
diff --git a/server/api/thread/thread.controller.js b/server/api/thread/thread.controller.js
@@ -17,6 +17,15 @@ import DataCatalog from '../data-catalog/data-catalog.model';
 import Tool from '../tool/tool.model';
 import App from '../app/app.model';
 
+// Gets a single Thread from the DB
+export function show(req, res) {
+    return Thread.findById(req.params.id)
+        .exec()
+        .then(handleEntityNotFound(res))
+        .then(respondWithResult(res))
+        .catch(handleError(res));
+}
+
 // Creates a new Thread in the DB
 export function create(req, res) {
     Reflect.deleteProperty(req.body, 'createdAt');

Original file line number	Diff line number	Diff line change
`@@ -35,10 +35,4 @@ export class DiscussionComponent implements OnInit {`
`35`	`35`	`err => console.error(err)`
`36`	`36`	`);`
`37`	`37`	`}`
`38`		`-`
`39`		`- newThread(thread: Thread): void {`
`40`		`- // if (thread) {`
`41`		`- // this.router.navigate(['/discussion', thread._id]);`
`42`		`- // }`
`43`		`- }`
`44`	`38`	`}`