Fix UI bug, don't hide event,` switch dashboard strategy impl (#37)

Author: raman325

custom_components/lock_code_manager/__init__.py

@@ -61,18 +61,18 @@ async def async_setup(hass: HomeAssistant, config: Config) -> bool:
             await resources.async_load()
             resources.loaded = True
 
+        # Expose strategy javascript
+        hass.http.register_static_path(
+            STRATEGY_PATH, Path(__file__).parent / "www" / STRATEGY_FILENAME
+        )
+
         try:
             res_id = next(
                 id
                 for id, data in resources.data.items()
                 if data["url"] == STRATEGY_PATH
             )
         except StopIteration:
-            # Expose strategy javascript
-            hass.http.register_static_path(
-                STRATEGY_PATH, Path(__file__).parent / "www" / STRATEGY_FILENAME
-            )
-
             # Register strategy module
             data = await resources.async_create_item(
                 {"res_type": "module", "url": STRATEGY_PATH}

custom_components/lock_code_manager/websocket.py

@@ -84,7 +84,6 @@ async def async_setup(hass: HomeAssistant) -> bool:
     """Enable the websocket_commands."""
     websocket_api.async_register_command(hass, get_slot_calendar_data)
     websocket_api.async_register_command(hass, get_config_entry_entities)
-    websocket_api.async_register_command(hass, get_config_entries_to_entities)
 
     return True
 
@@ -146,31 +145,3 @@ async def get_config_entry_entities(
             ],
         ],
     )
-
-
-@websocket_api.websocket_command(
-    {vol.Required("type"): "lock_code_manager/get_config_entries_to_entities"}
-)
-@websocket_api.async_response
-async def get_config_entries_to_entities(
-    hass: HomeAssistant,
-    connection: websocket_api.ActiveConnection,
-    msg: dict[str, Any],
-) -> None:
-    """Return entities for multiple lock_code_manager config entries."""
-    connection.send_result(
-        msg["id"],
-        [
-            [
-                config_entry.entry_id,
-                config_entry.title,
-                [
-                    entity.as_partial_dict
-                    for entity in er.async_entries_for_config_entry(
-                        er.async_get(hass), config_entry.entry_id
-                    )
-                ],
-            ]
-            for config_entry in hass.config_entries.async_entries(DOMAIN)
-        ],
-    )

custom_components/lock_code_manager/www/lock-code-manager-strategy.js

@@ -2,16 +2,17 @@ import { ReactiveElement } from 'lit';
 
 import { DEFAULT_INCLUDE_CODE_SLOT_SENSORS } from './const';
 import { HomeAssistant } from './ha_type_stubs';
