diff --git a/.devcontainer/preconfig/.storage/lovelace b/.devcontainer/preconfig/.storage/lovelace index bda880d3..3b8ef284 100644 --- a/.devcontainer/preconfig/.storage/lovelace +++ b/.devcontainer/preconfig/.storage/lovelace @@ -4,7 +4,7 @@ "key": "lovelace", "data": { "config": { - "title": "Frigate Card", + "title": "Advanced Camera Card", "views": [ { "theme": "Backend-selected", @@ -13,8 +13,8 @@ "badges": [], "cards": [ { - "type": "custom:frigate-card", - "name": "Frigate Card with Frigate Camera", + "type": "custom:advanced-camera-card", + "name": "Advanced Camera Card with Frigate Camera", "cameras": [ { "camera_entity": "camera.big_buck_bunny", diff --git a/.devcontainer/preconfig/.storage/lovelace_resources b/.devcontainer/preconfig/.storage/lovelace_resources index 5f9c118e..3c045c82 100644 --- a/.devcontainer/preconfig/.storage/lovelace_resources +++ b/.devcontainer/preconfig/.storage/lovelace_resources @@ -5,7 +5,7 @@ "data": { "items": [ { - "url": "http://localhost:10001/frigate-hass-card.js", + "url": "http://localhost:10001/advanced-camera-card.js", "type": "module", "id": "00c459541bac4290af01c51bf9c06ba1" } diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md index fc028421..d43853ed 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -14,13 +14,13 @@ assignees: '' **Checklist:** -- Please try updating to the [latest available version](https://github.com/dermotduffy/frigate-hass-card/releases). +- Please try updating to the [latest available version](https://github.com/dermotduffy/advanced-camera-card/releases). - Please try clearing your browser cache. **[REQUIRED] Card diagnostic information:** ```yaml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a73dc71a..6d4748f5 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -49,7 +49,7 @@ jobs: - name: Upload javascript uses: actions/upload-artifact@v4 with: - name: frigate-hass-card + name: advanced-camera-card path: dist/*.js # When this issue is fixed, it would be useful to upload visualizations: @@ -57,5 +57,5 @@ jobs: # - name: Upload visualizations # uses: actions/upload-artifact@v4 # with: - # name: frigate-hass-card + # name: advanced-camera-card # path: visualizations/*.html diff --git a/.github/workflows/manual-release.yml b/.github/workflows/manual-release.yml index 5489feb2..0649b06d 100644 --- a/.github/workflows/manual-release.yml +++ b/.github/workflows/manual-release.yml @@ -26,7 +26,7 @@ jobs: with: type: zip path: dist - filename: frigate-hass-card.zip + filename: advanced-camera-card.zip - name: Upload JS files to release uses: svenstaro/upload-release-action@2.9.0 @@ -43,7 +43,7 @@ jobs: with: repo_token: ${{ secrets.GITHUB_TOKEN }} - file: frigate-hass-card.zip + file: advanced-camera-card.zip tag: ${{ github.ref }} overwrite: true diff --git a/.github/workflows/semantic-release.yml b/.github/workflows/semantic-release.yml index 02248080..3f9d36e1 100644 --- a/.github/workflows/semantic-release.yml +++ b/.github/workflows/semantic-release.yml @@ -50,7 +50,7 @@ jobs: with: type: zip path: dist - filename: frigate-hass-card.zip + filename: advanced-camera-card.zip - run: npx semantic-release env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/README.md b/README.md index 1a162a66..3fb8b201 100644 --- a/README.md +++ b/README.md @@ -2,20 +2,17 @@ -Frigate icon -[![GitHub Release](https://img.shields.io/github/release/dermotduffy/frigate-hass-card.svg?style=flat-square)](https://github.com/dermotduffy/frigate-hass-card/releases) -[![Build Status](https://img.shields.io/github/actions/workflow/status/dermotduffy/frigate-hass-card/build.yml?style=flat-square)](https://github.com/dermotduffy/frigate-hass-card/actions/workflows/build.yml) -[![License](https://img.shields.io/github/license/dermotduffy/frigate-hass-card.svg?style=flat-square)](LICENSE) +[![GitHub Release](https://img.shields.io/github/release/dermotduffy/advanced-camera-card.svg?style=flat-square)](https://github.com/dermotduffy/advanced-camera-card/releases) +[![Build Status](https://img.shields.io/github/actions/workflow/status/dermotduffy/advanced-camera-card/build.yml?style=flat-square)](https://github.com/dermotduffy/advanced-camera-card/actions/workflows/build.yml) +[![License](https://img.shields.io/github/license/dermotduffy/advanced-camera-card.svg?style=flat-square)](LICENSE) [![HACS](https://img.shields.io/badge/HACS-default-orange.svg?style=flat-square)](https://hacs.xyz) [![Sponsor](https://img.shields.io/static/v1?label=Sponsor&message=%E2%9D%A4&logo=GitHub&color=%23fe8e86&style=flat-square)](https://github.com/sponsors/dermotduffy) -Frigate Card +Advanced Camera Card -# Frigate Card +# Advanced Camera Card + +Formerly known as: `Frigate Card` A comprehensive camera card for Home Assistant. @@ -31,4 +28,4 @@ A comprehensive camera card for Home Assistant. - Full [Picture Elements](https://www.home-assistant.io/lovelace/picture-elements/) support. - Theme friendly. -See [full documentation](https://dermotduffy.github.io/frigate-hass-card). +See [full documentation](https://dermotduffy.github.io/advanced-camera-card). diff --git a/docs/README.md b/docs/README.md index 532d1e0c..9e544b25 100644 --- a/docs/README.md +++ b/docs/README.md @@ -10,6 +10,8 @@ Home Assistant > HACS > Frontend > "Explore & Add Integrations" > Frigate Card ``` +[](./common/rename-hacs.md ':include') + - Click `Download this repository with HACS`. See [Advanced Installation](advanced-installation.md) for other installation resources, or [Rolling Back](./rolling-back.md) to rollback to prior versions. @@ -23,14 +25,14 @@ See [Advanced Installation](advanced-installation.md) for other installation res ``` - Click `+ Add Card` shown on the bottom of the screen -- Choose `Custom: Frigate card` from the list +- Choose `Custom: Advanced Camera Card` from the list ## Initial configuration ### Minimal configuration ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office ``` @@ -38,7 +40,7 @@ cameras: ### Video scrubbing configuration ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office profiles: @@ -48,7 +50,7 @@ profiles: ### Multi-camera grid configuration ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office - camera_entity: camera.kitchen diff --git a/docs/_coverpage.md b/docs/_coverpage.md index c1cb5d64..7c0ab1ce 100644 --- a/docs/_coverpage.md +++ b/docs/_coverpage.md @@ -1,8 +1,10 @@ -![logo](images/icons/frigate.svg) +![logo](images/icons/iris.svg ':size=48px') -# Frigate Card 6.0.0 +# Advanced Camera Card -> A comprehensive camera card for Home Assistant. +> A comprehensive camera card for Home Assistant -[GitHub](https://github.com/dermotduffy/frigate-hass-card/) +FKA: Frigate Card + +[GitHub](https://github.com/dermotduffy/advanced-camera-card/) [Documentation](README.md) diff --git a/docs/advanced-installation.md b/docs/advanced-installation.md index d1946899..e6b91f8b 100644 --- a/docs/advanced-installation.md +++ b/docs/advanced-installation.md @@ -14,7 +14,7 @@ For most users, HACS should automatically add the necessary resources. Should th Three dots menu -> "Edit Dashboard" -> Three dots menu -> "Manage resources" -> "Add Resource" ``` -- URL: `/hacsfiles/frigate-hass-card/frigate-hass-card.js` +- URL: `/hacsfiles/advanced-camera-card/advanced-camera-card.js` - Resource type: `JavaScript Module` #### Lovelace in "YAML mode" (rare) @@ -26,7 +26,7 @@ You would see`mode: yaml` under `lovelace:` in your `configuration.yaml` if this ```yaml lovelace: resources: - - url: /hacsfiles/frigate-hass-card/frigate-hass-card.js + - url: /hacsfiles/advanced-camera-card/advanced-camera-card.js type: module ``` @@ -34,15 +34,15 @@ lovelace: ### Manual installation -- Download the `frigate-hass-card.zip` attachment of the desired [release](https://github.com/dermotduffy/frigate-hass-card/releases) to a location accessible by Home Assistant. Note that the release will have a series of `.js` files (for HACS users) **and** a `frigate-hass-card.zip` for the convenience of manual installers. -- Unzip the file and move the contents of the `dist/` folder to any subfolder name you'd like, e.g. `frigate-card` is used in the below example. +- Download the `advanced-camera-card.zip` attachment of the desired [release](https://github.com/dermotduffy/advanced-camera-card/releases) to a location accessible by Home Assistant. Note that the release will have a series of `.js` files (for HACS users) **and** a `advanced-camera-card.zip` for the convenience of manual installers. +- Unzip the file and move the contents of the `dist/` folder to any subfolder name you'd like, e.g. `advanced-camera-card` is used in the below example. - Add the location as a Lovelace resource via the UI, or via [YAML configuration](https://www.home-assistant.io/lovelace/dashboards/#resources) such as: ```yaml lovelace: mode: yaml resources: - - url: /local/frigate-card/frigate-hass-card.js + - url: /local/advanced-camera-card/advanced-camera-card.js type: module ``` diff --git a/docs/common/rename-hacs.md b/docs/common/rename-hacs.md new file mode 100644 index 00000000..b24c43b3 --- /dev/null +++ b/docs/common/rename-hacs.md @@ -0,0 +1 @@ +?> This card was previously called `Frigate Card`. Until the rename is processed by HACS, use `Frigate Card` as the search term, thereafter it will be called `Advanced Camera Card`. diff --git a/docs/configuration/README.md b/docs/configuration/README.md index b19be1b1..847f96dc 100644 --- a/docs/configuration/README.md +++ b/docs/configuration/README.md @@ -5,7 +5,7 @@ The card supports a myriad of configuration options for simple or complex setups ### Minimal configuration ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office ``` diff --git a/docs/configuration/actions/README.md b/docs/configuration/actions/README.md index 22114ff2..d3d52617 100644 --- a/docs/configuration/actions/README.md +++ b/docs/configuration/actions/README.md @@ -10,15 +10,15 @@ variety of circumstances (e.g. tapping on a menu icon, double tapping on an [element](../elements/README.md) or holding the mouse/tap down on a particular [view](../view.md?id=supported-views)). -### Differences in actions between Frigate Card and Home Assistant +### Differences in actions between Advanced Camera Card and Home Assistant -Both the Home Assistant frontend and the Frigate card cooperate to provide -action functionality. In general, the Frigate Card functionality is a superset +Both the Home Assistant frontend and the Advanced Camera Card cooperate to provide +action functionality. In general, the Advanced Camera Card functionality is a superset of that offered by stock Home Assistant. Stock action functionality is used for Stock [Home Assistant picture elements](https://www.home-assistant.io/lovelace/picture-elements/). Extended -Frigate card behavior covers all other interactions on the Frigate card (e.g. +Advanced Camera Card behavior covers all other interactions on the Advanced Camera Card (e.g. menu icon elements, submenus and actions on the card or views). #### Custom action types: `start_tap` and `end_tap` @@ -32,7 +32,7 @@ actually occurring. #### Multiple actions -Extended Frigate card behavior supports a list of actions instead of a single +Extended Advanced Camera Card behavior supports a list of actions instead of a single action, all of which will be handled. See [an example of multiple actions](../../examples.md?id=multiple-actions). diff --git a/docs/configuration/actions/custom/README.md b/docs/configuration/actions/custom/README.md index ed45590a..4a3232c2 100644 --- a/docs/configuration/actions/custom/README.md +++ b/docs/configuration/actions/custom/README.md @@ -1,33 +1,33 @@ -# `custom:frigate-card-action` +# `custom:advanced-camera-card-action` -Execute a Frigate Card action. +Execute an Advanced Camera Card action. ```yaml -action: custom:frigate-card-action +action: custom:advanced-camera-card-action # [...] ``` -| Parameter | Description | -| --------------------- | ------------------------------------------- | -| `action` | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | A supported Frigate Card action. See below. | +| Parameter | Description | +| ----------------------------- | --------------------------------------------------- | +| `action` | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | A supported Advanced Camera Card action. See below. | ## `camera_select` Select a given camera. ```yaml -action: custom:frigate-card-action -frigate_card_action: camera_select +action: custom:advanced-camera-card-action +advanced_camera_card_action: camera_select # [...] ``` -| Parameter | Description | -| --------------------- | --------------------------------------------------------------------------------------------------- | -| `action` | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | Must be `camera_select`. | -| `camera` | The [camera ID](../../cameras/README.md?id=cameras) of the camera to select. | -| `triggered` | If `true` instead of `camera` being specified then a triggered camera (if any) is selected instead. | +| Parameter | Description | +| ----------------------------- | --------------------------------------------------------------------------------------------------- | +| `action` | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | Must be `camera_select`. | +| `camera` | The [camera ID](../../cameras/README.md?id=cameras) of the camera to select. | +| `triggered` | If `true` instead of `camera` being specified then a triggered camera (if any) is selected instead. | This action will respect the value of the `view.camera_select` to choose the appropriate view on the new camera. See [`view` configuration](../../view.md). @@ -36,8 +36,8 @@ This action will respect the value of the `view.camera_select` to choose the app Download the displayed media. ```yaml -action: custom:frigate-card-action -frigate_card_action: camera_ui +action: custom:advanced-camera-card-action +advanced_camera_card_action: camera_ui ``` Open the UI for the selected camera engine (e.g. the Frigate UI). @@ -47,8 +47,8 @@ Open the UI for the selected camera engine (e.g. the Frigate UI). Change to the `clip` view. ```yaml -action: custom:frigate-card-action -frigate_card_action: clip +action: custom:advanced-camera-card-action +advanced_camera_card_action: clip ``` ## `clips` @@ -56,8 +56,8 @@ frigate_card_action: clip Change to the `clips` view. ```yaml -action: custom:frigate-card-action -frigate_card_action: clips +action: custom:advanced-camera-card-action +advanced_camera_card_action: clips ``` ## `default` @@ -65,8 +65,8 @@ frigate_card_action: clips Change to the default view. ```yaml -action: custom:frigate-card-action -frigate_card_action: default +action: custom:advanced-camera-card-action +advanced_camera_card_action: default ``` ## `diagnostics` @@ -74,8 +74,8 @@ frigate_card_action: default Show the card diagnostics. ```yaml -action: custom:frigate-card-action -frigate_card_action: diagnostics +action: custom:advanced-camera-card-action +advanced_camera_card_action: diagnostics ``` ## `display_mode_select` @@ -83,24 +83,24 @@ frigate_card_action: diagnostics Select a display mode (e.g. view a `single` camera or a `grid` of cameras). ```yaml -action: custom:frigate-card-action -frigate_card_action: display_mode_select +action: custom:advanced-camera-card-action +advanced_camera_card_action: display_mode_select # [...] ``` -| Parameter | Description | -| --------------------- | ---------------------------------------------------------------------------------------------- | -| `action` | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | Must be `display_mode_select`. | -| `display_mode` | `single` to show a single camera at a time in a carousel, or `grid` to show a grid of cameras. | +| Parameter | Description | +| ----------------------------- | ---------------------------------------------------------------------------------------------- | +| `action` | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | Must be `display_mode_select`. | +| `display_mode` | `single` to show a single camera at a time in a carousel, or `grid` to show a grid of cameras. | ## `download` Download the displayed media. ```yaml -action: custom:frigate-card-action -frigate_card_action: download +action: custom:advanced-camera-card-action +advanced_camera_card_action: download ``` ## `expand` @@ -108,8 +108,8 @@ frigate_card_action: download Expand the card into a dialog/popup. ```yaml -action: custom:frigate-card-action -frigate_card_action: expand +action: custom:advanced-camera-card-action +advanced_camera_card_action: expand ``` ## `fullscreen` @@ -117,8 +117,8 @@ frigate_card_action: expand Toggle fullscreen. ```yaml -action: custom:frigate-card-action -frigate_card_action: fullscreen +action: custom:advanced-camera-card-action +advanced_camera_card_action: fullscreen ``` ## `image` @@ -126,8 +126,8 @@ frigate_card_action: fullscreen Change to the `image` view. ```yaml -action: custom:frigate-card-action -frigate_card_action: image +action: custom:advanced-camera-card-action +advanced_camera_card_action: image ``` ## `live` @@ -135,8 +135,8 @@ frigate_card_action: image Change to the `live` view. ```yaml -action: custom:frigate-card-action -frigate_card_action: live +action: custom:advanced-camera-card-action +advanced_camera_card_action: live ``` ## `live_substream_off` @@ -144,86 +144,86 @@ frigate_card_action: live Turn off the substream (if on). ```yaml -action: custom:frigate-card-action -frigate_card_action: live_substream_on +action: custom:advanced-camera-card-action +advanced_camera_card_action: live_substream_on ``` -| Parameter | Description | -| --------------------- | ------------------------------------- | -| `action` | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | Must be `live_substream_on`. | +| Parameter | Description | +| ----------------------------- | --------------------------------------------- | +| `action` | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | Must be `live_substream_on`. | ## `live_substream_on` Turn on the first available substream. Use [Camera dependency configuration](../../cameras/README.md?id=dependencies) to configure substreams. ```yaml -action: custom:frigate-card-action -frigate_card_action: live_substream_on +action: custom:advanced-camera-card-action +advanced_camera_card_action: live_substream_on ``` -| Parameter | Description | -| --------------------- | ------------------------------------- | -| `action` | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | Must be `live_substream_on`. | +| Parameter | Description | +| ----------------------------- | --------------------------------------------- | +| `action` | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | Must be `live_substream_on`. | ## `live_substream_select` Select a substream. Use [Camera dependency configuration](../../cameras/README.md?id=dependencies) to configure substreams. ```yaml -action: custom:frigate-card-action -frigate_card_action: live_substream_select +action: custom:advanced-camera-card-action +advanced_camera_card_action: live_substream_select # [...] ``` -| Parameter | Description | -| --------------------- | ------------------------------------------------------------------------------- | -| `action` | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | Must be `live_substream_select`. | -| `camera` | The [camera ID](../../cameras/README.md?id=cameras) of the substream to select. | +| Parameter | Description | +| ----------------------------- | ------------------------------------------------------------------------------- | +| `action` | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | Must be `live_substream_select`. | +| `camera` | The [camera ID](../../cameras/README.md?id=cameras) of the substream to select. | ## `log` Log a message to the Javascript console. ```yaml -action: custom:frigate-card-action -frigate_card_action: log +action: custom:advanced-camera-card-action +advanced_camera_card_action: log # [...] ``` -| Parameter | Default | Description | -| --------------------- | ------- | ------------------------------------------------------------------------------ | -| `action` | | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | | Must be `log`. | -| `message` | | The message to log. | -| `level` | `info` | The console logging level to use. One of `['debug', 'info', 'warn', 'error']`. | +| Parameter | Default | Description | +| ----------------------------- | ------- | ------------------------------------------------------------------------------ | +| `action` | | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | | Must be `log`. | +| `message` | | The message to log. | +| `level` | `info` | The console logging level to use. One of `['debug', 'info', 'warn', 'error']`. | ## `media_player` Perform a media player action. ```yaml -action: custom:frigate-card-action -frigate_card_action: media_player +action: custom:advanced-camera-card-action +advanced_camera_card_action: media_player # [...] ``` -| Parameter | Description | -| --------------------- | ----------------------------------------------------------------- | -| `action` | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | Must be `media_player`. | -| `media_player` | The entity ID of the media_player on which to perform the action. | -| `media_player_action` | Either `play` or `stop` to play or stop the media in question. | +| Parameter | Description | +| ----------------------------- | ----------------------------------------------------------------- | +| `action` | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | Must be `media_player`. | +| `media_player` | The entity ID of the media_player on which to perform the action. | +| `media_player_action` | Either `play` or `stop` to play or stop the media in question. | ## `menu_toggle` Show/hide the menu (for the `hidden` mode style). ```yaml -action: custom:frigate-card-action -frigate_card_action: menu_toggle +action: custom:advanced-camera-card-action +advanced_camera_card_action: menu_toggle ``` ## `microphone_connect` @@ -231,8 +231,8 @@ frigate_card_action: menu_toggle Connect the microphone for [2-way audio](../../../usage/2-way-audio.md). ```yaml -action: custom:frigate-card-action -frigate_card_action: microphone_connect +action: custom:advanced-camera-card-action +advanced_camera_card_action: microphone_connect ``` ## `microphone_disconnect` @@ -240,8 +240,8 @@ frigate_card_action: microphone_connect Disconnect the microphone during [2-way audio](../../../usage/2-way-audio.md). ```yaml -action: custom:frigate-card-action -frigate_card_action: microphone_disconnect +action: custom:advanced-camera-card-action +advanced_camera_card_action: microphone_disconnect ``` ## `microphone_mute` @@ -249,8 +249,8 @@ frigate_card_action: microphone_disconnect Mute the microphone during [2-way audio](../../../usage/2-way-audio.md). ```yaml -action: custom:frigate-card-action -frigate_card_action: microphone_mute +action: custom:advanced-camera-card-action +advanced_camera_card_action: microphone_mute ``` ## `microphone_unmute` @@ -258,8 +258,8 @@ frigate_card_action: microphone_mute Unmute the microphone during [2-way audio](../../../usage/2-way-audio.md). ```yaml -action: custom:frigate-card-action -frigate_card_action: microphone_unmute +action: custom:advanced-camera-card-action +advanced_camera_card_action: microphone_unmute ``` ## `mute` @@ -267,8 +267,8 @@ frigate_card_action: microphone_unmute Mute the selected media. ```yaml -action: custom:frigate-card-action -frigate_card_action: mute +action: custom:advanced-camera-card-action +advanced_camera_card_action: mute ``` ## `pause` @@ -276,8 +276,8 @@ frigate_card_action: mute Pause the selected media. ```yaml -action: custom:frigate-card-action -frigate_card_action: pause +action: custom:advanced-camera-card-action +advanced_camera_card_action: pause ``` ## `play` @@ -285,8 +285,8 @@ frigate_card_action: pause Play the selected media. ```yaml -action: custom:frigate-card-action -frigate_card_action: play +action: custom:advanced-camera-card-action +advanced_camera_card_action: play ``` ## `ptz` @@ -294,19 +294,19 @@ frigate_card_action: play Execute a real PTZ action, whether configured manually (see [Camera PTZ configuration](../../cameras/README.md?id=ptz)) or auto-detected. ```yaml -action: custom:frigate-card-action -frigate_card_action: ptz +action: custom:advanced-camera-card-action +advanced_camera_card_action: ptz # [...] ``` -| Parameter | | Description | -| --------------------- | ------------------------- | --------------------------------------------------------------------------------------------- | -| `action` | | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | | Must be `ptz`. | -| `camera` | Currently selected camera | An optional camera ID to execute the action on. | -| `ptz_action` | | Optional action that is of `left`, `right`, `up`, `down`, `zoom_in`, `zoom_out` or `preset`. | -| `ptz_phase` | | Optional parameter that is one of `start` or `stop` to start or stop the movement separately. | -| `ptz_preset` | | Optional preset to execute when the `ptz_action` is `preset`. | +| Parameter | | Description | +| ----------------------------- | ------------------------- | --------------------------------------------------------------------------------------------- | +| `action` | | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | | Must be `ptz`. | +| `camera` | Currently selected camera | An optional camera ID to execute the action on. | +| `ptz_action` | | Optional action that is of `left`, `right`, `up`, `down`, `zoom_in`, `zoom_out` or `preset`. | +| `ptz_phase` | | Optional parameter that is one of `start` or `stop` to start or stop the movement separately. | +| `ptz_preset` | | Optional preset to execute when the `ptz_action` is `preset`. | ?> If no `ptz_action` is specified, the camera returns to its "home" position. For a real PTZ camera, the "home" position is the first available preset. If there are no presets, there is no home position. @@ -315,35 +315,35 @@ frigate_card_action: ptz Show or hide the PTZ controls. ```yaml -action: custom:frigate-card-action -frigate_card_action: ptz_controls +action: custom:advanced-camera-card-action +advanced_camera_card_action: ptz_controls # [...] ``` -| Parameter | Description | -| --------------------- | -------------------------------------------------------- | -| `action` | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | Must be `ptz_controls`. | -| `show` | If `true` shows the PTZ controls, if `false` hides them. | +| Parameter | Description | +| ----------------------------- | -------------------------------------------------------- | +| `action` | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | Must be `ptz_controls`. | +| `show` | If `true` shows the PTZ controls, if `false` hides them. | ## `ptz_digital` Execute a digital PTZ action. ```yaml -action: custom:frigate-card-action -frigate_card_action: ptz_digital +action: custom:advanced-camera-card-action +advanced_camera_card_action: ptz_digital # [...] ``` -| Parameter | Default | Description | -| --------------------- | --------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `action` | | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | | Must be `ptz_digital`. | -| `target_id` | The currently selected camera or media | The target (camera or media) to execute a digital PTZ action on. Can be a camera ID, or another media ID (e.g. for Frigate, can specify a media/event ID). | -| `ptz_action` | Optional action that is one of `left`, `right`, `up`, `down`, `zoom_in` or `zoom_out`. | -| `ptz_phase` | Optional parameter that is one of `start` or `stop` to start or stop the movement separately. | -| `absolute` | Optional parameter to specify exact absolute pan and zoom settings. See below. | +| Parameter | Default | Description | +| ----------------------------- | --------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `action` | | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | | Must be `ptz_digital`. | +| `target_id` | The currently selected camera or media | The target (camera or media) to execute a digital PTZ action on. Can be a camera ID, or another media ID (e.g. for Frigate, can specify a media/event ID). | +| `ptz_action` | Optional action that is one of `left`, `right`, `up`, `down`, `zoom_in` or `zoom_out`. | +| `ptz_phase` | Optional parameter that is one of `start` or `stop` to start or stop the movement separately. | +| `absolute` | Optional parameter to specify exact absolute pan and zoom settings. See below. | ?> If no `ptz_action` is specified and no `absolute` value is specified, the camera returns to its "home" position. See [Camera layout configuration](../../cameras/README.md?id=layout-configuration) to configure the default "home" position for digital PTZ. @@ -369,18 +369,18 @@ action), otherwise a digital PTZ action will be run (equivalent to using the ?> If the camera supports _any_ real PTZ action, _all_ actions will attempt to make real PTZ calls. ```yaml -action: custom:frigate-card-action -frigate_card_action: ptz_multi +action: custom:advanced-camera-card-action +advanced_camera_card_action: ptz_multi # [...] ``` -| Parameter | Description | -| --------------------- | --------------------------------------------------------------------------------------------- | -| `action` | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | Must be `ptz_multi`. | -| `ptz_action` | Optional action that is one of `left`, `right`, `up`, `down`, `zoom_in` or `zoom_out`. | -| `ptz_phase` | Optional parameter that is one of `start` or `stop` to start or stop the movement separately. | -| `ptz_preset` | Optional preset to execute when the `ptz_action` is `preset`. | +| Parameter | Description | +| ----------------------------- | --------------------------------------------------------------------------------------------- | +| `action` | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | Must be `ptz_multi`. | +| `ptz_action` | Optional action that is one of `left`, `right`, `up`, `down`, `zoom_in` or `zoom_out`. | +| `ptz_phase` | Optional parameter that is one of `start` or `stop` to start or stop the movement separately. | +| `ptz_preset` | Optional preset to execute when the `ptz_action` is `preset`. | ?> If no `ptz_action` is specified, the camera returns to its "home" position. @@ -389,8 +389,8 @@ frigate_card_action: ptz_multi Change to the `recording` view. ```yaml -action: custom:frigate-card-action -frigate_card_action: recording +action: custom:advanced-camera-card-action +advanced_camera_card_action: recording ``` ## `recordings` @@ -398,8 +398,8 @@ frigate_card_action: recording Change to the `recordings` view. ```yaml -action: custom:frigate-card-action -frigate_card_action: recordings +action: custom:advanced-camera-card-action +advanced_camera_card_action: recordings ``` ## `screenshot` @@ -407,8 +407,8 @@ frigate_card_action: recordings Take a screenshot of the selected media (e.g. a still from a video). ```yaml -action: custom:frigate-card-action -frigate_card_action: screenshot +action: custom:advanced-camera-card-action +advanced_camera_card_action: screenshot ``` ## `sleep` @@ -416,15 +416,15 @@ frigate_card_action: screenshot Take no action for a given duration. Useful to pause between multiple other actions. ```yaml -action: custom:frigate-card-action -frigate_card_action: sleep +action: custom:advanced-camera-card-action +advanced_camera_card_action: sleep ``` -| Parameter | Description | -| --------------------- | ------------------------------------- | -| `action` | Must be `custom:frigate-card-action`. | -| `frigate_card_action` | Must be `sleep`. | -| `duration` | A duration object. See below. | +| Parameter | Description | +| ----------------------------- | --------------------------------------------- | +| `action` | Must be `custom:advanced-camera-card-action`. | +| `advanced_camera_card_action` | Must be `sleep`. | +| `duration` | A duration object. See below. | ### `duration` @@ -444,8 +444,8 @@ The `duration` block configures how long the `sleep` should last. Change to the `snapshot` view. ```yaml -action: custom:frigate-card-action -frigate_card_action: snapshot +action: custom:advanced-camera-card-action +advanced_camera_card_action: snapshot ``` ## `status_bar` @@ -453,8 +453,8 @@ frigate_card_action: snapshot Add or remove items from the status bar. ```yaml -action: custom:frigate-card-action -frigate_card_action: status_bar +action: custom:advanced-camera-card-action +advanced_camera_card_action: status_bar # [...] ``` @@ -465,15 +465,15 @@ frigate_card_action: status_bar ### `items` -The items parameter is a list of items to `add` or `remove`. See [`custom:frigate-card-status-bar-icon`](../../elements/custom/README.md?id=status-bar-icon), [`custom:frigate-card-status-bar-image`](../../elements/custom/README.md?id=status-bar-image), [`custom:frigate-card-status-bar-string`](../../elements/custom/README.md?id=status-bar-string) for the allowable items and their parameters. See the [fully expanded reference](./README.md?fully-expanded-reference) below for a complete example. +The items parameter is a list of items to `add` or `remove`. See [`custom:advanced-camera-card-status-bar-icon`](../../elements/custom/README.md?id=status-bar-icon), [`custom:advanced-camera-card-status-bar-image`](../../elements/custom/README.md?id=status-bar-image), [`custom:advanced-camera-card-status-bar-string`](../../elements/custom/README.md?id=status-bar-string) for the allowable items and their parameters. See the [fully expanded reference](./README.md?fully-expanded-reference) below for a complete example. ## `timeline` Change to the `timeline` view. ```yaml -action: custom:frigate-card-action -frigate_card_action: timeline +action: custom:advanced-camera-card-action +advanced_camera_card_action: timeline ``` ## `unmute` @@ -481,8 +481,8 @@ frigate_card_action: timeline Unmute the selected media. ```yaml -action: custom:frigate-card-action -frigate_card_action: unmute +action: custom:advanced-camera-card-action +advanced_camera_card_action: unmute ``` ## Fully expanded reference @@ -491,308 +491,308 @@ frigate_card_action: unmute ```yaml elements: - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-a-circle title: Select Front Door tap_action: - action: custom:frigate-card-action - frigate_card_action: camera_select + action: custom:advanced-camera-card-action + advanced_camera_card_action: camera_select camera: camera.front_door - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-b-circle title: Open Camera UI tap_action: - action: custom:frigate-card-action - frigate_card_action: camera_ui - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: camera_ui + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-d-circle title: Show most recent clip tap_action: - action: custom:frigate-card-action - frigate_card_action: clip - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: clip + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-e-circle title: Show clips tap_action: - action: custom:frigate-card-action - frigate_card_action: clips - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: clips + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-f-circle title: Show default view tap_action: - action: custom:frigate-card-action - frigate_card_action: default - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: default + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-g-circle title: Show diagnostics tap_action: - action: custom:frigate-card-action - frigate_card_action: diagnostics - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: diagnostics + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-h-circle title: Show grid tap_action: - action: custom:frigate-card-action - frigate_card_action: display_mode_select + action: custom:advanced-camera-card-action + advanced_camera_card_action: display_mode_select display_mode: grid - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-i-circle title: Download media tap_action: - action: custom:frigate-card-action - frigate_card_action: download - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: download + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-j-circle title: Expand tap_action: - action: custom:frigate-card-action - frigate_card_action: expand - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: expand + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-k-circle title: Fullscreen tap_action: - action: custom:frigate-card-action - frigate_card_action: fullscreen - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: fullscreen + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-l-circle title: Show image view tap_action: - action: custom:frigate-card-action - frigate_card_action: image - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: image + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-m-circle title: Show live view tap_action: - action: custom:frigate-card-action - frigate_card_action: live - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: live + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-n-circle title: Turn off substream tap_action: - action: custom:frigate-card-action - frigate_card_action: live_substream_off - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: live_substream_off + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-o-circle title: Turn on substream tap_action: - action: custom:frigate-card-action - frigate_card_action: live_substream_on - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: live_substream_on + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-n-circle title: Select HD substream tap_action: - action: custom:frigate-card-action - frigate_card_action: live_substream_select + action: custom:advanced-camera-card-action + advanced_camera_card_action: live_substream_select camera: camera.front_door_hd - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-o-circle title: Log to console tap_action: - action: custom:frigate-card-action - frigate_card_action: log + action: custom:advanced-camera-card-action + advanced_camera_card_action: log message: "Hello, world!" level: debug - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-m-circle title: Media player play tap_action: - action: custom:frigate-card-action - frigate_card_action: media_player + action: custom:advanced-camera-card-action + advanced_camera_card_action: media_player media_player: media_player.nesthub50be media_player_action: play - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-n-circle title: Media player stop tap_action: - action: custom:frigate-card-action - frigate_card_action: media_player + action: custom:advanced-camera-card-action + advanced_camera_card_action: media_player media_player: media_player.nesthub media_player_action: stop - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-o-circle title: Toggle hidden menu tap_action: - action: custom:frigate-card-action - frigate_card_action: menu_toggle - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: menu_toggle + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-p-circle title: Microphone mute tap_action: - action: custom:frigate-card-action - frigate_card_action: microphone_mute - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: microphone_mute + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-q-circle title: Microphone unmute tap_action: - action: custom:frigate-card-action - frigate_card_action: microphone_unmute - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: microphone_unmute + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-r-circle title: Mute tap_action: - action: custom:frigate-card-action - frigate_card_action: mute - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: mute + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-s-circle title: Pause tap_action: - action: custom:frigate-card-action - frigate_card_action: pause - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: pause + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-t-circle title: Play tap_action: - action: custom:frigate-card-action - frigate_card_action: play - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: play + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-u-circle title: Real PTZ Preset tap_action: - action: custom:frigate-card-action - frigate_card_action: ptz + action: custom:advanced-camera-card-action + advanced_camera_card_action: ptz ptz_action: preset ptz_preset: doorway - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-v-circle title: Show PTZ Controls tap_action: - action: custom:frigate-card-action - frigate_card_action: ptz_controls + action: custom:advanced-camera-card-action + advanced_camera_card_action: ptz_controls enabled: true - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-w-circle title: Go to precise digital location tap_action: - action: custom:frigate-card-action - frigate_card_action: ptz_digital + action: custom:advanced-camera-card-action + advanced_camera_card_action: ptz_digital absolute: zoom: 5 pan: x: 58 y: 14 - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-x-circle title: Smart select between real and digital PTZ tap_action: - action: custom:frigate-card-action - frigate_card_action: ptz_multi + action: custom:advanced-camera-card-action + advanced_camera_card_action: ptz_multi ptz_action: left - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-y-circle title: Show most recent recording tap_action: - action: custom:frigate-card-action - frigate_card_action: recording - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: recording + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-a-circle-outline title: Show recordings tap_action: - action: custom:frigate-card-action - frigate_card_action: recordings - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: recordings + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-b-circle-outline title: Screenshot tap_action: - action: custom:frigate-card-action - frigate_card_action: screenshot - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: screenshot + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-c-circle-outline title: Sleep tap_action: - action: custom:frigate-card-action - frigate_card_action: sleep + action: custom:advanced-camera-card-action + advanced_camera_card_action: sleep duration: h: 1 m: 20 s: 56 ms: 422 - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-d-circle-outline title: Show most recent snapshot tap_action: - action: custom:frigate-card-action - frigate_card_action: snapshot - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: snapshot + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-e-circle-outline title: Show snapshots tap_action: - action: custom:frigate-card-action - frigate_card_action: snapshots - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: snapshots + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-f-circle-outline title: Show timeline tap_action: - action: custom:frigate-card-action - frigate_card_action: timeline - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: timeline + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-g-circle-outline title: Unmute tap_action: - action: custom:frigate-card-action - frigate_card_action: unmute - - type: custom:frigate-card-menu-icon + action: custom:advanced-camera-card-action + advanced_camera_card_action: unmute + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-h-circle-outline title: Add status bar contents tap_action: - - action: custom:frigate-card-action - frigate_card_action: status_bar + - action: custom:advanced-camera-card-action + advanced_camera_card_action: status_bar status_bar_action: add items: - - type: custom:frigate-card-status-bar-string + - type: custom:advanced-camera-card-status-bar-string enabled: true exclusive: false expand: false string: 'Intruder alert!' priority: 50 sufficient: false - - type: custom:frigate-card-status-bar-icon + - type: custom:advanced-camera-card-status-bar-icon enabled: true exclusive: false expand: false icon: 'mdi:cow' priority: 50 sufficient: false - - type: custom:frigate-card-status-bar-image + - type: custom:advanced-camera-card-status-bar-image enabled: true exclusive: false expand: false image: https://my.site.com/status.png priority: 50 sufficient: false - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-i-circle-outline title: Remove status bar contents tap_action: - - action: custom:frigate-card-action - frigate_card_action: status_bar + - action: custom:advanced-camera-card-action + advanced_camera_card_action: status_bar status_bar_action: remove items: - - type: custom:frigate-card-status-bar-string + - type: custom:advanced-camera-card-status-bar-string enabled: true exclusive: false expand: false string: 'Intruder alert!' priority: 50 sufficient: false - - type: custom:frigate-card-status-bar-icon + - type: custom:advanced-camera-card-status-bar-icon enabled: true exclusive: false expand: false icon: 'mdi:cow' priority: 50 sufficient: false - - type: custom:frigate-card-status-bar-image + - type: custom:advanced-camera-card-status-bar-image enabled: true exclusive: false expand: false image: https://my.site.com/status.png priority: 50 sufficient: false - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alpha-i-circle-outline title: Reset status bar contents tap_action: - - action: custom:frigate-card-action - frigate_card_action: status_bar + - action: custom:advanced-camera-card-action + advanced_camera_card_action: status_bar status_bar_action: reset ``` diff --git a/docs/configuration/automations.md b/docs/configuration/automations.md index 49697bb6..5c69b2dd 100644 --- a/docs/configuration/automations.md +++ b/docs/configuration/automations.md @@ -30,9 +30,9 @@ automations: - condition: fullscreen fullscreen: true actions: - - action: custom:frigate-card-action - frigate_card_action: live_substream_on + - action: custom:advanced-camera-card-action + advanced_camera_card_action: live_substream_on actions_not: - - action: custom:frigate-card-action - frigate_card_action: live_substream_off + - action: custom:advanced-camera-card-action + advanced_camera_card_action: live_substream_off ``` diff --git a/docs/configuration/cameras/live-provider.md b/docs/configuration/cameras/live-provider.md index 6fc7cff7..727d2cf1 100644 --- a/docs/configuration/cameras/live-provider.md +++ b/docs/configuration/cameras/live-provider.md @@ -7,7 +7,7 @@ The `live_provider` parameter determines what provides the live stream for a cam | Live Provider | Latency | Frame Rate | Loading Time | Installation | Description | | ---------------------------------- | ------- | ---------- | ------------ | ------------------------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | | `go2rtc` | Best | High | Better | Builtin | Uses [go2rtc](https://github.com/AlexxIT/go2rtc) to stream live feeds. This is supported by Frigate >= `0.12`. | -| `ha` (default HA configuration) | Poor | High | Better | Builtin | Use the built-in Home Assistant camera stream. The camera doesn't even need to be a Frigate camera! | +| `ha` (default HA configuration) | Poor | High | Better | Builtin | Use the built-in Home Assistant camera stream. | | `ha` (Native WebRTC) | Best | High | Better | Builtin | Use the built-in Home Assistant camera streams -- can be configured to use [native WebRTC](https://www.home-assistant.io/integrations/rtsp_to_webrtc/) offering a very low-latency feed direct to your browser. | | `ha` (when configured with LL-HLS) | Better | High | Better | Builtin | Use the built-in Home Assistant camera streams -- can be configured to use an [LL-HLS](https://www.home-assistant.io/integrations/stream/#ll-hls) feed for lower latency. | | `image` | Poor | Poor | Best | Builtin | Use refreshing snapshots of the built-in Home Assistant camera streams. | @@ -44,13 +44,13 @@ cameras: # [...] ``` -| Option | Default | Description | -| ------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `entity` | | The entity to use when `mode` is set to `entity`. This entity is expected to have an `entity_picture` attribute that specifies the image URL. | -| `entity_parameters` | | Optional URL parameters to add to the URL generated for entity-based modes (i.e. when `mode` is `camera` or `entity`). | -| `mode` | `auto` | Value must be one of `url` (to fetch an arbitrary image URL), `camera` (to show a still of the currently selected camera entity using either `camera_entity` or `webrtc_card.entity` in that order of precedence), `entity` to show an image associated with a named entity (see the `entity` parameter below), or `screensaver` (to show an [embedded stock Frigate card logo](https://github.com/dermotduffy/frigate-hass-card/blob/main/src/images/frigate-bird-in-sky.jpg)). If `auto`, the mode is chosen automatically based on whether `url` or `entity` parameters have been specified. | -| `refresh_seconds` | 1 | The image will be refreshed at least every `refresh_seconds` (it may refresh more frequently, e.g. whenever Home Assistant updates its camera security token). `0` implies no refreshing. | -| `url` | | A static image URL to be used when the `mode` is set to `url` or when a temporary image is required (e.g. may appear momentarily prior to load of a camera snapshot in the `camera` mode). Note that a `_t=[timestsamp]` query parameter will be automatically added to all URLs such that the image will not be cached by the browser. | +| Option | Default | Description | +| ------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `entity` | | The entity to use when `mode` is set to `entity`. This entity is expected to have an `entity_picture` attribute that specifies the image URL. | +| `entity_parameters` | | Optional URL parameters to add to the URL generated for entity-based modes (i.e. when `mode` is `camera` or `entity`). | +| `mode` | `auto` | Value must be one of `url` (to fetch an arbitrary image URL), `camera` (to show a still of the currently selected camera entity using either `camera_entity` or `webrtc_card.entity` in that order of precedence), `entity` to show an image associated with a named entity (see the `entity` parameter below), or `screensaver` (to show an [embedded image](https://github.com/dermotduffy/advanced-camera-card/blob/main/src/images/iris-screensaver.jpg)). If `auto`, the mode is chosen automatically based on whether `url` or `entity` parameters have been specified. | +| `refresh_seconds` | 1 | The image will be refreshed at least every `refresh_seconds` (it may refresh more frequently, e.g. whenever Home Assistant updates its camera security token). `0` implies no refreshing. | +| `url` | | A static image URL to be used when the `mode` is set to `url` or when a temporary image is required (e.g. may appear momentarily prior to load of a camera snapshot in the `camera` mode). Note that a `_t=[timestsamp]` query parameter will be automatically added to all URLs such that the image will not be cached by the browser. | ## `jsmpeg` diff --git a/docs/configuration/elements/README.md b/docs/configuration/elements/README.md index 5591fb39..834d6d62 100644 --- a/docs/configuration/elements/README.md +++ b/docs/configuration/elements/README.md @@ -12,7 +12,7 @@ elements: - [element_2] ``` -?> The Frigate Card allows either a single [action](../actions/README.md) (as in stock Home +?> The Advanced Camera Card allows either a single [action](../actions/README.md) (as in stock Home Assistant) or list of [actions](../actions/README.md) to be defined for each class of user interaction (e.g. `tap`, `double_tap`, `hold`, etc). See [an example of multiple actions](../../examples.md?id=multiple-actions). diff --git a/docs/configuration/elements/custom/README.md b/docs/configuration/elements/custom/README.md index d9ef932f..e7d3e677 100644 --- a/docs/configuration/elements/custom/README.md +++ b/docs/configuration/elements/custom/README.md @@ -2,19 +2,19 @@ ## `conditional` -Restrict a set of elements to only render when the card is matches a set of [conditions](../../conditions.md). This is analogous to the stock [`conditional`](../stock/README.md?id=conditional) element except supporting a rich set of Frigate Card [conditions](../../conditions.md). +Restrict a set of elements to only render when the card is matches a set of [conditions](../../conditions.md). This is analogous to the stock [`conditional`](../stock/README.md?id=conditional) element except supporting a rich set of Advanced Camera Card [conditions](../../conditions.md). ```yaml elements: - - type: custom:frigate-card-conditional + - type: custom:advanced-camera-card-conditional # [...] ``` -Parameters for the `custom:frigate-card-conditional` element: +Parameters for the `custom:advanced-camera-card-conditional` element: | Parameter | Description | | ------------ | ---------------------------------------------------------------------------------------------------------------- | -| `type` | Must be `custom:frigate-card-conditional`. | +| `type` | Must be `custom:advanced-camera-card-conditional`. | | `conditions` | A list of [conditions](../../conditions.md) that must evaluate to true in order for the elements to be rendered. | | `elements` | The elements to render. Can be any supported element. | @@ -22,11 +22,11 @@ See the [conditional elements example](../../../examples.md?id=conditional-eleme ## `menu-icon` -Add an arbitrary icon to the Frigate Card menu. +Add an arbitrary icon to the Advanced Camera Card menu. ```yaml elements: - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon # [...] ``` @@ -34,7 +34,7 @@ Configuration is similar to a stock [Picture Elements Icon](https://www.home-ass | Parameter | Default | Description | | ------------------------------------------------------------------------ | ---------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `type` | | Must be `custom:frigate-card-menu-icon`. | +| `type` | | Must be `custom:advanced-camera-card-menu-icon`. | | `alignment` | `matching` | Whether this menu item should have an alignment that is `matching` the menu alignment or `opposing` the menu alignment. Can be used to create two separate groups of buttons on the menu. The `priority` option orders buttons within a given `alignment`. | | `enabled` | `true` | Whether or not to show this menu item. | | `entity` | | An optional Home Assistant entity for use with actions. | @@ -51,13 +51,13 @@ Add a configurable submenu dropdown. ```yaml elements: - - type: custom:frigate-card-menu-submenu + - type: custom:advanced-camera-card-menu-submenu # [...] ``` | Parameter | Default | Description | | ------------------------------------------------------------------------ | ---------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `type` | | Must be `custom:frigate-card-menu-submenu`. | +| `type` | | Must be `custom:advanced-camera-card-menu-submenu`. | | `alignment` | `matching` | Whether this menu item should have an alignment that is `matching` the menu alignment or `opposing` the menu alignment. Can be used to create two separate groups of buttons on the menu. The `priority` option orders buttons within a given `alignment`. | | `enabled` | `true` | Whether or not to show this menu item. | | `entity` | | An optional Home Assistant entity for use with actions. | @@ -88,13 +88,13 @@ Add a submenu based on a `select` or `input_select`. This element allows you to ```yaml elements: - - type: custom:frigate-card-menu-submenu-select + - type: custom:advanced-camera-card-menu-submenu-select # [...] ``` | Parameter | Default | Description | | ------------------------------------------------------------------------ | ---------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `type` | | Must be `custom:frigate-card-menu-submenu-select`. | +| `type` | | Must be `custom:advanced-camera-card-menu-submenu-select`. | | `alignment` | `matching` | Whether this menu item should have an alignment that is `matching` the menu alignment or `opposing` the menu alignment. Can be used to create two separate groups of buttons on the menu. The `priority` option orders buttons within a given `alignment`. | | `enabled` | `true` | Whether or not to show this menu item. | | `entity` | | An optional Home Assistant entity for use with actions. | @@ -110,11 +110,11 @@ See the `select` [submenu example](../../../examples.md?id=select-submenu). ## `menu-state-icon` -Add a state icon to the Frigate Card menu that represents the state of a Home Assistant entity. +Add a state icon to the Advanced Camera Card menu that represents the state of a Home Assistant entity. ```yaml elements: - - type: custom:frigate-card-menu-state-icon + - type: custom:advanced-camera-card-menu-state-icon # [...] ``` @@ -122,7 +122,7 @@ Configuration is similar to a stock [Picture Elements State Icon](https://www.ho | Parameter | Default | Description | | ------------------------------------------------------------------------ | ---------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `type` | | Must be `custom:frigate-card-menu-state-icon`. | +| `type` | | Must be `custom:advanced-camera-card-menu-state-icon`. | | `alignment` | `matching` | Whether this menu item should have an alignment that is `matching` the menu alignment or `opposing` the menu alignment. Can be used to create two separate groups of buttons on the menu. The `priority` option orders buttons within a given `alignment`. | | `enabled` | `true` | Whether or not to show this menu item. | | `entity` | | An optional Home Assistant entity for use with actions. | @@ -140,13 +140,13 @@ Add an arbitrary icon to the status bar. ```yaml elements: - - type: custom:frigate-card-status-bar-icon + - type: custom:advanced-camera-card-status-bar-icon # [...] ``` | Parameter | Default | Description | | ------------ | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `type` | | Must be `custom:frigate-card-status-bar-icon`. | +| `type` | | Must be `custom:advanced-camera-card-status-bar-icon`. | | `actions` | | Actions to performs when the status bar item is interacted with. See [actions](../../actions/README.md). | | `enabled` | `true` | `true` to enable this status bar item, `false` to disable. | | `exclusive` | `false` | Whether or not this item should evict non-exclusive items from the status bar. | @@ -161,13 +161,13 @@ Add an arbitrary image to the status bar. ```yaml elements: - - type: custom:frigate-card-status-bar-image + - type: custom:advanced-camera-card-status-bar-image # [...] ``` | Parameter | Default | Description | | ------------ | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `type` | | Must be `custom:frigate-card-status-bar-image`. | +| `type` | | Must be `custom:advanced-camera-card-status-bar-image`. | | `actions` | | Actions to performs when the status bar item is interacted with. See [actions](../../actions/README.md). | | `enabled` | `true` | `true` to enable this status bar item, `false` to disable. | | `exclusive` | `false` | Whether or not this item should evict non-exclusive items from the status bar. | @@ -182,13 +182,13 @@ Add an arbitrary string to the status bar. ```yaml elements: - - type: custom:frigate-card-status-bar-string + - type: custom:advanced-camera-card-status-bar-string # [...] ``` | Parameter | Default | Description | | ------------ | ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -| `type` | | Must be `custom:frigate-card-status-bar-string`. | +| `type` | | Must be `custom:advanced-camera-card-status-bar-string`. | | `actions` | | Actions to performs when the status bar item is interacted with. See [actions](../../actions/README.md). | | `enabled` | `true` | `true` to enable this status bar item, `false` to disable. | | `exclusive` | `false` | Whether or not this item should evict non-exclusive items from the status bar. | @@ -205,7 +205,7 @@ elements: ```yaml elements: - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon alignment: matching enabled: true entity: light.office_main_lights @@ -215,7 +215,7 @@ elements: style: color: white title: Vroom - - type: custom:frigate-card-menu-state-icon + - type: custom:advanced-camera-card-menu-state-icon alignment: matching enabled: true entity: light.office_main_lights @@ -226,7 +226,7 @@ elements: style: color: white title: Office lights - - type: custom:frigate-card-menu-submenu + - type: custom:advanced-camera-card-menu-submenu alignment: matching enabled: true entity: light.office_main_lights @@ -256,7 +256,7 @@ elements: style: color: white title: Office lights - - type: custom:frigate-card-menu-submenu-select + - type: custom:advanced-camera-card-menu-submenu-select alignment: matching enabled: true entity: input_select.kitchen_scene @@ -280,7 +280,7 @@ elements: color: white title: 'Kitchen Scene' # Show a pig icon if a variety of conditions are met. - - type: custom:frigate-card-conditional + - type: custom:advanced-camera-card-conditional elements: - type: icon icon: mdi:pig @@ -321,21 +321,21 @@ elements: - condition: user users: - 581fca7fdc014b8b894519cc531f9a04 - - type: custom:frigate-card-status-bar-string + - type: custom:advanced-camera-card-status-bar-string enabled: true exclusive: false expand: false string: 'Intruder alert!' priority: 50 sufficient: false - - type: custom:frigate-card-status-bar-icon + - type: custom:advanced-camera-card-status-bar-icon enabled: true exclusive: false expand: false icon: 'mdi:cow' priority: 50 sufficient: false - - type: custom:frigate-card-status-bar-image + - type: custom:advanced-camera-card-status-bar-image enabled: true exclusive: false expand: false diff --git a/docs/configuration/elements/stock/README.md b/docs/configuration/elements/stock/README.md index 620ce56c..606495a0 100644 --- a/docs/configuration/elements/stock/README.md +++ b/docs/configuration/elements/stock/README.md @@ -20,7 +20,7 @@ elements: # [...] ``` -?> See [Frigate Card custom elements](../custom//README.md) for the custom elements offered by _this_ card. +?> See [Advanced Camera Card custom elements](../custom//README.md) for the custom elements offered by _this_ card. ## `icon` diff --git a/docs/configuration/image.md b/docs/configuration/image.md index 2727e289..0e09f08a 100644 --- a/docs/configuration/image.md +++ b/docs/configuration/image.md @@ -7,14 +7,14 @@ image: # [...] ``` -| Option | Default | Description | -| ------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `actions` | | [Actions](actions/README.md) to use for the `image` view. | -| `entity` | | The entity to use when `mode` is set to `entity`. This entity is expected to have an `entity_picture` attribute that specifies the image URL. | -| `entity_parameters` | | Optional URL parameters to add to the URL generated for entity-based modes (i.e. when `mode` is `camera` or `entity`). | -| `mode` | `auto` | Value must be one of `url` (to fetch an arbitrary image URL), `camera` (to show a still of the currently selected camera entity using either `camera_entity` or `webrtc_card.entity` in that order of precedence), `entity` to show an image associated with a named entity (see the `entity` parameter below), or `screensaver` (to show an [embedded stock Frigate card logo](https://github.com/dermotduffy/frigate-hass-card/blob/main/src/images/frigate-bird-in-sky.jpg)). If `auto`, the mode is chosen automatically based on whether `url` or `entity` parameters have been specified. | -| `refresh_seconds` | 1 | The image will be refreshed at least every `refresh_seconds` (it may refresh more frequently, e.g. whenever Home Assistant updates its camera security token). `0` implies no refreshing. | -| `url` | | A static image URL to be used when the `mode` is set to `url` or when a temporary image is required (e.g. may appear momentarily prior to load of a camera snapshot in the `camera` mode). Note that a `_t=[timestsamp]` query parameter will be automatically added to all URLs such that the image will not be cached by the browser. | +| Option | Default | Description | +| ------------------- | ------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `actions` | | [Actions](actions/README.md) to use for the `image` view. | +| `entity` | | The entity to use when `mode` is set to `entity`. This entity is expected to have an `entity_picture` attribute that specifies the image URL. | +| `entity_parameters` | | Optional URL parameters to add to the URL generated for entity-based modes (i.e. when `mode` is `camera` or `entity`). | +| `mode` | `auto` | Value must be one of `url` (to fetch an arbitrary image URL), `camera` (to show a still of the currently selected camera entity using either `camera_entity` or `webrtc_card.entity` in that order of precedence), `entity` to show an image associated with a named entity (see the `entity` parameter below), or `screensaver` (to show an [embedded image](https://github.com/dermotduffy/advanced-camera-card/blob/main/src/images/iris-screensaver.jpg)). If `auto`, the mode is chosen automatically based on whether `url` or `entity` parameters have been specified. | +| `refresh_seconds` | 1 | The image will be refreshed at least every `refresh_seconds` (it may refresh more frequently, e.g. whenever Home Assistant updates its camera security token). `0` implies no refreshing. | +| `url` | | A static image URL to be used when the `mode` is set to `url` or when a temporary image is required (e.g. may appear momentarily prior to load of a camera snapshot in the `camera` mode). Note that a `_t=[timestsamp]` query parameter will be automatically added to all URLs such that the image will not be cached by the browser. | ?> When `mode` is set to `camera` this is effectively providing the same image as the `image` [live provider](cameras/live-provider.md) would show in the live camera carousel. diff --git a/docs/configuration/menu.md b/docs/configuration/menu.md index 43e615d9..bf74de25 100644 --- a/docs/configuration/menu.md +++ b/docs/configuration/menu.md @@ -36,9 +36,9 @@ menu: | `display_mode` | The `display_mode` button allows changing between single and grid views. | | `download` | The `download` menu button: allow direct download of the media being displayed. | | `expand` | The `expand` menu button: expand the card into a popup/dialog. | -| `frigate` | The `Frigate` menu button: brings the user to the default configured view (`view.default`), or collapses/expands the menu if the `menu.style` is `hidden` . | | `fullscreen` | The `fullscreen` menu button: expand the card to consume the fullscreen. Please note that fullscreen behavior on iPhone is limited, see [troubleshooting](../troubleshooting.md?id=fullscreen-doesn39t-work-on-iphone). | | `image` | The `image` view menu button: brings the user to the static `image` view. | +| `iris` | The main Advanced Camera Card `iris` menu button: brings the user to the default configured view (`view.default`), or collapses/expands the menu if the `menu.style` is `hidden` . | | `live` | The `live` view menu button: brings the user to the `live` view. | | `media_player` | The `media_player` menu button: sends the visible media to a remote media player. Supports Frigate clips, snapshots and live camera (only for cameras that specify a `camera_entity` and only using the default HA stream (equivalent to the `ha` live provider)). `jsmpeg` or `webrtc-card` are not supported, although live can still be played as long as `camera_entity` is specified. In the player list, a `tap` will send the media to the player, a `hold` will stop the media on the player. | | `microphone` | The `microphone` button allows usage of 2-way audio in certain configurations. See [Using 2-way audio](../usage/2-way-audio.md). | @@ -51,26 +51,26 @@ menu: ### Options for each button -| Option | Default | Description | -| ----------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `alignment` | `matching` | Whether this menu item should have an alignment that is `matching` the menu alignment or `opposing` the menu alignment. Can be used to create two separate groups of buttons on the menu. The `priority` option orders buttons within a given `alignment`. | -| `enabled` | `true` for `frigate`, `cameras`, `substreams`, `live`, `clips`, `snapshots`, `timeline`, `download`, `camera_ui`, `fullscreen`, `media_player`, `display_mode` and `ptz_home`. `false` for `image`, `expand`, `microphone`, `mute`, `play`, `recordings`, `screenshot`, `ptz_controls` | Whether or not to show the button. | -| `icon` | | An icon to overriding the default for that button, e.g. `mdi:camera-front`. See also [custom icons](../usage/custom-icons.md). | -| `permanent` | `false` | If `false` the menu item is hidden when the menu has the `hidden` style and the menu is closed, otherwise it is shown (and sorted to the front). | -| `priority` | `50` | The menu item priority. Higher priority items are ordered closer to the start of the menu alignment (i.e. a button with priority `70` will order further to the left than a button with priority `60`). Priority applies separately to `matching` and `opposing` groups (see `alignment` above). Minimum `0`, maximum `100`. | +| Option | Default | Description | +| ----------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `alignment` | `matching` | Whether this menu item should have an alignment that is `matching` the menu alignment or `opposing` the menu alignment. Can be used to create two separate groups of buttons on the menu. The `priority` option orders buttons within a given `alignment`. | +| `enabled` | `true` for `iris`, `cameras`, `substreams`, `live`, `clips`, `snapshots`, `timeline`, `download`, `camera_ui`, `fullscreen`, `media_player`, `display_mode` and `ptz_home`. `false` for `image`, `expand`, `microphone`, `mute`, `play`, `recordings`, `screenshot`, `ptz_controls` | Whether or not to show the button. | +| `icon` | | An icon to overriding the default for that button, e.g. `mdi:camera-front`. See also [custom icons](../usage/custom-icons.md). | +| `permanent` | `false` | If `false` the menu item is hidden when the menu has the `hidden` style and the menu is closed, otherwise it is shown (and sorted to the front). | +| `priority` | `50` | The menu item priority. Higher priority items are ordered closer to the start of the menu alignment (i.e. a button with priority `70` will order further to the left than a button with priority `60`). Priority applies separately to `matching` and `opposing` groups (see `alignment` above). Minimum `0`, maximum `100`. | ## `style` This card supports several menu styles. -| Key | Description | Screenshot | -| ------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------- | -| `hidden` | Hide the menu by default. It may be toggled open as needed. | ![](../images/menu-mode-hidden.png 'Menu hidden :size=400') | -| `hover-card` | Overlay the menu over the card contents when the mouse is over the **card**, otherwise it is not shown. The Frigate button shows the default view. | ![](../images/menu-mode-overlay.png 'Menu hover-card :size=400') | -| `hover` | Overlay the menu over the card contents when the mouse is over the **menu**, otherwise it is not shown. The Frigate button shows the default view. | ![](../images/menu-mode-overlay.png 'Menu hover :size=400') | -| `none` | No menu is shown. | ![](../images/menu-mode-none.png 'No menu :size=400') | -| `outside` | Render the menu outside the card (i.e. above it if `position` is `top`, or below it if `position` is `bottom`). The Frigate button shows the default view. | ![](../images/menu-mode-above.png 'Menu outside :size=400') | -| `overlay` | Overlay the menu over the card contents. The Frigate button shows the default view. | ![](../images/menu-mode-overlay.png 'Menu hidden :size=400') | +| Key | Description | Screenshot | +| ------------ | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------- | +| `hidden` | Hide the menu by default. It may be toggled open as needed with the `iris` button. | ![](../images/menu-mode-hidden.png 'Menu hidden :size=400') | +| `hover-card` | Overlay the menu over the card contents when the mouse is over the **card**, otherwise it is not shown. The `iris` button shows the default view. | ![](../images/menu-mode-overlay.png 'Menu hover-card :size=400') | +| `hover` | Overlay the menu over the card contents when the mouse is over the **menu**, otherwise it is not shown. The `iris` button shows the default view. | ![](../images/menu-mode-overlay.png 'Menu hover :size=400') | +| `none` | No menu is shown. | ![](../images/menu-mode-none.png 'No menu :size=400') | +| `outside` | Render the menu outside the card (i.e. above it if `position` is `top`, or below it if `position` is `bottom`). The `iris` button shows the default view. | ![](../images/menu-mode-above.png 'Menu outside :size=400') | +| `overlay` | Overlay the menu over the card contents. The `iris` button shows the default view. | ![](../images/menu-mode-overlay.png 'Menu hidden :size=400') | ## Fully expanded reference @@ -80,13 +80,11 @@ This card supports several menu styles. menu: alignment: left buttons: - frigate: + iris: priority: 50 enabled: true alignment: matching - # Default icon is an internal coded Frigate icon. Note - # absence of 'mdi' here (mdi has no Frigate icon). - icon: frigate + icon: iris cameras: priority: 50 enabled: true diff --git a/docs/configuration/profiles.md b/docs/configuration/profiles.md index 4baa2cd7..aca95c29 100644 --- a/docs/configuration/profiles.md +++ b/docs/configuration/profiles.md @@ -39,13 +39,13 @@ Principles used in the selection of options set by `low-performance` profile mod - Get 'out of the box' performance similar to the basic "Home Assistant Picture Glance" card. - Do not break the visual aesthetic of the card. -See the [source code](https://github.com/dermotduffy/frigate-hass-card/blob/main/src/config/profiles/low-performance.ts) for an exhaustive list of defaults set by this profile. +See the [source code](https://github.com/dermotduffy/advanced-camera-card/blob/main/src/config/profiles/low-performance.ts) for an exhaustive list of defaults set by this profile. ## `scrubbing` Configures the `live` view and media viewer to allow media "scrubbing" as the timeline is dragged back and forth. -See the [source code](https://github.com/dermotduffy/frigate-hass-card/blob/main/src/config/profiles/scrubbing.ts) for an exhaustive list of options set by this profile. +See the [source code](https://github.com/dermotduffy/advanced-camera-card/blob/main/src/config/profiles/scrubbing.ts) for an exhaustive list of options set by this profile. ## Fully expanded reference diff --git a/docs/configuration/view.md b/docs/configuration/view.md index 645b7b10..6ef695ef 100644 --- a/docs/configuration/view.md +++ b/docs/configuration/view.md @@ -7,20 +7,20 @@ view: # [...] ``` -| Option | Default | Description | -| ------------------------- | --------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `actions` | | [Actions](actions/README.md) to use for all views, individual actions may be overriden by view-specific actions. | -| `camera_select` | `current` | The [view](view.md?id=supported-views) to show when a new camera is selected (e.g. in the camera menu). If `current` the view is unchanged when a new camera is selected. | -| `dim` | `false` | Whether or not to 'dim' the brightness of the card (by 25%) if the card `interaction_seconds` has expired (i.e. card has been left unattended for that period of time). | -| `default` | `live` | The view to show in the card by default. The default camera is the first one listed. See [Supported Views](view.md?id=supported-views) below. | -| `default_reset` | | The circumstances and behavior that cause the card to reset to the default view. See below. | -| `interaction_seconds` | `300` | After a mouse/touch interaction with the card, it will be considered "interacted with" until this number of seconds elapses without further interaction. May be used as part of an [interaction condition](conditions.md?id=interaction) or with `reset_after_interaction` to reset the view after the interaction is complete. | -| `keyboard_shortcuts` | See [usage](../usage/keyboard-shortcuts.md) for defaults. | Configure keyboard shortcuts. See below. | -| `render_entities` | | **YAML only**: A list of entity ids that should cause the card to re-render 'in-place'. The view/camera is not changed. This should **very** rarely be needed, but could be useful if the card is both setting and changing HA state of the same object as could be the case for some complex `card_mod` scenarios ([example](https://github.com/dermotduffy/frigate-hass-card/issues/343)). | -| `reset_after_interaction` | `true` | If `true` the card will reset to the default configured view (i.e. 'screensaver' functionality) after `interaction_seconds` has elapsed after user interaction. | -| `theme` | | How the card is themed. See below. | -| `triggers` | | How to react when a camera is [triggered](cameras/README.md?id=triggers). | -| `default_cycle_camera` | `false` | When set to `true` the selected camera is cycled on each default view change. | +| Option | Default | Description | +| ------------------------- | --------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `actions` | | [Actions](actions/README.md) to use for all views, individual actions may be overriden by view-specific actions. | +| `camera_select` | `current` | The [view](view.md?id=supported-views) to show when a new camera is selected (e.g. in the camera menu). If `current` the view is unchanged when a new camera is selected. | +| `dim` | `false` | Whether or not to 'dim' the brightness of the card (by 25%) if the card `interaction_seconds` has expired (i.e. card has been left unattended for that period of time). | +| `default` | `live` | The view to show in the card by default. The default camera is the first one listed. See [Supported Views](view.md?id=supported-views) below. | +| `default_reset` | | The circumstances and behavior that cause the card to reset to the default view. See below. | +| `interaction_seconds` | `300` | After a mouse/touch interaction with the card, it will be considered "interacted with" until this number of seconds elapses without further interaction. May be used as part of an [interaction condition](conditions.md?id=interaction) or with `reset_after_interaction` to reset the view after the interaction is complete. | +| `keyboard_shortcuts` | See [usage](../usage/keyboard-shortcuts.md) for defaults. | Configure keyboard shortcuts. See below. | +| `render_entities` | | **YAML only**: A list of entity ids that should cause the card to re-render 'in-place'. The view/camera is not changed. This should **very** rarely be needed, but could be useful if the card is both setting and changing HA state of the same object as could be the case for some complex `card_mod` scenarios ([example](https://github.com/dermotduffy/advanced-camera-card/issues/343)). | +| `reset_after_interaction` | `true` | If `true` the card will reset to the default configured view (i.e. 'screensaver' functionality) after `interaction_seconds` has elapsed after user interaction. | +| `theme` | | How the card is themed. See below. | +| `triggers` | | How to react when a camera is [triggered](cameras/README.md?id=triggers). | +| `default_cycle_camera` | `false` | When set to `true` the selected camera is cycled on each default view change. | ## `default_reset` @@ -87,15 +87,15 @@ Configure the theming/colors applied to the card. | `dark` | Use a dark theme that is identical to the HA dark theme. | | `ha` | Uses HA-prescribed theming. Respects HA choice of dark or light colors. | | `light` | Use a light theme that is similar to the HA light theme (there are some differences if you do not use the standard choices of primary color). | -| `traditional` | A theme based on the default Frigate card theme before full theming support was added. Respects HA color theme choices. | +| `traditional` | A theme based on the default Advanced Camera Card theme before full theming support was added. Respects HA color theme choices. | ### `overrides` Allows overriding of any CSS value, can be used to tweak theming parameters. -| Option | Description | -| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------ | -| Any CSS key. Overriding the [Frigate Card](https://github.com/dermotduffy/frigate-hass-card/tree/main/src/scss/themes/base.scss) CSS variables allows changing individual theming paramters, e.g. `--frigate-card-menu-override-background` | Any CSS value, e.g. `red` or `rgba(10, 11, 12, 0.64)`. | +| Option | Description | +| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------ | +| Any CSS key. Overriding the [Advanced Camera Card](https://github.com/dermotduffy/advanced-camera-card/tree/main/src/scss/themes/base.scss) CSS variables allows changing individual theming paramters, e.g. `--advanced-camera-card-menu-override-background` | Any CSS value, e.g. `red` or `rgba(10, 11, 12, 0.64)`. | ## `triggers` @@ -199,8 +199,8 @@ view: themes: - ha overrides: - '--frigate-card-menu-button-active-color': red - '--frigate-card-menu-position-left-style-overlay-alignment-left-background': pink + '--advanced-camera-card-menu-button-active-color': red + '--advanced-camera-card-menu-position-left-style-overlay-alignment-left-background': pink actions: entity: light.office_main_lights tap_action: diff --git a/docs/developing.md b/docs/developing.md index 9702f1a6..097525eb 100644 --- a/docs/developing.md +++ b/docs/developing.md @@ -1,6 +1,6 @@ # Developing -?> Want to contribute? Development help [**welcome**](https://github.com/dermotduffy/frigate-hass-card/issues/1248)! +?> Want to contribute? Development help [**welcome**](https://github.com/dermotduffy/advanced-camera-card/issues/1248)! ## Building @@ -13,13 +13,13 @@ However, if you are not using Volta, you can check the `volta` key in the `package.json` to see which version of Node and Yarn should be used. ```sh -$ git clone https://github.com/dermotduffy/frigate-hass-card -$ cd frigate-hass-card +$ git clone https://github.com/dermotduffy/advanced-camera-card +$ cd advanced-camera-card $ yarn install $ yarn run build ``` -Resultant build entry file will be in `dist/frigate-hass-card.js`. This could be +Resultant build entry file will be in `dist/advanced-camera-card.js`. This could be installed via the [manual installation instructions](advanced-installation.md?id=manual-installation). @@ -38,7 +38,7 @@ Releases follow [Semantic Versioning](https://semver.org/) with the following de ### Manual Releases 1. Merge a PR that contains only a `package.json` version number bump. -1. Go to the [releases page](https://github.com/dermotduffy/frigate-hass-card/releases). +1. Go to the [releases page](https://github.com/dermotduffy/advanced-camera-card/releases). 1. A release draft will automatically have been created, click 'Edit'. 1. Use the same version number for the release title and tag. 1. Choose 'This is a pre-release' for a beta version. @@ -46,14 +46,14 @@ Releases follow [Semantic Versioning](https://semver.org/) with the following de ## Translations -[![translation badge](https://badge.inlang.com/?url=github.com/dermotduffy/frigate-hass-card)](https://fink.inlang.com/github.com/dermotduffy/frigate-hass-card?ref=badge) +[![translation badge](https://badge.inlang.com/?url=github.com/dermotduffy/advanced-camera-card)](https://fink.inlang.com/github.com/dermotduffy/advanced-camera-card?ref=badge) To add translations, you can manually edit the JSON translation files in `src/localize/languages` or use the [inlang](https://inlang.com/) online editor. ## Using a dev container -[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/dermotduffy/frigate-hass-card) +[![Open in Dev Containers](https://img.shields.io/static/v1?label=Dev%20Containers&message=Open&color=blue&logo=visualstudiocode)](https://vscode.dev/redirect?url=vscode://ms-vscode-remote.remote-containers/cloneInVolume?url=https://github.com/dermotduffy/advanced-camera-card) You can use the [VS Code Dev Containers](https://code.visualstudio.com/docs/remote/containers) extension to speed up the development environment creation. Simply: diff --git a/docs/examples.md b/docs/examples.md index 12f4c748..377dc77c 100644 --- a/docs/examples.md +++ b/docs/examples.md @@ -9,14 +9,14 @@ into fullscreen mode, **except** when the view is `live` in which case the office lights are toggled. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office view: actions: double_tap_action: - action: custom:frigate-card-action - frigate_card_action: fullscreen + action: custom:advanced-camera-card-action + advanced_camera_card_action: fullscreen live: actions: entity: light.office_main_lights @@ -27,7 +27,7 @@ live: ## Aspect ratios ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office dimensions: @@ -44,7 +44,7 @@ card is put in fullscreen mode, and turn off the substream when exiting fullscreen mode. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: image @@ -63,11 +63,11 @@ automations: - condition: fullscreen fullscreen: true actions: - - action: custom:frigate-card-action - frigate_card_action: live_substream_on + - action: custom:advanced-camera-card-action + advanced_camera_card_action: live_substream_on actions_not: - - action: custom:frigate-card-action - frigate_card_action: live_substream_off + - action: custom:advanced-camera-card-action + advanced_camera_card_action: live_substream_off ``` ### Responding to key input @@ -85,14 +85,14 @@ automations: key: z alt: true actions: - - action: custom:frigate-card-action - frigate_card_action: live - - action: custom:frigate-card-action - frigate_card_action: sleep + - action: custom:advanced-camera-card-action + advanced_camera_card_action: live + - action: custom:advanced-camera-card-action + advanced_camera_card_action: sleep duration: s: 5 - - action: custom:frigate-card-action - frigate_card_action: clips + - action: custom:advanced-camera-card-action + advanced_camera_card_action: clips ``` #### Change to `live` while key _held_ down @@ -106,11 +106,11 @@ automations: key: z alt: true actions: - - action: custom:frigate-card-action - frigate_card_action: live + - action: custom:advanced-camera-card-action + advanced_camera_card_action: live actions_not: - - action: custom:frigate-card-action - frigate_card_action: clips + - action: custom:advanced-camera-card-action + advanced_camera_card_action: clips ``` ## Cameras @@ -120,7 +120,7 @@ automations: In this example, there is no Home Assistant entity linked to the camera, just a `frigate` camera name: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - frigate: camera_name: office @@ -132,7 +132,7 @@ cameras: In this example, there is no Home Assistant entity linked to the camera, just a `go2rtc` stream. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - live_provider: go2rtc go2rtc: @@ -158,12 +158,12 @@ Elements state label](https://www.home-assistant.io/lovelace/picture-elements/#state-label). ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office card_mod: style: - frigate-card-elements $: + advanced-camera-card-elements $: hui-state-label-element $: | div { padding: 0px !important; @@ -173,12 +173,12 @@ card_mod: ## Cast a `dashboard` -This example will configure a Frigate card that can cast a dashboard view to a media player, which has a second Frigate card in panel mode with a low-latency live provider. +This example will configure an Advanced Camera Card that can cast a dashboard view to a media player, which has a second Advanced Camera Card in panel mode with a low-latency live provider. ### Source card ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: image @@ -194,7 +194,7 @@ cameras: ?> This dashboard is configured at the path `/cast/` (path referred to in `dashboard_path` above). ```yaml -title: Frigate Card Casting +title: Advanced Camera Card Casting views: - title: Casting # This path is referred to in `view_path` above. @@ -202,7 +202,7 @@ views: # Ensure the video is "maximized" / dashboard in "panel" mode. type: panel cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: go2rtc @@ -212,15 +212,15 @@ views: You can restrict elements to only show for certain [views](configuration/view.md?id=supported-views) using a -`custom:frigate-card-conditional` element. This example shows a car icon that +`custom:advanced-camera-card-conditional` element. This example shows a car icon that calls a service but only in the `live` view. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: - - type: custom:frigate-card-conditional + - type: custom:advanced-camera-card-conditional conditions: - condition: view views: @@ -248,7 +248,7 @@ You can have icons conditionally added to the menu based on entity state. ### Show a menu icon based on state ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: @@ -258,7 +258,7 @@ elements: entity: light.office_main_lights state: on elements: - - type: custom:frigate-card-menu-state-icon + - type: custom:advanced-camera-card-menu-state-icon entity: light.office tap_action: action: toggle @@ -269,13 +269,13 @@ elements: This example adds a menu button to optionally activate a siren when the camera is triggered. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: - - type: custom:frigate-card-conditional + - type: custom:advanced-camera-card-conditional elements: - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:alarm-bell title: Activate alarm style: @@ -308,7 +308,7 @@ events with the `birdseye` camera (since it will not have events of its own). This example shows events for two other cameras when `birdseye` is selected. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office - camera_entity: camera.kitchen @@ -326,7 +326,7 @@ This example shows events for _all_ other cameras when `birdseye` is selected. This is just a shortcut for naming all other cameras. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.kitchen - camera_entity: camera.sitting_room @@ -342,7 +342,7 @@ This example will automatically use a HD live substream when the mouse cursor interacts with the card. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: image @@ -356,11 +356,11 @@ cameras: - substream automations: - actions: - - action: custom:frigate-card-action - frigate_card_action: live_substream_on + - action: custom:advanced-camera-card-action + advanced_camera_card_action: live_substream_on actions_not: - - action: custom:frigate-card-action - frigate_card_action: live_substream_off + - action: custom:advanced-camera-card-action + advanced_camera_card_action: live_substream_off conditions: - condition: interaction interaction: true @@ -373,7 +373,7 @@ These examples change how the media fits and is positioned within the card dimen ### Stretch a camera into a 4:4 square ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.landing dimensions: @@ -387,7 +387,7 @@ cameras: Take the left-hand side (position with x == `0`) and use that as the basis of a `9:16` (i.e. portrait) live view. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office dimensions: @@ -404,7 +404,7 @@ This example moves the fullscreen button into its own group aligned to the `left`, enables the `image` button and orders it furthest to the `right`. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office menu: @@ -423,15 +423,15 @@ You can add custom icons to the menu with arbitrary actions. This example adds an icon that navigates the browser to the releases page for this card: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:book tap_action: action: url - url_path: https://github.com/dermotduffy/frigate-hass-card/releases + url_path: https://github.com/dermotduffy/advanced-camera-card/releases ``` ## Menu state icons @@ -442,11 +442,11 @@ of the `light.office_main_lights` entity, that toggles the light on double click. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: - - type: custom:frigate-card-menu-state-icon + - type: custom:advanced-camera-card-menu-state-icon entity: light.office_main_lights tap_action: action: toggle @@ -454,21 +454,21 @@ elements: ## Multiple actions -This example shows how to configure multiple actions for a single Frigate card user interaction, in this case both selecting a different camera and changing the view on `tap`. Note that multiple actions are not supported on stock Picture Elements, see [actions](configuration/actions/README.md) for more information. +This example shows how to configure multiple actions for a single Advanced Camera Card user interaction, in this case both selecting a different camera and changing the view on `tap`. Note that multiple actions are not supported on stock Picture Elements, see [actions](configuration/actions/README.md) for more information. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: - - type: custom:frigate-card-menu-icon + - type: custom:advanced-camera-card-menu-icon icon: mdi:chair-rolling tap_action: - - action: custom:frigate-card-action - frigate_card_action: camera_select + - action: custom:advanced-camera-card-action + advanced_camera_card_action: camera_select camera: camera.office - - action: custom:frigate-card-action - frigate_card_action: live + - action: custom:advanced-camera-card-action + advanced_camera_card_action: live ``` ## Multiple providers @@ -478,7 +478,7 @@ to provide a separate unambiguous way of referring to that camera, since the `camera_entity` is shared between the two cameras). ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: jsmpeg @@ -496,7 +496,7 @@ You can override card configuration when certain [conditions](configuration/cond ### Change menu position based on HA state ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office overrides: @@ -519,7 +519,7 @@ ask the card to trigger a card update based on that entity -- which causes it to use the new overriden default immediately. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office view: @@ -543,7 +543,7 @@ This example will always render 5 columns in fullscreen mode in both the live and media viewer views, and will not enlarge the selected item. The [normal auto-layout behavior](configuration/grid-layout-algorithm.md) will be used outside of fullscreen mode. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office overrides: @@ -569,7 +569,7 @@ This example changes the menu style to `overlay` in expanded mode in order to take advantage of the extra horizontal space of the dialog/popup. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office menu: @@ -589,14 +589,14 @@ This example disables the menu unless the card is in fullscreen mode, and uses a card-wide action to enable fullscreen mode on `double_tap`. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office view: actions: double_tap_action: - action: custom:frigate-card-action - frigate_card_action: fullscreen + action: custom:advanced-camera-card-action + advanced_camera_card_action: fullscreen overrides: - conditions: - condition: fullscreen @@ -611,7 +611,7 @@ overrides: This example removes a camera from the card when an entity is disabled (e.g. a switch controlling power to the camera). ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office - camera_entity: camera.kitchen @@ -629,7 +629,7 @@ overrides: This example disables the PTZ controls when the card is viewed on the Companion app: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office overrides: @@ -644,10 +644,11 @@ overrides: The card supports using PTZ controls to conveniently control pan, tilt and zoom for cameras. If you're using a Frigate camera, and Frigate itself shows PTZ -controls, this should work straight out of the box without any extra configuration: +controls, this should work straight out of the box without any extra +configuration: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office ``` @@ -657,7 +658,7 @@ controls on your camera but Home Assistant does, you can still manually configure actions for the card to perform for each PTZ control: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office ptz: @@ -677,7 +678,7 @@ These examples show altering the card configuration based on device or viewport ### Change menu position when orientation changes ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office - camera_entity: camera.kitchen @@ -695,7 +696,7 @@ overrides: ### Hide menu & controls when viewport width <= 300 (e.g. PIP mode) ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office - camera_entity: camera.kitchen @@ -720,7 +721,7 @@ You can add a state badge to the card showing arbitrary entity states. This example adds a state badge showing the temperature and hides the label text: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: @@ -740,7 +741,7 @@ elements: This example fetches a static image every 10 seconds (in this case the latest image saved on the Frigate server for a given camera). ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office view: @@ -757,7 +758,7 @@ image: This example disables the status bar. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office status_bar: @@ -771,7 +772,7 @@ This example shows an icon and a message on the status bar when a camera is trig ![Dynamic Status Messages](images/dynamic-status.gif 'Dynamic Status Messages :size=400') ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office automations: @@ -780,21 +781,21 @@ automations: triggered: - camera.office actions: - - action: custom:frigate-card-action - frigate_card_action: status_bar + - action: custom:advanced-camera-card-action + advanced_camera_card_action: status_bar status_bar_action: add items: - - type: custom:frigate-card-status-bar-icon + - type: custom:advanced-camera-card-status-bar-icon icon: mdi:alarm-light exclusive: true - - type: custom:frigate-card-status-bar-string + - type: custom:advanced-camera-card-status-bar-string string: Intruder detected! expand: true exclusive: true sufficient: true actions_not: - - action: custom:frigate-card-action - frigate_card_action: status_bar + - action: custom:advanced-camera-card-action + advanced_camera_card_action: status_bar status_bar_action: reset ``` @@ -805,11 +806,11 @@ You can add submenus to the menu -- buttons that when pressed reveal a dropdown ### Basic submenu ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: - - type: custom:frigate-card-menu-submenu + - type: custom:advanced-camera-card-menu-submenu icon: mdi:menu items: - title: Lights @@ -825,8 +826,8 @@ elements: - title: Fullscreen icon: mdi:fullscreen tap_action: - action: custom:frigate-card-action - frigate_card_action: fullscreen + action: custom:advanced-camera-card-action + advanced_camera_card_action: fullscreen ``` ### Conditional submenu @@ -834,17 +835,17 @@ elements: This example shows submenus conditional on the camera selected. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: - - type: custom:frigate-card-conditional + - type: custom:advanced-camera-card-conditional conditions: - condition: camera cameras: - camera.office elements: - - type: custom:frigate-card-menu-submenu + - type: custom:advanced-camera-card-menu-submenu icon: mdi:door items: - title: Office Lights @@ -852,13 +853,13 @@ elements: entity: light.office_main_lights tap_action: action: toggle - - type: custom:frigate-card-conditional + - type: custom:advanced-camera-card-conditional conditions: - condition: camera cameras: - camera.kitchen elements: - - type: custom:frigate-card-menu-submenu + - type: custom:advanced-camera-card-menu-submenu icon: mdi:sofa items: - title: Kitchen Lights @@ -890,22 +891,22 @@ input_select: The following will convert this entity into a submenu: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: - - type: custom:frigate-card-menu-submenu-select + - type: custom:advanced-camera-card-menu-submenu-select entity: input_select.office_scene ``` To override 1 or more individual options (e.g. to set custom icons and titles) ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: - - type: custom:frigate-card-menu-submenu-select + - type: custom:advanced-camera-card-menu-submenu-select icon: mdi:lamps entity: input_select.office_scene options: @@ -925,7 +926,7 @@ camera through the use of [camera dependencies](configuration/cameras/README.md? This example shows two substreams for a single live camera, and uses the 'HD' icon. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: image @@ -948,11 +949,11 @@ menu: ## Trigger actions -You can control the card itself with the `custom:frigate-card-action` action. +You can control the card itself with the `custom:advanced-camera-card-action` action. This example shows an icon that toggles the card fullscreen mode. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office elements: @@ -962,8 +963,8 @@ elements: left: 40px top: 40px tap_action: - action: custom:frigate-card-action - frigate_card_action: fullscreen + action: custom:advanced-camera-card-action + advanced_camera_card_action: fullscreen ``` ## Trigger fullscreen @@ -999,7 +1000,7 @@ action: size: wide timeout: 15000 content: - type: custom:frigate-card + type: custom:advanced-camera-card aspect_ratio: 55% cameras: - camera_entity: camera.frontdoor @@ -1023,7 +1024,7 @@ trigger conditions per camera. It will change back to the `default` view when untriggered. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: # This is a Frigate camera which will automatically # be triggered when events occur. @@ -1051,7 +1052,7 @@ view: Disable the stock video controls and add menu button equivalents. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live: @@ -1076,27 +1077,27 @@ The card can respond to actions in the query string. See [URL Actions](usage/url ### Choosing `clips` view on a named card -This example assumes that one card (of potentially multiple Frigate Cards on the dashboard) is configured with a `card_id` parameter: +This example assumes that one card (of potentially multiple Advanced Camera Cards on the dashboard) is configured with a `card_id` parameter: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office card_id: main ``` ```text -https://ha.mydomain.org/lovelace-test/0?frigate-card-action.main.clips +https://ha.mydomain.org/lovelace-test/0?advanced_camera_card_action-action.main.clips ``` ### Choosing the camera from a separate picture elements card In this example, the card will select a given camera when the user navigates from a _separate_ Picture Elements card: -Frigate Card configuration: +Advanced Camera Card configuration: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office - camera_entity: camera.kitchen @@ -1115,7 +1116,7 @@ elements: left: 30% tap_action: action: navigate - navigation_path: /lovelace-test/0?frigate-card-action.camera_select=camera.office + navigation_path: /lovelace-test/0?advanced_camera_card_action-action.camera_select=camera.office - type: icon icon: mdi:cctv style: @@ -1123,7 +1124,7 @@ elements: left: 42% tap_action: action: navigate - navigation_path: /lovelace-test/0?frigate-card-action.camera_select=camera.kitchen + navigation_path: /lovelace-test/0?advanced_camera_card_action-action.camera_select=camera.kitchen ``` ![Taking card actions via the URL](images/navigate-picture-elements.gif 'Taking card actions via the URL :size=400') @@ -1131,13 +1132,13 @@ elements: ### Selecting a camera in expanded mode via query string ```text -https://ha.mydomain.org/lovelace-test/0?frigate-card-action.camera_select=kitchen&frigate-card-action.expand +https://ha.mydomain.org/lovelace-test/0?advanced_camera_card_action-action.camera_select=kitchen&advanced_camera_card_action-action.expand ``` ## WebRTC Card configuration ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: webrtc-card @@ -1152,7 +1153,7 @@ cameras: This example changes the default [zoom/pan settings for a camera](./configuration/cameras/README.md?id=layout-configuration) to always zoom in on a given area: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office dimensions: @@ -1168,7 +1169,7 @@ cameras: This example prevents zooming on the media viewer but keeps it on in other views (e.g. `live` view): ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office dimensions: @@ -1186,7 +1187,7 @@ media_viewer: This example uses different settings for the media viewer and `live` view, by overriding the camera configuration: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office dimensions: @@ -1210,7 +1211,7 @@ overrides: This example automatically zooms in and out based on the state of an entity: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.living_room live_provider: go2rtc @@ -1222,8 +1223,8 @@ automations: entity: binary_sensor.door_contact state: 'on' actions: - - action: custom:frigate-card-action - frigate_card_action: ptz_digital + - action: custom:advanced-camera-card-action + advanced_camera_card_action: ptz_digital target_id: camera.living_room absolute: zoom: 4 @@ -1231,8 +1232,8 @@ automations: x: 38 y: 20 actions_not: - - action: custom:frigate-card-action - frigate_card_action: ptz_digital + - action: custom:advanced-camera-card-action + advanced_camera_card_action: ptz_digital target_id: camera.living_room ``` diff --git a/docs/images/advanced-camera-card.png b/docs/images/advanced-camera-card.png new file mode 100644 index 00000000..7c234da4 Binary files /dev/null and b/docs/images/advanced-camera-card.png differ diff --git a/docs/index.html b/docs/index.html index bc9cfc82..0f9bce14 100644 --- a/docs/index.html +++ b/docs/index.html @@ -2,9 +2,9 @@ - Frigate Card + Advanced Camera Card - + :root { --content-max-width: 95vw; + --cover-heading-font-size-max: 48; } .svg-icon { background-color: rgb(255, 255, 255); @@ -34,6 +35,9 @@ background: repeating-conic-gradient(#80808091 0% 25%, transparent 0% 50%) 50% / 4px 4px; } + #__sidebar img { + max-width: 100px; + } @@ -43,12 +47,13 @@ // Full reference: https://docsify.js.org/#/configuration // The repo to link to. - repo: 'dermotduffy/frigate-hass-card', + repo: 'dermotduffy/advanced-camera-card', // The overall documentation name. - name: 'Frigate Card', + name: 'Advanced Camera Card', - logo: 'images/icons/frigate.svg', + // The logo to show on the top of the sidebar. + logo: 'images/icons/iris.svg', // Automatically go to the top of a page on route change. auto2top: true, @@ -59,7 +64,7 @@ // Automatically use headings up to H2 for sider. subMaxLevel: 2, - // Show the Frigate Card cover page. + // Show the Advanced Camera Card cover page. coverpage: true, // Use relative links (this way both vscode and docsify work on clicking diff --git a/docs/rolling-back.md b/docs/rolling-back.md index 13014f89..ce4ebb64 100644 --- a/docs/rolling-back.md +++ b/docs/rolling-back.md @@ -13,6 +13,8 @@ There may be many versions of this card (see [release philosophy](./developing.m - Click "Download" - Reload your browser +[](./common/rename-hacs.md ':include') + ### Rolling Back Manually If you didn't use `HACS` to install the card, you're on your own to roll it diff --git a/docs/support.md b/docs/support.md index e32eeaf3..6de4863f 100644 --- a/docs/support.md +++ b/docs/support.md @@ -19,7 +19,7 @@ incrementally improve, and I think time is better spent working on reproducible issues or new features, than guessing what versions/options you are using. The new issue template asks for the minimum possible information to support you: -- **Diagnostics**: On the card, hold down the Default/Frigate menu button for a +- **Diagnostics**: On the card, hold down the Iris (default) menu button for a few seconds then paste the diagnostics into the issue between the backticks. - **Description of the problem**: I need to understand the issue in sufficient detail. @@ -44,7 +44,7 @@ fixes should be provided, or new features developed, is misunderstanding the fundamental dynamics of open source. I am sorry you feel this way, but open source software (including this card) is typically provided "as-is". Take it or leave it. If you want things to go faster / differently, [please -contribute](https://github.com/dermotduffy/frigate-hass-card/issues/1248). If +contribute](https://github.com/dermotduffy/advanced-camera-card/issues/1248). If you don't want to contribute to the shared codebase, fork it and make your own. Or pay for a (different) Enterprise grade solution to your problem. This is certainly not that -- a card, developed in hobbiest-level time, with diff --git a/docs/troubleshooting.md b/docs/troubleshooting.md index fab54452..fc4881dd 100644 --- a/docs/troubleshooting.md +++ b/docs/troubleshooting.md @@ -36,7 +36,7 @@ Debugging broken streams: ensure [you have configured Frigate accordingly](https://docs.frigate.video/configuration/live/#webrtc-extra-configuration). 1. Search for your symptoms on the [card issues - page](https://github.com/dermotduffy/frigate-hass-card/issues) and see if + page](https://github.com/dermotduffy/advanced-camera-card/issues) and see if you find any prior relevant discussions. If you're happy with just using an image stream but want the small circle to go @@ -81,7 +81,7 @@ live: disableGl: true ``` -[This bug](https://github.com/dermotduffy/frigate-hass-card/issues/191) has some +[This bug](https://github.com/dermotduffy/advanced-camera-card/issues/191) has some more discussion on this topic. New ideas to address this underlying limitation most welcome! @@ -97,7 +97,7 @@ by the card. Other browsers (e.g. Firefox, Safari) do not exhibit this behavior. For some slowly loading cameras, for which [Home Assistant stream preloading](https://www.home-assistant.io/integrations/camera/) is not enabled, Home Assistant may return a blank white image when asked for a still. These -stills are used during initial Frigate card load of the `live` view if the +stills are used during initial Advanced Camera Card load of the `live` view if the `live.show_image_during_load` option is enabled. Disabling this option should show the default media loading controls (e.g. a spinner or empty video player) instead of the blank white image. @@ -130,7 +130,7 @@ The Android video player swallows `double_tap` interactions in order to rewind or fast-forward. Workarounds: - Use `hold` instead of `double_tap` for your card-wide action. -- Use a [Frigate Card Element](configuration/elements/README.md) or menu icon to +- Use an [Advanced Camera Card Element](configuration/elements/README.md) or menu icon to trigger the action instead. ### Dragging in carousels broken in Firefox @@ -252,10 +252,10 @@ status_bar: [AlexxIT's WebRTC Card](https://github.com/AlexxIT/WebRTC) which is embedded by the `webrtc_card` live provider internally disconnects the stream when the -browser tab is changed (regardless of any Frigate card configuration settings, +browser tab is changed (regardless of any Advanced Camera Card configuration settings, e.g. `lazy_unload`). To allow the stream to continue running in the background, pass the `background` argument to the `webrtc_card` live provider as shown -below. This effectively allows the Frigate card to decide whether or not to +below. This effectively allows the Advanced Camera Card to decide whether or not to unload the stream. ```yaml diff --git a/docs/usage/2-way-audio.md b/docs/usage/2-way-audio.md index f0877132..ed26cd3c 100644 --- a/docs/usage/2-way-audio.md +++ b/docs/usage/2-way-audio.md @@ -23,7 +23,7 @@ challenging. ## Example configuration ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: go2rtc diff --git a/docs/usage/casting.md b/docs/usage/casting.md index 8a92b5d3..75404b93 100644 --- a/docs/usage/casting.md +++ b/docs/usage/casting.md @@ -3,7 +3,7 @@ This card allows casting a camera stream to a Google Cast device. You can enable the cast button with: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: go2rtc @@ -21,7 +21,7 @@ There are two different casting methods for cameras: `standard` and `dashboard` This is the default casting method. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: go2rtc @@ -41,7 +41,7 @@ The main disadvantage of this method is that the stream will be played through H This method is powered by [Home Assistant Cast](https://cast.home-assistant.io) and requires additional configuration, but allows **low latency streaming** with go2rtc. ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: go2rtc @@ -68,7 +68,7 @@ For the example above to work, a dashboard with `dashboard-cast` URL must exist: ![image](https://github.com/user-attachments/assets/67f0e145-df05-412a-8c6d-897feb5439d2) -Within that dashboard, create an `office` view and finally within that view you can place the Frigate card configured for that camera for a proper full-screen casting experience: +Within that dashboard, create an `office` view and finally within that view you can place the Advanced Camera Card configured for that camera for a proper full-screen casting experience: ```yaml views: @@ -76,7 +76,7 @@ views: type: panel path: office cards: - - type: custom:frigate-card + - type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: go2rtc @@ -92,7 +92,7 @@ The `casting` profile pre-configures the card to be casted to a 16:9 screen (suc When casting to a Google Nest Hub, the following configuration can be used: ```yaml -type: custom:frigate-card +type: custom:advanced-camera-card cameras: - camera_entity: camera.office live_provider: go2rtc diff --git a/docs/usage/url-actions.md b/docs/usage/url-actions.md index 291a41da..bc683039 100644 --- a/docs/usage/url-actions.md +++ b/docs/usage/url-actions.md @@ -1,12 +1,12 @@ # URL Actions -It is possible to pass the Frigate card one or more +It is possible to pass the Advanced Camera Card one or more [actions](../configuration/actions/README.md) from the URL (e.g. select a particular camera, open the live view in expanded mode, etc). ### When actions are executed -The Frigate card will execute these actions in the following circumstances: +The Advanced Camera Card will execute these actions in the following circumstances: - On initial card load. - On 'tab' change in a dashboard. @@ -17,28 +17,30 @@ The Frigate card will execute these actions in the following circumstances: ## Instructions -To send an action to _all_ Frigate Cards on a dashboard: +To send an action to _all_ Advanced Camera Cards on a dashboard: ``` -[PATH_TO_YOUR_HA_DASHBOARD]?frigate-card-action.[ACTION]=[VALUE] +[PATH_TO_YOUR_HA_DASHBOARD]?advanced-camera-card-action.[ACTION]=[VALUE] ``` -To send an action to a specific named Frigate Card: +To send an action to a specific named Advanced Camera Card: ``` -[PATH_TO_YOUR_HA_DASHBOARD]?frigate-card-action.[CARD_ID].[ACTION]=[VALUE] +[PATH_TO_YOUR_HA_DASHBOARD]?advanced-camera-card-action.[CARD_ID].[ACTION]=[VALUE] ``` +?> For backwards compatibility, the card will also respond to `frigate-card-action` as a query-parameter with the same syntax. + | Parameter | Description | | --------- | ------------------------------------------------------------------------------------------------- | -| `ACTION` | One of the supported Frigate Card custom actions. See below. | +| `ACTION` | One of the supported Advanced Camera Card custom actions. See below. | | `CARD_ID` | When specified only cards that have a [`card_id`](../configuration/README.md) parameter will act. | | `VALUE` | An optional value to use with the `camera_select` and `live_substream_select` actions. | ?> Both `.` and `:` may be used as the delimiter. If you use `:` some browsers may require it be escaped to `%3A`. -!> If a dashboard has multiple Frigate cards on it, even if they are on +!> If a dashboard has multiple Advanced Camera Cards on it, even if they are on different 'tabs' within that dashboard, they will all respond to the actions unless the action is targeted with a `CARD_ID` as shown above. @@ -59,16 +61,16 @@ Only a subset of all [actions](../configuration/actions/README.md) are supported | `image` | :white_check_mark: | | | `live_substream_select` | :white_check_mark: | | | `live` | :white_check_mark: | | -| `media_player` | :heavy_multiplication_x: | Please [request](https://github.com/dermotduffy/frigate-hass-card/issues) if you need this. | +| `media_player` | :heavy_multiplication_x: | Please [request](https://github.com/dermotduffy/advanced-camera-card/issues) if you need this. | | `menu_toggle` | :white_check_mark: | | | `microphone_connect`, `microphone_disconnect`, `microphone_mute`, `microphone_unmute` | :heavy_multiplication_x: | | | `mute`, `unmute` | :heavy_multiplication_x: | | | `play`, `pause` | :heavy_multiplication_x: | | -| `ptz` | :heavy_multiplication_x: | Please [request](https://github.com/dermotduffy/frigate-hass-card/issues) if you need this. | +| `ptz` | :heavy_multiplication_x: | Please [request](https://github.com/dermotduffy/advanced-camera-card/issues) if you need this. | | `recording` | :white_check_mark: | | | `recordings` | :white_check_mark: | | | `screenshot` | :heavy_multiplication_x: | Latest media information is not available on initial render. | -| `ptz_controls` | :heavy_multiplication_x: | Please [request](https://github.com/dermotduffy/frigate-hass-card/issues) if you need this. | +| `ptz_controls` | :heavy_multiplication_x: | Please [request](https://github.com/dermotduffy/advanced-camera-card/issues) if you need this. | | `snapshot` | :white_check_mark: | | | `snapshots` | :white_check_mark: | | diff --git a/hacs.json b/hacs.json index 34428673..ccbb4f5b 100644 --- a/hacs.json +++ b/hacs.json @@ -1,6 +1,6 @@ { - "name": "Frigate Card", + "name": "Advanced Camera Card", "render_readme": true, - "filename": "frigate-hass-card.js", + "filename": "advanced-camera-card.js", "homeassistant": "2022.3.0" } diff --git a/package.json b/package.json index be046ced..1befd109 100644 --- a/package.json +++ b/package.json @@ -1,8 +1,11 @@ { - "name": "frigate-hass-card", + "name": "advanced-camera-card", "version": "0.0.0-dev", - "description": "Frigate Lovelace Card for Home Assistant", + "description": "Advanced Camera Card for Home Assistant", "keywords": [ + "advanced", + "camera", + "card", "frigate", "home-assistant", "homeassistant", @@ -10,8 +13,8 @@ "lovelace" ], "type": "module", - "module": "frigate-hass-card.js", - "repository": "github:dermotduffy/frigate-hass-card", + "module": "advanced-camera-card.js", + "repository": "github:dermotduffy/advanced-camera-card", "author": "Dermot Duffy ", "license": "MIT", "dependencies": { @@ -149,7 +152,7 @@ { "assets": [ { - "path": "frigate-hass-card.zip", + "path": "advanced-camera-card.zip", "label": "Zip distribution" }, { @@ -163,7 +166,7 @@ "assignees": [ "dermotduffy" ], - "successComment": ":tada: This issue has been resolved in version ${nextRelease.version} :tada:\n\nSee: [GitHub release](https://github.com/dermotduffy/frigate-hass-card/releases/tag/${nextRelease.gitTag})", + "successComment": ":tada: This issue has been resolved in version ${nextRelease.version} :tada:\n\nSee: [GitHub release](https://github.com/dermotduffy/advanced-camera-card/releases/tag/${nextRelease.gitTag})", "releaseNameTemplate": "v${nextRelease.version}" } ] diff --git a/rollup.config.js b/rollup.config.js index ede62169..134d04df 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -60,7 +60,7 @@ const plugins = [ preventAssignment: true, values: { 'process.env.NODE_ENV': JSON.stringify(dev ? 'development' : 'production'), - __FRIGATE_CARD_RELEASE_VERSION__: + __ADVANCED_CAMERA_CARD_RELEASE_VERSION__: process.env.RELEASE_VERSION ?? (dev ? 'dev' : 'pkg'), }, }), @@ -72,6 +72,23 @@ const plugins = [ }), ]; +const outputEntryTemplate = { + entryFileNames: 'advanced-camera-card.js', + dir: 'dist', + chunkFileNames: (chunk) => { + // Add "lang-" to the front of the language chunk names for readability. + if ( + chunk.facadeModuleId && + chunk.facadeModuleId.match(/localize\/languages\/.*\.json/) + ) { + return 'lang-[name]-[hash].js'; + } + return '[name]-[hash].js'; + }, + format: 'es', + sourcemap: dev, +}; + /** * @type {import('rollup').RollupOptions} */ @@ -83,22 +100,15 @@ const config = { // the hacstag, causing a re-download of the same content and functionality // problems. preserveEntrySignatures: 'strict', - output: { - entryFileNames: 'frigate-hass-card.js', - dir: 'dist', - chunkFileNames: (chunk) => { - // Add "lang-" to the front of the language chunk names for readability. - if ( - chunk.facadeModuleId && - chunk.facadeModuleId.match(/localize\/languages\/.*\.json/) - ) { - return 'lang-[name]-[hash].js'; - } - return '[name]-[hash].js'; + output: [ + outputEntryTemplate, + + // Continue to include the old file name for backwards compatibility. + { + ...outputEntryTemplate, + entryFileNames: 'frigate-hass-card.js', }, - format: 'es', - sourcemap: dev, - }, + ], plugins: plugins, // These files use this at the toplevel, which causes rollup warning // spam on build: `this` has been rewritten to `undefined`. diff --git a/src/action-handler-directive.ts b/src/action-handler-directive.ts index 387654c2..dcd6744f 100644 --- a/src/action-handler-directive.ts +++ b/src/action-handler-directive.ts @@ -1,8 +1,8 @@ -import { fireEvent } from '@dermotduffy/custom-card-helpers'; import type { ActionHandlerDetail, ActionHandlerOptions, } from '@dermotduffy/custom-card-helpers'; +import { fireEvent } from '@dermotduffy/custom-card-helpers'; import { noChange } from 'lit'; import { AttributePart, @@ -18,10 +18,10 @@ interface ActionHandlerInterface extends HTMLElement { bind(element: Element, options): void; } interface ActionHandlerElement extends HTMLElement { - actionHandlerOptions?: FrigateCardActionHandlerOptions; + actionHandlerOptions?: AdvancedCameraCardActionHandlerOptions; } -interface FrigateCardActionHandlerOptions extends ActionHandlerOptions { +interface AdvancedCameraCardActionHandlerOptions extends ActionHandlerOptions { allowPropagation?: boolean; } @@ -56,7 +56,7 @@ class ActionHandler extends HTMLElement implements ActionHandlerInterface { public bind( element: ActionHandlerElement, - options?: FrigateCardActionHandlerOptions, + options?: AdvancedCameraCardActionHandlerOptions, ): void { if (element.actionHandlerOptions) { // Reset the options on an existing actionHandler. @@ -160,15 +160,15 @@ class ActionHandler extends HTMLElement implements ActionHandlerInterface { } } -customElements.define('action-handler-frigate-card', ActionHandler); +customElements.define('action-handler-advanced-camera-card', ActionHandler); const getActionHandler = (): ActionHandler => { const body = document.body; - if (body.querySelector('action-handler-frigate-card')) { - return body.querySelector('action-handler-frigate-card') as ActionHandler; + if (body.querySelector('action-handler-advanced-camera-card')) { + return body.querySelector('action-handler-advanced-camera-card') as ActionHandler; } - const actionhandler = document.createElement('action-handler-frigate-card'); + const actionhandler = document.createElement('action-handler-advanced-camera-card'); body.appendChild(actionhandler); return actionhandler as ActionHandler; @@ -176,7 +176,7 @@ const getActionHandler = (): ActionHandler => { const actionHandlerBind = ( element: ActionHandlerElement, - options?: FrigateCardActionHandlerOptions, + options?: AdvancedCameraCardActionHandlerOptions, ): void => { const actionhandler: ActionHandler = getActionHandler(); if (!actionhandler) { @@ -193,7 +193,7 @@ export const actionHandler = directive( } // eslint-disable-next-line @typescript-eslint/no-empty-function, @typescript-eslint/no-unused-vars - render(_options?: FrigateCardActionHandlerOptions) {} + render(_options?: AdvancedCameraCardActionHandlerOptions) {} }, ); @@ -222,7 +222,7 @@ export interface ActionEventTarget extends EventTarget { declare global { interface HTMLElementTagNameMap { - 'action-handler-frigate-card': ActionHandler; + 'action-handler-advanced-camera-card': ActionHandler; } interface HASSDomEvents { action: ActionHandlerDetail; diff --git a/src/camera-manager/error.ts b/src/camera-manager/error.ts index 38cb3561..d026f4af 100644 --- a/src/camera-manager/error.ts +++ b/src/camera-manager/error.ts @@ -1,4 +1,4 @@ -import { FrigateCardError } from '../types.js'; +import { AdvancedCameraCardError } from '../types.js'; -export class CameraInitializationError extends FrigateCardError {} -export class CameraNoIDError extends FrigateCardError {} +export class CameraInitializationError extends AdvancedCameraCardError {} +export class CameraNoIDError extends AdvancedCameraCardError {} diff --git a/src/camera-manager/frigate/requests.ts b/src/camera-manager/frigate/requests.ts index 57703d98..95939d2a 100644 --- a/src/camera-manager/frigate/requests.ts +++ b/src/camera-manager/frigate/requests.ts @@ -1,6 +1,6 @@ import { HomeAssistant } from '@dermotduffy/custom-card-helpers'; import { localize } from '../../localize/localize'; -import { FrigateCardError } from '../../types'; +import { AdvancedCameraCardError } from '../../types'; import { homeAssistantWSRequest } from '../../utils/ha/ws-request'; import { RecordingSegment } from '../types'; import { @@ -38,7 +38,7 @@ export const getRecordingsSummary = async ( camera: camera_name, // Ask for the summary relative to HA timezone - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1267 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1267 timezone: hass.config.time_zone, }, true, @@ -100,7 +100,7 @@ export async function retainEvent( true, ); if (!response.success) { - throw new FrigateCardError(localize('error.failed_retain'), { + throw new AdvancedCameraCardError(localize('error.failed_retain'), { request: retainRequest, response: response, }); @@ -153,7 +153,7 @@ export const getEventSummary = async ( instance_id: clientID, // Ask for the summary relative to HA timezone - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1267 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1267 timezone: hass.config.time_zone, }, true, diff --git a/src/camera-manager/manager.ts b/src/camera-manager/manager.ts index ae06d8e4..32a852fa 100644 --- a/src/camera-manager/manager.ts +++ b/src/camera-manager/manager.ts @@ -228,7 +228,7 @@ export class CameraManager { } // Engines are created sequentially, to avoid duplicate creation of the same - // engine. See: https://github.com/dermotduffy/frigate-hass-card/issues/941 + // engine. See: https://github.com/dermotduffy/advanced-camera-card/issues/941 const engineByConfig = await this._getEnginesForCameras(camerasConfig); // Configuration is initialized in parallel. @@ -272,7 +272,7 @@ export class CameraManager { log( this._api.getConfigManager().getCardWideConfig(), - 'Frigate Card CameraManager initialized (Cameras: ', + 'Advanced Camera Card CameraManager initialized (Cameras: ', this._store.getCameras(), `, Duration: ${ (new Date().getTime() - initializationStartTime.getTime()) / 1000 @@ -546,7 +546,7 @@ export class CameraManager { log( this._api.getConfigManager().getCardWideConfig(), - 'Frigate Card CameraManager favorite request (', + 'Advanced Camera Card CameraManager favorite request (', `Duration: ${(new Date().getTime() - queryStartTime.getTime()) / 1000}s,`, 'Media:', media.getID(), @@ -679,7 +679,7 @@ export class CameraManager { log( this._api.getConfigManager().getCardWideConfig(), - 'Frigate Card CameraManager request [Input queries:', + 'Advanced Camera Card CameraManager request [Input queries:', _queries.length, ', Cached output queries:', cachedOutputQueries, diff --git a/src/camera-manager/reolink/engine-reolink.ts b/src/camera-manager/reolink/engine-reolink.ts index 6cd9bea1..78852cda 100644 --- a/src/camera-manager/reolink/engine-reolink.ts +++ b/src/camera-manager/reolink/engine-reolink.ts @@ -181,7 +181,7 @@ export class ReolinkCameraManagerEngine extends BrowseMediaCameraManagerEngine { // First fetch all the Reolink cameras that show up under the media root, // that match the expected camera. Some Reolink cameras will not show up // here causing errors. - // https://github.com/dermotduffy/frigate-hass-card/issues/1723 + // https://github.com/dermotduffy/advanced-camera-card/issues/1723 const camerasWithMedia = await this._browseMediaManager.walkBrowseMedias( hass, [ diff --git a/src/camera-manager/store.ts b/src/camera-manager/store.ts index 58ef7906..ac662827 100644 --- a/src/camera-manager/store.ts +++ b/src/camera-manager/store.ts @@ -48,7 +48,7 @@ export class CameraManagerStore implements CameraManagerReadOnlyConfigStore { // In setting the store cameras, take great care to replace/add first before // remove. Otherwise, there may be race conditions where the card attempts // to render a view with (momentarily) no camera. - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1533 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1533 // Replace/Add the new cameras. for (const camera of cameras) { diff --git a/src/camera-manager/types.ts b/src/camera-manager/types.ts index e08d1052..76ce8342 100644 --- a/src/camera-manager/types.ts +++ b/src/camera-manager/types.ts @@ -1,5 +1,5 @@ +import { AdvancedCameraCardView, SSLCiphers } from '../config/types'; import { CapabilityKey, Icon } from '../types'; -import { FrigateCardView, SSLCiphers } from '../config/types'; import { ViewMedia } from '../view/media'; // ==== @@ -114,7 +114,7 @@ export interface CameraManagerCameraMetadata { export interface CameraEndpointsContext { media?: ViewMedia; - view?: FrigateCardView; + view?: AdvancedCameraCardView; } export interface CameraEndpoint { diff --git a/src/card-controller/actions/actions-manager.ts b/src/card-controller/actions/actions-manager.ts index 79bea074..65807af7 100644 --- a/src/card-controller/actions/actions-manager.ts +++ b/src/card-controller/actions/actions-manager.ts @@ -67,9 +67,9 @@ export class ActionsManager { if ( config && interaction && - // Don't call frigateCardHandleActionConfig() unless there is explicitly an - // action defined (as it uses a default that is unhelpful for views that - // have default tap/click actions). + // Don't execute unless there is explicitly an action defined (as it uses + // a default that is unhelpful for views that have default tap/click + // actions). actionConfig ) { this.executeActions(actionConfig, config); @@ -91,8 +91,8 @@ export class ActionsManager { }; /** - * This method handles actions requested by components of the Frigate card - * itself (e.g. menu, PTZ controller). + * This method handles actions requested by components of the Advanced Camera + * Card itself (e.g. menu, PTZ controller). */ public handleActionExecutionRequestEvent = async ( ev: CustomEvent, diff --git a/src/card-controller/actions/actions/base.ts b/src/card-controller/actions/actions/base.ts index 12533296..5ba18ce9 100644 --- a/src/card-controller/actions/actions/base.ts +++ b/src/card-controller/actions/actions/base.ts @@ -1,5 +1,5 @@ import { ActionContext } from 'action'; -import { FrigateCardCustomAction } from '../../../config/types'; +import { AdvancedCameraCardCustomAction } from '../../../config/types'; import { CardActionsAPI } from '../../types'; import { Action, AuxillaryActionConfig } from '../types'; @@ -24,6 +24,6 @@ export class BaseAction implements Action { } } -export class FrigateCardAction< - T extends FrigateCardCustomAction, +export class AdvancedCameraCardAction< + T extends AdvancedCameraCardCustomAction, > extends BaseAction {} diff --git a/src/card-controller/actions/actions/camera-select.ts b/src/card-controller/actions/actions/camera-select.ts index b492bf0d..e62a1b81 100644 --- a/src/card-controller/actions/actions/camera-select.ts +++ b/src/card-controller/actions/actions/camera-select.ts @@ -1,8 +1,8 @@ import { CameraSelectActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class CameraSelectAction extends FrigateCardAction { +export class CameraSelectAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { const selectCameraID = this._action.camera ?? diff --git a/src/card-controller/actions/actions/camera-ui.ts b/src/card-controller/actions/actions/camera-ui.ts index 148788c9..2b588856 100644 --- a/src/card-controller/actions/actions/camera-ui.ts +++ b/src/card-controller/actions/actions/camera-ui.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class CameraUIAction extends FrigateCardAction { +export class CameraUIAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { api.getCameraURLManager().openURL(); } diff --git a/src/card-controller/actions/actions/default.ts b/src/card-controller/actions/actions/default.ts index 5289c5ef..069b4b90 100644 --- a/src/card-controller/actions/actions/default.ts +++ b/src/card-controller/actions/actions/default.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class DefaultAction extends FrigateCardAction { +export class DefaultAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getViewManager().setViewDefaultWithNewQuery(); } diff --git a/src/card-controller/actions/actions/display-mode-select.ts b/src/card-controller/actions/actions/display-mode-select.ts index 8f1c13d2..f6a6c4b9 100644 --- a/src/card-controller/actions/actions/display-mode-select.ts +++ b/src/card-controller/actions/actions/display-mode-select.ts @@ -1,8 +1,8 @@ import { DisplayModeActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class DisplayModeSelectAction extends FrigateCardAction { +export class DisplayModeSelectAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getViewManager().setViewByParametersWithNewQuery({ params: { diff --git a/src/card-controller/actions/actions/download.ts b/src/card-controller/actions/actions/download.ts index 5103202e..aa7830b0 100644 --- a/src/card-controller/actions/actions/download.ts +++ b/src/card-controller/actions/actions/download.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class DownloadAction extends FrigateCardAction { +export class DownloadAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getDownloadManager().downloadViewerMedia(); } diff --git a/src/card-controller/actions/actions/expand.ts b/src/card-controller/actions/actions/expand.ts index 94d80d48..3bc92caa 100644 --- a/src/card-controller/actions/actions/expand.ts +++ b/src/card-controller/actions/actions/expand.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class ExpandAction extends FrigateCardAction { +export class ExpandAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { api.getExpandManager().toggleExpanded(); } diff --git a/src/card-controller/actions/actions/fullscreen.ts b/src/card-controller/actions/actions/fullscreen.ts index 411b08d2..cef14dbc 100644 --- a/src/card-controller/actions/actions/fullscreen.ts +++ b/src/card-controller/actions/actions/fullscreen.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class FullscreenAction extends FrigateCardAction { +export class FullscreenAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { api.getFullscreenManager().toggleFullscreen(); } diff --git a/src/card-controller/actions/actions/generic.ts b/src/card-controller/actions/actions/generic.ts index 9b7fda95..514556cd 100644 --- a/src/card-controller/actions/actions/generic.ts +++ b/src/card-controller/actions/actions/generic.ts @@ -3,7 +3,7 @@ import { CardActionsAPI } from '../../types'; import { BaseAction } from './base'; /** - * Handles generic HA (non-Frigate) actions (e.g. 'more-info') + * Handles generic HA actions (e.g. 'more-info') */ export class GenericAction extends BaseAction { public async execute(api: CardActionsAPI): Promise { diff --git a/src/card-controller/actions/actions/log.ts b/src/card-controller/actions/actions/log.ts index 50302f37..e3e4bde7 100644 --- a/src/card-controller/actions/actions/log.ts +++ b/src/card-controller/actions/actions/log.ts @@ -1,8 +1,8 @@ import { LogActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class LogAction extends FrigateCardAction { +export class LogAction extends AdvancedCameraCardAction { // eslint-disable-next-line @typescript-eslint/no-unused-vars public async execute(_api: CardActionsAPI): Promise { console[this._action.level](this._action.message); diff --git a/src/card-controller/actions/actions/media-player.ts b/src/card-controller/actions/actions/media-player.ts index 8ecfc574..bb79ac8c 100644 --- a/src/card-controller/actions/actions/media-player.ts +++ b/src/card-controller/actions/actions/media-player.ts @@ -1,9 +1,9 @@ import { MediaPlayerActionConfig } from '../../../config/types'; import { getStreamCameraID } from '../../../utils/substream'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class MediaPlayerAction extends FrigateCardAction { +export class MediaPlayerAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { const mediaPlayer = this._action.media_player; const mediaPlayerController = api.getMediaPlayerManager(); diff --git a/src/card-controller/actions/actions/menu-toggle.ts b/src/card-controller/actions/actions/menu-toggle.ts index 1cbac07d..1c1903fb 100644 --- a/src/card-controller/actions/actions/menu-toggle.ts +++ b/src/card-controller/actions/actions/menu-toggle.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class MenuToggleAction extends FrigateCardAction { +export class MenuToggleAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { api.getCardElementManager().toggleMenu(); } diff --git a/src/card-controller/actions/actions/microphone-connect.ts b/src/card-controller/actions/actions/microphone-connect.ts index 1be48dd1..b4ab7f90 100644 --- a/src/card-controller/actions/actions/microphone-connect.ts +++ b/src/card-controller/actions/actions/microphone-connect.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class MicrophoneConnectAction extends FrigateCardAction { +export class MicrophoneConnectAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getMicrophoneManager().connect(); } diff --git a/src/card-controller/actions/actions/microphone-disconnect.ts b/src/card-controller/actions/actions/microphone-disconnect.ts index f6771a60..0a7d0bb1 100644 --- a/src/card-controller/actions/actions/microphone-disconnect.ts +++ b/src/card-controller/actions/actions/microphone-disconnect.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class MicrophoneDisconnectAction extends FrigateCardAction { +export class MicrophoneDisconnectAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { api.getMicrophoneManager().disconnect(); } diff --git a/src/card-controller/actions/actions/microphone-mute.ts b/src/card-controller/actions/actions/microphone-mute.ts index c7a6c1bb..11658740 100644 --- a/src/card-controller/actions/actions/microphone-mute.ts +++ b/src/card-controller/actions/actions/microphone-mute.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class MicrophoneMuteAction extends FrigateCardAction { +export class MicrophoneMuteAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { api.getMicrophoneManager().mute(); } diff --git a/src/card-controller/actions/actions/microphone-unmute.ts b/src/card-controller/actions/actions/microphone-unmute.ts index 8757b2a8..92ef1796 100644 --- a/src/card-controller/actions/actions/microphone-unmute.ts +++ b/src/card-controller/actions/actions/microphone-unmute.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class MicrophoneUnmuteAction extends FrigateCardAction { +export class MicrophoneUnmuteAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getMicrophoneManager().unmute(); } diff --git a/src/card-controller/actions/actions/mute.ts b/src/card-controller/actions/actions/mute.ts index 3c43b8d0..f90fa6d0 100644 --- a/src/card-controller/actions/actions/mute.ts +++ b/src/card-controller/actions/actions/mute.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class MuteAction extends FrigateCardAction { +export class MuteAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getMediaLoadedInfoManager().get()?.player?.mute(); } diff --git a/src/card-controller/actions/actions/pause.ts b/src/card-controller/actions/actions/pause.ts index f77d657b..e8a75968 100644 --- a/src/card-controller/actions/actions/pause.ts +++ b/src/card-controller/actions/actions/pause.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class PauseAction extends FrigateCardAction { +export class PauseAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getMediaLoadedInfoManager().get()?.player?.pause(); } diff --git a/src/card-controller/actions/actions/play.ts b/src/card-controller/actions/actions/play.ts index 1d0707fe..8ef82c23 100644 --- a/src/card-controller/actions/actions/play.ts +++ b/src/card-controller/actions/actions/play.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class PlayAction extends FrigateCardAction { +export class PlayAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getMediaLoadedInfoManager().get()?.player?.play(); } diff --git a/src/card-controller/actions/actions/ptz-controls.ts b/src/card-controller/actions/actions/ptz-controls.ts index 6bf0e976..501bc074 100644 --- a/src/card-controller/actions/actions/ptz-controls.ts +++ b/src/card-controller/actions/actions/ptz-controls.ts @@ -1,8 +1,8 @@ import { PTZControlsActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class PTZControlsAction extends FrigateCardAction { +export class PTZControlsAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { api.getViewManager().setViewWithMergedContext({ ptzControls: { enabled: this._action.enabled }, diff --git a/src/card-controller/actions/actions/ptz-digital.ts b/src/card-controller/actions/actions/ptz-digital.ts index a2e1e779..0ddab55b 100644 --- a/src/card-controller/actions/actions/ptz-digital.ts +++ b/src/card-controller/actions/actions/ptz-digital.ts @@ -10,12 +10,12 @@ import { PTZDigitialActionConfig, ZOOM_MAX, ZOOM_MIN } from '../../../config/typ import { getPTZTarget } from '../../../utils/ptz'; import { Timer } from '../../../utils/timer'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; import { TargetedActionContext } from '../types'; import { setInProgressForThisTarget, stopInProgressForThisTarget, } from '../utils/action-state'; +import { AdvancedCameraCardAction } from './base'; const STEP_DELAY_SECONDS = 0.1; const STEP_ZOOM = 0.1; @@ -27,7 +27,7 @@ declare module 'action' { } } -export class PTZDigitalAction extends FrigateCardAction { +export class PTZDigitalAction extends AdvancedCameraCardAction { protected _timer = new Timer(); protected async _stepChange(api: CardActionsAPI, targetID: string): Promise { diff --git a/src/card-controller/actions/actions/ptz-multi.ts b/src/card-controller/actions/actions/ptz-multi.ts index 1207a50c..8a5da678 100644 --- a/src/card-controller/actions/actions/ptz-multi.ts +++ b/src/card-controller/actions/actions/ptz-multi.ts @@ -2,11 +2,11 @@ import { PTZMultiActionConfig } from '../../../config/types'; import { createPTZAction, createPTZDigitalAction } from '../../../utils/action'; import { PTZType, getPTZTarget, hasCameraTruePTZ } from '../../../utils/ptz'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; import { PTZAction } from './ptz'; import { PTZDigitalAction } from './ptz-digital'; -export class PTZMultiAction extends FrigateCardAction { +export class PTZMultiAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { const view = api.getViewManager().getView(); let targetID: string | null = null; diff --git a/src/card-controller/actions/actions/ptz.ts b/src/card-controller/actions/actions/ptz.ts index 8e253869..4814faa0 100644 --- a/src/card-controller/actions/actions/ptz.ts +++ b/src/card-controller/actions/actions/ptz.ts @@ -6,7 +6,7 @@ import { setInProgressForThisTarget, stopInProgressForThisTarget, } from '../utils/action-state'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; interface PTZContext { [cameraID: string]: { @@ -20,7 +20,7 @@ declare module 'action' { } } -export class PTZAction extends FrigateCardAction { +export class PTZAction extends AdvancedCameraCardAction { protected _timer = new Timer(); public async stop(): Promise { diff --git a/src/card-controller/actions/actions/screenshot.ts b/src/card-controller/actions/actions/screenshot.ts index 573b69a6..8838ca75 100644 --- a/src/card-controller/actions/actions/screenshot.ts +++ b/src/card-controller/actions/actions/screenshot.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class ScreenshotAction extends FrigateCardAction { +export class ScreenshotAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getDownloadManager().downloadScreenshot(); } diff --git a/src/card-controller/actions/actions/sleep.ts b/src/card-controller/actions/actions/sleep.ts index 3bf10c68..98cba66a 100644 --- a/src/card-controller/actions/actions/sleep.ts +++ b/src/card-controller/actions/actions/sleep.ts @@ -2,9 +2,9 @@ import { SleepActionConfig } from '../../../config/types'; import { sleep } from '../../../utils/basic'; import { CardActionsAPI } from '../../types'; import { timeDeltaToSeconds } from '../utils/time-delta'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class SleepAction extends FrigateCardAction { +export class SleepAction extends AdvancedCameraCardAction { // eslint-disable-next-line @typescript-eslint/no-unused-vars public async execute(_api: CardActionsAPI): Promise { await sleep(timeDeltaToSeconds(this._action.duration)); diff --git a/src/card-controller/actions/actions/status-bar.ts b/src/card-controller/actions/actions/status-bar.ts index a30e5ad0..5075bc87 100644 --- a/src/card-controller/actions/actions/status-bar.ts +++ b/src/card-controller/actions/actions/status-bar.ts @@ -1,8 +1,8 @@ import { StatusBarActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class StatusBarAction extends FrigateCardAction { +export class StatusBarAction extends AdvancedCameraCardAction { // eslint-disable-next-line @typescript-eslint/no-unused-vars public async execute(api: CardActionsAPI): Promise { switch (this._action.status_bar_action) { diff --git a/src/card-controller/actions/actions/substream-off.ts b/src/card-controller/actions/actions/substream-off.ts index 0a89b7a6..cf643d15 100644 --- a/src/card-controller/actions/actions/substream-off.ts +++ b/src/card-controller/actions/actions/substream-off.ts @@ -1,9 +1,9 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; import { SubstreamOffViewModifier } from '../../view/modifiers/substream-off'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class SubstreamOffAction extends FrigateCardAction { +export class SubstreamOffAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { api.getViewManager().setViewByParameters({ modifiers: [new SubstreamOffViewModifier()], diff --git a/src/card-controller/actions/actions/substream-on.ts b/src/card-controller/actions/actions/substream-on.ts index 78e6976d..ec8e0a49 100644 --- a/src/card-controller/actions/actions/substream-on.ts +++ b/src/card-controller/actions/actions/substream-on.ts @@ -1,9 +1,9 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; import { SubstreamOnViewModifier } from '../../view/modifiers/substream-on'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class SubstreamOnAction extends FrigateCardAction { +export class SubstreamOnAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { api.getViewManager().setViewByParameters({ modifiers: [new SubstreamOnViewModifier(api)], diff --git a/src/card-controller/actions/actions/substream-select.ts b/src/card-controller/actions/actions/substream-select.ts index ec55c5f6..c8131dcb 100644 --- a/src/card-controller/actions/actions/substream-select.ts +++ b/src/card-controller/actions/actions/substream-select.ts @@ -1,9 +1,9 @@ import { SubstreamSelectActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; import { SubstreamSelectViewModifier } from '../../view/modifiers/substream-select'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class SubstreamSelectAction extends FrigateCardAction { +export class SubstreamSelectAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { api.getViewManager().setViewByParameters({ modifiers: [new SubstreamSelectViewModifier(this._action.camera)], diff --git a/src/card-controller/actions/actions/unmute.ts b/src/card-controller/actions/actions/unmute.ts index 81043271..ed0b33bf 100644 --- a/src/card-controller/actions/actions/unmute.ts +++ b/src/card-controller/actions/actions/unmute.ts @@ -1,8 +1,8 @@ import { GeneralActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class UnmuteAction extends FrigateCardAction { +export class UnmuteAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getMediaLoadedInfoManager().get()?.player?.unmute(); } diff --git a/src/card-controller/actions/actions/view.ts b/src/card-controller/actions/actions/view.ts index 88967b38..c04c9cd0 100644 --- a/src/card-controller/actions/actions/view.ts +++ b/src/card-controller/actions/actions/view.ts @@ -1,12 +1,12 @@ import { ViewActionConfig } from '../../../config/types'; import { CardActionsAPI } from '../../types'; -import { FrigateCardAction } from './base'; +import { AdvancedCameraCardAction } from './base'; -export class ViewAction extends FrigateCardAction { +export class ViewAction extends AdvancedCameraCardAction { public async execute(api: CardActionsAPI): Promise { await api.getViewManager().setViewByParametersWithNewQuery({ params: { - view: this._action.frigate_card_action, + view: this._action.advanced_camera_card_action, }, }); } diff --git a/src/card-controller/actions/factory.ts b/src/card-controller/actions/factory.ts index a23794c8..c632fd81 100644 --- a/src/card-controller/actions/factory.ts +++ b/src/card-controller/actions/factory.ts @@ -43,8 +43,8 @@ export class ActionFactory { cardID?: string; }, ): Action | null { - const frigateCardAction = convertActionToCardCustomAction(action); - if (action.action !== 'fire-dom-event' || !frigateCardAction) { + const cardCustomAction = convertActionToCardCustomAction(action); + if (action.action !== 'fire-dom-event' || !cardCustomAction) { // * There is a slight typing (but not functional) difference between // ActionType in this card and ActionConfig in `custom-card-helpers`. See // `ExtendedConfirmationRestrictionConfig` in `types.ts` for the source and @@ -54,15 +54,15 @@ export class ActionFactory { if ( // Command not intended for this card (e.g. query string command). - frigateCardAction.card_id && - frigateCardAction.card_id !== options?.cardID + cardCustomAction.card_id && + cardCustomAction.card_id !== options?.cardID ) { return null; } - switch (frigateCardAction.frigate_card_action) { + switch (cardCustomAction.advanced_camera_card_action) { case 'default': - return new DefaultAction(context, frigateCardAction, options?.config); + return new DefaultAction(context, cardCustomAction, options?.config); case 'clip': case 'clips': case 'image': @@ -73,70 +73,70 @@ export class ActionFactory { case 'snapshots': case 'timeline': case 'diagnostics': - return new ViewAction(context, frigateCardAction, options?.config); + return new ViewAction(context, cardCustomAction, options?.config); case 'sleep': - return new SleepAction(context, frigateCardAction, options?.config); + return new SleepAction(context, cardCustomAction, options?.config); case 'download': - return new DownloadAction(context, frigateCardAction, options?.config); + return new DownloadAction(context, cardCustomAction, options?.config); case 'camera_ui': - return new CameraUIAction(context, frigateCardAction, options?.config); + return new CameraUIAction(context, cardCustomAction, options?.config); case 'expand': - return new ExpandAction(context, frigateCardAction, options?.config); + return new ExpandAction(context, cardCustomAction, options?.config); case 'fullscreen': - return new FullscreenAction(context, frigateCardAction, options?.config); + return new FullscreenAction(context, cardCustomAction, options?.config); case 'menu_toggle': - return new MenuToggleAction(context, frigateCardAction, options?.config); + return new MenuToggleAction(context, cardCustomAction, options?.config); case 'camera_select': - return new CameraSelectAction(context, frigateCardAction, options?.config); + return new CameraSelectAction(context, cardCustomAction, options?.config); case 'live_substream_select': - return new SubstreamSelectAction(context, frigateCardAction, options?.config); + return new SubstreamSelectAction(context, cardCustomAction, options?.config); case 'live_substream_off': - return new SubstreamOffAction(context, frigateCardAction, options?.config); + return new SubstreamOffAction(context, cardCustomAction, options?.config); case 'live_substream_on': - return new SubstreamOnAction(context, frigateCardAction, options?.config); + return new SubstreamOnAction(context, cardCustomAction, options?.config); case 'media_player': - return new MediaPlayerAction(context, frigateCardAction, options?.config); + return new MediaPlayerAction(context, cardCustomAction, options?.config); case 'microphone_connect': - return new MicrophoneConnectAction(context, frigateCardAction, options?.config); + return new MicrophoneConnectAction(context, cardCustomAction, options?.config); case 'microphone_disconnect': return new MicrophoneDisconnectAction( context, - frigateCardAction, + cardCustomAction, options?.config, ); case 'microphone_mute': - return new MicrophoneMuteAction(context, frigateCardAction, options?.config); + return new MicrophoneMuteAction(context, cardCustomAction, options?.config); case 'microphone_unmute': - return new MicrophoneUnmuteAction(context, frigateCardAction, options?.config); + return new MicrophoneUnmuteAction(context, cardCustomAction, options?.config); case 'mute': - return new MuteAction(context, frigateCardAction, options?.config); + return new MuteAction(context, cardCustomAction, options?.config); case 'unmute': - return new UnmuteAction(context, frigateCardAction, options?.config); + return new UnmuteAction(context, cardCustomAction, options?.config); case 'play': - return new PlayAction(context, frigateCardAction, options?.config); + return new PlayAction(context, cardCustomAction, options?.config); case 'pause': - return new PauseAction(context, frigateCardAction, options?.config); + return new PauseAction(context, cardCustomAction, options?.config); case 'screenshot': - return new ScreenshotAction(context, frigateCardAction, options?.config); + return new ScreenshotAction(context, cardCustomAction, options?.config); case 'display_mode_select': - return new DisplayModeSelectAction(context, frigateCardAction, options?.config); + return new DisplayModeSelectAction(context, cardCustomAction, options?.config); case 'ptz': - return new PTZAction(context, frigateCardAction, options?.config); + return new PTZAction(context, cardCustomAction, options?.config); case 'ptz_digital': - return new PTZDigitalAction(context, frigateCardAction, options?.config); + return new PTZDigitalAction(context, cardCustomAction, options?.config); case 'ptz_multi': - return new PTZMultiAction(context, frigateCardAction, options?.config); + return new PTZMultiAction(context, cardCustomAction, options?.config); case 'ptz_controls': - return new PTZControlsAction(context, frigateCardAction, options?.config); + return new PTZControlsAction(context, cardCustomAction, options?.config); case 'log': - return new LogAction(context, frigateCardAction, options?.config); + return new LogAction(context, cardCustomAction, options?.config); case 'status_bar': - return new StatusBarAction(context, frigateCardAction, options?.config); + return new StatusBarAction(context, cardCustomAction, options?.config); } /* istanbul ignore next: this path cannot be reached -- @preserve */ console.warn( - `Frigate card received unknown card action: ${frigateCardAction['frigate_card_action']}`, + `Advanced Camera Card received unknown card action: ${cardCustomAction['advanced_camera_card_action']}`, ); /* istanbul ignore next: this path cannot be reached -- @preserve */ return null; diff --git a/src/card-controller/actions/utils/execution-request.ts b/src/card-controller/actions/utils/execution-request.ts index 39ee47bc..b0ad889b 100644 --- a/src/card-controller/actions/utils/execution-request.ts +++ b/src/card-controller/actions/utils/execution-request.ts @@ -1,16 +1,16 @@ -import { dispatchFrigateCardEvent } from '../../../utils/basic'; +import { dispatchAdvancedCameraCardEvent } from '../../../utils/basic'; import { ActionExecutionRequest } from '../types'; export const dispatchActionExecutionRequest = ( element: HTMLElement, request: ActionExecutionRequest, ) => { - dispatchFrigateCardEvent(element, 'action:execution-request', request); + dispatchAdvancedCameraCardEvent(element, 'action:execution-request', request); }; export interface ActionExecutionRequestEventTarget extends EventTarget { addEventListener( - event: 'frigate-card:action:execution-request', + event: 'advanced-camera-card:action:execution-request', listener: ( this: ActionExecutionRequestEventTarget, ev: CustomEvent, @@ -23,7 +23,7 @@ export interface ActionExecutionRequestEventTarget extends EventTarget { options?: AddEventListenerOptions | boolean, ): void; removeEventListener( - event: 'frigate-card:action:execution-request', + event: 'advanced-camera-card:action:execution-request', listener: ( this: ActionExecutionRequestEventTarget, ev: CustomEvent, diff --git a/src/card-controller/automations-manager.ts b/src/card-controller/automations-manager.ts index 367a7f5c..98d840b1 100644 --- a/src/card-controller/automations-manager.ts +++ b/src/card-controller/automations-manager.ts @@ -31,7 +31,7 @@ export class AutomationsManager { !this._api.getHASSManager().hasHASS() || // Never execute automations if the card hasn't finished initializing, as // it could cause a view change when camera loads are not finished. - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1407 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1407 !this._api.getInitializationManager().isInitializedMandatory() || // Never execute automations if there's an error (as our automation loop // avoidance -- which shows as an error -- would not work!). diff --git a/src/card-controller/card-element-manager.ts b/src/card-controller/card-element-manager.ts index c68be81e..b11c6af0 100644 --- a/src/card-controller/card-element-manager.ts +++ b/src/card-controller/card-element-manager.ts @@ -78,7 +78,7 @@ export class CardElementManager { ...(this._api.getConfigManager().getConfig()?.view.render_entities ?? []), // Refresh the card if media player state changes: - // https://github.com/dermotduffy/frigate-hass-card/issues/881 + // https://github.com/dermotduffy/advanced-camera-card/issues/881 ...(this._api.getMediaPlayerManager().getMediaPlayers() ?? []), ]); @@ -109,7 +109,7 @@ export class CardElementManager { this._api.getInteractionManager().reportInteraction, ); this._element.addEventListener( - 'frigate-card:action:execution-request', + 'advanced-camera-card:action:execution-request', this._api.getActionsManager().handleActionExecutionRequestEvent, ); @@ -179,7 +179,7 @@ export class CardElementManager { this._api.getInteractionManager().reportInteraction, ); this._element.removeEventListener( - 'frigate-card:action:execution-request', + 'advanced-camera-card:action:execution-request', this._api.getActionsManager().handleActionExecutionRequestEvent, ); diff --git a/src/card-controller/conditions-manager.ts b/src/card-controller/conditions-manager.ts index 6b9fd23f..35337b46 100644 --- a/src/card-controller/conditions-manager.ts +++ b/src/card-controller/conditions-manager.ts @@ -10,14 +10,14 @@ import { setConfigValue, } from '../config/management'; import { - FrigateCardCondition, - frigateConditionalSchema, + AdvancedCameraCardCondition, + advancedCameraCardConditionalSchema, Overrides, - RawFrigateCardConfig, + RawAdvancedCameraCardConfig, ViewDisplayMode, } from '../config/types'; import { localize } from '../localize/localize'; -import { FrigateCardError, MediaLoadedInfo } from '../types'; +import { AdvancedCameraCardError, MediaLoadedInfo } from '../types'; import { desparsifyArrays } from '../utils/basic'; import { isCompanionApp } from '../utils/companion'; import { CardConditionAPI, KeysState, MicrophoneState } from './types'; @@ -38,25 +38,26 @@ export interface ConditionState { view?: string; } -class OverrideConfigurationError extends FrigateCardError {} +class OverrideConfigurationError extends AdvancedCameraCardError {} export class ConditionsEvaluateRequestEvent extends Event { - public conditions: FrigateCardCondition[]; + public conditions: AdvancedCameraCardCondition[]; public evaluation?: boolean; - constructor(conditions: FrigateCardCondition[], eventInitDict?: EventInit) { - super('frigate-card:conditions:evaluate', eventInitDict); + constructor(conditions: AdvancedCameraCardCondition[], eventInitDict?: EventInit) { + super('advanced-camera-card:conditions:evaluate', eventInitDict); this.conditions = conditions; } } /** - * Evaluate whether a frigateCardCondition is met using an event to evaluate. + * Evaluate whether an AdvancedCameraCardCondition is met using an event to + * evaluate. * @returns A boolean indicating whether the condition is met. */ export function evaluateConditionViaEvent( element: HTMLElement, - conditions?: FrigateCardCondition[], + conditions?: AdvancedCameraCardCondition[], ): boolean { if (!conditions) { return true; @@ -69,7 +70,7 @@ export function evaluateConditionViaEvent( /* Special note on what's going on here: * - * Some parts of the card (e.g. ) may have arbitrary + * Some parts of the card (e.g. ) may have arbitrary * complexity and layers (that this card doesn't control) between that master * element and the element that needs to evaluate the condition. In these * cases there's no clean way to pass state from the rest of card down through @@ -83,7 +84,7 @@ export function evaluateConditionViaEvent( return evaluateEvent.evaluation ?? false; } -export function getOverriddenConfig( +export function getOverriddenConfig( manager: Readonly, config: Readonly, options?: { @@ -198,9 +199,9 @@ export class ConditionsManager { public setConditionsFromConfig(): void { this.removeConditions(); - const getAllConditions = (): FrigateCardCondition[] => { + const getAllConditions = (): AdvancedCameraCardCondition[] => { const config = this._api.getConfigManager().getConfig(); - const conditions: FrigateCardCondition[] = []; + const conditions: AdvancedCameraCardCondition[] = []; config?.overrides?.forEach((override) => conditions.push(...override.conditions)); config?.automations?.forEach((automation) => conditions.push(...automation.conditions), @@ -210,7 +211,7 @@ export class ConditionsManager { // custom elements that this card may not known. Here we recursively parse // down the elements tree, parsing as we go to find valid conditions. const getElementsConditions = (data: unknown): void => { - const parseResult = frigateConditionalSchema.safeParse(data); + const parseResult = advancedCameraCardConditionalSchema.safeParse(data); if (parseResult.success) { conditions.push(...parseResult.data.conditions); parseResult.data.elements?.forEach(getElementsConditions); @@ -265,7 +266,7 @@ export class ConditionsManager { } public evaluateConditions( - conditions: Readonly[], + conditions: Readonly[], stateOverrides?: Partial, ): boolean { return conditions.every((conditionObj) => @@ -274,7 +275,7 @@ export class ConditionsManager { } protected _evaluateCondition( - conditionObj: Readonly, + conditionObj: Readonly, stateOverrides?: Partial, ): boolean { const state = { diff --git a/src/card-controller/config/config-manager.ts b/src/card-controller/config/config-manager.ts index 7ff48c13..9b177dc6 100644 --- a/src/card-controller/config/config-manager.ts +++ b/src/card-controller/config/config-manager.ts @@ -1,13 +1,13 @@ import isEqual from 'lodash-es/isEqual'; import { isConfigUpgradeable } from '../../config/management.js'; +import { setProfiles } from '../../config/profiles/index.js'; import { + AdvancedCameraCardConfig, + advancedCameraCardConfigSchema, CardWideConfig, - FrigateCardConfig, - frigateCardConfigSchema, - RawFrigateCardConfig, + RawAdvancedCameraCardConfig, } from '../../config/types.js'; import { localize } from '../../localize/localize.js'; -import { setProfiles } from '../../config/profiles/index.js'; import { getParseErrorPaths } from '../../utils/zod.js'; import { getOverriddenConfig } from '../conditions-manager.js'; import { InitializationAspect } from '../initialization-manager.js'; @@ -22,9 +22,9 @@ export class ConfigManager { // get the correct configuration (which will return overrides as appropriate). // This variable must be called `_config` or `config` to be compatible with // card-mod. - protected _config: FrigateCardConfig | null = null; - protected _overriddenConfig: FrigateCardConfig | null = null; - protected _rawConfig: RawFrigateCardConfig | null = null; + protected _config: AdvancedCameraCardConfig | null = null; + protected _overriddenConfig: AdvancedCameraCardConfig | null = null; + protected _rawConfig: RawAdvancedCameraCardConfig | null = null; protected _cardWideConfig: CardWideConfig | null = null; constructor(api: CardConfigAPI) { @@ -35,7 +35,7 @@ export class ConfigManager { return !!this.getConfig(); } - public getConfig(): FrigateCardConfig | null { + public getConfig(): AdvancedCameraCardConfig | null { return this._overriddenConfig ?? this._config; } @@ -43,20 +43,20 @@ export class ConfigManager { return this._cardWideConfig; } - public getNonOverriddenConfig(): FrigateCardConfig | null { + public getNonOverriddenConfig(): AdvancedCameraCardConfig | null { return this._config; } - public getRawConfig(): RawFrigateCardConfig | null { + public getRawConfig(): RawAdvancedCameraCardConfig | null { return this._rawConfig; } - public setConfig(inputConfig?: RawFrigateCardConfig): void { + public setConfig(inputConfig?: RawAdvancedCameraCardConfig): void { if (!inputConfig) { throw new Error(localize('error.invalid_configuration')); } - const parseResult = frigateCardConfigSchema.safeParse(inputConfig); + const parseResult = advancedCameraCardConfigSchema.safeParse(inputConfig); if (!parseResult.success) { const configUpgradeable = isConfigUpgradeable(inputConfig); const hint = getParseErrorPaths(parseResult.error); @@ -113,11 +113,11 @@ export class ConfigManager { return; } - let overriddenConfig: FrigateCardConfig | null = null; + let overriddenConfig: AdvancedCameraCardConfig | null = null; try { overriddenConfig = getOverriddenConfig(conditionsManager, this._config, { configOverrides: this._config.overrides, - schema: frigateCardConfigSchema, + schema: advancedCameraCardConfigSchema, }); } catch (ev) { this._api.getMessageManager().setErrorIfHigherPriority(ev); @@ -162,7 +162,7 @@ export class ConfigManager { * card hard requires, use InitializationManager instead. */ protected async _initializeBackground( - previousConfig: FrigateCardConfig | null, + previousConfig: AdvancedCameraCardConfig | null, ): Promise { await this._api.getDefaultManager().initializeIfNecessary(previousConfig); await this._api.getMediaPlayerManager().initializeIfNecessary(previousConfig); diff --git a/src/card-controller/controller.ts b/src/card-controller/controller.ts index 4769c87d..06b893be 100644 --- a/src/card-controller/controller.ts +++ b/src/card-controller/controller.ts @@ -1,7 +1,7 @@ import { LovelaceCardEditor } from '@dermotduffy/custom-card-helpers'; import { ReactiveController } from 'lit'; import { CameraManager } from '../camera-manager/manager'; -import { FrigateCardConfig } from '../config/types'; +import { AdvancedCameraCardConfig } from '../config/types'; import { createDeviceRegistryCache, DeviceRegistryManager, @@ -177,7 +177,7 @@ export class CardController public static async getConfigElement(): Promise { await import('../editor.js'); - return document.createElement('frigate-card-editor'); + return document.createElement('advanced-camera-card-editor'); } public getConfigManager(): ConfigManager { @@ -255,7 +255,7 @@ export class CardController return this._statusBarItemManager; } - public static getStubConfig(entities: string[]): FrigateCardConfig { + public static getStubConfig(entities: string[]): AdvancedCameraCardConfig { const cameraEntity = entities.find((element) => element.startsWith('camera.')); return { cameras: [ @@ -266,7 +266,7 @@ export class CardController // Need to use 'as unknown' to convince Typescript that this really isn't a // mistake, despite the miniscule size of the configuration vs the full type // description. - } as unknown as FrigateCardConfig; + } as unknown as AdvancedCameraCardConfig; } public getStyleManager(): StyleManager { diff --git a/src/card-controller/default-manager.ts b/src/card-controller/default-manager.ts index 72070cce..0d19880a 100644 --- a/src/card-controller/default-manager.ts +++ b/src/card-controller/default-manager.ts @@ -1,5 +1,5 @@ import isEqual from 'lodash-es/isEqual'; -import { FrigateCardConfig } from '../config/types'; +import { AdvancedCameraCardConfig } from '../config/types'; import { createGeneralAction } from '../utils/action'; import { isActionAllowedBasedOnInteractionState } from '../utils/interaction-mode'; import { Timer } from '../utils/timer'; @@ -17,7 +17,7 @@ export class DefaultManager { } public async initializeIfNecessary( - previousConfig: FrigateCardConfig | null, + previousConfig: AdvancedCameraCardConfig | null, ): Promise { if ( !isEqual( diff --git a/src/card-controller/fullscreen/webkit/index.ts b/src/card-controller/fullscreen/webkit/index.ts index 6927f3c1..ccbb78dc 100644 --- a/src/card-controller/fullscreen/webkit/index.ts +++ b/src/card-controller/fullscreen/webkit/index.ts @@ -9,7 +9,7 @@ const WEBKIT_PLAY_SECONDS = 0.5; /** * Fullscreen implementation for webkit based browsers that do not support the * standard Fullscreen API (expected to be exclusively iOS on an iPhone). - * See: https://github.com/dermotduffy/frigate-hass-card/issues/1444 + * See: https://github.com/dermotduffy/advanced-camera-card/issues/1444 */ export class WebkitFullScreenProvider extends FullscreenProviderBase diff --git a/src/card-controller/initialization-manager.ts b/src/card-controller/initialization-manager.ts index 5e2c3cd5..211a10ea 100644 --- a/src/card-controller/initialization-manager.ts +++ b/src/card-controller/initialization-manager.ts @@ -94,8 +94,8 @@ export class InitializationManager { !(await this._initializer.initializeMultipleIfNecessary({ [InitializationAspect.CAMERAS]: async () => { // Recreate the camera manager to guarantee an immediate re-render. - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1811 - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1769 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1811 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1769 this._api.createCameraManager(); return await this._api.getCameraManager().initializeCamerasFromConfig(); }, @@ -103,7 +103,7 @@ export class InitializationManager { // Connecting the microphone (if configured) is considered mandatory to // avoid issues with some cameras that only allow 2-way audio on the // first stream initialized. - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1235 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1235 ...(this._api.getMicrophoneManager().shouldConnectOnInitialization() && { [InitializationAspect.MICROPHONE_CONNECT]: async () => { // Recreate the microphone manager to guarantee an immediate diff --git a/src/card-controller/media-info-manager.ts b/src/card-controller/media-info-manager.ts index d269e325..c9c82359 100644 --- a/src/card-controller/media-info-manager.ts +++ b/src/card-controller/media-info-manager.ts @@ -23,7 +23,7 @@ export class MediaLoadedInfoManager { log( this._api.getConfigManager().getCardWideConfig(), - `Frigate Card media load: `, + `Advanced Camera Card media load: `, mediaLoadedInfo, ); diff --git a/src/card-controller/media-player-manager.ts b/src/card-controller/media-player-manager.ts index fd0d065f..3645f3d8 100644 --- a/src/card-controller/media-player-manager.ts +++ b/src/card-controller/media-player-manager.ts @@ -1,4 +1,4 @@ -import { CameraConfig, FrigateCardConfig } from '../config/types'; +import { AdvancedCameraCardConfig, CameraConfig } from '../config/types'; import { MEDIA_PLAYER_SUPPORT_BROWSE_MEDIA, MEDIA_PLAYER_SUPPORT_STOP, @@ -6,8 +6,8 @@ import { } from '../const'; import { localize } from '../localize/localize'; import { errorToConsole } from '../utils/basic'; -import { Entity } from '../utils/ha/registry/entity/types'; import { supportsFeature } from '../utils/ha'; +import { Entity } from '../utils/ha/registry/entity/types'; import { ViewMedia } from '../view/media'; import { ViewMediaClassifier } from '../view/media-classifier'; import { CardMediaPlayerAPI } from './types'; @@ -30,7 +30,7 @@ export class MediaPlayerManager { } public async initializeIfNecessary( - previousConfig: FrigateCardConfig | null, + previousConfig: AdvancedCameraCardConfig | null, ): Promise { if ( previousConfig?.menu.buttons.media_player.enabled !== @@ -80,7 +80,7 @@ export class MediaPlayerManager { // available in the HA state, only in the registry). this._mediaPlayers = mediaPlayers.filter((entityID) => { // Specifically allow for media players that are not found in the entity registry: - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1016 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1016 const entity = mediaPlayerEntities?.get(entityID); return !entity || !entity.hidden_by; }); diff --git a/src/card-controller/message-manager.ts b/src/card-controller/message-manager.ts index b754c7b1..b9fbf9f3 100644 --- a/src/card-controller/message-manager.ts +++ b/src/card-controller/message-manager.ts @@ -1,4 +1,4 @@ -import { FrigateCardError, Message, MessageType } from '../types'; +import { AdvancedCameraCardError, Message, MessageType } from '../types'; import { errorToConsole } from '../utils/basic'; import { CardMessageAPI } from './types'; @@ -60,7 +60,7 @@ export class MessageManager { this.setMessageIfHigherPriority({ message: prefix ? `${prefix}: ${error.message}` : String(error.message), type: 'error', - ...(error instanceof FrigateCardError && { context: error.context }), + ...(error instanceof AdvancedCameraCardError && { context: error.context }), }); } diff --git a/src/card-controller/microphone-manager.ts b/src/card-controller/microphone-manager.ts index 0cd56624..28557cbd 100644 --- a/src/card-controller/microphone-manager.ts +++ b/src/card-controller/microphone-manager.ts @@ -42,7 +42,7 @@ export class MicrophoneManager { public isSupported(): boolean { // Some browsers will have mediaDevices/getUserMedia as undefined if // accessed over http. - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1543 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1543 return !!navigator.mediaDevices?.getUserMedia; } diff --git a/src/card-controller/query-string-manager.ts b/src/card-controller/query-string-manager.ts index ce105c8a..d4398426 100644 --- a/src/card-controller/query-string-manager.ts +++ b/src/card-controller/query-string-manager.ts @@ -1,4 +1,4 @@ -import { FrigateCardCustomAction, ViewActionConfig } from '../config/types'; +import { AdvancedCameraCardCustomAction, ViewActionConfig } from '../config/types'; import { createCameraAction, createGeneralAction } from '../utils/action.js'; import { ViewParameters } from '../view/view'; import { CardQueryStringAPI } from './types'; @@ -9,7 +9,7 @@ interface QueryStringViewIntent { default?: boolean; substream?: string; }; - other?: FrigateCardCustomAction[]; + other?: AdvancedCameraCardCustomAction[]; } export class QueryStringManager { @@ -72,14 +72,14 @@ export class QueryStringManager { const result: QueryStringViewIntent = {}; for (const action of this._getActions()) { if (this._isViewAction(action)) { - (result.view ??= {}).view = action.frigate_card_action; + (result.view ??= {}).view = action.advanced_camera_card_action; (result.view ??= {}).default = undefined; - } else if (action.frigate_card_action === 'default') { + } else if (action.advanced_camera_card_action === 'default') { (result.view ??= {}).default = true; (result.view ??= {}).view = undefined; - } else if (action.frigate_card_action === 'camera_select') { + } else if (action.advanced_camera_card_action === 'camera_select') { (result.view ??= {}).camera = action.camera; - } else if (action.frigate_card_action === 'live_substream_select') { + } else if (action.advanced_camera_card_action === 'live_substream_select') { (result.view ??= {}).substream = action.camera; } else { (result.other ??= []).push(action); @@ -88,11 +88,11 @@ export class QueryStringManager { return result; } - protected _getActions(): FrigateCardCustomAction[] { + protected _getActions(): AdvancedCameraCardCustomAction[] { const params = new URLSearchParams(window.location.search); - const actions: FrigateCardCustomAction[] = []; + const actions: AdvancedCameraCardCustomAction[] = []; const actionRE = new RegExp( - /^frigate-card-action([.:](?\w+))?[.:](?\w+)/, + /^(advanced-camera-card|frigate-card)-action([.:](?\w+))?[.:](?\w+)/, ); for (const [key, value] of params.entries()) { const match = key.match(actionRE); @@ -102,7 +102,7 @@ export class QueryStringManager { const cardID: string | undefined = match.groups['cardID']; const action = match.groups['action']; - let customAction: FrigateCardCustomAction | null = null; + let customAction: AdvancedCameraCardCustomAction | null = null; switch (action) { case 'camera_select': case 'live_substream_select': @@ -133,7 +133,7 @@ export class QueryStringManager { break; default: console.warn( - `Frigate card received unknown card action in query string: ${action}`, + `Advanced Camera Card received unknown card action in query string: ${action}`, ); } if (customAction) { @@ -144,9 +144,9 @@ export class QueryStringManager { } protected _isViewAction = ( - action: FrigateCardCustomAction, + action: AdvancedCameraCardCustomAction, ): action is ViewActionConfig => { - switch (action.frigate_card_action) { + switch (action.advanced_camera_card_action) { case 'clip': case 'clips': case 'diagnostics': diff --git a/src/card-controller/status-bar-item-manager.ts b/src/card-controller/status-bar-item-manager.ts index 11efce02..d2c9a0bd 100644 --- a/src/card-controller/status-bar-item-manager.ts +++ b/src/card-controller/status-bar-item-manager.ts @@ -62,7 +62,7 @@ export class StatusBarItemManager { ...(title ? [ { - type: 'custom:frigate-card-status-bar-string' as const, + type: 'custom:advanced-camera-card-status-bar-string' as const, string: title, expand: true, sufficient: true, @@ -74,7 +74,7 @@ export class StatusBarItemManager { ...(resolution ? [ { - type: 'custom:frigate-card-status-bar-string' as const, + type: 'custom:advanced-camera-card-status-bar-string' as const, string: resolution, ...options?.statusConfig?.items.resolution, }, @@ -84,7 +84,7 @@ export class StatusBarItemManager { ...(technology && technology === 'webrtc' ? [ { - type: 'custom:frigate-card-status-bar-icon' as const, + type: 'custom:advanced-camera-card-status-bar-icon' as const, icon: 'mdi:webrtc', ...options?.statusConfig?.items.technology, }, @@ -92,7 +92,7 @@ export class StatusBarItemManager { : !!technology ? [ { - type: 'custom:frigate-card-status-bar-string' as const, + type: 'custom:advanced-camera-card-status-bar-string' as const, string: technology.toUpperCase(), ...options?.statusConfig?.items.technology, }, @@ -102,7 +102,7 @@ export class StatusBarItemManager { ...(engineIcon ? [ { - type: 'custom:frigate-card-status-bar-icon' as const, + type: 'custom:advanced-camera-card-status-bar-icon' as const, icon: engineIcon, ...options?.statusConfig?.items.engine, }, diff --git a/src/card-controller/style-manager.ts b/src/card-controller/style-manager.ts index 894673a1..fcba0e3c 100644 --- a/src/card-controller/style-manager.ts +++ b/src/card-controller/style-manager.ts @@ -1,7 +1,7 @@ import { StyleInfo } from 'lit/directives/style-map'; import { - FrigateCardConfig, - frigateCardConfigDefaults, + AdvancedCameraCardConfig, + configDefaults, ThemeConfig, ThemeName, } from '../config/types'; @@ -25,7 +25,7 @@ export class StyleManager { // as dimension configuration does not apply in fullscreen or expanded mode. const lastKnown = this._api.getMediaLoadedInfoManager().getLastKnown(); card.style.setProperty( - '--frigate-card-expand-aspect-ratio', + '--advanced-camera-card-expand-aspect-ratio', view?.isAnyMediaView() && lastKnown ? `${lastKnown.width} / ${lastKnown.height}` : 'unset', @@ -35,16 +35,16 @@ export class StyleManager { // space. const isGrid = view?.isGrid(); card.style.setProperty( - '--frigate-card-expand-width', + '--advanced-camera-card-expand-width', !isGrid && view?.isAnyMediaView() ? 'none' - : 'var(--frigate-card-expand-max-width)', + : 'var(--advanced-camera-card-expand-max-width)', ); card.style.setProperty( - '--frigate-card-expand-height', + '--advanced-camera-card-expand-height', !isGrid && view?.isAnyMediaView() ? 'none' - : 'var(--frigate-card-expand-max-height)', + : 'var(--advanced-camera-card-expand-max-height)', ); } @@ -76,7 +76,7 @@ export class StyleManager { protected _getThemeNames(themeConfig: ThemeConfig): ThemeName[] | null { return themeConfig.themes.length ? themeConfig.themes - : frigateCardConfigDefaults.view.theme.themes; + : configDefaults.view.theme.themes; } protected _setDimmable(): void { @@ -92,7 +92,7 @@ export class StyleManager { const config = this._api.getConfigManager().getConfig(); if (config) { const card = this._api.getCardElementManager().getElement(); - card.style.setProperty('--frigate-card-height', config.dimensions.height); + card.style.setProperty('--advanced-camera-card-height', config.dimensions.height); } } @@ -106,7 +106,7 @@ export class StyleManager { const styles = performance?.style ?? {}; for (const configKey of Object.keys(styles)) { - const CSSKey = `--frigate-card-css-${configKey.replaceAll('_', '-')}`; + const CSSKey = `--advanced-camera-card-css-${configKey.replaceAll('_', '-')}`; if (styles[configKey] === false) { element.style.setProperty(CSSKey, STYLE_DISABLE_MAP[configKey]); } else { @@ -116,7 +116,7 @@ export class StyleManager { } protected _isAspectRatioEnforced( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, view?: View | null, ): boolean { const aspectRatioMode = config.dimensions.aspect_ratio_mode; diff --git a/src/card-controller/view/factory.ts b/src/card-controller/view/factory.ts index 6131bb4c..828d2044 100644 --- a/src/card-controller/view/factory.ts +++ b/src/card-controller/view/factory.ts @@ -1,7 +1,7 @@ import { - FRIGATE_CARD_VIEW_DEFAULT, - FrigateCardConfig, - FrigateCardView, + VIEW_DEFAULT, + AdvancedCameraCardConfig, + AdvancedCameraCardView, ViewDisplayMode, } from '../../config/types'; import { localize } from '../../localize/localize'; @@ -26,7 +26,7 @@ export class ViewFactory { // Neither options.baseView.camera nor options.baseView.view are respected // here, since this is the default view / camera. - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1564 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1564 let cameraID: string | null = null; const viewName = options?.params?.view ?? config.view.default; @@ -101,11 +101,8 @@ export class ViewFactory { } if (!this.isViewSupportedByCamera(cameraID, viewName)) { - if ( - options?.failSafe && - this.isViewSupportedByCamera(cameraID, FRIGATE_CARD_VIEW_DEFAULT) - ) { - viewName = FRIGATE_CARD_VIEW_DEFAULT; + if (options?.failSafe && this.isViewSupportedByCamera(cameraID, VIEW_DEFAULT)) { + viewName = VIEW_DEFAULT; } else { const capabilities = this._api .getCameraManager() @@ -124,7 +121,7 @@ export class ViewFactory { const configuredDisplayMode = this._getDefaultDisplayModeForView(viewName, config); const displayMode = // Prioritize the configured display mode (if present). - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1812 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1812 (viewName !== options?.baseView?.view ? configuredDisplayMode : null) ?? options?.params?.displayMode ?? options?.baseView?.displayMode ?? @@ -147,13 +144,16 @@ export class ViewFactory { return view; } - public isViewSupportedByCamera(cameraID: string, view: FrigateCardView): boolean { + public isViewSupportedByCamera( + cameraID: string, + view: AdvancedCameraCardView, + ): boolean { return !!getCameraIDsForViewName(this._api.getCameraManager(), view, cameraID).size; } protected _getDefaultDisplayModeForView( - viewName: FrigateCardView, - config: FrigateCardConfig, + viewName: AdvancedCameraCardView, + config: AdvancedCameraCardConfig, ): ViewDisplayMode | null { let mode: ViewDisplayMode | null = null; switch (viewName) { diff --git a/src/card-controller/view/types.ts b/src/card-controller/view/types.ts index 5b769935..b9e449ea 100644 --- a/src/card-controller/view/types.ts +++ b/src/card-controller/view/types.ts @@ -1,6 +1,6 @@ import { ViewContext } from 'view'; -import { FrigateCardView } from '../../config/types.js'; -import { FrigateCardError } from '../../types.js'; +import { AdvancedCameraCardView } from '../../config/types.js'; +import { AdvancedCameraCardError } from '../../types.js'; import { MediaQueriesResults } from '../../view/media-queries-results.js'; import { MediaQueries } from '../../view/media-queries.js'; import { ViewMedia } from '../../view/media.js'; @@ -72,9 +72,9 @@ export interface ViewManagerInterface { setViewWithMergedContext(context: ViewContext | null): void; - isViewSupportedByCamera(cameraID: string, view: FrigateCardView): boolean; + isViewSupportedByCamera(cameraID: string, view: AdvancedCameraCardView): boolean; hasMajorMediaChange(oldView?: View | null, newView?: View | null): boolean; } -export class ViewNoCameraError extends FrigateCardError {} -export class ViewIncompatible extends FrigateCardError {} +export class ViewNoCameraError extends AdvancedCameraCardError {} +export class ViewIncompatible extends AdvancedCameraCardError {} diff --git a/src/card-controller/view/view-manager.ts b/src/card-controller/view/view-manager.ts index e63512db..e9671b7f 100644 --- a/src/card-controller/view/view-manager.ts +++ b/src/card-controller/view/view-manager.ts @@ -1,5 +1,5 @@ import { ViewContext } from 'view'; -import { FrigateCardView } from '../../config/types'; +import { AdvancedCameraCardView } from '../../config/types'; import { log } from '../../utils/debug'; import { getStreamCameraID } from '../../utils/substream'; import { MediaQueriesClassifier } from '../../view/media-queries-classifier'; @@ -217,7 +217,7 @@ export class ViewManager implements ViewManagerInterface { // target media of the gallery (e.g. clips, snapshots or recordings) is // equal to the queries that are currently used in the viewer. // - // See: https://github.com/dermotduffy/frigate-hass-card/issues/885 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/885 const switchingFromViewerToGallery = this._view?.isViewerView() && newView?.isGalleryView(); @@ -233,7 +233,10 @@ export class ViewManager implements ViewManagerInterface { } } - public isViewSupportedByCamera(cameraID: string, view: FrigateCardView): boolean { + public isViewSupportedByCamera( + cameraID: string, + view: AdvancedCameraCardView, + ): boolean { return !!getCameraIDsForViewName(this._api.getCameraManager(), view, cameraID).size; } @@ -266,7 +269,7 @@ export class ViewManager implements ViewManagerInterface { // If the query string contains a view related action, we don't set any view // here and allow that action to be triggered by the next call of to execute // query actions (called at least once per render cycle). - // Related: https://github.com/dermotduffy/frigate-hass-card/issues/1200 + // Related: https://github.com/dermotduffy/advanced-camera-card/issues/1200 if (!this._api.getQueryStringManager().hasViewRelatedActionsToRun()) { // This is not awaited to allow the initialization to complete before the // query is answered. @@ -280,7 +283,7 @@ export class ViewManager implements ViewManagerInterface { log( this._api.getConfigManager().getCardWideConfig(), - `Frigate Card view change: `, + `Advanced Camera Card view change: `, view, ); diff --git a/src/card-controller/view/view-query-executor.ts b/src/card-controller/view/view-query-executor.ts index 1953a6ef..de255996 100644 --- a/src/card-controller/view/view-query-executor.ts +++ b/src/card-controller/view/view-query-executor.ts @@ -137,7 +137,7 @@ export class ViewQueryExecutor { new MergeContextViewModifier({ // Force the window to start at the most recent time, not // necessarily when the most recent event/recording was: - // https://github.com/dermotduffy/frigate-hass-card/issues/1301 + // https://github.com/dermotduffy/advanced-camera-card/issues/1301 timeline: { window: { start: sub(now, { diff --git a/src/card.ts b/src/card.ts index cb0b739e..944a6b12 100644 --- a/src/card.ts +++ b/src/card.ts @@ -11,29 +11,29 @@ import { ConditionsEvaluateRequestEvent } from './card-controller/conditions-man import { CardController } from './card-controller/controller'; import { MenuButtonController } from './components-lib/menu-button-controller'; import './components/elements.js'; -import { FrigateCardElements } from './components/elements.js'; +import { AdvancedCameraCardElements } from './components/elements.js'; import './components/loading.js'; import './components/menu.js'; -import { FrigateCardMenu } from './components/menu.js'; +import { AdvancedCameraCardMenu } from './components/menu.js'; import './components/message.js'; import { renderMessage } from './components/message.js'; import './components/overlay.js'; -import { FrigateCardOverlay } from './components/overlay.js'; +import { AdvancedCameraCardOverlay } from './components/overlay.js'; import './components/status-bar'; import './components/thumbnail-carousel.js'; import './components/views.js'; -import { FrigateCardViews } from './components/views.js'; +import { AdvancedCameraCardViews } from './components/views.js'; import { - FrigateCardConfig, + AdvancedCameraCardConfig, MenuItem, - RawFrigateCardConfig, + RawAdvancedCameraCardConfig, StatusBarItem, } from './config/types'; import { REPO_URL } from './const.js'; import { localize } from './localize/localize.js'; import cardStyle from './scss/card.scss'; import { ExtendedHomeAssistant, MediaLoadedInfo, Message } from './types.js'; -import { frigateCardHasAction } from './utils/action.js'; +import { hasAction } from './utils/action.js'; import { getReleaseVersion } from './utils/diagnostics'; // *************************************************************************** @@ -57,23 +57,14 @@ import { getReleaseVersion } from './utils/diagnostics'; * - Directly specifying hooks (e.g. for snapshot viewing with simple tags) */ -/** Actions (action/menu/ll-custom events): - * - * The card supports actions being configured in a number of places (e.g. tap on - * an element, double_tap on a menu item, hold on the live view). These actions - * are handled by frigateCardHandleActionConfig(). For Frigate-card specific - * actions, the frigateCardHandleActionConfig() call will result in an ll-custom - * DOM event being fired, which needs to be caught at the card level to handle. - */ - // *************************************************************************** // Static Initializers // *************************************************************************** console.info( - `%c FRIGATE-HASS-CARD \n` + `%c ${localize('common.version')} ` + getReleaseVersion(), - 'color: pink; font-weight: bold; background: black', - 'color: white; font-weight: bold; background: dimgray', + `%c 📷 Advanced Camera Card %c ${getReleaseVersion()} `, + 'padding: 3px; color: black; background: pink;', + 'padding: 3px; color: black; background: white;', ); // eslint-disable-next-line @typescript-eslint/no-explicit-any @@ -81,22 +72,22 @@ console.info( // eslint-disable-next-line @typescript-eslint/no-explicit-any (window as any).customCards.push({ - type: 'frigate-card', - name: localize('common.frigate_card'), - description: localize('common.frigate_card_description'), + type: 'advanced-camera-card', + name: localize('common.advanced_camera_card'), + description: localize('common.advanced_camera_card_description'), preview: true, documentationURL: REPO_URL, }); // *************************************************************************** -// Main FrigateCard WebComponent +// Main AdvancedCameraCard WebComponent // // Any non-rendering / non-lit related functionality should be added to // CardController instead of this file. // *************************************************************************** -@customElement('frigate-card') -class FrigateCard extends LitElement { +@customElement('advanced-camera-card') +class AdvancedCameraCard extends LitElement { protected _controller = new CardController( this, // Callback to scroll the main pane back to the top (example usecase: scrolling @@ -109,14 +100,14 @@ class FrigateCard extends LitElement { protected _menuButtonController = new MenuButtonController(); - protected _refMenu: Ref = createRef(); - protected _refOverlay: Ref = createRef(); + protected _refMenu: Ref = createRef(); + protected _refOverlay: Ref = createRef(); protected _refMain: Ref = createRef(); - protected _refElements: Ref = createRef(); - protected _refViews: Ref = createRef(); + protected _refElements: Ref = createRef(); + protected _refViews: Ref = createRef(); // Convenience methods for very frequently accessed attributes. - get _config(): FrigateCardConfig | null { + get _config(): AdvancedCameraCardConfig | null { return this._controller.getConfigManager().getConfig(); } @@ -145,7 +136,10 @@ class FrigateCard extends LitElement { return await CardController.getConfigElement(); } - public static getStubConfig(_: HomeAssistant, entities: string[]): FrigateCardConfig { + public static getStubConfig( + _: HomeAssistant, + entities: string[], + ): AdvancedCameraCardConfig { return CardController.getStubConfig(entities); } @@ -153,7 +147,7 @@ class FrigateCard extends LitElement { // Update the components that need to know about condition changes. Trigger // updates directly on them to them to avoid the performance hit of a entire // card re-render (esp. when using card-mod). - // https://github.com/dermotduffy/frigate-hass-card/issues/678 + // https://github.com/dermotduffy/advanced-camera-card/issues/678 if (this._refViews.value) { this._refViews.value.conditionsManagerEpoch = this._controller.getConditionsManager().getEpoch() ?? undefined; @@ -164,7 +158,7 @@ class FrigateCard extends LitElement { } } - public setConfig(config: RawFrigateCardConfig): void { + public setConfig(config: RawAdvancedCameraCardConfig): void { this._controller.getConfigManager().setConfig(config); } @@ -246,7 +240,9 @@ class FrigateCard extends LitElement { return html` ${position === 'overlay' - ? html`${getContents('overlay')}` + ? html`${getContents('overlay')}` : html`
${getContents('outerlay')}
`} @@ -259,7 +255,7 @@ class FrigateCard extends LitElement { return; } return html` - + > `; } @@ -290,7 +286,7 @@ class FrigateCard extends LitElement { } return html` - + > `; } @@ -359,36 +355,36 @@ class FrigateCard extends LitElement { html` ) => + @advanced-camera-card:message=${(ev: CustomEvent) => this._controller.getMessageManager().setMessageIfHigherPriority(ev.detail)} - @frigate-card:media:loaded=${(ev: CustomEvent) => + @advanced-camera-card:media:loaded=${(ev: CustomEvent) => this._controller.getMediaLoadedInfoManager().set(ev.detail)} - @frigate-card:media:unloaded=${() => + @advanced-camera-card:media:unloaded=${() => this._controller.getMediaLoadedInfoManager().clear()} - @frigate-card:media:volumechange=${ + @advanced-camera-card:media:volumechange=${ () => this.requestUpdate() /* Refresh mute menu button */ } - @frigate-card:media:play=${ + @advanced-camera-card:media:play=${ () => this.requestUpdate() /* Refresh play/pause menu button */ } - @frigate-card:media:pause=${ + @advanced-camera-card:media:pause=${ () => this.requestUpdate() /* Refresh play/pause menu button */ } - @frigate-card:focus=${() => this.focus()} + @advanced-camera-card:focus=${() => this.focus()} > ${showLoading - ? html`` + >` : ''} ${this._renderMenuStatusContainer('top')} ${this._renderMenuStatusContainer('overlay')}
- + > ${this._controller.getMessageManager().hasMessage() ? // Keep message rendering to last to show messages that may have been // generated during the render. @@ -421,32 +417,36 @@ class FrigateCard extends LitElement { ${this._config?.elements ? // Elements need to render after the main views so it can render 'on // top'. - html` ) => { + @advanced-camera-card:menu:add=${(ev: CustomEvent) => { this._menuButtonController.addDynamicMenuButton(ev.detail); this.requestUpdate(); }} - @frigate-card:menu:remove=${(ev: CustomEvent) => { + @advanced-camera-card:menu:remove=${(ev: CustomEvent) => { this._menuButtonController.removeDynamicMenuButton(ev.detail); this.requestUpdate(); }} - @frigate-card:status-bar:add=${(ev: CustomEvent) => { + @advanced-camera-card:status-bar:add=${( + ev: CustomEvent, + ) => { this._controller .getStatusBarItemManager() .addDynamicStatusBarItem(ev.detail); }} - @frigate-card:status-bar:remove=${(ev: CustomEvent) => { + @advanced-camera-card:status-bar:remove=${( + ev: CustomEvent, + ) => { this._controller .getStatusBarItemManager() .removeDynamicStatusBarItem(ev.detail); }} - @frigate-card:conditions:evaluate=${( + @advanced-camera-card:conditions:evaluate=${( ev: ConditionsEvaluateRequestEvent, ) => { ev.evaluation = this._controller @@ -454,7 +454,7 @@ class FrigateCard extends LitElement { ?.evaluateConditions(ev.conditions); }} > - ` + ` : ``} `, ); @@ -477,8 +477,13 @@ class FrigateCard extends LitElement { } } +// Keep the old name around for backwards compatibility. +@customElement('frigate-card') +class FrigateCard extends AdvancedCameraCard {} + declare global { interface HTMLElementTagNameMap { + 'advanced-camera-card': AdvancedCameraCard; 'frigate-card': FrigateCard; } } diff --git a/src/components-lib/live/live-controller.ts b/src/components-lib/live/live-controller.ts index 5616292c..f2121fda 100644 --- a/src/components-lib/live/live-controller.ts +++ b/src/components-lib/live/live-controller.ts @@ -1,10 +1,10 @@ import { LitElement, ReactiveController } from 'lit'; import { MediaLoadedInfo } from '../../types.js'; import { - FrigateCardMediaLoadedEventTarget, + AdvancedCameraCardMediaLoadedEventTarget, dispatchExistingMediaLoadedInfoAsEvent, } from '../../utils/media-info.js'; -import { FrigateCardMessageEventTarget } from '../message/dispatch.js'; +import { AdvancedCameraCardMessageEventTarget } from '../message/dispatch.js'; interface LiveViewContext { // A cameraID override (used for dependencies/substreams to force a different @@ -24,8 +24,8 @@ interface LastMediaLoadedInfo { } type LiveControllerHost = LitElement & - FrigateCardMediaLoadedEventTarget & - FrigateCardMessageEventTarget; + AdvancedCameraCardMediaLoadedEventTarget & + AdvancedCameraCardMessageEventTarget; export class LiveController implements ReactiveController { protected _host: LiveControllerHost; @@ -56,13 +56,19 @@ export class LiveController implements ReactiveController { public hostConnected(): void { this._intersectionObserver.observe(this._host); - this._host.addEventListener('frigate-card:media:loaded', this._handleMediaLoaded); + this._host.addEventListener( + 'advanced-camera-card:media:loaded', + this._handleMediaLoaded, + ); } public hostDisconnected(): void { this._intersectionObserver.disconnect(); - this._host.removeEventListener('frigate-card:media:loaded', this._handleMediaLoaded); + this._host.removeEventListener( + 'advanced-camera-card:media:loaded', + this._handleMediaLoaded, + ); } public isInBackground(): boolean { diff --git a/src/components-lib/live/utils/dispatch-live-error.ts b/src/components-lib/live/utils/dispatch-live-error.ts index ed0b99dd..16e37f48 100644 --- a/src/components-lib/live/utils/dispatch-live-error.ts +++ b/src/components-lib/live/utils/dispatch-live-error.ts @@ -1,5 +1,5 @@ -import { dispatchFrigateCardEvent } from '../../../utils/basic'; +import { dispatchAdvancedCameraCardEvent } from '../../../utils/basic'; export function dispatchLiveErrorEvent(element: EventTarget): void { - dispatchFrigateCardEvent(element, 'live:error'); + dispatchAdvancedCameraCardEvent(element, 'live:error'); } diff --git a/src/components-lib/media-actions-controller.ts b/src/components-lib/media-actions-controller.ts index 4f34c122..8f1bd14e 100644 --- a/src/components-lib/media-actions-controller.ts +++ b/src/components-lib/media-actions-controller.ts @@ -5,8 +5,8 @@ import { AutoPlayCondition, AutoUnmuteCondition, } from '../config/types.js'; -import { FrigateCardMediaPlayer } from '../types.js'; -import { FrigateCardMediaLoadedEventTarget } from '../utils/media-info.js'; +import { AdvancedCameraCardMediaPlayer } from '../types.js'; +import { AdvancedCameraCardMediaLoadedEventTarget } from '../utils/media-info.js'; import { Timer } from '../utils/timer.js'; export interface MediaActionsControllerOptions { @@ -21,8 +21,8 @@ export interface MediaActionsControllerOptions { microphoneMuteSeconds?: number; } -type RenderRoot = HTMLElement & FrigateCardMediaLoadedEventTarget; -type PlayerElement = HTMLElement & FrigateCardMediaPlayer; +type RenderRoot = HTMLElement & AdvancedCameraCardMediaLoadedEventTarget; +type PlayerElement = HTMLElement & AdvancedCameraCardMediaPlayer; /** * General note: Always unmute before playing, since Chrome may pause a piece of @@ -191,7 +191,7 @@ export class MediaActionsController { protected _removeChildHandlers(): void { for (const [child, callback] of this._eventListeners.entries()) { - child.removeEventListener('frigate-card:media:loaded', callback); + child.removeEventListener('advanced-camera-card:media:loaded', callback); } this._eventListeners.clear(); } @@ -223,7 +223,7 @@ export class MediaActionsController { for (const [index, child] of this._children.entries()) { const eventListener = () => this._mediaLoadedHandler(index); this._eventListeners.set(child, eventListener); - child.addEventListener('frigate-card:media:loaded', eventListener); + child.addEventListener('advanced-camera-card:media:loaded', eventListener); } } protected async _intersectionHandler( diff --git a/src/components-lib/media-grid-controller.ts b/src/components-lib/media-grid-controller.ts index 1ca2c48e..73aa9ffc 100644 --- a/src/components-lib/media-grid-controller.ts +++ b/src/components-lib/media-grid-controller.ts @@ -4,12 +4,12 @@ import Masonry from 'masonry-layout'; import { ViewDisplayConfig } from '../config/types'; import { MediaLoadedInfo } from '../types'; import { - dispatchFrigateCardEvent, + dispatchAdvancedCameraCardEvent, getChildrenFromElement, setOrRemoveAttribute, } from '../utils/basic'; import { - FrigateCardMediaLoadedEventTarget, + AdvancedCameraCardMediaLoadedEventTarget, dispatchExistingMediaLoadedInfoAsEvent, dispatchMediaUnloadedEvent, } from '../utils/media-info'; @@ -24,7 +24,7 @@ const MEDIA_GRID_DEFAULT_SELECTED_WIDTH_FACTOR = 2.0; const MEDIA_GRID_HORIZONTAL_GUTTER_WIDTH = 1; type GridID = string; -type MediaGridChild = HTMLElement & FrigateCardMediaLoadedEventTarget; +type MediaGridChild = HTMLElement & AdvancedCameraCardMediaLoadedEventTarget; type MediaGridContents = Map; export interface MediaGridSelected { @@ -137,7 +137,7 @@ export class MediaGridController { } this._selected = id; - dispatchFrigateCardEvent(this._host, 'media-grid:selected', { selected: id }); + dispatchAdvancedCameraCardEvent(this._host, 'media-grid:selected', { selected: id }); const mediaLoadedInfo = this._mediaLoadedInfoMap.get(id); if (mediaLoadedInfo) { @@ -155,7 +155,7 @@ export class MediaGridController { public unselectAll() { if (this._selected !== null) { dispatchMediaUnloadedEvent(this._host); - dispatchFrigateCardEvent(this._host, 'media-grid:unselected'); + dispatchAdvancedCameraCardEvent(this._host, 'media-grid:unselected'); } this._selected = null; this._updateSelectedStylesOnElements(); @@ -251,7 +251,7 @@ export class MediaGridController { }); child.addEventListener( - 'frigate-card:media:loaded', + 'advanced-camera-card:media:loaded', this._handleMediaLoadedInfoEvent, ); } @@ -262,7 +262,7 @@ export class MediaGridController { }); child.removeEventListener( - 'frigate-card:media:loaded', + 'advanced-camera-card:media:loaded', this._handleMediaLoadedInfoEvent, ); } @@ -345,12 +345,12 @@ export class MediaGridController { protected _setColumnSizeStyles(): void { this._host.style.setProperty( - '--frigate-card-grid-column-size', + '--advanced-camera-card-grid-column-size', `${this._getColumnSize()}px`, ); this._host.style.setProperty( - '--frigate-card-grid-selected-width-factor', + '--advanced-camera-card-grid-selected-width-factor', `${ this._displayConfig?.grid_selected_width_factor ?? MEDIA_GRID_DEFAULT_SELECTED_WIDTH_FACTOR diff --git a/src/components-lib/menu-button-controller.ts b/src/components-lib/menu-button-controller.ts index 17131539..75e0505f 100644 --- a/src/components-lib/menu-button-controller.ts +++ b/src/components-lib/menu-button-controller.ts @@ -6,12 +6,11 @@ import { MediaPlayerManager } from '../card-controller/media-player-manager'; import { MicrophoneManager } from '../card-controller/microphone-manager'; import { ViewManager } from '../card-controller/view/view-manager'; import { - FRIGATE_CARD_VIEWS_USER_SPECIFIED, - FrigateCardConfig, - FrigateCardCustomAction, + AdvancedCameraCardConfig, + AdvancedCameraCardCustomAction, MenuItem, + VIEWS_USER_SPECIFIED, } from '../config/types'; -import { FRIGATE_BUTTON_MENU_ICON } from '../const'; import { localize } from '../localize/localize.js'; import { MediaLoadedInfo } from '../types'; import { @@ -63,12 +62,12 @@ export class MenuButtonController { */ public calculateButtons( hass: HomeAssistant, - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, cameraManager: CameraManager, options?: MenuButtonControllerOptions, ): MenuItem[] { return [ - this._getDefaultButton(config), + this._getIrisButton(config), this._getCamerasButton(config, cameraManager, options?.view), this._getSubstreamsButton(config, cameraManager, options?.view), this._getLiveButton(config, options?.view, options?.viewManager), @@ -107,27 +106,25 @@ export class MenuButtonController { ].filter(isTruthy); } - protected _getDefaultButton(config: FrigateCardConfig): MenuItem { + protected _getIrisButton(config: AdvancedCameraCardConfig): MenuItem { return { - // Use a magic icon value that the menu will use to render the custom - // Frigate icon. - icon: FRIGATE_BUTTON_MENU_ICON, - ...config.menu.buttons.frigate, - type: 'custom:frigate-card-menu-icon', - title: localize('config.menu.buttons.frigate'), + icon: 'iris', + ...config.menu.buttons.iris, + type: 'custom:advanced-camera-card-menu-icon', + title: localize('config.menu.buttons.iris'), // The default button always shows regardless of whether the menu is // hidden or not. permanent: true, tap_action: config.menu?.style === 'hidden' - ? (createGeneralAction('menu_toggle') as FrigateCardCustomAction) - : (createGeneralAction('default') as FrigateCardCustomAction), - hold_action: createGeneralAction('diagnostics') as FrigateCardCustomAction, + ? (createGeneralAction('menu_toggle') as AdvancedCameraCardCustomAction) + : (createGeneralAction('default') as AdvancedCameraCardCustomAction), + hold_action: createGeneralAction('diagnostics') as AdvancedCameraCardCustomAction, }; } protected _getCamerasButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, cameraManager: CameraManager, view?: View | null, ): MenuItem | null { @@ -153,7 +150,7 @@ export class MenuButtonController { return { icon: 'mdi:video-switch', ...config.menu.buttons.cameras, - type: 'custom:frigate-card-menu-submenu', + type: 'custom:advanced-camera-card-menu-submenu', title: localize('config.menu.buttons.cameras'), items: submenuItems, }; @@ -162,7 +159,7 @@ export class MenuButtonController { } protected _getSubstreamsButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, cameraManager: CameraManager, view?: View | null, ): MenuItem | null { @@ -190,10 +187,10 @@ export class MenuButtonController { substreamAwareCameraID !== view.camera ? this._getEmphasizedStyle() : {}, title: localize('config.menu.buttons.substreams'), ...config.menu.buttons.substreams, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', tap_action: createGeneralAction( hasSubstream(view) ? 'live_substream_off' : 'live_substream_on', - ) as FrigateCardCustomAction, + ) as AdvancedCameraCardCustomAction, }; } else if (streams.length > 2) { const menuItems = Array.from(streams, (streamID) => { @@ -216,7 +213,7 @@ export class MenuButtonController { style: substreamAwareCameraID !== view.camera ? this._getEmphasizedStyle() : {}, ...config.menu.buttons.substreams, - type: 'custom:frigate-card-menu-submenu', + type: 'custom:advanced-camera-card-menu-submenu', items: menuItems, }; } @@ -225,7 +222,7 @@ export class MenuButtonController { } protected _getLiveButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, view?: View | null, viewManager?: ViewManager | null, ): MenuItem | null { @@ -233,16 +230,16 @@ export class MenuButtonController { ? { icon: 'mdi:cctv', ...config.menu.buttons.live, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.view.views.live'), style: view.is('live') ? this._getEmphasizedStyle() : {}, - tap_action: createGeneralAction('live') as FrigateCardCustomAction, + tap_action: createGeneralAction('live') as AdvancedCameraCardCustomAction, } : null; } protected _getClipsButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, view?: View | null, viewManager?: ViewManager | null, ): MenuItem | null { @@ -250,17 +247,17 @@ export class MenuButtonController { ? { icon: 'mdi:filmstrip', ...config.menu.buttons.clips, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.view.views.clips'), style: view?.is('clips') ? this._getEmphasizedStyle() : {}, - tap_action: createGeneralAction('clips') as FrigateCardCustomAction, - hold_action: createGeneralAction('clip') as FrigateCardCustomAction, + tap_action: createGeneralAction('clips') as AdvancedCameraCardCustomAction, + hold_action: createGeneralAction('clip') as AdvancedCameraCardCustomAction, } : null; } protected _getSnapshotsButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, view?: View | null, viewManager?: ViewManager | null, ): MenuItem | null { @@ -268,17 +265,17 @@ export class MenuButtonController { ? { icon: 'mdi:camera', ...config.menu.buttons.snapshots, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.view.views.snapshots'), style: view?.is('snapshots') ? this._getEmphasizedStyle() : {}, - tap_action: createGeneralAction('snapshots') as FrigateCardCustomAction, - hold_action: createGeneralAction('snapshot') as FrigateCardCustomAction, + tap_action: createGeneralAction('snapshots') as AdvancedCameraCardCustomAction, + hold_action: createGeneralAction('snapshot') as AdvancedCameraCardCustomAction, } : null; } protected _getRecordingsButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, view?: View | null, viewManager?: ViewManager | null, ): MenuItem | null { @@ -286,17 +283,21 @@ export class MenuButtonController { ? { icon: 'mdi:album', ...config.menu.buttons.recordings, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.view.views.recordings'), style: view.is('recordings') ? this._getEmphasizedStyle() : {}, - tap_action: createGeneralAction('recordings') as FrigateCardCustomAction, - hold_action: createGeneralAction('recording') as FrigateCardCustomAction, + tap_action: createGeneralAction( + 'recordings', + ) as AdvancedCameraCardCustomAction, + hold_action: createGeneralAction( + 'recording', + ) as AdvancedCameraCardCustomAction, } : null; } protected _getImageButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, view?: View | null, viewManager?: ViewManager | null, ): MenuItem | null { @@ -304,16 +305,16 @@ export class MenuButtonController { ? { icon: 'mdi:image', ...config.menu.buttons.image, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.view.views.image'), style: view?.is('image') ? this._getEmphasizedStyle() : {}, - tap_action: createGeneralAction('image') as FrigateCardCustomAction, + tap_action: createGeneralAction('image') as AdvancedCameraCardCustomAction, } : null; } protected _getTimelineButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, view?: View | null, viewManager?: ViewManager | null, ): MenuItem | null { @@ -321,16 +322,16 @@ export class MenuButtonController { ? { icon: 'mdi:chart-gantt', ...config.menu.buttons.timeline, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.view.views.timeline'), style: view.is('timeline') ? this._getEmphasizedStyle() : {}, - tap_action: createGeneralAction('timeline') as FrigateCardCustomAction, + tap_action: createGeneralAction('timeline') as AdvancedCameraCardCustomAction, } : null; } protected _getDownloadButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, cameraManager: CameraManager, view?: View | null, ): MenuItem | null { @@ -342,31 +343,31 @@ export class MenuButtonController { return { icon: 'mdi:download', ...config.menu.buttons.download, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.menu.buttons.download'), - tap_action: createGeneralAction('download') as FrigateCardCustomAction, + tap_action: createGeneralAction('download') as AdvancedCameraCardCustomAction, }; } return null; } protected _getCameraUIButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, showCameraUIButton?: boolean, ): MenuItem | null { return showCameraUIButton ? { icon: 'mdi:web', ...config.menu.buttons.camera_ui, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.menu.buttons.camera_ui'), - tap_action: createGeneralAction('camera_ui') as FrigateCardCustomAction, + tap_action: createGeneralAction('camera_ui') as AdvancedCameraCardCustomAction, } : null; } protected _getMicrophoneButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, microphoneManager?: MicrophoneManager | null, currentMediaLoadedInfo?: MediaLoadedInfo | null, ): MenuItem | null { @@ -382,23 +383,23 @@ export class MenuButtonController { ? 'mdi:microphone-off' : 'mdi:microphone', ...config.menu.buttons.microphone, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.menu.buttons.microphone'), style: unavailable || muted ? {} : this._getEmphasizedStyle(true), ...(!unavailable && buttonType === 'momentary' && { start_tap_action: createGeneralAction( 'microphone_unmute', - ) as FrigateCardCustomAction, + ) as AdvancedCameraCardCustomAction, end_tap_action: createGeneralAction( 'microphone_mute', - ) as FrigateCardCustomAction, + ) as AdvancedCameraCardCustomAction, }), ...(!unavailable && buttonType === 'toggle' && { tap_action: createGeneralAction( muted ? 'microphone_unmute' : 'microphone_mute', - ) as FrigateCardCustomAction, + ) as AdvancedCameraCardCustomAction, }), }; } @@ -406,21 +407,21 @@ export class MenuButtonController { } protected _getExpandButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, inExpandedMode?: boolean, ): MenuItem { return { icon: inExpandedMode ? 'mdi:arrow-collapse-all' : 'mdi:arrow-expand-all', ...config.menu.buttons.expand, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.menu.buttons.expand'), - tap_action: createGeneralAction('expand') as FrigateCardCustomAction, + tap_action: createGeneralAction('expand') as AdvancedCameraCardCustomAction, style: inExpandedMode ? this._getEmphasizedStyle() : {}, }; } protected _getFullscreenButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, fullscreenManager?: FullscreenManager | null, ): MenuItem | null { const inFullscreen = fullscreenManager?.isInFullscreen(); @@ -428,9 +429,11 @@ export class MenuButtonController { ? { icon: inFullscreen ? 'mdi:fullscreen-exit' : 'mdi:fullscreen', ...config.menu.buttons.fullscreen, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.menu.buttons.fullscreen'), - tap_action: createGeneralAction('fullscreen') as FrigateCardCustomAction, + tap_action: createGeneralAction( + 'fullscreen', + ) as AdvancedCameraCardCustomAction, style: inFullscreen ? this._getEmphasizedStyle() : {}, } : null; @@ -438,7 +441,7 @@ export class MenuButtonController { protected _getCastButton( hass: HomeAssistant, - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, cameraManager: CameraManager, view?: View | null, mediaPlayerController?: MediaPlayerManager | null, @@ -475,7 +478,7 @@ export class MenuButtonController { return { icon: 'mdi:cast', ...config.menu.buttons.media_player, - type: 'custom:frigate-card-menu-submenu', + type: 'custom:advanced-camera-card-menu-submenu', title: localize('config.menu.buttons.media_player'), items: mediaPlayerItems, }; @@ -484,7 +487,7 @@ export class MenuButtonController { } protected _getPlayPauseButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, currentMediaLoadedInfo?: MediaLoadedInfo | null, ): MenuItem | null { if ( @@ -496,18 +499,18 @@ export class MenuButtonController { return { icon: paused ? 'mdi:play' : 'mdi:pause', ...config.menu.buttons.play, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.menu.buttons.play'), tap_action: createGeneralAction( paused ? 'play' : 'pause', - ) as FrigateCardCustomAction, + ) as AdvancedCameraCardCustomAction, }; } return null; } protected _getMuteUnmuteButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, currentMediaLoadedInfo?: MediaLoadedInfo | null, ): MenuItem | null { if ( @@ -519,34 +522,34 @@ export class MenuButtonController { return { icon: muted ? 'mdi:volume-off' : 'mdi:volume-high', ...config.menu.buttons.mute, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.menu.buttons.mute'), tap_action: createGeneralAction( muted ? 'unmute' : 'mute', - ) as FrigateCardCustomAction, + ) as AdvancedCameraCardCustomAction, }; } return null; } protected _getScreenshotButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, currentMediaLoadedInfo?: MediaLoadedInfo | null, ): MenuItem | null { if (currentMediaLoadedInfo && currentMediaLoadedInfo.player) { return { icon: 'mdi:monitor-screenshot', ...config.menu.buttons.screenshot, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.menu.buttons.screenshot'), - tap_action: createGeneralAction('screenshot') as FrigateCardCustomAction, + tap_action: createGeneralAction('screenshot') as AdvancedCameraCardCustomAction, }; } return null; } protected _getDisplayModeButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, cameraManager: CameraManager, view?: View | null, ): MenuItem | null { @@ -563,7 +566,7 @@ export class MenuButtonController { icon: isGrid ? 'mdi:grid-off' : 'mdi:grid', ...config.menu.buttons.display_mode, style: isGrid ? this._getEmphasizedStyle() : {}, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: isGrid ? localize('display_modes.single') : localize('display_modes.grid'), @@ -574,7 +577,7 @@ export class MenuButtonController { } protected _getPTZControlsButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, cameraManager: CameraManager, view?: View | null, ): MenuItem | null { @@ -602,7 +605,7 @@ export class MenuButtonController { icon: 'mdi:pan', ...config.menu.buttons.ptz_controls, style: isOn ? this._getEmphasizedStyle() : {}, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.menu.buttons.ptz_controls'), tap_action: createPTZControlsAction(!isOn), }; @@ -611,7 +614,7 @@ export class MenuButtonController { } protected _getPTZHomeButton( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, cameraManager: CameraManager, view?: View | null, ): MenuItem | null { @@ -633,11 +636,11 @@ export class MenuButtonController { return { icon: 'mdi:home', ...config.menu.buttons.ptz_home, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: localize('config.menu.buttons.ptz_home'), tap_action: createPTZMultiAction({ targetID: target.targetID, - }) as FrigateCardCustomAction, + }) as AdvancedCameraCardCustomAction, }; } @@ -649,11 +652,11 @@ export class MenuButtonController { if (critical) { return { animation: 'pulse 3s infinite', - color: 'var(--frigate-card-menu-button-critical-color)', + color: 'var(--advanced-camera-card-menu-button-critical-color)', }; } return { - color: 'var(--frigate-card-menu-button-active-color)', + color: 'var(--advanced-camera-card-menu-button-active-color)', }; } @@ -664,7 +667,7 @@ export class MenuButtonController { * @returns A StyleInfo object. */ protected _getStyleFromActions( - config: FrigateCardConfig, + config: AdvancedCameraCardConfig, button: MenuItem, options?: MenuButtonControllerOptions, ): StyleInfo { @@ -677,28 +680,28 @@ export class MenuButtonController { ]) { const actions = Array.isArray(actionSet) ? actionSet : [actionSet]; for (const action of actions) { - // All frigate card actions will have action of 'fire-dom-event' and + // All advanced camera card actions will have action of 'fire-dom-event' and // styling only applies to those. if ( !action || action.action !== 'fire-dom-event' || - !('frigate_card_action' in action) + !('advanced_camera_card_action' in action) ) { continue; } - const frigateCardAction = action as FrigateCardCustomAction; + const customCardAction = action as AdvancedCameraCardCustomAction; if ( - FRIGATE_CARD_VIEWS_USER_SPECIFIED.some( + VIEWS_USER_SPECIFIED.some( (viewName) => - viewName === frigateCardAction.frigate_card_action && - options?.view?.is(frigateCardAction.frigate_card_action), + viewName === customCardAction.advanced_camera_card_action && + options?.view?.is(customCardAction.advanced_camera_card_action), ) || - (frigateCardAction.frigate_card_action === 'default' && + (customCardAction.advanced_camera_card_action === 'default' && options?.view?.is(config.view.default)) || - (frigateCardAction.frigate_card_action === 'fullscreen' && + (customCardAction.advanced_camera_card_action === 'fullscreen' && !!options?.fullscreenManager?.isInFullscreen()) || - (frigateCardAction.frigate_card_action === 'camera_select' && - options?.view?.camera === frigateCardAction.camera) + (customCardAction.advanced_camera_card_action === 'camera_select' && + options?.view?.camera === customCardAction.camera) ) { return this._getEmphasizedStyle(); } diff --git a/src/components-lib/menu-controller.ts b/src/components-lib/menu-controller.ts index a5fb4a8f..c14d65c4 100644 --- a/src/components-lib/menu-controller.ts +++ b/src/components-lib/menu-controller.ts @@ -3,7 +3,7 @@ import { LitElement } from 'lit'; import { orderBy } from 'lodash-es'; import { dispatchActionExecutionRequest } from '../card-controller/actions/utils/execution-request.js'; import { - FRIGATE_MENU_PRIORITY_MAX, + MENU_PRIORITY_MAX, type ActionType, type ActionsConfig, type MenuConfig, @@ -28,7 +28,7 @@ export class MenuController { public setMenuConfig(config: MenuConfig): void { this._config = config; this._host.style.setProperty( - '--frigate-card-menu-button-size', + '--advanced-camera-card-menu-button-size', `${config.button_size}px`, ); @@ -164,8 +164,7 @@ export class MenuController { // If the menu is hidden, the buttons that toggle the menu must come // first. return ( - priority + - (this._isHidingMenu() && button.permanent ? FRIGATE_MENU_PRIORITY_MAX : 0) + priority + (this._isHidingMenu() && button.permanent ? MENU_PRIORITY_MAX : 0) ); }, ['desc'], @@ -178,6 +177,6 @@ export class MenuController { protected _isUnknownActionMenuToggleAction(action: ActionType): boolean { const parsedAction = convertActionToCardCustomAction(action); - return !!parsedAction && parsedAction.frigate_card_action == 'menu_toggle'; + return !!parsedAction && parsedAction.advanced_camera_card_action == 'menu_toggle'; } } diff --git a/src/components-lib/message/dispatch.ts b/src/components-lib/message/dispatch.ts index 052730d5..4928cdfd 100644 --- a/src/components-lib/message/dispatch.ts +++ b/src/components-lib/message/dispatch.ts @@ -1,11 +1,14 @@ -import { FrigateCardError, Message } from '../../types'; -import { dispatchFrigateCardEvent } from '../../utils/basic'; +import { AdvancedCameraCardError, Message } from '../../types'; +import { dispatchAdvancedCameraCardEvent } from '../../utils/basic'; // Facilitates correct typing of event handlers. -export interface FrigateCardMessageEventTarget extends EventTarget { +export interface AdvancedCameraCardMessageEventTarget extends EventTarget { addEventListener( - event: 'frigate-card:message', - listener: (this: FrigateCardMessageEventTarget, ev: CustomEvent) => void, + event: 'advanced-camera-card:message', + listener: ( + this: AdvancedCameraCardMessageEventTarget, + ev: CustomEvent, + ) => void, options?: AddEventListenerOptions | boolean, ): void; addEventListener( @@ -14,8 +17,11 @@ export interface FrigateCardMessageEventTarget extends EventTarget { options?: AddEventListenerOptions | boolean, ): void; removeEventListener( - event: 'frigate-card:message', - listener: (this: FrigateCardMessageEventTarget, ev: CustomEvent) => void, + event: 'advanced-camera-card:message', + listener: ( + this: AdvancedCameraCardMessageEventTarget, + ev: CustomEvent, + ) => void, options?: boolean | EventListenerOptions, ): void; removeEventListener( @@ -33,15 +39,15 @@ export interface FrigateCardMessageEventTarget extends EventTarget { * @param element The element to send the event. * @param message The message to show. */ -export const dispatchFrigateCardErrorEvent = ( +export const dispatchAdvancedCameraCardErrorEvent = ( element: EventTarget, error: unknown, ): void => { if (error instanceof Error) { - dispatchFrigateCardEvent(element, 'message', { + dispatchAdvancedCameraCardEvent(element, 'message', { message: error.message, type: 'error', - ...(error instanceof FrigateCardError && { context: error.context }), + ...(error instanceof AdvancedCameraCardError && { context: error.context }), }); } }; diff --git a/src/components-lib/status-bar-controller.ts b/src/components-lib/status-bar-controller.ts index fc16323c..401726e1 100644 --- a/src/components-lib/status-bar-controller.ts +++ b/src/components-lib/status-bar-controller.ts @@ -5,7 +5,7 @@ import orderBy from 'lodash-es/orderBy'; import { dispatchActionExecutionRequest } from '../card-controller/actions/utils/execution-request'; import { ActionsConfig, - FRIGATE_STATUS_BAR_PRIORITY_DEFAULT, + STATUS_BAR_PRIORITY_DEFAULT, StatusBarConfig, StatusBarItem, } from '../config/types'; @@ -33,7 +33,7 @@ export class StatusBarController { const newItems = orderBy( exclusiveItems.length ? exclusiveItems : items, - (item) => item.priority ?? FRIGATE_STATUS_BAR_PRIORITY_DEFAULT, + (item) => item.priority ?? STATUS_BAR_PRIORITY_DEFAULT, 'desc', ); @@ -53,7 +53,7 @@ export class StatusBarController { public setConfig(config: StatusBarConfig): void { this._config = config; this._host.style.setProperty( - '--frigate-card-status-bar-height', + '--advanced-camera-card-status-bar-height', `${config.height}px`, ); @@ -97,11 +97,11 @@ export class StatusBarController { protected _getSufficientValue(item: StatusBarItem): string | null { /* istanbul ignore else: cannot happen -- @preserve */ - if (item.type === 'custom:frigate-card-status-bar-icon') { + if (item.type === 'custom:advanced-camera-card-status-bar-icon') { return item.icon; - } else if (item.type === 'custom:frigate-card-status-bar-string') { + } else if (item.type === 'custom:advanced-camera-card-status-bar-string') { return item.string; - } else if (item.type === 'custom:frigate-card-status-bar-image') { + } else if (item.type === 'custom:advanced-camera-card-status-bar-image') { return item.image; } else { return null; diff --git a/src/components-lib/timeline-source.ts b/src/components-lib/timeline-source.ts index 054cc0ef..4d9819b6 100644 --- a/src/components-lib/timeline-source.ts +++ b/src/components-lib/timeline-source.ts @@ -24,7 +24,7 @@ const TIMELINE_FRESHNESS_TOLERANCE_SECONDS = 30; // instead of clean recording blocks. const TIMELINE_RECORDING_SEGMENT_CONSECUTIVE_TOLERANCE_SECONDS = 60; -export interface FrigateCardTimelineItem extends TimelineItem { +export interface AdvancedCameraCardTimelineItem extends TimelineItem { // Use numbers to avoid significant volumes of Date object construction (for // high-quantity recording segments). start: number; @@ -38,7 +38,7 @@ export interface FrigateCardTimelineItem extends TimelineItem { export class TimelineDataSource { protected _cameraManager: CameraManager; - protected _dataset: DataSet = new DataSet(); + protected _dataset: DataSet = new DataSet(); // The ranges in which recordings have been calculated and added for. // Calculating recordings is a very expensive process since it is based on @@ -66,7 +66,7 @@ export class TimelineDataSource { this._showRecordings = showRecordings; } - get dataset(): DataSet { + get dataset(): DataSet { return this._dataset; } @@ -135,7 +135,7 @@ export class TimelineDataSource { } const mediaArray = await this._cameraManager.executeMediaQueries(eventQueries); - const data: FrigateCardTimelineItem[] = []; + const data: AdvancedCameraCardTimelineItem[] = []; for (const media of mediaArray ?? []) { const startTime = media.getStartTime(); const id = media.getID(); @@ -160,15 +160,15 @@ export class TimelineDataSource { } protected async _refreshRecordings(window: TimelineWindow): Promise { - type FrigateCardTimelineItemWithEnd = ModifyInterface< - FrigateCardTimelineItem, + type AdvancedCameraCardTimelineItemWithEnd = ModifyInterface< + AdvancedCameraCardTimelineItem, { end: number } >; const convertSegmentToRecording = ( cameraID: string, segment: RecordingSegment, - ): FrigateCardTimelineItemWithEnd => { + ): AdvancedCameraCardTimelineItemWithEnd => { return { id: `recording-${cameraID}-${segment.id}`, group: cameraID, @@ -181,11 +181,11 @@ export class TimelineDataSource { const getExistingRecordingsForCameraID = ( cameraID: string, - ): FrigateCardTimelineItemWithEnd[] => { + ): AdvancedCameraCardTimelineItemWithEnd[] => { return this._dataset.get({ filter: (item) => item.type == 'background' && item.group === cameraID && item.end !== undefined, - }) as FrigateCardTimelineItemWithEnd[]; + }) as AdvancedCameraCardTimelineItemWithEnd[]; }; const deleteRecordingsForCameraID = (cameraID: string): void => { @@ -196,7 +196,9 @@ export class TimelineDataSource { ); }; - const addRecordings = (recordings: FrigateCardTimelineItemWithEnd[]): void => { + const addRecordings = ( + recordings: AdvancedCameraCardTimelineItemWithEnd[], + ): void => { this._dataset.add(recordings); }; @@ -247,7 +249,7 @@ export class TimelineDataSource { const compressedRecordings = compressRanges( mergedRecordings, TIMELINE_RECORDING_SEGMENT_CONSECUTIVE_TOLERANCE_SECONDS, - ) as FrigateCardTimelineItemWithEnd[]; + ) as AdvancedCameraCardTimelineItemWithEnd[]; deleteRecordingsForCameraID(cameraID); addRecordings(compressedRecordings); diff --git a/src/components-lib/zoom/zoom-controller.ts b/src/components-lib/zoom/zoom-controller.ts index 2261e35a..3dd05075 100644 --- a/src/components-lib/zoom/zoom-controller.ts +++ b/src/components-lib/zoom/zoom-controller.ts @@ -1,9 +1,9 @@ import Panzoom, { PanzoomEventDetail, PanzoomObject } from '@dermotduffy/panzoom'; -import throttle from 'lodash-es/throttle'; import round from 'lodash-es/round'; +import throttle from 'lodash-es/throttle'; import { arefloatsApproximatelyEqual, - dispatchFrigateCardEvent, + dispatchAdvancedCameraCardEvent, isHoverableDevice, } from '../../utils/basic'; import { @@ -76,7 +76,7 @@ export class ZoomController { // Even though the click is stopped,the card still needs to gain focus so // that keyboard shortcuts will work immediately after the card is clicked // upon. - dispatchFrigateCardEvent(this._element, 'focus'); + dispatchAdvancedCameraCardEvent(this._element, 'focus'); } this._allowClick = true; }; @@ -133,7 +133,7 @@ export class ZoomController { // Disable automatic touchAction setting from Panzoom() as otherwise it // effectively disables dashboard scrolling. See: - // https://github.com/dermotduffy/frigate-hass-card/issues/1181 + // https://github.com/dermotduffy/advanced-camera-card/issues/1181 touchAction: '', // Set the initial pan/zoom values to avoid an initial unzoomed view. @@ -211,11 +211,11 @@ export class ZoomController { if (unzoomed && this._zoomed) { this._zoomed = false; this._setTouchAction(true); - dispatchFrigateCardEvent(this._element, 'zoom:unzoomed'); + dispatchAdvancedCameraCardEvent(this._element, 'zoom:unzoomed'); } else if (!unzoomed && !this._zoomed) { this._zoomed = true; this._setTouchAction(false); - dispatchFrigateCardEvent(this._element, 'zoom:zoomed'); + dispatchAdvancedCameraCardEvent(this._element, 'zoom:zoomed'); } const converted = this._convertXYPanToPercent(pz.x, pz.y, pz.scale); @@ -229,7 +229,7 @@ export class ZoomController { unzoomed: unzoomed, }; - dispatchFrigateCardEvent(this._element, 'zoom:change', observed); + dispatchAdvancedCameraCardEvent(this._element, 'zoom:change', observed); } protected _isZoomEqual(a: PartialZoomSettings, b: PartialZoomSettings): boolean { @@ -319,7 +319,7 @@ export class ZoomController { } /** - * Convert from Frigate card pan % values to Panzoom X/Y transformation + * Convert from Advanced Camera Card pan % values to Panzoom X/Y transformation * coordinates. * @param x The x translation value. * @param y The y translation value. @@ -439,7 +439,7 @@ export class ZoomController { return ( !this._isUnzoomed(this._panzoom?.getScale()) || // TouchEvent does not exist on Firefox on non-touch events. See: - // https://github.com/dermotduffy/frigate-hass-card/issues/1174 + // https://github.com/dermotduffy/advanced-camera-card/issues/1174 (window.TouchEvent && ev instanceof TouchEvent && ev.touches.length > 1) || (ev instanceof WheelEvent && ev.ctrlKey) ); diff --git a/src/components/carousel.ts b/src/components/carousel.ts index e1dabd85..7545cd1f 100644 --- a/src/components/carousel.ts +++ b/src/components/carousel.ts @@ -22,8 +22,8 @@ export type EmblaCarouselPlugins = CreatePluginType< Record >[]; -@customElement('frigate-card-carousel') -export class FrigateCardCarousel extends LitElement { +@customElement('advanced-camera-card-carousel') +export class AdvancedCameraCardCarousel extends LitElement { @property({ attribute: true, reflect: true }) public direction: CarouselDirection = 'horizontal'; @@ -124,6 +124,6 @@ export class FrigateCardCarousel extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-carousel': FrigateCardCarousel; + 'advanced-camera-card-carousel': AdvancedCameraCardCarousel; } } diff --git a/src/components/date-picker.ts b/src/components/date-picker.ts index 6401f719..47799c21 100644 --- a/src/components/date-picker.ts +++ b/src/components/date-picker.ts @@ -4,15 +4,15 @@ import { createRef, ref, Ref } from 'lit/directives/ref.js'; import { localize } from '../localize/localize'; import datePickerStyle from '../scss/date-picker.scss'; import { stopEventFromActivatingCardWideActions } from '../utils/action'; -import { dispatchFrigateCardEvent } from '../utils/basic'; +import { dispatchAdvancedCameraCardEvent } from '../utils/basic'; import './icon'; export interface DatePickerEvent { date: Date | null; } -@customElement('frigate-card-date-picker') -export class FrigateCardDatePicker extends LitElement { +@customElement('advanced-camera-card-date-picker') +export class AdvancedCameraCardDatePicker extends LitElement { @property({ attribute: false }) public icon?: string; @@ -32,7 +32,7 @@ export class FrigateCardDatePicker extends LitElement { const changed = () => { const value = this._refInput.value?.value; - dispatchFrigateCardEvent(this, 'date-picker:change', { + dispatchAdvancedCameraCardEvent(this, 'date-picker:change', { date: value ? new Date(value) : null, }); }; @@ -45,7 +45,7 @@ export class FrigateCardDatePicker extends LitElement { @input=${() => changed()} @change=${() => changed()} /> - - `; + `; } static get styles(): CSSResultGroup { @@ -64,6 +64,6 @@ export class FrigateCardDatePicker extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-date-picker': FrigateCardDatePicker; + 'advanced-camera-card-date-picker': AdvancedCameraCardDatePicker; } } diff --git a/src/components/diagnostics.ts b/src/components/diagnostics.ts index 650704e8..f9c3f56b 100644 --- a/src/components/diagnostics.ts +++ b/src/components/diagnostics.ts @@ -2,15 +2,15 @@ import { HomeAssistant } from '@dermotduffy/custom-card-helpers'; import { CSSResultGroup, html, LitElement, TemplateResult, unsafeCSS } from 'lit'; import { customElement, property } from 'lit/decorators.js'; import { until } from 'lit/directives/until.js'; -import { RawFrigateCardConfig } from '../config/types'; +import { RawAdvancedCameraCardConfig } from '../config/types'; import { localize } from '../localize/localize'; import basicBlockStyle from '../scss/basic-block.scss'; import { getDiagnostics } from '../utils/diagnostics'; import { DeviceRegistryManager } from '../utils/ha/registry/device'; import { renderMessage } from './message'; -@customElement('frigate-card-diagnostics') -export class FrigateCardDiagnostics extends LitElement { +@customElement('advanced-camera-card-diagnostics') +export class AdvancedCameraCardDiagnostics extends LitElement { // Not a reactive property to avoid multiple diagnostics fetches. public hass?: HomeAssistant; @@ -18,7 +18,7 @@ export class FrigateCardDiagnostics extends LitElement { public deviceRegistryManager?: DeviceRegistryManager; @property({ attribute: false }) - public rawConfig?: RawFrigateCardConfig; + public rawConfig?: RawAdvancedCameraCardConfig; protected async _renderDiagnostics(): Promise { const diagnostics = await getDiagnostics( @@ -52,6 +52,6 @@ export class FrigateCardDiagnostics extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-diagnostics': FrigateCardDiagnostics; + 'advanced-camera-card-diagnostics': AdvancedCameraCardDiagnostics; } } diff --git a/src/components/drawer.ts b/src/components/drawer.ts index 2913ef69..0fe03136 100644 --- a/src/components/drawer.ts +++ b/src/components/drawer.ts @@ -21,8 +21,8 @@ export interface DrawerIcons { closed?: string; } -@customElement('frigate-card-drawer') -export class FrigateCardDrawer extends LitElement { +@customElement('advanced-camera-card-drawer') +export class AdvancedCameraCardDrawer extends LitElement { @property({ attribute: true, reflect: true }) public location: 'left' | 'right' = 'left'; @@ -122,7 +122,7 @@ export class FrigateCardDrawer extends LitElement { this.open = !this.open; }} > - @@ -63,9 +63,9 @@ export class FrigateCardKeyAssigner extends LitElement { this._controller.setValue(null); }} > - + > ${localize('key_assigner.unassign')} ` : '' @@ -87,6 +87,6 @@ export class FrigateCardKeyAssigner extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-key-assigner': FrigateCardKeyAssigner; + 'advanced-camera-card-key-assigner': AdvancedCameraCardKeyAssigner; } } diff --git a/src/components/live/carousel.ts b/src/components/live/carousel.ts index 9002e08c..53f6724e 100644 --- a/src/components/live/carousel.ts +++ b/src/components/live/carousel.ts @@ -18,13 +18,13 @@ import { import { MicrophoneState } from '../../card-controller/types.js'; import { ViewManagerEpoch } from '../../card-controller/view/types.js'; import { MediaActionsController } from '../../components-lib/media-actions-controller.js'; -import { dispatchFrigateCardErrorEvent } from '../../components-lib/message/dispatch.js'; +import { dispatchAdvancedCameraCardErrorEvent } from '../../components-lib/message/dispatch.js'; import { ZoomSettingsObserved } from '../../components-lib/zoom/types.js'; import { handleZoomSettingsObservedEvent } from '../../components-lib/zoom/zoom-view-context.js'; import { CameraConfig, CardWideConfig, - frigateCardConfigDefaults, + configDefaults, LiveConfig, liveConfigAbsoluteRootSchema, Overrides, @@ -45,11 +45,11 @@ import '../carousel'; import { EmblaCarouselPlugins } from '../carousel.js'; import '../next-prev-control.js'; import '../ptz.js'; -import { FrigateCardPTZ } from '../ptz.js'; +import { AdvancedCameraCardPTZ } from '../ptz.js'; import './provider.js'; -import { FrigateCardLiveProvider } from './provider.js'; +import { AdvancedCameraCardLiveProvider } from './provider.js'; -const FRIGATE_CARD_LIVE_PROVIDER = 'frigate-card-live-provider'; +const ADVANCED_CAMERA_CARD_LIVE_PROVIDER = 'advanced-camera-card-live-provider'; interface CameraNeighbor { id: string; @@ -61,8 +61,8 @@ interface CameraNeighbors { next?: CameraNeighbor; } -@customElement('frigate-card-live-carousel') -export class FrigateCardLiveCarousel extends LitElement { +@customElement('advanced-camera-card-live-carousel') +export class AdvancedCameraCardLiveCarousel extends LitElement { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -95,7 +95,7 @@ export class FrigateCardLiveCarousel extends LitElement { // Index between camera name and slide number. protected _cameraToSlide: Record = {}; - protected _refPTZControl: Ref = createRef(); + protected _refPTZControl: Ref = createRef(); protected _refCarousel: Ref = createRef(); protected _mediaActionsController = new MediaActionsController(); @@ -118,7 +118,7 @@ export class FrigateCardLiveCarousel extends LitElement { protected _getTransitionEffect(): TransitionEffect { return ( this.overriddenLiveConfig?.transition_effect ?? - frigateCardConfigDefaults.live.transition_effect + configDefaults.live.transition_effect ); } @@ -143,7 +143,7 @@ export class FrigateCardLiveCarousel extends LitElement { changedProps.has('overriddenLiveConfig') ) { this._mediaActionsController.setOptions({ - playerSelector: FRIGATE_CARD_LIVE_PROVIDER, + playerSelector: ADVANCED_CAMERA_CARD_LIVE_PROVIDER, ...(this.overriddenLiveConfig?.auto_play && { autoPlayConditions: this.overriddenLiveConfig.auto_play, }), @@ -254,8 +254,8 @@ export class FrigateCardLiveCarousel extends LitElement { } const liveProvider = slide?.querySelector( - FRIGATE_CARD_LIVE_PROVIDER, - ) as FrigateCardLiveProvider | null; + ADVANCED_CAMERA_CARD_LIVE_PROVIDER, + ) as AdvancedCameraCardLiveProvider | null; if (liveProvider) { liveProvider.load = action === 'load'; } @@ -280,7 +280,7 @@ export class FrigateCardLiveCarousel extends LitElement { try { // The condition controller object contains the currently live camera, which // (in the carousel for example) is not necessarily the live camera *this* - // is rendering right now, so we provide a + // is rendering right now, so we provide a // stateOverride to evaluate the condition in that context. liveConfig = getOverriddenConfig( this.conditionsManagerEpoch.manager, @@ -292,7 +292,7 @@ export class FrigateCardLiveCarousel extends LitElement { }, ).live; } catch (ev) { - return dispatchFrigateCardErrorEvent(this, ev); + return dispatchAdvancedCameraCardErrorEvent(this, ev); } const cameraMetadata = this.cameraManager.getCameraMetadata(cameraID); @@ -300,7 +300,7 @@ export class FrigateCardLiveCarousel extends LitElement { return html`
- ) => + @advanced-camera-card:zoom:change=${(ev: CustomEvent) => handleZoomSettingsObservedEvent( ev, this.viewManagerEpoch?.manager, cameraID, )} > - +
`; } @@ -381,7 +381,7 @@ export class FrigateCardLiveCarousel extends LitElement { ? neighbors?.previous : neighbors?.next; - return html` - `; + `; } protected render(): TemplateResult | void { @@ -424,7 +424,7 @@ export class FrigateCardLiveCarousel extends LitElement { // options/plugins actually change. return html` - { + @advanced-camera-card:carousel:select=${this._setViewHandler.bind(this)} + @advanced-camera-card:media:loaded=${() => { this._mediaHasLoaded = true; }} - @frigate-card:media:unloaded=${() => { + @advanced-camera-card:media:unloaded=${() => { this._mediaHasLoaded = false; }} > @@ -447,14 +447,14 @@ export class FrigateCardLiveCarousel extends LitElement { ${slides} ${this._renderNextPrevious('right', neighbors)} - - + - + `; } @@ -486,7 +486,7 @@ export class FrigateCardLiveCarousel extends LitElement { // If the view has changed, or if the media actions controller has just been // initialized, then call the necessary media action. - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1626 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1626 if (initialized || changedProperties.has('viewManagerEpoch')) { this._setMediaTarget(); } @@ -499,6 +499,6 @@ export class FrigateCardLiveCarousel extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-live-carousel': FrigateCardLiveCarousel; + 'advanced-camera-card-live-carousel': AdvancedCameraCardLiveCarousel; } } diff --git a/src/components/live/grid.ts b/src/components/live/grid.ts index 2698be4b..3a738bee 100644 --- a/src/components/live/grid.ts +++ b/src/components/live/grid.ts @@ -19,8 +19,8 @@ import { ExtendedHomeAssistant } from '../../types.js'; import { contentsChanged } from '../../utils/basic.js'; import './carousel.js'; -@customElement('frigate-card-live-grid') -export class FrigateCardLiveGrid extends LitElement { +@customElement('advanced-camera-card-live-grid') +export class AdvancedCameraCardLiveGrid extends LitElement { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -56,7 +56,7 @@ export class FrigateCardLiveGrid extends LitElement { const triggeredCameraID = cameraID ?? view?.camera; return html` - - + `; } @@ -110,14 +110,15 @@ export class FrigateCardLiveGrid extends LitElement { } return html` - ) => - this._gridSelectCamera(ev.detail.selected)} + @advanced-camera-card:media-grid:selected=${( + ev: CustomEvent, + ) => this._gridSelectCamera(ev.detail.selected)} > ${[...cameraIDs].map((cameraID) => this._renderCarousel(cameraID))} - + `; } @@ -128,6 +129,6 @@ export class FrigateCardLiveGrid extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-live-grid': FrigateCardLiveGrid; + 'advanced-camera-card-live-grid': AdvancedCameraCardLiveGrid; } } diff --git a/src/components/live/index.ts b/src/components/live/index.ts index 758bc4b5..200097a7 100644 --- a/src/components/live/index.ts +++ b/src/components/live/index.ts @@ -11,8 +11,8 @@ import { ExtendedHomeAssistant } from '../../types.js'; import { contentsChanged } from '../../utils/basic.js'; import './grid.js'; -@customElement('frigate-card-live') -export class FrigateCardLive extends LitElement { +@customElement('advanced-camera-card-live') +export class AdvancedCameraCardLive extends LitElement { @property({ attribute: false }) public conditionsManagerEpoch?: ConditionsManagerEpoch; @@ -57,7 +57,7 @@ export class FrigateCardLive extends LitElement { // - Various events are captured to prevent them propagating upwards if the // card is in the background. return html` - - + `; } @@ -81,6 +81,6 @@ export class FrigateCardLive extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-live': FrigateCardLive; + 'advanced-camera-card-live': AdvancedCameraCardLive; } } diff --git a/src/components/live/provider.ts b/src/components/live/provider.ts index b9b67e26..38a11ac2 100644 --- a/src/components/live/provider.ts +++ b/src/components/live/provider.ts @@ -17,7 +17,7 @@ import { PartialZoomSettings } from '../../components-lib/zoom/types.js'; import { CameraConfig, CardWideConfig, - frigateCardConfigDefaults, + configDefaults, LiveConfig, LiveProvider, } from '../../config/types.js'; @@ -26,7 +26,7 @@ import { localize } from '../../localize/localize.js'; import liveProviderStyle from '../../scss/live-provider.scss'; import { ExtendedHomeAssistant, - FrigateCardMediaPlayer, + AdvancedCameraCardMediaPlayer, FullscreenElement, } from '../../types.js'; import { aspectRatioToString } from '../../utils/basic.js'; @@ -39,10 +39,10 @@ import '../next-prev-control.js'; import '../ptz.js'; import '../surround.js'; -@customElement('frigate-card-live-provider') -export class FrigateCardLiveProvider +@customElement('advanced-camera-card-live-provider') +export class AdvancedCameraCardLiveProvider extends LitElement - implements FrigateCardMediaPlayer + implements AdvancedCameraCardMediaPlayer { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -84,7 +84,7 @@ export class FrigateCardLiveProvider @state() protected _showStreamTroubleshooting = false; - protected _refProvider: Ref = createRef(); + protected _refProvider: Ref = createRef(); // A note on dynamic imports: // @@ -94,7 +94,7 @@ export class FrigateCardLiveProvider // underlying code is not yet loaded. // // Test case: A card with a non-live view, but live pre-loaded, attempts to - // call mute() when the element first renders in the + // call mute() when the element first renders in the // background. These calls fail without waiting for loading here. protected _importPromises: Promise[] = []; @@ -168,7 +168,7 @@ export class FrigateCardLiveProvider } else if (this.cameraConfig?.frigate.camera_name) { return 'jsmpeg'; } - return frigateCardConfigDefaults.cameras.live_provider; + return configDefaults.cameras.live_provider; } return this.cameraConfig?.live_provider || 'image'; } @@ -254,7 +254,7 @@ export class FrigateCardLiveProvider protected _useZoomIfRequired(template: TemplateResult): TemplateResult { return this.liveConfig?.zoomable - ? html` this.cameraConfig?.dimensions?.layout ? { @@ -264,11 +264,11 @@ export class FrigateCardLiveProvider : undefined, )} .settings=${this.zoomSettings} - @frigate-card:zoom:zoomed=${() => this.setControls(false)} - @frigate-card:zoom:unzoomed=${() => this.setControls()} + @advanced-camera-card:zoom:zoomed=${() => this.setControls(false)} + @advanced-camera-card:zoom:unzoomed=${() => this.setControls()} > ${template} - ` + ` : template; } @@ -331,12 +331,12 @@ export class FrigateCardLiveProvider return html`${this._useZoomIfRequired(html` ${showImageDuringLoading || provider === 'image' - ? html` this._providerErrorHandler()} - @frigate-card:media:loaded=${(ev: Event) => { + @advanced-camera-card:live:error=${() => this._providerErrorHandler()} + @advanced-camera-card:media:loaded=${(ev: Event) => { if (provider === 'image') { // Only count the media has loaded if the required provider is // the image (not just the temporary image shown during @@ -347,21 +347,21 @@ export class FrigateCardLiveProvider } }} > - ` + ` : html``} ${provider === 'ha' - ? html` this._providerErrorHandler()} - @frigate-card:media:loaded=${this._videoMediaShowHandler.bind(this)} + @advanced-camera-card:live:error=${() => this._providerErrorHandler()} + @advanced-camera-card:media:loaded=${this._videoMediaShowHandler.bind(this)} > - ` + ` : provider === 'go2rtc' - ? html` this._providerErrorHandler()} - @frigate-card:media:loaded=${this._videoMediaShowHandler.bind(this)} + @advanced-camera-card:live:error=${() => this._providerErrorHandler()} + @advanced-camera-card:media:loaded=${this._videoMediaShowHandler.bind( + this, + )} > - ` + ` : provider === 'webrtc-card' - ? html` this._providerErrorHandler()} - @frigate-card:media:loaded=${this._videoMediaShowHandler.bind(this)} + @advanced-camera-card:live:error=${() => this._providerErrorHandler()} + @advanced-camera-card:media:loaded=${this._videoMediaShowHandler.bind( + this, + )} > - ` + ` : provider === 'jsmpeg' - ? html` this._providerErrorHandler()} - @frigate-card:media:loaded=${this._videoMediaShowHandler.bind(this)} + @advanced-camera-card:live:error=${() => this._providerErrorHandler()} + @advanced-camera-card:media:loaded=${this._videoMediaShowHandler.bind( + this, + )} > - ` + ` : html``} `)} ${showLoadingIcon - ? html` { this._showStreamTroubleshooting = !this._showStreamTroubleshooting; }} - >` + >` : ''} ${this._showStreamTroubleshooting ? renderMessage( @@ -430,6 +436,6 @@ export class FrigateCardLiveProvider declare global { interface HTMLElementTagNameMap { - 'frigate-card-live-provider': FrigateCardLiveProvider; + 'advanced-camera-card-live-provider': AdvancedCameraCardLiveProvider; } } diff --git a/src/components/live/providers/go2rtc/README.md b/src/components/live/providers/go2rtc/README.md index 8a43e428..fc602967 100644 --- a/src/components/live/providers/go2rtc/README.md +++ b/src/components/live/providers/go2rtc/README.md @@ -1,7 +1,7 @@ # go2rtc Player This is a modified version of the go2rtc example video player code, modified for -use in the Frigate card. In order to make future maintenance easier, +use in the Advanced Camera Card. In order to make future maintenance easier, modifications have been kept to a minimum. ## Original Example Code diff --git a/src/components/live/providers/go2rtc/index.ts b/src/components/live/providers/go2rtc/index.ts index 045d844b..09c5f21c 100644 --- a/src/components/live/providers/go2rtc/index.ts +++ b/src/components/live/providers/go2rtc/index.ts @@ -15,7 +15,7 @@ import { localize } from '../../../../localize/localize.js'; import liveGo2RTCStyle from '../../../../scss/live-go2rtc.scss'; import { ExtendedHomeAssistant, - FrigateCardMediaPlayer, + AdvancedCameraCardMediaPlayer, FullscreenElement, Message, } from '../../../../types.js'; @@ -25,7 +25,7 @@ import { screenshotMedia } from '../../../../utils/screenshot.js'; import { renderMessage } from '../../../message.js'; import { VideoRTC } from './video-rtc.js'; -customElements.define('frigate-card-live-go2rtc-player', VideoRTC); +customElements.define('advanced-camera-card-live-go2rtc-player', VideoRTC); // Note (2023-02-18): Depending on the behavior of the player / browser is // possible this URL will need to be re-signed in order to avoid HA spamming @@ -34,8 +34,11 @@ customElements.define('frigate-card-live-go2rtc-player', VideoRTC); // provider). const GO2RTC_URL_SIGN_EXPIRY_SECONDS = 24 * 60 * 60; -@customElement('frigate-card-live-go2rtc') -export class FrigateCardGo2RTC extends LitElement implements FrigateCardMediaPlayer { +@customElement('advanced-camera-card-live-go2rtc') +export class AdvancedCameraCardGo2RTC + extends LitElement + implements AdvancedCameraCardMediaPlayer +{ // Not an reactive property to avoid resetting the video. public hass?: ExtendedHomeAssistant; @@ -116,7 +119,7 @@ export class FrigateCardGo2RTC extends LitElement implements FrigateCardMediaPla super.connectedCallback(); // Reset the player when reconnected to the DOM. - // https://github.com/dermotduffy/frigate-hass-card/issues/996 + // https://github.com/dermotduffy/advanced-camera-card/issues/996 this.requestUpdate(); } @@ -205,6 +208,6 @@ export class FrigateCardGo2RTC extends LitElement implements FrigateCardMediaPla declare global { interface HTMLElementTagNameMap { - 'frigate-card-live-go2rtc': FrigateCardGo2RTC; + 'advanced-camera-card-live-go2rtc': AdvancedCameraCardGo2RTC; } } diff --git a/src/components/live/providers/go2rtc/video-rtc.d.ts b/src/components/live/providers/go2rtc/video-rtc.d.ts index 3ed4fc9d..614408f4 100644 --- a/src/components/live/providers/go2rtc/video-rtc.d.ts +++ b/src/components/live/providers/go2rtc/video-rtc.d.ts @@ -29,7 +29,7 @@ export class VideoRTC extends HTMLElement { onmessage: Record void>; // Custom methods/members. - containingPlayer: FrigateCardMediaPlayer | null; + containingPlayer: AdvancedCameraCardMediaPlayer | null; microphoneStream: MediaStream | null; reconnect(); diff --git a/src/components/live/providers/go2rtc/video-rtc.js b/src/components/live/providers/go2rtc/video-rtc.js index 8a1e6b10..8f91760c 100644 --- a/src/components/live/providers/go2rtc/video-rtc.js +++ b/src/components/live/providers/go2rtc/video-rtc.js @@ -162,8 +162,8 @@ export class VideoRTC extends HTMLElement { this.microphoneStream = null; /** - * A reference to a containing FrigateCardMediaPlayer object. - * @type {FrigateCardMediaPlayer}} + * A reference to a containing AdvancedCameraCardMediaPlayer object. + * @type {AdvancedCameraCardMediaPlayer}} */ this.containingPlayer = null; @@ -222,7 +222,7 @@ export class VideoRTC extends HTMLElement { * https://developer.chrome.com/blog/autoplay/ */ play() { - // Frigate card controls playing at a higher level. + // Advanced Camera Card controls playing at a higher level. } /** @@ -303,7 +303,7 @@ export class VideoRTC extends HTMLElement { // eslint-disable-next-line @typescript-eslint/no-unused-vars this.video.addEventListener('error', (_ev) => { - // For Frigate Card, we avoid log spam here from errors, and also don't + // For Advanced Camera Card, we avoid log spam here from errors, and also don't // attempt to close the websocket unless the connection is open (otherwise // on reconnect() an exception will be thrown here that we're attempting // to close a connection that's not open) @@ -405,7 +405,7 @@ export class VideoRTC extends HTMLElement { if (this.pc) { // Do not close the (microphone) track attached to the peer connection as // that is controlled by MicrophoneManager. - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1810 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1810 this.pc.close(); this.pc = null; diff --git a/src/components/live/providers/ha.ts b/src/components/live/providers/ha.ts index ff4dd4df..6572325b 100644 --- a/src/components/live/providers/ha.ts +++ b/src/components/live/providers/ha.ts @@ -7,10 +7,13 @@ import '../../../patches/ha-camera-stream'; import '../../../patches/ha-hls-player.js'; import '../../../patches/ha-web-rtc-player.js'; import liveHAStyle from '../../../scss/live-ha.scss'; -import { FrigateCardMediaPlayer, FullscreenElement } from '../../../types.js'; +import { AdvancedCameraCardMediaPlayer, FullscreenElement } from '../../../types.js'; -@customElement('frigate-card-live-ha') -export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPlayer { +@customElement('advanced-camera-card-live-ha') +export class AdvancedCameraCardLiveHA + extends LitElement + implements AdvancedCameraCardMediaPlayer +{ @property({ attribute: false }) public hass?: HomeAssistant; @@ -20,7 +23,7 @@ export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPla @property({ attribute: true, type: Boolean }) public controls = false; - protected _playerRef: Ref = createRef(); + protected _playerRef: Ref = createRef(); public async play(): Promise { return this._playerRef.value?.play(); @@ -67,7 +70,7 @@ export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPla return; } - return html` - `; + `; } static get styles(): CSSResultGroup { @@ -86,6 +89,6 @@ export class FrigateCardLiveHA extends LitElement implements FrigateCardMediaPla declare global { interface HTMLElementTagNameMap { - 'frigate-card-live-ha': FrigateCardLiveHA; + 'advanced-camera-card-live-ha': AdvancedCameraCardLiveHA; } } diff --git a/src/components/live/providers/image.ts b/src/components/live/providers/image.ts index 88c29eda..62131786 100644 --- a/src/components/live/providers/image.ts +++ b/src/components/live/providers/image.ts @@ -4,18 +4,21 @@ import { customElement, property } from 'lit/decorators.js'; import { createRef, ref, Ref } from 'lit/directives/ref.js'; import { CameraConfig } from '../../../config/types'; import basicBlockStyle from '../../../scss/basic-block.scss'; -import { FrigateCardMediaPlayer, FullscreenElement } from '../../../types.js'; +import { AdvancedCameraCardMediaPlayer, FullscreenElement } from '../../../types.js'; import '../../image-base.js'; -@customElement('frigate-card-live-image') -export class FrigateCardLiveImage extends LitElement implements FrigateCardMediaPlayer { +@customElement('advanced-camera-card-live-image') +export class AdvancedCameraCardLiveImage + extends LitElement + implements AdvancedCameraCardMediaPlayer +{ @property({ attribute: false }) public hass?: HomeAssistant; @property({ attribute: false }) public cameraConfig?: CameraConfig; - protected _refImage: Ref = createRef(); + protected _refImage: Ref = createRef(); public async play(): Promise { await this._refImage.value?.play(); @@ -63,13 +66,13 @@ export class FrigateCardLiveImage extends LitElement implements FrigateCardMedia } return html` - - + `; } @@ -80,6 +83,6 @@ export class FrigateCardLiveImage extends LitElement implements FrigateCardMedia declare global { interface HTMLElementTagNameMap { - 'frigate-card-live-image': FrigateCardLiveImage; + 'advanced-camera-card-live-image': AdvancedCameraCardLiveImage; } } diff --git a/src/components/live/providers/jsmpeg.ts b/src/components/live/providers/jsmpeg.ts index e4063c05..279ec82b 100644 --- a/src/components/live/providers/jsmpeg.ts +++ b/src/components/live/providers/jsmpeg.ts @@ -15,8 +15,8 @@ import { CameraConfig, CardWideConfig } from '../../../config/types.js'; import { localize } from '../../../localize/localize.js'; import liveJSMPEGStyle from '../../../scss/live-jsmpeg.scss'; import { + AdvancedCameraCardMediaPlayer, ExtendedHomeAssistant, - FrigateCardMediaPlayer, FullscreenElement, Message, } from '../../../types.js'; @@ -38,8 +38,11 @@ const JSMPEG_URL_SIGN_EXPIRY_SECONDS = 24 * 60 * 60; // Number of seconds before the expiry to trigger a refresh. const JSMPEG_URL_SIGN_REFRESH_THRESHOLD_SECONDS = 1 * 60 * 60; -@customElement('frigate-card-live-jsmpeg') -export class FrigateCardLiveJSMPEG extends LitElement implements FrigateCardMediaPlayer { +@customElement('advanced-camera-card-live-jsmpeg') +export class AdvancedCameraCardLiveJSMPEG + extends LitElement + implements AdvancedCameraCardMediaPlayer +{ @property({ attribute: false }) public cameraConfig?: CameraConfig; @@ -303,6 +306,6 @@ export class FrigateCardLiveJSMPEG extends LitElement implements FrigateCardMedi declare global { interface HTMLElementTagNameMap { - 'frigate-card-live-jsmpeg': FrigateCardLiveJSMPEG; + 'advanced-camera-card-live-jsmpeg': AdvancedCameraCardLiveJSMPEG; } } diff --git a/src/components/live/providers/webrtc-card.ts b/src/components/live/providers/webrtc-card.ts index d9b36532..8cd90a3d 100644 --- a/src/components/live/providers/webrtc-card.ts +++ b/src/components/live/providers/webrtc-card.ts @@ -16,8 +16,8 @@ import { CameraConfig, CardWideConfig } from '../../../config/types.js'; import { localize } from '../../../localize/localize.js'; import liveWebRTCCardStyle from '../../../scss/live-webrtc-card.scss'; import { - FrigateCardError, - FrigateCardMediaPlayer, + AdvancedCameraCardError, + AdvancedCameraCardMediaPlayer, FullscreenElement, Message, } from '../../../types.js'; @@ -43,10 +43,10 @@ import { VideoRTC } from './go2rtc/video-rtc.js'; // Create a wrapper for AlexxIT's WebRTC card // - https://github.com/AlexxIT/WebRTC -@customElement('frigate-card-live-webrtc-card') -export class FrigateCardLiveWebRTCCard +@customElement('advanced-camera-card-live-webrtc-card') +export class AdvancedCameraCardLiveWebRTCCard extends LitElement - implements FrigateCardMediaPlayer + implements AdvancedCameraCardMediaPlayer { @property({ attribute: false }) public cameraConfig?: CameraConfig; @@ -125,7 +125,7 @@ export class FrigateCardLiveWebRTCCard super.connectedCallback(); // Reset the player when reconnected to the DOM. - // https://github.com/dermotduffy/frigate-hass-card/issues/996 + // https://github.com/dermotduffy/advanced-camera-card/issues/996 this.requestUpdate(); } @@ -177,11 +177,11 @@ export class FrigateCardLiveWebRTCCard // hidden. This is incompatible with the card zoom support, since the // video will easily stop if the user zooms in too much. Disable this // feature by default. - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1614 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1614 intersection: 0, - // Frigate card always starts muted (unlike webrtc-card). - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1654 + // Advanced Camera Card always starts muted (unlike webrtc-card). + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1654 muted: true, ...this.cameraConfig.webrtc_card, @@ -209,12 +209,12 @@ export class FrigateCardLiveWebRTCCard this._message = { type: 'error', message: - e instanceof FrigateCardError + e instanceof AdvancedCameraCardError ? e.message : localize('error.webrtc_card_reported_error') + ': ' + (e as Error).message, - context: (e as FrigateCardError).context, + context: (e as AdvancedCameraCardError).context, }; dispatchLiveErrorEvent(this); return; @@ -275,6 +275,6 @@ export class FrigateCardLiveWebRTCCard declare global { interface HTMLElementTagNameMap { - 'frigate-card-live-webrtc-card': FrigateCardLiveWebRTCCard; + 'advanced-camera-card-live-webrtc-card': AdvancedCameraCardLiveWebRTCCard; } } diff --git a/src/components/loading.ts b/src/components/loading.ts index f0ca552e..7fc57a94 100644 --- a/src/components/loading.ts +++ b/src/components/loading.ts @@ -4,10 +4,12 @@ import loadingStyle from '../scss/loading.scss'; import { getReleaseVersion } from '../utils/diagnostics'; import './icon'; -@customElement('frigate-card-loading') -export class FrigateCardLoading extends LitElement { +@customElement('advanced-camera-card-loading') +export class AdvancedCameraCardLoading extends LitElement { protected render(): TemplateResult { - return html`${getReleaseVersion()}`; } @@ -18,6 +20,6 @@ export class FrigateCardLoading extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-loading': FrigateCardLoading; + 'advanced-camera-card-loading': AdvancedCameraCardLoading; } } diff --git a/src/components/media-filter.ts b/src/components/media-filter.ts index e7a6bb06..7cf14393 100644 --- a/src/components/media-filter.ts +++ b/src/components/media-filter.ts @@ -21,14 +21,14 @@ import { import { CardWideConfig } from '../config/types'; import { localize } from '../localize/localize'; import mediaFilterStyle from '../scss/media-filter.scss'; -import { FrigateCardDatePicker } from './date-picker'; +import { AdvancedCameraCardDatePicker } from './date-picker'; import './date-picker.js'; -import { FrigateCardSelect } from './select'; +import { AdvancedCameraCardSelect } from './select'; import './select.js'; import { ViewManagerEpoch } from '../card-controller/view/types'; -@customElement('frigate-card-media-filter') -class FrigateCardMediaFilter extends ScopedRegistryHost(LitElement) { +@customElement('advanced-camera-card-media-filter') +class AdvancedCameraCardMediaFilter extends ScopedRegistryHost(LitElement) { @property({ attribute: false }) public hass?: HomeAssistant; @@ -42,21 +42,21 @@ class FrigateCardMediaFilter extends ScopedRegistryHost(LitElement) { public cardWideConfig?: CardWideConfig; static elementDefinitions = { - 'frigate-card-select': FrigateCardSelect, - 'frigate-card-date-picker': FrigateCardDatePicker, + 'advanced-camera-card-select': AdvancedCameraCardSelect, + 'advanced-camera-card-date-picker': AdvancedCameraCardDatePicker, }; protected _mediaFilterController = new MediaFilterController(this); - protected _refMediaType: Ref = createRef(); - protected _refCamera: Ref = createRef(); - protected _refWhen: Ref = createRef(); - protected _refWhenFrom: Ref = createRef(); - protected _refWhenTo: Ref = createRef(); - protected _refWhat: Ref = createRef(); - protected _refWhere: Ref = createRef(); - protected _refFavorite: Ref = createRef(); - protected _refTags: Ref = createRef(); + protected _refMediaType: Ref = createRef(); + protected _refCamera: Ref = createRef(); + protected _refWhen: Ref = createRef(); + protected _refWhenFrom: Ref = createRef(); + protected _refWhenTo: Ref = createRef(); + protected _refWhat: Ref = createRef(); + protected _refWhere: Ref = createRef(); + protected _refFavorite: Ref = createRef(); + protected _refTags: Ref = createRef(); protected willUpdate(changedProps: PropertyValues): void { if (changedProps.has('viewManagerEpoch')) { @@ -132,48 +132,48 @@ class FrigateCardMediaFilter extends ScopedRegistryHost(LitElement) { const tagsOptions = this._mediaFilterController.getTagsOptions(); const whereOptions = this._mediaFilterController.getWhereOptions(); - return html` valueChange()} + @advanced-camera-card:select:change=${() => valueChange()} > - +
- whenChange('selected')} + @advanced-camera-card:select:change=${() => whenChange('selected')} > - - + whenChange('custom')} + @advanced-camera-card:date-picker:change=${() => whenChange('custom')} > - - + whenChange('custom')} + @advanced-camera-card:date-picker:change=${() => whenChange('custom')} > - +
- valueChange()} + @advanced-camera-card:select:change=${() => valueChange()} > - + ${controls.events && whatOptions.length - ? html` valueChange()} + @advanced-camera-card:select:change=${() => valueChange()} > - ` + ` : ''} ${controls.events && tagsOptions.length - ? html` valueChange()} + @advanced-camera-card:select:change=${() => valueChange()} > - ` + ` : ''} ${controls.events && whereOptions.length - ? html` valueChange()} + @advanced-camera-card:select:change=${() => valueChange()} > - ` + ` : ''} ${controls.favorites ? html` - valueChange()} + @advanced-camera-card:select:change=${() => valueChange()} > - + ` : ''}`; } @@ -246,6 +246,6 @@ class FrigateCardMediaFilter extends ScopedRegistryHost(LitElement) { declare global { interface HTMLElementTagNameMap { - 'frigate-card-media-filter': FrigateCardMediaFilter; + 'advanced-camera-card-media-filter': AdvancedCameraCardMediaFilter; } } diff --git a/src/components/media-grid.ts b/src/components/media-grid.ts index 99b72b30..fe3f7c11 100644 --- a/src/components/media-grid.ts +++ b/src/components/media-grid.ts @@ -12,8 +12,8 @@ import { MediaGridController } from '../components-lib/media-grid-controller.js' import { ViewDisplayConfig } from '../config/types'; import mediaGridStyle from '../scss/media-grid.scss'; -@customElement('frigate-card-media-grid') -export class FrigateCardMediaGrid extends LitElement { +@customElement('advanced-camera-card-media-grid') +export class AdvancedCameraCardMediaGrid extends LitElement { @property({ attribute: false }) public selected?: string; @@ -68,6 +68,6 @@ export class FrigateCardMediaGrid extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-media-grid': FrigateCardMediaGrid; + 'advanced-camera-card-media-grid': AdvancedCameraCardMediaGrid; } } diff --git a/src/components/menu.ts b/src/components/menu.ts index 42c2ac21..2d14d50e 100644 --- a/src/components/menu.ts +++ b/src/components/menu.ts @@ -6,14 +6,14 @@ import { actionHandler } from '../action-handler-directive.js'; import { MenuController } from '../components-lib/menu-controller.js'; import type { MenuConfig, MenuItem } from '../config/types.js'; import menuStyle from '../scss/menu.scss'; -import { frigateCardHasAction } from '../utils/action.js'; +import { hasAction } from '../utils/action.js'; import { getEntityTitle } from '../utils/ha/index.js'; import { EntityRegistryManager } from '../utils/ha/registry/entity/index.js'; import './icon.js'; import './submenu.js'; -@customElement('frigate-card-menu') -export class FrigateCardMenu extends LitElement { +@customElement('advanced-camera-card-menu') +export class AdvancedCameraCardMenu extends LitElement { protected _controller = new MenuController(this); @property({ attribute: false }) @@ -43,37 +43,39 @@ export class FrigateCardMenu extends LitElement { return; } - if (button.type === 'custom:frigate-card-menu-submenu') { - return html` this._controller.actionHandler(ev)} > - `; - } else if (button.type === 'custom:frigate-card-menu-submenu-select') { - return html` `; + } else if (button.type === 'custom:advanced-camera-card-menu-submenu-select') { + return html` this._controller.actionHandler(ev)} > - `; + `; } const title = - this.hass && button.type === 'custom:frigate-card-menu-state-icon' && !button.title + this.hass && + button.type === 'custom:advanced-camera-card-menu-state-icon' && + !button.title ? getEntityTitle(this.hass, button.entity) : button.title; return html` this._controller.actionHandler(ev, button)} > - + > `; } @@ -108,13 +110,13 @@ export class FrigateCardMenu extends LitElement { const generateValue = (suffix: string): string => { return ` - var(--frigate-card-menu-override-${suffix}, - var(--frigate-card-menu-position-${position}-alignment-${alignment}-style-${style}-${suffix}, - var(--frigate-card-menu-position-${position}-alignment-${alignment}-${suffix}, - var(--frigate-card-menu-position-${position}-${suffix}, - var(--frigate-card-menu-style-${style}-${suffix}, - var(--frigate-card-menu-alignment-${alignment}-${suffix}, - var(--frigate-card-menu-${suffix})))))))`; + var(--advanced-camera-card-menu-override-${suffix}, + var(--advanced-camera-card-menu-position-${position}-alignment-${alignment}-style-${style}-${suffix}, + var(--advanced-camera-card-menu-position-${position}-alignment-${alignment}-${suffix}, + var(--advanced-camera-card-menu-position-${position}-${suffix}, + var(--advanced-camera-card-menu-style-${style}-${suffix}, + var(--advanced-camera-card-menu-alignment-${alignment}-${suffix}, + var(--advanced-camera-card-menu-${suffix})))))))`; }; // By definition `rule` will match the current configuration, the choice is @@ -169,6 +171,6 @@ export class FrigateCardMenu extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-menu': FrigateCardMenu; + 'advanced-camera-card-menu': AdvancedCameraCardMenu; } } diff --git a/src/components/message.ts b/src/components/message.ts index f944da9c..11dcd46c 100644 --- a/src/components/message.ts +++ b/src/components/message.ts @@ -13,13 +13,13 @@ export function renderMessage( overlay?: boolean; }, ): TemplateResult { - return html` `; + >`; } -@customElement('frigate-card-message') -export class FrigateCardMessage extends LitElement { +@customElement('advanced-camera-card-message') +export class AdvancedCameraCardMessage extends LitElement { @property({ attribute: false }) public message?: Message; @@ -51,7 +51,9 @@ export class FrigateCardMessage extends LitElement { return html`
- +
${messageTemplate} @@ -70,6 +72,6 @@ export class FrigateCardMessage extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-message': FrigateCardMessage; + 'advanced-camera-card-message': AdvancedCameraCardMessage; } } diff --git a/src/components/next-prev-control.ts b/src/components/next-prev-control.ts index 4c03f81c..db4999af 100644 --- a/src/components/next-prev-control.ts +++ b/src/components/next-prev-control.ts @@ -8,14 +8,17 @@ import { Icon } from '../types.js'; import { renderTask } from '../utils/task.js'; import { createFetchThumbnailTask } from '../utils/thumbnail.js'; -@customElement('frigate-card-next-previous-control') -export class FrigateCardNextPreviousControl extends LitElement { +@customElement('advanced-camera-card-next-previous-control') +export class AdvancedCameraCardNextPreviousControl extends LitElement { @property({ attribute: false }) public side?: 'left' | 'right'; set controlConfig(controlConfig: NextPreviousControlConfig | undefined) { if (controlConfig?.size) { - this.style.setProperty('--frigate-card-next-prev-size', `${controlConfig.size}px`); + this.style.setProperty( + '--advanced-camera-card-next-prev-size', + `${controlConfig.size}px`, + ); } this._controlConfig = controlConfig; } @@ -74,7 +77,10 @@ export class FrigateCardNextPreviousControl extends LitElement { : { icon: 'mdi:chevron-right' }; return html` - + `; } @@ -106,6 +112,6 @@ export class FrigateCardNextPreviousControl extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-next-previous-control': FrigateCardNextPreviousControl; + 'advanced-camera-card-next-previous-control': AdvancedCameraCardNextPreviousControl; } } diff --git a/src/components/overlay.ts b/src/components/overlay.ts index 2c98d7ba..8277bb5a 100644 --- a/src/components/overlay.ts +++ b/src/components/overlay.ts @@ -2,8 +2,8 @@ import { CSSResultGroup, LitElement, TemplateResult, html, unsafeCSS } from 'lit import { customElement } from 'lit/decorators.js'; import overlayStyle from '../scss/overlay.scss'; -@customElement('frigate-card-overlay') -export class FrigateCardOverlay extends LitElement { +@customElement('advanced-camera-card-overlay') +export class AdvancedCameraCardOverlay extends LitElement { protected render(): TemplateResult | void { return html` @@ -20,6 +20,6 @@ export class FrigateCardOverlay extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-overlay': FrigateCardOverlay; + 'advanced-camera-card-overlay': AdvancedCameraCardOverlay; } } diff --git a/src/components/progress-indicator.ts b/src/components/progress-indicator.ts index 196a4367..30e64eaf 100644 --- a/src/components/progress-indicator.ts +++ b/src/components/progress-indicator.ts @@ -6,17 +6,17 @@ import { CardWideConfig } from '../config/types.js'; import messageStyle from '../scss/message.scss'; import './icon.js'; -type FrigateCardProgressIndicatorSize = 'tiny' | 'small' | 'medium' | 'large'; +type AdvancedCameraCardProgressIndicatorSize = 'tiny' | 'small' | 'medium' | 'large'; export function renderProgressIndicator(options?: { message?: string; cardWideConfig?: CardWideConfig | null; componentRef?: Ref; classes?: ClassInfo; - size?: FrigateCardProgressIndicatorSize; + size?: AdvancedCameraCardProgressIndicatorSize; }): TemplateResult { return html` - - + `; } -@customElement('frigate-card-progress-indicator') -export class FrigateCardProgressIndicator extends LitElement { +@customElement('advanced-camera-card-progress-indicator') +export class AdvancedCameraCardProgressIndicator extends LitElement { @property({ attribute: false }) public message: string = ''; @@ -37,16 +37,16 @@ export class FrigateCardProgressIndicator extends LitElement { public animated = false; @property({ attribute: false }) - public size: FrigateCardProgressIndicatorSize = 'large'; + public size: AdvancedCameraCardProgressIndicatorSize = 'large'; protected render(): TemplateResult { return html`
${this.animated ? html` ` - : html``} + >`} ${this.message ? html`${this.message}` : html``}
`; } @@ -58,6 +58,6 @@ export class FrigateCardProgressIndicator extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-progress-indicator': FrigateCardProgressIndicator; + 'advanced-camera-card-progress-indicator': AdvancedCameraCardProgressIndicator; } } diff --git a/src/components/ptz.ts b/src/components/ptz.ts index d9639a50..cbf81c5f 100644 --- a/src/components/ptz.ts +++ b/src/components/ptz.ts @@ -16,11 +16,11 @@ import { PTZActionPresence } from '../components-lib/ptz/types.js'; import { Actions, PTZControlsConfig } from '../config/types.js'; import { localize } from '../localize/localize.js'; import ptzStyle from '../scss/ptz.scss'; -import { frigateCardHasAction } from '../utils/action.js'; +import { hasAction } from '../utils/action.js'; import './icon.js'; -@customElement('frigate-card-ptz') -export class FrigateCardPTZ extends LitElement { +@customElement('advanced-camera-card-ptz') +export class AdvancedCameraCardPTZ extends LitElement { @property({ attribute: false }) public config?: PTZControlsConfig; @@ -68,17 +68,17 @@ export class FrigateCardPTZ extends LitElement { }; return actions - ? html`) => this._controller.handleAction(ev, actions)} - >` + >` : html``; }; @@ -113,6 +113,6 @@ export class FrigateCardPTZ extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-ptz': FrigateCardPTZ; + 'advanced-camera-card-ptz': AdvancedCameraCardPTZ; } } diff --git a/src/components/select.ts b/src/components/select.ts index 94393e96..741018a3 100644 --- a/src/components/select.ts +++ b/src/components/select.ts @@ -9,7 +9,7 @@ import { import { property } from 'lit/decorators.js'; import { createRef, ref, Ref } from 'lit/directives/ref.js'; import selectStyle from '../scss/select.scss'; -import { contentsChanged, dispatchFrigateCardEvent } from '../utils/basic'; +import { contentsChanged, dispatchAdvancedCameraCardEvent } from '../utils/basic'; import { ScopedRegistryHost } from '@lit-labs/scoped-registry-mixin'; import { grSelectElements } from '../scoped-elements/gr-select'; import isEqual from 'lodash-es/isEqual'; @@ -26,7 +26,7 @@ type SelectElement = HTMLElement & { value: SelectValues; }; -export class FrigateCardSelect extends ScopedRegistryHost(LitElement) { +export class AdvancedCameraCardSelect extends ScopedRegistryHost(LitElement) { @property({ attribute: false, hasChanged: contentsChanged }) public options?: SelectOption[]; @@ -73,7 +73,7 @@ export class FrigateCardSelect extends ScopedRegistryHost(LitElement) { // (even when the user has not interacted with the control). Do not // dispatch events for this. if (!initialValueSet) { - dispatchFrigateCardEvent(this, 'select:change', value); + dispatchAdvancedCameraCardEvent(this, 'select:change', value); } } } @@ -111,6 +111,6 @@ export class FrigateCardSelect extends ScopedRegistryHost(LitElement) { declare global { interface HTMLElementTagNameMap { - 'frigate-card-select': FrigateCardSelect; + 'advanced-camera-card-select': AdvancedCameraCardSelect; } } diff --git a/src/components/status-bar.ts b/src/components/status-bar.ts index 13c90814..d6617e83 100644 --- a/src/components/status-bar.ts +++ b/src/components/status-bar.ts @@ -12,11 +12,11 @@ import { actionHandler } from '../action-handler-directive.js'; import { StatusBarController } from '../components-lib/status-bar-controller'; import { StatusBarConfig, StatusBarItem } from '../config/types'; import statusStyle from '../scss/status.scss'; -import { frigateCardHasAction } from '../utils/action'; +import { hasAction } from '../utils/action'; import './icon.js'; -@customElement('frigate-card-status-bar') -export class FrigateCardStatusBar extends LitElement { +@customElement('advanced-camera-card-status-bar') +export class AdvancedCameraCardStatusBar extends LitElement { protected _controller = new StatusBarController(this); @property({ attribute: false }) @@ -54,11 +54,11 @@ export class FrigateCardStatusBar extends LitElement { const generateValue = (suffix: string): string => { return ` - var(--frigate-card-status-bar-override-${suffix}, - var(--frigate-card-status-bar-position-${position}-style-${style}-${suffix}, - var(--frigate-card-status-bar-position-${position}-${suffix}, - var(--frigate-card-status-bar-style-${style}-${suffix}, - var(--frigate-card-status-bar-${suffix})))))`; + var(--advanced-camera-card-status-bar-override-${suffix}, + var(--advanced-camera-card-status-bar-position-${position}-style-${style}-${suffix}, + var(--advanced-camera-card-status-bar-position-${position}-${suffix}, + var(--advanced-camera-card-status-bar-style-${style}-${suffix}, + var(--advanced-camera-card-status-bar-${suffix})))))`; }; const rule = `[data-position='${position}']` + `[data-style='${style}']`; @@ -91,11 +91,11 @@ export class FrigateCardStatusBar extends LitElement { }); const handler = actionHandler({ - hasHold: frigateCardHasAction(item.actions?.hold_action), - hasDoubleClick: frigateCardHasAction(item.actions?.double_tap_action), + hasHold: hasAction(item.actions?.hold_action), + hasDoubleClick: hasAction(item.actions?.double_tap_action), }); - if (item.type === 'custom:frigate-card-status-bar-string') { + if (item.type === 'custom:advanced-camera-card-status-bar-string') { return html`
${item.string}
`; - } else if (item.type === 'custom:frigate-card-status-bar-icon') { - return html` this._controller.actionHandler(ev, item.actions)} - >`; - } else if (item.type === 'custom:frigate-card-status-bar-image') { + >`; + } else if (item.type === 'custom:advanced-camera-card-status-bar-image') { return html` ${title ?? ''} ${item.subtitle ? html`${item.subtitle}` : ''} - + > `; } @@ -90,7 +87,7 @@ export class FrigateCardSubmenu extends LitElement { @closed=${ // Prevent the submenu closing from closing anything upstream (e.g. // selecting a submenu in the editor dialog should not close the - // editor, see https://github.com/dermotduffy/frigate-hass-card/issues/377). + // editor, see https://github.com/dermotduffy/advanced-camera-card/issues/377). (ev) => ev.stopPropagation() } @click=${(ev) => stopEventFromActivatingCardWideActions(ev)} @@ -105,11 +102,11 @@ export class FrigateCardSubmenu extends LitElement { // propagation is forbidden by the @click handler on // . allowPropagation: true, - hasHold: frigateCardHasAction(this.submenu.hold_action), - hasDoubleClick: frigateCardHasAction(this.submenu.double_tap_action), + hasHold: hasAction(this.submenu.hold_action), + hasDoubleClick: hasAction(this.submenu.double_tap_action), })} > - + > ${items.map(this._renderItem.bind(this))} @@ -130,8 +127,8 @@ export class FrigateCardSubmenu extends LitElement { } } -@customElement('frigate-card-submenu-select') -export class FrigateCardSubmenuSelect extends LitElement { +@customElement('advanced-camera-card-submenu-select') +export class AdvancedCameraCardSubmenuSelect extends LitElement { @property({ attribute: false }) public hass?: HomeAssistant; @@ -220,7 +217,7 @@ export class FrigateCardSubmenuSelect extends LitElement { fallback: 'mdi:format-list-bulleted', }, - type: 'custom:frigate-card-menu-submenu', + type: 'custom:advanced-camera-card-menu-submenu', items: [], }; @@ -261,16 +258,16 @@ export class FrigateCardSubmenuSelect extends LitElement { } protected render(): TemplateResult { - return html` `; + >`; } } declare global { interface HTMLElementTagNameMap { - 'frigate-card-submenu': FrigateCardSubmenu; - 'frigate-card-submenu-select': FrigateCardSubmenuSelect; + 'advanced-camera-card-submenu': AdvancedCameraCardSubmenu; + 'advanced-camera-card-submenu-select': AdvancedCameraCardSubmenuSelect; } } diff --git a/src/components/surround-basic.ts b/src/components/surround-basic.ts index 1975b708..4a0a8ddc 100644 --- a/src/components/surround-basic.ts +++ b/src/components/surround-basic.ts @@ -1,26 +1,26 @@ import { CSSResultGroup, LitElement, TemplateResult, html, unsafeCSS } from 'lit'; import { createRef, ref, Ref } from 'lit/directives/ref.js'; import { customElement, property } from 'lit/decorators.js'; -import { DrawerIcons, FrigateCardDrawer } from './drawer.js'; +import { DrawerIcons, AdvancedCameraCardDrawer } from './drawer.js'; import './drawer.js'; import surroundBasicStyle from '../scss/surround-basic.scss'; -interface FrigateCardDrawerOpen { +interface AdvancedCameraCardDrawerOpen { drawer: 'left' | 'right'; } -@customElement('frigate-card-surround-basic') -export class FrigateCardSurroundBasic extends LitElement { +@customElement('advanced-camera-card-surround-basic') +export class AdvancedCameraCardSurroundBasic extends LitElement { @property({ attribute: false }) public drawerIcons?: { left?: DrawerIcons; right?: DrawerIcons; }; - protected _refDrawerLeft: Ref = createRef(); - protected _refDrawerRight: Ref = createRef(); + protected _refDrawerLeft: Ref = createRef(); + protected _refDrawerRight: Ref = createRef(); protected _boundDrawerHandler = this._drawerHandler.bind(this); /** @@ -28,8 +28,8 @@ export class FrigateCardSurroundBasic extends LitElement { */ connectedCallback(): void { super.connectedCallback(); - this.addEventListener('frigate-card:drawer:open', this._boundDrawerHandler); - this.addEventListener('frigate-card:drawer:close', this._boundDrawerHandler); + this.addEventListener('advanced-camera-card:drawer:open', this._boundDrawerHandler); + this.addEventListener('advanced-camera-card:drawer:close', this._boundDrawerHandler); } /** @@ -37,12 +37,18 @@ export class FrigateCardSurroundBasic extends LitElement { */ disconnectedCallback(): void { super.disconnectedCallback(); - this.removeEventListener('frigate-card:drawer:open', this._boundDrawerHandler); - this.removeEventListener('frigate-card:drawer:close', this._boundDrawerHandler); + this.removeEventListener( + 'advanced-camera-card:drawer:open', + this._boundDrawerHandler, + ); + this.removeEventListener( + 'advanced-camera-card:drawer:close', + this._boundDrawerHandler, + ); } protected _drawerHandler(ev: Event) { - const drawer = (ev as CustomEvent).detail.drawer; + const drawer = (ev as CustomEvent).detail.drawer; const open = ev.type.endsWith(':open'); if (drawer === 'left' && this._refDrawerLeft.value) { this._refDrawerLeft.value.open = open; @@ -54,20 +60,20 @@ export class FrigateCardSurroundBasic extends LitElement { protected render(): TemplateResult | void { return html` - - - + - + `; } @@ -81,6 +87,6 @@ export class FrigateCardSurroundBasic extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-surround-basic': FrigateCardSurroundBasic; + 'advanced-camera-card-surround-basic': AdvancedCameraCardSurroundBasic; } } diff --git a/src/components/surround.ts b/src/components/surround.ts index c48b5c7b..b63df56e 100644 --- a/src/components/surround.ts +++ b/src/components/surround.ts @@ -17,12 +17,12 @@ import { } from '../config/types.js'; import basicBlockStyle from '../scss/basic-block.scss'; import { ExtendedHomeAssistant } from '../types.js'; -import { contentsChanged, dispatchFrigateCardEvent } from '../utils/basic.js'; +import { contentsChanged, dispatchAdvancedCameraCardEvent } from '../utils/basic.js'; import './surround-basic.js'; import { ThumbnailCarouselTap } from './thumbnail-carousel.js'; -@customElement('frigate-card-surround') -export class FrigateCardSurround extends LitElement { +@customElement('advanced-camera-card-surround') +export class AdvancedCameraCardSurround extends LitElement { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -110,20 +110,22 @@ export class FrigateCardSurround extends LitElement { // request to view thumbnails and re-dispatches a request to open the drawer // (if the thumbnails are in a drawer). The new event needs to be dispatched // from the origin of the inbound event, so it can be handled by - // . + // . if (this.thumbnailConfig && this._hasDrawer()) { - dispatchFrigateCardEvent(ev.composedPath()[0], 'drawer:' + action, { + dispatchAdvancedCameraCardEvent(ev.composedPath()[0], 'drawer:' + action, { drawer: this.thumbnailConfig.mode, }); } }; - return html` changeDrawer(ev, 'open')} - @frigate-card:thumbnails:close=${(ev: CustomEvent) => changeDrawer(ev, 'close')} + return html` + changeDrawer(ev, 'open')} + @advanced-camera-card:thumbnails:close=${(ev: CustomEvent) => + changeDrawer(ev, 'close')} > ${this.thumbnailConfig && this.thumbnailConfig.mode !== 'none' - ? html` , ) => { const media = ev.detail.queryResults.getSelectedResult(); @@ -150,10 +152,10 @@ export class FrigateCardSurround extends LitElement { } }} > - ` + ` : ''} ${this.timelineConfig && this.timelineConfig.mode !== 'none' - ? html` - ` + ` : ''} - `; + `; } static get styles(): CSSResultGroup { @@ -182,6 +184,6 @@ export class FrigateCardSurround extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-surround': FrigateCardSurround; + 'advanced-camera-card-surround': AdvancedCameraCardSurround; } } diff --git a/src/components/thumbnail-carousel.ts b/src/components/thumbnail-carousel.ts index 52361d93..ea437449 100644 --- a/src/components/thumbnail-carousel.ts +++ b/src/components/thumbnail-carousel.ts @@ -9,23 +9,23 @@ import { import { customElement, property } from 'lit/decorators.js'; import { classMap } from 'lit/directives/class-map.js'; import { CameraManager } from '../camera-manager/manager.js'; +import { ViewManagerEpoch } from '../card-controller/view/types.js'; import { ThumbnailsControlConfig } from '../config/types.js'; import thumbnailCarouselStyle from '../scss/thumbnail-carousel.scss'; import { ExtendedHomeAssistant } from '../types.js'; import { stopEventFromActivatingCardWideActions } from '../utils/action.js'; -import { dispatchFrigateCardEvent } from '../utils/basic.js'; +import { dispatchAdvancedCameraCardEvent } from '../utils/basic.js'; import { CarouselDirection } from '../utils/embla/carousel-controller.js'; import { MediaQueriesResults } from '../view/media-queries-results'; import './carousel.js'; import './thumbnail.js'; -import { ViewManagerEpoch } from '../card-controller/view/types.js'; export interface ThumbnailCarouselTap { queryResults: MediaQueriesResults; } -@customElement('frigate-card-thumbnail-carousel') -export class FrigateCardThumbnailCarousel extends LitElement { +@customElement('advanced-camera-card-thumbnail-carousel') +export class AdvancedCameraCardThumbnailCarousel extends LitElement { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -46,7 +46,10 @@ export class FrigateCardThumbnailCarousel extends LitElement { protected willUpdate(changedProps: PropertyValues): void { if (changedProps.has('config')) { if (this.config?.size) { - this.style.setProperty('--frigate-card-thumbnail-size', `${this.config.size}px`); + this.style.setProperty( + '--advanced-camera-card-thumbnail-size', + `${this.config.size}px`, + ); } const direction = this._getDirection(); if (direction) { @@ -68,7 +71,7 @@ export class FrigateCardThumbnailCarousel extends LitElement { if (changedProps.has('viewManagerEpoch')) { this.style.setProperty( - '--frigate-card-carousel-thumbnail-opacity', + '--advanced-camera-card-carousel-thumbnail-opacity', !this.fadeThumbnails || this._getSelectedSlide() === null ? '1.0' : '0.4', ); } @@ -94,7 +97,7 @@ export class FrigateCardThumbnailCarousel extends LitElement { }; slides.push( - html` { const view = this.viewManagerEpoch?.manager.getView(); if (view && view.queryResults) { - dispatchFrigateCardEvent( + dispatchAdvancedCameraCardEvent( this, 'thumbnail-carousel:tap', { @@ -119,7 +122,7 @@ export class FrigateCardThumbnailCarousel extends LitElement { stopEventFromActivatingCardWideActions(ev); }} > - `, + `, ); } return slides; @@ -140,13 +143,13 @@ export class FrigateCardThumbnailCarousel extends LitElement { return; } - return html` ${this._thumbnailSlides} - `; + `; } static get styles(): CSSResultGroup { @@ -156,6 +159,6 @@ export class FrigateCardThumbnailCarousel extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-thumbnail-carousel': FrigateCardThumbnailCarousel; + 'advanced-camera-card-thumbnail-carousel': AdvancedCameraCardThumbnailCarousel; } } diff --git a/src/components/thumbnail.ts b/src/components/thumbnail.ts index 23c8bd86..7a54bddc 100644 --- a/src/components/thumbnail.ts +++ b/src/components/thumbnail.ts @@ -14,7 +14,7 @@ import { CameraManager } from '../camera-manager/manager.js'; import { CameraManagerCameraMetadata } from '../camera-manager/types.js'; import { RemoveContextViewModifier } from '../card-controller/view/modifiers/remove-context.js'; import { ViewManagerEpoch } from '../card-controller/view/types.js'; -import { dispatchFrigateCardErrorEvent } from '../components-lib/message/dispatch.js'; +import { dispatchAdvancedCameraCardErrorEvent } from '../components-lib/message/dispatch.js'; import { localize } from '../localize/localize.js'; import thumbnailDetailsStyle from '../scss/thumbnail-details.scss'; import thumbnailFeatureTextStyle from '../scss/thumbnail-feature-text.scss'; @@ -37,8 +37,8 @@ import { EventViewMedia, RecordingViewMedia, ViewMedia } from '../view/media.js' // The minimum width of a thumbnail with details enabled. export const THUMBNAIL_DETAILS_WIDTH_MIN = 300; -@customElement('frigate-card-thumbnail-feature-thumbnail') -export class FrigateCardThumbnailFeatureThumbnail extends LitElement { +@customElement('advanced-camera-card-thumbnail-feature-thumbnail') +export class AdvancedCameraCardThumbnailFeatureThumbnail extends LitElement { @property({ attribute: false }) public thumbnail?: string; @@ -105,10 +105,10 @@ export class FrigateCardThumbnailFeatureThumbnail extends LitElement { } protected render(): TemplateResult | void { - const imageOff = html` `; + > `; if (!this._embedThumbnailTask || this._thumbnailError) { return imageOff; @@ -134,8 +134,8 @@ export class FrigateCardThumbnailFeatureThumbnail extends LitElement { } } -@customElement('frigate-card-thumbnail-feature-text') -export class FrigateCardThumbnailFeatureText extends LitElement { +@customElement('advanced-camera-card-thumbnail-feature-text') +export class AdvancedCameraCardThumbnailFeatureText extends LitElement { @property({ attribute: false }) public date?: Date; @@ -151,10 +151,10 @@ export class FrigateCardThumbnailFeatureText extends LitElement { } return html` ${this.cameraMetadata?.engineIcon - ? html`` + >` : ''}
${format(this.date, 'HH:mm')}
@@ -171,8 +171,8 @@ export class FrigateCardThumbnailFeatureText extends LitElement { } } -@customElement('frigate-card-thumbnail-details-event') -export class FrigateCardThumbnailDetailsEvent extends LitElement { +@customElement('advanced-camera-card-thumbnail-details-event') +export class AdvancedCameraCardThumbnailDetailsEvent extends LitElement { @property({ attribute: false }) public media?: EventViewMedia; @@ -214,18 +214,18 @@ export class FrigateCardThumbnailDetailsEvent extends LitElement {
${startTime ? html`
- + > ${startTime}
${duration || inProgress ? html`
- + > ${duration ? html`${duration}` : ''} ${inProgress ? html`${inProgress}` @@ -235,37 +235,37 @@ export class FrigateCardThumbnailDetailsEvent extends LitElement { : ''} ${this.cameraTitle ? html`
- + > ${this.cameraTitle}
` : ''} ${where ? html`
- + > ${where}
` : html``} ${tags ? html`
- + > ${tags}
` : html``} ${seek ? html`
- + > ${seek}
` : html``} @@ -278,8 +278,8 @@ export class FrigateCardThumbnailDetailsEvent extends LitElement { } } -@customElement('frigate-card-thumbnail-details-recording') -export class FrigateCardThumbnailDetailsRecording extends LitElement { +@customElement('advanced-camera-card-thumbnail-details-recording') +export class AdvancedCameraCardThumbnailDetailsRecording extends LitElement { @property({ attribute: false }) public media?: RecordingViewMedia; @@ -315,18 +315,18 @@ export class FrigateCardThumbnailDetailsRecording extends LitElement {
${startTime ? html`
- + > ${startTime}
${duration || inProgress ? html`
- + > ${duration ? html`${duration}` : ''} ${inProgress ? html`${inProgress}` @@ -336,19 +336,19 @@ export class FrigateCardThumbnailDetailsRecording extends LitElement { : ''} ${seek ? html`
- + > ${seek}
` : html``} ${eventCount !== null ? html`
- + > ${eventCount}
` : ``} @@ -361,8 +361,8 @@ export class FrigateCardThumbnailDetailsRecording extends LitElement { } } -@customElement('frigate-card-thumbnail') -export class FrigateCardThumbnail extends LitElement { +@customElement('advanced-camera-card-thumbnail') +export class AdvancedCameraCardThumbnail extends LitElement { // Performance: During timeline scrubbing, hass may be updated continuously. // As it is not needed for the thumbnail rendering itself, it does not trigger // a re-render. The HomeAssistant object may be required for thumbnail signing @@ -439,25 +439,25 @@ export class FrigateCardThumbnail extends LitElement { return html` ${ViewMediaClassifier.isEvent(this.media) && thumbnail - ? html`` + >` : ViewMediaClassifier.isEvent(this.media) || ViewMediaClassifier.isRecording(this.media) - ? html`` + >` : html``} ${shouldShowFavoriteControl - ? html` ` + />` : ``} ${this.details && ViewMediaClassifier.isEvent(this.media) - ? html`` + >` : this.details && ViewMediaClassifier.isRecording(this.media) - ? html`` + >` : html``} ${shouldShowTimelineControl - ? html`` + >` : ''} ${shouldShowDownloadControl - ? html` ` + >` : ``} `; } @@ -544,10 +544,10 @@ export class FrigateCardThumbnail extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-thumbnail': FrigateCardThumbnail; - 'frigate-card-thumbnail-details-recording': FrigateCardThumbnailDetailsRecording; - 'frigate-card-thumbnail-details-event': FrigateCardThumbnailDetailsEvent; - 'frigate-card-thumbnail-feature-text': FrigateCardThumbnailFeatureText; - 'frigate-card-thumbnail-feature-thumbnail': FrigateCardThumbnailFeatureThumbnail; + 'advanced-camera-card-thumbnail': AdvancedCameraCardThumbnail; + 'advanced-camera-card-thumbnail-details-recording': AdvancedCameraCardThumbnailDetailsRecording; + 'advanced-camera-card-thumbnail-details-event': AdvancedCameraCardThumbnailDetailsEvent; + 'advanced-camera-card-thumbnail-feature-text': AdvancedCameraCardThumbnailFeatureText; + 'advanced-camera-card-thumbnail-feature-thumbnail': AdvancedCameraCardThumbnailFeatureThumbnail; } } diff --git a/src/components/timeline-core.ts b/src/components/timeline-core.ts index 058ae3ba..07274dc7 100644 --- a/src/components/timeline-core.ts +++ b/src/components/timeline-core.ts @@ -34,17 +34,17 @@ import { convertRangeToCacheFriendlyTimes } from '../camera-manager/utils/range- import { MergeContextViewModifier } from '../card-controller/view/modifiers/merge-context'; import { ViewManagerEpoch } from '../card-controller/view/types'; import { - FrigateCardTimelineItem, + AdvancedCameraCardTimelineItem, TimelineDataSource, } from '../components-lib/timeline-source'; import { + AdvancedCameraCardView, CameraConfig, CardWideConfig, - FrigateCardView, ThumbnailsControlBaseConfig, TimelineCoreConfig, TimelinePanMode, - frigateCardConfigDefaults, + configDefaults, } from '../config/types'; import { localize } from '../localize/localize'; import timelineCoreStyle from '../scss/timeline-core.scss'; @@ -52,7 +52,7 @@ import { ExtendedHomeAssistant } from '../types'; import { stopEventFromActivatingCardWideActions } from '../utils/action'; import { contentsChanged, - dispatchFrigateCardEvent, + dispatchAdvancedCameraCardEvent, formatDateAndTime, isHoverableDevice, isTruthy, @@ -73,11 +73,11 @@ import { import { MediaQueriesResults } from '../view/media-queries-results'; import { mergeViewContext } from '../view/view'; import './date-picker.js'; -import { DatePickerEvent, FrigateCardDatePicker } from './date-picker.js'; +import { AdvancedCameraCardDatePicker, DatePickerEvent } from './date-picker.js'; import './icon'; import './thumbnail.js'; -interface FrigateCardGroupData { +interface AdvancedCameraCardGroupData { id: string; content: string; } @@ -123,8 +123,8 @@ const TIMELINE_TARGET_BAR_ID = 'target_bar'; * A simgple thumbnail wrapper class for use in the timeline where Lit data * bindings are not available. */ -@customElement('frigate-card-timeline-thumbnail') -export class FrigateCardTimelineThumbnail extends LitElement { +@customElement('advanced-camera-card-timeline-thumbnail') +export class AdvancedCameraCardTimelineThumbnail extends LitElement { @property({ attribute: true }) public item?: IdType; @@ -153,11 +153,14 @@ export class FrigateCardTimelineThumbnail extends LitElement { item: this.item, }; this.dispatchEvent( - new ThumbnailDataRequestEvent(`frigate-card:timeline:thumbnail-data-request`, { - composed: true, - bubbles: true, - detail: dataRequest, - }), + new ThumbnailDataRequestEvent( + `advanced-camera-card:timeline:thumbnail-data-request`, + { + composed: true, + bubbles: true, + detail: dataRequest, + }, + ), ); if ( @@ -170,19 +173,19 @@ export class FrigateCardTimelineThumbnail extends LitElement { return html``; } - return html` - `; + `; } } -@customElement('frigate-card-timeline-core') -export class FrigateCardTimelineCore extends LitElement { +@customElement('advanced-camera-card-timeline-core') +export class AdvancedCameraCardTimelineCore extends LitElement { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -219,7 +222,7 @@ export class FrigateCardTimelineCore extends LitElement { protected _targetBarVisible = false; - protected _refDatePicker: Ref = createRef(); + protected _refDatePicker: Ref = createRef(); protected _refTimeline: Ref = createRef(); protected _timeline?: ExtendedTimeline; @@ -256,11 +259,11 @@ export class FrigateCardTimelineCore extends LitElement { // Note that changes to attributes here must be mirrored in the xss // whitelist in `_getOptions()` . return ` - - `; + `; } protected _handleThumbnailDataRequest(request: ThumbnailDataRequestEvent): void { @@ -302,7 +305,7 @@ export class FrigateCardTimelineCore extends LitElement { : 'mdi:camera-lock'; return html`
${this._shouldSupportSeeking() - ? html` { this._panMode = @@ -325,17 +328,19 @@ export class FrigateCardTimelineCore extends LitElement { aria-label="${panTitle}" title="${panTitle}" > - ` + ` : ''} - ) => { + @advanced-camera-card:date-picker:change=${( + ev: CustomEvent, + ) => { if (ev.detail.date) { this._timeline?.moveTo(ev.detail.date); } }} > - +
`; } @@ -498,7 +503,7 @@ export class FrigateCardTimelineCore extends LitElement { newResults = results; } - const desiredView: FrigateCardView = this.mini + const desiredView: AdvancedCameraCardView = this.mini ? targetTime >= new Date() ? 'live' : 'media' @@ -629,7 +634,7 @@ export class FrigateCardTimelineCore extends LitElement { } } - dispatchFrigateCardEvent(this, `thumbnails:${drawerAction}`); + dispatchAdvancedCameraCardEvent(this, `thumbnails:${drawerAction}`); this._ignoreClick = false; } @@ -726,7 +731,7 @@ export class FrigateCardTimelineCore extends LitElement { * @returns The dataset. */ protected _getGroups(): DataGroupCollectionType { - const groups: FrigateCardGroupData[] = []; + const groups: AdvancedCameraCardGroupData[] = []; (this.cameraIDs ?? []).forEach((cameraID: string) => { if (!this.hass || !this.cameraManager) { return; @@ -789,10 +794,7 @@ export class FrigateCardTimelineCore extends LitElement { * Get the configured window length in seconds. */ protected _getConfiguredWindowSeconds(): number { - return ( - this.timelineConfig?.window_seconds ?? - frigateCardConfigDefaults.timeline.window_seconds - ); + return this.timelineConfig?.window_seconds ?? configDefaults.timeline.window_seconds; } /** @@ -862,8 +864,8 @@ export class FrigateCardTimelineCore extends LitElement { clusterCriteria: (first: TimelineItem, second: TimelineItem): boolean => { const selectedIDs = this._getAllSelectedMediaIDsFromView(); - const firstMedia = (first).media; - const secondMedia = (second).media; + const firstMedia = (first).media; + const secondMedia = (second).media; // Never include the currently selected item in a cluster, and // never group different object types together (e.g. person and @@ -909,7 +911,7 @@ export class FrigateCardTimelineCore extends LitElement { disabled: false, filterOptions: { whiteList: { - 'frigate-card-timeline-thumbnail': ['details', 'item'], + 'advanced-camera-card-timeline-thumbnail': ['details', 'item'], div: ['title'], span: ['style'], }, @@ -1117,11 +1119,11 @@ export class FrigateCardTimelineCore extends LitElement { if (changedProps.has('thumbnailConfig')) { if (this.thumbnailConfig) { this.style.setProperty( - '--frigate-card-thumbnail-size', + '--advanced-camera-card-thumbnail-size', `${this.thumbnailConfig.size}px`, ); } else { - this.style.removeProperty('--frigate-card-thumbnail-size'); + this.style.removeProperty('--advanced-camera-card-thumbnail-size'); } } @@ -1248,7 +1250,7 @@ export class FrigateCardTimelineCore extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-timeline-thumbnail': FrigateCardTimelineThumbnail; - 'frigate-card-timeline-core': FrigateCardTimelineCore; + 'advanced-camera-card-timeline-thumbnail': AdvancedCameraCardTimelineThumbnail; + 'advanced-camera-card-timeline-core': AdvancedCameraCardTimelineCore; } } diff --git a/src/components/timeline.ts b/src/components/timeline.ts index 4e0c11e9..d8554af8 100644 --- a/src/components/timeline.ts +++ b/src/components/timeline.ts @@ -8,8 +8,8 @@ import { ExtendedHomeAssistant } from '../types'; import './surround.js'; import './timeline-core.js'; -@customElement('frigate-card-timeline') -export class FrigateCardTimeline extends LitElement { +@customElement('advanced-camera-card-timeline') +export class AdvancedCameraCardTimeline extends LitElement { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -31,7 +31,7 @@ export class FrigateCardTimeline extends LitElement { } return html` - - + `; } @@ -56,6 +56,6 @@ export class FrigateCardTimeline extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-timeline': FrigateCardTimeline; + 'advanced-camera-card-timeline': AdvancedCameraCardTimeline; } } diff --git a/src/components/viewer/carousel.ts b/src/components/viewer/carousel.ts index 9b0169af..44546a11 100644 --- a/src/components/viewer/carousel.ts +++ b/src/components/viewer/carousel.ts @@ -15,7 +15,7 @@ import { ViewManagerEpoch } from '../../card-controller/view/types.js'; import { MediaActionsController } from '../../components-lib/media-actions-controller.js'; import { CardWideConfig, - frigateCardConfigDefaults, + configDefaults, TransitionEffect, ViewerConfig, } from '../../config/types.js'; @@ -23,8 +23,8 @@ import { localize } from '../../localize/localize.js'; import '../../patches/ha-hls-player.js'; import viewerCarouselStyle from '../../scss/viewer-carousel.scss'; import { + AdvancedCameraCardMediaPlayer, ExtendedHomeAssistant, - FrigateCardMediaPlayer, MediaLoadedInfo, } from '../../types.js'; import { stopEventFromActivatingCardWideActions } from '../../utils/action.js'; @@ -42,7 +42,7 @@ import { renderMessage } from '../message.js'; import '../next-prev-control.js'; import '../ptz.js'; import './provider.js'; -import { FrigateCardViewerProvider } from './provider.js'; +import { AdvancedCameraCardViewerProvider } from './provider.js'; interface MediaNeighbor { index: number; @@ -54,10 +54,10 @@ interface MediaNeighbors { next?: MediaNeighbor; } -const FRIGATE_CARD_VIEWER_PROVIDER = 'frigate-card-viewer-provider'; +const ADVANCED_CAMERA_CARD_VIEWER_PROVIDER = 'advanced-camera-card-viewer-provider'; -@customElement('frigate-card-viewer-carousel') -export class FrigateCardViewerCarousel extends LitElement { +@customElement('advanced-camera-card-viewer-carousel') +export class AdvancedCameraCardViewerCarousel extends LitElement { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -92,7 +92,7 @@ export class FrigateCardViewerCarousel extends LitElement { protected _media: ViewMedia[] | null = null; protected _mediaActionsController = new MediaActionsController(); - protected _player: FrigateCardMediaPlayer | null = null; + protected _player: AdvancedCameraCardMediaPlayer | null = null; protected _refCarousel: Ref = createRef(); updated(changedProperties: PropertyValues): void { @@ -134,7 +134,7 @@ export class FrigateCardViewerCarousel extends LitElement { protected _getTransitionEffect(): TransitionEffect { return ( this.viewerConfig?.transition_effect ?? - frigateCardConfigDefaults.media_viewer.transition_effect + configDefaults.media_viewer.transition_effect ); } @@ -227,8 +227,8 @@ export class FrigateCardViewerCarousel extends LitElement { } const viewerProvider = slide?.querySelector( - 'frigate-card-viewer-provider', - ) as FrigateCardViewerProvider | null; + 'advanced-camera-card-viewer-provider', + ) as AdvancedCameraCardViewerProvider | null; if (viewerProvider) { viewerProvider.load = true; } @@ -259,7 +259,7 @@ export class FrigateCardViewerCarousel extends LitElement { protected willUpdate(changedProps: PropertyValues): void { if (changedProps.has('viewerConfig')) { this._mediaActionsController.setOptions({ - playerSelector: FRIGATE_CARD_VIEWER_PROVIDER, + playerSelector: ADVANCED_CAMERA_CARD_VIEWER_PROVIDER, ...(this.viewerConfig?.auto_play && { autoPlayConditions: this.viewerConfig.auto_play, }), @@ -330,7 +330,7 @@ export class FrigateCardViewerCarousel extends LitElement { ? 'previous' : 'next'; - return html` `; + >`; } protected render(): TemplateResult | void { @@ -373,40 +373,40 @@ export class FrigateCardViewerCarousel extends LitElement { const view = this.viewManagerEpoch?.manager.getView(); return html` - ) => { + @advanced-camera-card:carousel:select=${(ev: CustomEvent) => { this._setViewSelectedIndex(ev.detail.index); }} - @frigate-card:media:loaded=${(ev: CustomEvent) => { + @advanced-camera-card:media:loaded=${(ev: CustomEvent) => { this._player = ev.detail.player ?? null; this._seekHandler(); }} - @frigate-card:media:unloaded=${() => { + @advanced-camera-card:media:unloaded=${() => { this._player = null; }} > ${this.showControls ? this._renderNextPrevious('left', neighbors) : ''} ${guard([this._media, view], () => this._getSlides())} ${this.showControls ? this._renderNextPrevious('right', neighbors) : ''} - + ${view - ? html` - ` + ` : ''}
- - +
`; } @@ -448,7 +448,7 @@ export class FrigateCardViewerCarousel extends LitElement { } return html`
- + >
`; } @@ -468,6 +468,6 @@ export class FrigateCardViewerCarousel extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-viewer-carousel': FrigateCardViewerCarousel; + 'advanced-camera-card-viewer-carousel': AdvancedCameraCardViewerCarousel; } } diff --git a/src/components/viewer/grid.ts b/src/components/viewer/grid.ts index 5512a5f4..20b697dc 100644 --- a/src/components/viewer/grid.ts +++ b/src/components/viewer/grid.ts @@ -18,8 +18,8 @@ import { ExtendedHomeAssistant } from '../../types.js'; import { ResolvedMediaCache } from '../../utils/ha/resolved-media.js'; import './carousel'; -@customElement('frigate-card-viewer-grid') -export class FrigateCardViewerGrid extends LitElement { +@customElement('advanced-camera-card-viewer-grid') +export class AdvancedCameraCardViewerGrid extends LitElement { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -41,7 +41,7 @@ export class FrigateCardViewerGrid extends LitElement { protected _renderCarousel(filterCamera?: string): TemplateResult { const selectedCameraID = this.viewManagerEpoch?.manager.getView()?.camera; return html` - - + `; } @@ -92,14 +92,15 @@ export class FrigateCardViewerGrid extends LitElement { } return html` - ) => - this._gridSelectCamera(ev.detail.selected)} + @advanced-camera-card:media-grid:selected=${( + ev: CustomEvent, + ) => this._gridSelectCamera(ev.detail.selected)} > ${[...cameraIDs].map((cameraID) => this._renderCarousel(cameraID))} - + `; } @@ -110,6 +111,6 @@ export class FrigateCardViewerGrid extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-viewer-grid': FrigateCardViewerGrid; + 'advanced-camera-card-viewer-grid': AdvancedCameraCardViewerGrid; } } diff --git a/src/components/viewer/index.ts b/src/components/viewer/index.ts index 5c10ff30..41b8b8a2 100644 --- a/src/components/viewer/index.ts +++ b/src/components/viewer/index.ts @@ -21,8 +21,8 @@ declare module 'view' { } } -@customElement('frigate-card-viewer') -export class FrigateCardViewer extends LitElement { +@customElement('advanced-camera-card-viewer') +export class AdvancedCameraCardViewer extends LitElement { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -68,7 +68,7 @@ export class FrigateCardViewer extends LitElement { }); } - return html` - `; + `; } static get styles(): CSSResultGroup { @@ -86,6 +86,6 @@ export class FrigateCardViewer extends LitElement { declare global { interface HTMLElementTagNameMap { - 'frigate-card-viewer': FrigateCardViewer; + 'advanced-camera-card-viewer': AdvancedCameraCardViewer; } } diff --git a/src/components/viewer/provider.ts b/src/components/viewer/provider.ts index 0c10ca8d..4208a385 100644 --- a/src/components/viewer/provider.ts +++ b/src/components/viewer/provider.ts @@ -17,8 +17,8 @@ import { CardWideConfig, ViewerConfig } from '../../config/types.js'; import '../../patches/ha-hls-player.js'; import viewerProviderStyle from '../../scss/viewer-provider.scss'; import { + AdvancedCameraCardMediaPlayer, ExtendedHomeAssistant, - FrigateCardMediaPlayer, FullscreenElement, ResolvedMedia, } from '../../types.js'; @@ -54,10 +54,10 @@ import { MediaQueriesClassifier } from '../../view/media-queries-classifier.js'; import { VideoContentType, ViewMedia } from '../../view/media.js'; import { renderProgressIndicator } from '../progress-indicator.js'; -@customElement('frigate-card-viewer-provider') -export class FrigateCardViewerProvider +@customElement('advanced-camera-card-viewer-provider') +export class AdvancedCameraCardViewerProvider extends LitElement - implements FrigateCardMediaPlayer + implements AdvancedCameraCardMediaPlayer { @property({ attribute: false }) public hass?: ExtendedHomeAssistant; @@ -86,8 +86,9 @@ export class FrigateCardViewerProvider @property({ attribute: false }) public cardWideConfig?: CardWideConfig; - protected _refFrigateCardMediaPlayer: Ref = - createRef(); + protected _refAdvancedCameraCardMediaPlayer: Ref< + Element & AdvancedCameraCardMediaPlayer + > = createRef(); protected _refVideoProvider: Ref = createRef(); protected _refImageProvider: Ref = createRef(); @@ -97,33 +98,35 @@ export class FrigateCardViewerProvider public async play(): Promise { await playMediaMutingIfNecessary( this, - this._refFrigateCardMediaPlayer.value ?? this._refVideoProvider.value, + this._refAdvancedCameraCardMediaPlayer.value ?? this._refVideoProvider.value, ); } public async pause(): Promise { - (this._refFrigateCardMediaPlayer.value || this._refVideoProvider.value)?.pause(); + ( + this._refAdvancedCameraCardMediaPlayer.value || this._refVideoProvider.value + )?.pause(); } public async mute(): Promise { - if (this._refFrigateCardMediaPlayer.value) { - this._refFrigateCardMediaPlayer.value?.mute(); + if (this._refAdvancedCameraCardMediaPlayer.value) { + this._refAdvancedCameraCardMediaPlayer.value?.mute(); } else if (this._refVideoProvider.value) { this._refVideoProvider.value.muted = true; } } public async unmute(): Promise { - if (this._refFrigateCardMediaPlayer.value) { - this._refFrigateCardMediaPlayer.value?.mute(); + if (this._refAdvancedCameraCardMediaPlayer.value) { + this._refAdvancedCameraCardMediaPlayer.value?.mute(); } else if (this._refVideoProvider.value) { this._refVideoProvider.value.muted = false; } } public isMuted(): boolean { - if (this._refFrigateCardMediaPlayer.value) { - return this._refFrigateCardMediaPlayer.value?.isMuted() ?? true; + if (this._refAdvancedCameraCardMediaPlayer.value) { + return this._refAdvancedCameraCardMediaPlayer.value?.isMuted() ?? true; } else if (this._refVideoProvider.value) { return this._refVideoProvider.value.muted; } @@ -131,8 +134,8 @@ export class FrigateCardViewerProvider } public async seek(seconds: number): Promise { - if (this._refFrigateCardMediaPlayer.value) { - return this._refFrigateCardMediaPlayer.value.seek(seconds); + if (this._refAdvancedCameraCardMediaPlayer.value) { + return this._refAdvancedCameraCardMediaPlayer.value.seek(seconds); } else if (this._refVideoProvider.value) { hideMediaControlsTemporarily(this._refVideoProvider.value); this._refVideoProvider.value.currentTime = seconds; @@ -140,8 +143,8 @@ export class FrigateCardViewerProvider } public async setControls(controls?: boolean): Promise { - if (this._refFrigateCardMediaPlayer.value) { - return this._refFrigateCardMediaPlayer.value.setControls(controls); + if (this._refAdvancedCameraCardMediaPlayer.value) { + return this._refAdvancedCameraCardMediaPlayer.value.setControls(controls); } else if (this._refVideoProvider.value) { setControlsOnVideo( this._refVideoProvider.value, @@ -151,8 +154,8 @@ export class FrigateCardViewerProvider } public isPaused(): boolean { - if (this._refFrigateCardMediaPlayer.value) { - return this._refFrigateCardMediaPlayer.value.isPaused(); + if (this._refAdvancedCameraCardMediaPlayer.value) { + return this._refAdvancedCameraCardMediaPlayer.value.isPaused(); } else if (this._refVideoProvider.value) { return this._refVideoProvider.value.paused; } @@ -160,8 +163,8 @@ export class FrigateCardViewerProvider } public async getScreenshotURL(): Promise { - if (this._refFrigateCardMediaPlayer.value) { - return await this._refFrigateCardMediaPlayer.value.getScreenshotURL(); + if (this._refAdvancedCameraCardMediaPlayer.value) { + return await this._refAdvancedCameraCardMediaPlayer.value.getScreenshotURL(); } else if (this._refVideoProvider.value) { return screenshotMedia(this._refVideoProvider.value); } else if (this._refImageProvider.value) { @@ -171,8 +174,8 @@ export class FrigateCardViewerProvider } public getFullscreenElement(): FullscreenElement | null { - if (this._refFrigateCardMediaPlayer.value) { - return this._refFrigateCardMediaPlayer.value.getFullscreenElement(); + if (this._refAdvancedCameraCardMediaPlayer.value) { + return this._refAdvancedCameraCardMediaPlayer.value.getFullscreenElement(); } else if (this._refVideoProvider.value) { return this._refVideoProvider.value; } @@ -319,7 +322,7 @@ export class FrigateCardViewerProvider const view = this.viewManagerEpoch?.manager.getView(); return this.viewerConfig?.zoomable - ? html` cameraConfig?.dimensions?.layout ? { @@ -329,13 +332,13 @@ export class FrigateCardViewerProvider : undefined, )} .settings=${mediaID ? view?.context?.zoom?.[mediaID]?.requested : undefined} - @frigate-card:zoom:zoomed=${() => this.setControls(false)} - @frigate-card:zoom:unzoomed=${() => this.setControls()} - @frigate-card:zoom:change=${(ev: CustomEvent) => + @advanced-camera-card:zoom:zoomed=${() => this.setControls(false)} + @advanced-camera-card:zoom:unzoomed=${() => this.setControls()} + @advanced-camera-card:zoom:change=${(ev: CustomEvent) => handleZoomSettingsObservedEvent(ev, this.viewManagerEpoch?.manager, mediaID)} > ${template} - ` + ` : template; } @@ -355,8 +358,8 @@ export class FrigateCardViewerProvider return this._useZoomIfRequired(html` ${ViewMediaClassifier.isVideo(this.media) ? this.media.getVideoContentType() === VideoContentType.HLS - ? html` - ` + ` : html`
${selected ? html`
${template}
` : ''} @@ -1878,7 +1878,7 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor * @returns A rendered template. */ protected _renderCamera( - cameras: RawFrigateCardConfigArray, + cameras: RawAdvancedCameraCardConfigArray, cameraIndex: number, entities: string[], addNewCamera?: boolean, @@ -1916,7 +1916,9 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor }); // Make a new config and update the editor with changes on it, - const modifyConfig = (func: (config: RawFrigateCardConfig) => boolean): void => { + const modifyConfig = ( + func: (config: RawAdvancedCameraCardConfig) => boolean, + ): void => { if (this._config) { const newConfig = copyConfig(this._config); if (func(newConfig)) { @@ -1938,9 +1940,9 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor .domain=${MENU_CAMERAS} .key=${cameraIndex} > - + > ${addNewCamera ? html` @@ -1965,7 +1967,7 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor cameraIndex <= 0} @click=${() => !addNewCamera && - modifyConfig((config: RawFrigateCardConfig): boolean => { + modifyConfig((config: RawAdvancedCameraCardConfig): boolean => { if (Array.isArray(config.cameras) && cameraIndex > 0) { arrayMove(config.cameras, cameraIndex, cameraIndex - 1); this._openMenu(MENU_CAMERAS, cameraIndex - 1); @@ -1974,9 +1976,9 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor return false; })} > - + > = this._config.cameras.length - 1} @click=${() => !addNewCamera && - modifyConfig((config: RawFrigateCardConfig): boolean => { + modifyConfig((config: RawAdvancedCameraCardConfig): boolean => { if ( Array.isArray(config.cameras) && cameraIndex < config.cameras.length - 1 @@ -1998,15 +2000,15 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor return false; })} > - + > { - modifyConfig((config: RawFrigateCardConfig): boolean => { + modifyConfig((config: RawAdvancedCameraCardConfig): boolean => { if (Array.isArray(config.cameras)) { config.cameras.splice(cameraIndex, 1); this._closeMenu(MENU_CAMERAS); @@ -2016,7 +2018,9 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor }); }} > - +
${this._renderEntitySelector( @@ -2497,7 +2501,7 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor `; } - protected _updateConfig(config: RawFrigateCardConfig): void { + protected _updateConfig(config: RawAdvancedCameraCardConfig): void { this._config = config; fireEvent(this, 'config-changed', { config: this._config }); } @@ -2509,7 +2513,7 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor const entities = getEntitiesFromHASS(this.hass); const cameras = (getConfigValue(this._config, CONF_CAMERAS) || - []) as RawFrigateCardConfigArray; + []) as RawAdvancedCameraCardConfigArray; return html` ${this._configUpgradeable @@ -2587,7 +2591,7 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor ${this._renderNumberInput(CONF_MENU_BUTTON_SIZE, { min: BUTTON_SIZE_MIN, })} - ${this._renderMenuButton('frigate') /* */} + ${this._renderMenuButton('iris') /* */} ${this._renderMenuButton('cameras') /* */} ${this._renderMenuButton('substreams') /* */} ${this._renderMenuButton('live') /* */} @@ -3128,12 +3132,12 @@ export class FrigateCardEditor extends LitElement implements LovelaceCardEditor } static get styles(): CSSResultGroup { - return unsafeCSS(frigate_card_editor_style); + return unsafeCSS(editorStyle); } } declare global { interface HTMLElementTagNameMap { - 'frigate-card-editor': FrigateCardEditor; + 'advanced-camera-card-editor': AdvancedCameraCardEditor; } } diff --git a/src/images/README.md b/src/images/README.md index 0a561e50..a5817903 100644 --- a/src/images/README.md +++ b/src/images/README.md @@ -1,25 +1,22 @@ # Image Copyright -## frigate-bird-in-sky.jpg +## iris-screensaver.jpg -**Link**: https://www.flickr.com/photos/dianasch/47543120431 +**Link**: https://unsplash.com/photos/purple-and-white-flower-in-tilt-shift-lens-y4xISRK8TUg -**Description**: A Frigate bird with a very large wingspan (7 ft) soaring overhead on Sanibel Island, Florida. +**Description**: Iris flowers in Vancouver Park. -**Copyright**: Diana Robinson +**Copyright**: Kevin Castel -**License**: https://creativecommons.org/licenses/by-nc-nd/2.0/ +**License**: https://unsplash.com/license **Image Formatting Process**: -- Horizontal mirror (to face the opposite direction) -- Cropped for 16:9 - Scaled down to 492x277 - Quality @ 85% ```sh -$ convert -extent 2048x1152 -flop -gravity center 47543120431_b285c45ac8_k.jpg frigate-bird-in-sky.jpg -$ mogrify -strip -interlace Plane -quality 85% -scale 492x277 frigate-bird-in-sky.jpg +$ convert -strip -interlace Plane -quality 85% -scale 492x277 iris-screensaver-original.jpg iris-screensaver.jpg ``` ## iris.svg / iris-outline.svg diff --git a/src/images/frigate-bird-in-sky.jpg b/src/images/frigate-bird-in-sky.jpg deleted file mode 100644 index f5c3cadd..00000000 Binary files a/src/images/frigate-bird-in-sky.jpg and /dev/null differ diff --git a/src/images/iris-screensaver.jpg b/src/images/iris-screensaver.jpg new file mode 100644 index 00000000..f9f06e7c Binary files /dev/null and b/src/images/iris-screensaver.jpg differ diff --git a/src/localize/languages/ca.json b/src/localize/languages/ca.json index 94fd2814..2552071b 100644 --- a/src/localize/languages/ca.json +++ b/src/localize/languages/ca.json @@ -1,7 +1,7 @@ { "common": { - "frigate_card": "Tarjeta Frigate", - "frigate_card_description": "Una targeta Lovelace per a utilitzar amb Frigate", + "advanced_camera_card": "", + "advanced_camera_card_description": "", "live": "En directe", "no_media": "No hi ha suport per mostrar", "recordings": "Enregistraments", @@ -265,7 +265,7 @@ "modes": { "camera": "Instantània de l'entitat de la càmera de Home Assistant", "entity": "", - "screensaver": "Logotip de Frigate incrustat", + "screensaver": "", "url": "Imatge arbitrària especificada per URL" }, "refresh_seconds": "Nombre de segons després dels quals cal actualitzar (0=mai)", @@ -394,10 +394,10 @@ "download": "Descarregar", "enabled": "Botó habilitat", "expand": "Expandir", - "frigate": "Menú de Frigate / Vista per defecte", "fullscreen": "Pantalla completa", "icon": "Icona", "image": "Imatge", + "iris": "", "live": "En directe", "media_player": "Envia al reproductor multimèdia", "microphone": "Micròfon", @@ -646,7 +646,6 @@ "no_camera_entity": "No s'ha pogut trobar l'entitat de la càmera", "no_camera_entity_for_triggers": "Es requereix una entitat de càmera per detectar automàticament els activadors", "no_camera_id": "No s'ha pogut determinar l'identificador de la càmera per a la següent càmera, és possible que hagis d'establir el paràmetre 'id' manualment", - "no_camera_name": "No s'ha pogut determinar el nom de la càmera Frigate per a la càmera (o una de les seves dependències), especifiqueu 'camera_entity' o 'camera_name'", "no_dashboard_or_view": "Tant els paràmetres 'dashboard_path' com 'view_path' són necessaris per al mètode d'emissió 'dashboard'", "no_live_camera": "El paràmetre 'camera_entity' s'ha de configurar i validar per a aquest proveïdor en directe", "no_supported_camera": "", diff --git a/src/localize/languages/en.json b/src/localize/languages/en.json index 614d26b7..da9942ed 100644 --- a/src/localize/languages/en.json +++ b/src/localize/languages/en.json @@ -1,7 +1,7 @@ { "common": { - "frigate_card": "Frigate card", - "frigate_card_description": "A Lovelace card for use with Frigate", + "advanced_camera_card": "Advanced Camera Card", + "advanced_camera_card_description": "An Advanced Camera Card", "live": "Live", "no_media": "No media to display", "recordings": "Recordings", @@ -177,7 +177,7 @@ }, "webrtc_card": { "editor_label": "WebRTC Card Options", - "entity": "WebRTC Card Camera Entity (Not a Frigate camera)", + "entity": "WebRTC Card Camera Entity", "url": "WebRTC Card Camera URL" } }, @@ -265,7 +265,7 @@ "modes": { "camera": "Home Assistant camera snapshot of camera entity", "entity": "Entity with entity_picture attribute", - "screensaver": "Embedded Frigate logo", + "screensaver": "Embedded screensaver image", "url": "Arbitrary image specified by URL" }, "refresh_seconds": "Number of seconds after which to refresh (0=never)", @@ -394,10 +394,10 @@ "download": "Download", "enabled": "Button enabled", "expand": "Expand", - "frigate": "Frigate menu / Default view", "fullscreen": "Fullscreen", "icon": "Icon", "image": "Image", + "iris": "Iris / Default View / Unhide menu", "live": "Live", "media_player": "Send to media player", "microphone": "Microphone", @@ -626,7 +626,7 @@ "diagnostics": "Card diagnostics. Please review for confidential information prior to sharing", "download_no_media": "No media to download", "download_sign_failed": "Could not sign media URL for download", - "duplicate_camera_id": "Duplicate Frigate camera id for the following camera, use the 'id' parameter to uniquely identify cameras", + "duplicate_camera_id": "Duplicate camera id for the following camera, use the 'id' parameter to uniquely identify cameras", "empty_response": "Received empty response from Home Assistant for request", "failed_response": "Failed to receive response from Home Assistant for request", "failed_retain": "Could not retain event", @@ -646,7 +646,6 @@ "no_camera_entity": "Could not find camera entity", "no_camera_entity_for_triggers": "A camera entity is required in order to autodetect triggers", "no_camera_id": "Could not determine camera id for the following camera, may need to set 'id' parameter manually", - "no_camera_name": "Could not determine a Frigate camera name for camera (or one of its dependents), please specify either 'camera_entity' or 'camera_name'", "no_dashboard_or_view": "Both 'dashboard_path' and 'view_path' parameters are required for the 'dashboard' cast method", "no_live_camera": "The camera_entity parameter must be set and valid for this live provider", "no_supported_camera": "The selected camera does not support this view", diff --git a/src/localize/languages/fr.json b/src/localize/languages/fr.json index d45aeebf..63d6b7d4 100644 --- a/src/localize/languages/fr.json +++ b/src/localize/languages/fr.json @@ -1,7 +1,7 @@ { "common": { - "frigate_card": "Carte Frigate", - "frigate_card_description": "Une carte Lovelace à utiliser avec Frigate", + "advanced_camera_card": "", + "advanced_camera_card_description": "", "live": "En direct", "no_media": "Aucun média à afficher", "recordings": "Enregistrements", @@ -265,7 +265,7 @@ "modes": { "camera": "Instantané de la caméra Home Assistant de l'entité caméra", "entity": "Entité avec l'attribut entity_picture", - "screensaver": "Logo Frigate intégré", + "screensaver": "", "url": "Image arbitraire spécifiée par URL" }, "refresh_seconds": "Nombre de secondes après lesquelles actualiser (0=jamais)", @@ -394,10 +394,10 @@ "download": "Télécharger", "enabled": "Bouton activé", "expand": "Étendre", - "frigate": "Menu Frigate / Vue par défaut", "fullscreen": "Plein écran", "icon": "Icône", "image": "Image", + "iris": "", "live": "En direct", "media_player": "Envoyer au lecteur multimédia", "microphone": "Microphone", @@ -646,7 +646,6 @@ "no_camera_entity": "Impossible de trouver l'entité de caméra", "no_camera_entity_for_triggers": "Une entité caméra est requise pour détecter automatiquement les déclencheurs", "no_camera_id": "Impossible de déterminer l'identifiant de la caméra suivante. Il faudra peut-être définir le paramètre « ID » manuellement", - "no_camera_name": "Impossible de déterminer le nom de la caméra Frigate pour la caméra (ou l'une de ses dépendances). Veuillez spécifier soit « camera_entity » soit « camera_name ».", "no_dashboard_or_view": "Les paramètres 'dashboard_path' et 'view_path' sont requis pour la méthode de conversion 'dashboard'", "no_live_camera": "Le paramètre camera_entity doit être défini et valide pour ce fournisseur en direct", "no_supported_camera": "La caméra sélectionnée ne prend pas en charge cette vue", diff --git a/src/localize/languages/it.json b/src/localize/languages/it.json index 6299f458..7f5f40d8 100644 --- a/src/localize/languages/it.json +++ b/src/localize/languages/it.json @@ -1,7 +1,7 @@ { "common": { - "frigate_card": "Frigate card", - "frigate_card_description": "Una scheda Lovelace per l'uso con Frigate", + "advanced_camera_card": "", + "advanced_camera_card_description": "", "live": "Live", "no_media": "Nessun contenuto multimediale da visualizzare", "recordings": "Registrazioni", @@ -265,7 +265,7 @@ "modes": { "camera": "Istantanea della telecamera di Home Assistant dell'entità telecamera", "entity": "", - "screensaver": "Logo Frigate incorporato", + "screensaver": "", "url": "Immagine arbitraria specificata dall'URL" }, "refresh_seconds": "Numero di secondi dopo i quali aggiornare (0 = mai)", @@ -394,10 +394,10 @@ "download": "Download", "enabled": "Pulsante abilitato", "expand": "Espandere", - "frigate": "Frigate menu / Visualizzazione predefinita", "fullscreen": "A schermo intero", "icon": "Icona", "image": "Immagine", + "iris": "", "live": "Abitare", "media_player": "Invia a Media Player", "microphone": "", @@ -646,7 +646,6 @@ "no_camera_entity": "Impossibile trovare l'entità fotocamera", "no_camera_entity_for_triggers": "È necessaria un'entità telecamera per rilevare automaticamente i trigger", "no_camera_id": "Impossibile determinare l'ID della telecamera , potrebbe essere necessario impostare manualmente il parametro 'ID'", - "no_camera_name": "Impossibile determinare un nome della telecamera in Frigate, si prega di specificare 'camera_enty' o 'camera_name'", "no_dashboard_or_view": "", "no_live_camera": "Il parametro fotocamera_enty deve essere impostato e valido per questo provider live", "no_supported_camera": "", diff --git a/src/localize/languages/pt-BR.json b/src/localize/languages/pt-BR.json index 680afc01..5b870621 100644 --- a/src/localize/languages/pt-BR.json +++ b/src/localize/languages/pt-BR.json @@ -1,7 +1,7 @@ { "common": { - "frigate_card": "Cartão Frigate", - "frigate_card_description": "Um cartão da Lovelace para usar com Frigate", + "advanced_camera_card": "", + "advanced_camera_card_description": "", "live": "Ao Vivo", "no_media": "Nenhuma mídia para exibir", "recordings": "Gravações", @@ -265,7 +265,7 @@ "modes": { "camera": "Instantâneo da câmera do Home Assistant, da entidade de câmera", "entity": "", - "screensaver": "Logo Frigate embutido", + "screensaver": "", "url": "Imagem arbitrária especificada por URL" }, "refresh_seconds": "Número de segundos após o qual atualizar (0 = nunca)", @@ -394,10 +394,10 @@ "download": "Baixe a mídia do evento", "enabled": "Botão ativado", "expand": "Expandir", - "frigate": "Frigate menu / Visualização padrão", "fullscreen": "Tela cheia", "icon": "Ícone", "image": "Imagem", + "iris": "", "live": "Ao vivo", "media_player": "Enviar para o reprodutor de mídia", "microphone": "", @@ -646,7 +646,6 @@ "no_camera_entity": "Não foi possível encontrar a entidade da câmera", "no_camera_entity_for_triggers": "Uma entidade de câmera é necessária para detectar automaticamente os gatilhos", "no_camera_id": "Não foi possível determinar o ID da câmera para a câmera a seguir, pode ser necessário definir o parâmetro 'id' manualmente", - "no_camera_name": "Não foi possível determinar o nome da câmera da Frigate, especifique 'camera_entity' ou 'camera_name' para a câmera a seguir", "no_dashboard_or_view": "", "no_live_camera": "O parâmetro camera_entity deve ser definido e válido para este provedor ativo", "no_supported_camera": "", diff --git a/src/localize/languages/pt-PT.json b/src/localize/languages/pt-PT.json index a45e6258..37d49ce4 100644 --- a/src/localize/languages/pt-PT.json +++ b/src/localize/languages/pt-PT.json @@ -1,7 +1,7 @@ { "common": { - "frigate_card": "Cartão Frigate", - "frigate_card_description": "Um cartão da Lovelace para usar com Frigate", + "advanced_camera_card": "", + "advanced_camera_card_description": "", "live": "Ao Vivo", "no_media": "Sem média", "recordings": "Gravações", @@ -265,7 +265,7 @@ "modes": { "camera": "Instantâneo da câmera do Home Assistant, da entidade de câmera", "entity": "", - "screensaver": "Logo Frigate embutido", + "screensaver": "", "url": "Imagem arbitrária especificada por URL" }, "refresh_seconds": "Número de segundos após o qual atualizar (0 = nunca)", @@ -394,10 +394,10 @@ "download": "Descarregar mídia do evento", "enabled": "Botão ativado", "expand": "Expandir", - "frigate": "Frigate menu / Visualização padrão", "fullscreen": "Tela cheia", "icon": "Ícone", "image": "Imagem", + "iris": "", "live": "Ao vivo", "media_player": "Enviar para o reprodutor de mídia", "microphone": "", @@ -646,7 +646,6 @@ "no_camera_entity": "Não existe uma entidade câmera", "no_camera_entity_for_triggers": "Não existe camera para a acção", "no_camera_id": "Não foi possível determinar o ID da câmera para a câmera a seguir, pode ser necessário definir o parâmetro 'id' manualmente", - "no_camera_name": "Não foi possível determinar o nome da câmera da Frigate, especifique 'camera_entity' ou 'camera_name' para a câmera a seguir", "no_dashboard_or_view": "", "no_live_camera": "O parâmetro camera_entity deve ser definido e válido para este serviço ativo", "no_supported_camera": "", diff --git a/src/localize/localize.ts b/src/localize/localize.ts index 76b8361a..556f3f5e 100644 --- a/src/localize/localize.ts +++ b/src/localize/localize.ts @@ -14,7 +14,7 @@ const languages: Record = { // The language is calculated and stored once, then re-used to avoid needing to // repeat the lookups and to ensure minimal information needs to be plumbed // through on each localization call. -let frigateCardLanguage: string | undefined; +let advancedCameraCardLanguage: string | undefined; /** * Get the configured language. @@ -67,7 +67,7 @@ export const loadLanguages = async (hass: HomeAssistant): Promise => { } if (lang) { - frigateCardLanguage = lang; + advancedCameraCardLanguage = lang; } return true; }; @@ -85,7 +85,7 @@ export function localize(string: string, search = '', replace = ''): string { try { translated = string .split('.') - .reduce((o, i) => o[i], languages[frigateCardLanguage ?? DEFAULT_LANG]); + .reduce((o, i) => o[i], languages[advancedCameraCardLanguage ?? DEFAULT_LANG]); } catch (_) {} if (!translated) { diff --git a/src/patches/ha-camera-stream.ts b/src/patches/ha-camera-stream.ts index ff2c3fd5..3e2e7aa0 100644 --- a/src/patches/ha-camera-stream.ts +++ b/src/patches/ha-camera-stream.ts @@ -13,7 +13,11 @@ import { css, CSSResultGroup, html, nothing, PropertyValues, unsafeCSS } from 'l import { customElement } from 'lit/decorators.js'; import { query } from 'lit/decorators/query.js'; import liveHAComponentsStyle from '../scss/live-ha-components.scss'; -import { FrigateCardMediaPlayer, FullscreenElement, MediaLoadedInfo } from '../types.js'; +import { + AdvancedCameraCardMediaPlayer, + FullscreenElement, + MediaLoadedInfo, +} from '../types.js'; import { createMediaLoadedInfo, dispatchExistingMediaLoadedInfoAsEvent, @@ -36,16 +40,16 @@ customElements.whenDefined('ha-camera-stream').then(() => { const STREAM_TYPE_MJPEG = 'mjpeg'; type StreamType = STREAM_TYPE_HLS | STREAM_TYPE_WEB_RTC | STREAM_TYPE_MJPEG; - @customElement('frigate-card-ha-camera-stream') + @customElement('advanced-camera-card-ha-camera-stream') // eslint-disable-next-line @typescript-eslint/no-unused-vars - class FrigateCardHaCameraStream + class AdvancedCameraCardHaCameraStream extends customElements.get('ha-camera-stream') - implements FrigateCardMediaPlayer + implements AdvancedCameraCardMediaPlayer { // Due to an obscure behavior when this card is casted, this element needs // to use query rather than the ref directive to find the player. @query('.player:not(.hidden)') - protected _player: FrigateCardMediaPlayer; + protected _player: AdvancedCameraCardMediaPlayer; protected _mediaLoadedInfoPerStream: Record = {}; protected _mediaLoadedInfoDispatched: MediaLoadedInfo | null = null; @@ -133,7 +137,7 @@ customElements.whenDefined('ha-camera-stream').then(() => { } if (stream.type === STREAM_TYPE_HLS) { - return html` { .hass=${this.hass} .entityid=${this.stateObj.entity_id} .posterUrl=${this._posterUrl} - @frigate-card:media:loaded=${(ev) => + @advanced-camera-card:media:loaded=${(ev) => this._storeMediaLoadedInfoHandler(STREAM_TYPE_HLS, ev)} @streams=${this._handleHlsStreams} class="player ${stream.visible ? '' : 'hidden'}" - >`; + >`; } if (stream.type === STREAM_TYPE_WEB_RTC) { - return html` { .hass=${this.hass} .entityid=${this.stateObj.entity_id} .posterUrl=${this._posterUrl} - @frigate-card:media:loaded=${(ev) => + @advanced-camera-card:media:loaded=${(ev) => this._storeMediaLoadedInfoHandler(STREAM_TYPE_WEB_RTC, ev)} @streams=${this._handleWebRtcStreams} class="player ${stream.visible ? '' : 'hidden'}" - >`; + >`; } return nothing; @@ -208,6 +212,6 @@ customElements.whenDefined('ha-camera-stream').then(() => { declare global { interface HTMLElementTagNameMap { - 'frigate-card-ha-camera-stream': FrigateCardHaCameraStream; + 'advanced-camera-card-ha-camera-stream': AdvancedCameraCardHaCameraStream; } } diff --git a/src/patches/ha-hls-player.ts b/src/patches/ha-hls-player.ts index d7a897dd..840d1bc4 100644 --- a/src/patches/ha-hls-player.ts +++ b/src/patches/ha-hls-player.ts @@ -15,7 +15,7 @@ import { query } from 'lit/decorators/query.js'; import { dispatchLiveErrorEvent } from '../components-lib/live/utils/dispatch-live-error.js'; import { renderMessage } from '../components/message.js'; import liveHAComponentsStyle from '../scss/live-ha-components.scss'; -import { FrigateCardMediaPlayer, FullscreenElement } from '../types.js'; +import { AdvancedCameraCardMediaPlayer, FullscreenElement } from '../types.js'; import { mayHaveAudio } from '../utils/audio.js'; import { errorToConsole } from '../utils/basic.js'; import { @@ -32,11 +32,11 @@ import { import { screenshotMedia } from '../utils/screenshot.js'; customElements.whenDefined('ha-hls-player').then(() => { - @customElement('frigate-card-ha-hls-player') + @customElement('advanced-camera-card-ha-hls-player') // eslint-disable-next-line @typescript-eslint/no-unused-vars - class FrigateCardHaHlsPlayer + class AdvancedCameraCardHaHlsPlayer extends customElements.get('ha-hls-player') - implements FrigateCardMediaPlayer + implements AdvancedCameraCardMediaPlayer { // Due to an obscure behavior when this card is casted, this element needs // to use query rather than the ref directive to find the player. @@ -171,6 +171,6 @@ customElements.whenDefined('ha-hls-player').then(() => { declare global { interface HTMLElementTagNameMap { - 'frigate-card-ha-hls-player': FrigateCardHaHlsPlayer; + 'advanced-camera-card-ha-hls-player': AdvancedCameraCardHaHlsPlayer; } } diff --git a/src/patches/ha-web-rtc-player.ts b/src/patches/ha-web-rtc-player.ts index 839098e6..5a0cfbfd 100644 --- a/src/patches/ha-web-rtc-player.ts +++ b/src/patches/ha-web-rtc-player.ts @@ -16,7 +16,7 @@ import { ifDefined } from 'lit/directives/if-defined.js'; import { dispatchLiveErrorEvent } from '../components-lib/live/utils/dispatch-live-error.js'; import { renderMessage } from '../components/message.js'; import liveHAComponentsStyle from '../scss/live-ha-components.scss'; -import { FrigateCardMediaPlayer, FullscreenElement } from '../types.js'; +import { AdvancedCameraCardMediaPlayer, FullscreenElement } from '../types.js'; import { mayHaveAudio } from '../utils/audio.js'; import { dispatchMediaLoadedEvent, @@ -32,11 +32,11 @@ import { import { screenshotMedia } from '../utils/screenshot.js'; customElements.whenDefined('ha-web-rtc-player').then(() => { - @customElement('frigate-card-ha-web-rtc-player') + @customElement('advanced-camera-card-ha-web-rtc-player') // eslint-disable-next-line @typescript-eslint/no-unused-vars - class FrigateCardHaWebRtcPlayer + class AdvancedCameraCardHaWebRtcPlayer extends customElements.get('ha-web-rtc-player') - implements FrigateCardMediaPlayer + implements AdvancedCameraCardMediaPlayer { // Due to an obscure behavior when this card is casted, this element needs // to use query rather than the ref directive to find the player. @@ -166,6 +166,6 @@ customElements.whenDefined('ha-web-rtc-player').then(() => { declare global { interface HTMLElementTagNameMap { - 'frigate-card-ha-web-rtc-player': FrigateCardHaWebRtcPlayer; + 'advanced-camera-card-ha-web-rtc-player': AdvancedCameraCardHaWebRtcPlayer; } } diff --git a/src/scss/button.scss b/src/scss/button.scss index d2ac2a92..849a1545 100644 --- a/src/scss/button.scss +++ b/src/scss/button.scss @@ -1,6 +1,6 @@ ha-icon-button { - color: var(--frigate-card-button-color); - background-color: var(--frigate-card-button-background); + color: var(--advanced-camera-card-button-color); + background-color: var(--advanced-camera-card-button-background); border-radius: 50%; padding: 0px; diff --git a/src/scss/card.scss b/src/scss/card.scss index 678f4107..8f70e057 100644 --- a/src/scss/card.scss +++ b/src/scss/card.scss @@ -14,7 +14,7 @@ // keeping the background-color within the radius. border-radius: var(--ha-card-border-radius, 4px); - height: var(--frigate-card-height); + height: var(--advanced-camera-card-height); min-height: 100px; // Ensure all clicks at the top level work. @@ -23,16 +23,16 @@ // The standard HA header is 56 pixels tall, so that much off the top (header) // and bottom (to maintain center), before doing the calculation of // max-height. This matters on small mobile devices in landscape orientation. - --frigate-card-expand-max-height: calc((100vh - (2 * 56px)) * 0.85); - --frigate-card-expand-max-width: 85vw; - --frigate-card-expand-width: none; - --frigate-card-expand-height: none; - --frigate-card-expand-aspect-ratio: unset; + --advanced-camera-card-expand-max-height: calc((100vh - (2 * 56px)) * 0.85); + --advanced-camera-card-expand-max-width: 85vw; + --advanced-camera-card-expand-width: none; + --advanced-camera-card-expand-height: none; + --advanced-camera-card-expand-aspect-ratio: unset; - --frigate-card-height: auto; + --advanced-camera-card-height: auto; } -frigate-card-loading { +advanced-camera-card-loading { position: absolute; inset: 0; z-index: 1; @@ -47,13 +47,13 @@ frigate-card-loading { // If the "Kiosk Mode" (https://github.com/maykar/kiosk-mode) plugin is // installed, the --kiosk-header-height variable will be authoritative // instead. - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1762 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1762 height: calc(100vh - var(--kiosk-header-height, var(--header-height))); } :host([panel][casted]) { // Card always extends to the full height in panel mode when casting (there is // no header). - // See: https://github.com/dermotduffy/frigate-hass-card/issues/1746 + // See: https://github.com/dermotduffy/advanced-camera-card/issues/1746 height: 100%; } @@ -143,11 +143,11 @@ ha-card { } :host(:fullscreen) div.main, -:host(:fullscreen) frigate-card-menu { +:host(:fullscreen) advanced-camera-card-menu { @include fullscreen-no-rounded-corners; } :host(:-webkit-full-screen) div.main, -:host(:-webkit-full-screen) frigate-card-menu { +:host(:-webkit-full-screen) advanced-camera-card-menu { @include fullscreen-no-rounded-corners; } @@ -159,11 +159,11 @@ web-dialog { --dialog-padding: 0px; --dialog-container-padding: 0px; - --dialog-max-height: var(--frigate-card-expand-max-height); - --dialog-max-width: var(--frigate-card-expand-max-width); + --dialog-max-height: var(--advanced-camera-card-expand-max-height); + --dialog-max-width: var(--advanced-camera-card-expand-max-width); - --dialog-width: var(--frigate-card-expand-width); - --dialog-height: var(--frigate-card-expand-height); + --dialog-width: var(--advanced-camera-card-expand-width); + --dialog-height: var(--advanced-camera-card-expand-height); // Allow submenus to flow outside the edge of the dialog. --dialog-overflow-x: visible; @@ -174,7 +174,7 @@ web-dialog { } web-dialog::part(dialog) { - aspect-ratio: var(--frigate-card-expand-aspect-ratio); + aspect-ratio: var(--advanced-camera-card-expand-aspect-ratio); // Fixes to render the dialog correctly in Safari. border-radius: 0px; @@ -203,16 +203,18 @@ web-dialog::part(dialog) { * Menu hover styles *******************/ -frigate-card-menu { +advanced-camera-card-menu { z-index: 2; } -frigate-card-menu[data-style*='hover'] { +advanced-camera-card-menu[data-style*='hover'] { transition: opacity 0.5s ease; opacity: 0; } -frigate-card-menu[data-style*='hover']:hover, -ha-card:hover > frigate-card-overlay > frigate-card-menu[data-style='hover-card'] { +advanced-camera-card-menu[data-style*='hover']:hover, +ha-card:hover + > advanced-camera-card-overlay + > advanced-camera-card-menu[data-style='hover-card'] { opacity: 1; } @@ -220,15 +222,17 @@ ha-card:hover > frigate-card-overlay > frigate-card-menu[data-style='hover-card' * Status bar hover styles *************************/ -frigate-card-status-bar { +advanced-camera-card-status-bar { z-index: 1; } -frigate-card-status-bar[data-style*='hover'] { +advanced-camera-card-status-bar[data-style*='hover'] { transition: opacity 0.5s ease; opacity: 0; } -frigate-card-status-bar[data-style*='hover']:hover, -ha-card:hover > frigate-card-overlay > frigate-card-status-bar[data-style='hover-card'] { +advanced-camera-card-status-bar[data-style*='hover']:hover, +ha-card:hover + > advanced-camera-card-overlay + > advanced-camera-card-status-bar[data-style='hover-card'] { opacity: 1; } diff --git a/src/scss/const.scss b/src/scss/const.scss index 35264fd3..45373b6f 100644 --- a/src/scss/const.scss +++ b/src/scss/const.scss @@ -1,6 +1,6 @@ :host { - --frigate-card-thumbnail-size-max: 300px; - --frigate-card-thumbnail-details-width: calc( - var(--frigate-card-thumbnail-size) + 200px + --advanced-camera-card-thumbnail-size-max: 300px; + --advanced-camera-card-thumbnail-details-width: calc( + var(--advanced-camera-card-thumbnail-size) + 200px ); } diff --git a/src/scss/date-picker.scss b/src/scss/date-picker.scss index 92fc9d45..585a4569 100644 --- a/src/scss/date-picker.scss +++ b/src/scss/date-picker.scss @@ -42,7 +42,7 @@ input { } } -frigate-card-icon { +advanced-camera-card-icon { display: block; height: 100%; width: 100%; diff --git a/src/scss/drawer-inject.scss b/src/scss/drawer-inject.scss index 94db2960..f6e1ed1c 100644 --- a/src/scss/drawer-inject.scss +++ b/src/scss/drawer-inject.scss @@ -40,7 +40,7 @@ :host([location='right'][open]) #d { transform: none; - box-shadow: var(--frigate-card-css-box-shadow, 0px 0px 25px 0px black); + box-shadow: var(--advanced-camera-card-css-box-shadow, 0px 0px 25px 0px black); } #ifs { diff --git a/src/scss/drawer.scss b/src/scss/drawer.scss index 96395559..f4ef72b2 100644 --- a/src/scss/drawer.scss +++ b/src/scss/drawer.scss @@ -36,9 +36,9 @@ div.control-surround { visibility: visible; } -frigate-card-icon.control { - color: var(--frigate-card-button-color); - background-color: var(--frigate-card-button-background); +advanced-camera-card-icon.control { + color: var(--advanced-camera-card-button-color); + background-color: var(--advanced-camera-card-button-background); pointer-events: all; --mdc-icon-size: #{$drawer-icon-size}; @@ -48,19 +48,19 @@ frigate-card-icon.control { transition: opacity 0.5s ease; } -:host([open]) frigate-card-icon.control, -frigate-card-icon.control:hover { +:host([open]) advanced-camera-card-icon.control, +advanced-camera-card-icon.control:hover { // When the drawer is open or hovered make the button to close it more // prominent. opacity: 1; } -:host([location='left']) frigate-card-icon.control { +:host([location='left']) advanced-camera-card-icon.control { border-top-right-radius: $drawer-icon-size; border-bottom-right-radius: $drawer-icon-size; } -:host([location='right']) frigate-card-icon.control { +:host([location='right']) advanced-camera-card-icon.control { border-top-left-radius: $drawer-icon-size; border-bottom-left-radius: $drawer-icon-size; } diff --git a/src/scss/editor.scss b/src/scss/editor.scss index def0ed45..52f68cf4 100644 --- a/src/scss/editor.scss +++ b/src/scss/editor.scss @@ -70,7 +70,7 @@ div.upgrade span { color: var(--secondary-text-color, 'black'); } -.submenu-header frigate-card-icon { +.submenu-header advanced-camera-card-icon { margin-right: 15px; } diff --git a/src/scss/gallery-core.scss b/src/scss/gallery-core.scss index f6a230ec..a6f86243 100644 --- a/src/scss/gallery-core.scss +++ b/src/scss/gallery-core.scss @@ -10,15 +10,18 @@ // Hide scrollbar: Firefox scrollbar-width: none; - --frigate-card-gallery-gap: 3px; - --frigate-card-gallery-columns: 4; + --advanced-camera-card-gallery-gap: 3px; + --advanced-camera-card-gallery-columns: 4; } .grid { display: grid; - grid-template-columns: repeat(var(--frigate-card-gallery-columns), minmax(0, 1fr)); + grid-template-columns: repeat( + var(--advanced-camera-card-gallery-columns), + minmax(0, 1fr) + ); grid-auto-rows: min-content; - gap: var(--frigate-card-gallery-gap); + gap: var(--advanced-camera-card-gallery-gap); } // Hide scrollbar for Chrome, Safari and Opera @@ -26,14 +29,14 @@ display: none; } -frigate-card-thumbnail { +advanced-camera-card-thumbnail { height: 100%; - max-height: var(--frigate-card-thumbnail-size); + max-height: var(--advanced-camera-card-thumbnail-size); } -frigate-card-thumbnail:not([details]) { +advanced-camera-card-thumbnail:not([details]) { width: 100%; } -frigate-card-thumbnail.selected { +advanced-camera-card-thumbnail.selected { border: 4px solid var(--accent-color); // Because this is box-sizing: border-box, the border is effectively // 'padding'. To get the curved borders to line up between the thumbnail and @@ -41,11 +44,12 @@ frigate-card-thumbnail.selected { // image border radius. // Related: https://www.30secondsofcode.org/articles/s/css-nested-border-radius border-radius: calc( - var(--frigate-card-css-border-radius, var(--ha-card-border-radius, 4px)) + 4px + var(--advanced-camera-card-css-border-radius, var(--ha-card-border-radius, 4px)) + + 4px ); } -frigate-card-progress-indicator.top { +advanced-camera-card-progress-indicator.top { // The top loading progress indicator should span the whole width. grid-column: 1/-1; } diff --git a/src/scss/gallery.scss b/src/scss/gallery.scss index b650673d..1628a336 100644 --- a/src/scss/gallery.scss +++ b/src/scss/gallery.scss @@ -4,7 +4,7 @@ display: block; } -frigate-card-surround-basic { +advanced-camera-card-surround-basic { // The gallery will grow indefinitely in the `unconstrained` aspect ratio // modes, the surround height needs to be limited to something reasonable in // order for the media filter to still display somewhere the user can diff --git a/src/scss/key-assigner.scss b/src/scss/key-assigner.scss index dfb85002..80ff942c 100644 --- a/src/scss/key-assigner.scss +++ b/src/scss/key-assigner.scss @@ -12,11 +12,11 @@ } :host([assigning]) ha-button.assign span, -:host([assigning]) ha-button.assign frigate-card-icon { +:host([assigning]) ha-button.assign advanced-camera-card-icon { color: var(--warning-color); } -frigate-card-icon { +advanced-camera-card-icon { padding: 10px; } diff --git a/src/scss/live-carousel.scss b/src/scss/live-carousel.scss index a6b9f29a..8589935a 100644 --- a/src/scss/live-carousel.scss +++ b/src/scss/live-carousel.scss @@ -14,7 +14,7 @@ // when the carousel is part of a media-grid. Without this next/prev controls // will enlarge on hover, and the wheel-gestures plugin may block scrolling. // See matching in viewer-carousel.scss . -:host([unselected]) frigate-card-carousel { +:host([unselected]) advanced-camera-card-carousel { pointer-events: none; } diff --git a/src/scss/live-grid.scss b/src/scss/live-grid.scss index 8e860304..ae976b24 100644 --- a/src/scss/live-grid.scss +++ b/src/scss/live-grid.scss @@ -2,19 +2,19 @@ @keyframes warning-pulse { 0% { - border: solid 2px var(--frigate-card-triggered-color-1, rgba(0, 0, 0, 0)); + border: solid 2px var(--advanced-camera-card-triggered-color-1, rgba(0, 0, 0, 0)); } 50% { - border: solid 2px var(--frigate-card-triggered-color-2, var(--warning-color)); + border: solid 2px var(--advanced-camera-card-triggered-color-2, var(--warning-color)); } 100% { - border: solid 2px var(--frigate-card-triggered-color-1, rgba(0, 0, 0, 0)); + border: solid 2px var(--advanced-camera-card-triggered-color-1, rgba(0, 0, 0, 0)); } } -frigate-card-live-carousel[triggered] { +advanced-camera-card-live-carousel[triggered] { animation: warning-pulse 5s infinite; } -frigate-card-live-carousel[selected] { - --frigate-card-triggered-color-1: var(--primary-color); +advanced-camera-card-live-carousel[selected] { + --advanced-camera-card-triggered-color-1: var(--primary-color); } diff --git a/src/scss/live-provider.scss b/src/scss/live-provider.scss index 8fe39c01..71536ce1 100644 --- a/src/scss/live-provider.scss +++ b/src/scss/live-provider.scss @@ -11,7 +11,7 @@ display: none; } -frigate-card-icon { +advanced-camera-card-icon { position: absolute; top: 10px; right: 10px; diff --git a/src/scss/loading.scss b/src/scss/loading.scss index 8db11741..56d8bedb 100644 --- a/src/scss/loading.scss +++ b/src/scss/loading.scss @@ -9,8 +9,8 @@ pointer-events: none; - background-color: var(--frigate-card-loading-background-color); - color: var(--frigate-card-loading-foreground-color); + background-color: var(--advanced-camera-card-loading-background-color); + color: var(--advanced-camera-card-loading-foreground-color); transition: opacity 1.5s ease-in; opacity: 1; @@ -20,7 +20,7 @@ opacity: 0; } -frigate-card-icon { +advanced-camera-card-icon { margin-bottom: 20px; height: 25%; width: auto; diff --git a/src/scss/media-filter.scss b/src/scss/media-filter.scss index 77d1741b..b9650f09 100644 --- a/src/scss/media-filter.scss +++ b/src/scss/media-filter.scss @@ -19,7 +19,7 @@ display: none; } -frigate-card-select { +advanced-camera-card-select { padding: 5px; } @@ -27,21 +27,21 @@ div.when { display: inline-flex; align-items: flex-end; } -div.when frigate-card-select { +div.when advanced-camera-card-select { flex: 1; } -div.when frigate-card-date-picker { +div.when advanced-camera-card-date-picker { // Visually line up the date-picker icon with the bottom of the select // dropdown. padding-bottom: 5px; transition: width 0.5s ease-in-out; } -div.when frigate-card-date-picker { +div.when advanced-camera-card-date-picker { color: var(--secondary-color); } -div.when frigate-card-date-picker.selected { +div.when advanced-camera-card-date-picker.selected { color: var(--primary-color); } -div.when frigate-card-date-picker.hidden { +div.when advanced-camera-card-date-picker.hidden { width: 0px; } diff --git a/src/scss/media-grid.scss b/src/scss/media-grid.scss index 9efa5f6c..acc48f93 100644 --- a/src/scss/media-grid.scss +++ b/src/scss/media-grid.scss @@ -3,9 +3,9 @@ width: 100%; height: 100%; - --frigate-card-grid-border-size: 3px; - --frigate-card-grid-column-size: 100%; - --frigate-card-grid-selected-width-factor: 2; + --advanced-camera-card-grid-border-size: 3px; + --advanced-camera-card-grid-column-size: 100%; + --advanced-camera-card-grid-selected-width-factor: 2; // Allow the grid to scroll if necessary (e.g. fullscreen). overflow: auto; @@ -25,22 +25,22 @@ box-sizing: border-box; border-radius: var(--ha-card-border-radius, 4px); overflow: hidden; - width: var(--frigate-card-grid-column-size); + width: var(--advanced-camera-card-grid-column-size); // Unselected items included a transparent border to act as the effective // gutter between elements, and to ensure when the item is selected it does // not change in size (even border-box sizing appears to allow size to change // when the element has a non-fixed height). - border: var(--frigate-card-grid-border-size) solid transparent; + border: var(--advanced-camera-card-grid-border-size) solid transparent; } ::slotted([selected]) { - border: var(--frigate-card-grid-border-size) solid var(--primary-color); + border: var(--advanced-camera-card-grid-border-size) solid var(--primary-color); width: min( 100%, calc( - var(--frigate-card-grid-selected-width-factor) * - var(--frigate-card-grid-column-size) + var(--advanced-camera-card-grid-selected-width-factor) * + var(--advanced-camera-card-grid-column-size) ) ); diff --git a/src/scss/media-layout.scss b/src/scss/media-layout.scss index ec93509a..45846480 100644 --- a/src/scss/media-layout.scss +++ b/src/scss/media-layout.scss @@ -1,14 +1,14 @@ @mixin media-layout { - object-fit: var(--frigate-card-media-layout-fit, contain); - object-position: var(--frigate-card-media-layout-position-x, 50%) - var(--frigate-card-media-layout-position-y, 50%); + object-fit: var(--advanced-camera-card-media-layout-fit, contain); + object-position: var(--advanced-camera-card-media-layout-position-x, 50%) + var(--advanced-camera-card-media-layout-position-y, 50%); // This is supported on limited browsers: // See: https://caniuse.com/?search=object-view-box object-view-box: inset( - var(--frigate-card-media-layout-view-box-top, 0%) - var(--frigate-card-media-layout-view-box-right, 0%) - var(--frigate-card-media-layout-view-box-bottom, 0%) - var(--frigate-card-media-layout-view-box-left, 0%) + var(--advanced-camera-card-media-layout-view-box-top, 0%) + var(--advanced-camera-card-media-layout-view-box-right, 0%) + var(--advanced-camera-card-media-layout-view-box-bottom, 0%) + var(--advanced-camera-card-media-layout-view-box-left, 0%) ); } diff --git a/src/scss/menu.scss b/src/scss/menu.scss index bf2d2f93..d33f4449 100644 --- a/src/scss/menu.scss +++ b/src/scss/menu.scss @@ -1,8 +1,8 @@ @use './button.scss'; :host { - --frigate-card-menu-button-size: 40px; - --mdc-icon-button-size: var(--frigate-card-menu-button-size); + --advanced-camera-card-menu-button-size: 40px; + --mdc-icon-button-size: var(--advanced-camera-card-menu-button-size); --mdc-icon-size: calc(var(--mdc-icon-button-size) / 2); pointer-events: auto; @@ -102,8 +102,8 @@ div.opposing { ****************************/ :host(:not([data-style='outside'])[data-position='bottom']) div { - // If the menu has more content that allows, "wrap upwards" to keep the - // Frigate button in the same place. + // If the menu has more content that allows, "wrap upwards" to keep the Iris + // button in the same place. flex-wrap: wrap-reverse; } @@ -139,15 +139,15 @@ div.opposing { // permanent menu buttons use the menu background color instead of the button // background color. :host([data-style='hidden']:not([expanded])) ha-icon-button { - background: var(--frigate-card-menu-background); + background: var(--advanced-camera-card-menu-background); } -// Icons in the menu are expected to follow Frigate card theming unless they are +// Icons in the menu are expected to follow Advanced Camera Card theming unless they are // active (in which case we want to take advantage of the whatever styling is // appropriate, e.g. light icon partially lit). :host ha-icon-button { - --state-unavailable-color: var(--frigate-card-button-color); - --state-inactive-color: var(--frigate-card-button-color); + --state-unavailable-color: var(--advanced-camera-card-button-color); + --state-inactive-color: var(--advanced-camera-card-button-color); } // Further theme related styling is dynamically applied by `menu.ts`, see diff --git a/src/scss/message.scss b/src/scss/message.scss index 8e7d5411..d191d52d 100644 --- a/src/scss/message.scss +++ b/src/scss/message.scss @@ -15,16 +15,16 @@ height: 100%; width: 100%; - background: var(--frigate-card-message-background); - color: var(--frigate-card-message-color); + background: var(--advanced-camera-card-message-background); + color: var(--advanced-camera-card-message-color); } :host([overlay]) { position: absolute; inset: 5%; - background: var(--frigate-card-message-overlay-background); - color: var(--frigate-card-message-overlay-color); + background: var(--advanced-camera-card-message-overlay-background); + color: var(--advanced-camera-card-message-overlay-color); } div.wrapper { @@ -65,16 +65,16 @@ a { } :host(:not([overlay])) a { - color: var(--frigate-card-message-color); + color: var(--advanced-camera-card-message-color); } :host([overlay]) a { - color: var(--frigate-card-message-overlay-color); + color: var(--advanced-camera-card-message-overlay-color); } .message pre { margin-top: 20px; overflow-x: auto; - border: 1px dotted var(--frigate-card-divider-color); + border: 1px dotted var(--advanced-camera-card-divider-color); padding: 1em; } diff --git a/src/scss/next-previous-control.scss b/src/scss/next-previous-control.scss index 4a24a2d1..caa643ab 100644 --- a/src/scss/next-previous-control.scss +++ b/src/scss/next-previous-control.scss @@ -1,11 +1,13 @@ @use './button.scss'; :host { - --frigate-card-next-prev-size: 48px; - --frigate-card-next-prev-size-hover: calc(var(--frigate-card-next-prev-size) * 2); - --frigate-card-left-position: 45px; - --frigate-card-right-position: 45px; - --mdc-icon-button-size: var(--frigate-card-next-prev-size); + --advanced-camera-card-next-prev-size: 48px; + --advanced-camera-card-next-prev-size-hover: calc( + var(--advanced-camera-card-next-prev-size) * 2 + ); + --advanced-camera-card-left-position: 45px; + --advanced-camera-card-right-position: 45px; + --mdc-icon-button-size: var(--advanced-camera-card-next-prev-size); --mdc-icon-size: calc(var(--mdc-icon-button-size) / 2); } @@ -15,41 +17,49 @@ overflow: hidden; } .controls.left { - left: var(--frigate-card-left-position); + left: var(--advanced-camera-card-left-position); } .controls.right { - right: var(--frigate-card-right-position); + right: var(--advanced-camera-card-right-position); } .controls.icons { - top: calc(50% - (var(--frigate-card-next-prev-size) / 2)); + top: calc(50% - (var(--advanced-camera-card-next-prev-size) / 2)); } .controls.thumbnails { border-radius: 50%; - height: var(--frigate-card-next-prev-size); - top: calc(50% - (var(--frigate-card-next-prev-size) / 2)); - box-shadow: var(--frigate-card-css-box-shadow, 0px 0px 20px 5px black); + height: var(--advanced-camera-card-next-prev-size); + top: calc(50% - (var(--advanced-camera-card-next-prev-size) / 2)); + box-shadow: var(--advanced-camera-card-css-box-shadow, 0px 0px 20px 5px black); transition: all 0.2s ease-out; opacity: 0.8; aspect-ratio: 1 / 1; } .controls.thumbnails:hover { opacity: 1 !important; - height: var(--frigate-card-next-prev-size-hover); - top: calc(50% - (var(--frigate-card-next-prev-size-hover) / 2)); + height: var(--advanced-camera-card-next-prev-size-hover); + top: calc(50% - (var(--advanced-camera-card-next-prev-size-hover) / 2)); } .controls.left.thumbnails:hover { left: calc( - var(--frigate-card-left-position) - - (var(--frigate-card-next-prev-size-hover) - var(--frigate-card-next-prev-size)) / 2 + var(--advanced-camera-card-left-position) - + ( + var(--advanced-camera-card-next-prev-size-hover) - var( + --advanced-camera-card-next-prev-size + ) + ) / 2 ); } .controls.right.thumbnails:hover { right: calc( - var(--frigate-card-right-position) - - (var(--frigate-card-next-prev-size-hover) - var(--frigate-card-next-prev-size)) / 2 + var(--advanced-camera-card-right-position) - + ( + var(--advanced-camera-card-next-prev-size-hover) - var( + --advanced-camera-card-next-prev-size + ) + ) / 2 ); } diff --git a/src/scss/ptz.scss b/src/scss/ptz.scss index c3ad73f9..4af81493 100644 --- a/src/scss/ptz.scss +++ b/src/scss/ptz.scss @@ -6,7 +6,7 @@ width: fit-content; height: fit-content; - --frigate-card-ptz-icon-size: 24px; + --advanced-camera-card-ptz-icon-size: 24px; } :host([data-position$='-left']) { @@ -47,10 +47,10 @@ } :host([data-orientation='vertical']) .ptz div { - width: calc(var(--frigate-card-ptz-icon-size) * 3); + width: calc(var(--advanced-camera-card-ptz-icon-size) * 3); } :host([data-orientation='horizontal']) .ptz div { - height: calc(var(--frigate-card-ptz-icon-size) * 3); + height: calc(var(--advanced-camera-card-ptz-icon-size) * 3); } .ptz-move, @@ -61,19 +61,19 @@ } .ptz-move { - height: calc(var(--frigate-card-ptz-icon-size) * 3); - width: calc(var(--frigate-card-ptz-icon-size) * 3); + height: calc(var(--advanced-camera-card-ptz-icon-size) * 3); + width: calc(var(--advanced-camera-card-ptz-icon-size) * 3); border-radius: 50%; } :host([data-orientation='horizontal']) .ptz .ptz-zoom, :host([data-orientation='horizontal']) .ptz .ptz-home { - width: calc(var(--frigate-card-ptz-icon-size) * 1.5); + width: calc(var(--advanced-camera-card-ptz-icon-size) * 1.5); } :host([data-orientation='vertical']) .ptz .ptz-zoom, :host([data-orientation='vertical']) .ptz .ptz-home { - height: calc(var(--frigate-card-ptz-icon-size) * 1.5); + height: calc(var(--advanced-camera-card-ptz-icon-size) * 1.5); } .ptz-zoom, @@ -84,11 +84,11 @@ /*********** * PTZ Icons ***********/ -frigate-card-icon { +advanced-camera-card-icon { position: absolute; - --mdc-icon-size: var(--frigate-card-ptz-icon-size); + --mdc-icon-size: var(--advanced-camera-card-ptz-icon-size); } -frigate-card-icon:not(.disabled) { +advanced-camera-card-icon:not(.disabled) { cursor: pointer; } .disabled { diff --git a/src/scss/status.scss b/src/scss/status.scss index 8ee52e53..962cc6e5 100644 --- a/src/scss/status.scss +++ b/src/scss/status.scss @@ -1,7 +1,7 @@ @use './button.scss'; :host { - --mdc-icon-size: calc(var(--frigate-card-status-bar-height) / 2); + --mdc-icon-size: calc(var(--advanced-camera-card-status-bar-height) / 2); display: block; width: 100%; @@ -41,7 +41,7 @@ overflow: hidden; width: 100%; - height: var(--frigate-card-status-bar-height); + height: var(--advanced-camera-card-status-bar-height); } .item { @@ -67,7 +67,7 @@ } img.item, -frigate-card-icon.item { +advanced-camera-card-icon.item { display: block; // To ensure images render somewhat reasonably looking their height is kept to diff --git a/src/scss/submenu.scss b/src/scss/submenu.scss index 36e222f1..7f824c7e 100644 --- a/src/scss/submenu.scss +++ b/src/scss/submenu.scss @@ -9,12 +9,12 @@ mwc-list-item { } ha-icon-button { - // The main submenu icon is expected to follow Frigate card theming unless it + // The main submenu icon is expected to follow Advanced Camera Card theming unless it // is are active (in which case we want to take advantage of the whatever // styling is appropriate, e.g. light icon partially lit). - --state-unavailable-color: var(--frigate-card-button-color); - --state-inactive-color: var(--frigate-card-button-color); + --state-unavailable-color: var(--advanced-camera-card-button-color); + --state-inactive-color: var(--advanced-camera-card-button-color); - color: var(--frigate-card-menu-button-inactive-color); - background-color: var(--frigate-card-menu-button-background); + color: var(--advanced-camera-card-menu-button-inactive-color); + background-color: var(--advanced-camera-card-menu-button-background); } diff --git a/src/scss/themes/base.scss b/src/scss/themes/base.scss index 1f041179..ceb084b5 100644 --- a/src/scss/themes/base.scss +++ b/src/scss/themes/base.scss @@ -7,141 +7,169 @@ * General *********/ - --frigate-card-exterior: var(--secondary-background-color, black); - --frigate-card-background: var(--primary-background-color, white); + --advanced-camera-card-exterior: var(--secondary-background-color, black); + --advanced-camera-card-background: var(--primary-background-color, white); - --frigate-card-foreground-primary: var(--primary-color, black); + --advanced-camera-card-foreground-primary: var(--primary-color, black); - --frigate-card-active-color: var(--accent-color, orange); - --frigate-card-warning-color: var(--error-color, red); + --advanced-camera-card-active-color: var(--accent-color, orange); + --advanced-camera-card-warning-color: var(--error-color, red); - --frigate-card-text-color: var(--primary-text-color); - --frigate-card-divider-color: var(--divider-color); + --advanced-camera-card-text-color: var(--primary-text-color); + --advanced-camera-card-divider-color: var(--divider-color); - --frigate-card-control-background: var(--app-header-background-color); - --frigate-card-control-background-transparent: color-mix( + --advanced-camera-card-control-background: var(--app-header-background-color); + --advanced-camera-card-control-background-transparent: color-mix( in oklab, - var(--frigate-card-control-background), + var(--advanced-camera-card-control-background), transparent 60% ); - --frigate-card-control-foreground: var(--app-header-text-color); + --advanced-camera-card-control-foreground: var(--app-header-text-color); /********* * Buttons *********/ // The color of buttons (in general, menu or otherwise). - --frigate-card-button-color: var(--frigate-card-control-foreground); + --advanced-camera-card-button-color: var(--advanced-camera-card-control-foreground); // The color of button background "circles". - --frigate-card-button-background: var(--frigate-card-control-background-transparent); + --advanced-camera-card-button-background: var( + --advanced-camera-card-control-background-transparent + ); /****** * Menu ******/ // The color of an active icon in the menu. - --frigate-card-menu-button-active-color: var(--frigate-card-active-color); + --advanced-camera-card-menu-button-active-color: var( + --advanced-camera-card-active-color + ); // The color of an inactive icon in the menu. - --frigate-card-menu-button-inactive-color: var(--frigate-card-button-color); + --advanced-camera-card-menu-button-inactive-color: var( + --advanced-camera-card-button-color + ); // The color of a critical icon in the menu. - --frigate-card-menu-button-critical-color: var( + --advanced-camera-card-menu-button-critical-color: var( --error-color, - var(--frigate-card-warning-color) + var(--advanced-camera-card-warning-color) ); // The background color of the button "circles" in the menu. - --frigate-card-menu-button-background: color-mix( + --advanced-camera-card-menu-button-background: color-mix( in oklab, - var(--frigate-card-menu-button-inactive-color), + var(--advanced-camera-card-menu-button-inactive-color), transparent 60% ); // The menu background color. - --frigate-card-menu-background: var(--frigate-card-control-background-transparent); - --frigate-card-menu-style-outside-background: var(--frigate-card-control-background); + --advanced-camera-card-menu-background: var( + --advanced-camera-card-control-background-transparent + ); + --advanced-camera-card-menu-style-outside-background: var( + --advanced-camera-card-control-background + ); // May be overridden by the user to force a particular color. - --frigate-card-menu-override-background: unset; - --frigate-card-menu-override-button-inactive-color: unset; - --frigate-card-menu-override-button-background: unset; + --advanced-camera-card-menu-override-background: unset; + --advanced-camera-card-menu-override-button-inactive-color: unset; + --advanced-camera-card-menu-override-button-background: unset; // Examples of precise theming for the menu: - // --frigate-card-menu-position-left-alignment-left-style-overlay-background: pink; - // --frigate-card-menu-position-left-background: purple; - // --frigate-card-menu-style-overlay-background: pink; + // --advanced-camera-card-menu-position-left-alignment-left-style-overlay-background: pink; + // --advanced-camera-card-menu-position-left-background: purple; + // --advanced-camera-card-menu-style-overlay-background: pink; /************ * Status bar ************/ // May be overridden by the user to force a particular color. - --frigate-card-status-bar-override-background: unset; - --frigate-card-status-bar-override-color: unset; + --advanced-camera-card-status-bar-override-background: unset; + --advanced-camera-card-status-bar-override-color: unset; // The color of items on the status bar. - --frigate-card-status-bar-color: var(--frigate-card-control-foreground); + --advanced-camera-card-status-bar-color: var( + --advanced-camera-card-control-foreground + ); // The background color of the outerlay above/below the card. - --frigate-card-status-bar-background: var( - --frigate-card-control-background-transparent + --advanced-camera-card-status-bar-background: var( + --advanced-camera-card-control-background-transparent ); - --frigate-card-status-bar-style-outside-background: var( - --frigate-card-control-background + --advanced-camera-card-status-bar-style-outside-background: var( + --advanced-camera-card-control-background ); /************ * Thumbnails ************/ - --frigate-card-thumbnail-icon-color: var(--frigate-card-foreground-primary); - --frigate-card-thumbnail-border-color: var(--frigate-card-foreground-primary); - --frigate-card-thumbnail-background: var(--frigate-card-background); - --frigate-card-thumbnail-icon-favorite-color: color-mix( + --advanced-camera-card-thumbnail-icon-color: var( + --advanced-camera-card-foreground-primary + ); + --advanced-camera-card-thumbnail-border-color: var( + --advanced-camera-card-foreground-primary + ); + --advanced-camera-card-thumbnail-background: var(--advanced-camera-card-background); + --advanced-camera-card-thumbnail-icon-favorite-color: color-mix( in oklab, gold, transparent 25% ); - --frigate-card-thumbnail-text-color: var(--frigate-card-text-color); + --advanced-camera-card-thumbnail-text-color: var(--advanced-camera-card-text-color); /********** * Timeline **********/ - --frigate-card-timeline-text-color: var(--frigate-card-text-color); - --frigate-card-timeline-item-color: var(--frigate-card-foreground-primary); - --frigate-card-timeline-tool-color: var(--frigate-card-foreground-primary); - --frigate-card-timeline-background: var(--frigate-card-background); + --advanced-camera-card-timeline-text-color: var(--advanced-camera-card-text-color); + --advanced-camera-card-timeline-item-color: var( + --advanced-camera-card-foreground-primary + ); + --advanced-camera-card-timeline-tool-color: var( + --advanced-camera-card-foreground-primary + ); + --advanced-camera-card-timeline-background: var(--advanced-camera-card-background); // style for the 'background' style of item (i.e. recordings). - --frigate-card-timeline-background-item-color: color-mix( + --advanced-camera-card-timeline-background-item-color: color-mix( in oklab, - var(--frigate-card-timeline-item-color), + var(--advanced-camera-card-timeline-item-color), transparent 90% ); - --frigate-card-timeline-divider-color: var(--frigate-card-divider-color); - --frigate-card-timeline-target-bar-color: var(--frigate-card-active-color); + --advanced-camera-card-timeline-divider-color: var( + --advanced-camera-card-divider-color + ); + --advanced-camera-card-timeline-target-bar-color: var( + --advanced-camera-card-active-color + ); /******************* * Loading Indicator *******************/ - --frigate-card-loading-background-color: var( - --frigate-card-control-background-transparent + --advanced-camera-card-loading-background-color: var( + --advanced-camera-card-control-background-transparent + ); + --advanced-camera-card-loading-foreground-color: var( + --advanced-camera-card-control-foreground ); - --frigate-card-loading-foreground-color: var(--frigate-card-control-foreground); /********* * Message *********/ - --frigate-card-message-color: var(--frigate-card-text-color); - --frigate-card-message-background: var(--frigate-card-background); + --advanced-camera-card-message-color: var(--advanced-camera-card-text-color); + --advanced-camera-card-message-background: var(--advanced-camera-card-background); - --frigate-card-message-overlay-background: var( - --frigate-card-control-background-transparent + --advanced-camera-card-message-overlay-background: var( + --advanced-camera-card-control-background-transparent + ); + --advanced-camera-card-message-overlay-color: var( + --advanced-camera-card-control-foreground ); - --frigate-card-message-overlay-color: var(--frigate-card-control-foreground); } diff --git a/src/scss/themes/traditional.scss b/src/scss/themes/traditional.scss index b3b2fe2b..6d717c47 100644 --- a/src/scss/themes/traditional.scss +++ b/src/scss/themes/traditional.scss @@ -1,10 +1,10 @@ @mixin background-gradient($var, $angle) { #{$var}: linear-gradient( $angle, - var(--frigate-card-menu-background), - var(--frigate-card-menu-background), - var(--frigate-card-menu-background), - color-mix(in oklab, var(--frigate-card-menu-background), transparent 100%) + var(--advanced-camera-card-menu-background), + var(--advanced-camera-card-menu-background), + var(--advanced-camera-card-menu-background), + color-mix(in oklab, var(--advanced-camera-card-menu-background), transparent 100%) ); } @@ -13,59 +13,59 @@ * General *********/ - --frigate-card-control-background: black; + --advanced-camera-card-control-background: black; /****** * Menu ******/ - --frigate-card-menu-button-active-color: var(--primary-color, white); - --frigate-card-menu-button-background: rgba(0, 0, 0, 0.6); + --advanced-camera-card-menu-button-active-color: var(--primary-color, white); + --advanced-camera-card-menu-button-background: rgba(0, 0, 0, 0.6); @include background-gradient( - '--frigate-card-menu-position-left-alignment-top-background', + '--advanced-camera-card-menu-position-left-alignment-top-background', 180deg ); @include background-gradient( - '--frigate-card-menu-position-left-alignment-bottom-background', + '--advanced-camera-card-menu-position-left-alignment-bottom-background', 0deg ); @include background-gradient( - '--frigate-card-menu-position-right-alignment-top-background', + '--advanced-camera-card-menu-position-right-alignment-top-background', 180deg ); @include background-gradient( - '--frigate-card-menu-position-right-alignment-bottom-background', + '--advanced-camera-card-menu-position-right-alignment-bottom-background', 0deg ); @include background-gradient( - '--frigate-card-menu-position-top-alignment-left-background', + '--advanced-camera-card-menu-position-top-alignment-left-background', 90deg ); @include background-gradient( - '--frigate-card-menu-position-top-alignment-right-background', + '--advanced-camera-card-menu-position-top-alignment-right-background', 270deg ); @include background-gradient( - '--frigate-card-menu-position-bottom-alignment-left-background', + '--advanced-camera-card-menu-position-bottom-alignment-left-background', 90deg ); @include background-gradient( - '--frigate-card-menu-position-bottom-alignment-right-background', + '--advanced-camera-card-menu-position-bottom-alignment-right-background', 270deg ); - --frigate-card-menu-position-top-alignment-left-style-outside-background: var( + --advanced-camera-card-menu-position-top-alignment-left-style-outside-background: var( --secondary-background-color ); - --frigate-card-menu-position-top-alignment-right-style-outside-background: var( + --advanced-camera-card-menu-position-top-alignment-right-style-outside-background: var( --secondary-background-color ); - --frigate-card-menu-position-bottom-alignment-left-style-outside-background: var( + --advanced-camera-card-menu-position-bottom-alignment-left-style-outside-background: var( --secondary-background-color ); - --frigate-card-menu-position-bottom-alignment-right-style-outside-background: var( + --advanced-camera-card-menu-position-bottom-alignment-right-style-outside-background: var( --secondary-background-color ); @@ -73,27 +73,27 @@ * Status bar ************/ - --frigate-card-status-bar-color: white; + --advanced-camera-card-status-bar-color: white; @include background-gradient( - '--frigate-card-status-bar-position-top-background', + '--advanced-camera-card-status-bar-position-top-background', 90deg ); @include background-gradient( - '--frigate-card-status-bar-position-bottom-background', + '--advanced-camera-card-status-bar-position-bottom-background', 90deg ); - --frigate-card-status-bar-position-top-style-outside-background: var( + --advanced-camera-card-status-bar-position-top-style-outside-background: var( --secondary-background-color ); - --frigate-card-status-bar-position-bottom-style-outside-background: var( + --advanced-camera-card-status-bar-position-bottom-style-outside-background: var( --secondary-background-color ); - --frigate-card-status-bar-position-top-style-outside-color: var( + --advanced-camera-card-status-bar-position-top-style-outside-color: var( --secondary-text-color ); - --frigate-card-status-bar-position-bottom-style-outside-color: var( + --advanced-camera-card-status-bar-position-bottom-style-outside-color: var( --secondary-text-color ); } diff --git a/src/scss/thumbnail-carousel.scss b/src/scss/thumbnail-carousel.scss index d4c77eaa..846ad205 100644 --- a/src/scss/thumbnail-carousel.scss +++ b/src/scss/thumbnail-carousel.scss @@ -5,9 +5,9 @@ width: 100%; height: 100%; - background-color: var(--frigate-card-thumbnail-background); + background-color: var(--advanced-camera-card-thumbnail-background); - --frigate-card-carousel-thumbnail-opacity: 1; + --advanced-camera-card-carousel-thumbnail-opacity: 1; } :host([direction='vertical']) { @@ -21,19 +21,19 @@ .embla__slide { flex: 0 0 auto; - opacity: var(--frigate-card-carousel-thumbnail-opacity); + opacity: var(--advanced-camera-card-carousel-thumbnail-opacity); } .embla__slide.slide-selected { opacity: 1; } -frigate-card-thumbnail { - width: var(--frigate-card-thumbnail-size); - height: var(--frigate-card-thumbnail-size); +advanced-camera-card-thumbnail { + width: var(--advanced-camera-card-thumbnail-size); + height: var(--advanced-camera-card-thumbnail-size); // Do not let thumbnails span beyond the width of the carousel. max-width: 100%; } -frigate-card-thumbnail[details] { - width: var(--frigate-card-thumbnail-details-width); +advanced-camera-card-thumbnail[details] { + width: var(--advanced-camera-card-thumbnail-details-width); } diff --git a/src/scss/thumbnail-details.scss b/src/scss/thumbnail-details.scss index fcf9a537..40dc6b04 100644 --- a/src/scss/thumbnail-details.scss +++ b/src/scss/thumbnail-details.scss @@ -5,7 +5,7 @@ width: 100%; margin-left: 5px; padding: 5px; - color: var(--frigate-card-thumbnail-text-color); + color: var(--advanced-camera-card-thumbnail-text-color); overflow: hidden; column-gap: 5%; } diff --git a/src/scss/thumbnail-feature-text.scss b/src/scss/thumbnail-feature-text.scss index e4cec7b4..df978c72 100644 --- a/src/scss/thumbnail-feature-text.scss +++ b/src/scss/thumbnail-feature-text.scss @@ -1,14 +1,14 @@ :host { display: block; - max-width: var(--frigate-card-thumbnail-size); - max-height: var(--frigate-card-thumbnail-size); + max-width: var(--advanced-camera-card-thumbnail-size); + max-height: var(--advanced-camera-card-thumbnail-size); aspect-ratio: 1 / 1; border: 1px solid var(--secondary-color); background-color: var(--secondary-background-color); border-radius: var( - --frigate-card-css-border-radius, + --advanced-camera-card-css-border-radius, var(--ha-card-border-radius, 4px) ); @@ -21,7 +21,7 @@ position: relative; } -frigate-card-icon.background { +advanced-camera-card-icon.background { display: block; width: 100%; height: 100%; diff --git a/src/scss/thumbnail-feature-thumbnail.scss b/src/scss/thumbnail-feature-thumbnail.scss index cc75a31a..ccbd1f82 100644 --- a/src/scss/thumbnail-feature-thumbnail.scss +++ b/src/scss/thumbnail-feature-thumbnail.scss @@ -14,7 +14,7 @@ img { } img, -frigate-card-icon { +advanced-camera-card-icon { // Safari will occasionally not load thumbnails correctly with display block. display: inline-block; @@ -23,11 +23,11 @@ frigate-card-icon { margin: 0; border-radius: var( - --frigate-card-css-border-radius, + --advanced-camera-card-css-border-radius, var(--ha-card-border-radius, 4px) ); - width: var(--frigate-card-thumbnail-size); + width: var(--advanced-camera-card-thumbnail-size); max-height: 100%; aspect-ratio: 1 / 1; @@ -37,7 +37,7 @@ frigate-card-icon { object-fit: cover; } -frigate-card-icon { +advanced-camera-card-icon { --mdc-icon-size: 50%; color: var(--primary-text-color); display: flex; diff --git a/src/scss/thumbnail.scss b/src/scss/thumbnail.scss index 5054e93b..9d4b175d 100644 --- a/src/scss/thumbnail.scss +++ b/src/scss/thumbnail.scss @@ -15,26 +15,26 @@ } :host([details]) { - border: 1px solid var(--frigate-card-thumbnail-border-color); + border: 1px solid var(--advanced-camera-card-thumbnail-border-color); border-radius: var( - --frigate-card-css-border-radius, + --advanced-camera-card-css-border-radius, var(--ha-card-border-radius, 4px) ); padding: 2px; // When details are enabled, use a background color so that the details have // contrast with the background. - background-color: var(--frigate-card-thumbnail-background); + background-color: var(--advanced-camera-card-thumbnail-background); } :host(:hover) { transform: scale(1.04); } -frigate-card-icon { +advanced-camera-card-icon { position: absolute; border-radius: 50%; - color: var(--frigate-card-thumbnail-icon-color); + color: var(--advanced-camera-card-thumbnail-icon-color); cursor: pointer; @@ -42,29 +42,29 @@ frigate-card-icon { opacity 0.2s ease-in-out, color 0.2s ease-in-out; } -frigate-card-icon:hover { +advanced-camera-card-icon:hover { opacity: 1; } -frigate-card-icon.star { +advanced-camera-card-icon.star { top: 3px; left: 3px; } -frigate-card-icon.star.starred { - color: var(--frigate-card-thumbnail-icon-favorite-color); +advanced-camera-card-icon.star.starred { + color: var(--advanced-camera-card-thumbnail-icon-favorite-color); } -frigate-card-icon.timeline { +advanced-camera-card-icon.timeline { top: 3px; right: 3px; } -frigate-card-icon.download { +advanced-camera-card-icon.download { right: 3px; bottom: 3px; } -frigate-card-thumbnail-details-event, -frigate-card-thumbnail-details-recording { +advanced-camera-card-thumbnail-details-event, +advanced-camera-card-thumbnail-details-recording { flex: 1; } diff --git a/src/scss/timeline-core.scss b/src/scss/timeline-core.scss index 990c7149..acc9ff27 100644 --- a/src/scss/timeline-core.scss +++ b/src/scss/timeline-core.scss @@ -11,7 +11,7 @@ // So that absolute sidedrawer is relative to this host. position: relative; - background-color: var(--frigate-card-timeline-background); + background-color: var(--advanced-camera-card-timeline-background); } :host(:not([mini])) { @@ -19,12 +19,12 @@ height: 100%; } -frigate-card-thumbnail { - height: var(--frigate-card-thumbnail-size); - width: var(--frigate-card-thumbnail-size); +advanced-camera-card-thumbnail { + height: var(--advanced-camera-card-thumbnail-size); + width: var(--advanced-camera-card-thumbnail-size); } -frigate-card-thumbnail[details] { - width: var(--frigate-card-thumbnail-details-width); +advanced-camera-card-thumbnail[details] { + width: var(--advanced-camera-card-thumbnail-details-width); } div.timeline { @@ -32,7 +32,7 @@ div.timeline { } .vis-text { - color: var(--frigate-card-timeline-text-color) !important; + color: var(--advanced-camera-card-timeline-text-color) !important; } .vis-timeline { @@ -41,7 +41,7 @@ div.timeline { .vis-labelset .vis-label { // Group labels. - color: var(--frigate-card-timeline-text-color); + color: var(--advanced-camera-card-timeline-text-color); } :host([ribbon]:not([groups])) .vis-item:not(.vis-background) { @@ -55,10 +55,10 @@ div.timeline { height: 6px; } .vis-item { - border-color: var(--frigate-card-timeline-item-color); + border-color: var(--advanced-camera-card-timeline-item-color); background: none; - color: var(--frigate-card-timeline-text-color); - background-color: var(--frigate-card-timeline-item-color); + color: var(--advanced-camera-card-timeline-text-color); + background-color: var(--advanced-camera-card-timeline-item-color); transition: background-color ease-in-out 1s, @@ -66,15 +66,15 @@ div.timeline { box-shadow ease-in-out 1s; } .vis-item.vis-selected { - border-color: var(--frigate-card-active-color); - background-color: var(--frigate-card-active-color); + border-color: var(--advanced-camera-card-active-color); + background-color: var(--advanced-camera-card-active-color); box-shadow: var( - --frigate-card-css-box-shadow, - 0px 0px 5px 1px var(--frigate-card-active-color) + --advanced-camera-card-css-box-shadow, + 0px 0px 5px 1px var(--advanced-camera-card-active-color) ); } .vis-item.vis-background { - background-color: var(--frigate-card-timeline-background-item-color); + background-color: var(--advanced-camera-card-timeline-background-item-color); } // If there are no timeline groups shown (e.g. mini mode with a single camera), @@ -106,19 +106,19 @@ div.timeline { .vis-item.vis-cluster { border-style: dotted; - color: var(--frigate-card-timeline-text-color); - background-color: var(--frigate-card-timeline-background); + color: var(--advanced-camera-card-timeline-text-color); + background-color: var(--advanced-camera-card-timeline-background); box-shadow: var( - --frigate-card-css-box-shadow, - 0px 0px 5px 1px var(--frigate-card-timeline-item-color) + --advanced-camera-card-css-box-shadow, + 0px 0px 5px 1px var(--advanced-camera-card-timeline-item-color) ); } .vis-item.vis-range { - border-radius: var(--frigate-card-css-border-radius, unset); + border-radius: var(--advanced-camera-card-css-border-radius, unset); } .vis-time-axis .vis-grid.vis-minor { - border-color: var(--frigate-card-timeline-divider-color); + border-color: var(--advanced-camera-card-timeline-divider-color); } // Give an indication that the user can interact with the axes. @@ -129,13 +129,13 @@ div.timeline { :host([recordings]) .vis-text.vis-minor:hover { background-color: color-mix( in oklab, - var(--frigate-card-timeline-text-color), + var(--advanced-camera-card-timeline-text-color), transparent 80% ); } .vis-time-axis .vis-grid.vis-major { - border-color: var(--frigate-card-timeline-divider-color); + border-color: var(--advanced-camera-card-timeline-divider-color); } .vis-label { @@ -156,7 +156,7 @@ div.vis-tooltip { } .target_bar { - background-color: var(--frigate-card-timeline-target-bar-color); + background-color: var(--advanced-camera-card-timeline-target-bar-color); width: 2px; z-index: 20; @@ -165,8 +165,8 @@ div.vis-tooltip { pointer-events: none; } .target_bar .vis-custom-time-marker { - background-color: var(--frigate-card-timeline-background); - color: var(--frigate-card-timeline-text-color); + background-color: var(--advanced-camera-card-timeline-background); + color: var(--advanced-camera-card-timeline-text-color); bottom: 0px; top: unset; } @@ -186,7 +186,7 @@ div.vis-tooltip { position: absolute; right: 0px; bottom: 0px; - color: var(--frigate-card-timeline-tool-color); + color: var(--advanced-camera-card-timeline-tool-color); z-index: 10; } .timeline-tools * { diff --git a/src/scss/viewer-carousel.scss b/src/scss/viewer-carousel.scss index 5d4a4501..e0c4a889 100644 --- a/src/scss/viewer-carousel.scss +++ b/src/scss/viewer-carousel.scss @@ -10,12 +10,12 @@ // when the carousel is part of a media-grid. Without this next/prev controls // will enlarge on hover, and the wheel-gestures plugin may block scrolling. // See matching in live-carousel.scss . -:host([unselected]) frigate-card-carousel, +:host([unselected]) advanced-camera-card-carousel, :host([unselected]) .seek-warning { pointer-events: none; } -:host([unseekable]) frigate-card-carousel { +:host([unseekable]) advanced-camera-card-carousel { filter: brightness(50%); } :host([unseekable]) .seek-warning { diff --git a/src/scss/viewer-provider.scss b/src/scss/viewer-provider.scss index a9c6ce50..53663142 100644 --- a/src/scss/viewer-provider.scss +++ b/src/scss/viewer-provider.scss @@ -9,7 +9,7 @@ img, video, -frigate-card-ha-hls-player { +advanced-camera-card-ha-hls-player { display: block; width: 100%; height: 100%; @@ -17,7 +17,7 @@ frigate-card-ha-hls-player { @include media-layout.media-layout(); } -frigate-card-progress-indicator { +advanced-camera-card-progress-indicator { padding: 30px; box-sizing: border-box; } diff --git a/src/scss/viewer.scss b/src/scss/viewer.scss index 18ec3c39..aadbb614 100644 --- a/src/scss/viewer.scss +++ b/src/scss/viewer.scss @@ -6,7 +6,7 @@ gap: 5px; } -frigate-card-viewer-carousel { +advanced-camera-card-viewer-carousel { flex: 1; min-height: 0; } diff --git a/src/types.ts b/src/types.ts index 85471470..b8b1d5d4 100644 --- a/src/types.ts +++ b/src/types.ts @@ -10,7 +10,7 @@ import { z } from 'zod'; export type ClipsOrSnapshots = 'clips' | 'snapshots'; export type ClipsOrSnapshotsOrAll = 'clips' | 'snapshots' | 'all'; -export class FrigateCardError extends Error { +export class AdvancedCameraCardError extends Error { context?: unknown; constructor(message: string, context?: unknown) { @@ -39,7 +39,7 @@ export interface MediaLoadedInfo { width: number; height: number; technology?: MediaTechnology[]; - player?: FrigateCardMediaPlayer; + player?: AdvancedCameraCardMediaPlayer; capabilities?: MediaLoadedCapabilities; } @@ -63,7 +63,7 @@ export type WebkitHTMLVideoElement = HTMLVideoElement & { export type FullscreenElement = HTMLElement; -export interface FrigateCardMediaPlayer { +export interface AdvancedCameraCardMediaPlayer { play(): Promise; pause(): Promise; mute(): Promise; diff --git a/src/utils/action.ts b/src/utils/action.ts index d26af9be..7eb15108 100644 --- a/src/utils/action.ts +++ b/src/utils/action.ts @@ -1,48 +1,51 @@ -import { ActionConfig, hasAction } from '@dermotduffy/custom-card-helpers'; +import { + ActionConfig, + hasAction as customCardHasAction, +} from '@dermotduffy/custom-card-helpers'; import { ZoomSettingsBase } from '../components-lib/zoom/types.js'; import { PTZAction } from '../config/ptz.js'; import { ActionPhase, ActionType, Actions, - FrigateCardCustomAction, - FrigateCardGeneralAction, - FrigateCardUserSpecifiedView, + AdvancedCameraCardCustomAction, + AdvancedCameraCardGeneralAction, + AdvancedCameraCardUserSpecifiedView, LogActionConfig, LogActionLevel, PTZActionConfig, PTZDigitialActionConfig, PTZMultiActionConfig, - frigateCardCustomActionSchema, + advancedCameraCardCustomActionSchema, } from '../config/types.js'; import { arrayify } from './basic.js'; /** - * Convert a generic Action to a FrigateCardCustomAction if it parses correctly. + * Convert a generic Action to a AdvancedCameraCardCustomAction if it parses correctly. * @param action The generic action configuration. - * @returns A FrigateCardCustomAction or null if it cannot be converted. + * @returns A AdvancedCameraCardCustomAction or null if it cannot be converted. */ export function convertActionToCardCustomAction( action: unknown, -): FrigateCardCustomAction | null { +): AdvancedCameraCardCustomAction | null { if (!action) { return null; } // Parse a custom event as other things could generate ll-custom events that - // are not related to Frigate Card. - const parseResult = frigateCardCustomActionSchema.safeParse(action); + // are not related to Advanced Camera Card. + const parseResult = advancedCameraCardCustomActionSchema.safeParse(action); return parseResult.success ? parseResult.data : null; } export function createGeneralAction( - action: FrigateCardGeneralAction | FrigateCardUserSpecifiedView, + action: AdvancedCameraCardGeneralAction | AdvancedCameraCardUserSpecifiedView, options?: { cardID?: string; }, -): FrigateCardCustomAction { +): AdvancedCameraCardCustomAction { return { action: 'fire-dom-event', - frigate_card_action: action, + advanced_camera_card_action: action, ...(options?.cardID && { card_id: options.cardID }), }; } @@ -53,10 +56,10 @@ export function createCameraAction( options?: { cardID?: string; }, -): FrigateCardCustomAction { +): AdvancedCameraCardCustomAction { return { action: 'fire-dom-event', - frigate_card_action: action, + advanced_camera_card_action: action, camera: camera, ...(options?.cardID && { card_id: options.cardID }), }; @@ -68,10 +71,10 @@ export function createMediaPlayerAction( options?: { cardID?: string; }, -): FrigateCardCustomAction { +): AdvancedCameraCardCustomAction { return { action: 'fire-dom-event', - frigate_card_action: 'media_player', + advanced_camera_card_action: 'media_player', media_player: mediaPlayer, media_player_action: mediaPlayerAction, ...(options?.cardID && { card_id: options.cardID }), @@ -83,10 +86,10 @@ export function createDisplayModeAction( options?: { cardID?: string; }, -): FrigateCardCustomAction { +): AdvancedCameraCardCustomAction { return { action: 'fire-dom-event', - frigate_card_action: 'display_mode_select', + advanced_camera_card_action: 'display_mode_select', display_mode: displayMode, ...(options?.cardID && { card_id: options.cardID }), }; @@ -97,10 +100,10 @@ export function createPTZControlsAction( options?: { cardID?: string; }, -): FrigateCardCustomAction { +): AdvancedCameraCardCustomAction { return { action: 'fire-dom-event', - frigate_card_action: 'ptz_controls', + advanced_camera_card_action: 'ptz_controls', enabled: enabled, ...(options?.cardID && { card_id: options.cardID }), }; @@ -115,7 +118,7 @@ export function createPTZAction(options?: { }): PTZActionConfig { return { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ...(options?.cardID && { card_id: options.cardID }), ...(options?.ptzAction && { ptz_action: options.ptzAction }), ...(options?.ptzPhase && { ptz_phase: options.ptzPhase }), @@ -133,7 +136,7 @@ export function createPTZDigitalAction(options?: { }): PTZDigitialActionConfig { return { action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', ...(options?.cardID && { card_id: options.cardID }), ...(options?.ptzAction && { ptz_action: options.ptzAction }), ...(options?.ptzPhase && { ptz_phase: options.ptzPhase }), @@ -151,7 +154,7 @@ export function createPTZMultiAction(options?: { }): PTZMultiActionConfig { return { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', ...(options?.cardID && { card_id: options.cardID }), ...(options?.ptzAction && { ptz_action: options.ptzAction }), ...(options?.ptzPhase && { ptz_phase: options.ptzPhase }), @@ -169,7 +172,7 @@ export function createLogAction( ): LogActionConfig { return { action: 'fire-dom-event', - frigate_card_action: 'log', + advanced_camera_card_action: 'log', message: message, level: options?.level ?? 'info', ...(options?.cardID && { card_id: options.cardID }), @@ -209,10 +212,12 @@ export function getActionConfigGivenAction( * @param config The action config in question. * @returns `true` if there's a real action defined, `false` otherwise. */ -export const frigateCardHasAction = (config?: ActionType | ActionType[]): boolean => { +export const hasAction = (config?: ActionType | ActionType[]): boolean => { // See note above on 'ActionConfig vs ActionType' for why this cast is // necessary and harmless. - return arrayify(config).some((item) => hasAction(item as ActionConfig | undefined)); + return arrayify(config).some((item) => + customCardHasAction(item as ActionConfig | undefined), + ); }; /** diff --git a/src/utils/basic.ts b/src/utils/basic.ts index e530849b..8c692ed9 100644 --- a/src/utils/basic.ts +++ b/src/utils/basic.ts @@ -9,23 +9,23 @@ import isEqualWith from 'lodash-es/isEqualWith'; import mergeWith from 'lodash-es/mergeWith'; import round from 'lodash-es/round'; import uniq from 'lodash-es/uniq'; -import { FrigateCardError } from '../types'; +import { AdvancedCameraCardError } from '../types'; export type ModifyInterface = Omit & R; /** - * Dispatch a Frigate Card event. + * Dispatch an Advanced Camera Card event. * @param target The target from which send the event. - * @param name The name of the Frigate card event to send. + * @param name The name of the Advanced Camera Card event to send. * @param detail An optional detail object to attach. */ -export function dispatchFrigateCardEvent( +export function dispatchAdvancedCameraCardEvent( target: EventTarget, name: string, detail?: T, ): void { target.dispatchEvent( - new CustomEvent(`frigate-card:${name}`, { + new CustomEvent(`advanced-camera-card:${name}`, { bubbles: true, composed: true, detail: detail, @@ -35,7 +35,7 @@ export function dispatchFrigateCardEvent( /** * Prettify a title by converting '_' to spaces and capitalizing words. - * @param input The input Frigate (camera/label/zone) name. + * @param input The input string. * @returns A prettified name. */ export function prettifyTitle(input: string): string; @@ -108,7 +108,7 @@ export function errorToConsole( e: Error | { message: unknown } | string, func: CallableFunction = console.warn, ): void { - if (e instanceof FrigateCardError && e.context) { + if (e instanceof AdvancedCameraCardError && e.context) { func(e, e.context); } else if (typeof e === 'object' && 'message' in e) { func(e.message); diff --git a/src/utils/camera.ts b/src/utils/camera.ts index 0a561890..ab5e952b 100644 --- a/src/utils/camera.ts +++ b/src/utils/camera.ts @@ -1,4 +1,4 @@ -import { CameraConfig, RawFrigateCardConfig } from '../config/types.js'; +import { CameraConfig, RawAdvancedCameraCardConfig } from '../config/types.js'; /** * Get a camera id. @@ -6,7 +6,7 @@ import { CameraConfig, RawFrigateCardConfig } from '../config/types.js'; * @returns A camera id. */ export function getCameraID( - config?: CameraConfig | RawFrigateCardConfig | null, + config?: CameraConfig | RawAdvancedCameraCardConfig | null, ): string { return ( (typeof config?.id === 'string' && config.id) || diff --git a/src/utils/diagnostics.ts b/src/utils/diagnostics.ts index 7c0f073d..3115fe6f 100644 --- a/src/utils/diagnostics.ts +++ b/src/utils/diagnostics.ts @@ -1,6 +1,6 @@ import { HomeAssistant } from '@dermotduffy/custom-card-helpers'; import pkg from '../../package.json'; -import { RawFrigateCardConfig } from '../config/types'; +import { RawAdvancedCameraCardConfig } from '../config/types'; import { getLanguage } from '../localize/localize'; import { getIntegrationManifest } from './ha/integration'; import { IntegrationManifest } from './ha/integration/types'; @@ -21,7 +21,7 @@ interface IntegrationDiagnostics { } export const getReleaseVersion = (): string => { - const releaseVersion: string = '__FRIGATE_CARD_RELEASE_VERSION__'; + const releaseVersion: string = '__ADVANCED_CAMERA_CARD_RELEASE_VERSION__'; /* istanbul ignore if: depends on rollup substitution -- @preserve */ if (releaseVersion === 'pkg') { @@ -45,7 +45,7 @@ interface Diagnostics { git: GitDiagnostics; ha_version?: string; - config?: RawFrigateCardConfig; + config?: RawAdvancedCameraCardConfig; custom_integrations: { frigate: IntegrationDiagnostics & { @@ -78,7 +78,7 @@ const getIntegrationDiagnostics = async ( export const getDiagnostics = async ( hass?: HomeAssistant, deviceRegistryManager?: DeviceRegistryManager, - rawConfig?: RawFrigateCardConfig, + rawConfig?: RawAdvancedCameraCardConfig, ): Promise => { // Get the Frigate devices in order to extract the Frigate integration and // server version numbers. diff --git a/src/utils/download.ts b/src/utils/download.ts index 5e9b77d2..f42a3b59 100644 --- a/src/utils/download.ts +++ b/src/utils/download.ts @@ -1,6 +1,6 @@ import { CameraManager } from '../camera-manager/manager'; import { localize } from '../localize/localize'; -import { ExtendedHomeAssistant, FrigateCardError } from '../types'; +import { AdvancedCameraCardError, ExtendedHomeAssistant } from '../types'; import { ViewMedia } from '../view/media'; import { errorToConsole } from './basic'; import { homeAssistantSignPath } from './ha'; @@ -32,7 +32,7 @@ export const downloadMedia = async ( ): Promise => { const download = await cameraManager.getMediaDownloadPath(media); if (!download) { - throw new FrigateCardError(localize('error.download_no_media')); + throw new AdvancedCameraCardError(localize('error.download_no_media')); } let finalURL = download.endpoint; @@ -45,7 +45,7 @@ export const downloadMedia = async ( } if (!response) { - throw new FrigateCardError(localize('error.download_sign_failed')); + throw new AdvancedCameraCardError(localize('error.download_sign_failed')); } finalURL = response; } diff --git a/src/utils/embla/carousel-controller.ts b/src/utils/embla/carousel-controller.ts index 6153300f..db98ce0c 100644 --- a/src/utils/embla/carousel-controller.ts +++ b/src/utils/embla/carousel-controller.ts @@ -3,7 +3,7 @@ import { WheelGesturesPlugin } from 'embla-carousel-wheel-gestures'; import { CreatePluginType, LoosePluginType } from 'embla-carousel/components/Plugins'; import isEqual from 'lodash-es/isEqual'; import { TransitionEffect } from '../../config/types'; -import { dispatchFrigateCardEvent, getChildrenFromElement } from '../basic.js'; +import { dispatchAdvancedCameraCardEvent, getChildrenFromElement } from '../basic.js'; import { TextDirection } from '../text-direction'; export interface CarouselSelected { @@ -99,10 +99,14 @@ export class CarouselController { // this is used. const newSlide = this.getSlide(index); if (newSlide) { - dispatchFrigateCardEvent(this._parent, 'carousel:force-select', { - index: index, - element: newSlide, - }); + dispatchAdvancedCameraCardEvent( + this._parent, + 'carousel:force-select', + { + index: index, + element: newSlide, + }, + ); } } @@ -168,7 +172,7 @@ export class CarouselController { const selectSlide = (): void => { const carouselSelected = getCarouselSelectedObject(); if (carouselSelected) { - dispatchFrigateCardEvent( + dispatchAdvancedCameraCardEvent( this._parent, 'carousel:select', carouselSelected, diff --git a/src/utils/embla/plugins/auto-media-loaded-info/auto-media-loaded-info.ts b/src/utils/embla/plugins/auto-media-loaded-info/auto-media-loaded-info.ts index d260b368..0d30feee 100644 --- a/src/utils/embla/plugins/auto-media-loaded-info/auto-media-loaded-info.ts +++ b/src/utils/embla/plugins/auto-media-loaded-info/auto-media-loaded-info.ts @@ -3,7 +3,7 @@ import { LooseOptionsType } from 'embla-carousel/components/Options'; import { CreatePluginType, LoosePluginType } from 'embla-carousel/components/Plugins'; import { MediaLoadedInfo } from '../../../../types'; import { - FrigateCardMediaLoadedEventTarget, + AdvancedCameraCardMediaLoadedEventTarget, dispatchExistingMediaLoadedInfoAsEvent, } from '../../../media-info'; @@ -41,7 +41,7 @@ type AutoMediaLoadedInfoType = CreatePluginType): void { diff --git a/src/utils/embla/plugins/auto-size/auto-size.ts b/src/utils/embla/plugins/auto-size/auto-size.ts index 5b139837..2d325f3b 100644 --- a/src/utils/embla/plugins/auto-size/auto-size.ts +++ b/src/utils/embla/plugins/auto-size/auto-size.ts @@ -61,7 +61,10 @@ function AutoSize(): AutoSizeType { // the size to large than the maxHeight is set). emblaApi .containerNode() - .addEventListener('frigate-card:media:loaded', debouncedSetContainerHeight); + .addEventListener( + 'advanced-camera-card:media:loaded', + debouncedSetContainerHeight, + ); emblaApi.on('settle', debouncedSetContainerHeight); } @@ -72,7 +75,10 @@ function AutoSize(): AutoSizeType { emblaApi .containerNode() - .removeEventListener('frigate-card:media:loaded', debouncedSetContainerHeight); + .removeEventListener( + 'advanced-camera-card:media:loaded', + debouncedSetContainerHeight, + ); emblaApi.off('settle', debouncedSetContainerHeight); } @@ -85,7 +91,7 @@ function AutoSize(): AutoSizeType { * occur for some users in some circumstances causing the carousel to * appear 'stuck'. * - Example bug when this reinitialization is not performed: - * https://github.com/dermotduffy/frigate-hass-card/issues/651 + * https://github.com/dermotduffy/advanced-camera-card/issues/651 */ const isContainerIntersectingNow = entries.some((entry) => entry.isIntersecting); diff --git a/src/utils/ha/registry/entity/types.ts b/src/utils/ha/registry/entity/types.ts index 702b6b04..1ab16af5 100644 --- a/src/utils/ha/registry/entity/types.ts +++ b/src/utils/ha/registry/entity/types.ts @@ -10,7 +10,7 @@ export const entitySchema = z.object({ translation_key: z.string().nullable(), // Technically the unique_id should be a string, but we want to tolerate // numeric unique_ids also in case they are used. See: - // https://github.com/dermotduffy/frigate-hass-card/issues/1016 + // https://github.com/dermotduffy/advanced-camera-card/issues/1016 unique_id: z.string().or(z.number()).optional(), }); export type Entity = z.infer; diff --git a/src/utils/ha/ws-request.ts b/src/utils/ha/ws-request.ts index 1a4bb569..c65ce724 100644 --- a/src/utils/ha/ws-request.ts +++ b/src/utils/ha/ws-request.ts @@ -2,7 +2,7 @@ import { HomeAssistant } from '@dermotduffy/custom-card-helpers'; import { MessageBase } from 'home-assistant-js-websocket'; import { ZodSchema } from 'zod'; import { localize } from '../../localize/localize'; -import { FrigateCardError } from '../../types'; +import { AdvancedCameraCardError } from '../../types'; import { getParseErrorKeys } from '../zod'; /** @@ -24,7 +24,7 @@ export async function homeAssistantWSRequest( response = await hass.callWS(request); } catch (e) { if (!(e instanceof Error)) { - throw new FrigateCardError(localize('error.failed_response'), { + throw new AdvancedCameraCardError(localize('error.failed_response'), { request: request, response: e, }); @@ -33,17 +33,17 @@ export async function homeAssistantWSRequest( } if (!response) { - throw new FrigateCardError(localize('error.empty_response'), { + throw new AdvancedCameraCardError(localize('error.empty_response'), { request: request, }); } - // Some endpoints on the integration pass through JSON directly from Frigate - // These end up wrapped in a string and must be unwrapped first + // Some endpoints in Home Assistant pass JSON directly though, these end up + // wrapped in a string and must be unwrapped first. const parseResult = passthrough ? schema.safeParse(JSON.parse(response)) : schema.safeParse(response); if (!parseResult.success) { - throw new FrigateCardError(localize('error.invalid_response'), { + throw new AdvancedCameraCardError(localize('error.invalid_response'), { request: request, response: response, invalid_keys: getParseErrorKeys(parseResult.error), diff --git a/src/utils/media-info.ts b/src/utils/media-info.ts index 41af8cfa..cf8f54bc 100644 --- a/src/utils/media-info.ts +++ b/src/utils/media-info.ts @@ -1,10 +1,10 @@ import { - FrigateCardMediaPlayer, + AdvancedCameraCardMediaPlayer, MediaLoadedCapabilities, MediaLoadedInfo, MediaTechnology, } from '../types.js'; -import { dispatchFrigateCardEvent } from './basic.js'; +import { dispatchAdvancedCameraCardEvent } from './basic.js'; const MEDIA_INFO_HEIGHT_CUTOFF = 50; const MEDIA_INFO_WIDTH_CUTOFF = MEDIA_INFO_HEIGHT_CUTOFF; @@ -17,7 +17,7 @@ const MEDIA_INFO_WIDTH_CUTOFF = MEDIA_INFO_HEIGHT_CUTOFF; export function createMediaLoadedInfo( source: Event | HTMLElement, options?: { - player?: FrigateCardMediaPlayer; + player?: AdvancedCameraCardMediaPlayer; capabilities?: MediaLoadedCapabilities; technology?: MediaTechnology[]; }, @@ -53,7 +53,7 @@ export function createMediaLoadedInfo( } /** - * Dispatch a Frigate card media loaded event. + * Dispatch an Advanced Camera Card media loaded event. * @param element The element to send the event. * @param source An event or HTMLElement that should be used as a source. */ @@ -61,7 +61,7 @@ export function dispatchMediaLoadedEvent( target: HTMLElement, source: Event | HTMLElement, options?: { - player?: FrigateCardMediaPlayer; + player?: AdvancedCameraCardMediaPlayer; capabilities?: MediaLoadedCapabilities; technology?: MediaTechnology[]; }, @@ -81,7 +81,11 @@ export function dispatchExistingMediaLoadedInfoAsEvent( target: EventTarget, MediaLoadedInfo: MediaLoadedInfo, ): void { - dispatchFrigateCardEvent(target, 'media:loaded', MediaLoadedInfo); + dispatchAdvancedCameraCardEvent( + target, + 'media:loaded', + MediaLoadedInfo, + ); } /** @@ -89,19 +93,19 @@ export function dispatchExistingMediaLoadedInfoAsEvent( * @param element The element to send the event. */ export function dispatchMediaUnloadedEvent(element: HTMLElement): void { - dispatchFrigateCardEvent(element, 'media:unloaded'); + dispatchAdvancedCameraCardEvent(element, 'media:unloaded'); } export function dispatchMediaVolumeChangeEvent(target: HTMLElement): void { - dispatchFrigateCardEvent(target, 'media:volumechange'); + dispatchAdvancedCameraCardEvent(target, 'media:volumechange'); } export function dispatchMediaPlayEvent(target: HTMLElement): void { - dispatchFrigateCardEvent(target, 'media:play'); + dispatchAdvancedCameraCardEvent(target, 'media:play'); } export function dispatchMediaPauseEvent(target: HTMLElement): void { - dispatchFrigateCardEvent(target, 'media:pause'); + dispatchAdvancedCameraCardEvent(target, 'media:pause'); } /** @@ -116,18 +120,18 @@ export function isValidMediaLoadedInfo(info: MediaLoadedInfo): boolean { } // Facilitates correct typing of event handlers. -export interface FrigateCardMediaLoadedEventTarget extends EventTarget { +export interface AdvancedCameraCardMediaLoadedEventTarget extends EventTarget { addEventListener( - event: 'frigate-card:media:loaded', + event: 'advanced-camera-card:media:loaded', listener: ( - this: FrigateCardMediaLoadedEventTarget, + this: AdvancedCameraCardMediaLoadedEventTarget, ev: CustomEvent, ) => void, options?: AddEventListenerOptions | boolean, ): void; addEventListener( - event: 'frigate-card:media:unloaded', - listener: (this: FrigateCardMediaLoadedEventTarget, ev: CustomEvent) => void, + event: 'advanced-camera-card:media:unloaded', + listener: (this: AdvancedCameraCardMediaLoadedEventTarget, ev: CustomEvent) => void, options?: AddEventListenerOptions | boolean, ): void; addEventListener( @@ -136,16 +140,16 @@ export interface FrigateCardMediaLoadedEventTarget extends EventTarget { options?: AddEventListenerOptions | boolean, ): void; removeEventListener( - event: 'frigate-card:media:loaded', + event: 'advanced-camera-card:media:loaded', listener: ( - this: FrigateCardMediaLoadedEventTarget, + this: AdvancedCameraCardMediaLoadedEventTarget, ev: CustomEvent, ) => void, options?: boolean | EventListenerOptions, ): void; removeEventListener( - event: 'frigate-card:media:unloaded', - listener: (this: FrigateCardMediaLoadedEventTarget, ev: CustomEvent) => void, + event: 'advanced-camera-card:media:unloaded', + listener: (this: AdvancedCameraCardMediaLoadedEventTarget, ev: CustomEvent) => void, options?: boolean | EventListenerOptions, ): void; removeEventListener( diff --git a/src/utils/media-layout.ts b/src/utils/media-layout.ts index 6128e10c..e7c52a0b 100644 --- a/src/utils/media-layout.ts +++ b/src/utils/media-layout.ts @@ -10,28 +10,35 @@ export const updateElementStyleFromMediaLayoutConfig = ( mediaLayoutConfig?: MediaLayoutConfig, ): void => { if (mediaLayoutConfig?.fit !== undefined) { - element.style.setProperty('--frigate-card-media-layout-fit', mediaLayoutConfig.fit); + element.style.setProperty( + '--advanced-camera-card-media-layout-fit', + mediaLayoutConfig.fit, + ); } else { - element.style.removeProperty('--frigate-card-media-layout-fit'); + element.style.removeProperty('--advanced-camera-card-media-layout-fit'); } for (const dimension of ['x', 'y']) { if (mediaLayoutConfig?.position?.[dimension] !== undefined) { element.style.setProperty( - `--frigate-card-media-layout-position-${dimension}`, + `--advanced-camera-card-media-layout-position-${dimension}`, `${mediaLayoutConfig.position[dimension]}%`, ); } else { - element.style.removeProperty(`--frigate-card-media-layout-position-${dimension}`); + element.style.removeProperty( + `--advanced-camera-card-media-layout-position-${dimension}`, + ); } } for (const dimension of ['top', 'bottom', 'left', 'right']) { if (mediaLayoutConfig?.view_box?.[dimension] !== undefined) { element.style.setProperty( - `--frigate-card-media-layout-view-box-${dimension}`, + `--advanced-camera-card-media-layout-view-box-${dimension}`, `${mediaLayoutConfig.view_box[dimension]}%`, ); } else { - element.style.removeProperty(`--frigate-card-media-layout-view-box-${dimension}`); + element.style.removeProperty( + `--advanced-camera-card-media-layout-view-box-${dimension}`, + ); } } }; diff --git a/src/utils/media.ts b/src/utils/media.ts index f63f07a9..252f7f6a 100644 --- a/src/utils/media.ts +++ b/src/utils/media.ts @@ -1,13 +1,13 @@ -import { FrigateCardMediaPlayer } from '../types'; +import { AdvancedCameraCardMediaPlayer } from '../types'; import { Timer } from './timer'; // The number of seconds to hide the video controls for after loading (in order // to give a cleaner UI appearance, see: -// https://github.com/dermotduffy/frigate-hass-card/issues/856 +// https://github.com/dermotduffy/advanced-camera-card/issues/856 export const MEDIA_LOAD_CONTROLS_HIDE_SECONDS = 2; const MEDIA_SEEK_CONTROLS_HIDE_SECONDS = 1; -export type FrigateCardHTMLVideoElement = HTMLVideoElement & { +export type AdvancedCameraCardHTMLVideoElement = HTMLVideoElement & { _controlsHideTimer?: Timer; _controlsOriginalValue?: boolean; }; @@ -19,7 +19,7 @@ export type FrigateCardHTMLVideoElement = HTMLVideoElement & { * @param value */ export const setControlsOnVideo = ( - video: FrigateCardHTMLVideoElement, + video: AdvancedCameraCardHTMLVideoElement, value: boolean, ): void => { if (video._controlsHideTimer) { @@ -33,11 +33,11 @@ export const setControlsOnVideo = ( /** * Temporarily hide media controls. * @param element Any HTMLElement that has a controls property (e.g. - * HTMLVideoElement, FrigateCardHaHlsPlayer) + * HTMLVideoElement, AdvancedCameraCardHaHlsPlayer) * @param seconds The number of seconds to hide the controls for. */ export const hideMediaControlsTemporarily = ( - video: FrigateCardHTMLVideoElement, + video: AdvancedCameraCardHTMLVideoElement, seconds = MEDIA_SEEK_CONTROLS_HIDE_SECONDS, ): void => { const oldValue = video._controlsOriginalValue ?? video.controls; @@ -48,7 +48,7 @@ export const hideMediaControlsTemporarily = ( // LitElement may change the src attribute of the video element during // rendering, so we need to ensure that the controls are reset on the 'old' // video. See: - // https://github.com/dermotduffy/frigate-hass-card/issues/1310 + // https://github.com/dermotduffy/advanced-camera-card/issues/1310 const resetIfReloaded = () => { setControlsOnVideo(video, oldValue); video.removeEventListener('loadstart', resetIfReloaded); @@ -61,12 +61,12 @@ export const hideMediaControlsTemporarily = ( }; /** - * @param player The Frigate Card Media Player object. + * @param player The Advanced Camera Card Media Player object. * @param video An underlying video or media player upon which to call play. */ export const playMediaMutingIfNecessary = async ( - player: FrigateCardMediaPlayer, - video?: HTMLVideoElement | FrigateCardMediaPlayer, + player: AdvancedCameraCardMediaPlayer, + video?: HTMLVideoElement | AdvancedCameraCardMediaPlayer, ): Promise => { // If the play call fails, and the media is not already muted, mute it first // and then try again. This works around some browsers that prevent diff --git a/src/utils/scroll.ts b/src/utils/scroll.ts index 08c2975b..6c6623bc 100644 --- a/src/utils/scroll.ts +++ b/src/utils/scroll.ts @@ -3,7 +3,7 @@ import { compute as computeScroll, Options } from 'compute-scroll-into-view'; // Alternative to the stock element.scrollIntoView that suppports limiting // scrolling to a boundary, rather than the entire browser root. // -// See: https://github.com/dermotduffy/frigate-hass-card/issues/1814 +// See: https://github.com/dermotduffy/advanced-camera-card/issues/1814 // See: https://github.com/w3c/csswg-drafts/issues/9452 export const scrollIntoView = (element: HTMLElement, options: Options) => { computeScroll(element, options).forEach(({ el, top, left }) => { diff --git a/src/view/view-to-cameras.ts b/src/view/view-to-cameras.ts index 2efbf40b..6d65c471 100644 --- a/src/view/view-to-cameras.ts +++ b/src/view/view-to-cameras.ts @@ -1,6 +1,6 @@ import { CameraManager } from '../camera-manager/manager'; import { CapabilitySearchOptions } from '../camera-manager/types'; -import { FrigateCardView } from '../config/types'; +import { AdvancedCameraCardView } from '../config/types'; /** * Get cameraIDs that are relevant for a given view name based on camera @@ -8,7 +8,7 @@ import { FrigateCardView } from '../config/types'; */ export const getCameraIDsForViewName = ( cameraManager: CameraManager, - viewName: FrigateCardView, + viewName: AdvancedCameraCardView, cameraID?: string, ): Set => { const capabilityMatchAnyMedia: CapabilitySearchOptions = { diff --git a/src/view/view.ts b/src/view/view.ts index 36c12024..ef68fb60 100644 --- a/src/view/view.ts +++ b/src/view/view.ts @@ -1,6 +1,6 @@ import merge from 'lodash-es/merge'; import { ViewContext } from 'view'; -import { FrigateCardView, ViewDisplayMode } from '../config/types.js'; +import { AdvancedCameraCardView, ViewDisplayMode } from '../config/types.js'; import { MediaQueries } from './media-queries'; import { MediaQueriesResults } from './media-queries-results'; @@ -13,7 +13,7 @@ declare module 'view' { } interface ViewEvolveParameters { - view?: FrigateCardView; + view?: AdvancedCameraCardView; camera?: string; query?: MediaQueries | null; queryResults?: MediaQueriesResults | null; @@ -22,7 +22,7 @@ interface ViewEvolveParameters { } export interface ViewParameters extends ViewEvolveParameters { - view: FrigateCardView; + view: AdvancedCameraCardView; camera: string; } @@ -34,7 +34,7 @@ export const mergeViewContext = ( }; export class View { - public view: FrigateCardView; + public view: AdvancedCameraCardView; public camera: string; public query: MediaQueries | null; public queryResults: MediaQueriesResults | null; @@ -117,7 +117,7 @@ export class View { /** * Determine if current view matches a named view. */ - public is(view: FrigateCardView): boolean { + public is(view: AdvancedCameraCardView): boolean { return this.view == view; } diff --git a/tests/camera-manager/frigate/engine-frigate.test.ts b/tests/camera-manager/frigate/engine-frigate.test.ts index 93d60a75..190886c3 100644 --- a/tests/camera-manager/frigate/engine-frigate.test.ts +++ b/tests/camera-manager/frigate/engine-frigate.test.ts @@ -6,17 +6,24 @@ import { FrigateRecordingViewMedia, } from '../../../src/camera-manager/frigate/media'; import { FrigateEvent, eventSchema } from '../../../src/camera-manager/frigate/types.js'; +import { StateWatcher } from '../../../src/card-controller/hass/state-watcher'; import { PTZAction } from '../../../src/config/ptz'; import { + AdvancedCameraCardView, CameraConfig, - FrigateCardView, - RawFrigateCardConfig, + RawAdvancedCameraCardConfig, } from '../../../src/config/types'; +import { + EntityRegistryManager, + createEntityRegistryCache, +} from '../../../src/utils/ha/registry/entity'; import { ViewMedia } from '../../../src/view/media'; import { TestViewMedia, createCameraConfig, createHASS } from '../../test-utils'; const createEngine = (): FrigateCameraManagerEngine => { return new FrigateCameraManagerEngine( + new EntityRegistryManager(createEntityRegistryCache()), + new StateWatcher(), new RecordingSegmentsCache(), new RequestCache(), ); @@ -75,7 +82,9 @@ const createSnapshotMedia = (): FrigateEventViewMedia => { ); }; -const createFrigateCameraConfig = (config?: RawFrigateCardConfig): CameraConfig => { +const createFrigateCameraConfig = ( + config?: RawAdvancedCameraCardConfig, +): CameraConfig => { return createCameraConfig({ frigate: { camera_name: 'camera-1', @@ -345,7 +354,7 @@ describe('getCameraEndpoints', () => { ['clips' as const], ['snapshot' as const], ['snapshots' as const], - ])('%s', (viewName: FrigateCardView) => { + ])('%s', (viewName: AdvancedCameraCardView) => { const endpoints = createEngine().getCameraEndpoints( createCameraConfig({ frigate: { @@ -369,7 +378,7 @@ describe('getCameraEndpoints', () => { it.each([['recording' as const], ['recordings' as const]])( '%s', - (viewName: FrigateCardView) => { + (viewName: AdvancedCameraCardView) => { const endpoints = createEngine().getCameraEndpoints( createCameraConfig({ frigate: { diff --git a/tests/camera-manager/generic/engine-generic.test.ts b/tests/camera-manager/generic/engine-generic.test.ts index 0c57fc86..212d4594 100644 --- a/tests/camera-manager/generic/engine-generic.test.ts +++ b/tests/camera-manager/generic/engine-generic.test.ts @@ -3,7 +3,7 @@ import { mock } from 'vitest-mock-extended'; import { GenericCameraManagerEngine } from '../../../src/camera-manager/generic/engine-generic'; import { Engine, QueryResultsType, QueryType } from '../../../src/camera-manager/types'; import { StateWatcherSubscriptionInterface } from '../../../src/card-controller/hass/state-watcher'; -import { CameraConfig, RawFrigateCardConfig } from '../../../src/config/types'; +import { CameraConfig, RawAdvancedCameraCardConfig } from '../../../src/config/types'; import { TestViewMedia, createCameraConfig, @@ -16,7 +16,9 @@ const createEngine = (): GenericCameraManagerEngine => { return new GenericCameraManagerEngine(mock()); }; -const createGenericCameraConfig = (config?: RawFrigateCardConfig): CameraConfig => { +const createGenericCameraConfig = ( + config?: RawAdvancedCameraCardConfig, +): CameraConfig => { return createCameraConfig(config); }; diff --git a/tests/camera-manager/manager.test.ts b/tests/camera-manager/manager.test.ts index 43909bff..fb80c74e 100644 --- a/tests/camera-manager/manager.test.ts +++ b/tests/camera-manager/manager.test.ts @@ -331,7 +331,7 @@ describe('CameraManager', async () => { expect(await manager.initializeCamerasFromConfig()).toBeFalsy(); expect(api.getMessageManager().setErrorIfHigherPriority).toBeCalledWith( new Error( - 'Duplicate Frigate camera id for the following camera, ' + + 'Duplicate camera id for the following camera, ' + "use the 'id' parameter to uniquely identify cameras", ), 'Camera initialization failed', @@ -997,7 +997,9 @@ describe('CameraManager', async () => { const result: CameraManagerCameraMetadata = { title: 'My Camera', - icon: 'mdi:camera', + icon: { + icon: 'mdi:camera', + }, }; vi.mocked(engine.getCameraMetadata).mockReturnValue(result); diff --git a/tests/card-controller/actions/actions-manager.test.ts b/tests/card-controller/actions/actions-manager.test.ts index 32bd5c82..ba8f127f 100644 --- a/tests/card-controller/actions/actions-manager.test.ts +++ b/tests/card-controller/actions/actions-manager.test.ts @@ -4,7 +4,7 @@ import { Interaction, InteractionName, } from '../../../src/card-controller/actions/actions-manager'; -import { FrigateCardView } from '../../../src/config/types'; +import { AdvancedCameraCardView } from '../../../src/config/types'; import { createLogAction } from '../../../src/utils/action'; import { createAction, @@ -114,7 +114,7 @@ describe('ActionsManager', () => { }, ], ['timeline' as const, {}], - ])('%s', (viewName: FrigateCardView, result: Record) => { + ])('%s', (viewName: AdvancedCameraCardView, result: Record) => { const api = createCardAPI(); vi.mocked(api.getViewManager().getView).mockReturnValue( createView({ view: viewName }), @@ -231,7 +231,7 @@ describe('ActionsManager', () => { const consoleSpy = vi.spyOn(global.console, 'info').mockReturnValue(undefined); await manager.handleActionExecutionRequestEvent( - new CustomEvent('frigate-card:action:execution-request', { + new CustomEvent('advanced-camera-card:action:execution-request', { detail: { action: createLogAction('Hello, world!') }, }), ); @@ -266,7 +266,7 @@ describe('ActionsManager', () => { const promise = manager.executeActions([ // eslint-disable-next-line @typescript-eslint/no-non-null-assertion createAction({ - frigate_card_action: 'sleep', + advanced_camera_card_action: 'sleep', duration: { m: 1, }, diff --git a/tests/card-controller/actions/actions/camera-select.test.ts b/tests/card-controller/actions/actions/camera-select.test.ts index 57d30a19..d7c5acd2 100644 --- a/tests/card-controller/actions/actions/camera-select.test.ts +++ b/tests/card-controller/actions/actions/camera-select.test.ts @@ -12,7 +12,7 @@ describe('should handle camera_select action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'camera_select', + advanced_camera_card_action: 'camera_select', camera: 'camera', }, ); @@ -44,7 +44,7 @@ describe('should handle camera_select action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'camera_select', + advanced_camera_card_action: 'camera_select', camera: 'camera', }, ); @@ -83,7 +83,7 @@ describe('should handle camera_select action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'camera_select', + advanced_camera_card_action: 'camera_select', camera: 'camera', }, ); @@ -113,7 +113,7 @@ describe('should handle camera_select action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'camera_select', + advanced_camera_card_action: 'camera_select', triggered: true, }, ); @@ -143,7 +143,7 @@ describe('should handle camera_select action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'camera_select', + advanced_camera_card_action: 'camera_select', }, ); @@ -159,7 +159,7 @@ describe('should handle camera_select action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'camera_select', + advanced_camera_card_action: 'camera_select', camera: 'camera', }, ); diff --git a/tests/card-controller/actions/actions/camera-ui.test.ts b/tests/card-controller/actions/actions/camera-ui.test.ts index 09703fb1..287e3958 100644 --- a/tests/card-controller/actions/actions/camera-ui.test.ts +++ b/tests/card-controller/actions/actions/camera-ui.test.ts @@ -8,7 +8,7 @@ it('should handle camera_ui action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'camera_ui', + advanced_camera_card_action: 'camera_ui', }, ); diff --git a/tests/card-controller/actions/actions/default.test.ts b/tests/card-controller/actions/actions/default.test.ts index 2c62c811..0397d9cf 100644 --- a/tests/card-controller/actions/actions/default.test.ts +++ b/tests/card-controller/actions/actions/default.test.ts @@ -8,7 +8,7 @@ it('should handle default action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'default', + advanced_camera_card_action: 'default', }, ); diff --git a/tests/card-controller/actions/actions/display-mode-select.test.ts b/tests/card-controller/actions/actions/display-mode-select.test.ts index 7c7900e5..2056117f 100644 --- a/tests/card-controller/actions/actions/display-mode-select.test.ts +++ b/tests/card-controller/actions/actions/display-mode-select.test.ts @@ -8,7 +8,7 @@ it('should handle default action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'display_mode_select', + advanced_camera_card_action: 'display_mode_select', display_mode: 'grid', }, ); diff --git a/tests/card-controller/actions/actions/download.test.ts b/tests/card-controller/actions/actions/download.test.ts index 3e9b321d..9552d96d 100644 --- a/tests/card-controller/actions/actions/download.test.ts +++ b/tests/card-controller/actions/actions/download.test.ts @@ -8,7 +8,7 @@ it('should handle download action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'download', + advanced_camera_card_action: 'download', }, ); diff --git a/tests/card-controller/actions/actions/expand.test.ts b/tests/card-controller/actions/actions/expand.test.ts index 1a3ac265..7f4a602d 100644 --- a/tests/card-controller/actions/actions/expand.test.ts +++ b/tests/card-controller/actions/actions/expand.test.ts @@ -8,7 +8,7 @@ it('should handle expand action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'expand', + advanced_camera_card_action: 'expand', }, ); diff --git a/tests/card-controller/actions/actions/fullscreen.test.ts b/tests/card-controller/actions/actions/fullscreen.test.ts index d678b1a3..5b57e8f3 100644 --- a/tests/card-controller/actions/actions/fullscreen.test.ts +++ b/tests/card-controller/actions/actions/fullscreen.test.ts @@ -8,7 +8,7 @@ it('should handle fullscreen action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'fullscreen', + advanced_camera_card_action: 'fullscreen', }, ); diff --git a/tests/card-controller/actions/actions/log.test.ts b/tests/card-controller/actions/actions/log.test.ts index 889f32c8..32d68748 100644 --- a/tests/card-controller/actions/actions/log.test.ts +++ b/tests/card-controller/actions/actions/log.test.ts @@ -12,7 +12,7 @@ it('should handle log action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'log', + advanced_camera_card_action: 'log', message: 'Hello, world!', level: 'warn', }, diff --git a/tests/card-controller/actions/actions/media-player.test.ts b/tests/card-controller/actions/actions/media-player.test.ts index 49a539e9..ca0cd3d8 100644 --- a/tests/card-controller/actions/actions/media-player.test.ts +++ b/tests/card-controller/actions/actions/media-player.test.ts @@ -14,7 +14,7 @@ describe('should handle media_player action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'media_player', + advanced_camera_card_action: 'media_player', media_player_action: 'stop', media_player: 'this_is_a_media_player', }, @@ -38,7 +38,7 @@ describe('should handle media_player action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'media_player', + advanced_camera_card_action: 'media_player', media_player_action: 'play', media_player: 'this_is_a_media_player', }, @@ -65,7 +65,7 @@ describe('should handle media_player action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'media_player', + advanced_camera_card_action: 'media_player', media_player_action: 'play', media_player: 'this_is_a_media_player', }, @@ -91,7 +91,7 @@ describe('should handle media_player action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'media_player', + advanced_camera_card_action: 'media_player', media_player_action: 'play', media_player: 'this_is_a_media_player', }, diff --git a/tests/card-controller/actions/actions/menu-toggle.test.ts b/tests/card-controller/actions/actions/menu-toggle.test.ts index c9d1d276..36e69f7d 100644 --- a/tests/card-controller/actions/actions/menu-toggle.test.ts +++ b/tests/card-controller/actions/actions/menu-toggle.test.ts @@ -8,7 +8,7 @@ it('should handle menu toggle action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'menu_toggle', + advanced_camera_card_action: 'menu_toggle', }, ); diff --git a/tests/card-controller/actions/actions/microphone-connect.test.ts b/tests/card-controller/actions/actions/microphone-connect.test.ts index ad252ae7..3073db94 100644 --- a/tests/card-controller/actions/actions/microphone-connect.test.ts +++ b/tests/card-controller/actions/actions/microphone-connect.test.ts @@ -8,7 +8,7 @@ it('should handle microphone_connect action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'microphone_connect', + advanced_camera_card_action: 'microphone_connect', }, ); diff --git a/tests/card-controller/actions/actions/microphone-disconnect.test.ts b/tests/card-controller/actions/actions/microphone-disconnect.test.ts index fe0d20e1..0c85d488 100644 --- a/tests/card-controller/actions/actions/microphone-disconnect.test.ts +++ b/tests/card-controller/actions/actions/microphone-disconnect.test.ts @@ -8,7 +8,7 @@ it('should handle microphone_disconnect action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'microphone_disconnect', + advanced_camera_card_action: 'microphone_disconnect', }, ); diff --git a/tests/card-controller/actions/actions/microphone-mute.test.ts b/tests/card-controller/actions/actions/microphone-mute.test.ts index 6b343c48..7179a176 100644 --- a/tests/card-controller/actions/actions/microphone-mute.test.ts +++ b/tests/card-controller/actions/actions/microphone-mute.test.ts @@ -8,7 +8,7 @@ it('should handle microphone_mute action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'microphone_mute', + advanced_camera_card_action: 'microphone_mute', }, ); diff --git a/tests/card-controller/actions/actions/microphone-unmute.test.ts b/tests/card-controller/actions/actions/microphone-unmute.test.ts index dd53b923..680a7f79 100644 --- a/tests/card-controller/actions/actions/microphone-unmute.test.ts +++ b/tests/card-controller/actions/actions/microphone-unmute.test.ts @@ -8,7 +8,7 @@ it('should handle microphone_unmute action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'microphone_unmute', + advanced_camera_card_action: 'microphone_unmute', }, ); diff --git a/tests/card-controller/actions/actions/mute.test.ts b/tests/card-controller/actions/actions/mute.test.ts index 5ba80cce..31234251 100644 --- a/tests/card-controller/actions/actions/mute.test.ts +++ b/tests/card-controller/actions/actions/mute.test.ts @@ -1,12 +1,12 @@ import { expect, it, vi } from 'vitest'; import { mock } from 'vitest-mock-extended'; import { MuteAction } from '../../../../src/card-controller/actions/actions/mute'; -import { FrigateCardMediaPlayer } from '../../../../src/types'; +import { AdvancedCameraCardMediaPlayer } from '../../../../src/types'; import { createCardAPI, createMediaLoadedInfo } from '../../../test-utils'; it('should handle mute action', async () => { const api = createCardAPI(); - const player = mock(); + const player = mock(); vi.mocked(api.getMediaLoadedInfoManager().get).mockReturnValue( createMediaLoadedInfo({ player: player, @@ -16,7 +16,7 @@ it('should handle mute action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'mute', + advanced_camera_card_action: 'mute', }, ); diff --git a/tests/card-controller/actions/actions/pause.test.ts b/tests/card-controller/actions/actions/pause.test.ts index 733bf8a0..02b12d7b 100644 --- a/tests/card-controller/actions/actions/pause.test.ts +++ b/tests/card-controller/actions/actions/pause.test.ts @@ -1,12 +1,12 @@ import { expect, it, vi } from 'vitest'; import { mock } from 'vitest-mock-extended'; import { PauseAction } from '../../../../src/card-controller/actions/actions/pause'; -import { FrigateCardMediaPlayer } from '../../../../src/types'; +import { AdvancedCameraCardMediaPlayer } from '../../../../src/types'; import { createCardAPI, createMediaLoadedInfo } from '../../../test-utils'; it('should handle pause action', async () => { const api = createCardAPI(); - const player = mock(); + const player = mock(); vi.mocked(api.getMediaLoadedInfoManager().get).mockReturnValue( createMediaLoadedInfo({ player: player, @@ -16,7 +16,7 @@ it('should handle pause action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'pause', + advanced_camera_card_action: 'pause', }, ); diff --git a/tests/card-controller/actions/actions/play.test.ts b/tests/card-controller/actions/actions/play.test.ts index f0f3879e..3c35373f 100644 --- a/tests/card-controller/actions/actions/play.test.ts +++ b/tests/card-controller/actions/actions/play.test.ts @@ -1,12 +1,12 @@ import { expect, it, vi } from 'vitest'; import { mock } from 'vitest-mock-extended'; import { PlayAction } from '../../../../src/card-controller/actions/actions/play'; -import { FrigateCardMediaPlayer } from '../../../../src/types'; +import { AdvancedCameraCardMediaPlayer } from '../../../../src/types'; import { createCardAPI, createMediaLoadedInfo } from '../../../test-utils'; it('should handle play action', async () => { const api = createCardAPI(); - const player = mock(); + const player = mock(); vi.mocked(api.getMediaLoadedInfoManager().get).mockReturnValue( createMediaLoadedInfo({ player: player, @@ -16,7 +16,7 @@ it('should handle play action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'play', + advanced_camera_card_action: 'play', }, ); diff --git a/tests/card-controller/actions/actions/ptz-controls.test.ts b/tests/card-controller/actions/actions/ptz-controls.test.ts index 7ab107fb..9cc22469 100644 --- a/tests/card-controller/actions/actions/ptz-controls.test.ts +++ b/tests/card-controller/actions/actions/ptz-controls.test.ts @@ -8,7 +8,7 @@ it('should handle ptz_controls action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_controls', + advanced_camera_card_action: 'ptz_controls', enabled: true, }, ); diff --git a/tests/card-controller/actions/actions/ptz-digital.test.ts b/tests/card-controller/actions/actions/ptz-digital.test.ts index 7652fbc3..05dc946f 100644 --- a/tests/card-controller/actions/actions/ptz-digital.test.ts +++ b/tests/card-controller/actions/actions/ptz-digital.test.ts @@ -33,7 +33,7 @@ describe('should handle ptz digital action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', absolute: { zoom: 2, pan: { @@ -70,7 +70,7 @@ describe('should handle ptz digital action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', }, ); @@ -93,7 +93,7 @@ describe('should handle ptz digital action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', ptz_action: 'left', }, ); @@ -117,7 +117,7 @@ describe('should handle ptz digital action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', ptz_action: 'left', }, ); @@ -330,7 +330,7 @@ describe('should handle ptz digital action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', ptz_action: ptzAction, }, ); @@ -370,7 +370,7 @@ describe('should handle ptz digital action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', ptz_action: 'right', ptz_phase: 'start', }, @@ -442,7 +442,7 @@ describe('should handle ptz digital action', () => { const startAction = new PTZDigitalAction(context, { action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', ptz_action: 'right', ptz_phase: 'start', }); @@ -466,7 +466,7 @@ describe('should handle ptz digital action', () => { const stopAction = new PTZDigitalAction(context, { action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', ptz_phase: 'stop', }); await stopAction.execute(api); diff --git a/tests/card-controller/actions/actions/ptz-multi.test.ts b/tests/card-controller/actions/actions/ptz-multi.test.ts index 92ee7590..70bcd810 100644 --- a/tests/card-controller/actions/actions/ptz-multi.test.ts +++ b/tests/card-controller/actions/actions/ptz-multi.test.ts @@ -32,7 +32,7 @@ describe('should handle ptz multi action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', ptz_action: 'left', ...(targetID && { target_id: targetID }), }, @@ -69,7 +69,7 @@ describe('should handle ptz multi action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', ptz_action: 'right', ...(targetID && { target_id: targetID }), }, @@ -108,7 +108,7 @@ describe('should handle ptz multi action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', ptz_action: 'right', }, ); @@ -137,7 +137,7 @@ describe('should handle ptz multi action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', ptz_action: 'right', }, ); diff --git a/tests/card-controller/actions/actions/ptz.test.ts b/tests/card-controller/actions/actions/ptz.test.ts index 4743089d..36a6f279 100644 --- a/tests/card-controller/actions/actions/ptz.test.ts +++ b/tests/card-controller/actions/actions/ptz.test.ts @@ -29,7 +29,7 @@ describe('should handle ptz action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', camera: 'camera.office', }, @@ -65,7 +65,7 @@ describe('should handle ptz action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', }, ); @@ -112,7 +112,7 @@ describe('should handle ptz action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', }, ); @@ -140,7 +140,7 @@ describe('should handle ptz action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', }, ); @@ -159,7 +159,7 @@ describe('should handle ptz action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', }, ); @@ -187,7 +187,7 @@ describe('should handle ptz action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', }, ); @@ -225,7 +225,7 @@ describe('should handle ptz action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', }, ); @@ -256,7 +256,7 @@ describe('should handle ptz action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'preset', ptz_preset: 'window', }, @@ -295,7 +295,7 @@ describe('should handle ptz action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', ptz_phase: 'start', }, @@ -343,7 +343,7 @@ describe('should handle ptz action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', }, ); @@ -388,7 +388,7 @@ describe('should handle ptz action', () => { const context = {}; const action = new PTZAction(context, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', }); @@ -432,7 +432,7 @@ describe('should handle ptz action', () => { const context = {}; const startAction = new PTZAction(context, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', ptz_phase: 'start', }); @@ -455,7 +455,7 @@ describe('should handle ptz action', () => { const stopAction = new PTZAction(context, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', ptz_phase: 'stop', }); @@ -486,7 +486,7 @@ describe('should handle ptz action', () => { const context = {}; const action = new PTZAction(context, { action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', ptz_action: 'left', ptz_phase: 'start', }); diff --git a/tests/card-controller/actions/actions/screenshot.test.ts b/tests/card-controller/actions/actions/screenshot.test.ts index 3e773aa0..4af61046 100644 --- a/tests/card-controller/actions/actions/screenshot.test.ts +++ b/tests/card-controller/actions/actions/screenshot.test.ts @@ -8,7 +8,7 @@ it('should handle screenshot action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'screenshot', + advanced_camera_card_action: 'screenshot', }, ); diff --git a/tests/card-controller/actions/actions/sleep.test.ts b/tests/card-controller/actions/actions/sleep.test.ts index b9e3efb7..25ab0ab1 100644 --- a/tests/card-controller/actions/actions/sleep.test.ts +++ b/tests/card-controller/actions/actions/sleep.test.ts @@ -15,7 +15,7 @@ it('should handle sleep action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'sleep', + advanced_camera_card_action: 'sleep', duration: { s: 5, ms: 200, diff --git a/tests/card-controller/actions/actions/status-bar.test.ts b/tests/card-controller/actions/actions/status-bar.test.ts index d4ec5c8c..a631229c 100644 --- a/tests/card-controller/actions/actions/status-bar.test.ts +++ b/tests/card-controller/actions/actions/status-bar.test.ts @@ -9,7 +9,7 @@ describe('should handle status bar action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'status_bar', + advanced_camera_card_action: 'status_bar', status_bar_action: 'reset', }, ); @@ -22,7 +22,7 @@ describe('should handle status bar action', () => { it('add', async () => { const api = createCardAPI(); const item = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item', }; @@ -30,7 +30,7 @@ describe('should handle status bar action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'status_bar', + advanced_camera_card_action: 'status_bar', status_bar_action: 'add', items: [item], }, @@ -44,7 +44,7 @@ describe('should handle status bar action', () => { it('remove', async () => { const api = createCardAPI(); const item = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item', }; @@ -52,7 +52,7 @@ describe('should handle status bar action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'status_bar', + advanced_camera_card_action: 'status_bar', status_bar_action: 'remove', items: [item], }, diff --git a/tests/card-controller/actions/actions/substream-off.test.ts b/tests/card-controller/actions/actions/substream-off.test.ts index 03b86187..37550519 100644 --- a/tests/card-controller/actions/actions/substream-off.test.ts +++ b/tests/card-controller/actions/actions/substream-off.test.ts @@ -9,7 +9,7 @@ it('should handle live_substream_off action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'live_substream_off', + advanced_camera_card_action: 'live_substream_off', }, ); diff --git a/tests/card-controller/actions/actions/substream-on.test.ts b/tests/card-controller/actions/actions/substream-on.test.ts index b37061f3..9369bc34 100644 --- a/tests/card-controller/actions/actions/substream-on.test.ts +++ b/tests/card-controller/actions/actions/substream-on.test.ts @@ -9,7 +9,7 @@ it('should handle live_substream_on action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'live_substream_on', + advanced_camera_card_action: 'live_substream_on', }, ); diff --git a/tests/card-controller/actions/actions/substream-select.test.ts b/tests/card-controller/actions/actions/substream-select.test.ts index a0f326f9..0d320ec3 100644 --- a/tests/card-controller/actions/actions/substream-select.test.ts +++ b/tests/card-controller/actions/actions/substream-select.test.ts @@ -9,7 +9,7 @@ it('should handle live_substream_select action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'live_substream_select', + advanced_camera_card_action: 'live_substream_select', camera: 'substream', }, ); diff --git a/tests/card-controller/actions/actions/unmute.test.ts b/tests/card-controller/actions/actions/unmute.test.ts index 34a59a46..a47a9801 100644 --- a/tests/card-controller/actions/actions/unmute.test.ts +++ b/tests/card-controller/actions/actions/unmute.test.ts @@ -1,12 +1,12 @@ import { expect, it, vi } from 'vitest'; import { mock } from 'vitest-mock-extended'; import { UnmuteAction } from '../../../../src/card-controller/actions/actions/unmute'; -import { FrigateCardMediaPlayer } from '../../../../src/types'; +import { AdvancedCameraCardMediaPlayer } from '../../../../src/types'; import { createCardAPI, createMediaLoadedInfo } from '../../../test-utils'; it('should handle unmute action', async () => { const api = createCardAPI(); - const player = mock(); + const player = mock(); vi.mocked(api.getMediaLoadedInfoManager().get).mockReturnValue( createMediaLoadedInfo({ player: player, @@ -16,7 +16,7 @@ it('should handle unmute action', async () => { {}, { action: 'fire-dom-event', - frigate_card_action: 'unmute', + advanced_camera_card_action: 'unmute', }, ); diff --git a/tests/card-controller/actions/actions/view.test.ts b/tests/card-controller/actions/actions/view.test.ts index 41215a63..2e290b5d 100644 --- a/tests/card-controller/actions/actions/view.test.ts +++ b/tests/card-controller/actions/actions/view.test.ts @@ -21,7 +21,7 @@ describe('should handle view action', () => { {}, { action: 'fire-dom-event', - frigate_card_action: viewName, + advanced_camera_card_action: viewName, }, ); diff --git a/tests/card-controller/actions/factory.test.ts b/tests/card-controller/actions/factory.test.ts index becc9e7f..9107ccf7 100644 --- a/tests/card-controller/actions/factory.test.ts +++ b/tests/card-controller/actions/factory.test.ts @@ -30,7 +30,7 @@ import { SubstreamSelectAction } from '../../../src/card-controller/actions/acti import { UnmuteAction } from '../../../src/card-controller/actions/actions/unmute'; import { ViewAction } from '../../../src/card-controller/actions/actions/view'; import { ActionFactory } from '../../../src/card-controller/actions/factory'; -import { FrigateCardCustomAction } from '../../../src/config/types'; +import { AdvancedCameraCardCustomAction } from '../../../src/config/types'; // @vitest-environment jsdom describe('ActionFactory', () => { @@ -39,7 +39,11 @@ describe('ActionFactory', () => { expect( factory.createAction( {}, - { action: 'fire-dom-event', frigate_card_action: 'clip', card_id: 'card_id' }, + { + action: 'fire-dom-event', + advanced_camera_card_action: 'clip', + card_id: 'card_id', + }, { cardID: 'different_card_id', }, @@ -48,7 +52,7 @@ describe('ActionFactory', () => { }); describe('generic', () => { - it('non frigate card action', () => { + it('non advanced camera card action', () => { const factory = new ActionFactory(); expect(factory.createAction({}, { action: 'fire-dom-event' })).toBeInstanceOf( GenericAction, @@ -65,81 +69,105 @@ describe('ActionFactory', () => { describe('actions', () => { it.each([ - [{ frigate_card_action: 'camera_select' as const }, CameraSelectAction], - [{ frigate_card_action: 'camera_ui' as const }, CameraUIAction], - [{ frigate_card_action: 'clip' as const }, ViewAction], - [{ frigate_card_action: 'clips' as const }, ViewAction], - [{ frigate_card_action: 'default' as const }, DefaultAction], - [{ frigate_card_action: 'diagnostics' as const }, ViewAction], + [{ advanced_camera_card_action: 'camera_select' as const }, CameraSelectAction], + [{ advanced_camera_card_action: 'camera_ui' as const }, CameraUIAction], + [{ advanced_camera_card_action: 'clip' as const }, ViewAction], + [{ advanced_camera_card_action: 'clips' as const }, ViewAction], + [{ advanced_camera_card_action: 'default' as const }, DefaultAction], + [{ advanced_camera_card_action: 'diagnostics' as const }, ViewAction], [ { - frigate_card_action: 'display_mode_select' as const, + advanced_camera_card_action: 'display_mode_select' as const, display_mode: 'single' as const, }, DisplayModeSelectAction, ], - [{ frigate_card_action: 'download' as const }, DownloadAction], - [{ frigate_card_action: 'expand' as const }, ExpandAction], - [{ frigate_card_action: 'fullscreen' as const }, FullscreenAction], - [{ frigate_card_action: 'image' as const }, ViewAction], - [{ frigate_card_action: 'live_substream_off' as const }, SubstreamOffAction], - [{ frigate_card_action: 'live_substream_on' as const }, SubstreamOnAction], + [{ advanced_camera_card_action: 'download' as const }, DownloadAction], + [{ advanced_camera_card_action: 'expand' as const }, ExpandAction], + [{ advanced_camera_card_action: 'fullscreen' as const }, FullscreenAction], + [{ advanced_camera_card_action: 'image' as const }, ViewAction], + [ + { advanced_camera_card_action: 'live_substream_off' as const }, + SubstreamOffAction, + ], + [{ advanced_camera_card_action: 'live_substream_on' as const }, SubstreamOnAction], [ { - frigate_card_action: 'live_substream_select' as const, + advanced_camera_card_action: 'live_substream_select' as const, camera: 'camera.office', }, SubstreamSelectAction, ], - [{ frigate_card_action: 'live' as const }, ViewAction], + [{ advanced_camera_card_action: 'live' as const }, ViewAction], [ - { frigate_card_action: 'log' as const, message: 'Hello, world!' as const }, + { + advanced_camera_card_action: 'log' as const, + message: 'Hello, world!' as const, + }, LogAction, ], [ { - frigate_card_action: 'media_player' as const, + advanced_camera_card_action: 'media_player' as const, media_player: 'media_player.foo' as const, media_player_action: 'play' as const, }, MediaPlayerAction, ], - [{ frigate_card_action: 'menu_toggle' as const }, MenuToggleAction], - [{ frigate_card_action: 'microphone_connect' as const }, MicrophoneConnectAction], + [{ advanced_camera_card_action: 'menu_toggle' as const }, MenuToggleAction], [ - { frigate_card_action: 'microphone_disconnect' as const }, + { advanced_camera_card_action: 'microphone_connect' as const }, + MicrophoneConnectAction, + ], + [ + { advanced_camera_card_action: 'microphone_disconnect' as const }, MicrophoneDisconnectAction, ], - [{ frigate_card_action: 'microphone_mute' as const }, MicrophoneMuteAction], - [{ frigate_card_action: 'microphone_unmute' as const }, MicrophoneUnmuteAction], - [{ frigate_card_action: 'mute' as const }, MuteAction], - [{ frigate_card_action: 'pause' as const }, PauseAction], - [{ frigate_card_action: 'play' as const }, PlayAction], - [{ frigate_card_action: 'ptz_digital' as const }, PTZDigitalAction], [ - { frigate_card_action: 'ptz_multi' as const, ptz_action: 'right' as const }, + { advanced_camera_card_action: 'microphone_mute' as const }, + MicrophoneMuteAction, + ], + [ + { advanced_camera_card_action: 'microphone_unmute' as const }, + MicrophoneUnmuteAction, + ], + [{ advanced_camera_card_action: 'mute' as const }, MuteAction], + [{ advanced_camera_card_action: 'pause' as const }, PauseAction], + [{ advanced_camera_card_action: 'play' as const }, PlayAction], + [{ advanced_camera_card_action: 'ptz_digital' as const }, PTZDigitalAction], + [ + { + advanced_camera_card_action: 'ptz_multi' as const, + ptz_action: 'right' as const, + }, PTZMultiAction, ], - [{ frigate_card_action: 'ptz' as const, ptz_action: 'right' as const }, PTZAction], - [{ frigate_card_action: 'recording' as const }, ViewAction], - [{ frigate_card_action: 'recordings' as const }, ViewAction], - [{ frigate_card_action: 'screenshot' as const }, ScreenshotAction], [ - { frigate_card_action: 'ptz_controls' as const, enabled: true }, + { advanced_camera_card_action: 'ptz' as const, ptz_action: 'right' as const }, + PTZAction, + ], + [{ advanced_camera_card_action: 'recording' as const }, ViewAction], + [{ advanced_camera_card_action: 'recordings' as const }, ViewAction], + [{ advanced_camera_card_action: 'screenshot' as const }, ScreenshotAction], + [ + { advanced_camera_card_action: 'ptz_controls' as const, enabled: true }, PTZControlsAction, ], - [{ frigate_card_action: 'sleep' as const }, SleepAction], - [{ frigate_card_action: 'snapshot' as const }, ViewAction], - [{ frigate_card_action: 'snapshots' as const }, ViewAction], - [{ frigate_card_action: 'timeline' as const }, ViewAction], - [{ frigate_card_action: 'unmute' as const }, UnmuteAction], + [{ advanced_camera_card_action: 'sleep' as const }, SleepAction], + [{ advanced_camera_card_action: 'snapshot' as const }, ViewAction], + [{ advanced_camera_card_action: 'snapshots' as const }, ViewAction], + [{ advanced_camera_card_action: 'timeline' as const }, ViewAction], + [{ advanced_camera_card_action: 'unmute' as const }, UnmuteAction], [ - { frigate_card_action: 'status_bar' as const, status_bar_action: 'reset' }, + { + advanced_camera_card_action: 'status_bar' as const, + status_bar_action: 'reset', + }, StatusBarAction, ], ])( - 'frigate_card_action: $frigate_card_action', - (action: Partial, classObject: object) => { + 'advanced_camera_card_action: $advanced_camera_card_action', + (action: Partial, classObject: object) => { const factory = new ActionFactory(); expect( factory.createAction({}, { action: 'fire-dom-event', ...action }), diff --git a/tests/card-controller/automations-manager.test.ts b/tests/card-controller/automations-manager.test.ts index 2f9d6d41..f90d904a 100644 --- a/tests/card-controller/automations-manager.test.ts +++ b/tests/card-controller/automations-manager.test.ts @@ -8,7 +8,7 @@ describe('AutomationsManager', () => { const actions = [ { action: 'fire-dom-event' as const, - frigate_card_action: 'clips', + advanced_camera_card_action: 'clips', }, ]; const conditions = [{ condition: 'fullscreen' as const, fullscreen: true }]; diff --git a/tests/card-controller/conditions-manager.test.ts b/tests/card-controller/conditions-manager.test.ts index 5243331d..f32d44b0 100644 --- a/tests/card-controller/conditions-manager.test.ts +++ b/tests/card-controller/conditions-manager.test.ts @@ -7,7 +7,7 @@ import { getOverriddenConfig, } from '../../src/card-controller/conditions-manager'; import { MicrophoneState } from '../../src/card-controller/types'; -import { FrigateCardCondition } from '../../src/config/types'; +import { AdvancedCameraCardCondition } from '../../src/config/types'; import { createCardAPI, createCondition, @@ -26,7 +26,7 @@ describe('ConditionEvaluateRequestEvent', () => { composed: true, }); - expect(event.type).toBe('frigate-card:conditions:evaluate'); + expect(event.type).toBe('advanced-camera-card:conditions:evaluate'); expect(event.conditions).toBe(conditions); expect(event.bubbles).toBeTruthy(); expect(event.composed).toBeTruthy(); @@ -45,7 +45,7 @@ describe('evaluateConditionViaEvent', () => { expect(ev.conditions).toBe(conditions); ev.evaluation = true; }); - element.addEventListener('frigate-card:conditions:evaluate', handler); + element.addEventListener('advanced-camera-card:conditions:evaluate', handler); expect(evaluateConditionViaEvent(element, conditions)).toBeTruthy(); expect(handler).toBeCalled(); @@ -57,7 +57,7 @@ describe('evaluateConditionViaEvent', () => { expect(ev.conditions).toBe(conditions); ev.evaluation = false; }); - element.addEventListener('frigate-card:conditions:evaluate', handler); + element.addEventListener('advanced-camera-card:conditions:evaluate', handler); expect(evaluateConditionViaEvent(element, conditions)).toBeFalsy(); expect(handler).toBeCalled(); @@ -66,7 +66,7 @@ describe('evaluateConditionViaEvent', () => { const element = document.createElement('div'); const conditions = [createCondition({ condition: 'fullscreen', fullscreen: true })]; const handler = vi.fn(); - element.addEventListener('frigate-card:conditions:evaluate', handler); + element.addEventListener('advanced-camera-card:conditions:evaluate', handler); expect(evaluateConditionViaEvent(element, conditions)).toBeFalsy(); expect(handler).toBeCalled(); @@ -464,7 +464,7 @@ describe('ConditionsManager', () => { vi.restoreAllMocks(); }); - const createSuitableConfig = (conditions: FrigateCardCondition[]) => { + const createSuitableConfig = (conditions: AdvancedCameraCardCondition[]) => { return createConfig({ overrides: [ { @@ -790,11 +790,11 @@ describe('ConditionsManager', () => { describe('with screen condition', () => { const mediaQueryConfig = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], elements: [ { - type: 'custom:frigate-card-conditional', + type: 'custom:advanced-camera-card-conditional', conditions: [ { condition: 'fullscreen' as const, @@ -805,7 +805,7 @@ describe('ConditionsManager', () => { { type: 'custom:nested-unknown-object', unknown_key: { - type: 'custom:frigate-card-conditional', + type: 'custom:advanced-camera-card-conditional', conditions: [ { condition: 'screen' as const, diff --git a/tests/card-controller/config/config-manager.test.ts b/tests/card-controller/config/config-manager.test.ts index c9020f6d..8254f415 100644 --- a/tests/card-controller/config/config-manager.test.ts +++ b/tests/card-controller/config/config-manager.test.ts @@ -3,7 +3,7 @@ import { ZodError } from 'zod'; import { getOverriddenConfig } from '../../../src/card-controller/conditions-manager'; import { ConfigManager } from '../../../src/card-controller/config/config-manager'; import { InitializationAspect } from '../../../src/card-controller/initialization-manager'; -import { frigateCardConfigSchema } from '../../../src/config/types'; +import { advancedCameraCardConfigSchema } from '../../../src/config/types'; import { createCardAPI, createConfig, flushPromises } from '../../test-utils'; vi.mock('../../../src/card-controller/conditions-manager.js'); @@ -20,7 +20,7 @@ describe('ConfigManager', () => { }); it('invalid configuration', () => { - const spy = vi.spyOn(frigateCardConfigSchema, 'safeParse').mockReturnValue({ + const spy = vi.spyOn(advancedCameraCardConfigSchema, 'safeParse').mockReturnValue({ success: false, error: new ZodError([]), }); @@ -44,18 +44,14 @@ describe('ConfigManager', () => { const manager = new ConfigManager(createCardAPI()); expect(() => manager.setConfig({ - cameras: [ - { - frigate: { - label: 'foo', - }, - }, - ], + // This key needs to be upgradeable in `management.ts` . + type: 'custom:frigate-card', + cameras: 'WILL_NOT_PARSE', }), ).toThrowError( 'An automated card configuration upgrade is ' + 'available, please visit the visual card editor. ' + - 'Invalid configuration: [\n "type"\n]', + 'Invalid configuration: [\n "cameras"\n]', ); }); }); @@ -72,7 +68,7 @@ describe('ConfigManager', () => { const api = createCardAPI(); const manager = new ConfigManager(api); const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], }; @@ -105,7 +101,7 @@ describe('ConfigManager', () => { it('should apply profiles', () => { const manager = new ConfigManager(createCardAPI()); const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], profiles: ['low-performance'], }; @@ -120,7 +116,7 @@ describe('ConfigManager', () => { const api = createCardAPI(); const manager = new ConfigManager(api); const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], }; @@ -137,7 +133,7 @@ describe('ConfigManager', () => { const api = createCardAPI(); const manager = new ConfigManager(api); const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], debug: { logging: true, @@ -183,7 +179,7 @@ describe('ConfigManager', () => { const api = createCardAPI(); const manager = new ConfigManager(api); const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], }; vi.mocked(getOverriddenConfig).mockReturnValue(config); @@ -201,14 +197,14 @@ describe('ConfigManager', () => { const api = createCardAPI(); const manager = new ConfigManager(api); const config_1 = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], }; manager.setConfig(config_1); vi.mocked(api.getStyleManager().updateFromConfig).mockClear(); const config_2 = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.kitchen' }], }; vi.mocked(getOverriddenConfig).mockReturnValue(config_2); @@ -223,7 +219,7 @@ describe('ConfigManager', () => { const api = createCardAPI(); const manager = new ConfigManager(api); manager.setConfig({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], }); @@ -242,7 +238,7 @@ describe('ConfigManager', () => { const api = createCardAPI(); const manager = new ConfigManager(api); const config_1 = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], }; vi.mocked(getOverriddenConfig).mockReturnValue(createConfig(config_1)); @@ -253,7 +249,7 @@ describe('ConfigManager', () => { ); const config_2 = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.kitchen' }], }; vi.mocked(getOverriddenConfig).mockReturnValue(createConfig(config_2)); @@ -268,7 +264,7 @@ describe('ConfigManager', () => { const api = createCardAPI(); const manager = new ConfigManager(api); const config_1 = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], }; vi.mocked(getOverriddenConfig).mockReturnValue(createConfig(config_1)); @@ -296,7 +292,7 @@ describe('ConfigManager', () => { const api = createCardAPI(); const manager = new ConfigManager(api); const config_1 = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], live: { microphone: { @@ -332,7 +328,7 @@ describe('ConfigManager', () => { const api = createCardAPI(); const manager = new ConfigManager(api); const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], }; vi.mocked(getOverriddenConfig).mockReturnValue(createConfig(config)); diff --git a/tests/card-controller/config/load-automations.test.ts b/tests/card-controller/config/load-automations.test.ts index e246499d..6fd7d6f5 100644 --- a/tests/card-controller/config/load-automations.test.ts +++ b/tests/card-controller/config/load-automations.test.ts @@ -17,7 +17,7 @@ describe('setAutomationsFromConfig', () => { actions: [ { action: 'fire-dom-event' as const, - frigate_card_action: 'clips', + advanced_camera_card_action: 'clips', }, ], conditions: [{ condition: 'fullscreen' as const, fullscreen: true }], diff --git a/tests/card-controller/config/load-keyboard-shortcuts.test.ts b/tests/card-controller/config/load-keyboard-shortcuts.test.ts index 282fd433..bfa8dc1e 100644 --- a/tests/card-controller/config/load-keyboard-shortcuts.test.ts +++ b/tests/card-controller/config/load-keyboard-shortcuts.test.ts @@ -67,7 +67,7 @@ describe('setKeyboardShortcutsFromConfig', () => { actions: [ { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', ptz_action: ptzAction, ptz_phase: 'start', }, @@ -89,7 +89,7 @@ describe('setKeyboardShortcutsFromConfig', () => { actions: [ { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', ptz_action: ptzAction, ptz_phase: 'stop', }, @@ -119,7 +119,7 @@ describe('setKeyboardShortcutsFromConfig', () => { actions: [ { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', }, ], conditions: [ diff --git a/tests/card-controller/controller.test.ts b/tests/card-controller/controller.test.ts index e293ab32..27fa84c4 100644 --- a/tests/card-controller/controller.test.ts +++ b/tests/card-controller/controller.test.ts @@ -27,7 +27,7 @@ import { StatusBarItemManager } from '../../src/card-controller/status-bar-item- import { StyleManager } from '../../src/card-controller/style-manager'; import { TriggersManager } from '../../src/card-controller/triggers-manager'; import { ViewManager } from '../../src/card-controller/view/view-manager'; -import { FrigateCardEditor } from '../../src/editor'; +import { AdvancedCameraCardEditor } from '../../src/editor'; import { DeviceRegistryManager } from '../../src/utils/ha/registry/device'; import { EntityRegistryManager } from '../../src/utils/ha/registry/entity'; import { ResolvedMediaCache } from '../../src/utils/ha/resolved-media'; @@ -142,7 +142,9 @@ describe('CardController', () => { }); it('getConfigElement', async () => { - expect((await CardController.getConfigElement()) instanceof FrigateCardEditor); + expect( + (await CardController.getConfigElement()) instanceof AdvancedCameraCardEditor, + ); }); it('getConfigManager', () => { diff --git a/tests/card-controller/default-manager.test.ts b/tests/card-controller/default-manager.test.ts index ab4b4748..5b110d44 100644 --- a/tests/card-controller/default-manager.test.ts +++ b/tests/card-controller/default-manager.test.ts @@ -189,7 +189,7 @@ describe('DefaultManager', () => { actions: [ { action: 'fire-dom-event', - frigate_card_action: 'default', + advanced_camera_card_action: 'default', }, ], conditions: [ diff --git a/tests/card-controller/download-manager.test.ts b/tests/card-controller/download-manager.test.ts index 59427a12..07282f8a 100644 --- a/tests/card-controller/download-manager.test.ts +++ b/tests/card-controller/download-manager.test.ts @@ -1,7 +1,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import { mock } from 'vitest-mock-extended'; -import { FrigateCardMediaPlayer } from '../../src/types'; import { DownloadManager } from '../../src/card-controller/download-manager'; +import { AdvancedCameraCardMediaPlayer } from '../../src/types'; import { downloadMedia, downloadURL } from '../../src/utils/download.js'; import { createCardAPI, @@ -62,7 +62,7 @@ describe('DownloadManager.downloadScreenshot', () => { it('with url', async () => { const api = createCardAPI(); - const player = mock(); + const player = mock(); player.getScreenshotURL.mockResolvedValue('http://screenshot'); vi.mocked(api.getMediaLoadedInfoManager().get).mockReturnValue( @@ -78,7 +78,7 @@ describe('DownloadManager.downloadScreenshot', () => { it('without url', async () => { const api = createCardAPI(); - const player = mock(); + const player = mock(); player.getScreenshotURL.mockResolvedValue(null); vi.mocked(api.getMediaLoadedInfoManager().get).mockReturnValue( diff --git a/tests/card-controller/fullscreen/webkit/index.test.ts b/tests/card-controller/fullscreen/webkit/index.test.ts index 97ecba06..f8d91897 100644 --- a/tests/card-controller/fullscreen/webkit/index.test.ts +++ b/tests/card-controller/fullscreen/webkit/index.test.ts @@ -2,7 +2,10 @@ import { afterEach, describe, expect, it, vi } from 'vitest'; import { mock } from 'vitest-mock-extended'; import { CardController } from '../../../../src/card-controller/controller'; import { WebkitFullScreenProvider } from '../../../../src/card-controller/fullscreen/webkit'; -import { FrigateCardMediaPlayer, WebkitHTMLVideoElement } from '../../../../src/types'; +import { + AdvancedCameraCardMediaPlayer, + WebkitHTMLVideoElement, +} from '../../../../src/types'; import { createCardAPI, createMediaLoadedInfo } from '../../../test-utils'; const createWebkitVideoElement = (): HTMLVideoElement & @@ -11,7 +14,7 @@ const createWebkitVideoElement = (): HTMLVideoElement & }; const setElement = (api: CardController, element: HTMLElement): void => { - const player = mock(); + const player = mock(); player.getFullscreenElement.mockReturnValue(element); vi.mocked(api.getMediaLoadedInfoManager().get).mockReturnValue( @@ -158,7 +161,7 @@ describe('WebkitFullScreenProvider', () => { ).mock.calls[0][0]; const element_1 = createWebkitVideoElement(); - const player_1 = mock(); + const player_1 = mock(); player_1.getFullscreenElement.mockReturnValue(element_1); const mediaLoadedInfo_1 = createMediaLoadedInfo({ player: player_1 }); @@ -169,7 +172,7 @@ describe('WebkitFullScreenProvider', () => { expect(handler).toBeCalledTimes(1); const element_2 = createWebkitVideoElement(); - const player_2 = mock(); + const player_2 = mock(); player_2.getFullscreenElement.mockReturnValue(element_2); const mediaLoadedInfo_2 = createMediaLoadedInfo({ player: player_2 }); @@ -219,7 +222,7 @@ describe('WebkitFullScreenProvider', () => { setElement(api, element); - const player = mock(); + const player = mock(); player.getFullscreenElement.mockReturnValue(element); const mediaLoadedInfo = createMediaLoadedInfo({ player }); diff --git a/tests/card-controller/message-manager.test.ts b/tests/card-controller/message-manager.test.ts index ffedd7f6..69f4c9ea 100644 --- a/tests/card-controller/message-manager.test.ts +++ b/tests/card-controller/message-manager.test.ts @@ -1,6 +1,6 @@ import { afterAll, describe, expect, it, vi } from 'vitest'; -import { FrigateCardError, Message } from '../../src/types'; import { MessageManager } from '../../src/card-controller/message-manager'; +import { AdvancedCameraCardError, Message } from '../../src/types'; import { createCardAPI } from '../test-utils'; const createMessage = (options?: Partial): Message => { @@ -111,7 +111,7 @@ describe('MessageManager', () => { expect(manager.getMessage()).toBe(connectionMessage); }); - it('should set FrigateCardError object', () => { + it('should set AdvancedCameraCardError object', () => { const consoleSpy = vi.spyOn(global.console, 'warn').mockReturnValue(undefined); const api = createCardAPI(); @@ -119,11 +119,11 @@ describe('MessageManager', () => { const context = { foo: 'bar' }; manager.setErrorIfHigherPriority( - new FrigateCardError('frigate card message', context), + new AdvancedCameraCardError('advanced camera card message', context), ); expect(manager.hasMessage()).toBeTruthy(); expect(manager.getMessage()).toEqual({ - message: 'frigate card message', + message: 'advanced camera card message', type: 'error', context: context, }); diff --git a/tests/card-controller/query-string-manager.test.ts b/tests/card-controller/query-string-manager.test.ts index 5b7dcfb0..e2bd9a30 100644 --- a/tests/card-controller/query-string-manager.test.ts +++ b/tests/card-controller/query-string-manager.test.ts @@ -42,7 +42,7 @@ describe('QueryStringManager', () => { ['snapshots' as const], ['timeline' as const], ])('%s', async (viewName: string) => { - setQueryString(`?frigate-card-action.id.${viewName}=`); + setQueryString(`?advanced-camera-card-action.id.${viewName}=`); const api = createCardAPI(); // View actions do not need the card to have been updated. @@ -68,7 +68,7 @@ describe('QueryStringManager', () => { ['expand' as const], ['menu_toggle' as const], ])('%s', async (action: string) => { - setQueryString(`?frigate-card-action.id.${action}=`); + setQueryString(`?advanced-camera-card-action.id.${action}=`); const api = createCardAPI(); vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(true); const manager = new QueryStringManager(api); @@ -80,14 +80,14 @@ describe('QueryStringManager', () => { { action: 'fire-dom-event', card_id: 'id', - frigate_card_action: action, + advanced_camera_card_action: action, }, ]); }); }); it('should execute view default action', async () => { - setQueryString('?frigate-card-action.id.default='); + setQueryString('?advanced-camera-card-action.id.default='); const api = createCardAPI(); // View actions do not need the card to have been updated. vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(false); @@ -104,7 +104,7 @@ describe('QueryStringManager', () => { }); it('should execute camera_select action', async () => { - setQueryString('?frigate-card-action.id.camera_select=camera.office'); + setQueryString('?advanced-camera-card-action.id.camera_select=camera.office'); const api = createCardAPI(); vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(true); const manager = new QueryStringManager(api); @@ -123,7 +123,9 @@ describe('QueryStringManager', () => { }); it('should execute live_substream_select action', async () => { - setQueryString('?frigate-card-action.id.live_substream_select=camera.office_hd'); + setQueryString( + '?advanced-camera-card-action.id.live_substream_select=camera.office_hd', + ); const api = createCardAPI(); vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(true); const manager = new QueryStringManager(api); @@ -145,7 +147,7 @@ describe('QueryStringManager', () => { it.each([['camera_select' as const], ['live_substream_select' as const]])( '%s', async (action: string) => { - setQueryString(`?frigate-card-action.id.${action}=`); + setQueryString(`?advanced-camera-card-action.id.${action}=`); const api = createCardAPI(); vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(true); const manager = new QueryStringManager(api); @@ -163,7 +165,7 @@ describe('QueryStringManager', () => { it('should handle unknown action', async () => { const consoleSpy = vi.spyOn(global.console, 'warn').mockReturnValue(undefined); - setQueryString('?frigate-card-action.id.not_an_action=value'); + setQueryString('?advanced-camera-card-action.id.not_an_action=value'); const api = createCardAPI(); vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(true); const manager = new QueryStringManager(api); @@ -190,7 +192,7 @@ describe('QueryStringManager', () => { ['snapshots' as const], ['timeline' as const], ])('%s', async (viewName: string) => { - setQueryString(`?frigate-card-action.id.${viewName}=`); + setQueryString(`?advanced-camera-card-action.id.${viewName}=`); const api = createCardAPI(); vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(true); const manager = new QueryStringManager(api); @@ -210,10 +212,10 @@ describe('QueryStringManager', () => { describe('should handle conflicting but valid actions', () => { it('view and default with camera and substream specified', async () => { setQueryString( - '?frigate-card-action.id.clips=' + - '&frigate-card-action.id.live_substream_select=camera.kitchen_hd' + - '&frigate-card-action.id.default=' + - '&frigate-card-action.id.camera_select=camera.kitchen', + '?advanced-camera-card-action.id.clips=' + + '&advanced-camera-card-action.id.live_substream_select=camera.kitchen_hd' + + '&advanced-camera-card-action.id.default=' + + '&advanced-camera-card-action.id.camera_select=camera.kitchen', ); const api = createCardAPI(); vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(true); @@ -232,8 +234,8 @@ describe('QueryStringManager', () => { it('multiple cameras specified', async () => { setQueryString( - '?frigate-card-action.id.camera_select=camera.kitchen' + - '&frigate-card-action.id.camera_select=camera.office', + '?advanced-camera-card-action.id.camera_select=camera.kitchen' + + '&advanced-camera-card-action.id.camera_select=camera.office', ); const api = createCardAPI(); vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(true); @@ -250,7 +252,9 @@ describe('QueryStringManager', () => { }); it('should only execute when needed', async () => { - setQueryString('?frigate-card-action.id.live_substream_select=camera.office_hd'); + setQueryString( + '?advanced-camera-card-action.id.live_substream_select=camera.office_hd', + ); const api = createCardAPI(); vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(true); const manager = new QueryStringManager(api); @@ -271,4 +275,23 @@ describe('QueryStringManager', () => { expect(manager.hasViewRelatedActionsToRun()).toBeFalsy(); expect(api.getViewManager().setViewByParametersWithNewQuery).toBeCalledTimes(2); }); + + it('should execute actions with old frigate-card-action key', async () => { + setQueryString(`?frigate-card-action.id.clips=`); + const api = createCardAPI(); + + // View actions do not need the card to have been updated. + vi.mocked(api.getCardElementManager().hasUpdated).mockReturnValue(false); + const manager = new QueryStringManager(api); + + expect(manager.hasViewRelatedActionsToRun()).toBeTruthy(); + await manager.executeIfNecessary(); + expect(manager.hasViewRelatedActionsToRun()).toBeFalsy(); + + expect(api.getViewManager().setViewByParametersWithNewQuery).toBeCalledWith({ + params: { + view: 'clips', + }, + }); + }); }); diff --git a/tests/card-controller/status-bar-item-manager.test.ts b/tests/card-controller/status-bar-item-manager.test.ts index 58f582f8..7ccc9769 100644 --- a/tests/card-controller/status-bar-item-manager.test.ts +++ b/tests/card-controller/status-bar-item-manager.test.ts @@ -12,7 +12,7 @@ import { describe('StatusBarItemManager', () => { const testItem: StatusBarString = { - type: 'custom:frigate-card-status-bar-string' as const, + type: 'custom:advanced-camera-card-status-bar-string' as const, string: 'test', }; @@ -68,7 +68,7 @@ describe('StatusBarItemManager', () => { view: createView({ view: 'live', camera: 'camera-1' }), }), ).toContainEqual({ - type: 'custom:frigate-card-status-bar-string' as const, + type: 'custom:advanced-camera-card-status-bar-string' as const, string: 'Camera Title', expand: true, sufficient: true, @@ -108,7 +108,7 @@ describe('StatusBarItemManager', () => { view: view, }), ).toContainEqual({ - type: 'custom:frigate-card-status-bar-string' as const, + type: 'custom:advanced-camera-card-status-bar-string' as const, string: 'Media Title', expand: true, sufficient: true, @@ -180,7 +180,7 @@ describe('StatusBarItemManager', () => { mediaLoadedInfo: { width, height }, }), ).toContainEqual({ - type: 'custom:frigate-card-status-bar-string' as const, + type: 'custom:advanced-camera-card-status-bar-string' as const, string: expectedName, }); }, @@ -196,7 +196,7 @@ describe('StatusBarItemManager', () => { mediaLoadedInfo: { width: 640, height: 480, technology: ['webrtc'] }, }), ).toContainEqual({ - type: 'custom:frigate-card-status-bar-icon' as const, + type: 'custom:advanced-camera-card-status-bar-icon' as const, icon: 'mdi:webrtc', }); }); @@ -209,7 +209,7 @@ describe('StatusBarItemManager', () => { mediaLoadedInfo: { width: 640, height: 480, technology: ['hls'] }, }), ).toContainEqual({ - type: 'custom:frigate-card-status-bar-string' as const, + type: 'custom:advanced-camera-card-status-bar-string' as const, string: 'HLS', }); }); @@ -237,7 +237,7 @@ describe('StatusBarItemManager', () => { view: createView({ view: 'live', camera: 'camera-1' }), }), ).toContainEqual({ - type: 'custom:frigate-card-status-bar-icon' as const, + type: 'custom:advanced-camera-card-status-bar-icon' as const, icon: 'ENGINE_ICON', }); }); diff --git a/tests/card-controller/style-manager.test.ts b/tests/card-controller/style-manager.test.ts index c908a12c..2b6ac8b2 100644 --- a/tests/card-controller/style-manager.test.ts +++ b/tests/card-controller/style-manager.test.ts @@ -1,6 +1,6 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import { StyleManager } from '../../src/card-controller/style-manager'; -import { FrigateCardView, ThemeName } from '../../src/config/types'; +import { AdvancedCameraCardView, ThemeName } from '../../src/config/types'; import { createCardAPI, createConfig, createView } from '../test-utils'; // @vitest-environment jsdom @@ -57,15 +57,15 @@ describe('StyleManager', () => { manager.setExpandedMode(); - expect(element.style.getPropertyValue('--frigate-card-expand-aspect-ratio')).toBe( - 'unset', - ); - expect(element.style.getPropertyValue('--frigate-card-expand-width')).toBe( - 'var(--frigate-card-expand-max-width)', - ); - expect(element.style.getPropertyValue('--frigate-card-expand-height')).toBe( - 'var(--frigate-card-expand-max-height)', + expect( + element.style.getPropertyValue('--advanced-camera-card-expand-aspect-ratio'), + ).toBe('unset'); + expect(element.style.getPropertyValue('--advanced-camera-card-expand-width')).toBe( + 'var(--advanced-camera-card-expand-max-width)', ); + expect( + element.style.getPropertyValue('--advanced-camera-card-expand-height'), + ).toBe('var(--advanced-camera-card-expand-max-height)'); }); it('with view but without media', () => { @@ -79,13 +79,15 @@ describe('StyleManager', () => { manager.setExpandedMode(); - expect(element.style.getPropertyValue('--frigate-card-expand-aspect-ratio')).toBe( - 'unset', - ); - expect(element.style.getPropertyValue('--frigate-card-expand-width')).toBe('none'); - expect(element.style.getPropertyValue('--frigate-card-expand-height')).toBe( + expect( + element.style.getPropertyValue('--advanced-camera-card-expand-aspect-ratio'), + ).toBe('unset'); + expect(element.style.getPropertyValue('--advanced-camera-card-expand-width')).toBe( 'none', ); + expect( + element.style.getPropertyValue('--advanced-camera-card-expand-height'), + ).toBe('none'); }); it('with view and media', () => { @@ -102,13 +104,15 @@ describe('StyleManager', () => { manager.setExpandedMode(); - expect(element.style.getPropertyValue('--frigate-card-expand-aspect-ratio')).toBe( - '800 / 600', - ); - expect(element.style.getPropertyValue('--frigate-card-expand-width')).toBe('none'); - expect(element.style.getPropertyValue('--frigate-card-expand-height')).toBe( + expect( + element.style.getPropertyValue('--advanced-camera-card-expand-aspect-ratio'), + ).toBe('800 / 600'); + expect(element.style.getPropertyValue('--advanced-camera-card-expand-width')).toBe( 'none', ); + expect( + element.style.getPropertyValue('--advanced-camera-card-expand-height'), + ).toBe('none'); }); it('with view and grid display mode', () => { @@ -125,15 +129,15 @@ describe('StyleManager', () => { manager.setExpandedMode(); - expect(element.style.getPropertyValue('--frigate-card-expand-aspect-ratio')).toBe( - '800 / 600', - ); - expect(element.style.getPropertyValue('--frigate-card-expand-width')).toBe( - 'var(--frigate-card-expand-max-width)', - ); - expect(element.style.getPropertyValue('--frigate-card-expand-height')).toBe( - 'var(--frigate-card-expand-max-height)', + expect( + element.style.getPropertyValue('--advanced-camera-card-expand-aspect-ratio'), + ).toBe('800 / 600'); + expect(element.style.getPropertyValue('--advanced-camera-card-expand-width')).toBe( + 'var(--advanced-camera-card-expand-max-width)', ); + expect( + element.style.getPropertyValue('--advanced-camera-card-expand-height'), + ).toBe('var(--advanced-camera-card-expand-max-height)'); }); }); @@ -146,8 +150,12 @@ describe('StyleManager', () => { manager.updateFromConfig(); - expect(element.style.getPropertyValue('--frigate-card-max-height')).toBeFalsy(); - expect(element.style.getPropertyValue('--frigate-card-expand-height')).toBeFalsy(); + expect( + element.style.getPropertyValue('--advanced-camera-card-max-height'), + ).toBeFalsy(); + expect( + element.style.getPropertyValue('--advanced-camera-card-expand-height'), + ).toBeFalsy(); }); it('with a config', () => { @@ -165,7 +173,9 @@ describe('StyleManager', () => { manager.updateFromConfig(); - expect(element.style.getPropertyValue('--frigate-card-height')).toBe('800px'); + expect(element.style.getPropertyValue('--advanced-camera-card-height')).toBe( + '800px', + ); }); }); @@ -180,10 +190,10 @@ describe('StyleManager', () => { manager.updateFromConfig(); expect( - element.style.getPropertyValue('--frigate-card-css-box-shadow'), + element.style.getPropertyValue('--advanced-camera-card-css-box-shadow'), ).toBeFalsy(); expect( - element.style.getPropertyValue('--frigate-card-css-border-radius'), + element.style.getPropertyValue('--advanced-camera-card-css-border-radius'), ).toBeFalsy(); }); @@ -205,11 +215,11 @@ describe('StyleManager', () => { manager.updateFromConfig(); - expect(element.style.getPropertyValue('--frigate-card-css-box-shadow')).toEqual( - 'none', - ); expect( - element.style.getPropertyValue('--frigate-card-css-border-radius'), + element.style.getPropertyValue('--advanced-camera-card-css-box-shadow'), + ).toEqual('none'); + expect( + element.style.getPropertyValue('--advanced-camera-card-css-border-radius'), ).toBeFalsy(); }); }); @@ -277,7 +287,7 @@ describe('StyleManager', () => { ['recording' as const], ['snapshot' as const], ['timeline' as const], - ])('%s', (viewName: FrigateCardView) => { + ])('%s', (viewName: AdvancedCameraCardView) => { const api = createCardAPI(); const view = createView({ view: viewName }); vi.mocked(api.getViewManager().getView).mockReturnValue(view); @@ -297,7 +307,7 @@ describe('StyleManager', () => { describe('should be enforced when dynamic in certain views', () => { it.each([['clips' as const], ['recordings' as const], ['snapshots' as const]])( '%s', - (viewName: FrigateCardView) => { + (viewName: AdvancedCameraCardView) => { const api = createCardAPI(); const view = createView({ view: viewName }); vi.mocked(api.getViewManager().getView).mockReturnValue(view); @@ -318,7 +328,7 @@ describe('StyleManager', () => { describe('should use media dimensions in dynamic', () => { it.each([['clips' as const], ['recordings' as const], ['snapshots' as const]])( '%s', - (viewName: FrigateCardView) => { + (viewName: AdvancedCameraCardView) => { const api = createCardAPI(); const view = createView({ view: viewName }); vi.mocked(api.getViewManager().getView).mockReturnValue(view); diff --git a/tests/card-controller/triggers-manager.test.ts b/tests/card-controller/triggers-manager.test.ts index 0ea09bec..b6258ad8 100644 --- a/tests/card-controller/triggers-manager.test.ts +++ b/tests/card-controller/triggers-manager.test.ts @@ -3,7 +3,7 @@ import { beforeEach, describe, expect, it, vi } from 'vitest'; import { CardController } from '../../src/card-controller/controller'; import { TriggersManager } from '../../src/card-controller/triggers-manager'; import { - FrigateCardView, + AdvancedCameraCardView, TriggersOptions, triggersSchema, } from '../../src/config/types'; @@ -36,7 +36,7 @@ const baseTriggersConfig: TriggersOptions = { // function reduces it. const createTriggerAPI = (options?: { config?: Partial; - default?: FrigateCardView; + default?: AdvancedCameraCardView; interaction?: boolean; }): CardController => { const api = createCardAPI(); diff --git a/tests/card-controller/view/factory.test.ts b/tests/card-controller/view/factory.test.ts index df690345..894dc00e 100644 --- a/tests/card-controller/view/factory.test.ts +++ b/tests/card-controller/view/factory.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest'; import { ViewFactory } from '../../../src/card-controller/view/factory'; import { ViewModifier } from '../../../src/card-controller/view/types'; -import { FrigateCardView, ViewDisplayMode } from '../../../src/config/types'; +import { AdvancedCameraCardView, ViewDisplayMode } from '../../../src/config/types'; import { View } from '../../../src/view/view'; import { createCameraManager, @@ -374,7 +374,7 @@ describe('getViewByParameters', () => { ['recording' as const], ['snapshot' as const], ['live' as const], - ])('%s', (viewName: FrigateCardView) => { + ])('%s', (viewName: AdvancedCameraCardView) => { const api = createPopulatedAPI({ media_viewer: { display: displayConfig, diff --git a/tests/card-controller/view/modifiers/substream-on.test.ts b/tests/card-controller/view/modifiers/substream-on.test.ts index ea82b18a..52d95240 100644 --- a/tests/card-controller/view/modifiers/substream-on.test.ts +++ b/tests/card-controller/view/modifiers/substream-on.test.ts @@ -1,7 +1,7 @@ import { describe, expect, it, vi } from 'vitest'; import { CardController } from '../../../../src/card-controller/controller'; import { SubstreamOnViewModifier } from '../../../../src/card-controller/view/modifiers/substream-on'; -import { RawFrigateCardConfig } from '../../../../src/config/types'; +import { RawAdvancedCameraCardConfig } from '../../../../src/config/types'; import { getStreamCameraID, hasSubstream, @@ -17,7 +17,9 @@ import { createView, } from '../../../test-utils'; -const createAPIWithSubstreams = (config?: RawFrigateCardConfig): CardController => { +const createAPIWithSubstreams = ( + config?: RawAdvancedCameraCardConfig, +): CardController => { const api = createCardAPI(); vi.mocked(api.getCameraManager).mockReturnValue(createCameraManager()); vi.mocked(api.getCameraManager().getStore).mockReturnValue( diff --git a/tests/card-controller/view/test-utils.ts b/tests/card-controller/view/test-utils.ts index 926208a5..8d67dfc5 100644 --- a/tests/card-controller/view/test-utils.ts +++ b/tests/card-controller/view/test-utils.ts @@ -1,6 +1,6 @@ import { vi } from 'vitest'; import { CardController } from '../../../src/card-controller/controller'; -import { RawFrigateCardConfig } from '../../../src/config/types'; +import { RawAdvancedCameraCardConfig } from '../../../src/config/types'; import { createCameraManager, createCapabilities, @@ -9,7 +9,9 @@ import { createStore, } from '../../test-utils'; -export const createPopulatedAPI = (config?: RawFrigateCardConfig): CardController => { +export const createPopulatedAPI = ( + config?: RawAdvancedCameraCardConfig, +): CardController => { const api = createCardAPI(); vi.mocked(api.getCameraManager).mockReturnValue(createCameraManager()); vi.mocked(api.getCameraManager().getStore).mockReturnValue( diff --git a/tests/card-controller/view/view-manager.test.ts b/tests/card-controller/view/view-manager.test.ts index 0cb2461c..3086e32f 100644 --- a/tests/card-controller/view/view-manager.test.ts +++ b/tests/card-controller/view/view-manager.test.ts @@ -1,11 +1,20 @@ import { ViewContext } from 'view'; import { describe, expect, it, vi } from 'vitest'; import { mock } from 'vitest-mock-extended'; +import { QueryType } from '../../../src/camera-manager/types'; import { ViewFactory } from '../../../src/card-controller/view/factory'; +import { SetQueryViewModifier } from '../../../src/card-controller/view/modifiers/set-query'; +import { + QueryExecutorOptions, + ViewModifier, +} from '../../../src/card-controller/view/types'; import { ViewManager } from '../../../src/card-controller/view/view-manager'; -import { FrigateCardView } from '../../../src/config/types'; +import { ViewQueryExecutor } from '../../../src/card-controller/view/view-query-executor'; +import { AdvancedCameraCardView } from '../../../src/config/types'; import { ViewMedia } from '../../../src/view/media'; +import { EventMediaQueries } from '../../../src/view/media-queries'; import { MediaQueriesResults } from '../../../src/view/media-queries-results'; +import { View } from '../../../src/view/view'; import { createCameraManager, createCapabilities, @@ -13,15 +22,6 @@ import { createStore, createView, } from '../../test-utils'; -import { ViewQueryExecutor } from '../../../src/card-controller/view/view-query-executor'; -import { EventMediaQueries } from '../../../src/view/media-queries'; -import { QueryType } from '../../../src/camera-manager/types'; -import { SetQueryViewModifier } from '../../../src/card-controller/view/modifiers/set-query'; -import { View } from '../../../src/view/view'; -import { - QueryExecutorOptions, - ViewModifier, -} from '../../../src/card-controller/view/types'; describe('should act correctly when view is set', () => { it('basic view', () => { @@ -279,7 +279,7 @@ describe('isViewSupportedByCamera', () => { ['recordings' as const, false], ['timeline' as const, false], ['media' as const, false], - ])('%s', (viewName: FrigateCardView, expected: boolean) => { + ])('%s', (viewName: AdvancedCameraCardView, expected: boolean) => { const api = createCardAPI(); vi.mocked(api.getCameraManager).mockReturnValue(createCameraManager()); vi.mocked(api.getCameraManager().getStore).mockReturnValue( diff --git a/tests/card-controller/view/view-query-executor.test.ts b/tests/card-controller/view/view-query-executor.test.ts index 9abbc384..6936ce9e 100644 --- a/tests/card-controller/view/view-query-executor.test.ts +++ b/tests/card-controller/view/view-query-executor.test.ts @@ -3,7 +3,7 @@ import { mock } from 'vitest-mock-extended'; import { applyViewModifiers } from '../../../src/card-controller/view/modifiers'; import { QueryExecutor } from '../../../src/card-controller/view/query-executor'; import { ViewQueryExecutor } from '../../../src/card-controller/view/view-query-executor'; -import { FrigateCardView } from '../../../src/config/types'; +import { AdvancedCameraCardView } from '../../../src/config/types'; import { EventMediaQueries, RecordingMediaQueries, @@ -271,7 +271,10 @@ describe('ViewQueryExecutor', () => { ['snapshots' as const, 'snapshots' as const], ])( '%s', - async (viewName: FrigateCardView, eventsMediaType: 'clips' | 'snapshots') => { + async ( + viewName: AdvancedCameraCardView, + eventsMediaType: 'clips' | 'snapshots', + ) => { const executor = mock(); const query = new EventMediaQueries(); const queryResults = new MediaQueriesResults(); @@ -310,7 +313,7 @@ describe('ViewQueryExecutor', () => { describe('with a recordings-based view', () => { it.each([['recording' as const], ['recordings' as const]])( '%s', - async (viewName: FrigateCardView) => { + async (viewName: AdvancedCameraCardView) => { const executor = mock(); const query = new RecordingMediaQueries(); const queryResults = new MediaQueriesResults(); diff --git a/tests/components-lib/live/live-controller.test.ts b/tests/components-lib/live/live-controller.test.ts index 00647a21..bf5f2d2e 100644 --- a/tests/components-lib/live/live-controller.test.ts +++ b/tests/components-lib/live/live-controller.test.ts @@ -26,7 +26,7 @@ describe('LiveController', () => { const host = createLitElement(); const parent = createParent({ children: [host] }); const eventListener = vi.fn(); - parent.addEventListener('frigate-card:media:loaded', eventListener); + parent.addEventListener('advanced-camera-card:media:loaded', eventListener); const controller = new LiveController(host); expect(host.addController).toBeCalled(); @@ -70,7 +70,7 @@ describe('LiveController', () => { const host = createLitElement(); const parent = createParent({ children: [host] }); const eventListener = vi.fn(); - parent.addEventListener('frigate-card:media:loaded', eventListener); + parent.addEventListener('advanced-camera-card:media:loaded', eventListener); const controller = new LiveController(host); const mediaLoadedInfo = createMediaLoadedInfo(); diff --git a/tests/components-lib/live/utils/dispatch-live-error.test.ts b/tests/components-lib/live/utils/dispatch-live-error.test.ts index 18993cf4..4553044c 100644 --- a/tests/components-lib/live/utils/dispatch-live-error.test.ts +++ b/tests/components-lib/live/utils/dispatch-live-error.test.ts @@ -5,7 +5,7 @@ import { dispatchLiveErrorEvent } from '../../../../src/components-lib/live/util it('should dispatch live error event', () => { const element = document.createElement('div'); const handler = vi.fn(); - element.addEventListener('frigate-card:live:error', handler); + element.addEventListener('advanced-camera-card:live:error', handler); dispatchLiveErrorEvent(element); expect(handler).toBeCalled(); diff --git a/tests/components-lib/media-actions-controller.test.ts b/tests/components-lib/media-actions-controller.test.ts index 2e39c960..424c5758 100644 --- a/tests/components-lib/media-actions-controller.test.ts +++ b/tests/components-lib/media-actions-controller.test.ts @@ -4,7 +4,7 @@ import { MediaActionsController, MediaActionsControllerOptions, } from '../../src/components-lib/media-actions-controller'; -import { FrigateCardMediaPlayer } from '../../src/types'; +import { AdvancedCameraCardMediaPlayer } from '../../src/types'; import { IntersectionObserverMock, MutationObserverMock, @@ -18,11 +18,11 @@ import { callVisibilityHandler, createTestSlideNodes } from '../utils/embla/test const getPlayer = ( element: HTMLElement, selector: string, -): (HTMLElement & FrigateCardMediaPlayer) | null => { +): (HTMLElement & AdvancedCameraCardMediaPlayer) | null => { return element.querySelector(selector); }; -const createPlayer = (): HTMLElement & FrigateCardMediaPlayer => { +const createPlayer = (): HTMLElement & AdvancedCameraCardMediaPlayer => { const player = document.createElement('video'); player['play'] = vi.fn(); @@ -35,7 +35,7 @@ const createPlayer = (): HTMLElement & FrigateCardMediaPlayer => { player['setControls'] = vi.fn(); player['isPaused'] = vi.fn(); - return player as unknown as HTMLElement & FrigateCardMediaPlayer; + return player as unknown as HTMLElement & AdvancedCameraCardMediaPlayer; }; const createPlayerSlideNodes = (n = 10): HTMLElement[] => { @@ -231,7 +231,7 @@ describe('MediaActionsController', () => { controller.unsetTarget(); getPlayer(children[0], 'video')?.dispatchEvent( - new Event('frigate-card:media:loaded'), + new Event('advanced-camera-card:media:loaded'), ); await flushPromises(); @@ -255,7 +255,7 @@ describe('MediaActionsController', () => { expect(getPlayer(children[0], 'video')?.play).toBeCalledTimes(1); getPlayer(children[0], 'video')?.dispatchEvent( - new Event('frigate-card:media:loaded'), + new Event('advanced-camera-card:media:loaded'), ); await flushPromises(); @@ -277,7 +277,7 @@ describe('MediaActionsController', () => { expect(getPlayer(children[0], 'video')?.unmute).toBeCalledTimes(1); getPlayer(children[0], 'video')?.dispatchEvent( - new Event('frigate-card:media:loaded'), + new Event('advanced-camera-card:media:loaded'), ); await flushPromises(); @@ -299,7 +299,7 @@ describe('MediaActionsController', () => { await controller.setTarget(0, true); getPlayer(children[9], 'video')?.dispatchEvent( - new Event('frigate-card:media:loaded'), + new Event('advanced-camera-card:media:loaded'), ); await flushPromises(); @@ -325,7 +325,7 @@ describe('MediaActionsController', () => { expect(getPlayer(children[0], 'video')?.unmute).toBeCalledTimes(1); getPlayer(children[0], 'video')?.dispatchEvent( - new Event('frigate-card:media:loaded'), + new Event('advanced-camera-card:media:loaded'), ); await flushPromises(); diff --git a/tests/components-lib/media-grid-controller.test.ts b/tests/components-lib/media-grid-controller.test.ts index bac8bad1..0a902138 100644 --- a/tests/components-lib/media-grid-controller.test.ts +++ b/tests/components-lib/media-grid-controller.test.ts @@ -174,7 +174,7 @@ describe('MediaGridController', () => { const controller = createController(slot); const mediaLoadedInfoHandler = vi.fn(); - host.addEventListener('frigate-card:media:loaded', mediaLoadedInfoHandler); + host.addEventListener('advanced-camera-card:media:loaded', mediaLoadedInfoHandler); dispatchExistingMediaLoadedInfoAsEvent(children[0], mediaLoadedInfo); controller.selectCell('0'); @@ -194,7 +194,7 @@ describe('MediaGridController', () => { controller.selectCell('0'); const mediaLoadedInfoHandler = vi.fn(); - host.addEventListener('frigate-card:media:loaded', mediaLoadedInfoHandler); + host.addEventListener('advanced-camera-card:media:loaded', mediaLoadedInfoHandler); dispatchExistingMediaLoadedInfoAsEvent(children[0], mediaLoadedInfo); expect(mediaLoadedInfoHandler).toBeCalledWith( @@ -213,7 +213,7 @@ describe('MediaGridController', () => { controller.selectCell('1'); const mediaLoadedInfoHandler = vi.fn(); - host.addEventListener('frigate-card:media:loaded', mediaLoadedInfoHandler); + host.addEventListener('advanced-camera-card:media:loaded', mediaLoadedInfoHandler); dispatchExistingMediaLoadedInfoAsEvent(children[0], mediaLoadedInfo); // Another element is selected, so the event should not have propagated. @@ -228,8 +228,11 @@ describe('MediaGridController', () => { const unselectedHandler = vi.fn(); const unloadMediaHandler = vi.fn(); - host.addEventListener('frigate-card:media-grid:unselected', unselectedHandler); - host.addEventListener('frigate-card:media:unloaded', unloadMediaHandler); + host.addEventListener( + 'advanced-camera-card:media-grid:unselected', + unselectedHandler, + ); + host.addEventListener('advanced-camera-card:media:unloaded', unloadMediaHandler); controller.selectCell('0'); expect(controller.getSelected()).toBe('0'); @@ -401,9 +404,9 @@ describe('MediaGridController', () => { columnWidth: 245, }), ); - expect(parent.style.getPropertyValue('--frigate-card-grid-column-size')).toBe( - '245px', - ); + expect( + parent.style.getPropertyValue('--advanced-camera-card-grid-column-size'), + ).toBe('245px'); }); it('should respect exact columns', () => { @@ -420,9 +423,9 @@ describe('MediaGridController', () => { columnWidth: 1499, }), ); - expect(parent.style.getPropertyValue('--frigate-card-grid-column-size')).toBe( - '1499px', - ); + expect( + parent.style.getPropertyValue('--advanced-camera-card-grid-column-size'), + ).toBe('1499px'); }); it('should respect selected width factor', () => { @@ -430,13 +433,13 @@ describe('MediaGridController', () => { const controller = createController(parent); controller.setDisplayConfig({ mode: 'grid', grid_selected_width_factor: 3 }); expect( - parent.style.getPropertyValue('--frigate-card-grid-selected-width-factor'), + parent.style.getPropertyValue('--advanced-camera-card-grid-selected-width-factor'), ).toBe('3'); // Setting the same config again should do nothing. controller.setDisplayConfig({ mode: 'grid', grid_selected_width_factor: 3 }); expect( - parent.style.getPropertyValue('--frigate-card-grid-selected-width-factor'), + parent.style.getPropertyValue('--advanced-camera-card-grid-selected-width-factor'), ).toBe('3'); }); @@ -490,9 +493,9 @@ describe('MediaGridController', () => { columnWidth: 245, }), ); - expect(parent.style.getPropertyValue('--frigate-card-grid-column-size')).toBe( - '245px', - ); + expect( + parent.style.getPropertyValue('--advanced-camera-card-grid-column-size'), + ).toBe('245px'); // Clear mock state. vi.mocked(Masonry).mockClear(); @@ -509,9 +512,9 @@ describe('MediaGridController', () => { columnWidth: 599, }), ); - expect(parent.style.getPropertyValue('--frigate-card-grid-column-size')).toBe( - '599px', - ); + expect( + parent.style.getPropertyValue('--advanced-camera-card-grid-column-size'), + ).toBe('599px'); expect(masonry.layout).toBeCalled(); // Clear mock state. diff --git a/tests/components-lib/menu-button-controller.test.ts b/tests/components-lib/menu-button-controller.test.ts index 065ed454..36841e51 100644 --- a/tests/components-lib/menu-button-controller.test.ts +++ b/tests/components-lib/menu-button-controller.test.ts @@ -14,12 +14,12 @@ import { MenuButtonControllerOptions, } from '../../src/components-lib/menu-button-controller'; import { - FrigateCardConfig, - FrigateCardView, + AdvancedCameraCardConfig, + AdvancedCameraCardView, MenuItem, ViewDisplayMode, } from '../../src/config/types'; -import { FrigateCardMediaPlayer } from '../../src/types'; +import { AdvancedCameraCardMediaPlayer } from '../../src/types'; import { createGeneralAction } from '../../src/utils/action'; import { ViewMedia } from '../../src/view/media'; import { MediaQueriesResults } from '../../src/view/media-queries-results'; @@ -45,7 +45,7 @@ const calculateButtons = ( controller: MenuButtonController, options?: MenuButtonControllerOptions & { hass?: HomeAssistant; - config?: FrigateCardConfig; + config?: AdvancedCameraCardConfig; cameraManager?: CameraManager; view?: View | null; viewManager?: ViewManager; @@ -72,7 +72,7 @@ const calculateButtons = ( describe('MenuButtonController', () => { let controller: MenuButtonController; const dynamicButton: MenuItem = { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:alpha-a-circle', title: 'Dynamic button', }; @@ -82,17 +82,17 @@ describe('MenuButtonController', () => { controller = new MenuButtonController(); }); - describe('should have default menu button', () => { + describe('should have iris menu button', () => { it('with hidden menu style', () => { const buttons = calculateButtons(controller); expect(buttons).toContainEqual({ - icon: 'frigate', + icon: 'iris', enabled: true, permanent: true, priority: 50, - type: 'custom:frigate-card-menu-icon', - title: 'Frigate menu / Default view', + type: 'custom:advanced-camera-card-menu-icon', + title: 'Iris / Default View / Unhide menu', tap_action: createGeneralAction('menu_toggle'), hold_action: createGeneralAction('diagnostics'), }); @@ -104,12 +104,12 @@ describe('MenuButtonController', () => { }); expect(buttons).toContainEqual({ - icon: 'frigate', + icon: 'iris', enabled: true, permanent: true, priority: 50, - type: 'custom:frigate-card-menu-icon', - title: 'Frigate menu / Default view', + type: 'custom:advanced-camera-card-menu-icon', + title: 'Iris / Default View / Unhide menu', tap_action: createGeneralAction('default'), hold_action: createGeneralAction('diagnostics'), }); @@ -138,7 +138,7 @@ describe('MenuButtonController', () => { icon: 'mdi:video-switch', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-submenu', + type: 'custom:advanced-camera-card-menu-submenu', title: 'Cameras', items: [ { @@ -150,7 +150,7 @@ describe('MenuButtonController', () => { selected: true, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'camera_select', + advanced_camera_card_action: 'camera_select', camera: 'camera-1', }, }, @@ -163,7 +163,7 @@ describe('MenuButtonController', () => { selected: false, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'camera_select', + advanced_camera_card_action: 'camera_select', camera: 'camera-2', }, }, @@ -252,10 +252,10 @@ describe('MenuButtonController', () => { title: 'Substream(s)', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', tap_action: { action: 'fire-dom-event', - frigate_card_action: 'live_substream_on', + advanced_camera_card_action: 'live_substream_on', }, }); }); @@ -289,14 +289,14 @@ describe('MenuButtonController', () => { expect(buttons).toContainEqual({ icon: 'mdi:video-input-component', - style: { color: 'var(--frigate-card-menu-button-active-color)' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, title: 'Substream(s)', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', tap_action: { action: 'fire-dom-event', - frigate_card_action: 'live_substream_off', + advanced_camera_card_action: 'live_substream_off', }, }); }); @@ -354,7 +354,7 @@ describe('MenuButtonController', () => { style: {}, enabled: true, priority: 50, - type: 'custom:frigate-card-menu-submenu', + type: 'custom:advanced-camera-card-menu-submenu', items: [ { enabled: true, @@ -365,7 +365,7 @@ describe('MenuButtonController', () => { selected: true, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'live_substream_select', + advanced_camera_card_action: 'live_substream_select', camera: 'camera-1', }, }, @@ -378,7 +378,7 @@ describe('MenuButtonController', () => { selected: false, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'live_substream_select', + advanced_camera_card_action: 'live_substream_select', camera: 'camera-2', }, }, @@ -391,7 +391,7 @@ describe('MenuButtonController', () => { selected: false, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'live_substream_select', + advanced_camera_card_action: 'live_substream_select', camera: 'camera-3', }, }, @@ -443,10 +443,10 @@ describe('MenuButtonController', () => { expect(buttons).toContainEqual({ icon: 'mdi:video-input-component', title: 'Substream(s)', - style: { color: 'var(--frigate-card-menu-button-active-color)' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, enabled: true, priority: 50, - type: 'custom:frigate-card-menu-submenu', + type: 'custom:advanced-camera-card-menu-submenu', items: [ { enabled: true, @@ -457,7 +457,7 @@ describe('MenuButtonController', () => { selected: false, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'live_substream_select', + advanced_camera_card_action: 'live_substream_select', camera: 'camera-1', }, }, @@ -472,7 +472,7 @@ describe('MenuButtonController', () => { selected: true, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'live_substream_select', + advanced_camera_card_action: 'live_substream_select', camera: 'camera-2', }, }, @@ -485,7 +485,7 @@ describe('MenuButtonController', () => { selected: false, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'live_substream_select', + advanced_camera_card_action: 'live_substream_select', camera: 'camera-3', }, }, @@ -507,10 +507,10 @@ describe('MenuButtonController', () => { icon: 'mdi:cctv', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Live view', - style: { color: 'var(--frigate-card-menu-button-active-color)' }, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'live' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'live' }, }); }); @@ -526,10 +526,10 @@ describe('MenuButtonController', () => { icon: 'mdi:cctv', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Live view', style: {}, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'live' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'live' }, }); }); @@ -561,11 +561,11 @@ describe('MenuButtonController', () => { icon: 'mdi:filmstrip', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Clips gallery', - style: { color: 'var(--frigate-card-menu-button-active-color)' }, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'clips' }, - hold_action: { action: 'fire-dom-event', frigate_card_action: 'clip' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'clips' }, + hold_action: { action: 'fire-dom-event', advanced_camera_card_action: 'clip' }, }); }); @@ -580,11 +580,11 @@ describe('MenuButtonController', () => { icon: 'mdi:filmstrip', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Clips gallery', style: {}, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'clips' }, - hold_action: { action: 'fire-dom-event', frigate_card_action: 'clip' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'clips' }, + hold_action: { action: 'fire-dom-event', advanced_camera_card_action: 'clip' }, }); }); @@ -614,11 +614,17 @@ describe('MenuButtonController', () => { icon: 'mdi:camera', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Snapshots gallery', - style: { color: 'var(--frigate-card-menu-button-active-color)' }, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'snapshots' }, - hold_action: { action: 'fire-dom-event', frigate_card_action: 'snapshot' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'snapshots', + }, + hold_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'snapshot', + }, }); }); @@ -633,11 +639,17 @@ describe('MenuButtonController', () => { icon: 'mdi:camera', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Snapshots gallery', style: {}, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'snapshots' }, - hold_action: { action: 'fire-dom-event', frigate_card_action: 'snapshot' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'snapshots', + }, + hold_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'snapshot', + }, }); }); @@ -669,11 +681,17 @@ describe('MenuButtonController', () => { icon: 'mdi:album', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Recordings gallery', - style: { color: 'var(--frigate-card-menu-button-active-color)' }, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'recordings' }, - hold_action: { action: 'fire-dom-event', frigate_card_action: 'recording' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'recordings', + }, + hold_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'recording', + }, }); }); @@ -688,11 +706,17 @@ describe('MenuButtonController', () => { icon: 'mdi:album', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Recordings gallery', style: {}, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'recordings' }, - hold_action: { action: 'fire-dom-event', frigate_card_action: 'recording' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'recordings', + }, + hold_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'recording', + }, }); }); @@ -725,10 +749,10 @@ describe('MenuButtonController', () => { icon: 'mdi:image', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Static image', - style: { color: 'var(--frigate-card-menu-button-active-color)' }, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'image' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'image' }, }); }); @@ -745,10 +769,10 @@ describe('MenuButtonController', () => { icon: 'mdi:image', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Static image', style: {}, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'image' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'image' }, }); }); @@ -780,10 +804,13 @@ describe('MenuButtonController', () => { icon: 'mdi:chart-gantt', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Timeline view', - style: { color: 'var(--frigate-card-menu-button-active-color)' }, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'timeline' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'timeline', + }, }); }); @@ -799,10 +826,13 @@ describe('MenuButtonController', () => { icon: 'mdi:chart-gantt', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Timeline view', style: {}, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'timeline' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'timeline', + }, }); }); @@ -844,9 +874,12 @@ describe('MenuButtonController', () => { icon: 'mdi:download', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Download', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'download' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'download', + }, }); }); @@ -909,9 +942,9 @@ describe('MenuButtonController', () => { icon: 'mdi:web', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Camera user interface', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'camera_ui' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'camera_ui' }, }); }); @@ -935,19 +968,19 @@ describe('MenuButtonController', () => { icon: 'mdi:microphone', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Microphone', style: { animation: 'pulse 3s infinite', - color: 'var(--frigate-card-menu-button-critical-color)', + color: 'var(--advanced-camera-card-menu-button-critical-color)', }, start_tap_action: { action: 'fire-dom-event', - frigate_card_action: 'microphone_unmute', + advanced_camera_card_action: 'microphone_unmute', }, end_tap_action: { action: 'fire-dom-event', - frigate_card_action: 'microphone_mute', + advanced_camera_card_action: 'microphone_mute', }, }); }); @@ -989,7 +1022,7 @@ describe('MenuButtonController', () => { icon: 'mdi:microphone-message-off', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Microphone', style: {}, }); @@ -1014,16 +1047,16 @@ describe('MenuButtonController', () => { icon: 'mdi:microphone-off', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Microphone', style: {}, start_tap_action: { action: 'fire-dom-event', - frigate_card_action: 'microphone_unmute', + advanced_camera_card_action: 'microphone_unmute', }, end_tap_action: { action: 'fire-dom-event', - frigate_card_action: 'microphone_mute', + advanced_camera_card_action: 'microphone_mute', }, }); }); @@ -1047,7 +1080,7 @@ describe('MenuButtonController', () => { icon: 'mdi:microphone-message-off', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Microphone', style: {}, }); @@ -1075,12 +1108,12 @@ describe('MenuButtonController', () => { icon: 'mdi:microphone-off', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Microphone', style: {}, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'microphone_unmute', + advanced_camera_card_action: 'microphone_unmute', }, }); }); @@ -1107,15 +1140,15 @@ describe('MenuButtonController', () => { icon: 'mdi:microphone', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Microphone', style: { animation: 'pulse 3s infinite', - color: 'var(--frigate-card-menu-button-critical-color)', + color: 'var(--advanced-camera-card-menu-button-critical-color)', }, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'microphone_mute', + advanced_camera_card_action: 'microphone_mute', }, }); }); @@ -1140,9 +1173,12 @@ describe('MenuButtonController', () => { icon: 'mdi:fullscreen', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Fullscreen', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'fullscreen' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'fullscreen', + }, style: {}, }); }); @@ -1159,10 +1195,13 @@ describe('MenuButtonController', () => { icon: 'mdi:fullscreen-exit', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Fullscreen', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'fullscreen' }, - style: { color: 'var(--frigate-card-menu-button-active-color)' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'fullscreen', + }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, }); }); @@ -1188,9 +1227,9 @@ describe('MenuButtonController', () => { icon: 'mdi:arrow-expand-all', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Expand', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'expand' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'expand' }, style: {}, }); }); @@ -1202,10 +1241,10 @@ describe('MenuButtonController', () => { icon: 'mdi:arrow-collapse-all', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Expand', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'expand' }, - style: { color: 'var(--frigate-card-menu-button-active-color)' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'expand' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, }); }); }); @@ -1240,7 +1279,7 @@ describe('MenuButtonController', () => { icon: 'mdi:cast', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-submenu', + type: 'custom:advanced-camera-card-menu-submenu', title: 'Send to media player', items: [ { @@ -1252,13 +1291,13 @@ describe('MenuButtonController', () => { disabled: false, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'media_player', + advanced_camera_card_action: 'media_player', media_player: 'media_player.tv', media_player_action: 'play', }, hold_action: { action: 'fire-dom-event', - frigate_card_action: 'media_player', + advanced_camera_card_action: 'media_player', media_player: 'media_player.tv', media_player_action: 'stop', }, @@ -1293,7 +1332,7 @@ describe('MenuButtonController', () => { icon: 'mdi:cast', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-submenu', + type: 'custom:advanced-camera-card-menu-submenu', title: 'Send to media player', items: [ { @@ -1310,7 +1349,7 @@ describe('MenuButtonController', () => { }); it('should have pause button', () => { - const player = mock(); + const player = mock(); const buttons = calculateButtons(controller, { currentMediaLoadedInfo: createMediaLoadedInfo({ capabilities: { @@ -1324,14 +1363,14 @@ describe('MenuButtonController', () => { icon: 'mdi:pause', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Play / Pause', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'pause' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'pause' }, }); }); it('should have play button', () => { - const player = mock(); + const player = mock(); player.isPaused.mockReturnValue(true); const buttons = calculateButtons(controller, { currentMediaLoadedInfo: createMediaLoadedInfo({ @@ -1346,14 +1385,14 @@ describe('MenuButtonController', () => { icon: 'mdi:play', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Play / Pause', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'play' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'play' }, }); }); it('should have mute button', () => { - const player = mock(); + const player = mock(); const buttons = calculateButtons(controller, { currentMediaLoadedInfo: createMediaLoadedInfo({ capabilities: { @@ -1367,14 +1406,14 @@ describe('MenuButtonController', () => { icon: 'mdi:volume-high', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Mute / Unmute', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'mute' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'mute' }, }); }); it('should have unmute button', () => { - const player = mock(); + const player = mock(); player.isMuted.mockReturnValue(true); const buttons = calculateButtons(controller, { currentMediaLoadedInfo: createMediaLoadedInfo({ @@ -1389,16 +1428,16 @@ describe('MenuButtonController', () => { icon: 'mdi:volume-off', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Mute / Unmute', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'unmute' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'unmute' }, }); }); it('should have screenshot button', () => { const buttons = calculateButtons(controller, { currentMediaLoadedInfo: createMediaLoadedInfo({ - player: mock(), + player: mock(), }), }); @@ -1406,9 +1445,12 @@ describe('MenuButtonController', () => { icon: 'mdi:monitor-screenshot', enabled: false, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: 'Screenshot', - tap_action: { action: 'fire-dom-event', frigate_card_action: 'screenshot' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'screenshot', + }, }); }); @@ -1435,18 +1477,18 @@ describe('MenuButtonController', () => { icon: displayMode === 'single' ? 'mdi:grid' : 'mdi:grid-off', enabled: true, priority: 50, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', title: displayMode === 'grid' ? 'Show single media viewer' : 'Show media viewer for each camera in a grid', style: displayMode === 'grid' - ? { color: 'var(--frigate-card-menu-button-active-color)' } + ? { color: 'var(--advanced-camera-card-menu-button-active-color)' } : {}, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'display_mode_select', + advanced_camera_card_action: 'display_mode_select', display_mode: displayMode === 'single' ? 'grid' : 'single', }, }); @@ -1517,15 +1559,15 @@ describe('MenuButtonController', () => { icon: 'mdi:pan', priority: 50, style: { - color: 'var(--frigate-card-menu-button-active-color)', + color: 'var(--advanced-camera-card-menu-button-active-color)', }, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'ptz_controls', + advanced_camera_card_action: 'ptz_controls', enabled: false, }, title: 'Show PTZ controls', - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', }); }); @@ -1553,11 +1595,11 @@ describe('MenuButtonController', () => { style: {}, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'ptz_controls', + advanced_camera_card_action: 'ptz_controls', enabled: true, }, title: 'Show PTZ controls', - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', }); }); @@ -1583,15 +1625,15 @@ describe('MenuButtonController', () => { icon: 'mdi:pan', priority: 50, style: { - color: 'var(--frigate-card-menu-button-active-color)', + color: 'var(--advanced-camera-card-menu-button-active-color)', }, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'ptz_controls', + advanced_camera_card_action: 'ptz_controls', enabled: false, }, title: 'Show PTZ controls', - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', }); }); @@ -1624,15 +1666,15 @@ describe('MenuButtonController', () => { icon: 'mdi:pan', priority: 50, style: { - color: 'var(--frigate-card-menu-button-active-color)', + color: 'var(--advanced-camera-card-menu-button-active-color)', }, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'ptz_controls', + advanced_camera_card_action: 'ptz_controls', enabled: false, }, title: 'Show PTZ controls', - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', }); }); }); @@ -1648,7 +1690,7 @@ describe('MenuButtonController', () => { ])( '%s view with isDefault %s', ( - viewName: FrigateCardView, + viewName: AdvancedCameraCardView, isDefault: boolean | undefined, expectedResult: boolean, ) => { @@ -1695,11 +1737,11 @@ describe('MenuButtonController', () => { priority: 50, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', target_id: targetID, }, title: 'PTZ Home', - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', }); } else { expect(buttons).not.toContainEqual( @@ -1747,7 +1789,7 @@ describe('MenuButtonController', () => { }); }); - it('with non-Frigate fire-dom-event action', () => { + it('with non-advanced-camera-card fire-dom-event action', () => { const button: MenuItem = { ...dynamicButton, tap_action: { action: 'fire-dom-event' }, @@ -1761,37 +1803,40 @@ describe('MenuButtonController', () => { }); }); - it('with Frigate view action', () => { + it('with advanced camera card view action', () => { const button: MenuItem = { ...dynamicButton, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'clips' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'clips' }, }; const view = createView({ view: 'clips' }); controller.addDynamicMenuButton(button); expect(calculateButtons(controller, { view: view })).toContainEqual({ ...button, - style: { color: 'var(--frigate-card-menu-button-active-color)' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, }); }); - it('with Frigate default action', () => { + it('with advanced camera card default action', () => { const button: MenuItem = { ...dynamicButton, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'default' }, + tap_action: { action: 'fire-dom-event', advanced_camera_card_action: 'default' }, }; controller.addDynamicMenuButton(button); expect(calculateButtons(controller)).toContainEqual({ ...button, - style: { color: 'var(--frigate-card-menu-button-active-color)' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, }); }); it('with fullscreen action', () => { const button: MenuItem = { ...dynamicButton, - tap_action: { action: 'fire-dom-event', frigate_card_action: 'fullscreen' }, + tap_action: { + action: 'fire-dom-event', + advanced_camera_card_action: 'fullscreen', + }, }; controller.addDynamicMenuButton(button); const fullscreenManager = mock(); @@ -1800,7 +1845,7 @@ describe('MenuButtonController', () => { expect(calculateButtons(controller, { fullscreenManager })).toContainEqual({ ...button, - style: { color: 'var(--frigate-card-menu-button-active-color)' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, }); }); @@ -1809,7 +1854,7 @@ describe('MenuButtonController', () => { ...dynamicButton, tap_action: { action: 'fire-dom-event', - frigate_card_action: 'camera_select', + advanced_camera_card_action: 'camera_select', camera: 'foo', }, }; @@ -1818,7 +1863,7 @@ describe('MenuButtonController', () => { expect(calculateButtons(controller, { view: view })).toContainEqual({ ...button, - style: { color: 'var(--frigate-card-menu-button-active-color)' }, + style: { color: 'var(--advanced-camera-card-menu-button-active-color)' }, }); }); @@ -1827,7 +1872,7 @@ describe('MenuButtonController', () => { ...dynamicButton, tap_action: [ { action: 'fire-dom-event' }, - { action: 'fire-dom-event', frigate_card_action: 'clips' }, + { action: 'fire-dom-event', advanced_camera_card_action: 'clips' }, ], }; const view = createView({ camera: 'clips' }); diff --git a/tests/components-lib/menu-controller.test.ts b/tests/components-lib/menu-controller.test.ts index f22ad20f..58cd8f2d 100644 --- a/tests/components-lib/menu-controller.test.ts +++ b/tests/components-lib/menu-controller.test.ts @@ -18,7 +18,7 @@ describe('MenuController', () => { }; const menuToggleAction = { action: 'fire-dom-event' as const, - frigate_card_action: 'menu_toggle' as const, + advanced_camera_card_action: 'menu_toggle' as const, }; const tapActionConfig = { camera_entity: 'foo', @@ -46,7 +46,9 @@ describe('MenuController', () => { controller.setMenuConfig(config); expect(controller.getMenuConfig()).toBe(config); - expect(host.style.getPropertyValue('--frigate-card-menu-button-size')).toBe('21px'); + expect(host.style.getPropertyValue('--advanced-camera-card-menu-button-size')).toBe( + '21px', + ); expect(host.getAttribute('data-style')).toBe('hover'); expect(host.getAttribute('data-position')).toBe('left'); expect(host.getAttribute('data-alignment')).toBe('top'); @@ -79,24 +81,24 @@ describe('MenuController', () => { controller.setButtons([ { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', priority: 20, alignment: 'matching', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:goat', alignment: 'matching', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:chicken', priority: 40, alignment: 'matching', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:horse', priority: 40, alignment: 'matching', @@ -105,7 +107,7 @@ describe('MenuController', () => { permanent: true, }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:sheep', priority: 30, alignment: 'matching', @@ -114,13 +116,13 @@ describe('MenuController', () => { expect(controller.getButtons('matching')).toEqual([ { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:chicken', priority: 40, alignment: 'matching', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:horse', priority: 40, alignment: 'matching', @@ -130,16 +132,16 @@ describe('MenuController', () => { alignment: 'matching', icon: 'mdi:sheep', priority: 30, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', }, { alignment: 'matching', icon: 'mdi:cow', priority: 20, - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:goat', alignment: 'matching', }, @@ -156,19 +158,19 @@ describe('MenuController', () => { controller.setExpanded(true); controller.setButtons([ { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', priority: 99, alignment: 'matching', }, { - type: 'custom:frigate-card-menu-icon', - icon: 'frigate', + type: 'custom:advanced-camera-card-menu-icon', + icon: 'iris', alignment: 'matching', permanent: true, }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:sheep', priority: 100, alignment: 'matching', @@ -177,19 +179,19 @@ describe('MenuController', () => { expect(controller.getButtons('matching')).toEqual([ { - type: 'custom:frigate-card-menu-icon', - icon: 'frigate', + type: 'custom:advanced-camera-card-menu-icon', + icon: 'iris', alignment: 'matching', permanent: true, }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:sheep', priority: 100, alignment: 'matching', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', priority: 99, alignment: 'matching', @@ -207,25 +209,25 @@ describe('MenuController', () => { controller.setExpanded(false); controller.setButtons([ { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', priority: 100, alignment: 'matching', }, { - type: 'custom:frigate-card-menu-icon', - icon: 'frigate', + type: 'custom:advanced-camera-card-menu-icon', + icon: 'iris', alignment: 'matching', permanent: true, }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:sheep', priority: 100, alignment: 'matching', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', alignment: 'matching', priority: 100, @@ -235,15 +237,15 @@ describe('MenuController', () => { expect(controller.getButtons('matching')).toEqual([ { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', alignment: 'matching', priority: 100, permanent: true, }, { - type: 'custom:frigate-card-menu-icon', - icon: 'frigate', + type: 'custom:advanced-camera-card-menu-icon', + icon: 'iris', alignment: 'matching', permanent: true, }, @@ -256,29 +258,29 @@ describe('MenuController', () => { const controller = new MenuController(createLitElement()); controller.setButtons([ { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', alignment: 'opposing', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:sheep', alignment: 'matching', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', }, ]); expect(controller.getButtons('matching')).toEqual([ { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:sheep', alignment: 'matching', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', }, ]); @@ -288,16 +290,16 @@ describe('MenuController', () => { const controller = new MenuController(createLitElement()); controller.setButtons([ { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:sheep', enabled: false, }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:goat', enabled: true, }, @@ -305,11 +307,11 @@ describe('MenuController', () => { expect(controller.getButtons('matching')).toEqual([ { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:cow', }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:goat', enabled: true, }, @@ -326,20 +328,20 @@ describe('MenuController', () => { controller.setButtons([ { - type: 'custom:frigate-card-menu-icon', - icon: 'frigate', + type: 'custom:advanced-camera-card-menu-icon', + icon: 'iris', permanent: true, }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:sheep', }, ]); expect(controller.getButtons('matching')).toEqual([ { - type: 'custom:frigate-card-menu-icon', - icon: 'frigate', + type: 'custom:advanced-camera-card-menu-icon', + icon: 'iris', permanent: true, }, ]); @@ -348,12 +350,12 @@ describe('MenuController', () => { expect(controller.getButtons('matching')).toEqual([ { - type: 'custom:frigate-card-menu-icon', - icon: 'frigate', + type: 'custom:advanced-camera-card-menu-icon', + icon: 'iris', permanent: true, }, { - type: 'custom:frigate-card-menu-icon', + type: 'custom:advanced-camera-card-menu-icon', icon: 'mdi:sheep', }, ]); @@ -370,7 +372,7 @@ describe('MenuController', () => { it('should execute simple action in non-hidden menu', () => { const host = createLitElement(); const handler = vi.fn(); - host.addEventListener('frigate-card:action:execution-request', handler); + host.addEventListener('advanced-camera-card:action:execution-request', handler); const controller = new MenuController(host); @@ -386,7 +388,7 @@ describe('MenuController', () => { it('should execute simple action in with config in event', () => { const host = createLitElement(); const handler = vi.fn(); - host.addEventListener('frigate-card:action:execution-request', handler); + host.addEventListener('advanced-camera-card:action:execution-request', handler); const controller = new MenuController(host); @@ -401,7 +403,7 @@ describe('MenuController', () => { it('should execute simple array of actions in non-hidden menu', () => { const host = createLitElement(); const handler = vi.fn(); - host.addEventListener('frigate-card:action:execution-request', handler); + host.addEventListener('advanced-camera-card:action:execution-request', handler); const controller = new MenuController(host); diff --git a/tests/components-lib/message/dispatch.test.ts b/tests/components-lib/message/dispatch.test.ts index c81e4299..c6959f19 100644 --- a/tests/components-lib/message/dispatch.test.ts +++ b/tests/components-lib/message/dispatch.test.ts @@ -1,14 +1,14 @@ import { expect, it, vi } from 'vitest'; -import { dispatchFrigateCardErrorEvent } from '../../../src/components-lib/message/dispatch'; -import { FrigateCardError } from '../../../src/types'; +import { dispatchAdvancedCameraCardErrorEvent } from '../../../src/components-lib/message/dispatch'; +import { AdvancedCameraCardError } from '../../../src/types'; // @vitest-environment jsdom it('should ignore non-error', () => { const element = document.createElement('div'); const handler = vi.fn(); - element.addEventListener('frigate-card:message', handler); + element.addEventListener('advanced-camera-card:message', handler); - dispatchFrigateCardErrorEvent(element, 'NOT_FRIGATE_EVENT'); + dispatchAdvancedCameraCardErrorEvent(element, 'NOT_ADVANCED_CAMERA_CARD_EVENT'); expect(handler).not.toBeCalled(); }); @@ -16,9 +16,9 @@ it('should ignore non-error', () => { it('should dispatch error', () => { const element = document.createElement('div'); const handler = vi.fn(); - element.addEventListener('frigate-card:message', handler); + element.addEventListener('advanced-camera-card:message', handler); - dispatchFrigateCardErrorEvent(element, new Error('ERROR')); + dispatchAdvancedCameraCardErrorEvent(element, new Error('ERROR')); expect(handler).toBeCalledWith( expect.objectContaining({ @@ -32,9 +32,12 @@ it('should dispatch error', () => { it('should dispatch error with context', () => { const element = document.createElement('div'); const handler = vi.fn(); - element.addEventListener('frigate-card:message', handler); + element.addEventListener('advanced-camera-card:message', handler); - dispatchFrigateCardErrorEvent(element, new FrigateCardError('ERROR', 'CONTEXT')); + dispatchAdvancedCameraCardErrorEvent( + element, + new AdvancedCameraCardError('ERROR', 'CONTEXT'), + ); expect(handler).toBeCalledWith( expect.objectContaining({ diff --git a/tests/components-lib/ptz/ptz-controller.test.ts b/tests/components-lib/ptz/ptz-controller.test.ts index 5d5f9519..341ca2f4 100644 --- a/tests/components-lib/ptz/ptz-controller.test.ts +++ b/tests/components-lib/ptz/ptz-controller.test.ts @@ -172,13 +172,13 @@ describe('PTZController', () => { expect(controller.getPTZActions()?.[actionName]).toEqual({ start_tap_action: { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', ptz_action: actionName, ptz_phase: 'start', }, end_tap_action: { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', ptz_action: actionName, ptz_phase: 'stop', }, @@ -211,7 +211,7 @@ describe('PTZController', () => { expect(controller.getPTZActions()['home']).toEqual({ tap_action: { action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', }, }); }); @@ -229,7 +229,7 @@ describe('PTZController', () => { const element = document.createElement('div'); const handler = vi.fn(); - element.addEventListener('frigate-card:action:execution-request', handler); + element.addEventListener('advanced-camera-card:action:execution-request', handler); const controller = new PTZController(element); controller.setCamera(); @@ -251,7 +251,7 @@ describe('PTZController', () => { it('should not call action without actions config', () => { const element = document.createElement('div'); const handler = vi.fn(); - element.addEventListener('frigate-card:action:execution-request', handler); + element.addEventListener('advanced-camera-card:action:execution-request', handler); const controller = new PTZController(element); controller.setCamera(); @@ -265,7 +265,7 @@ describe('PTZController', () => { it('should not call action without hass', () => { const element = document.createElement('div'); const handler = vi.fn(); - element.addEventListener('frigate-card:action:execution-request', handler); + element.addEventListener('advanced-camera-card:action:execution-request', handler); const controller = new PTZController(element); controller.setCamera(); diff --git a/tests/components-lib/status-bar-controller.test.ts b/tests/components-lib/status-bar-controller.test.ts index c547219d..198ab32c 100644 --- a/tests/components-lib/status-bar-controller.test.ts +++ b/tests/components-lib/status-bar-controller.test.ts @@ -22,9 +22,9 @@ describe('StatusBarController', () => { controller.setConfig(config); expect(controller.getConfig()).toEqual(config); - expect(host.style.getPropertyValue('--frigate-card-status-bar-height')).toBe( - '50px', - ); + expect( + host.style.getPropertyValue('--advanced-camera-card-status-bar-height'), + ).toBe('50px'); expect(host.getAttribute('data-style')).toBe('hover'); expect(host.getAttribute('data-position')).toBe('top'); expect(host.requestUpdate).toHaveBeenCalled(); @@ -79,7 +79,7 @@ describe('StatusBarController', () => { const controller = new StatusBarController(host); const items = [ { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Test', }, ]; @@ -92,22 +92,22 @@ describe('StatusBarController', () => { const host = createLitElement(); const controller = new StatusBarController(host); const item1 = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 1', priority: 40, }; const item2 = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 2', priority: 10, }; const item3 = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 3', priority: 60, }; const item4 = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 4', priority: undefined, }; @@ -120,12 +120,12 @@ describe('StatusBarController', () => { const host = createLitElement(); const controller = new StatusBarController(host); const item1 = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 1', priority: 100, }; const exclusiveItem = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 2', priority: 1, exclusive: true, @@ -140,12 +140,12 @@ describe('StatusBarController', () => { const host = createLitElement(); const controller = new StatusBarController(host); const insufficientItem = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 1', sufficient: false, }; const sufficientItem = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 2', sufficient: true, }; @@ -159,12 +159,12 @@ describe('StatusBarController', () => { const host = createLitElement(); const controller = new StatusBarController(host); const insufficientItem = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 1', sufficient: false, }; const sufficientItem = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 2', sufficient: false, }; @@ -188,7 +188,7 @@ describe('StatusBarController', () => { ); const sufficientItem = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 1', priority: 100, sufficient: true, @@ -210,7 +210,7 @@ describe('StatusBarController', () => { ); const insufficientItem = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 1', priority: 100, sufficient: false, @@ -231,19 +231,19 @@ describe('StatusBarController', () => { ); const sufficientString = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'String', priority: 100, sufficient: true, }; const sufficientIcon = { - type: 'custom:frigate-card-status-bar-icon', + type: 'custom:advanced-camera-card-status-bar-icon', icon: 'Icon', priority: 100, sufficient: true, }; const sufficientImage = { - type: 'custom:frigate-card-status-bar-image', + type: 'custom:advanced-camera-card-status-bar-image', image: 'Image', priority: 100, sufficient: true, @@ -275,7 +275,7 @@ describe('StatusBarController', () => { ); const sufficientItem = { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item 1', priority: 100, sufficient: true, @@ -297,7 +297,7 @@ describe('StatusBarController', () => { it('should bail without action', () => { const host = createLitElement(); const handler = vi.fn(); - host.addEventListener('frigate-card:action:execution-request', handler); + host.addEventListener('advanced-camera-card:action:execution-request', handler); const controller = new StatusBarController(host); controller.actionHandler(createInteractionEvent('tap')); @@ -307,7 +307,7 @@ describe('StatusBarController', () => { it('should request action execution', () => { const host = createLitElement(); const handler = vi.fn(); - host.addEventListener('frigate-card:action:execution-request', handler); + host.addEventListener('advanced-camera-card:action:execution-request', handler); const controller = new StatusBarController(host); diff --git a/tests/components-lib/zoom/zoom-controller.test.ts b/tests/components-lib/zoom/zoom-controller.test.ts index ed4a3689..1ff1c8f3 100644 --- a/tests/components-lib/zoom/zoom-controller.test.ts +++ b/tests/components-lib/zoom/zoom-controller.test.ts @@ -231,8 +231,8 @@ describe('ZoomController', () => { const element = document.createElement('div'); const zoomedFunc = vi.fn(); const unzoomedFunc = vi.fn(); - element.addEventListener('frigate-card:zoom:zoomed', zoomedFunc); - element.addEventListener('frigate-card:zoom:unzoomed', unzoomedFunc); + element.addEventListener('advanced-camera-card:zoom:zoomed', zoomedFunc); + element.addEventListener('advanced-camera-card:zoom:unzoomed', unzoomedFunc); vi.mocked(Panzoom).mockReturnValueOnce(createMockPanZoom()); createAndRegisterZoom(element); @@ -267,8 +267,8 @@ describe('ZoomController', () => { const element = document.createElement('div'); const zoomedFunc = vi.fn(); const unzoomedFunc = vi.fn(); - element.addEventListener('frigate-card:zoom:zoomed', zoomedFunc); - element.addEventListener('frigate-card:zoom:unzoomed', unzoomedFunc); + element.addEventListener('advanced-camera-card:zoom:zoomed', zoomedFunc); + element.addEventListener('advanced-camera-card:zoom:unzoomed', unzoomedFunc); vi.mocked(Panzoom).mockReturnValueOnce(createMockPanZoom()); createAndRegisterZoom(element); @@ -312,7 +312,7 @@ describe('ZoomController', () => { setElementToDefaultCardSize(element); const changeFunc = vi.fn(); - element.addEventListener('frigate-card:zoom:change', changeFunc); + element.addEventListener('advanced-camera-card:zoom:change', changeFunc); vi.mocked(Panzoom).mockReturnValueOnce(createMockPanZoom()); createAndRegisterZoom(element); @@ -357,7 +357,7 @@ describe('ZoomController', () => { setElementToDefaultCardSize(element); const changeFunc = vi.fn(); - element.addEventListener('frigate-card:zoom:change', changeFunc); + element.addEventListener('advanced-camera-card:zoom:change', changeFunc); vi.mocked(Panzoom).mockReturnValueOnce(createMockPanZoom()); const controller = createAndRegisterZoom(element); @@ -403,7 +403,7 @@ describe('ZoomController', () => { setElementToDefaultCardSize(element); const changeFunc = vi.fn(); - element.addEventListener('frigate-card:zoom:change', changeFunc); + element.addEventListener('advanced-camera-card:zoom:change', changeFunc); vi.mocked(Panzoom).mockReturnValueOnce(createMockPanZoom()); const controller = createAndRegisterZoom(element); diff --git a/tests/components-lib/zoom/zoom-view-context.test.ts b/tests/components-lib/zoom/zoom-view-context.test.ts index cf2320ba..7bd630fb 100644 --- a/tests/components-lib/zoom/zoom-view-context.test.ts +++ b/tests/components-lib/zoom/zoom-view-context.test.ts @@ -61,7 +61,7 @@ it('handleZoomSettingsObservedEvent', () => { const viewManager = mock(); handleZoomSettingsObservedEvent( - new CustomEvent('frigate-card:zoom:change', { + new CustomEvent('advanced-camera-card:zoom:change', { detail: { pan: { x: 1, y: 2 }, zoom: 3, diff --git a/tests/config/management.test.ts b/tests/config/management.test.ts index 91976993..9d202374 100644 --- a/tests/config/management.test.ts +++ b/tests/config/management.test.ts @@ -24,8 +24,8 @@ import { import { PTZControlAction } from '../../src/config/ptz'; import { Actions, - RawFrigateCardConfig, - frigateCardConfigSchema, + RawAdvancedCameraCardConfig, + advancedCameraCardConfigSchema, } from '../../src/config/types'; import { getParseErrorPaths } from '../../src/utils/zod'; @@ -100,7 +100,7 @@ describe('upgrade functions', () => { expect( // Upgrade example: rename of service_data to data. isConfigUpgradeable({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -271,7 +271,10 @@ describe('upgrade functions', () => { c: 10, overrides: [ { - overrides: { + merge: { + c: 10, + }, + set: { c: 10, }, }, @@ -279,7 +282,7 @@ describe('upgrade functions', () => { }; expect(upgradeMoveToWithOverrides('c', 'd')(config)).toBeTruthy(); - expect(config).toEqual({ d: 10, overrides: [{ overrides: { d: 10 } }] }); + expect(config).toEqual({ d: 10, overrides: [{ merge: { d: 10 }, set: { d: 10 } }] }); }); it('should upgrade config and overrides in-place', () => { @@ -287,7 +290,7 @@ describe('upgrade functions', () => { c: 10, overrides: [ { - overrides: { + merge: { c: 10, }, }, @@ -295,7 +298,7 @@ describe('upgrade functions', () => { }; expect(upgradeWithOverrides('c', (val) => String(val))(config)).toBeTruthy(); - expect(config).toEqual({ c: '10', overrides: [{ overrides: { c: '10' } }] }); + expect(config).toEqual({ c: '10', overrides: [{ merge: { c: '10' } }] }); }); describe('should upgrade array', () => { @@ -341,6 +344,21 @@ describe('upgrade functions', () => { expect(upgradeObjectRecursively((_val) => false)(config)).toBeFalsy(); expect(config).toEqual({ c: 10, d: 10 }); }); + + it('getting sub-objects', () => { + const config = { c: 10, target_obj: { target_val: 10 } }; + expect( + upgradeObjectRecursively( + (val: RawAdvancedCameraCardConfig) => { + (val['target_val'] as number)++; + return true; + }, + (obj) => obj['target_obj'] as RawAdvancedCameraCardConfig, + )(config), + ).toBeTruthy(); + expect(config).toEqual({ c: 10, target_obj: { target_val: 11 } }); + }); + it('iterating into arrays', () => { const config = { values: [{ c: 10 }, { d: 10 }, 'random'] }; expect( @@ -360,7 +378,7 @@ describe('upgrade functions', () => { }); it('should have upgrades with bad input data', () => { - expect(upgradeConfig(3 as unknown as RawFrigateCardConfig)).toBeFalsy(); + expect(upgradeConfig(3 as unknown as RawAdvancedCameraCardConfig)).toBeFalsy(); }); it('should delete properties', () => { @@ -371,12 +389,12 @@ describe('upgrade functions', () => { }); describe('should handle version specific upgrades', () => { - const postUpgradeChecks = (config: RawFrigateCardConfig): void => { + const postUpgradeChecks = (config: RawAdvancedCameraCardConfig): void => { // Should be no additional upgrades. expect(upgradeConfig(config)).toBeFalsy(); // Result should be parseable. - const result = frigateCardConfigSchema.safeParse(config); + const result = advancedCameraCardConfigSchema.safeParse(config); if (!result.success) { expect( result.success, @@ -389,312 +407,11 @@ describe('should handle version specific upgrades', () => { } }; - describe('v4.1.0', () => { - describe('should rename mediaLoaded to media_loaded', () => { - it('elements', () => { - const config = { - type: 'custom:frigate-card', - cameras: [{ camera_entity: 'camera.office' }], - elements: [ - { - type: 'custom:random', - conditions: { - mediaLoaded: true, - }, - }, - { - type: 'custom:random2', - conditions: 'not an object', - }, - ], - }; - expect(upgradeConfig(config)).toBeTruthy(); - expect(config).toEqual({ - type: 'custom:frigate-card', - cameras: [{ camera_entity: 'camera.office' }], - elements: [ - { - type: 'custom:random', - conditions: [ - { - condition: 'media_loaded' as const, - media_loaded: true, - }, - ], - }, - { - type: 'custom:random2', - conditions: 'not an object', - }, - ], - }); - postUpgradeChecks(config); - }); - - it('overrides', () => { - const config = { - type: 'custom:frigate-card', - cameras: [{ camera_entity: 'camera.office' }], - overrides: [ - { - conditions: { - mediaLoaded: true, - }, - overrides: { - view: { - default: 'clips', - }, - }, - }, - ], - }; - expect(upgradeConfig(config)).toBeTruthy(); - expect(config).toEqual({ - type: 'custom:frigate-card', - cameras: [{ camera_entity: 'camera.office' }], - overrides: [ - { - conditions: [ - { - condition: 'media_loaded' as const, - media_loaded: true, - }, - ], - merge: { - view: { - default: 'clips', - }, - }, - }, - ], - }); - postUpgradeChecks(config); - }); - }); - - it('should rename event_gallery to media_gallery', () => { - const config = { - type: 'custom:frigate-card', - cameras: [{ camera_entity: 'camera.office' }], - event_gallery: { - foo: 'bar', - }, - }; - expect(upgradeConfig(config)).toBeTruthy(); - expect(config).toEqual({ - type: 'custom:frigate-card', - cameras: [{ camera_entity: 'camera.office' }], - media_gallery: { - foo: 'bar', - }, - }); - postUpgradeChecks(config); - }); - - it('should rename menu.buttons.frigate_ui to menu.buttons.camera_ui', () => { - const config = { - type: 'custom:frigate-card', - cameras: [{ camera_entity: 'camera.office' }], - menu: { - buttons: { - frigate_ui: { - foo: 'bar', - }, - }, - }, - overrides: [ - { - conditions: [ - { - condition: 'view', - views: ['clips'], - }, - ], - overrides: { - menu: { - buttons: { - frigate_ui: { - foo: 'bar', - }, - }, - }, - }, - }, - ], - }; - expect(upgradeConfig(config)).toBeTruthy(); - expect(config).toEqual({ - type: 'custom:frigate-card', - cameras: [{ camera_entity: 'camera.office' }], - menu: { - buttons: { - camera_ui: { - foo: 'bar', - }, - }, - }, - overrides: [ - { - conditions: [ - { - condition: 'view', - views: ['clips'], - }, - ], - merge: { - menu: { - buttons: { - camera_ui: { - foo: 'bar', - }, - }, - }, - }, - }, - ], - }); - postUpgradeChecks(config); - }); - - it('should rename frigate ui actions', () => { - const config = { - type: 'custom:frigate-card', - cameras: [{ camera_entity: 'camera.office' }], - elements: [ - { - type: 'icon', - icon: 'mdi:cow', - tap_action: { - action: 'custom:frigate-card-action', - frigate_card_action: 'frigate_ui', - }, - }, - ], - view: { - actions: { - double_tap_action: { - action: 'custom:frigate-card-action', - frigate_card_action: 'frigate_ui', - }, - }, - }, - }; - expect(upgradeConfig(config)).toBeTruthy(); - expect(config).toEqual({ - type: 'custom:frigate-card', - cameras: [{ camera_entity: 'camera.office' }], - elements: [ - { - type: 'icon', - icon: 'mdi:cow', - tap_action: { - action: 'custom:frigate-card-action', - frigate_card_action: 'camera_ui', - }, - }, - ], - view: { - actions: { - double_tap_action: { - action: 'custom:frigate-card-action', - frigate_card_action: 'camera_ui', - }, - }, - }, - }); - postUpgradeChecks(config); - }); - - describe('should rename frigate-jsmpeg provider to jsmpeg', () => { - it('in cameras', () => { - const config = { - type: 'custom:frigate-card', - cameras: [{ live_provider: 'ha' }, { live_provider: 'frigate-jsmpeg' }], - }; - expect(upgradeConfig(config)).toBeTruthy(); - expect(config).toEqual({ - type: 'custom:frigate-card', - cameras: [{ live_provider: 'ha' }, { live_provider: 'jsmpeg' }], - }); - postUpgradeChecks(config); - }); - }); - - describe('should move live object into cameras_global', () => { - it.each([['image' as const], ['jsmpeg' as const], ['webrtc_card' as const]])( - '%s', - (objName: string) => { - const config = { - type: 'custom:frigate-card', - cameras: [{}], - live: { - [objName]: { - foo: 'bar', - }, - }, - }; - expect(upgradeConfig(config)).toBeTruthy(); - expect(config).toEqual({ - type: 'custom:frigate-card', - cameras: [{}], - cameras_global: { - [objName]: { - foo: 'bar', - }, - }, - live: {}, - }); - postUpgradeChecks(config); - }, - ); - }); - - describe('should convert to array and rename', () => { - it.each([['zone' as const], ['label' as const]])(`%s`, (objName: string) => { - const config = { - type: 'custom:frigate-card', - cameras: [ - { live_provider: 'ha', frigate: { [objName]: 'foo' } }, - { live_provider: 'jsmpeg' }, - ], - }; - expect(upgradeConfig(config)).toBeTruthy(); - expect(config).toEqual({ - type: 'custom:frigate-card', - cameras: [ - { live_provider: 'ha', frigate: { [objName + 's']: ['foo'] } }, - { live_provider: 'jsmpeg' }, - ], - }); - postUpgradeChecks(config); - }); - }); - - it('should convert and rename frigate.label to frigate.labels', () => { - const config = { - type: 'custom:frigate-card', - cameras: [ - { live_provider: 'ha', frigate: { zone: 'foo' } }, - { live_provider: 'jsmpeg' }, - ], - }; - expect(upgradeConfig(config)).toBeTruthy(); - expect(config).toEqual({ - type: 'custom:frigate-card', - cameras: [ - { live_provider: 'ha', frigate: { zones: ['foo'] } }, - { live_provider: 'jsmpeg' }, - ], - }); - postUpgradeChecks(config); - }); - }); - describe('v5.2.0 -> v6.0.0', () => { describe('should rename service_data to data', () => { it('positive case', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -743,7 +460,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -796,7 +513,7 @@ describe('should handle version specific upgrades', () => { }); it('negative case', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], view: { default: 'live', @@ -804,7 +521,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeFalsy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], view: { default: 'live', @@ -817,11 +534,11 @@ describe('should handle version specific upgrades', () => { describe('should move PTZ elements to live', () => { it('case with 1 element', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { - type: 'custom:frigate-card-ptz', + type: 'custom:advanced-camera-card-ptz', orientation: 'vertical', style: { right: '20px', @@ -866,18 +583,18 @@ describe('should handle version specific upgrades', () => { }, }, }, - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', }); postUpgradeChecks(config); }); it('case with >1 element', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { - type: 'custom:frigate-card-ptz', + type: 'custom:advanced-camera-card-ptz', orientation: 'vertical', style: { right: '20px', @@ -940,25 +657,25 @@ describe('should handle version specific upgrades', () => { }, }, }, - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', }); postUpgradeChecks(config); }); it('case with custom conditional element with 2 PTZ but nothing else', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { - type: 'custom:frigate-card-conditional', + type: 'custom:advanced-camera-card-conditional', conditions: { fullscreen: true, media_loaded: true, }, elements: [ { - type: 'custom:frigate-card-ptz', + type: 'custom:advanced-camera-card-ptz', orientation: 'vertical', style: { right: '20px', @@ -976,7 +693,7 @@ describe('should handle version specific upgrades', () => { }, }, { - type: 'custom:frigate-card-ptz', + type: 'custom:advanced-camera-card-ptz', orientation: 'vertical', style: { right: '20px', @@ -1023,18 +740,18 @@ describe('should handle version specific upgrades', () => { }, }, }, - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', }); postUpgradeChecks(config); }); it('case with custom conditional element with 1 PTZ and another element', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { - type: 'custom:frigate-card-conditional', + type: 'custom:advanced-camera-card-conditional', conditions: { fullscreen: true, media_loaded: true, @@ -1049,7 +766,7 @@ describe('should handle version specific upgrades', () => { }, }, { - type: 'custom:frigate-card-ptz', + type: 'custom:advanced-camera-card-ptz', orientation: 'vertical', style: { right: '20px', @@ -1098,7 +815,7 @@ describe('should handle version specific upgrades', () => { }, elements: [ { - type: 'custom:frigate-card-conditional', + type: 'custom:advanced-camera-card-conditional', conditions: [ { condition: 'fullscreen' as const, @@ -1121,14 +838,14 @@ describe('should handle version specific upgrades', () => { ], }, ], - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', }); postUpgradeChecks(config); }); it('case with stock conditional element with 1 PTZ', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -1136,7 +853,7 @@ describe('should handle version specific upgrades', () => { conditions: [{ entity: 'light.office', state: 'on' }], elements: [ { - type: 'custom:frigate-card-ptz', + type: 'custom:advanced-camera-card-ptz', orientation: 'vertical', style: { right: '20px', @@ -1183,14 +900,14 @@ describe('should handle version specific upgrades', () => { }, }, }, - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', }); postUpgradeChecks(config); }); it('case when live.controls.ptz already exists', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], live: { controls: { @@ -1215,7 +932,7 @@ describe('should handle version specific upgrades', () => { }, elements: [ { - type: 'custom:frigate-card-ptz', + type: 'custom:advanced-camera-card-ptz', orientation: 'vertical', style: { right: '20px', @@ -1260,7 +977,7 @@ describe('should handle version specific upgrades', () => { }, }, }, - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', }); postUpgradeChecks(config); }); @@ -1268,7 +985,7 @@ describe('should handle version specific upgrades', () => { it('should move view.timeout_seconds', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], view: { timeout_seconds: 200, @@ -1276,7 +993,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], view: { interaction_seconds: 200, @@ -1290,7 +1007,7 @@ describe('should handle version specific upgrades', () => { describe('lazy_unload', () => { it('all', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { lazy_unload: 'all', @@ -1298,7 +1015,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { lazy_unload: ['unselected', 'hidden'], @@ -1308,7 +1025,7 @@ describe('should handle version specific upgrades', () => { }); it('never', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { lazy_unload: 'never', @@ -1316,7 +1033,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: {}, }); @@ -1324,7 +1041,7 @@ describe('should handle version specific upgrades', () => { }); it('other value', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { lazy_unload: 'unselected', @@ -1332,7 +1049,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { lazy_unload: ['unselected'], @@ -1345,7 +1062,7 @@ describe('should handle version specific upgrades', () => { describe('auto_play', () => { it('all', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_play: 'all', @@ -1353,7 +1070,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: {}, }); @@ -1361,7 +1078,7 @@ describe('should handle version specific upgrades', () => { }); it('never', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_play: 'never', @@ -1369,7 +1086,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_play: [], @@ -1379,7 +1096,7 @@ describe('should handle version specific upgrades', () => { }); it('other value', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_play: 'selected', @@ -1387,7 +1104,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_play: ['selected'], @@ -1399,7 +1116,7 @@ describe('should handle version specific upgrades', () => { describe('auto_pause', () => { it('all', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_pause: 'all', @@ -1407,7 +1124,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_pause: ['unselected', 'hidden'], @@ -1417,7 +1134,7 @@ describe('should handle version specific upgrades', () => { }); it('never', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_pause: 'never', @@ -1425,7 +1142,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: {}, }); @@ -1433,7 +1150,7 @@ describe('should handle version specific upgrades', () => { }); it('other value', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_pause: 'unselected', @@ -1441,7 +1158,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_pause: ['unselected'], @@ -1453,7 +1170,7 @@ describe('should handle version specific upgrades', () => { describe('auto_mute', () => { it('all', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_mute: 'all', @@ -1461,7 +1178,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: {}, }); @@ -1469,7 +1186,7 @@ describe('should handle version specific upgrades', () => { }); it('never', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_mute: 'never', @@ -1477,7 +1194,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_mute: [], @@ -1487,7 +1204,7 @@ describe('should handle version specific upgrades', () => { }); it('other value', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_mute: 'unselected', @@ -1495,7 +1212,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_mute: ['unselected'], @@ -1507,7 +1224,7 @@ describe('should handle version specific upgrades', () => { describe('auto_unmute', () => { it('all', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_unmute: 'all', @@ -1515,7 +1232,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_unmute: ['selected', 'visible', 'microphone'], @@ -1525,7 +1242,7 @@ describe('should handle version specific upgrades', () => { }); it('never', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_unmute: 'never', @@ -1533,7 +1250,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: {}, }); @@ -1541,7 +1258,7 @@ describe('should handle version specific upgrades', () => { }); it('other value', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_unmute: 'selected', @@ -1549,7 +1266,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { auto_unmute: ['selected'], @@ -1564,7 +1281,7 @@ describe('should handle version specific upgrades', () => { describe('auto_play', () => { it('all', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_play: 'all', @@ -1572,7 +1289,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: {}, }); @@ -1580,7 +1297,7 @@ describe('should handle version specific upgrades', () => { }); it('never', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_play: 'never', @@ -1588,7 +1305,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_play: [], @@ -1598,7 +1315,7 @@ describe('should handle version specific upgrades', () => { }); it('other value', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_play: 'selected', @@ -1606,7 +1323,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_play: ['selected'], @@ -1618,7 +1335,7 @@ describe('should handle version specific upgrades', () => { describe('auto_pause', () => { it('all', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_pause: 'all', @@ -1626,7 +1343,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: {}, }); @@ -1634,7 +1351,7 @@ describe('should handle version specific upgrades', () => { }); it('never', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_pause: 'never', @@ -1642,7 +1359,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_pause: [], @@ -1652,7 +1369,7 @@ describe('should handle version specific upgrades', () => { }); it('other value', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_pause: 'unselected', @@ -1660,7 +1377,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_pause: ['unselected'], @@ -1672,7 +1389,7 @@ describe('should handle version specific upgrades', () => { describe('auto_mute', () => { it('all', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_mute: 'all', @@ -1680,7 +1397,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: {}, }); @@ -1688,7 +1405,7 @@ describe('should handle version specific upgrades', () => { }); it('never', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_mute: 'never', @@ -1696,7 +1413,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_mute: [], @@ -1706,7 +1423,7 @@ describe('should handle version specific upgrades', () => { }); it('other value', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_mute: 'unselected', @@ -1714,7 +1431,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_mute: ['unselected'], @@ -1726,7 +1443,7 @@ describe('should handle version specific upgrades', () => { describe('auto_unmute', () => { it('all', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_unmute: 'all', @@ -1734,7 +1451,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_unmute: ['selected', 'visible'], @@ -1744,7 +1461,7 @@ describe('should handle version specific upgrades', () => { }); it('never', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_unmute: 'never', @@ -1752,7 +1469,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: {}, }); @@ -1760,7 +1477,7 @@ describe('should handle version specific upgrades', () => { }); it('other value', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_unmute: 'selected', @@ -1768,7 +1485,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { auto_unmute: ['selected'], @@ -1785,7 +1502,7 @@ describe('should handle version specific upgrades', () => { '%s', (mediaEventType: string) => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -1797,7 +1514,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -1817,7 +1534,7 @@ describe('should handle version specific upgrades', () => { '%s', (mediaEventType: string) => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], timeline: { media: mediaEventType, @@ -1825,7 +1542,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], timeline: { events_media_type: mediaEventType, @@ -1841,7 +1558,7 @@ describe('should handle version specific upgrades', () => { '%s', (mediaEventType: string) => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -1853,7 +1570,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -1873,7 +1590,7 @@ describe('should handle version specific upgrades', () => { '%s', (mediaEventType: string) => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { controls: { @@ -1885,7 +1602,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], media_viewer: { controls: { @@ -1904,7 +1621,7 @@ describe('should handle version specific upgrades', () => { describe('should move and transform untrigger_reset', () => { it('when true', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], view: { scan: { @@ -1914,7 +1631,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], view: { triggers: { @@ -1929,7 +1646,7 @@ describe('should handle version specific upgrades', () => { it('when false', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], view: { scan: { @@ -1939,7 +1656,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], view: { triggers: {}, @@ -1952,7 +1669,7 @@ describe('should handle version specific upgrades', () => { describe('should rename view.scan.enabled to a trigger action', () => { it('when true', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], view: { scan: { @@ -1962,7 +1679,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], view: { triggers: { @@ -1978,7 +1695,7 @@ describe('should handle version specific upgrades', () => { it('when false', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], view: { scan: { @@ -1988,7 +1705,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], view: { triggers: {}, @@ -2002,7 +1719,7 @@ describe('should handle version specific upgrades', () => { describe('should handle media layout changes', () => { it('from live.layout to camera_global.dimensions', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { layout: { @@ -2016,7 +1733,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: {}, cameras_global: { @@ -2039,7 +1756,7 @@ describe('should handle version specific upgrades', () => { '%s', (section: string) => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], [section]: { layout: { @@ -2053,7 +1770,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], [section]: {}, }); @@ -2067,7 +1784,7 @@ describe('should handle version specific upgrades', () => { describe('with view condition', () => { it('elements', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -2084,7 +1801,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -2107,7 +1824,7 @@ describe('should handle version specific upgrades', () => { it('overrides', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], overrides: [ { @@ -2125,7 +1842,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], overrides: [ { @@ -2148,7 +1865,7 @@ describe('should handle version specific upgrades', () => { it('automations', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], automations: [ { @@ -2157,8 +1874,8 @@ describe('should handle version specific upgrades', () => { }, actions: [ { - action: 'custom:frigate-card-action' as const, - frigate_card_action: 'live_substream_on' as const, + action: 'custom:advanced-camera-card-action' as const, + advanced_camera_card_action: 'live_substream_on' as const, }, ], }, @@ -2167,7 +1884,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], automations: [ { @@ -2179,8 +1896,8 @@ describe('should handle version specific upgrades', () => { ], actions: [ { - action: 'custom:frigate-card-action' as const, - frigate_card_action: 'live_substream_on' as const, + action: 'custom:advanced-camera-card-action' as const, + advanced_camera_card_action: 'live_substream_on' as const, }, ], }, @@ -2193,7 +1910,7 @@ describe('should handle version specific upgrades', () => { describe('with camera condition', () => { it('elements', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -2210,7 +1927,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -2233,7 +1950,7 @@ describe('should handle version specific upgrades', () => { it('overrides', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], overrides: [ { @@ -2251,7 +1968,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], overrides: [ { @@ -2274,7 +1991,7 @@ describe('should handle version specific upgrades', () => { it('automations', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], automations: [ { @@ -2283,8 +2000,8 @@ describe('should handle version specific upgrades', () => { }, actions: [ { - action: 'custom:frigate-card-action' as const, - frigate_card_action: 'live_substream_on' as const, + action: 'custom:advanced-camera-card-action' as const, + advanced_camera_card_action: 'live_substream_on' as const, }, ], }, @@ -2293,7 +2010,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], automations: [ { @@ -2305,8 +2022,8 @@ describe('should handle version specific upgrades', () => { ], actions: [ { - action: 'custom:frigate-card-action' as const, - frigate_card_action: 'live_substream_on' as const, + action: 'custom:advanced-camera-card-action' as const, + advanced_camera_card_action: 'live_substream_on' as const, }, ], }, @@ -2324,7 +2041,7 @@ describe('should handle version specific upgrades', () => { ])('%s', (condition: string) => { it('elements', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -2341,7 +2058,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -2364,7 +2081,7 @@ describe('should handle version specific upgrades', () => { it('overrides', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], overrides: [ { @@ -2382,7 +2099,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], overrides: [ { @@ -2405,7 +2122,7 @@ describe('should handle version specific upgrades', () => { it('automations', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], automations: [ { @@ -2414,8 +2131,8 @@ describe('should handle version specific upgrades', () => { }, actions: [ { - action: 'custom:frigate-card-action' as const, - frigate_card_action: 'live_substream_on' as const, + action: 'custom:advanced-camera-card-action' as const, + advanced_camera_card_action: 'live_substream_on' as const, }, ], }, @@ -2424,7 +2141,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], automations: [ { @@ -2436,8 +2153,8 @@ describe('should handle version specific upgrades', () => { ], actions: [ { - action: 'custom:frigate-card-action' as const, - frigate_card_action: 'live_substream_on' as const, + action: 'custom:advanced-camera-card-action' as const, + advanced_camera_card_action: 'live_substream_on' as const, }, ], }, @@ -2451,7 +2168,7 @@ describe('should handle version specific upgrades', () => { describe('with state condition', () => { it('elements', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -2478,7 +2195,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -2507,7 +2224,7 @@ describe('should handle version specific upgrades', () => { it('overrides', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], overrides: [ { @@ -2535,7 +2252,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], overrides: [ { @@ -2564,7 +2281,7 @@ describe('should handle version specific upgrades', () => { it('automations', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], automations: [ { @@ -2583,8 +2300,8 @@ describe('should handle version specific upgrades', () => { }, actions: [ { - action: 'custom:frigate-card-action' as const, - frigate_card_action: 'live_substream_on' as const, + action: 'custom:advanced-camera-card-action' as const, + advanced_camera_card_action: 'live_substream_on' as const, }, ], }, @@ -2593,7 +2310,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], automations: [ { @@ -2611,8 +2328,8 @@ describe('should handle version specific upgrades', () => { ], actions: [ { - action: 'custom:frigate-card-action' as const, - frigate_card_action: 'live_substream_on' as const, + action: 'custom:advanced-camera-card-action' as const, + advanced_camera_card_action: 'live_substream_on' as const, }, ], }, @@ -2625,7 +2342,7 @@ describe('should handle version specific upgrades', () => { describe('with media query condition', () => { it('elements', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -2642,7 +2359,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -2665,7 +2382,7 @@ describe('should handle version specific upgrades', () => { it('overrides', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], overrides: [ { @@ -2683,7 +2400,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], overrides: [ { @@ -2706,7 +2423,7 @@ describe('should handle version specific upgrades', () => { it('automations', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], automations: [ { @@ -2715,8 +2432,8 @@ describe('should handle version specific upgrades', () => { }, actions: [ { - action: 'custom:frigate-card-action' as const, - frigate_card_action: 'live_substream_on' as const, + action: 'custom:advanced-camera-card-action' as const, + advanced_camera_card_action: 'live_substream_on' as const, }, ], }, @@ -2725,7 +2442,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], automations: [ { @@ -2737,8 +2454,8 @@ describe('should handle version specific upgrades', () => { ], actions: [ { - action: 'custom:frigate-card-action' as const, - frigate_card_action: 'live_substream_on' as const, + action: 'custom:advanced-camera-card-action' as const, + advanced_camera_card_action: 'live_substream_on' as const, }, ], }, @@ -2752,7 +2469,7 @@ describe('should handle version specific upgrades', () => { describe('from hide to substream capability disable', () => { it('overrides', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [ { camera_entity: 'camera.office', hide: true }, { camera_entity: 'camera.sitting_room', hide: false }, @@ -2761,7 +2478,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [ { camera_entity: 'camera.office', @@ -2776,7 +2493,7 @@ describe('should handle version specific upgrades', () => { describe('from performance profile to generic profile', () => { it('low performance', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], performance: { profile: 'low', @@ -2785,7 +2502,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], profiles: ['low-performance'], performance: {}, @@ -2795,7 +2512,7 @@ describe('should handle version specific upgrades', () => { it('high performance', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], performance: { profile: 'high', @@ -2804,7 +2521,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], performance: {}, }); @@ -2815,7 +2532,7 @@ describe('should handle version specific upgrades', () => { it('from overrides to merge', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], overrides: [ { @@ -2836,7 +2553,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], overrides: [ { @@ -2880,7 +2597,7 @@ describe('should handle version specific upgrades', () => { it('with action_ format', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -2914,7 +2631,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], cameras_global: { ptz: { @@ -2957,7 +2674,7 @@ describe('should handle version specific upgrades', () => { }); const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -2989,7 +2706,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], cameras_global: { ptz: { @@ -3027,7 +2744,7 @@ describe('should handle version specific upgrades', () => { it('with invalid ptz type', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -3041,7 +2758,7 @@ describe('should handle version specific upgrades', () => { it('with nothing to transform', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -3057,7 +2774,7 @@ describe('should handle version specific upgrades', () => { it('without tap_action', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -3086,7 +2803,7 @@ describe('should handle version specific upgrades', () => { it('without pre-existing presets', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -3120,7 +2837,7 @@ describe('should handle version specific upgrades', () => { it('view.update_cycle_camera -> view.default_cycle_camera', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], view: { update_cycle_camera: true, @@ -3137,7 +2854,7 @@ describe('should handle version specific upgrades', () => { describe('view.update_force -> view.default_reset.interaction_mode', () => { it('should convert to all when true', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], view: { update_force: true, @@ -3155,7 +2872,7 @@ describe('should handle version specific upgrades', () => { it('should remove when false', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], view: { update_force: false, @@ -3170,7 +2887,7 @@ describe('should handle version specific upgrades', () => { it('view.update_seconds', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], view: { update_seconds: 42, @@ -3188,7 +2905,7 @@ describe('should handle version specific upgrades', () => { it('view.update_entities', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], view: { update_entities: ['binary_sensor.foo', 'camera.bar'], @@ -3207,7 +2924,7 @@ describe('should handle version specific upgrades', () => { describe('title controls to status bar', () => { it('when mode is none', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -3227,7 +2944,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: {} }, media_viewer: { controls: {} }, @@ -3244,7 +2961,7 @@ describe('should handle version specific upgrades', () => { '%s', (mode: unknown) => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -3264,7 +2981,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: {} }, media_viewer: { controls: {} }, @@ -3281,7 +2998,7 @@ describe('should handle version specific upgrades', () => { [`popup-${position}-right` as const], ])('%s', (mode: string) => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { @@ -3301,7 +3018,7 @@ describe('should handle version specific upgrades', () => { expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: {} }, media_viewer: { controls: {} }, @@ -3317,7 +3034,7 @@ describe('should handle version specific upgrades', () => { it('rename call-service -> perform-action', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -3343,7 +3060,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], elements: [ { @@ -3372,7 +3089,7 @@ describe('should handle version specific upgrades', () => { it('rename dimensions.max_height -> dimensions.height', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], dimensions: { max_height: '500px', @@ -3380,7 +3097,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], dimensions: { height: '500px', @@ -3391,7 +3108,7 @@ describe('should handle version specific upgrades', () => { it('delete dimensions.min_height', () => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], dimensions: { min_height: '100px', @@ -3399,7 +3116,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], dimensions: {}, }); @@ -3415,7 +3132,7 @@ describe('should handle version specific upgrades', () => { ['off' as const, false], ])('%s', (darkMode: 'on' | 'off' | 'auto', expected: boolean) => { const config = { - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], view: { dark_mode: darkMode, @@ -3423,7 +3140,7 @@ describe('should handle version specific upgrades', () => { }; expect(upgradeConfig(config)).toBeTruthy(); expect(config).toEqual({ - type: 'custom:frigate-card', + type: 'custom:advanced-camera-card', cameras: [{ camera_entity: 'camera.office' }], view: { dim: expected, @@ -3433,4 +3150,445 @@ describe('should handle version specific upgrades', () => { }); }); }); + + describe('v7.0.0+', () => { + it('custom:frigate-card -> custom:advanced-camera-card', () => { + const config = { + type: 'custom:frigate-card', + cameras: [{}], + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{}], + }); + postUpgradeChecks(config); + }); + + it('custom:frigate-card-action -> custom:advanced-camera-card-action', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'icon', + icon: 'mdi:cow', + tap_action: { + action: 'custom:frigate-card-action', + advanced_camera_card_action: 'camera_ui', + }, + }, + ], + view: { + actions: { + double_tap_action: { + action: 'custom:frigate-card-action', + advanced_camera_card_action: 'camera_ui', + }, + }, + }, + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'icon', + icon: 'mdi:cow', + tap_action: { + action: 'custom:advanced-camera-card-action', + advanced_camera_card_action: 'camera_ui', + }, + }, + ], + view: { + actions: { + double_tap_action: { + action: 'custom:advanced-camera-card-action', + advanced_camera_card_action: 'camera_ui', + }, + }, + }, + }); + postUpgradeChecks(config); + }); + + it('custom:frigate-card-menu-icon -> custom:advanced-camera-card-menu-icon', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:frigate-card-menu-icon', + icon: 'mdi:cow', + }, + ], + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:advanced-camera-card-menu-icon', + icon: 'mdi:cow', + }, + ], + }); + postUpgradeChecks(config); + }); + + it('custom:frigate-card-menu-state-icon -> custom:advanced-camera-card-menu-state-icon', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:frigate-card-menu-state-icon', + entity: 'binary_sensor.office', + icon: 'mdi:cow', + }, + ], + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:advanced-camera-card-menu-state-icon', + entity: 'binary_sensor.office', + icon: 'mdi:cow', + }, + ], + }); + postUpgradeChecks(config); + }); + + it('custom:frigate-card-menu-submenu -> custom:advanced-camera-card-menu-submenu', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:frigate-card-menu-submenu', + icon: 'mdi:cow', + items: [], + }, + ], + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:advanced-camera-card-menu-submenu', + icon: 'mdi:cow', + items: [], + }, + ], + }); + postUpgradeChecks(config); + }); + + it('custom:frigate-card-status-bar-icon -> custom:advanced-camera-card-status-bar-icon', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:frigate-card-status-bar-icon', + icon: 'mdi:cow', + }, + ], + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:advanced-camera-card-status-bar-icon', + icon: 'mdi:cow', + }, + ], + }); + postUpgradeChecks(config); + }); + + it('custom:frigate-card-status-bar-image -> custom:advanced-camera-card-status-bar-image', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:frigate-card-status-bar-image', + image: 'image', + }, + ], + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:advanced-camera-card-status-bar-image', + image: 'image', + }, + ], + }); + postUpgradeChecks(config); + }); + + it('custom:frigate-card-status-bar-string -> custom:advanced-camera-card-status-bar-string', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:frigate-card-status-bar-string', + string: 'string', + }, + ], + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:advanced-camera-card-status-bar-string', + string: 'string', + }, + ], + }); + postUpgradeChecks(config); + }); + + it('custom:frigate-card-conditional -> custom:advanced-camera-card-conditional', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:frigate-card-conditional', + conditions: [], + elements: [], + }, + ], + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'custom:advanced-camera-card-conditional', + conditions: [], + elements: [], + }, + ], + }); + postUpgradeChecks(config); + }); + + it('frigate_card_action -> advanced_camera_card_action', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'icon', + icon: 'mdi:cow', + tap_action: { + action: 'custom:advanced-camera-card-action', + frigate_card_action: 'camera_ui', + }, + }, + ], + view: { + actions: { + double_tap_action: { + action: 'custom:advanced-camera-card-action', + frigate_card_action: 'camera_ui', + }, + }, + }, + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + elements: [ + { + type: 'icon', + icon: 'mdi:cow', + tap_action: { + action: 'custom:advanced-camera-card-action', + advanced_camera_card_action: 'camera_ui', + }, + }, + ], + view: { + actions: { + double_tap_action: { + action: 'custom:advanced-camera-card-action', + advanced_camera_card_action: 'camera_ui', + }, + }, + }, + }); + postUpgradeChecks(config); + }); + + describe('frigate card style overrides -> advanced camera card style overrides', () => { + it('valid style overrides', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + view: { + theme: { + overrides: { + '--zero': 'zero', + '--frigate-card-one': 'one', + }, + }, + }, + overrides: [ + { + conditions: [ + { + condition: 'media_loaded' as const, + media_loaded: true, + }, + ], + merge: { + view: { + theme: { + overrides: { + '--frigate-card-two': 'two', + }, + }, + }, + }, + }, + ], + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + view: { + theme: { + overrides: { + '--zero': 'zero', + '--advanced-camera-card-one': 'one', + }, + }, + }, + overrides: [ + { + conditions: [ + { + condition: 'media_loaded' as const, + media_loaded: true, + }, + ], + merge: { + view: { + theme: { + overrides: { + '--advanced-camera-card-two': 'two', + }, + }, + }, + }, + }, + ], + }); + postUpgradeChecks(config); + }); + + it('invalid style overrides', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + view: { + theme: { + overrides: ['should', 'not', 'be', 'an', 'array'], + }, + }, + }; + expect(upgradeConfig(config)).toBeFalsy(); + }); + }); + + it('frigate card button -> iris button', () => { + const config = { + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + menu: { + buttons: { + frigate: { + icon: 'mdi:cow', + }, + }, + }, + overrides: [ + { + conditions: [ + { + condition: 'media_loaded' as const, + media_loaded: true, + }, + ], + merge: { + menu: { + buttons: { + frigate: { + icon: 'mdi:cow', + }, + }, + }, + }, + }, + ], + }; + expect(upgradeConfig(config)).toBeTruthy(); + expect(config).toEqual({ + type: 'custom:advanced-camera-card', + cameras: [{ camera_entity: 'camera.office' }], + menu: { + buttons: { + iris: { + icon: 'mdi:cow', + }, + }, + }, + overrides: [ + { + conditions: [ + { + condition: 'media_loaded' as const, + media_loaded: true, + }, + ], + merge: { + menu: { + buttons: { + iris: { + icon: 'mdi:cow', + }, + }, + }, + }, + }, + ], + }); + postUpgradeChecks(config); + }); + }); }); diff --git a/tests/config/profiles/casting.test.ts b/tests/config/profiles/casting.test.ts index d4a77515..aabb8a5b 100644 --- a/tests/config/profiles/casting.test.ts +++ b/tests/config/profiles/casting.test.ts @@ -1,8 +1,8 @@ import { expect, it } from 'vitest'; import { setProfiles } from '../../../src/config/profiles'; -import { frigateCardConfigSchema } from '../../../src/config/types'; -import { createRawConfig } from '../../test-utils'; import { CASTING_PROFILE } from '../../../src/config/profiles/casting'; +import { advancedCameraCardConfigSchema } from '../../../src/config/types'; +import { createRawConfig } from '../../test-utils'; it('should contain expected defaults', () => { expect(CASTING_PROFILE).toEqual({ @@ -23,11 +23,11 @@ it('should contain expected defaults', () => { it('should be parseable after application', () => { const rawInputConfig = createRawConfig(); - const parsedConfig = frigateCardConfigSchema.parse(rawInputConfig); + const parsedConfig = advancedCameraCardConfigSchema.parse(rawInputConfig); setProfiles(rawInputConfig, parsedConfig, ['casting']); // Reparse the config to ensure the profile did not introduce errors. - const parseResult = frigateCardConfigSchema.safeParse(parsedConfig); + const parseResult = advancedCameraCardConfigSchema.safeParse(parsedConfig); expect(parseResult.success, parseResult.error?.toString()).toBeTruthy(); }); diff --git a/tests/config/profiles/index.test.ts b/tests/config/profiles/index.test.ts index c34d1c08..230a50ed 100644 --- a/tests/config/profiles/index.test.ts +++ b/tests/config/profiles/index.test.ts @@ -24,7 +24,7 @@ describe('setProfiles', () => { it('should handle profiles', () => { const input = { - type: 'frigate-hass-card', + type: 'custom:advanced-camera-card', cameras: [{}], live: { controls: { diff --git a/tests/config/profiles/low-performance.test.ts b/tests/config/profiles/low-performance.test.ts index ece5088b..3056f47d 100644 --- a/tests/config/profiles/low-performance.test.ts +++ b/tests/config/profiles/low-performance.test.ts @@ -1,7 +1,7 @@ import { expect, it } from 'vitest'; import { setProfiles } from '../../../src/config/profiles'; import { LOW_PERFORMANCE_PROFILE } from '../../../src/config/profiles/low-performance'; -import { frigateCardConfigSchema } from '../../../src/config/types'; +import { advancedCameraCardConfigSchema } from '../../../src/config/types'; import { createRawConfig } from '../../test-utils'; it('should contain expected defaults', () => { @@ -37,7 +37,7 @@ it('should contain expected defaults', () => { 'media_viewer.draggable': false, 'media_viewer.snapshot_click_plays_clip': false, 'media_viewer.transition_effect': 'none', - 'menu.buttons.frigate.enabled': false, + 'menu.buttons.iris.enabled': false, 'menu.buttons.media_player.enabled': false, 'menu.buttons.timeline.enabled': false, 'menu.style': 'outside', @@ -60,11 +60,11 @@ it('should contain expected defaults', () => { it('should be parseable after application', () => { const rawInputConfig = createRawConfig(); - const parsedConfig = frigateCardConfigSchema.parse(rawInputConfig); + const parsedConfig = advancedCameraCardConfigSchema.parse(rawInputConfig); setProfiles(rawInputConfig, parsedConfig, ['low-performance']); // Reparse the config to ensure the profile did not introduce errors. - const parseResult = frigateCardConfigSchema.safeParse(parsedConfig); + const parseResult = advancedCameraCardConfigSchema.safeParse(parsedConfig); expect(parseResult.success, parseResult.error?.toString()).toBeTruthy(); }); diff --git a/tests/config/profiles/scrubbing.test.ts b/tests/config/profiles/scrubbing.test.ts index de2a92b5..e9939e48 100644 --- a/tests/config/profiles/scrubbing.test.ts +++ b/tests/config/profiles/scrubbing.test.ts @@ -1,7 +1,7 @@ import { expect, it } from 'vitest'; -import { SCRUBBING_PROFILE } from '../../../src/config/profiles/scrubbing'; import { setProfiles } from '../../../src/config/profiles'; -import { frigateCardConfigSchema } from '../../../src/config/types'; +import { SCRUBBING_PROFILE } from '../../../src/config/profiles/scrubbing'; +import { advancedCameraCardConfigSchema } from '../../../src/config/types'; import { createRawConfig } from '../../test-utils'; it('should contain expected defaults', () => { @@ -17,11 +17,11 @@ it('should contain expected defaults', () => { it('should be parseable after application', () => { const rawInputConfig = createRawConfig(); - const parsedConfig = frigateCardConfigSchema.parse(rawInputConfig); + const parsedConfig = advancedCameraCardConfigSchema.parse(rawInputConfig); setProfiles(rawInputConfig, parsedConfig, ['low-performance']); // Reparse the config to ensure the profile did not introduce errors. - const parseResult = frigateCardConfigSchema.safeParse(parsedConfig); + const parseResult = advancedCameraCardConfigSchema.safeParse(parsedConfig); expect(parseResult.success, parseResult.error?.toString()).toBeTruthy(); }); diff --git a/tests/config/types.test.ts b/tests/config/types.test.ts index cbb9964b..cccd51ff 100644 --- a/tests/config/types.test.ts +++ b/tests/config/types.test.ts @@ -4,9 +4,9 @@ import { conditionalSchema, customSchema, dimensionsConfigSchema, - frigateCardConditionSchema, - frigateCardCustomActionsBaseSchema, - frigateCardCustomActionSchema, + advancedCameraCardConditionSchema, + advancedCameraCardCustomActionsBaseSchema, + advancedCameraCardCustomActionSchema, } from '../../src/config/types'; import { createConfig } from '../test-utils'; @@ -217,10 +217,6 @@ describe('config defaults', () => { enabled: false, priority: 50, }, - frigate: { - enabled: true, - priority: 50, - }, fullscreen: { enabled: true, priority: 50, @@ -229,6 +225,10 @@ describe('config defaults', () => { enabled: false, priority: 50, }, + iris: { + enabled: true, + priority: 50, + }, live: { enabled: true, priority: 50, @@ -338,7 +338,7 @@ describe('config defaults', () => { style: 'stack', window_seconds: 3600, }, - type: 'frigate-hass-card', + type: 'advanced-camera-card', view: { camera_select: 'current', default: 'live', @@ -416,7 +416,7 @@ it('should transform dimensions.aspect_ratio', () => { describe('should refine user_agent_re conditions', () => { it('should successfully parse valid user_agent_re condition', () => { expect( - frigateCardConditionSchema.parse({ + advancedCameraCardConditionSchema.parse({ condition: 'user_agent', user_agent_re: 'Chrome/', }), @@ -428,7 +428,7 @@ describe('should refine user_agent_re conditions', () => { it('should reject invalid user_agent_re conditions', () => { expect(() => - frigateCardConditionSchema.parse({ + advancedCameraCardConditionSchema.parse({ condition: 'user_agent', user_agent_re: '[', }), @@ -438,15 +438,15 @@ describe('should refine user_agent_re conditions', () => { it('should transform action', () => { expect( - frigateCardCustomActionsBaseSchema.parse({ - action: 'custom:frigate-card-action', + advancedCameraCardCustomActionsBaseSchema.parse({ + action: 'custom:advanced-camera-card-action', }), ).toEqual({ action: 'fire-dom-event', }); }); -describe('should convert webrtc card PTZ to Frigate card PTZ', () => { +describe('should convert webrtc card PTZ to Advanced Camera Card PTZ', () => { describe('relative actions', () => { it.each([ ['left' as const], @@ -632,29 +632,29 @@ describe('should lazy evaluate schemas', () => { it('status bar actions', () => { const input = { action: 'fire-dom-event', - frigate_card_action: 'status_bar', + advanced_camera_card_action: 'status_bar', status_bar_action: 'reset', items: [ { - type: 'custom:frigate-card-status-bar-string', + type: 'custom:advanced-camera-card-status-bar-string', string: 'Item', }, ], }; - expect(frigateCardCustomActionSchema.parse(input)).toEqual(input); + expect(advancedCameraCardCustomActionSchema.parse(input)).toEqual(input); }); }); -describe('should handle custom frigate elements', () => { - it('should add custom error on frigate entry', () => { +describe('should handle custom advanced camera card elements', () => { + it('should add custom error on advanced camera card element', () => { const result = customSchema.safeParse({ - type: 'custom:frigate-card-foo', + type: 'custom:advanced-camera-card-foo', }); expect(result.success).toBeFalsy(); if (!result.success) { expect(result.error.errors[0]).toEqual({ code: 'custom', - message: 'Frigate-card custom elements must match specific schemas', + message: 'advanced-camera-card custom elements must match specific schemas', fatal: true, path: ['type'], }); @@ -669,7 +669,7 @@ describe('should handle custom frigate elements', () => { }); }); -// https://github.com/dermotduffy/frigate-hass-card/issues/1280 +// https://github.com/dermotduffy/advanced-camera-card/issues/1280 it('should not require title controls to specify all options', () => { expect( createConfig({ diff --git a/tests/test-utils.ts b/tests/test-utils.ts index c93a967a..c93e2cad 100644 --- a/tests/test-utils.ts +++ b/tests/test-utils.ts @@ -42,16 +42,16 @@ import { TriggersManager } from '../src/card-controller/triggers-manager'; import { ViewManager } from '../src/card-controller/view/view-manager'; import { ActionsConfig, + AdvancedCameraCardCondition, + AdvancedCameraCardConfig, + AdvancedCameraCardCustomAction, CameraConfig, - FrigateCardCondition, - FrigateCardConfig, - FrigateCardCustomAction, PerformanceConfig, - RawFrigateCardConfig, + RawAdvancedCameraCardConfig, + advancedCameraCardConditionSchema, + advancedCameraCardConfigSchema, + advancedCameraCardCustomActionSchema, cameraConfigSchema, - frigateCardConditionSchema, - frigateCardConfigSchema, - frigateCardCustomActionSchema, performanceConfigSchema, } from '../src/config/types'; import { CapabilitiesRaw, ExtendedHomeAssistant, MediaLoadedInfo } from '../src/types'; @@ -65,9 +65,9 @@ import { View, ViewParameters } from '../src/view/view'; export const createAction = ( action: Record, -): FrigateCardCustomAction | null => { - const result = frigateCardCustomActionSchema.safeParse({ - action: 'custom:frigate-card-action', +): AdvancedCameraCardCustomAction | null => { + const result = advancedCameraCardCustomActionSchema.safeParse({ + action: 'custom:advanced-camera-card-action', ...action, }); return result.success ? result.data : null; @@ -78,23 +78,25 @@ export const createCameraConfig = (config?: unknown): CameraConfig => { }; export const createCondition = ( - condition?: Partial, -): FrigateCardCondition => { - return frigateCardConditionSchema.parse(condition ?? {}); + condition?: Partial, +): AdvancedCameraCardCondition => { + return advancedCameraCardConditionSchema.parse(condition ?? {}); }; export const createRawConfig = ( - config?: Partial, -): RawFrigateCardConfig => { + config?: Partial, +): RawAdvancedCameraCardConfig => { return { - type: 'frigate-hass-card', + type: 'advanced-camera-card', cameras: [{}], ...config, }; }; -export const createConfig = (config?: RawFrigateCardConfig): FrigateCardConfig => { - return frigateCardConfigSchema.parse(createRawConfig(config)); +export const createConfig = ( + config?: RawAdvancedCameraCardConfig, +): AdvancedCameraCardConfig => { + return advancedCameraCardConfigSchema.parse(createRawConfig(config)); }; export const createCamera = ( @@ -296,7 +298,7 @@ export const createMediaLoadedInfo = ( export const createMediaLoadedInfoEvent = ( mediaLoadedInfo?: MediaLoadedInfo, ): CustomEvent => { - return new CustomEvent('frigate-card:media:loaded', { + return new CustomEvent('advanced-camera-card:media:loaded', { detail: mediaLoadedInfo ?? createMediaLoadedInfo(), composed: true, bubbles: true, diff --git a/tests/utils/action.test.ts b/tests/utils/action.test.ts index b0b7eba7..9c9731a4 100644 --- a/tests/utils/action.test.ts +++ b/tests/utils/action.test.ts @@ -1,4 +1,4 @@ -import { hasAction } from '@dermotduffy/custom-card-helpers'; +import { hasAction as customCardHasAction } from '@dermotduffy/custom-card-helpers'; import { afterEach, describe, expect, it, vi } from 'vitest'; import { mock } from 'vitest-mock-extended'; import { actionSchema } from '../../src/config/types'; @@ -9,18 +9,18 @@ import { createGeneralAction, createLogAction, createMediaPlayerAction, + createPTZAction, + createPTZControlsAction, createPTZDigitalAction, createPTZMultiAction, - createPTZControlsAction, - frigateCardHasAction, getActionConfigGivenAction, + hasAction, stopEventFromActivatingCardWideActions, - createPTZAction, } from '../../src/utils/action'; vi.mock('@dermotduffy/custom-card-helpers'); -describe('convertActionToFrigateCardCustomAction', () => { +describe('convertActionToAdvancedCameraCardCustomAction', () => { it('should skip null action', () => { expect(convertActionToCardCustomAction(null)).toBeFalsy(); }); @@ -28,12 +28,12 @@ describe('convertActionToFrigateCardCustomAction', () => { it('should parse valid', () => { expect( convertActionToCardCustomAction({ - action: 'custom:frigate-card-action', - frigate_card_action: 'download', + action: 'custom:advanced-camera-card-action', + advanced_camera_card_action: 'download', }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'download', + advanced_camera_card_action: 'download', }); }); @@ -50,7 +50,7 @@ describe('createGeneralAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'clips', + advanced_camera_card_action: 'clips', card_id: 'card_id', }); }); @@ -62,7 +62,7 @@ describe('createCameraAction', () => { { action: 'fire-dom-event', camera: 'camera', - frigate_card_action: 'camera_select', + advanced_camera_card_action: 'camera_select', card_id: 'card_id', }, ); @@ -77,7 +77,7 @@ describe('createMediaPlayerAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'media_player', + advanced_camera_card_action: 'media_player', media_player: 'device', media_player_action: 'play', card_id: 'card_id', @@ -93,7 +93,7 @@ describe('createDisplayModeAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'display_mode_select', + advanced_camera_card_action: 'display_mode_select', display_mode: 'grid', card_id: 'card_id', }); @@ -108,7 +108,7 @@ describe('createPTZControlsAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'ptz_controls', + advanced_camera_card_action: 'ptz_controls', enabled: true, card_id: 'card_id', }); @@ -123,7 +123,7 @@ describe('createPTZAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', card_id: 'card_id', }); }); @@ -139,7 +139,7 @@ describe('createPTZAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'ptz', + advanced_camera_card_action: 'ptz', card_id: 'card_id', camera: 'camera_id', ptz_action: 'right', @@ -157,7 +157,7 @@ describe('createPTZDigitalAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', card_id: 'card_id', }); }); @@ -176,7 +176,7 @@ describe('createPTZDigitalAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'ptz_digital', + advanced_camera_card_action: 'ptz_digital', card_id: 'card_id', target_id: 'target_id', absolute: { @@ -199,7 +199,7 @@ describe('createPTZMultiAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', card_id: 'card_id', ptz_action: 'right', ptz_preset: 'preset', @@ -216,7 +216,7 @@ describe('createPTZMultiAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'ptz_multi', + advanced_camera_card_action: 'ptz_multi', card_id: 'card_id', ptz_action: 'right', ptz_phase: 'start', @@ -233,7 +233,7 @@ describe('createLogAction', () => { }), ).toEqual({ action: 'fire-dom-event', - frigate_card_action: 'log', + advanced_camera_card_action: 'log', message: 'Hello, world!', card_id: 'card_id', level: 'info', @@ -244,7 +244,7 @@ describe('createLogAction', () => { describe('getActionConfigGivenAction', () => { const action = actionSchema.parse({ action: 'fire-dom-event', - frigate_card_action: 'clips', + advanced_camera_card_action: 'clips', }); it('should not handle undefined arguments', () => { @@ -284,7 +284,7 @@ describe('getActionConfigGivenAction', () => { }); }); -describe('frigateCardHasAction', () => { +describe('hasAction', () => { const action = actionSchema.parse({ action: 'toggle', }); @@ -294,12 +294,12 @@ describe('frigateCardHasAction', () => { }); it('should handle non-array case', () => { - expect(frigateCardHasAction(action)).toBeFalsy(); - expect(hasAction).toBeCalledTimes(1); + expect(hasAction(action)).toBeFalsy(); + expect(customCardHasAction).toBeCalledTimes(1); }); it('should handle array case', () => { - expect(frigateCardHasAction([action, action, action])).toBeFalsy(); - expect(hasAction).toBeCalledTimes(3); + expect(hasAction([action, action, action])).toBeFalsy(); + expect(customCardHasAction).toBeCalledTimes(3); }); }); diff --git a/tests/utils/basic.test.ts b/tests/utils/basic.test.ts index 257bbe3c..f0578db6 100644 --- a/tests/utils/basic.test.ts +++ b/tests/utils/basic.test.ts @@ -1,5 +1,5 @@ import { afterAll, describe, expect, it, vi } from 'vitest'; -import { FrigateCardError } from '../../src/types'; +import { AdvancedCameraCardError } from '../../src/types'; import { allPromises, arefloatsApproximatelyEqual, @@ -9,7 +9,7 @@ import { contentsChanged, dayToDate, desparsifyArrays, - dispatchFrigateCardEvent, + dispatchAdvancedCameraCardEvent, errorToConsole, formatDate, formatDateAndTime, @@ -32,13 +32,13 @@ import { import { createSlot, createSlotHost } from '../test-utils'; // @vitest-environment jsdom -describe('dispatchFrigateCardEvent', () => { +describe('dispatchAdvancedCameraCardEvent', () => { it('should dispatch event without data', () => { const element = document.createElement('div'); const handler = vi.fn(); - element.addEventListener('frigate-card:foo', handler); + element.addEventListener('advanced-camera-card:foo', handler); - dispatchFrigateCardEvent(element, 'foo'); + dispatchAdvancedCameraCardEvent(element, 'foo'); expect(handler).toBeCalled(); }); @@ -49,8 +49,8 @@ describe('dispatchFrigateCardEvent', () => { expect(ev.detail).toBe(data); }); - element.addEventListener('frigate-card:foo', handler); - dispatchFrigateCardEvent(element, 'foo', data); + element.addEventListener('advanced-camera-card:foo', handler); + dispatchAdvancedCameraCardEvent(element, 'foo', data); expect(handler).toBeCalled(); }); }); @@ -112,9 +112,9 @@ describe('errorToConsole', () => { errorToConsole(error); expect(spy).toHaveBeenCalledWith('ERROR'); }); - it('should log with context given frigate card error', () => { + it('should log with context given advanced camera card error', () => { const data = { foo: 2 }; - const error = new FrigateCardError('ERROR', { foo: 2 }); + const error = new AdvancedCameraCardError('ERROR', { foo: 2 }); errorToConsole(error); expect(spy).toHaveBeenCalledWith(error, data); }); diff --git a/tests/utils/diagnostics.test.ts b/tests/utils/diagnostics.test.ts index c596df0d..93ffbd07 100644 --- a/tests/utils/diagnostics.test.ts +++ b/tests/utils/diagnostics.test.ts @@ -4,8 +4,8 @@ import { mock } from 'vitest-mock-extended'; import { getLanguage } from '../../src/localize/localize'; import { getDiagnostics, getReleaseVersion } from '../../src/utils/diagnostics.js'; import { DeviceRegistryManager } from '../../src/utils/ha/registry/device'; -import { createHASS, createRegistryDevice } from '../test-utils'; import { homeAssistantWSRequest } from '../../src/utils/ha/ws-request'; +import { createHASS, createRegistryDevice } from '../test-utils'; vi.mock('../../package.json', () => ({ default: { @@ -21,7 +21,7 @@ vi.mock('../../src/utils/ha/ws-request.js'); describe('getReleaseVersion', () => { it('should get release version', () => { - expect(getReleaseVersion()).toBe('__FRIGATE_CARD_RELEASE_VERSION__'); + expect(getReleaseVersion()).toBe('__ADVANCED_CAMERA_CARD_RELEASE_VERSION__'); }); }); @@ -38,7 +38,7 @@ describe('getDiagnostics', () => { vi.setSystemTime(now); vi.mocked(getLanguage).mockReturnValue('en'); - vi.stubGlobal('navigator', { userAgent: 'FrigateCardTest/1.0' }); + vi.stubGlobal('navigator', { userAgent: 'AdvancedCameraCardTest/1.0' }); }); afterEach(() => { @@ -76,8 +76,8 @@ describe('getDiagnostics', () => { cameras: [{ camera_entity: 'camera.office' }], }), ).toEqual({ - browser: 'FrigateCardTest/1.0', - card_version: '__FRIGATE_CARD_RELEASE_VERSION__', + browser: 'AdvancedCameraCardTest/1.0', + card_version: '__ADVANCED_CAMERA_CARD_RELEASE_VERSION__', config: { cameras: [{ camera_entity: 'camera.office' }], }, @@ -130,8 +130,8 @@ describe('getDiagnostics', () => { it('should fetch diagnostics without hass or config', async () => { expect(await getDiagnostics()).toEqual({ - browser: 'FrigateCardTest/1.0', - card_version: '__FRIGATE_CARD_RELEASE_VERSION__', + browser: 'AdvancedCameraCardTest/1.0', + card_version: '__ADVANCED_CAMERA_CARD_RELEASE_VERSION__', git: { build_date: 'Tue, 19 Sep 2023 04:59:27 GMT', commit_date: 'Wed, 6 Sep 2023 21:27:28 -0700', @@ -156,8 +156,8 @@ describe('getDiagnostics', () => { deviceRegistryManager.getMatchingDevices.mockResolvedValue([]); expect(await getDiagnostics(hass, deviceRegistryManager)).toEqual({ - browser: 'FrigateCardTest/1.0', - card_version: '__FRIGATE_CARD_RELEASE_VERSION__', + browser: 'AdvancedCameraCardTest/1.0', + card_version: '__ADVANCED_CAMERA_CARD_RELEASE_VERSION__', git: { build_date: 'Tue, 19 Sep 2023 04:59:27 GMT', commit_date: 'Wed, 6 Sep 2023 21:27:28 -0700', diff --git a/tests/utils/embla/carousel-controller.test.ts b/tests/utils/embla/carousel-controller.test.ts index 5ee90ec5..12045da6 100644 --- a/tests/utils/embla/carousel-controller.test.ts +++ b/tests/utils/embla/carousel-controller.test.ts @@ -112,7 +112,10 @@ describe('CarouselController', () => { const parent = createParent({ children: children }); const forceSelectListener = vi.fn(); - parent.addEventListener('frigate-card:carousel:force-select', forceSelectListener); + parent.addEventListener( + 'advanced-camera-card:carousel:force-select', + forceSelectListener, + ); const carousel = new CarouselController(createRoot(), parent); @@ -131,7 +134,10 @@ describe('CarouselController', () => { const parent = createParent({ children: children }); const forceSelectListener = vi.fn(); - parent.addEventListener('frigate-card:carousel:force-select', forceSelectListener); + parent.addEventListener( + 'advanced-camera-card:carousel:force-select', + forceSelectListener, + ); const carousel = new CarouselController(createRoot(), parent); @@ -147,7 +153,7 @@ describe('CarouselController', () => { new CarouselController(createRoot(), parent); const selectHandler = vi.fn(); - parent.addEventListener('frigate-card:carousel:select', selectHandler); + parent.addEventListener('advanced-camera-card:carousel:select', selectHandler); getEmblaApi()?.selectedScrollSnap.mockReturnValue(6); getEmblaApi()?.slideNodes.mockReturnValue(children); @@ -169,7 +175,7 @@ describe('CarouselController', () => { new CarouselController(createRoot(), parent); const selectHandler = vi.fn(); - parent.addEventListener('frigate-card:carousel:select', selectHandler); + parent.addEventListener('advanced-camera-card:carousel:select', selectHandler); getEmblaApi()?.selectedScrollSnap.mockReturnValue(1000); getEmblaApi()?.slideNodes.mockReturnValue(children); diff --git a/tests/utils/embla/plugins/auto-media-loaded-info/auto-media-loaded-info.test.ts b/tests/utils/embla/plugins/auto-media-loaded-info/auto-media-loaded-info.test.ts index fd31b787..abba7e81 100644 --- a/tests/utils/embla/plugins/auto-media-loaded-info/auto-media-loaded-info.test.ts +++ b/tests/utils/embla/plugins/auto-media-loaded-info/auto-media-loaded-info.test.ts @@ -50,7 +50,7 @@ describe('AutoMediaLoadedInfo', () => { plugin.init(emblaApi, createTestEmblaOptionHandler()); const mediaLoadedHandler = vi.fn(); - parent.addEventListener('frigate-card:media:' + type, mediaLoadedHandler); + parent.addEventListener('advanced-camera-card:media:' + type, mediaLoadedHandler); if (type === 'loaded') { dispatchExistingMediaLoadedInfoAsEvent(children[5], createMediaLoadedInfo()); } else if (type === 'unloaded') { @@ -76,19 +76,19 @@ describe('AutoMediaLoadedInfo', () => { plugin.init(emblaApi, createTestEmblaOptionHandler()); const mediaLoadedHandler = vi.fn(); - parent.addEventListener('frigate-card:media:loaded', mediaLoadedHandler); + parent.addEventListener('advanced-camera-card:media:loaded', mediaLoadedHandler); dispatchExistingMediaLoadedInfoAsEvent(children[5], createMediaLoadedInfo()); vi.mocked(emblaApi.selectedScrollSnap).mockReturnValue(4); emblaApi .containerNode() - .dispatchEvent(new Event('frigate-card:carousel:force-select')); + .dispatchEvent(new Event('advanced-camera-card:carousel:force-select')); expect(mediaLoadedHandler).not.toBeCalled(); vi.mocked(emblaApi.selectedScrollSnap).mockReturnValue(5); emblaApi .containerNode() - .dispatchEvent(new Event('frigate-card:carousel:force-select')); + .dispatchEvent(new Event('advanced-camera-card:carousel:force-select')); expect(mediaLoadedHandler).toBeCalled(); }); }); diff --git a/tests/utils/media-info.test.ts b/tests/utils/media-info.test.ts index 59e11787..ca4553e9 100644 --- a/tests/utils/media-info.test.ts +++ b/tests/utils/media-info.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it, vi } from 'vitest'; import { mock } from 'vitest-mock-extended'; -import { FrigateCardMediaPlayer, MediaLoadedCapabilities } from '../../src/types'; +import { AdvancedCameraCardMediaPlayer, MediaLoadedCapabilities } from '../../src/types'; import { createMediaLoadedInfo, dispatchExistingMediaLoadedInfoAsEvent, @@ -14,7 +14,7 @@ import { import { createMediaLoadedInfo as createTestMediaLoadedInfo } from '../test-utils.js'; const options = { - player: mock(), + player: mock(), capabilities: mock(), }; @@ -86,14 +86,14 @@ describe('createMediaLoadedInfo', () => { // @vitest-environment jsdom describe('dispatchMediaLoadedEvent', () => { const options = { - player: mock(), + player: mock(), capabilities: mock(), }; it('should dispatch', () => { const handler = vi.fn(); const div = document.createElement('div'); - div.addEventListener('frigate-card:media:loaded', handler); + div.addEventListener('advanced-camera-card:media:loaded', handler); // Need to write readonly properties. const img = document.createElement('img'); @@ -115,7 +115,7 @@ describe('dispatchMediaLoadedEvent', () => { it('should not dispatch', () => { const handler = vi.fn(); const div = document.createElement('div'); - div.addEventListener('frigate-card:media:loaded', handler); + div.addEventListener('advanced-camera-card:media:loaded', handler); dispatchMediaLoadedEvent(div, div, options); expect(handler).not.toBeCalled(); @@ -127,7 +127,7 @@ describe('dispatchExistingMediaLoadedInfoAsEvent', () => { it('should dispatch', () => { const handler = vi.fn(); const div = document.createElement('div'); - div.addEventListener('frigate-card:media:loaded', handler); + div.addEventListener('advanced-camera-card:media:loaded', handler); const info = createTestMediaLoadedInfo(); dispatchExistingMediaLoadedInfoAsEvent(div, info); @@ -144,7 +144,7 @@ describe('dispatchMediaUnloadedEvent', () => { it('should dispatch', () => { const handler = vi.fn(); const div = document.createElement('div'); - div.addEventListener('frigate-card:media:unloaded', handler); + div.addEventListener('advanced-camera-card:media:unloaded', handler); dispatchMediaUnloadedEvent(div); expect(handler).toBeCalled(); @@ -156,7 +156,7 @@ describe('dispatchMediaVolumeChangeEvent', () => { it('should dispatch', () => { const handler = vi.fn(); const div = document.createElement('div'); - div.addEventListener('frigate-card:media:volumechange', handler); + div.addEventListener('advanced-camera-card:media:volumechange', handler); dispatchMediaVolumeChangeEvent(div); expect(handler).toBeCalled(); @@ -168,7 +168,7 @@ describe('dispatchMediaPlayEvent', () => { it('should dispatch', () => { const handler = vi.fn(); const div = document.createElement('div'); - div.addEventListener('frigate-card:media:play', handler); + div.addEventListener('advanced-camera-card:media:play', handler); dispatchMediaPlayEvent(div); expect(handler).toBeCalled(); @@ -180,7 +180,7 @@ describe('dispatchMediaPauseEvent', () => { it('should dispatch', () => { const handler = vi.fn(); const div = document.createElement('div'); - div.addEventListener('frigate-card:media:pause', handler); + div.addEventListener('advanced-camera-card:media:pause', handler); dispatchMediaPauseEvent(div); expect(handler).toBeCalled(); diff --git a/tests/utils/media-layout.test.ts b/tests/utils/media-layout.test.ts index 85054fc9..80a0db32 100644 --- a/tests/utils/media-layout.test.ts +++ b/tests/utils/media-layout.test.ts @@ -11,19 +11,19 @@ describe('updateElementStyleFromMediaLayoutConfig', () => { fit: 'cover', }); - expect(video.style.getPropertyValue('--frigate-card-media-layout-fit')).toBe( - 'cover', - ); + expect( + video.style.getPropertyValue('--advanced-camera-card-media-layout-fit'), + ).toBe('cover'); }); it('unset', () => { const video = document.createElement('video'); - video.style.setProperty('--frigate-card-media-layout-fit', 'cover'); + video.style.setProperty('--advanced-camera-card-media-layout-fit', 'cover'); updateElementStyleFromMediaLayoutConfig(video); expect( - video.style.getPropertyValue('--frigate-card-media-layout-fit'), + video.style.getPropertyValue('--advanced-camera-card-media-layout-fit'), ).toBeFalsy(); }); }); @@ -40,25 +40,25 @@ describe('updateElementStyleFromMediaLayoutConfig', () => { }); expect( - video.style.getPropertyValue('--frigate-card-media-layout-position-x'), + video.style.getPropertyValue('--advanced-camera-card-media-layout-position-x'), ).toBe('10%'); expect( - video.style.getPropertyValue('--frigate-card-media-layout-position-y'), + video.style.getPropertyValue('--advanced-camera-card-media-layout-position-y'), ).toBe('20%'); }); it('unset', () => { const video = document.createElement('video'); - video.style.setProperty('--frigate-card-media-layout-position-x', '10%'); - video.style.setProperty('--frigate-card-media-layout-position-y', '20%'); + video.style.setProperty('--advanced-camera-card-media-layout-position-x', '10%'); + video.style.setProperty('--advanced-camera-card-media-layout-position-y', '20%'); updateElementStyleFromMediaLayoutConfig(video); expect( - video.style.getPropertyValue('--frigate-card-media-layout-position-x'), + video.style.getPropertyValue('--advanced-camera-card-media-layout-position-x'), ).toBeFalsy(); expect( - video.style.getPropertyValue('--frigate-card-media-layout-position-y'), + video.style.getPropertyValue('--advanced-camera-card-media-layout-position-y'), ).toBeFalsy(); }); }); @@ -77,39 +77,57 @@ describe('updateElementStyleFromMediaLayoutConfig', () => { }); expect( - video.style.getPropertyValue('--frigate-card-media-layout-view-box-top'), + video.style.getPropertyValue('--advanced-camera-card-media-layout-view-box-top'), ).toBe('1%'); expect( - video.style.getPropertyValue('--frigate-card-media-layout-view-box-bottom'), + video.style.getPropertyValue( + '--advanced-camera-card-media-layout-view-box-bottom', + ), ).toBe('2%'); expect( - video.style.getPropertyValue('--frigate-card-media-layout-view-box-left'), + video.style.getPropertyValue( + '--advanced-camera-card-media-layout-view-box-left', + ), ).toBe('3%'); expect( - video.style.getPropertyValue('--frigate-card-media-layout-view-box-right'), + video.style.getPropertyValue( + '--advanced-camera-card-media-layout-view-box-right', + ), ).toBe('4%'); }); it('unset', () => { const video = document.createElement('video'); - video.style.setProperty('--frigate-card-media-layout-view-box-top', '1%'); - video.style.setProperty('--frigate-card-media-layout-view-box-bottom', '2%'); - video.style.setProperty('--frigate-card-media-layout-view-box-left', '3%'); - video.style.setProperty('--frigate-card-media-layout-view-box-right', '4%'); + video.style.setProperty('--advanced-camera-card-media-layout-view-box-top', '1%'); + video.style.setProperty( + '--advanced-camera-card-media-layout-view-box-bottom', + '2%', + ); + video.style.setProperty('--advanced-camera-card-media-layout-view-box-left', '3%'); + video.style.setProperty( + '--advanced-camera-card-media-layout-view-box-right', + '4%', + ); updateElementStyleFromMediaLayoutConfig(video); expect( - video.style.getPropertyValue('--frigate-card-media-layout-view-box-top'), + video.style.getPropertyValue('--advanced-camera-card-media-layout-view-box-top'), ).toBeFalsy(); expect( - video.style.getPropertyValue('--frigate-card-media-layout-view-box-bottom'), + video.style.getPropertyValue( + '--advanced-camera-card-media-layout-view-box-bottom', + ), ).toBeFalsy(); expect( - video.style.getPropertyValue('--frigate-card-media-layout-view-box-left'), + video.style.getPropertyValue( + '--advanced-camera-card-media-layout-view-box-left', + ), ).toBeFalsy(); expect( - video.style.getPropertyValue('--frigate-card-media-layout-view-box-right'), + video.style.getPropertyValue( + '--advanced-camera-card-media-layout-view-box-right', + ), ).toBeFalsy(); }); }); diff --git a/tests/utils/media.test.ts b/tests/utils/media.test.ts index adbdd322..99e16287 100644 --- a/tests/utils/media.test.ts +++ b/tests/utils/media.test.ts @@ -1,8 +1,8 @@ import { afterAll, beforeAll, describe, expect, it, vi } from 'vitest'; import { mock } from 'vitest-mock-extended'; -import { FrigateCardMediaPlayer } from '../../src/types.js'; +import { AdvancedCameraCardMediaPlayer } from '../../src/types.js'; import { - FrigateCardHTMLVideoElement, + AdvancedCameraCardHTMLVideoElement, MEDIA_LOAD_CONTROLS_HIDE_SECONDS, hideMediaControlsTemporarily, playMediaMutingIfNecessary, @@ -19,7 +19,7 @@ describe('setControlsOnVideo', () => { }); it('should stop timer', () => { - const video: FrigateCardHTMLVideoElement = document.createElement('video'); + const video: AdvancedCameraCardHTMLVideoElement = document.createElement('video'); hideMediaControlsTemporarily(video); expect(video._controlsHideTimer).toBeTruthy(); @@ -41,7 +41,7 @@ describe('hideMediaControlsTemporarily', () => { }); it('should set controls', () => { - const video: FrigateCardHTMLVideoElement = document.createElement('video'); + const video: AdvancedCameraCardHTMLVideoElement = document.createElement('video'); video.controls = true; hideMediaControlsTemporarily(video); @@ -53,7 +53,7 @@ describe('hideMediaControlsTemporarily', () => { }); it('should add event listener that resets controls', () => { - const video: FrigateCardHTMLVideoElement = document.createElement('video'); + const video: AdvancedCameraCardHTMLVideoElement = document.createElement('video'); video.controls = true; hideMediaControlsTemporarily(video); @@ -77,7 +77,7 @@ class NotAllowedError extends Error { describe('playMediaMutingIfNecessary', () => { it('should play', async () => { - const player = mock(); + const player = mock(); const video = mock(); video.play.mockResolvedValue(); await playMediaMutingIfNecessary(player, video); @@ -85,7 +85,7 @@ describe('playMediaMutingIfNecessary', () => { }); it('should mute if not allowed to play and unmuted', async () => { - const player = mock(); + const player = mock(); player.isMuted.mockReturnValue(false); player.mute.mockResolvedValue(); @@ -100,7 +100,7 @@ describe('playMediaMutingIfNecessary', () => { }); it('should not mute if not allowed to play and already unmuted', async () => { - const player = mock(); + const player = mock(); player.isMuted.mockReturnValue(true); const video = mock(); @@ -114,7 +114,7 @@ describe('playMediaMutingIfNecessary', () => { }); it('should ignore exception if subsequent play call throws', async () => { - const player = mock(); + const player = mock(); player.isMuted.mockReturnValue(false); const video = mock(); @@ -128,7 +128,7 @@ describe('playMediaMutingIfNecessary', () => { }); it('should ignore calls without a video', async () => { - const player = mock(); + const player = mock(); player.isMuted.mockReturnValue(false); await playMediaMutingIfNecessary(player); diff --git a/tests/utils/ptz.test.ts b/tests/utils/ptz.test.ts index de9ac066..929f44bd 100644 --- a/tests/utils/ptz.test.ts +++ b/tests/utils/ptz.test.ts @@ -1,6 +1,6 @@ import { describe, expect, it } from 'vitest'; import { Capabilities } from '../../src/camera-manager/capabilities'; -import { FrigateCardView } from '../../src/config/types'; +import { AdvancedCameraCardView } from '../../src/config/types'; import { IMAGE_VIEW_ZOOM_TARGET_SENTINEL } from '../../src/const'; import { getPTZTarget, @@ -124,7 +124,7 @@ describe('getPTZTarget', () => { describe('in non-media views', () => { it.each([['timeline' as const], ['diagnostics' as const]])( '%s', - (viewName: FrigateCardView) => { + (viewName: AdvancedCameraCardView) => { const view = createView({ view: viewName, }); diff --git a/tests/view/view-to-cameras.test.ts b/tests/view/view-to-cameras.test.ts index 723ce232..b3cee6ae 100644 --- a/tests/view/view-to-cameras.test.ts +++ b/tests/view/view-to-cameras.test.ts @@ -1,5 +1,5 @@ import { describe, expect, it, vi } from 'vitest'; -import { FrigateCardView } from '../../src/config/types'; +import { AdvancedCameraCardView } from '../../src/config/types'; import { CapabilityKey } from '../../src/types'; import { getCameraIDsForViewName } from '../../src/view/view-to-cameras'; import { @@ -13,7 +13,7 @@ describe('getCameraIDsForViewName', () => { describe('views that are always supported', () => { it.each([['image' as const], ['diagnostics' as const]])( '%s', - (viewName: FrigateCardView) => { + (viewName: AdvancedCameraCardView) => { const cameraManager = createCameraManager(); vi.mocked(cameraManager.getStore).mockReturnValue( createStore([ @@ -53,7 +53,7 @@ describe('getCameraIDsForViewName', () => { ['timeline' as const, 'clips' as const], ['timeline' as const, 'snapshots' as const], ['timeline' as const, 'recordings' as const], - ])('%s', (viewName: FrigateCardView, capabilityKey: CapabilityKey) => { + ])('%s', (viewName: AdvancedCameraCardView, capabilityKey: CapabilityKey) => { const cameraManager = createCameraManager(); vi.mocked(cameraManager.getStore).mockReturnValue( createStore([ diff --git a/yarn.lock b/yarn.lock index 743fdb79..9ce38cc9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2461,6 +2461,88 @@ __metadata: languageName: node linkType: hard +"advanced-camera-card@workspace:.": + version: 0.0.0-use.local + resolution: "advanced-camera-card@workspace:." + dependencies: + "@babel/core": "npm:^7.24.7" + "@babel/plugin-proposal-decorators": "npm:^7.24.7" + "@babel/plugin-transform-class-properties": "npm:^7.24.7" + "@cycjimmy/jsmpeg-player": "npm:^6.0.5" + "@dermotduffy/custom-card-helpers": "npm:^1.9.1" + "@dermotduffy/panzoom": "npm:^4.5.1" + "@egjs/hammerjs": "npm:^2.0.17" + "@graphiteds/core": "npm:^1.9.21" + "@lit-labs/scoped-registry-mixin": "npm:^1.0.3" + "@lit-labs/task": "npm:^1.1.3" + "@rollup/plugin-babel": "npm:^6.0.4" + "@rollup/plugin-commonjs": "npm:^26.0.1" + "@rollup/plugin-image": "npm:^3.0.3" + "@rollup/plugin-json": "npm:^6.1.0" + "@rollup/plugin-node-resolve": "npm:^15.2.3" + "@rollup/plugin-replace": "npm:^5.0.7" + "@rollup/plugin-terser": "npm:^0.4.4" + "@rollup/plugin-typescript": "npm:^11.1.6" + "@semantic-release/github": "npm:^10.3.3" + "@types/bluebird": "npm:^3.5.42" + "@types/js-yaml": "npm:^4" + "@types/lodash-es": "npm:^4.17.12" + "@types/masonry-layout": "npm:^4.2.8" + "@typescript-eslint/eslint-plugin": "npm:^7.13.0" + "@typescript-eslint/parser": "npm:^7.13.0" + "@vitest/coverage-istanbul": "npm:^1.6.0" + component-emitter: "npm:^1.3.1" + compute-scroll-into-view: "npm:^3.1.1" + conventional-changelog-conventionalcommits: "npm:^8.0.0" + crypto: "npm:^1.0.1" + date-fns: "npm:^3.6.0" + date-fns-tz: "npm:^3.1.3" + docsify-cli: "npm:^4.4.4" + embla-carousel: "npm:^8.3.0" + embla-carousel-wheel-gestures: "npm:^8.0.1" + eslint: "npm:^8.57.0" + eslint-config-airbnb-base: "npm:^15.0.0" + eslint-config-prettier: "npm:^9.1.0" + eslint-plugin-import: "npm:^2.29.1" + home-assistant-js-websocket: "npm:^9.4.0" + js-yaml: "npm:^4.1.0" + jsdom: "npm:^21.1.2" + keycharm: "npm:^0.4.0" + lit: "npm:^3.1.4" + lodash-es: "npm:^4.17.21" + markdown-link-check: "npm:^3.12.2" + masonry-layout: "npm:^4.2.2" + moment: "npm:^2.30.1" + p-queue: "npm:^8.0.1" + prettier: "npm:^3.3.2" + propagating-hammerjs: "npm:^2.0.1" + quick-lru: "npm:^6.1.2" + rollup: "npm:^3.29.4" + rollup-plugin-git-info: "npm:^1.0.0" + rollup-plugin-serve: "npm:^1.1.1" + rollup-plugin-styler: "npm:^1.8.0" + rollup-plugin-svgo: "npm:^2.0.0" + rollup-plugin-visualizer: "npm:^5.12.0" + sass: "patch:sass@npm%3A1.77.4#~/.yarn/patches/sass-npm-1.77.4-13b6910aea.patch" + screenfull: "npm:^6.0.2" + semantic-release: "npm:^24.1.1" + semantic-release-export-data: "npm:^1.1.0" + side-drawer: "npm:^3.1.0" + ts-prune: "npm:^0.10.3" + type-fest: "npm:^4.20.0" + typescript: "npm:^5.4.5" + uuid: "npm:^8.3.2" + vis-data: "npm:^7.1.9" + vis-timeline: "npm:^7.7.3" + vis-util: "npm:^5.0.7" + vitest: "npm:^1.6.0" + vitest-mock-extended: "npm:^1.3.1" + web-dialog: "npm:^0.0.11" + xss: "npm:^1.0.15" + zod: "npm:^3.23.8" + languageName: unknown + linkType: soft + "agent-base@npm:6": version: 6.0.2 resolution: "agent-base@npm:6.0.2" @@ -5200,88 +5282,6 @@ __metadata: languageName: node linkType: hard -"frigate-hass-card@workspace:.": - version: 0.0.0-use.local - resolution: "frigate-hass-card@workspace:." - dependencies: - "@babel/core": "npm:^7.24.7" - "@babel/plugin-proposal-decorators": "npm:^7.24.7" - "@babel/plugin-transform-class-properties": "npm:^7.24.7" - "@cycjimmy/jsmpeg-player": "npm:^6.0.5" - "@dermotduffy/custom-card-helpers": "npm:^1.9.1" - "@dermotduffy/panzoom": "npm:^4.5.1" - "@egjs/hammerjs": "npm:^2.0.17" - "@graphiteds/core": "npm:^1.9.21" - "@lit-labs/scoped-registry-mixin": "npm:^1.0.3" - "@lit-labs/task": "npm:^1.1.3" - "@rollup/plugin-babel": "npm:^6.0.4" - "@rollup/plugin-commonjs": "npm:^26.0.1" - "@rollup/plugin-image": "npm:^3.0.3" - "@rollup/plugin-json": "npm:^6.1.0" - "@rollup/plugin-node-resolve": "npm:^15.2.3" - "@rollup/plugin-replace": "npm:^5.0.7" - "@rollup/plugin-terser": "npm:^0.4.4" - "@rollup/plugin-typescript": "npm:^11.1.6" - "@semantic-release/github": "npm:^10.3.3" - "@types/bluebird": "npm:^3.5.42" - "@types/js-yaml": "npm:^4" - "@types/lodash-es": "npm:^4.17.12" - "@types/masonry-layout": "npm:^4.2.8" - "@typescript-eslint/eslint-plugin": "npm:^7.13.0" - "@typescript-eslint/parser": "npm:^7.13.0" - "@vitest/coverage-istanbul": "npm:^1.6.0" - component-emitter: "npm:^1.3.1" - compute-scroll-into-view: "npm:^3.1.1" - conventional-changelog-conventionalcommits: "npm:^8.0.0" - crypto: "npm:^1.0.1" - date-fns: "npm:^3.6.0" - date-fns-tz: "npm:^3.1.3" - docsify-cli: "npm:^4.4.4" - embla-carousel: "npm:^8.3.0" - embla-carousel-wheel-gestures: "npm:^8.0.1" - eslint: "npm:^8.57.0" - eslint-config-airbnb-base: "npm:^15.0.0" - eslint-config-prettier: "npm:^9.1.0" - eslint-plugin-import: "npm:^2.29.1" - home-assistant-js-websocket: "npm:^9.4.0" - js-yaml: "npm:^4.1.0" - jsdom: "npm:^21.1.2" - keycharm: "npm:^0.4.0" - lit: "npm:^3.1.4" - lodash-es: "npm:^4.17.21" - markdown-link-check: "npm:^3.12.2" - masonry-layout: "npm:^4.2.2" - moment: "npm:^2.30.1" - p-queue: "npm:^8.0.1" - prettier: "npm:^3.3.2" - propagating-hammerjs: "npm:^2.0.1" - quick-lru: "npm:^6.1.2" - rollup: "npm:^3.29.4" - rollup-plugin-git-info: "npm:^1.0.0" - rollup-plugin-serve: "npm:^1.1.1" - rollup-plugin-styler: "npm:^1.8.0" - rollup-plugin-svgo: "npm:^2.0.0" - rollup-plugin-visualizer: "npm:^5.12.0" - sass: "patch:sass@npm%3A1.77.4#~/.yarn/patches/sass-npm-1.77.4-13b6910aea.patch" - screenfull: "npm:^6.0.2" - semantic-release: "npm:^24.1.1" - semantic-release-export-data: "npm:^1.1.0" - side-drawer: "npm:^3.1.0" - ts-prune: "npm:^0.10.3" - type-fest: "npm:^4.20.0" - typescript: "npm:^5.4.5" - uuid: "npm:^8.3.2" - vis-data: "npm:^7.1.9" - vis-timeline: "npm:^7.7.3" - vis-util: "npm:^5.0.7" - vitest: "npm:^1.6.0" - vitest-mock-extended: "npm:^1.3.1" - web-dialog: "npm:^0.0.11" - xss: "npm:^1.0.15" - zod: "npm:^3.23.8" - languageName: unknown - linkType: soft - "from2@npm:^2.3.0": version: 2.3.0 resolution: "from2@npm:2.3.0"