From 55ca108a9bcad7b38e957ba2013e013362795d9d Mon Sep 17 00:00:00 2001
From: Dermot Duffy <dermot.duffy@gmail.com>
Date: Sat, 8 Jan 2022 00:40:48 -0800
Subject: [PATCH] Use less fancy camera condition matching.

---
 src/card-condition.ts  | 46 ++++++++----------------------------------
 src/card.ts            |  5 ++---
 src/components/live.ts | 11 +++++-----
 src/types.ts           |  4 +---
 4 files changed, 17 insertions(+), 49 deletions(-)

diff --git a/src/card-condition.ts b/src/card-condition.ts
index fbe69b27..7b62c284 100644
--- a/src/card-condition.ts
+++ b/src/card-condition.ts
@@ -1,16 +1,13 @@
 import type {
-  CameraConfig,
   FrigateCardCondition,
   RawFrigateCardConfig,
 } from './types';
 import { merge, cloneDeep } from 'lodash-es';
 
-import { View } from './view';
-
 export interface ConditionState {
-  view?: Readonly<View>;
+  view?: string;
   fullscreen?: boolean;
-  camera?: CameraConfig;
+  camera?: string;
 }
 
 class ConditionStateRequestEvent extends Event {
@@ -26,41 +23,14 @@ export function evaluateCondition(
   }
 
   let result = true;
-  if (condition?.view?.length && state.view) {
-    result &&= condition?.view.includes(state.view.view);
+  if (condition?.view?.length) {
+    result &&= !!state.view && condition.view.includes(state.view);
   }
-  if (condition?.fullscreen !== undefined && state.fullscreen !== undefined) {
-    result &&= condition?.fullscreen == state.fullscreen;
+  if (condition?.fullscreen !== undefined) {
+    result &&= state.fullscreen !== undefined && condition.fullscreen == state.fullscreen;
   }
-
-  const evaluateNested = (
-    input: Readonly<RawFrigateCardConfig>,
-    condition: Readonly<RawFrigateCardConfig>,
-  ): boolean => {
-    let result = true;
-
-    for (const key of Object.keys(condition)) {
-      if (typeof condition[key] === 'string') {
-        // If the test is a literal, it must exactly match.
-        result &&= input[key] === condition[key];
-      } else if (Array.isArray(condition[key])) {
-        // If the test is an array, it's a list of acceptable values.
-        result &&= (condition[key] as unknown[]).includes(input[key]);
-      } else if (typeof condition[key] === 'object' && typeof input[key] === 'object') {
-        // If the test is an object, recursively navigate downwards.
-        result &&= evaluateNested(
-          input[key] as RawFrigateCardConfig,
-          condition[key] as RawFrigateCardConfig,
-        );
-      } else if (input[key] === undefined) {
-        return false;
-      }
-    }
-    return result;
-  };
-
-  if (condition?.camera) {
-    result &&= state.camera ? evaluateNested(state.camera, condition.camera) : false;
+  if (condition?.camera?.length) {
+    result &&= !!state.camera && condition.camera.includes(state.camera);
   }
   return result;
 }
diff --git a/src/card.ts b/src/card.ts
index b5cada03..13c8b357 100644
--- a/src/card.ts
+++ b/src/card.ts
@@ -222,10 +222,9 @@ export class FrigateCard extends LitElement {
    */
   protected _generateConditionState(): void {
     this._conditionState = {
-      view: this._view,
+      view: this._view?.view,
       fullscreen: screenfull.isEnabled && screenfull.isFullscreen,
-      camera:
-        this._cameras && this._view ? this._cameras.get(this._view.camera) : undefined,
+      camera: this._view?.camera,
     };
   }
 
diff --git a/src/components/live.ts b/src/components/live.ts
index 4ecb2b20..700234cb 100644
--- a/src/components/live.ts
+++ b/src/components/live.ts
@@ -1,7 +1,7 @@
 // TODO different live configs per camera
 // TODO evaluate single override section instead of per-subcomponent
-// TODO Remove id as a concept for cameras and use an array instead?
 // TODO Convert menu condition to use overrides
+// TODO Fix overlapping menu icon issue.
 // TODO Remove media load event console message
 // TODO Remove view change console message
 // TODO readme
@@ -309,10 +309,10 @@ export class FrigateCardLiveCarousel extends FrigateCardMediaCarousel {
     const slides: TemplateResult[] = [];
     const cameraToSlide: Record<string, number> = {};
 
-    for (const [key, value] of this.cameras) {
-      const slide = this._renderLive(value, slides.length);
+    for (const [camera, cameraConfig] of this.cameras) {
+      const slide = this._renderLive(camera, cameraConfig, slides.length);
       if (slide) {
-        cameraToSlide[key] = slides.length;
+        cameraToSlide[camera] = slides.length;
         slides.push(slide);
       }
     }
@@ -351,6 +351,7 @@ export class FrigateCardLiveCarousel extends FrigateCardMediaCarousel {
   }
 
   protected _renderLive(
+    camera: string,
     cameraConfig: CameraConfig,
     slideIndex: number,
   ): TemplateResult | void {
@@ -362,7 +363,7 @@ export class FrigateCardLiveCarousel extends FrigateCardMediaCarousel {
     // <frigate-card-live-provider> is rendering right now.
     const conditionState = Object.assign({
       ...this.conditionState,
-      camera: cameraConfig,
+      camera: camera,
     });
 
     const config = getOverriddenConfig(this.liveConfig, conditionState) as LiveConfig;
diff --git a/src/types.ts b/src/types.ts
index 75d9c35c..2f74a99b 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -349,9 +349,7 @@ export type MenuSubmenu = z.infer<typeof menuSubmenuSchema>;
 const frigateCardConditionSchema = z.object({
   view: z.string().array().optional(),
   fullscreen: z.boolean().optional(),
-
-  // Allow matching any field of cameraConfig.
-  camera: z.record(z.any()),
+  camera: z.string().array().optional(),
 });
 export type FrigateCardCondition = z.infer<typeof frigateCardConditionSchema>;