Merge branch 'max_dev' of Software_Engineering_I/greenvironment-frontend into master

src/app/components/feed/feed.component.ts

@@ -1,6 +1,6 @@
 import {Component, OnInit, ViewChild, ElementRef} from '@angular/core';
 import {Post} from 'src/app/models/post';
-import {FeedService, Sort} from 'src/app/services/feed/feed.service';
+import {FeedService, Sort, PostingState} from 'src/app/services/feed/feed.service';
 import {Activitylist} from 'src/app/models/activity';
 import {DatasharingService} from '../../services/datasharing.service';
 import {ActivityService} from 'src/app/services/activity/activity.service';
@@ -63,10 +63,14 @@ export class FeedComponent implements OnInit {
     this.feedService.postsAvailable.subscribe(available => {
       this.loadingMostLiked = this.loadingNew = available;
     });
-    this.feedService.posting.subscribe(posting => {
+    this.feedService.postingState.subscribe(postingState => {
       const temp = this.posting;
-      this.posting = posting;
+
-      if (temp !== this.posting && !this.posting) {
+      this.posting = postingState.posting;
+      this.errorOccurred = postingState.errorOccured;
+      this.errorMessage = postingState.errorMessage;
+
+      if (!this.posting  && this.posting !== temp && !postingState.errorOccured) {
         this.resetPostInput();
       }
     });
@@ -79,22 +83,9 @@ export class FeedComponent implements OnInit {
    */
   createPost(postElement, activityId: string) {
     if (postElement && activityId && this.checked) {
-      this.posting = true;
+      this.feedService.createPostActivity(postElement.value, activityId, this.file).subscribe();
-      this.feedService.createPostActivity(postElement.value, activityId, this.file).subscribe(() => {
-      }, (error: IErrorResponse) => {
-        this.errorOccurred = true;
-        this.posting = false;
-        this.errorMessage = error.error.errors[0].message;
-      });
     } else if (postElement) {
-      this.posting = true;
+      this.feedService.createPost(postElement.value, this.file).subscribe();
-      this.feedService.createPost(postElement.value, this.file).subscribe((result) => {
-      }, (error: IErrorResponse) => {
-        console.log(error);
-        this.posting = false;
-        this.errorOccurred = true;
-        this.errorMessage = error.error.errors[0].message;
-      });
     }
   }
 

src/app/services/feed/feed.service.ts

@@ -9,6 +9,7 @@ import {tap} from 'rxjs/operators';
 import {BaseService} from '../base.service';
 import {formatDate} from '@angular/common';
 import {IFileUploadResult} from '../../models/interfaces/IFileUploadResult';
+import { IErrorResponse } from 'src/app/models/interfaces/IErrorResponse';
 
 const createPostGqlQuery = `mutation($content: String!, $type: PostType) {
   createPost(content: $content, type: $type) {
@@ -98,6 +99,11 @@ export enum Sort {
   NEW = 'NEW',
   TOP = 'TOP',
 }
+export class PostingState {
+  posting = false;
+  errorOccured = false;
+  errorMessage = 'An error occured.';
+}
 
 @Injectable({
   providedIn: 'root'
@@ -109,7 +115,7 @@ export class FeedService extends BaseService {
   }
 
   public postsAvailable = new BehaviorSubject<boolean>(true);
-  public posting = new BehaviorSubject<boolean>(false);
+  public postingState = new BehaviorSubject<PostingState>(new PostingState());
   public posts: BehaviorSubject<Post[]> = new BehaviorSubject([]);
   private activePostList: Sort = Sort.NEW;
   private offset = 0;
@@ -187,7 +193,7 @@ export class FeedService extends BaseService {
    * @param file - a file that is being uploaded with the post
    */
   private createPostRequest(body: { variables: any; query: string }, file?: File) {
-    this.posting.next(true);
+    this.setPostingState(true);
     if (file) {
       return this.postGraphql(body, null, 0)
       .pipe(tap(response => {
@@ -200,34 +206,60 @@ export class FeedService extends BaseService {
               post.mediaType = result.fileName.endsWith('.png') ? 'IMAGE' : 'VIDEO';
               updatedPosts.unshift(post);
               this.posts.next(updatedPosts);
-              this.posting.next(false);
+              this.setPostingState(false);
             }
           } else {
             console.error(result.error);
-            this.posting.next(false);
+            this.setPostingError(result.error);
             this.deletePost(post.id).subscribe();
           }
           }, error => {
             console.error(error);
-            this.posting.next(false);
+            this.setPostingError(error);
             this.deletePost(post.id).subscribe();
           });
+        }, (error: IErrorResponse) => {
+          this.setPostingError(error.error.errors[0].message);
         }
       ));
     } else if (!file) {
       return this.postGraphql(body, null, 0)
       .pipe(tap(response => {
-        this.posting.next(false);
+        this.setPostingState(false);
         const updatedPosts = this.posts.getValue();
         if (this.activePostList === Sort.NEW) {
           const post = this.constructPost(response);
           updatedPosts.unshift(post);
           this.posts.next(updatedPosts);
         }
+      }, (error: IErrorResponse) => {
+        console.log(error);
+        this.setPostingError(error.error.errors[0].message);
       }));
     }
   }
 
+  setPostingState(b: boolean) {
+    if (b) {
+      this.postingState.getValue().posting = true;
+      this.postingState.getValue().errorOccured = false;
+      this.postingState.getValue().errorMessage = '';
+      this.postingState.next(this.postingState.getValue());
+    } else {
+      this.postingState.getValue().posting = false;
+      this.postingState.getValue().errorOccured = false;
+      this.postingState.getValue().errorMessage = '';
+      this.postingState.next(this.postingState.getValue());
+    }
+  }
+
+  setPostingError(error: string) {
+    this.postingState.getValue().posting = false;
+    this.postingState.getValue().errorOccured = true;
+    this.postingState.getValue().errorMessage = error;
+    this.postingState.next(this.postingState.getValue());
+  }
+
   /**
    * Uploads a file for a post
    * @param postId