From 767d4ee7a0034b1951f938a68794eccbcfd54656 Mon Sep 17 00:00:00 2001
From: Dermot Duffy <dermot.duffy@gmail.com>
Date: Sun, 29 Jan 2023 19:28:34 -0800
Subject: [PATCH] Handle timeline item click corner case.

---
 src/components/timeline-core.ts | 59 +++++++++++++++++----------------
 src/view/view.ts                |  2 --
 2 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/src/components/timeline-core.ts b/src/components/timeline-core.ts
index 037b6712..50122d5a 100644
--- a/src/components/timeline-core.ts
+++ b/src/components/timeline-core.ts
@@ -503,37 +503,38 @@ export class FrigateCardTimelineCore extends LitElement {
       );
     } else if (
       properties.item &&
-      properties.what === 'item' &&
-      MediaQueriesClassifier.areRecordingQueries(this.view.query)
+      properties.what === 'item'
     ) {
-      const eventView = await this._createViewWithEventMediaQuery(
-        this._createEventMediaQuerys(),
-        {
-          selectedItem: properties.item,
-          targetView: 'media',
-        },
-      );
-      const results = eventView?.queryResults?.getResults();
-      // Specifically ensure there are _some_ results before dispatching the
-      // view change.
-      if (eventView && results && results.length) {
-        eventView.mergeInContext({ mediaViewer: { seek: properties.time } });
-        view = eventView;
+      const newResults = this.view.queryResults?.clone()
+        .resetSelectedResult()
+        .selectResultIfFound(
+          (media) => !!this.cameras && media.getID() === properties.item,
+        );
+
+      if (!newResults || !newResults.hasSelectedResult()) {
+        // This can happen if this is a recording query (with recorded hours)
+        // and an event is clicked on the timeline, or if the current thumbnails
+        // is a filtered view from the media gallery (i.e. any case where the
+        // thumbnails may not be match the events on the timeline).
+        const fullEventView = await this._createViewWithEventMediaQuery(
+          this._createEventMediaQuerys(),
+          {
+            selectedItem: properties.item,
+            targetView: 'media',
+          },
+        );
+        if (fullEventView?.queryResults?.hasResults()) {
+          view = fullEventView;
+        }
+      } else {
+        view = this.view.evolve({
+          queryResults: newResults,
+        });
+      }
+
+      if (view?.queryResults?.hasResults()) {
+        view.mergeInContext({ mediaViewer: { seek: properties.time } });
       }
-    } else if (
-      properties.item &&
-      properties.what === 'item' &&
-      this.view.queryResults?.hasResults() &&
-      this.view.query
-    ) {
-      view = this.view.evolve({
-        queryResults: this.view.queryResults
-          ?.clone()
-          .resetSelectedResult()
-          .selectResultIfFound(
-            (media) => !!this.cameras && media.getID() === properties.item,
-          ),
-      });
     }
 
     if (view) {
diff --git a/src/view/view.ts b/src/view/view.ts
index 77482d66..5c015e6d 100644
--- a/src/view/view.ts
+++ b/src/view/view.ts
@@ -9,8 +9,6 @@
 // Hard:
 //  - TODO: Remove FrigateBrowseMediaSource if not necessary (post-gallery).
 //  - TODO: Remove browse-media.ts TODOs.
-//  - TODO: What should the timeline do when an event is clicked on that is not in the queryResults (or if queryResults is empty)?
-//  - TODO: Should the timeline data source clear events (as it currently does) when the query changes?
 
 import { ViewContext } from 'view';
 import {