-import { generateView } from './helpers';
-import { LockCodeManagerDashboardStrategyConfig, LockCodeManagerEntitiesResponse } from './types';
+import { generateView, slugify } from './helpers';
+import { GetConfigEntriesResponse, LockCodeManagerDashboardStrategyConfig } from './types';
 
 export class LockCodeManagerDashboardStrategy extends ReactiveElement {
     static async generate(config: LockCodeManagerDashboardStrategyConfig, hass: HomeAssistant) {
-        const configEntriesAndEntities = await hass.callWS<LockCodeManagerEntitiesResponse[]>({
-            type: 'lock_code_manager/get_config_entries_to_entities'
+        const configEntries = await hass.callWS<GetConfigEntriesResponse>({
+            domain: 'lock_code_manager',
+            type: 'config_entries/get'
         });
 
-        if (configEntriesAndEntities.length === 0) {
+        if (configEntries.length === 0) {
             return {
                 title: 'Lock Code Manager',
                 views: [
@@ -29,16 +30,19 @@ export class LockCodeManagerDashboardStrategy extends ReactiveElement {
             };
         }
 
-        const views = await Promise.all(
-            configEntriesAndEntities.map(([configEntryId, configEntryTitle, entities]) =>
-                generateView(
-                    hass,
-                    configEntryId,
-                    configEntryTitle,
-                    entities,
-                    config.include_code_slot_sensors ?? DEFAULT_INCLUDE_CODE_SLOT_SENSORS
-                )
-            )
+        const views: object[] = await Promise.all(
+            configEntries.map((configEntry) => {
+                return {
+                    path: slugify(configEntry.title),
+                    strategy: {
+                        config_entry_id: configEntry.entry_id,
+                        include_code_slot_sensors:
+                            config.include_code_slot_sensors ?? DEFAULT_INCLUDE_CODE_SLOT_SENSORS,
+                        type: 'custom:lock-code-manager'
+                    },
+                    title: configEntry.title
+                };
+            })
         );
 
         if (views.length === 1) {

js/dashboard-strategy.ts

@@ -70,6 +70,14 @@ export async function generateView(
         // cards.push({});
     }
 
+    console.log({
+        badges,
+        cards,
+        panel: false,
+        path: slugify(configEntryTitle),
+        title: configEntryTitle
+    });
+
     return {
         badges,
         cards,
@@ -135,11 +143,10 @@ function generateSlotCard(
                     {
                         entity: slotMapping.pinShouldBeEnabledEntity.entity_id
                     },
-                    ...maybeGenerateFoldEntityRowCard(
-                        slotMapping.codeEventEntityIds,
-                        'Unlock Events for this Slot',
-                        useFoldEntityRow
-                    ),
+                    {
+                        entity: slotMapping.codeEventEntityId,
+                        name: 'PIN Last Used'
+                    },
                     ...maybeGenerateFoldEntityRowCard(
                         slotMapping.conditionEntityIds,
                         'Conditions',
@@ -170,14 +177,14 @@ function getSlotMapping(
     const mainEntityIds: string[] = [];
     const conditionEntityIds: string[] = [];
     const codeSensorEntityIds: string[] = [];
-    const codeEventEntityIds: string[] = [];
+    let codeEventEntityId: string;
     lockCodeManagerEntities
         .filter((entity) => entity.slotNum === slotNum)
         .forEach((entity) => {
             if (entity.key === CODE_SENSOR_KEY) {
                 codeSensorEntityIds.push(entity.entity_id);
             } else if (entity.key === CODE_EVENT_KEY) {
-                codeEventEntityIds.push(entity.entity_id);
+                codeEventEntityId = entity.entity_id;
             } else if (CONDITION_KEYS.includes(entity.key)) {
                 conditionEntityIds.push(entity.entity_id);
             } else if (entity.key !== PIN_SYNCED_TO_LOCKS_KEY) {
@@ -190,7 +197,7 @@ function getSlotMapping(
     const calendarEntityId = configEntryData.slots[slotNum];
     if (calendarEntityId) conditionEntityIds.unshift(calendarEntityId);
     return {
-        codeEventEntityIds,
+        codeEventEntityId,
         codeSensorEntityIds,
         conditionEntityIds,
         mainEntityIds,
@@ -228,7 +235,7 @@ function maybeGenerateFoldEntityRowCard(
 }
 
 // https://gist.github.com/hagemann/382adfc57adbd5af078dc93feef01fe1
-function slugify(value: string, delimiter = '-'): string {
+export function slugify(value: string, delimiter = '-'): string {
     const a = 'àáâäæãåāăąçćčđďèéêëēėęěğǵḧîïíīįìıİłḿñńǹňôöòóœøōõőṕŕřßśšşșťțûüùúūǘůűųẃẍÿýžźż·';
     const b = `aaaaaaaaaacccddeeeeeeeegghiiiiiiiilmnnnnoooooooooprrsssssttuuuuuuuuuwxyyzzz${delimiter}`;
     const p = new RegExp(a.split('').join('|'), 'g');

js/helpers.ts

@@ -14,13 +14,8 @@ export interface LockCodeManagerDashboardStrategyConfig extends LockCodeManagerS
     type: 'custom:lock-code-manager';
 }
 
-export interface ConfigEntryToEntities {
-    configEntry: ConfigEntry;
-    entities: LockCodeManagerEntityEntry[];
-}
-
 export interface SlotMapping {
-    codeEventEntityIds: string[];
+    codeEventEntityId: string;
     codeSensorEntityIds: string[];
     conditionEntityIds: string[];
     mainEntityIds: string[];
@@ -40,3 +35,20 @@ export interface LockCodeManagerConfigEntryData {
     locks: string[];
     slots: { [key: number]: string | null };
 }
+
+export interface ConfigEntryJSONFragment {
+    disabled_by: string;
+    domain: string;
+    entry_id: string;
+    pref_disable_new_entities: boolean;
+    pref_disable_polling: boolean;
+    reason: string | null;
+    source: string;
+    state: string;
+    supports_options: boolean;
+    supports_remove_device: boolean;
+    supports_unload: boolean;
+    title: string;
+}
+
+export type GetConfigEntriesResponse = ConfigEntryJSONFragment[];

js/types.ts

@@ -107,25 +107,3 @@ async def test_get_config_entry_entities(
     assert entry_id == lock_code_manager_config_entry.entry_id
     assert title == "Mock Title"
     assert len(entities) == 15
-
-
-async def test_get_config_entries_to_entities(
-    hass: HomeAssistant,
-    mock_lock_config_entry,
-    lock_code_manager_config_entry,
-    hass_ws_client: WebSocketGenerator,
-) -> None:
-    """Test get_config_entries_to_entities WS API."""
-    ws_client = await hass_ws_client(hass)
-
-    # Try API call with entry ID
-    await ws_client.send_json(
-        {"id": 1, "type": "lock_code_manager/get_config_entries_to_entities"}
-    )
-    msg = await ws_client.receive_json()
-    assert msg["success"]
-    assert len(msg["result"]) == 1
-    [[entry_id, title, entities]] = msg["result"]
-    assert entry_id == lock_code_manager_config_entry.entry_id
-    assert title == "Mock Title"
-    assert len(entities) == 15