mirror of
https://github.com/Matysh/houseplan-card
synced 2026-07-31 08:28:31 +00:00
v1.45.3: 'value instead of an icon' could never be saved (issue #3)
The device editor has offered display='value' since v1.26.0; MARKER_SCHEMA accepted only badge/ripple/icon_ripple. Picking it produced not a valid value for dictionary value @ data['config']['markers'][n]['display'] and since one rejected marker fails the whole config write, the user could not save the plan at all until the setting was undone. Reported by @RemyRoux with the exact error text, 2026-07-27 — a year and a half after the feature shipped. The schema now accepts it, and the class of bug is closed rather than the instance: DISPLAY_MODES, TAP_ACTIONS, SPACE_FILL_MODES and ROOM_FILL_MODES are exported from src/logic.ts, the editors render their options from them, and a backend test parses those lists out of the TypeScript source and asserts the schema accepts every one (and rejects a bogus value). Reverting the one-word schema fix fails that test, which is the check that was missing. Plus an HA-harness test saving a config that contains a value-display marker — the exact call the user's card was making. Docs: CHANGELOG.md + CHANGELOG.ru.md + TESTING.md + STATUS.md.
This commit is contained in:
Binary file not shown.
@@ -24,7 +24,7 @@ MAX_SIGN_PATHS = 200
|
|||||||
PLAN_ORPHAN_TTL_S = 3600
|
PLAN_ORPHAN_TTL_S = 3600
|
||||||
FILES_DIR = "houseplan/files"
|
FILES_DIR = "houseplan/files"
|
||||||
CONF_ADMIN_ONLY = "admin_only"
|
CONF_ADMIN_ONLY = "admin_only"
|
||||||
VERSION = "1.45.2"
|
VERSION = "1.45.3"
|
||||||
|
|
||||||
DEFAULT_CONFIG: dict = {
|
DEFAULT_CONFIG: dict = {
|
||||||
"spaces": [],
|
"spaces": [],
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -16,5 +16,5 @@
|
|||||||
"issue_tracker": "https://github.com/Matysh/houseplan-card/issues",
|
"issue_tracker": "https://github.com/Matysh/houseplan-card/issues",
|
||||||
"requirements": [],
|
"requirements": [],
|
||||||
"single_config_entry": true,
|
"single_config_entry": true,
|
||||||
"version": "1.45.2"
|
"version": "1.45.3"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -207,7 +207,9 @@ MARKER_SCHEMA = vol.Schema(
|
|||||||
vol.Optional("glow_radius_cm"): vol.Any(vol.All(vol.Coerce(float), vol.Range(min=10, max=10000)), None),
|
vol.Optional("glow_radius_cm"): vol.Any(vol.All(vol.Coerce(float), vol.Range(min=10, max=10000)), None),
|
||||||
vol.Optional("is_light"): vol.Any(bool, None),
|
vol.Optional("is_light"): vol.Any(bool, None),
|
||||||
vol.Optional("room_id"): vol.Any(str, None),
|
vol.Optional("room_id"): vol.Any(str, None),
|
||||||
vol.Optional("display"): vol.Any("badge", "ripple", "icon_ripple", None),
|
# keep in sync with DISPLAY_MODES in src/logic.ts — a cross-language test
|
||||||
|
# asserts every option the editor offers is accepted here (issue #3)
|
||||||
|
vol.Optional("display"): vol.Any("badge", "ripple", "icon_ripple", "value", None),
|
||||||
vol.Optional("ripple_color"): vol.Any(str, None),
|
vol.Optional("ripple_color"): vol.Any(str, None),
|
||||||
vol.Optional("ripple_size"): vol.Any(vol.All(vol.Coerce(float), vol.Range(min=1, max=20)), None),
|
vol.Optional("ripple_size"): vol.Any(vol.All(vol.Coerce(float), vol.Range(min=1, max=20)), None),
|
||||||
vol.Optional("size"): vol.Any(vol.All(vol.Coerce(float), vol.Range(min=0.2, max=6)), None),
|
vol.Optional("size"): vol.Any(vol.All(vol.Coerce(float), vol.Range(min=0.2, max=6)), None),
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
Vendored
+35
-35
File diff suppressed because one or more lines are too long
@@ -1,5 +1,20 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## v1.45.3 — 2026-07-27
|
||||||
|
- **"Value instead of an icon" could not be saved (issue #3).** The option was
|
||||||
|
added to the device editor in v1.26.0, but the server-side schema only ever
|
||||||
|
accepted `badge`, `ripple` and `icon_ripple`. Choosing it produced
|
||||||
|
`not a valid value for dictionary value @ data['config']['markers'][n]['display']`
|
||||||
|
— and because a single rejected marker fails the whole configuration write,
|
||||||
|
the plan could not be saved at all until the setting was undone. Thanks to
|
||||||
|
@RemyRoux for the report and the exact error text.
|
||||||
|
- **The option lists now live in one place and are checked across languages.**
|
||||||
|
`DISPLAY_MODES`, `TAP_ACTIONS`, `SPACE_FILL_MODES` and `ROOM_FILL_MODES` are
|
||||||
|
exported from the card and read by a backend test that asserts the schema
|
||||||
|
accepts every value a user can actually pick. Adding an option to an editor
|
||||||
|
and forgetting the schema now fails the test suite instead of surfacing a year
|
||||||
|
later through somebody's error message.
|
||||||
|
|
||||||
## v1.45.2 — 2026-07-27 (hardening from the v1.45.1 review: R4-1, R4-2)
|
## v1.45.2 — 2026-07-27 (hardening from the v1.45.1 review: R4-1, R4-2)
|
||||||
- **A failed cleanup no longer reports an accepted save as an error (R4-1).**
|
- **A failed cleanup no longer reports an accepted save as an error (R4-1).**
|
||||||
Collecting superseded plan files runs after the configuration is already
|
Collecting superseded plan files runs after the configuration is already
|
||||||
|
|||||||
@@ -6,6 +6,22 @@
|
|||||||
> **Правило проекта:** оба файла пополняются в одном коммите с самим
|
> **Правило проекта:** оба файла пополняются в одном коммите с самим
|
||||||
> изменением — как и остальная документация (см. docs/STATUS.md).
|
> изменением — как и остальная документация (см. docs/STATUS.md).
|
||||||
|
|
||||||
|
## v1.45.3 — 2026-07-27
|
||||||
|
- **«Значение вместо иконки» невозможно было сохранить (issue #3).** Опция
|
||||||
|
появилась в редакторе устройств ещё в v1.26.0, но серверная схема всё это
|
||||||
|
время принимала только `badge`, `ripple` и `icon_ripple`. При её выборе
|
||||||
|
сохранение падало с
|
||||||
|
`not a valid value for dictionary value @ data['config']['markers'][n]['display']`,
|
||||||
|
а поскольку один отвергнутый маркер валит всю запись конфигурации, план не
|
||||||
|
сохранялся вообще, пока настройку не отменишь. Спасибо @RemyRoux за отчёт и
|
||||||
|
точный текст ошибки.
|
||||||
|
- **Списки опций теперь в одном месте и сверяются между языками.**
|
||||||
|
`DISPLAY_MODES`, `TAP_ACTIONS`, `SPACE_FILL_MODES` и `ROOM_FILL_MODES`
|
||||||
|
экспортируются из карточки, и backend-тест читает их, проверяя, что схема
|
||||||
|
принимает каждое значение, которое пользователь реально может выбрать.
|
||||||
|
Теперь добавить опцию в редактор и забыть про схему — значит уронить тесты, а
|
||||||
|
не узнать об этом через полтора года из чужого сообщения об ошибке.
|
||||||
|
|
||||||
## v1.45.2 — 2026-07-27 (закалка по ревью v1.45.1: R4-1, R4-2)
|
## v1.45.2 — 2026-07-27 (закалка по ревью v1.45.1: R4-1, R4-2)
|
||||||
- **Сбой уборки больше не превращает принятое сохранение в ошибку (R4-1).**
|
- **Сбой уборки больше не превращает принятое сохранение в ошибку (R4-1).**
|
||||||
Сборка вытесненных файлов плана идёт уже после того, как конфигурация
|
Сборка вытесненных файлов плана идёт уже после того, как конфигурация
|
||||||
|
|||||||
+2
-2
@@ -15,12 +15,12 @@
|
|||||||
|
|
||||||
| Item | State |
|
| Item | State |
|
||||||
|---|---|
|
|---|---|
|
||||||
| Version | **v1.45.2** everywhere (manifest, const.py, package.json, CARD_VERSION); deployed to the home instance |
|
| Version | **v1.45.3** everywhere (manifest, const.py, package.json, CARD_VERSION); deployed to the home instance |
|
||||||
| Workflow | Since 2026-07-22: minor changes go to branch **`dev`** (build + smokes → deploy home → commit → push, NO release); releases are batched on the owner's command (merge dev→main, one tag, one release with a summary changelog, CI checked on dev beforehand) |
|
| Workflow | Since 2026-07-22: minor changes go to branch **`dev`** (build + smokes → deploy home → commit → push, NO release); releases are batched on the owner's command (merge dev→main, one tag, one release with a summary changelog, CI checked on dev beforehand) |
|
||||||
| GitHub | https://github.com/Matysh/houseplan-card — `main` = releases up to **v1.40.1**; `dev` ahead with v1.40.2+ (speaker icons, kiosk). Push via SSH key `ha_jb` (remote git@github.com:…); API releases via the fine-grained PAT in `~/.git-credentials` (Contents R/W, issued 2026-07-23) |
|
| GitHub | https://github.com/Matysh/houseplan-card — `main` = releases up to **v1.40.1**; `dev` ahead with v1.40.2+ (speaker icons, kiosk). Push via SSH key `ha_jb` (remote git@github.com:…); API releases via the fine-grained PAT in `~/.git-credentials` (Contents R/W, issued 2026-07-23) |
|
||||||
| CI | validate.yml (hacs + hassfest + frontend + backend) green; release.yml attaches the bundle on release publish |
|
| CI | validate.yml (hacs + hassfest + frontend + backend) green; release.yml attaches the bundle on release publish |
|
||||||
| HACS | Custom repository works. **Inclusion PR: hacs/default#9004** — open, valid, labeled; ~864 older open PRs but merge rate ≈180/mo; realistic ETA 1–3 months (checked 2026-07-24) |
|
| HACS | Custom repository works. **Inclusion PR: hacs/default#9004** — open, valid, labeled; ~864 older open PRs but merge rate ≈180/mo; realistic ETA 1–3 months (checked 2026-07-24) |
|
||||||
| Home instance | ha.jbstudio.pro (SSH port 323, key `ha_jb`), deployed **v1.45.2** via direct copy (HACS custom repo also installed) |
|
| Home instance | ha.jbstudio.pro (SSH port 323, key `ha_jb`), deployed **v1.45.3** via direct copy (HACS custom repo also installed) |
|
||||||
| Localization | UI en/ru (src/i18n/*.json), everything user-visible localized incl. kiosk popover |
|
| Localization | UI en/ru (src/i18n/*.json), everything user-visible localized incl. kiosk popover |
|
||||||
| Tests | 121 frontend (node:test) + 12 pure backend + 12 HA-harness (CI, py3.13); ~30 demo smoke suites (headless chromium) |
|
| Tests | 121 frontend (node:test) + 12 pure backend + 12 HA-harness (CI, py3.13); ~30 demo smoke suites (headless chromium) |
|
||||||
| Community | **Telegram chat: https://t.me/ha_houseplan** (created 2026-07-27) — the primary user-facing support channel; GitHub issues stay for bugs/features. Link it from any new release notes and posts |
|
| Community | **Telegram chat: https://t.me/ha_houseplan** (created 2026-07-27) — the primary user-facing support channel; GitHub issues stay for bugs/features. Link it from any new release notes and posts |
|
||||||
|
|||||||
@@ -234,6 +234,11 @@ Run the *core flows* (marked ★ below) in each environment at least once per mi
|
|||||||
are only reachable through /api/houseplan/content/… with a session; the
|
are only reachable through /api/houseplan/content/… with a session; the
|
||||||
old /houseplan_files/plans|files paths return 404 after a restart; old
|
old /houseplan_files/plans|files paths return 404 after a restart; old
|
||||||
stored URLs keep working (rewritten on read) [auto+manual]
|
stored URLs keep working (rewritten on read) [auto+manual]
|
||||||
|
- [ ] Every editor option is storable (v1.45.3, issue #3): set a sensor to
|
||||||
|
"value instead of an icon" and save — no validation error, the value shows
|
||||||
|
on the plan after a reload. Same for each tap action and each fill mode
|
||||||
|
[auto: backend test_every_display_mode_the_editor_offers_is_accepted and
|
||||||
|
neighbours, test_a_marker_showing_its_value_can_be_saved]
|
||||||
- [ ] Signing does not amplify on a bad connection (v1.45.2, review R4-2): with
|
- [ ] Signing does not amplify on a bad connection (v1.45.2, review R4-2): with
|
||||||
the WebSocket slow or refusing, the card issues ONE sign request per url
|
the WebSocket slow or refusing, the card issues ONE sign request per url
|
||||||
and backs off after a failure instead of asking again on every render; a
|
and backs off after a failure instead of asking again on every render; a
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "houseplan-card",
|
"name": "houseplan-card",
|
||||||
"version": "1.45.2",
|
"version": "1.45.3",
|
||||||
"description": "Interactive house plan Lovelace card for Home Assistant",
|
"description": "Interactive house plan Lovelace card for Home Assistant",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ import {
|
|||||||
isActiveState, DEFAULT_ROOM_COLOR, DEFAULT_ROOM_OPACITY,
|
isActiveState, DEFAULT_ROOM_COLOR, DEFAULT_ROOM_OPACITY,
|
||||||
DEFAULT_TEMP_MIN, DEFAULT_TEMP_MAX, type SpaceDisplay,
|
DEFAULT_TEMP_MIN, DEFAULT_TEMP_MAX, type SpaceDisplay,
|
||||||
referencedContentUrls,
|
referencedContentUrls,
|
||||||
|
DISPLAY_MODES, TAP_ACTIONS, SPACE_FILL_MODES, ROOM_FILL_MODES,
|
||||||
} from './logic';
|
} from './logic';
|
||||||
import { ContentSigner } from './signing';
|
import { ContentSigner } from './signing';
|
||||||
import { buildDevices, lqiFor, tempFor, humFor, isHumEntity, areaLights, areaTemp, areaHum, areaLightStats, sourceValue, areaClimateMap, type AreaClimate } from './devices';
|
import { buildDevices, lqiFor, tempFor, humFor, isHumEntity, areaLights, areaTemp, areaHum, areaLightStats, sourceValue, areaClimateMap, type AreaClimate } from './devices';
|
||||||
@@ -34,7 +35,7 @@ import './space-card';
|
|||||||
import { cardStyles } from './styles';
|
import { cardStyles } from './styles';
|
||||||
import { langOf, t, type I18nKey } from './i18n';
|
import { langOf, t, type I18nKey } from './i18n';
|
||||||
|
|
||||||
const CARD_VERSION = '1.45.2';
|
const CARD_VERSION = '1.45.3';
|
||||||
const LS_KEY = 'houseplan_card_layout_v1';
|
const LS_KEY = 'houseplan_card_layout_v1';
|
||||||
const LS_CFG = 'houseplan_card_cfg_v1'; // cache of the server config+layout for instant rendering
|
const LS_CFG = 'houseplan_card_cfg_v1'; // cache of the server config+layout for instant rendering
|
||||||
const LS_ZOOM = 'houseplan_card_zoom_v1';
|
const LS_ZOOM = 'houseplan_card_zoom_v1';
|
||||||
@@ -4824,7 +4825,7 @@ class HouseplanCard extends LitElement {
|
|||||||
<label>${this._t('marker.tap_label')}</label>
|
<label>${this._t('marker.tap_label')}</label>
|
||||||
<select class="areasel"
|
<select class="areasel"
|
||||||
@change=${(e: Event) => (this._markerDialog = { ...d, tapAction: (e.target as HTMLSelectElement).value })}>
|
@change=${(e: Event) => (this._markerDialog = { ...d, tapAction: (e.target as HTMLSelectElement).value })}>
|
||||||
${[['info', 'tap.info'], ['more-info', 'tap.more_info'], ['toggle', 'tap.toggle']].map(
|
${TAP_ACTIONS.map((v) => [v, 'tap.' + v.replace('-', '_')] as const).map(
|
||||||
([v, k]) => html`<option value=${v} ?selected=${(d.tapAction || d.defaultTap) === v}>${this._t(k as any)}</option>`,
|
([v, k]) => html`<option value=${v} ?selected=${(d.tapAction || d.defaultTap) === v}>${this._t(k as any)}</option>`,
|
||||||
)}
|
)}
|
||||||
</select>
|
</select>
|
||||||
@@ -4895,7 +4896,7 @@ class HouseplanCard extends LitElement {
|
|||||||
<label>${this._t('marker.display_label')}</label>
|
<label>${this._t('marker.display_label')}</label>
|
||||||
<select class="areasel"
|
<select class="areasel"
|
||||||
@change=${(e: Event) => (this._markerDialog = { ...d, display: (e.target as HTMLSelectElement).value as any })}>
|
@change=${(e: Event) => (this._markerDialog = { ...d, display: (e.target as HTMLSelectElement).value as any })}>
|
||||||
${[['badge', 'display.badge'], ['ripple', 'display.ripple'], ['icon_ripple', 'display.icon_ripple'], ['value', 'display.value']].map(
|
${DISPLAY_MODES.map((v) => [v, 'display.' + v] as const).map(
|
||||||
([v, k]) => html`<option value=${v} ?selected=${d.display === v}>${this._t(k as any)}</option>`,
|
([v, k]) => html`<option value=${v} ?selected=${d.display === v}>${this._t(k as any)}</option>`,
|
||||||
)}
|
)}
|
||||||
</select>
|
</select>
|
||||||
@@ -5072,7 +5073,7 @@ class HouseplanCard extends LitElement {
|
|||||||
<span class="opv">${Math.round(d.roomOpacity * 100)}%</span>
|
<span class="opv">${Math.round(d.roomOpacity * 100)}%</span>
|
||||||
</div>
|
</div>
|
||||||
<label>${this._t('space.fill_label')}</label>
|
<label>${this._t('space.fill_label')}</label>
|
||||||
${[['none', 'fill.none'], ['lqi', 'fill.lqi'], ['light', 'fill.light'], ['temp', 'fill.temp'], ['glow', 'fill.glow']].map(
|
${SPACE_FILL_MODES.map((v) => [v, 'fill.' + v] as const).map(
|
||||||
([v, k]) => html`<label class="srcrow">
|
([v, k]) => html`<label class="srcrow">
|
||||||
<input type="radio" name="fillmode" .checked=${d.fillMode === v}
|
<input type="radio" name="fillmode" .checked=${d.fillMode === v}
|
||||||
@change=${() => (this._spaceDialog = { ...d, fillMode: v as any })} />
|
@change=${() => (this._spaceDialog = { ...d, fillMode: v as any })} />
|
||||||
@@ -5243,7 +5244,7 @@ class HouseplanCard extends LitElement {
|
|||||||
|
|
||||||
<label class="dispsection">${this._t('room.settings_section')}</label>
|
<label class="dispsection">${this._t('room.settings_section')}</label>
|
||||||
<label>${this._t('room.fill_label')}</label>
|
<label>${this._t('room.fill_label')}</label>
|
||||||
${([['', 'fill.inherit'], ['none', 'fill.none'], ['lqi', 'fill.lqi'], ['light', 'fill.light'], ['temp', 'fill.temp']] as const).map(
|
${([['', 'fill.inherit'], ...ROOM_FILL_MODES.map((v) => [v, 'fill.' + v])] as const).map(
|
||||||
([v, k]) => html`<label class="srcrow inline">
|
([v, k]) => html`<label class="srcrow inline">
|
||||||
<input type="radio" name="rfill" .checked=${this._roomFill === v}
|
<input type="radio" name="rfill" .checked=${this._roomFill === v}
|
||||||
@change=${() => { this._roomFill = v as any; this.requestUpdate(); }} />
|
@change=${() => { this._roomFill = v as any; this.requestUpdate(); }} />
|
||||||
|
|||||||
@@ -531,6 +531,24 @@ export function safeUrl(url: string | null | undefined): string | null {
|
|||||||
export type TapAction = 'info' | 'more-info' | 'toggle';
|
export type TapAction = 'info' | 'more-info' | 'toggle';
|
||||||
|
|
||||||
/** Domains a card-wide `tap_action: toggle` may toggle (accidental-tap safe). */
|
/** Domains a card-wide `tap_action: toggle` may toggle (accidental-tap safe). */
|
||||||
|
/**
|
||||||
|
* The option lists the editors offer, in one place — and the reason they are
|
||||||
|
* here rather than inline in the templates.
|
||||||
|
*
|
||||||
|
* `display` gained 'value' in v1.26.0 ("show the measurement instead of the
|
||||||
|
* icon") but the backend schema still only accepted badge/ripple/icon_ripple,
|
||||||
|
* so saving any marker configured that way was rejected outright — the feature
|
||||||
|
* was unusable for a year and a half and only surfaced through a user's error
|
||||||
|
* message (issue #3, 2026-07-27). The lists are exported so a backend test can
|
||||||
|
* read them and assert the schema accepts every value a user can pick.
|
||||||
|
* Adding an option here and forgetting the schema now fails the test suite.
|
||||||
|
*/
|
||||||
|
export const DISPLAY_MODES = ['badge', 'ripple', 'icon_ripple', 'value'] as const;
|
||||||
|
export const TAP_ACTIONS = ['info', 'more-info', 'toggle'] as const;
|
||||||
|
/** Space-level fill: 'glow' is a whole-space light model, not a per-room one. */
|
||||||
|
export const SPACE_FILL_MODES = ['none', 'lqi', 'light', 'temp', 'glow'] as const;
|
||||||
|
export const ROOM_FILL_MODES = ['none', 'lqi', 'light', 'temp'] as const;
|
||||||
|
|
||||||
export const TOGGLE_SAFE_DOMAINS = new Set(['light', 'switch', 'fan', 'humidifier']);
|
export const TOGGLE_SAFE_DOMAINS = new Set(['light', 'switch', 'fan', 'humidifier']);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -396,6 +396,31 @@ async def test_collection_ignores_files_that_are_not_plans(
|
|||||||
assert (plans / "readme").is_file()
|
assert (plans / "readme").is_file()
|
||||||
|
|
||||||
|
|
||||||
|
async def test_a_marker_showing_its_value_can_be_saved(
|
||||||
|
hass: HomeAssistant, hass_ws_client: WebSocketGenerator
|
||||||
|
) -> None:
|
||||||
|
"""issue #3: display='value' was rejected, and one bad marker fails the lot.
|
||||||
|
|
||||||
|
A user could not save the configuration at all after setting any sensor to
|
||||||
|
"value instead of an icon" — the editor offered the option, the schema had
|
||||||
|
never heard of it.
|
||||||
|
"""
|
||||||
|
await _setup(hass)
|
||||||
|
client = await hass_ws_client(hass)
|
||||||
|
|
||||||
|
cfg = await _cfg([{"id": "f1", "plan_url": None}])
|
||||||
|
cfg["markers"] = [
|
||||||
|
{"id": "sensor.t", "binding": "entity:sensor.t", "display": "value"},
|
||||||
|
{"id": "sensor.h", "binding": "entity:sensor.h", "display": "badge"},
|
||||||
|
]
|
||||||
|
ok = await _save(client, cfg, 0)
|
||||||
|
assert ok["success"], ok.get("error")
|
||||||
|
|
||||||
|
await client.send_json_auto_id({"type": "houseplan/config/get"})
|
||||||
|
got = await client.receive_json()
|
||||||
|
assert [m["display"] for m in got["result"]["config"]["markers"]] == ["value", "badge"]
|
||||||
|
|
||||||
|
|
||||||
async def test_a_failing_collector_does_not_undo_an_accepted_save(
|
async def test_a_failing_collector_does_not_undo_an_accepted_save(
|
||||||
hass: HomeAssistant, hass_ws_client: WebSocketGenerator, monkeypatch
|
hass: HomeAssistant, hass_ws_client: WebSocketGenerator, monkeypatch
|
||||||
) -> None:
|
) -> None:
|
||||||
|
|||||||
@@ -305,3 +305,79 @@ def test_collect_plans_never_raises_when_the_directory_disappears(tmp_path, monk
|
|||||||
|
|
||||||
monkeypatch.setattr(type(d), "iterdir", _boom, raising=False)
|
monkeypatch.setattr(type(d), "iterdir", _boom, raising=False)
|
||||||
assert collect_plans(d, _cfg("/p/a.png"), _cfg("/p/b.png")) == 0
|
assert collect_plans(d, _cfg("/p/a.png"), _cfg("/p/b.png")) == 0
|
||||||
|
|
||||||
|
|
||||||
|
# ---------- the editor's options must be storable (issue #3) ----------
|
||||||
|
|
||||||
|
|
||||||
|
def _ts_list(name):
|
||||||
|
"""Read one `export const NAME = [...] as const;` list out of src/logic.ts.
|
||||||
|
|
||||||
|
Deliberately reads the TypeScript source rather than duplicating the values:
|
||||||
|
a list that lives in two places drifts, which is exactly what happened here.
|
||||||
|
"""
|
||||||
|
import re
|
||||||
|
|
||||||
|
src = os.path.join(os.path.dirname(os.path.dirname(__file__)), "src", "logic.ts")
|
||||||
|
with open(src, encoding="utf-8") as fh:
|
||||||
|
text = fh.read()
|
||||||
|
m = re.search(rf"export const {name} = \[(.*?)\] as const;", text, re.S)
|
||||||
|
assert m, f"{name} not found in src/logic.ts"
|
||||||
|
return re.findall(r"'([^']+)'", m.group(1))
|
||||||
|
|
||||||
|
|
||||||
|
def _marker(**extra):
|
||||||
|
return {"id": "m1", "binding": "entity:sensor.x", **extra}
|
||||||
|
|
||||||
|
|
||||||
|
def test_every_display_mode_the_editor_offers_is_accepted():
|
||||||
|
"""issue #3: 'value' was added to the card in v1.26.0 and never to the schema.
|
||||||
|
|
||||||
|
Saving a sensor set to "value instead of an icon" failed with
|
||||||
|
"not a valid value for dictionary value @ data['config']['markers'][n]['display']",
|
||||||
|
and because one bad marker rejects the whole config, the user could not save
|
||||||
|
at all. Reported 2026-07-27.
|
||||||
|
"""
|
||||||
|
modes = _ts_list("DISPLAY_MODES")
|
||||||
|
assert "value" in modes, "the regression this test exists for"
|
||||||
|
for mode in modes:
|
||||||
|
v.MARKER_SCHEMA(_marker(display=mode))
|
||||||
|
v.MARKER_SCHEMA(_marker(display=None))
|
||||||
|
with pytest.raises(vol.Invalid):
|
||||||
|
v.MARKER_SCHEMA(_marker(display="wat"))
|
||||||
|
|
||||||
|
|
||||||
|
def test_every_tap_action_the_editor_offers_is_accepted():
|
||||||
|
for action in _ts_list("TAP_ACTIONS"):
|
||||||
|
v.MARKER_SCHEMA(_marker(tap_action=action))
|
||||||
|
with pytest.raises(vol.Invalid):
|
||||||
|
v.MARKER_SCHEMA(_marker(tap_action="launch-missiles"))
|
||||||
|
|
||||||
|
|
||||||
|
def _space(**settings):
|
||||||
|
return {
|
||||||
|
"id": "f1", "title": "F1", "aspect": 1.4, "view_box": [0, 0, 1, 1],
|
||||||
|
"rooms": [], "settings": settings,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def test_every_fill_mode_the_editor_offers_is_accepted():
|
||||||
|
for mode in _ts_list("SPACE_FILL_MODES"):
|
||||||
|
v.SPACE_SCHEMA(_space(fill_mode=mode))
|
||||||
|
with pytest.raises(vol.Invalid):
|
||||||
|
v.SPACE_SCHEMA(_space(fill_mode="rainbow"))
|
||||||
|
|
||||||
|
|
||||||
|
def test_every_room_fill_mode_the_editor_offers_is_accepted():
|
||||||
|
def room(mode):
|
||||||
|
return {
|
||||||
|
"id": "f1", "title": "F1", "aspect": 1.4, "view_box": [0, 0, 1, 1],
|
||||||
|
"rooms": [{"id": "r1", "name": "R", "x": 0.1, "y": 0.1, "w": 0.2, "h": 0.2,
|
||||||
|
"settings": {"fill_mode": mode}}],
|
||||||
|
}
|
||||||
|
|
||||||
|
for mode in _ts_list("ROOM_FILL_MODES"):
|
||||||
|
v.SPACE_SCHEMA(room(mode))
|
||||||
|
v.SPACE_SCHEMA(room(None)) # inherit from the space
|
||||||
|
with pytest.raises(vol.Invalid):
|
||||||
|
v.SPACE_SCHEMA(room("rainbow"))
|
||||||
|
|||||||
Reference in New Issue
Block a user