mirror of
https://github.com/4gray/iptvnator.git
synced 2026-10-08 17:06:15 -08:00
feat: update channel selection logic by removing EPG service call
This commit is contained in:
4gray committed
1 parent
1677d709ff
commit
b73053ea5a
3 files changed
+1
-242
No files matched your search
+1
-1
@@ -1,5 +1,5 @@
|
||||
@if (displayedChannels().length) {
|
||||
@if (viewTitle()) {
|
||||
@if (viewTitle() && activeView() !== 'groups') {
|
||||
<header class="context-header">
|
||||
<div class="context-header__top">
|
||||
<h2>{{ viewTitle() | translate }}</h2>
|
||||
|
||||
-236
@@ -1,236 +0,0 @@
|
||||
/* import { ScrollingModule } from '@angular/cdk/scrolling';
|
||||
import { KeyValue } from '@angular/common';
|
||||
import { ComponentFixture, TestBed } from '@angular/core/testing';
|
||||
import { FormsModule } from '@angular/forms';
|
||||
import { MatExpansionModule } from '@angular/material/expansion';
|
||||
import { MatIconModule } from '@angular/material/icon';
|
||||
import { MatInputModule } from '@angular/material/input';
|
||||
import { MatListModule } from '@angular/material/list';
|
||||
import { MatSnackBar, MatSnackBarModule } from '@angular/material/snack-bar';
|
||||
import { MatTabsModule } from '@angular/material/tabs';
|
||||
import { MatTooltipModule } from '@angular/material/tooltip';
|
||||
import { By } from '@angular/platform-browser';
|
||||
import { NoopAnimationsModule } from '@angular/platform-browser/animations';
|
||||
import { RouterTestingModule } from '@angular/router/testing';
|
||||
import { FilterPipe } from '@iptvnator/pipes';
|
||||
import { Actions } from '@ngrx/effects';
|
||||
import { provideMockActions } from '@ngrx/effects/testing';
|
||||
import { MockStore, provideMockStore } from '@ngrx/store/testing';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import { MockModule, MockPipes, MockProviders } from 'ng-mocks';
|
||||
import { NgxIndexedDBService } from 'ngx-indexed-db';
|
||||
import { Observable } from 'rxjs';
|
||||
import * as MOCKED_PLAYLIST from '../../../../mocks/playlist.json';
|
||||
import { DataService } from '../../../services/data.service';
|
||||
import { ElectronServiceStub } from '../../../services/electron.service.stub';
|
||||
import { createChannel } from '../../../shared/channel.model';
|
||||
import { ChannelListContainerComponent } from './channel-list-container.component';
|
||||
|
||||
class MatSnackBarStub {
|
||||
open(): void {}
|
||||
}
|
||||
|
||||
jest.mock('lodash', () => {
|
||||
return {
|
||||
__esModule: true,
|
||||
default: {
|
||||
groupBy: jest.fn(() => ({})),
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
describe('ChannelListContainerComponent', () => {
|
||||
let component: ChannelListContainerComponent;
|
||||
let fixture: ComponentFixture<ChannelListContainerComponent>;
|
||||
let mockStore: MockStore;
|
||||
const actions$ = new Observable<Actions>();
|
||||
|
||||
beforeEach(() => {
|
||||
TestBed.configureTestingModule({
|
||||
imports: [
|
||||
ChannelListContainerComponent,
|
||||
FormsModule,
|
||||
MatTabsModule,
|
||||
MockModule(MatExpansionModule),
|
||||
MockModule(MatIconModule),
|
||||
MockModule(MatInputModule),
|
||||
MockModule(MatListModule),
|
||||
MockModule(MatSnackBarModule),
|
||||
MockModule(MatTooltipModule),
|
||||
MockModule(ScrollingModule),
|
||||
TranslateModule.forRoot(),
|
||||
NoopAnimationsModule,
|
||||
RouterTestingModule,
|
||||
],
|
||||
providers: [
|
||||
{ provide: DataService, useClass: ElectronServiceStub },
|
||||
{ provide: MatSnackBar, useClass: MatSnackBarStub },
|
||||
MockPipes(FilterPipe),
|
||||
MockProviders(NgxIndexedDBService),
|
||||
provideMockActions(actions$),
|
||||
provideMockStore(),
|
||||
],
|
||||
}).compileComponents();
|
||||
});
|
||||
|
||||
beforeEach(() => {
|
||||
fixture = TestBed.createComponent(ChannelListContainerComponent);
|
||||
component = fixture.componentInstance;
|
||||
mockStore = TestBed.inject(MockStore);
|
||||
|
||||
// set channels
|
||||
const channels = MOCKED_PLAYLIST.playlist.items.map((element) =>
|
||||
createChannel({
|
||||
...element,
|
||||
http: {
|
||||
...element.http,
|
||||
origin: '', // Add the missing 'origin' property
|
||||
},
|
||||
})
|
||||
);
|
||||
|
||||
mockStore.setState({
|
||||
playlistState: {
|
||||
channels,
|
||||
active: undefined,
|
||||
},
|
||||
});
|
||||
component.channelList = channels;
|
||||
fixture.detectChanges();
|
||||
});
|
||||
|
||||
it('should create component', () => {
|
||||
expect(component).toBeTruthy();
|
||||
});
|
||||
|
||||
it('should render three tabs', async () => {
|
||||
const tabGroup = fixture.debugElement.query(By.css('mat-tab-group'));
|
||||
expect(tabGroup).toBeTruthy();
|
||||
|
||||
// Force another change detection cycle
|
||||
await fixture.whenStable();
|
||||
fixture.detectChanges();
|
||||
|
||||
const tabs = tabGroup.queryAll(By.css('.mat-mdc-tab'));
|
||||
expect(tabs.length).toEqual(3);
|
||||
});
|
||||
|
||||
it('should set channels list', () => {
|
||||
expect(component.channelList).toHaveLength(4);
|
||||
});
|
||||
|
||||
it.skip('should set groups list', () => {
|
||||
// check first group
|
||||
expect(
|
||||
component.groupedChannels[
|
||||
MOCKED_PLAYLIST.playlist.items[0].group.title
|
||||
][0]
|
||||
).toBeTruthy();
|
||||
expect(
|
||||
component.groupedChannels[
|
||||
MOCKED_PLAYLIST.playlist.items[0].group.title
|
||||
][0]
|
||||
).toEqual(
|
||||
expect.objectContaining({
|
||||
id: MOCKED_PLAYLIST.playlist.items[0].url,
|
||||
name: MOCKED_PLAYLIST.playlist.items[0].name,
|
||||
group: MOCKED_PLAYLIST.playlist.items[0].group,
|
||||
url: MOCKED_PLAYLIST.playlist.items[0].url,
|
||||
})
|
||||
);
|
||||
|
||||
// check second group
|
||||
expect(
|
||||
component.groupedChannels[
|
||||
MOCKED_PLAYLIST.playlist.items[2].group.title
|
||||
][0]
|
||||
).toBeTruthy();
|
||||
expect(
|
||||
component.groupedChannels[
|
||||
MOCKED_PLAYLIST.playlist.items[2].group.title
|
||||
][0]
|
||||
).toEqual(
|
||||
expect.objectContaining({
|
||||
id: MOCKED_PLAYLIST.playlist.items[2].url,
|
||||
name: MOCKED_PLAYLIST.playlist.items[2].name,
|
||||
group: MOCKED_PLAYLIST.playlist.items[2].group,
|
||||
url: MOCKED_PLAYLIST.playlist.items[2].url,
|
||||
})
|
||||
);
|
||||
});
|
||||
|
||||
it('should set favorites list', () => {
|
||||
component.favorites$.subscribe((favorites) => {
|
||||
expect(favorites).toHaveLength(1);
|
||||
expect(favorites).toStrictEqual([
|
||||
MOCKED_PLAYLIST.playlist.items[0].url,
|
||||
]);
|
||||
});
|
||||
});
|
||||
|
||||
it('should update store after channel was selected', () => {
|
||||
jest.spyOn(mockStore, 'dispatch');
|
||||
component.selectChannel(component._channelList[0]);
|
||||
fixture.detectChanges();
|
||||
expect(mockStore.dispatch).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('should update store after channel was favorited', () => {
|
||||
jest.spyOn(mockStore, 'dispatch');
|
||||
component.toggleFavoriteChannel(
|
||||
component._channelList[0],
|
||||
new MouseEvent('click')
|
||||
);
|
||||
fixture.detectChanges();
|
||||
expect(mockStore.dispatch).toHaveBeenCalledWith({
|
||||
channel: component._channelList[0],
|
||||
type: expect.stringContaining('favorites'),
|
||||
});
|
||||
expect(mockStore.dispatch).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
describe('groupsComparator', () => {
|
||||
it('should sort numeric groups in correct order', () => {
|
||||
const groups: KeyValue<string, any[]>[] = [
|
||||
{ key: '10', value: [] },
|
||||
{ key: '2', value: [] },
|
||||
{ key: '1', value: [] },
|
||||
];
|
||||
|
||||
const sorted = [...groups].sort(component.groupsComparator);
|
||||
|
||||
expect(sorted[0].key).toBe('1');
|
||||
expect(sorted[1].key).toBe('2');
|
||||
expect(sorted[2].key).toBe('10');
|
||||
});
|
||||
|
||||
it('should sort mixed text and numeric groups', () => {
|
||||
const groups: KeyValue<string, any[]>[] = [
|
||||
{ key: 'Group 10', value: [] },
|
||||
{ key: 'Group 2', value: [] },
|
||||
{ key: 'Group A', value: [] },
|
||||
];
|
||||
|
||||
const sorted = [...groups].sort(component.groupsComparator);
|
||||
|
||||
expect(sorted[0].key).toBe('Group 2');
|
||||
expect(sorted[1].key).toBe('Group 10');
|
||||
expect(sorted[2].key).toBe('Group A');
|
||||
});
|
||||
|
||||
it('should fall back to alphabetical sort for non-numeric groups', () => {
|
||||
const groups: KeyValue<string, any[]>[] = [
|
||||
{ key: 'C', value: [] },
|
||||
{ key: 'A', value: [] },
|
||||
{ key: 'B', value: [] },
|
||||
];
|
||||
|
||||
const sorted = [...groups].sort(component.groupsComparator);
|
||||
|
||||
expect(sorted[0].key).toBe('A');
|
||||
expect(sorted[1].key).toBe('B');
|
||||
expect(sorted[2].key).toBe('C');
|
||||
});
|
||||
});
|
||||
});
|
||||
*/
|
||||
@@ -325,11 +325,6 @@ export class ChannelListContainerComponent implements OnInit, OnDestroy {
|
||||
*/
|
||||
onChannelSelected(channel: Channel): void {
|
||||
this.store.dispatch(ChannelActions.setActiveChannel({ channel }));
|
||||
|
||||
const epgChannelId = channel?.tvg?.id?.trim() || channel?.name.trim();
|
||||
if (epgChannelId) {
|
||||
this.epgService.getChannelPrograms(epgChannelId);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
Reference in new issue
Block a user