From 9044fe4b61ff3240400de3bca3674b0bd0696447 Mon Sep 17 00:00:00 2001 From: 4gray <4gray@users.noreply.github.com> Date: Wed, 9 Aug 2023 22:58:25 +0200 Subject: [PATCH] refactor: some improvements in interfaces --- src/app/xtream/breadcrumb.interface.ts | 5 ++++- src/app/xtream/xtream-main-container.component.ts | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/app/xtream/breadcrumb.interface.ts b/src/app/xtream/breadcrumb.interface.ts index dfb2d38bf..f619a3c3a 100644 --- a/src/app/xtream/breadcrumb.interface.ts +++ b/src/app/xtream/breadcrumb.interface.ts @@ -1,7 +1,10 @@ +import { StalkerPortalActions } from '../../../shared/stalker-portal-actions.enum'; import { XtreamCodeActions } from '../../../shared/xtream-code-actions'; +export type PortalActions = StalkerPortalActions | XtreamCodeActions; + export interface Breadcrumb { - action: XtreamCodeActions; + action: PortalActions; title: string; category_id?: string; } diff --git a/src/app/xtream/xtream-main-container.component.ts b/src/app/xtream/xtream-main-container.component.ts index 1b9298bed..629b1d5bb 100644 --- a/src/app/xtream/xtream-main-container.component.ts +++ b/src/app/xtream/xtream-main-container.component.ts @@ -55,7 +55,7 @@ import { import { PlaylistsService } from '../services/playlists.service'; import { Settings, VideoPlayer } from '../settings/settings.interface'; import { STORE_KEY } from '../shared/enums/store-keys.enum'; -import { Breadcrumb } from './breadcrumb.interface'; +import { Breadcrumb, PortalActions } from './breadcrumb.interface'; import { ContentTypeNavigationItem } from './content-type-navigation-item.interface'; import { PlayerDialogComponent } from './player-dialog/player-dialog.component'; import { PortalStore } from './portal.store'; @@ -164,15 +164,15 @@ export class XtreamMainContainerComponent implements OnInit { effect(() => { if (this.currentPlaylist()) { this.getCategories(this.selectedContentType); + this.favorites$ = this.playlistService.getPortalFavorites( + this.currentPlaylist()._id + ); } }); } ngOnInit() { this.setInitialBreadcrumb(); - this.favorites$ = this.playlistService.getPortalFavorites( - this.currentPlaylist()._id - ); this.commandsList.forEach((command) => { if (this.dataService.isElectron) { @@ -363,7 +363,7 @@ export class XtreamMainContainerComponent implements OnInit { }); } - getLayoutViewBasedOnAction(action: XtreamCodeActions) { + getLayoutViewBasedOnAction(action: PortalActions) { let result: LayoutView = 'category'; switch (action) { case XtreamCodeActions.GetLiveCategories: