Merge branch 'fix/invalid-feed-algo-5559' into 'master'

Fix invalid feed algorithm #5559

See merge request minds/front!1936

Author: FaustoJohn

src/app/modules/newsfeed/feeds/feed-header/feed-header.component.ts

@@ -1,5 +1,5 @@
 import { FeedAlgorithm } from './../subscribed.component';
-import { Component, HostBinding, Input, OnInit } from '@angular/core';
+import { Component, HostBinding, Input } from '@angular/core';
 import { ExperimentsService } from '../../../experiments/experiments.service';
 import { ActivityV2ExperimentService } from '../../../experiments/sub-services/activity-v2-experiment.service';
 
@@ -20,5 +20,5 @@ export class FeedHeaderComponent {
   }
 
   @Input()
-  algorithm: FeedAlgorithm = 'latest';
+  algorithm: FeedAlgorithm = FeedAlgorithm.latest;
 }

src/app/modules/newsfeed/feeds/feed-header/feed-type-popover/feed-type-popover.component.ts

@@ -19,7 +19,7 @@ const TOP_FEED_PROMPT_STORAGE_KEY = 'top-feed:recommended';
   styleUrls: ['./feed-type-popover.component.ng.scss'],
 })
 export class FeedTypePopoverComponent implements OnInit {
-  @Input() type: FeedAlgorithm = 'latest';
+  @Input() type: FeedAlgorithm = FeedAlgorithm.latest;
   shown: boolean = false;
   shouldShowTooltip$ = new BehaviorSubject<boolean>(false);
 

src/app/modules/newsfeed/feeds/subscribed.component.ts

@@ -36,7 +36,10 @@ import { FormToastService } from '../../../common/services/form-toast.service';
 import { ExperimentsService } from '../../experiments/experiments.service';
 import { NewsfeedBoostRotatorComponent } from '../boost-rotator/boost-rotator.component';
 
-export type FeedAlgorithm = 'top' | 'latest';
+export enum FeedAlgorithm {
+  top = 'top',
+  latest = 'latest',
+}
 
 @Injectable()
 export class LatestFeedService extends FeedsService {}
@@ -151,7 +154,11 @@ export class NewsfeedSubscribedComponent implements OnInit, OnDestroy {
 
     this.paramsSubscription = this.route.params.subscribe(params => {
       if (params['algorithm']) {
-        this.changeFeedAlgorithm(params['algorithm']);
+        if (params['algorithm'] in FeedAlgorithm) {
+          this.changeFeedAlgorithm(params['algorithm']);
+        } else {
+          this.router.navigate([`/newsfeed/subscriptions/${this.algorithm}`]);
+        }
       }
       this.load();
 
@@ -326,7 +333,7 @@ export class NewsfeedSubscribedComponent implements OnInit, OnDestroy {
       behavior: 'smooth',
     });
     setTimeout(() => {
-      this.changeFeedAlgorithm('top');
+      this.changeFeedAlgorithm(FeedAlgorithm.top);
       this.load();
     }, 500);
   }

src/app/modules/newsfeed/services/feed-algorithm-history.service.ts

@@ -15,8 +15,9 @@ export class FeedAlgorithmHistoryService {
    * Gets last feed algorithm from storage.
    * @returns { string } - feed type a user last accessed.
    */
-  get lastAlorithm(): FeedAlgorithm {
-    return this.storage.get(FEED_ALGORITHM_STORAGE_KEY) as FeedAlgorithm;
+  get lastAlorithm(): FeedAlgorithm | undefined {
+    const algo = this.storage.get(FEED_ALGORITHM_STORAGE_KEY);
+    return FeedAlgorithm[algo];
   }
 
   /**