mirror of
https://github.com/4gray/iptvnator.git
synced 2026-10-16 14:16:16 -08:00
fix(migration): show startup preparation and recover source read failures (#1568)
* fix(migration): show startup preparation and recover source read failures * fix(migration): keep inventory reload failures recoverable * test(migration): type the deferred recovery hook * fix(migration): reconcile failed EPG cleanup before recovery * fix(migration): await settings before inventory readiness * style(migration): add a subtle theme-aware startup watermark
This commit is contained in:
1 parent
97b0264dee
commit
9f950a1530
37 files changed
+1024
-14
No files matched your search
@@ -0,0 +1,66 @@
|
||||
import { TestBed } from '@angular/core/testing';
|
||||
import { MockStore, provideMockStore } from '@ngrx/store/testing';
|
||||
import { TranslateModule } from '@ngx-translate/core';
|
||||
import {
|
||||
PlaylistActions,
|
||||
selectPlaylistsLoadFailed,
|
||||
selectPlaylistsLoadingFlag,
|
||||
} from '@iptvnator/m3u-state';
|
||||
import { AppStartupStatusComponent } from './app-startup-status.component';
|
||||
|
||||
describe('AppStartupStatusComponent', () => {
|
||||
beforeEach(() =>
|
||||
TestBed.configureTestingModule({
|
||||
imports: [AppStartupStatusComponent, TranslateModule.forRoot()],
|
||||
providers: [
|
||||
provideMockStore({
|
||||
selectors: [
|
||||
{ selector: selectPlaylistsLoadingFlag, value: false },
|
||||
{ selector: selectPlaylistsLoadFailed, value: false },
|
||||
],
|
||||
}),
|
||||
],
|
||||
})
|
||||
);
|
||||
|
||||
it('keeps showing preparation while EPG reconciliation delays the route', () => {
|
||||
const store = TestBed.inject(MockStore);
|
||||
store.overrideSelector(selectPlaylistsLoadingFlag, true);
|
||||
const fixture = TestBed.createComponent(AppStartupStatusComponent);
|
||||
fixture.detectChanges();
|
||||
expect(
|
||||
fixture.nativeElement.querySelector('[role="status"]')
|
||||
).not.toBeNull();
|
||||
fixture.componentRef.setInput('routeReady', true);
|
||||
fixture.detectChanges();
|
||||
expect(fixture.nativeElement.querySelector('section')).toBeNull();
|
||||
});
|
||||
|
||||
it('does not expose an empty workspace before sources finish loading', () => {
|
||||
const fixture = TestBed.createComponent(AppStartupStatusComponent);
|
||||
fixture.componentRef.setInput('routeReady', true);
|
||||
fixture.detectChanges();
|
||||
expect(fixture.componentInstance.complete()).toBe(false);
|
||||
const store = TestBed.inject(MockStore);
|
||||
store.overrideSelector(selectPlaylistsLoadingFlag, true);
|
||||
store.refreshState();
|
||||
fixture.detectChanges();
|
||||
expect(fixture.componentInstance.complete()).toBe(true);
|
||||
});
|
||||
|
||||
it('offers a retry on failure without rendering raw storage errors', () => {
|
||||
TestBed.inject(MockStore).overrideSelector(
|
||||
selectPlaylistsLoadFailed,
|
||||
true
|
||||
);
|
||||
const fixture = TestBed.createComponent(AppStartupStatusComponent);
|
||||
fixture.detectChanges();
|
||||
expect(
|
||||
fixture.nativeElement.querySelector('[role="alert"]')
|
||||
).not.toBeNull();
|
||||
expect(fixture.nativeElement.querySelector('mat-spinner')).toBeNull();
|
||||
const dispatch = jest.spyOn(TestBed.inject(MockStore), 'dispatch');
|
||||
fixture.nativeElement.querySelector('button').click();
|
||||
expect(dispatch).toHaveBeenCalledWith(PlaylistActions.loadPlaylists());
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,140 @@
|
||||
import {
|
||||
ChangeDetectionStrategy,
|
||||
Component,
|
||||
computed,
|
||||
inject,
|
||||
input,
|
||||
} from '@angular/core';
|
||||
import { MatButtonModule } from '@angular/material/button';
|
||||
import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
|
||||
import { Store } from '@ngrx/store';
|
||||
import { TranslatePipe } from '@ngx-translate/core';
|
||||
import {
|
||||
PlaylistActions,
|
||||
selectPlaylistsLoadFailed,
|
||||
selectPlaylistsLoadingFlag,
|
||||
} from '@iptvnator/m3u-state';
|
||||
|
||||
/** The first route also waits for settings and XMLTV source reconciliation. */
|
||||
@Component({
|
||||
selector: 'app-startup-status',
|
||||
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||
imports: [MatButtonModule, MatProgressSpinnerModule, TranslatePipe],
|
||||
template: `
|
||||
@if (!complete()) {
|
||||
<section
|
||||
[attr.role]="failed() ? 'alert' : 'status'"
|
||||
aria-live="polite"
|
||||
>
|
||||
<svg
|
||||
class="startup-watermark"
|
||||
viewBox="0 0 256 256"
|
||||
aria-hidden="true"
|
||||
focusable="false"
|
||||
>
|
||||
<g fill="none" stroke="currentColor" stroke-width="5">
|
||||
<rect x="46" y="53" width="166" height="115" rx="2" />
|
||||
<path d="M128 168v32M67 200h122" />
|
||||
<path
|
||||
d="M94 101Q129 72 165 101M101 109Q129 85 158 109M108 117Q129 99 151 117"
|
||||
/>
|
||||
</g>
|
||||
<path
|
||||
d="M119 126Q129 120 139 126L129 138Z"
|
||||
fill="currentColor"
|
||||
/>
|
||||
</svg>
|
||||
@if (!failed()) {
|
||||
<mat-spinner diameter="32" aria-hidden="true" />
|
||||
}
|
||||
<h1>
|
||||
{{
|
||||
(failed() ? 'STARTUP.FAILED' : 'STARTUP.PREPARING')
|
||||
| translate
|
||||
}}
|
||||
</h1>
|
||||
<p>
|
||||
{{
|
||||
(failed()
|
||||
? 'STARTUP.FAILED_DETAIL'
|
||||
: 'STARTUP.PREPARING_DETAIL'
|
||||
) | translate
|
||||
}}
|
||||
</p>
|
||||
@if (failed()) {
|
||||
<button mat-flat-button type="button" (click)="retry()">
|
||||
{{ 'RETRY' | translate }}
|
||||
</button>
|
||||
}
|
||||
</section>
|
||||
}
|
||||
`,
|
||||
styles: `
|
||||
:host {
|
||||
display: contents;
|
||||
}
|
||||
section {
|
||||
app-region: drag;
|
||||
position: relative;
|
||||
isolation: isolate;
|
||||
overflow: clip;
|
||||
min-height: 100dvh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: 12px;
|
||||
padding: 48px 24px;
|
||||
box-sizing: border-box;
|
||||
background: var(--app-content-bg);
|
||||
color: var(--app-heading-color);
|
||||
text-align: center;
|
||||
}
|
||||
.startup-watermark {
|
||||
position: absolute;
|
||||
right: -14%;
|
||||
bottom: -34%;
|
||||
width: clamp(420px, 76vw, 960px);
|
||||
height: auto;
|
||||
opacity: 0.07;
|
||||
transform: rotate(-14deg);
|
||||
mask-image: linear-gradient(135deg, transparent 15%, #000 78%);
|
||||
pointer-events: none;
|
||||
z-index: 0;
|
||||
}
|
||||
section > :not(svg) {
|
||||
position: relative;
|
||||
z-index: 1;
|
||||
}
|
||||
h1 {
|
||||
margin: 0;
|
||||
font-size: 18px;
|
||||
font-weight: 500;
|
||||
}
|
||||
p {
|
||||
margin: 0;
|
||||
max-width: 420px;
|
||||
color: var(--app-body-color);
|
||||
line-height: 1.5;
|
||||
}
|
||||
button {
|
||||
margin-top: 8px;
|
||||
app-region: no-drag;
|
||||
}
|
||||
`,
|
||||
})
|
||||
export class AppStartupStatusComponent {
|
||||
private readonly store = inject(Store);
|
||||
readonly routeReady = input(false);
|
||||
private readonly sourcesReady = this.store.selectSignal(
|
||||
selectPlaylistsLoadingFlag
|
||||
);
|
||||
readonly failed = this.store.selectSignal(selectPlaylistsLoadFailed);
|
||||
readonly complete = computed(
|
||||
() => this.routeReady() && this.sourcesReady()
|
||||
);
|
||||
|
||||
retry(): void {
|
||||
this.store.dispatch(PlaylistActions.loadPlaylists());
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,7 @@
|
||||
<router-outlet />
|
||||
<app-startup-status #startup [routeReady]="routeReady()" />
|
||||
<div [style.display]="startup.complete() ? 'contents' : 'none'">
|
||||
<router-outlet (activate)="routeReady.set(true)" />
|
||||
</div>
|
||||
|
||||
<app-epg-progress-panel />
|
||||
|
||||
|
||||
@@ -1,4 +1,11 @@
|
||||
import { Component, effect, HostBinding, inject, OnInit } from '@angular/core';
|
||||
import {
|
||||
Component,
|
||||
effect,
|
||||
HostBinding,
|
||||
inject,
|
||||
OnInit,
|
||||
signal,
|
||||
} from '@angular/core';
|
||||
import { MatSnackBar } from '@angular/material/snack-bar';
|
||||
import { Router, RouterOutlet } from '@angular/router';
|
||||
import { Actions, ofType } from '@ngrx/effects';
|
||||
@@ -34,6 +41,7 @@ import { SettingsService } from './services/settings.service';
|
||||
import { PlaybackKeepAwakeService } from './services/playback-keep-awake.service';
|
||||
import { PlaylistOpenRequestService } from './services/playlist-open-request.service';
|
||||
import { AppUpdateNotificationPanelComponent } from './app-update-notification-panel.component';
|
||||
import { AppStartupStatusComponent } from './app-startup-status.component';
|
||||
|
||||
const debugAppComponent = createDevLogger('AppComponent');
|
||||
|
||||
@@ -41,6 +49,7 @@ const debugAppComponent = createDevLogger('AppComponent');
|
||||
selector: 'app-root',
|
||||
templateUrl: './app.component.html',
|
||||
imports: [
|
||||
AppStartupStatusComponent,
|
||||
AppUpdateNotificationPanelComponent,
|
||||
EpgProgressPanelComponent,
|
||||
RouterOutlet,
|
||||
@@ -48,6 +57,7 @@ const debugAppComponent = createDevLogger('AppComponent');
|
||||
],
|
||||
})
|
||||
export class AppComponent implements OnInit {
|
||||
readonly routeReady = signal(false);
|
||||
@HostBinding('class.macos-platform') get isMacOS() {
|
||||
return this.runtime.isMacOS;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user