Don't render thumbnail carousel if there are no thumbnails.

This commit is contained in:
Dermot Duffy
2021-11-26 16:28:36 -08:00
parent b7c6f48214
commit 065d297386
5 changed files with 50 additions and 82 deletions
-2
View File
@@ -67,8 +67,6 @@ export class BrowseMediaUtil {
return index >= 0 ? index : null; return index >= 0 ? index : null;
} }
//
/** /**
* Browse Frigate media with a media content id. May throw. * Browse Frigate media with a media content id. May throw.
* @param hass The HomeAssistant object. * @param hass The HomeAssistant object.
+24 -2
View File
@@ -1,6 +1,7 @@
import { CSSResultGroup, LitElement, TemplateResult, html, unsafeCSS } from 'lit'; import { CSSResultGroup, LitElement, TemplateResult, html, unsafeCSS } from 'lit';
import type { import type {
BrowseMediaQueryParameters, BrowseMediaQueryParameters,
BrowseMediaSource,
ExtendedHomeAssistant, ExtendedHomeAssistant,
FrigateCardConfig, FrigateCardConfig,
JSMPEGConfig, JSMPEGConfig,
@@ -11,6 +12,9 @@ import { HomeAssistant } from 'custom-card-helpers';
import { customElement, property } from 'lit/decorators.js'; import { customElement, property } from 'lit/decorators.js';
import { until } from 'lit/directives/until.js'; import { until } from 'lit/directives/until.js';
import { BrowseMediaUtil } from '../browse-media-util.js';
import { ThumbnailCarouselTap } from './thumbnail-carousel.js';
import { View } from '../view.js';
import { localize } from '../localize/localize.js'; import { localize } from '../localize/localize.js';
import { import {
dispatchErrorMessageEvent, dispatchErrorMessageEvent,
@@ -30,8 +34,6 @@ import liveFrigateStyle from '../scss/live-frigate.scss';
import liveJSMPEGStyle from '../scss/live-jsmpeg.scss'; import liveJSMPEGStyle from '../scss/live-jsmpeg.scss';
import liveWebRTCStyle from '../scss/live-webrtc.scss'; import liveWebRTCStyle from '../scss/live-webrtc.scss';
import { View } from '../view.js';
import { ThumbnailCarouselTap } from './thumbnail-carousel.js';
// Number of seconds a signed URL is valid for. // Number of seconds a signed URL is valid for.
const URL_SIGN_EXPIRY_SECONDS = 24 * 60 * 60; const URL_SIGN_EXPIRY_SECONDS = 24 * 60 * 60;
@@ -87,6 +89,22 @@ export class FrigateCardLive extends LitElement {
if (!this.config) { if (!this.config) {
return; return;
} }
const fetchThumbnailsThenRender = async (): Promise<TemplateResult | void> => {
if (!this.hass || !this.browseMediaQueryParameters) {
return;
}
let parent: BrowseMediaSource | null;
try {
parent = await BrowseMediaUtil.browseMediaQuery(
this.hass,
this.browseMediaQueryParameters,
);
} catch (e) {
return dispatchErrorMessageEvent(this, (e as Error).message);
}
if (BrowseMediaUtil.getFirstTrueMediaChildIndex(parent) != null) {
return html` <frigate-card-thumbnail-carousel return html` <frigate-card-thumbnail-carousel
.hass=${this.hass} .hass=${this.hass}
.browseMediaQueryParameters=${this.browseMediaQueryParameters} .browseMediaQueryParameters=${this.browseMediaQueryParameters}
@@ -105,6 +123,10 @@ export class FrigateCardLive extends LitElement {
> >
</frigate-card-thumbnail-carousel>`; </frigate-card-thumbnail-carousel>`;
} }
}
return html`${until(fetchThumbnailsThenRender(), renderProgressIndicator())}`;
}
/** /**
* Master render method. * Master render method.
+4 -56
View File
@@ -1,14 +1,11 @@
import { BrowseMediaUtil } from '../browse-media-util.js'; import { BrowseMediaUtil } from '../browse-media-util.js';
import { CSSResultGroup, TemplateResult, html, unsafeCSS, LitElement } from 'lit'; import { CSSResultGroup, TemplateResult, html, unsafeCSS } from 'lit';
import { customElement, property } from 'lit/decorators.js'; import { customElement, property } from 'lit/decorators.js';
import { until } from 'lit/directives/until';
import type { BrowseMediaQueryParameters, BrowseMediaSource, ExtendedHomeAssistant, ThumbnailsControlConfig } from '../types.js'; import type { BrowseMediaSource, ThumbnailsControlConfig } from '../types.js';
import { FrigateCardCarousel } from './carousel.js'; import { FrigateCardCarousel } from './carousel.js';
import { HomeAssistant } from 'custom-card-helpers';
import { actionHandler } from '../action-handler-directive.js'; import { actionHandler } from '../action-handler-directive.js';
import { dispatchErrorMessageEvent, dispatchFrigateCardEvent } from '../common.js'; import { dispatchFrigateCardEvent } from '../common.js';
import { renderProgressIndicator } from './message.js';
import thumbnailCarouselStyle from '../scss/thumbnail-carousel.scss'; import thumbnailCarouselStyle from '../scss/thumbnail-carousel.scss';
@@ -19,56 +16,7 @@ export interface ThumbnailCarouselTap {
} }
@customElement('frigate-card-thumbnail-carousel') @customElement('frigate-card-thumbnail-carousel')
export class FrigateCardThumbnailCarousel extends LitElement { export class FrigateCardThumbnailCarousel extends FrigateCardCarousel {
@property({ attribute: false })
protected hass?: HomeAssistant & ExtendedHomeAssistant;
@property({ attribute: false })
protected browseMediaQueryParameters?: BrowseMediaQueryParameters;
@property({ attribute: false })
protected config?: ThumbnailsControlConfig;
@property({ attribute: false })
protected highlightSelected = true;
/**
* Master render method.
* @returns A rendered template.
*/
protected render(): TemplateResult | void {
return html`${until(this._render(), renderProgressIndicator())}`;
}
/**
* Asyncronously render the element.
* @returns A rendered template.
*/
protected async _render(): Promise<TemplateResult | void> {
if (!this.hass || !this.browseMediaQueryParameters) {
return html``;
}
let parent: BrowseMediaSource | null = null;
try {
parent = await BrowseMediaUtil.browseMediaQuery(
this.hass,
this.browseMediaQueryParameters,
);
} catch (e) {
return dispatchErrorMessageEvent(this, (e as Error).message);
}
return html` <frigate-card-thumbnail-carousel-core
.target=${parent}
.config=${this.config}
.highlightSelected=${this.highlightSelected}
>
</frigate-card-thumbnail-carousel-core>`;
}
}
@customElement('frigate-card-thumbnail-carousel-core')
export class FrigateCardThumbnailCarouselCore extends FrigateCardCarousel {
@property({ attribute: false }) @property({ attribute: false })
protected target?: BrowseMediaSource; protected target?: BrowseMediaSource;
+4 -4
View File
@@ -16,7 +16,7 @@ import type {
ViewerConfig, ViewerConfig,
} from '../types.js'; } from '../types.js';
import { FrigateCardCarousel } from './carousel.js'; import { FrigateCardCarousel } from './carousel.js';
import { FrigateCardThumbnailCarouselCore, ThumbnailCarouselTap } from './thumbnail-carousel.js'; import { FrigateCardThumbnailCarousel, ThumbnailCarouselTap } from './thumbnail-carousel.js';
import { ResolvedMediaCache, ResolvedMediaUtil } from '../resolved-media.js'; import { ResolvedMediaCache, ResolvedMediaUtil } from '../resolved-media.js';
import { View } from '../view.js'; import { View } from '../view.js';
import { actionHandler } from '../action-handler-directive.js'; import { actionHandler } from '../action-handler-directive.js';
@@ -165,7 +165,7 @@ export class FrigateCardViewerCore extends LitElement {
protected resolvedMediaCache?: ResolvedMediaCache; protected resolvedMediaCache?: ResolvedMediaCache;
protected _mediaCarouselRef: Ref<FrigateCardMediaCarousel> = createRef(); protected _mediaCarouselRef: Ref<FrigateCardMediaCarousel> = createRef();
protected _thumbnailCarouselRef: Ref<FrigateCardThumbnailCarouselCore> = createRef(); protected _thumbnailCarouselRef: Ref<FrigateCardThumbnailCarousel> = createRef();
protected _syncThumbnailCarousel(): void { protected _syncThumbnailCarousel(): void {
const mediaSelected = this._mediaCarouselRef.value?.carouselSelected(); const mediaSelected = this._mediaCarouselRef.value?.carouselSelected();
@@ -179,7 +179,7 @@ export class FrigateCardViewerCore extends LitElement {
return html``; return html``;
} }
return html` <frigate-card-thumbnail-carousel-core return html` <frigate-card-thumbnail-carousel
${ref(this._thumbnailCarouselRef)} ${ref(this._thumbnailCarouselRef)}
.target=${this.view.target} .target=${this.view.target}
.config=${this.viewerConfig.controls.thumbnails} .config=${this.viewerConfig.controls.thumbnails}
@@ -188,7 +188,7 @@ export class FrigateCardViewerCore extends LitElement {
}} }}
@frigate-card:carousel:init=${this._syncThumbnailCarousel.bind(this)} @frigate-card:carousel:init=${this._syncThumbnailCarousel.bind(this)}
> >
</frigate-card-thumbnail-carousel-core>`; </frigate-card-thumbnail-carousel>`;
} }
protected render(): TemplateResult | void { protected render(): TemplateResult | void {
+1 -1
View File
@@ -12,6 +12,6 @@ frigate-card-media-carousel {
min-height: 0; min-height: 0;
} }
frigate-card-thumbnail-carousel-core { frigate-card-thumbnail-carousel {
flex: 0 0 var(--frigate-card-carousel-thumbnail-size); flex: 0 0 var(--frigate-card-carousel-thumbnail-size);
} }