39 Commits
0.5.2 ... 0.5.7

Author SHA1 Message Date
cc8db6a034 Add 0.5.7 2026-01-17 11:01:14 +00:00
e0ad133221 0.5.7 2026-01-17 11:00:36 +00:00
0e27a03aaf Fix laxout mobile 2026-01-17 10:59:48 +00:00
e2dfa20789 0.5.6 2026-01-17 08:39:24 +00:00
8e8b58d2d2 0.5.6 2026-01-17 08:37:09 +00:00
76ecaabd98 0.5.6 2026-01-17 08:35:21 +00:00
3f14dc3bd9 Buttons add 8n panel 2026-01-17 08:16:54 +00:00
50a78714cc Button gix 2026-01-17 08:16:10 +00:00
3bf01c91f1 Button fix 2026-01-17 08:15:32 +00:00
7aa14284dd Button fix 2026-01-17 08:14:59 +00:00
24933e980d Button 2026-01-17 08:13:22 +00:00
e10624df6b Button 1 2026-01-17 08:04:02 +00:00
1a1ebd3821 Button 2026-01-17 08:01:43 +00:00
d3d61067db Button 2026-01-17 08:01:23 +00:00
23b605becf Button delete 2026-01-17 07:59:20 +00:00
c07f8615e4 Add 0.5.5 2026-01-16 20:18:34 +00:00
9b209a15bf 0.5.5 2026-01-16 20:17:28 +00:00
30258bd2c0 Fix 0.5.4 to. 5 2026-01-16 20:15:11 +00:00
2c8ca490ea Add 0.5.4 2026-01-16 20:06:08 +00:00
9e8a8e81b9 0.5.4 fix 2026-01-16 20:05:20 +00:00
f5b2534fdb 0.5.4 2026-01-16 20:02:24 +00:00
8b3916c3fa 0.5.4 2026-01-16 19:59:33 +00:00
13e71046f8 Add on 0.5.4 2026-01-16 19:58:58 +00:00
58e3674325 0.5.4 2026-01-16 19:57:49 +00:00
828d84caa3 0.5.3 2026-01-16 19:55:20 +00:00
c18e93406a 0.5.3 2026-01-16 19:20:07 +00:00
9af18ba090 0.5.3 2026-01-16 19:19:23 +00:00
fff50a1580 0.5.3 2026-01-16 19:18:47 +00:00
f8e9967c3a 0.5.3 2026-01-16 19:18:09 +00:00
7bc493eb45 0.5.3 2026-01-16 19:16:39 +00:00
b97b970a45 Dump 2026-01-16 19:16:01 +00:00
593e0c367d 0.5.3 2026-01-16 19:14:35 +00:00
8e0817a64b 0.5.3 2026-01-16 19:13:56 +00:00
dfc7e44565 0.5.3 2026-01-16 19:13:17 +00:00
c9c4f99fbf 0.5.3 2026-01-16 19:12:43 +00:00
37cc11c9ee 0.5.3 2026-01-16 19:12:10 +00:00
9c773c07e8 0.5.3 2026-01-16 19:11:26 +00:00
c04612e159 0.5.3 2026-01-16 19:10:35 +00:00
5796012189 0.5.3 2026-01-16 19:09:47 +00:00
10 changed files with 640 additions and 204 deletions

View File

@@ -11,6 +11,58 @@ Sections:
--- ---
## [0.5.7] - 2026-01-17
### Changed
- Mobile UI improvements: removed floating action buttons to prevent overlay issues.
- Improved responsive layout to avoid horizontal overflow (badges, URLs, descriptions).
- README rendering on mobile is more stable (better wrapping and image scaling).
- Header icon buttons are more readable in both light and dark mode.
## [0.5.6] - 2026-01-17
### Added
- Repository uninstall support directly from the Store UI.
- New backend API endpoint: `POST /api/bcs/uninstall`.
- Automatic **reconcile**: repositories are marked as not installed when their `custom_components` directories are removed manually.
### Changed
- Installation & Updates section extended with an Uninstall button.
- Store state now remains consistent even after manual file system changes.
### Fixed
- Repositories remained marked as installed after manual deletion of their domains.
- UI cache issues caused by outdated static assets.
## [0.5.5] - 2026-01-16
### Fixed
- Update entities now refresh their displayed name after store refreshes, so repository names replace fallback IDs (e.g. `index:1`) reliably.
## [0.5.4] - 2026-01-16
### Added
- Native **Repair fix flow** for restart-required situations.
- “Restart required” issues are now **fixable** and provide a confirmation dialog with a real restart action.
### Changed
- Restart-required issues are automatically cleared after Home Assistant restarts.
- Update entities now fully align with official Home Assistant behavior (Updates screen + Repairs integration).
### Fixed
- Fixed integration startup issues caused by incorrect file placement.
- Resolved circular import and missing setup errors during Home Assistant startup.
- Ensured YAML-based setup remains fully supported.
## [0.5.3] - 2026-01-16
### Added
- Native Home Assistant Update entities for installed repositories (shown under **Settings → System → Updates**).
- Human-friendly update names based on repository name (instead of internal repo IDs like `index:1`).
### Changed
- Update UI now behaves like official Home Assistant integrations (update action is triggered via the HA Updates screen).
## [0.5.2] - 2026-01-16 ## [0.5.2] - 2026-01-16
### Added ### Added

View File

@@ -6,6 +6,7 @@ from datetime import timedelta
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.components.panel_custom import async_register_panel from homeassistant.components.panel_custom import async_register_panel
from homeassistant.helpers.event import async_track_time_interval from homeassistant.helpers.event import async_track_time_interval
from homeassistant.helpers.discovery import async_load_platform
from .core import BCSCore, BCSConfig, BCSError from .core import BCSCore, BCSConfig, BCSError
@@ -26,6 +27,10 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
await core.async_initialize() await core.async_initialize()
# Provide native Update entities in Settings -> System -> Updates.
# This integration is YAML-based (async_setup), therefore we load the platform manually.
await async_load_platform(hass, "update", DOMAIN, {}, config)
from .views import ( from .views import (
StaticAssetsView, StaticAssetsView,
BCSApiView, BCSApiView,
@@ -33,6 +38,7 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
BCSCustomRepoView, BCSCustomRepoView,
BCSInstallView, BCSInstallView,
BCSUpdateView, BCSUpdateView,
BCSUninstallView,
BCSRestartView, BCSRestartView,
) )
@@ -42,6 +48,7 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
hass.http.register_view(BCSCustomRepoView(core)) hass.http.register_view(BCSCustomRepoView(core))
hass.http.register_view(BCSInstallView(core)) hass.http.register_view(BCSInstallView(core))
hass.http.register_view(BCSUpdateView(core)) hass.http.register_view(BCSUpdateView(core))
hass.http.register_view(BCSUninstallView(core))
hass.http.register_view(BCSRestartView(core)) hass.http.register_view(BCSRestartView(core))
await async_register_panel( await async_register_panel(
@@ -49,7 +56,7 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
frontend_url_path="bahmcloud-store", frontend_url_path="bahmcloud-store",
webcomponent_name="bahmcloud-store-panel", webcomponent_name="bahmcloud-store-panel",
# IMPORTANT: bump v to avoid caching old JS # IMPORTANT: bump v to avoid caching old JS
module_url="/api/bahmcloud_store_static/panel.js?v=101", module_url="/api/bahmcloud_store_static/panel.js?v=102",
sidebar_title="Bahmcloud Store", sidebar_title="Bahmcloud Store",
sidebar_icon="mdi:store", sidebar_icon="mdi:store",
require_admin=True, require_admin=True,

View File

@@ -15,7 +15,8 @@ from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit, urlparse
from homeassistant.core import HomeAssistant from homeassistant.core import HomeAssistant
from homeassistant.helpers.aiohttp_client import async_get_clientsession from homeassistant.helpers.aiohttp_client import async_get_clientsession
from homeassistant.components import persistent_notification from homeassistant.helpers.dispatcher import async_dispatcher_send
from homeassistant.helpers import issue_registry as ir
from homeassistant.util import yaml as ha_yaml from homeassistant.util import yaml as ha_yaml
from .storage import BCSStorage, CustomRepo from .storage import BCSStorage, CustomRepo
@@ -26,6 +27,9 @@ _LOGGER = logging.getLogger(__name__)
DOMAIN = "bahmcloud_store" DOMAIN = "bahmcloud_store"
SIGNAL_UPDATED = f"{DOMAIN}_updated"
RESTART_REQUIRED_ISSUE_ID = "restart_required"
class BCSError(Exception): class BCSError(Exception):
"""BCS core error.""" """BCS core error."""
@@ -91,6 +95,9 @@ class BCSCore:
self.version = await self._read_manifest_version_async() self.version = await self._read_manifest_version_async()
await self._refresh_installed_cache() await self._refresh_installed_cache()
# After a successful HA restart, restart-required is no longer relevant.
self._clear_restart_required_issue()
async def _read_manifest_version_async(self) -> str: async def _read_manifest_version_async(self) -> str:
def _read() -> str: def _read() -> str:
try: try:
@@ -107,12 +114,44 @@ class BCSCore:
self._listeners.append(cb) self._listeners.append(cb)
def signal_updated(self) -> None: def signal_updated(self) -> None:
# Notify entities/platforms (e.g. update entities) that BCS data changed.
async_dispatcher_send(self.hass, SIGNAL_UPDATED)
for cb in list(self._listeners): for cb in list(self._listeners):
try: try:
cb() cb()
except Exception: except Exception:
pass pass
def _mark_restart_required(self) -> None:
"""Show a 'restart required' issue in Home Assistant Settings.
IMPORTANT:
- is_fixable=True enables the "Fix/OK" button
- the real action is implemented in repairs.py (fix flow)
"""
try:
ir.async_create_issue(
self.hass,
DOMAIN,
RESTART_REQUIRED_ISSUE_ID,
is_fixable=True, # <-- IMPORTANT: show "Fix" button
is_persistent=False,
severity=ir.IssueSeverity.WARNING,
translation_key=RESTART_REQUIRED_ISSUE_ID,
)
except Exception:
_LOGGER.debug("Failed to create restart required issue", exc_info=True)
def _clear_restart_required_issue(self) -> None:
"""Remove restart required issue after HA restarted."""
try:
if hasattr(ir, "async_delete_issue"):
ir.async_delete_issue(self.hass, DOMAIN, RESTART_REQUIRED_ISSUE_ID)
elif hasattr(ir, "async_remove_issue"):
ir.async_remove_issue(self.hass, DOMAIN, RESTART_REQUIRED_ISSUE_ID)
except Exception:
_LOGGER.debug("Failed to clear restart required issue", exc_info=True)
async def full_refresh(self, source: str = "manual") -> None: async def full_refresh(self, source: str = "manual") -> None:
"""Single refresh entry-point used by both timer and manual button.""" """Single refresh entry-point used by both timer and manual button."""
_LOGGER.info("BCS full refresh triggered (source=%s)", source) _LOGGER.info("BCS full refresh triggered (source=%s)", source)
@@ -122,6 +161,11 @@ class BCSCore:
def get_repo(self, repo_id: str) -> RepoItem | None: def get_repo(self, repo_id: str) -> RepoItem | None:
return self.repos.get(repo_id) return self.repos.get(repo_id)
def get_installed(self, repo_id: str) -> dict[str, Any] | None:
"""Return cached installation info for a repo_id (no I/O)."""
data = (self._installed_cache or {}).get(repo_id)
return data if isinstance(data, dict) else None
async def refresh(self) -> None: async def refresh(self) -> None:
index_repos, refresh_seconds = await self._load_index_repos() index_repos, refresh_seconds = await self._load_index_repos()
self.refresh_seconds = refresh_seconds self.refresh_seconds = refresh_seconds
@@ -322,7 +366,6 @@ class BCSCore:
if isinstance(d, list): if isinstance(d, list):
installed_domains = [str(x) for x in d if str(x).strip()] installed_domains = [str(x) for x in d if str(x).strip()]
# IMPORTANT: this is the ref we installed (tag/release/branch)
v = inst.get("installed_version") v = inst.get("installed_version")
installed_version = str(v) if v is not None else None installed_version = str(v) if v is not None else None
@@ -367,7 +410,6 @@ class BCSCore:
) )
def _pick_ref_for_install(self, repo: RepoItem) -> str: def _pick_ref_for_install(self, repo: RepoItem) -> str:
# Prefer latest_version (release/tag/atom-derived), fallback to default branch, then main.
if repo.latest_version and str(repo.latest_version).strip(): if repo.latest_version and str(repo.latest_version).strip():
return str(repo.latest_version).strip() return str(repo.latest_version).strip()
if repo.default_branch and str(repo.default_branch).strip(): if repo.default_branch and str(repo.default_branch).strip():
@@ -375,13 +417,6 @@ class BCSCore:
return "main" return "main"
def _build_zip_url(self, repo_url: str, ref: str) -> str: def _build_zip_url(self, repo_url: str, ref: str) -> str:
"""Build a public ZIP download URL (provider-neutral, no tokens).
Supports:
- GitHub: codeload
- GitLab: /-/archive/
- Gitea (incl. Bahmcloud): /archive/<ref>.zip
"""
ref = (ref or "").strip() ref = (ref or "").strip()
if not ref: if not ref:
raise BCSInstallError("Missing ref for ZIP download") raise BCSInstallError("Missing ref for ZIP download")
@@ -480,21 +515,93 @@ class BCSCore:
return await self.hass.async_add_executor_job(_read) return await self.hass.async_add_executor_job(_read)
async def _refresh_installed_cache(self) -> None: async def _refresh_installed_cache(self) -> None:
"""Refresh installed cache and reconcile with filesystem.
If a user manually deletes a domain folder under /config/custom_components,
we automatically remove the installed flag from our storage so the Store UI
does not show stale "installed" state.
"""
try: try:
items = await self.storage.list_installed_repos() items = await self.storage.list_installed_repos()
cache: dict[str, Any] = {} cache: dict[str, Any] = {}
# Determine which installed repos still exist on disk.
cc_root = Path(self.hass.config.path("custom_components"))
to_remove: list[str] = []
for it in items: for it in items:
domains = [str(d) for d in (it.domains or []) if str(d).strip()]
# A repo is considered "present" if at least one of its domains
# exists and contains a manifest.json.
present = False
for d in domains:
p = cc_root / d
if p.is_dir() and (p / "manifest.json").exists():
present = True
break
if not present:
to_remove.append(it.repo_id)
continue
cache[it.repo_id] = { cache[it.repo_id] = {
"domains": it.domains, "installed": True,
"installed_version": it.installed_version, # BCS ref "domains": domains,
"installed_version": it.installed_version,
"installed_manifest_version": it.installed_manifest_version, "installed_manifest_version": it.installed_manifest_version,
"ref": it.ref, "ref": it.ref,
"installed_at": it.installed_at, "installed_at": it.installed_at,
} }
# Remove stale installed entries from storage.
for rid in to_remove:
try:
await self.storage.remove_installed_repo(rid)
_LOGGER.info("BCS reconcile: removed stale installed repo_id=%s", rid)
except Exception:
_LOGGER.debug("BCS reconcile: failed removing stale repo_id=%s", rid, exc_info=True)
self._installed_cache = cache self._installed_cache = cache
except Exception: except Exception:
self._installed_cache = {} self._installed_cache = {}
async def uninstall_repo(self, repo_id: str) -> dict[str, Any]:
"""Uninstall a repository by deleting its installed domains and clearing storage."""
async with self._install_lock:
inst = await self.storage.get_installed_repo(repo_id)
if not inst:
# Already uninstalled.
await self._refresh_installed_cache()
self.signal_updated()
return {"ok": True, "repo_id": repo_id, "removed": [], "restart_required": False}
cc_root = Path(self.hass.config.path("custom_components"))
removed: list[str] = []
def _remove_dir(path: Path) -> None:
if path.exists() and path.is_dir():
shutil.rmtree(path, ignore_errors=True)
for domain in inst.domains:
d = str(domain).strip()
if not d:
continue
target = cc_root / d
await self.hass.async_add_executor_job(_remove_dir, target)
removed.append(d)
await self.storage.remove_installed_repo(repo_id)
await self._refresh_installed_cache()
# Show restart required in Settings.
if removed:
self._mark_restart_required()
_LOGGER.info("BCS uninstall complete: repo_id=%s removed_domains=%s", repo_id, removed)
self.signal_updated()
return {"ok": True, "repo_id": repo_id, "removed": removed, "restart_required": bool(removed)}
async def install_repo(self, repo_id: str) -> dict[str, Any]: async def install_repo(self, repo_id: str) -> dict[str, Any]:
repo = self.get_repo(repo_id) repo = self.get_repo(repo_id)
if not repo: if not repo:
@@ -534,11 +641,7 @@ class BCSCore:
if not installed_domains: if not installed_domains:
raise BCSInstallError("No integrations found under custom_components/ (missing manifest.json)") raise BCSInstallError("No integrations found under custom_components/ (missing manifest.json)")
# informational only (many repos are wrong here)
installed_manifest_version = await self._read_installed_manifest_version(installed_domains[0]) installed_manifest_version = await self._read_installed_manifest_version(installed_domains[0])
# IMPORTANT: BCS "installed_version" is the ref we installed (tag/release/branch),
# so update logic won't break when manifest.json is 0.0.0 or outdated.
installed_version = ref installed_version = ref
await self.storage.set_installed_repo( await self.storage.set_installed_repo(
@@ -551,12 +654,7 @@ class BCSCore:
) )
await self._refresh_installed_cache() await self._refresh_installed_cache()
persistent_notification.async_create( self._mark_restart_required()
self.hass,
"Bahmcloud Store installation finished. A Home Assistant restart is required to load the integration.",
title="Bahmcloud Store",
notification_id="bcs_restart_required",
)
_LOGGER.info( _LOGGER.info(
"BCS install complete: repo_id=%s domains=%s installed_ref=%s manifest_version=%s", "BCS install complete: repo_id=%s domains=%s installed_ref=%s manifest_version=%s",

View File

@@ -1,8 +1,9 @@
{ {
"domain": "bahmcloud_store", "domain": "bahmcloud_store",
"name": "Bahmcloud Store", "name": "Bahmcloud Store",
"version": "0.5.2", "version": "0.5.7",
"documentation": "https://git.bahmcloud.de/bahmcloud/bahmcloud_store", "documentation": "https://git.bahmcloud.de/bahmcloud/bahmcloud_store",
"platforms": ["update"],
"requirements": [], "requirements": [],
"codeowners": ["@bahmcloud"], "codeowners": ["@bahmcloud"],
"iot_class": "local_polling" "iot_class": "local_polling"

View File

@@ -29,6 +29,7 @@ class BahmcloudStorePanel extends HTMLElement {
this._installingRepoId = null; this._installingRepoId = null;
this._updatingRepoId = null; this._updatingRepoId = null;
this._uninstallingRepoId = null;
this._restartRequired = false; this._restartRequired = false;
this._lastActionMsg = null; this._lastActionMsg = null;
} }
@@ -141,6 +142,36 @@ class BahmcloudStorePanel extends HTMLElement {
} }
} }
async _uninstallRepo(repoId) {
if (!repoId) return;
if (this._installingRepoId || this._updatingRepoId || this._uninstallingRepoId) return;
const r = this._repoById(repoId);
const name = this._safeText(r?.name) || repoId;
const ok = window.confirm(`Uninstall "${name}"?\n\nThis will delete the integration folder(s) from /config/custom_components. A restart will be required.`);
if (!ok) return;
this._uninstallingRepoId = repoId;
this._lastActionMsg = null;
this.requestUpdate();
try {
const resp = await this._hass.callApi("post", `bcs/uninstall?repo_id=${encodeURIComponent(repoId)}`, {});
if (resp && resp.ok) {
this._restartRequired = !!resp.restart_required;
this._lastActionMsg = "Uninstalled. Restart required.";
} else {
this._lastActionMsg = (resp && resp.message) ? String(resp.message) : "Uninstall failed.";
}
} catch (e) {
this._lastActionMsg = e && e.message ? e.message : "Uninstall failed.";
} finally {
this._uninstallingRepoId = null;
await this._load();
}
}
async _restartHA() { async _restartHA() {
if (!this._hass) return; if (!this._hass) return;
try { try {
@@ -436,15 +467,15 @@ class BahmcloudStorePanel extends HTMLElement {
<div class="mobilebar"> <div class="mobilebar">
<div class="left"> <div class="left">
<div class="iconbtn" id="menuBtn" title="Menu"></div> <div class="iconbtn" id="menuBtn" title="Menu"><EFBFBD></div>
<div class="iconbtn" id="backBtn" title="Back"></div> <div class="iconbtn" id="backBtn" title="Back"><EFBFBD></div>
<div> <div>
<div style="font-weight:700;">Bahmcloud Store</div> <div style="font-weight:700;">Bahmcloud Store</div>
<div class="muted small" id="subtitle">Store</div> <div class="muted small" id="subtitle">Store</div>
</div> </div>
</div> </div>
<div class="right"> <div class="right">
<div class="iconbtn" id="refreshBtn" title="Refresh"></div> <div class="iconbtn" id="refreshBtn" title="Refresh"><EFBFBD></div>
</div> </div>
</div> </div>
@@ -506,7 +537,7 @@ class BahmcloudStorePanel extends HTMLElement {
: ""; : "";
if (this._loading) { if (this._loading) {
content.innerHTML = `${err}<div class="card">Loading</div>`; content.innerHTML = `${err}<div class="card">Loading<EFBFBD></div>`;
fabs.innerHTML = ""; fabs.innerHTML = "";
return; return;
} }
@@ -608,7 +639,7 @@ class BahmcloudStorePanel extends HTMLElement {
if (updateAvailable) badges.push("Update"); if (updateAvailable) badges.push("Update");
const badgeHtml = badges.length const badgeHtml = badges.length
? `<div class="badge">${this._esc(badges.join(" · "))}</div>` ? `<div class="badge">${this._esc(badges.join(" "))}</div>`
: `<div class="badge">${this._esc(this._safeText(r?.provider || "repo"))}</div>`; : `<div class="badge">${this._esc(this._safeText(r?.provider || "repo"))}</div>`;
return ` return `
@@ -628,7 +659,7 @@ class BahmcloudStorePanel extends HTMLElement {
return ` return `
<div class="filters"> <div class="filters">
<input id="q" placeholder="Search" value="${this._esc(this._search)}" /> <input id="q" placeholder="Search<EFBFBD>" value="${this._esc(this._search)}" />
<select id="cat"> <select id="cat">
<option value="all">All categories</option> <option value="all">All categories</option>
${categories.map((c) => `<option value="${this._esc(c)}" ${this._category === c ? "selected" : ""}>${this._esc(c)}</option>`).join("")} ${categories.map((c) => `<option value="${this._esc(c)}" ${this._category === c ? "selected" : ""}>${this._esc(c)}</option>`).join("")}
@@ -640,7 +671,7 @@ class BahmcloudStorePanel extends HTMLElement {
</select> </select>
</div> </div>
<div class="muted small">Version: ${this._esc(this._data.version || "-")} · Repositories: ${repos.length}</div> <div class="muted small">Version: ${this._esc(this._data.version || "-")} Repositories: ${repos.length}</div>
<div class="grid" style="margin-top:12px;"> <div class="grid" style="margin-top:12px;">
${cards || `<div class="card">No repositories found.</div>`} ${cards || `<div class="card">No repositories found.</div>`}
@@ -713,7 +744,7 @@ class BahmcloudStorePanel extends HTMLElement {
].filter(Boolean); ].filter(Boolean);
const readmeBlock = this._readmeLoading const readmeBlock = this._readmeLoading
? `<div class="card">Loading README</div>` ? `<div class="card">Loading README<EFBFBD></div>`
: this._readmeText : this._readmeText
? ` ? `
<div class="card"> <div class="card">
@@ -748,12 +779,14 @@ class BahmcloudStorePanel extends HTMLElement {
const busyInstall = this._installingRepoId === repoId; const busyInstall = this._installingRepoId === repoId;
const busyUpdate = this._updatingRepoId === repoId; const busyUpdate = this._updatingRepoId === repoId;
const busy = busyInstall || busyUpdate; const busyUninstall = this._uninstallingRepoId === repoId;
const busy = busyInstall || busyUpdate || busyUninstall;
const updateAvailable = installed && !!latestVersion && (!installedVersion || latestVersion !== installedVersion); const updateAvailable = installed && !!latestVersion && (!installedVersion || latestVersion !== installedVersion);
const installBtn = `<button class="primary" id="btnInstall" ${installed || busy ? "disabled" : ""}>${busyInstall ? "Installing" : installed ? "Installed" : "Install"}</button>`; const installBtn = `<button class="primary" id="btnInstall" ${installed || busy ? "disabled" : ""}>${busyInstall ? "Installing<EFBFBD>" : installed ? "Installed" : "Install"}</button>`;
const updateBtn = `<button class="primary" id="btnUpdate" ${!updateAvailable || busy ? "disabled" : ""}>${busyUpdate ? "Updating" : updateAvailable ? "Update" : "Up to date"}</button>`; const updateBtn = `<button class="primary" id="btnUpdate" ${!updateAvailable || busy ? "disabled" : ""}>${busyUpdate ? "Updating<EFBFBD>" : updateAvailable ? "Update" : "Up to date"}</button>`;
const uninstallBtn = `<button id="btnUninstall" ${!installed || busy ? "disabled" : ""}>${busyUninstall ? "Uninstalling鈥<67>" : "Uninstall"}</button>`;
const restartHint = this._restartRequired const restartHint = this._restartRequired
? ` ? `
@@ -777,7 +810,7 @@ class BahmcloudStorePanel extends HTMLElement {
<div> <div>
<div><strong style="font-size:16px;">${this._esc(name)}</strong></div> <div><strong style="font-size:16px;">${this._esc(name)}</strong></div>
<div class="muted">${this._esc(desc)}</div> <div class="muted">${this._esc(desc)}</div>
<div class="muted small" style="margin-top:8px;">${this._esc(infoBits.join(" · "))}</div> <div class="muted small" style="margin-top:8px;">${this._esc(infoBits.join(" "))}</div>
<div class="muted small" style="margin-top:8px;"> <div class="muted small" style="margin-top:8px;">
<a href="${this._esc(url)}" target="_blank" rel="noreferrer">Open repository</a> <a href="${this._esc(url)}" target="_blank" rel="noreferrer">Open repository</a>
</div> </div>
@@ -805,6 +838,7 @@ class BahmcloudStorePanel extends HTMLElement {
<div class="row" style="margin-top:14px; gap:10px; flex-wrap:wrap;"> <div class="row" style="margin-top:14px; gap:10px; flex-wrap:wrap;">
${installBtn} ${installBtn}
${updateBtn} ${updateBtn}
${uninstallBtn}
</div> </div>
${restartHint} ${restartHint}
@@ -820,6 +854,7 @@ class BahmcloudStorePanel extends HTMLElement {
// Always wire action buttons (even if README is already loaded) // Always wire action buttons (even if README is already loaded)
const btnInstall = root.getElementById("btnInstall"); const btnInstall = root.getElementById("btnInstall");
const btnUpdate = root.getElementById("btnUpdate"); const btnUpdate = root.getElementById("btnUpdate");
const btnUninstall = root.getElementById("btnUninstall");
const btnRestart = root.getElementById("btnRestart"); const btnRestart = root.getElementById("btnRestart");
if (btnInstall) { if (btnInstall) {
@@ -836,6 +871,13 @@ class BahmcloudStorePanel extends HTMLElement {
}); });
} }
if (btnUninstall) {
btnUninstall.addEventListener("click", () => {
if (btnUninstall.disabled) return;
if (this._detailRepoId) this._uninstallRepo(this._detailRepoId);
});
}
if (btnRestart) { if (btnRestart) {
btnRestart.addEventListener("click", () => this._restartHA()); btnRestart.addEventListener("click", () => this._restartHA());
} }
@@ -848,7 +890,7 @@ class BahmcloudStorePanel extends HTMLElement {
mount.innerHTML = this._readmeHtml; mount.innerHTML = this._readmeHtml;
this._postprocessRenderedMarkdown(mount); this._postprocessRenderedMarkdown(mount);
} else { } else {
mount.innerHTML = `<div class="muted">Rendered HTML not available. Use “Show raw Markdown.</div>`; mount.innerHTML = `<div class="muted">Rendered HTML not available. Use 鈥淪how raw Markdown<EFBFBD>.</div>`;
} }
} else { } else {
mount.innerHTML = ""; mount.innerHTML = "";
@@ -883,10 +925,10 @@ class BahmcloudStorePanel extends HTMLElement {
return ` return `
<div class="fabs"> <div class="fabs">
<button class="fabbtn primary" id="fabOpen" title="Open repository"></button> <button class="fabbtn primary" id="fabOpen" title="Open repository"><EFBFBD></button>
<button class="fabbtn" id="fabReload" title="Reload README"></button> <button class="fabbtn" id="fabReload" title="Reload README"><EFBFBD></button>
<button class="fabbtn" id="fabInstall" title="${installDisabled ? (installed ? "Already installed" : "Installing") : "Install"}" ${installDisabled ? "disabled" : ""}></button> <button class="fabbtn" id="fabInstall" title="${installDisabled ? (installed ? "Already installed" : "Installing<EFBFBD>") : "Install"}" ${installDisabled ? "disabled" : ""}><EFBFBD></button>
<button class="fabbtn" id="fabUpdate" title="${updateDisabled ? (!installed ? "Not installed" : "No update available") : "Update"}" ${updateDisabled ? "disabled" : ""}></button> <button class="fabbtn" id="fabUpdate" title="${updateDisabled ? (!installed ? "Not installed" : "No update available") : "Update"}" ${updateDisabled ? "disabled" : ""}><EFBFBD></button>
<button class="fabbtn" id="fabInfo" title="About">i</button> <button class="fabbtn" id="fabInfo" title="About">i</button>
</div> </div>
`; `;

View File

@@ -25,13 +25,11 @@ class BahmcloudStorePanel extends HTMLElement {
this._readmeHtml = null; this._readmeHtml = null;
this._readmeError = null; this._readmeError = null;
// Manual refresh UX state
this._refreshing = false; this._refreshing = false;
this._status = "";
// Install/Update UX
this._installingRepoId = null; this._installingRepoId = null;
this._updatingRepoId = null; this._updatingRepoId = null;
this._uninstallingRepoId = null;
this._restartRequired = false; this._restartRequired = false;
this._lastActionMsg = null; this._lastActionMsg = null;
} }
@@ -56,7 +54,6 @@ class BahmcloudStorePanel extends HTMLElement {
const data = await this._hass.callApi("get", "bcs"); const data = await this._hass.callApi("get", "bcs");
this._data = data; this._data = data;
// keep detail fresh
if (this._view === "detail" && this._detailRepoId && Array.isArray(data?.repos)) { if (this._view === "detail" && this._detailRepoId && Array.isArray(data?.repos)) {
const fresh = data.repos.find((r) => this._safeId(r?.id) === this._detailRepoId); const fresh = data.repos.find((r) => this._safeId(r?.id) === this._detailRepoId);
if (fresh) this._detailRepo = fresh; if (fresh) this._detailRepo = fresh;
@@ -75,19 +72,16 @@ class BahmcloudStorePanel extends HTMLElement {
this._refreshing = true; this._refreshing = true;
this._error = null; this._error = null;
this._status = "Refreshing…"; this._loading = true;
this._update(); this._update();
try { try {
const resp = await this._hass.callApi("post", "bcs?action=refresh", {}); const resp = await this._hass.callApi("post", "bcs?action=refresh", {});
if (!resp?.ok) { if (!resp?.ok) {
this._status = ""; const msg = this._safeText(resp?.message) || "Refresh failed.";
this._error = this._safeText(resp?.message) || "Refresh failed."; this._error = msg;
} else {
this._status = "Refresh done.";
} }
} catch (e) { } catch (e) {
this._status = "";
this._error = e?.message ? String(e.message) : String(e); this._error = e?.message ? String(e.message) : String(e);
} finally { } finally {
this._refreshing = false; this._refreshing = false;
@@ -148,6 +142,35 @@ class BahmcloudStorePanel extends HTMLElement {
} }
} }
async _uninstallRepo(repoId) {
if (!this._hass) return;
if (!repoId) return;
if (this._installingRepoId || this._updatingRepoId || this._uninstallingRepoId) return;
const ok = window.confirm("Really uninstall this repository? This will remove its files from /config/custom_components and requires a restart.");
if (!ok) return;
this._uninstallingRepoId = repoId;
this._error = null;
this._lastActionMsg = null;
this._update();
try {
const resp = await this._hass.callApi("post", `bcs/uninstall?repo_id=${encodeURIComponent(repoId)}`, {});
if (!resp?.ok) {
this._error = this._safeText(resp?.message) || "Uninstall failed.";
} else {
this._restartRequired = !!resp.restart_required;
this._lastActionMsg = "Uninstall finished. Restart required.";
}
} catch (e) {
this._error = e?.message ? String(e.message) : String(e);
} finally {
this._uninstallingRepoId = null;
await this._load();
}
}
async _restartHA() { async _restartHA() {
if (!this._hass) return; if (!this._hass) return;
try { try {
@@ -178,7 +201,6 @@ class BahmcloudStorePanel extends HTMLElement {
this._readmeText = null; this._readmeText = null;
this._readmeHtml = null; this._readmeHtml = null;
this._readmeError = null; this._readmeError = null;
this._status = "";
this._update(); this._update();
return; return;
} }
@@ -244,10 +266,6 @@ class BahmcloudStorePanel extends HTMLElement {
this._readmeHtml = null; this._readmeHtml = null;
this._readmeError = null; this._readmeError = null;
this._status = "";
this._restartRequired = false;
this._lastActionMsg = null;
this._update(); this._update();
this._loadReadme(repoId); this._loadReadme(repoId);
} }
@@ -284,7 +302,7 @@ class BahmcloudStorePanel extends HTMLElement {
root.innerHTML = ` root.innerHTML = `
<style> <style>
:host { display:block; min-height:100%; --bcs-accent:#1E88E5; } :host { display:block; min-height:100%; --bcs-accent:#1E88E5; max-width:100%; overflow-x:hidden; }
.mobilebar{ .mobilebar{
position:sticky; top:0; z-index:50; position:sticky; top:0; z-index:50;
@@ -299,13 +317,15 @@ class BahmcloudStorePanel extends HTMLElement {
.iconbtn{ .iconbtn{
width:40px; height:40px; border-radius:14px; width:40px; height:40px; border-radius:14px;
display:flex; align-items:center; justify-content:center; display:flex; align-items:center; justify-content:center;
border:1px solid var(--divider-color); /* Ensure icon visibility on app header (light & dark modes) */
background: var(--card-background-color); color: var(--app-header-text-color, var(--primary-text-color));
border: 1px solid rgba(255,255,255,0.25);
background: rgba(0,0,0,0.18);
cursor:pointer; user-select:none; cursor:pointer; user-select:none;
} }
.iconbtn:hover{ filter:brightness(0.98); } .iconbtn:hover{ filter:brightness(0.98); }
.wrap{ max-width:1200px; margin:0 auto; padding:16px; } .wrap{ max-width:1200px; margin:0 auto; padding:16px; overflow-x:hidden; }
.tabs{ display:flex; gap:10px; flex-wrap:wrap; margin:8px 0 16px; } .tabs{ display:flex; gap:10px; flex-wrap:wrap; margin:8px 0 16px; }
.tab{ .tab{
@@ -328,12 +348,12 @@ class BahmcloudStorePanel extends HTMLElement {
background: var(--card-background-color); background: var(--card-background-color);
border:1px solid var(--divider-color); border:1px solid var(--divider-color);
box-shadow: 0 1px 0 rgba(0,0,0,.04); box-shadow: 0 1px 0 rgba(0,0,0,.04);
overflow:hidden;
} }
.row{ display:flex; align-items:flex-start; justify-content:space-between; gap:12px; } .row{ display:flex; align-items:flex-start; justify-content:space-between; gap:12px; flex-wrap:wrap; }
.muted{ color: var(--secondary-text-color); } .muted{ color: var(--secondary-text-color); overflow-wrap:anywhere; word-break:break-word; }
.small{ font-size: 12px; } .small{ font-size: 12px; }
.badge{ .badge{
padding:6px 10px; padding:6px 10px;
border-radius:999px; border-radius:999px;
@@ -341,7 +361,10 @@ class BahmcloudStorePanel extends HTMLElement {
background: rgba(30,136,229,.06); background: rgba(30,136,229,.06);
color: var(--primary-text-color); color: var(--primary-text-color);
font-size: 12px; font-size: 12px;
white-space:nowrap; white-space:normal;
max-width:55%;
overflow:hidden;
text-overflow:ellipsis;
} }
.filters{ display:flex; gap:10px; flex-wrap:wrap; margin-bottom:12px; } .filters{ display:flex; gap:10px; flex-wrap:wrap; margin-bottom:12px; }
@@ -380,36 +403,6 @@ class BahmcloudStorePanel extends HTMLElement {
background: rgba(255, 82, 82, .08); background: rgba(255, 82, 82, .08);
} }
.fabs{
position: fixed;
right: 16px;
bottom: 16px;
display:flex;
flex-direction:column;
gap:10px;
z-index: 60;
}
.fabbtn{
width:54px; height:54px;
border-radius:18px;
border:1px solid var(--divider-color);
background: var(--card-background-color);
display:flex; align-items:center; justify-content:center;
cursor:pointer;
box-shadow: 0 8px 18px rgba(0,0,0,.12);
user-select:none;
font-size: 18px;
padding: 0;
}
.fabbtn.primary{
border-color: rgba(30,136,229,.35);
background: rgba(30,136,229,.10);
}
.fabbtn:disabled{
opacity: .55;
cursor: not-allowed;
}
pre.readme{ pre.readme{
padding: 12px; padding: 12px;
border-radius: 14px; border-radius: 14px;
@@ -420,7 +413,9 @@ class BahmcloudStorePanel extends HTMLElement {
line-height: 1.4; line-height: 1.4;
} }
.md{ overflow-wrap:anywhere; word-break:break-word; }
.md :is(h1,h2,h3){ margin-top: 12px; } .md :is(h1,h2,h3){ margin-top: 12px; }
.md img{ max-width:100%; height:auto; }
.md code{ .md code{
padding: 2px 5px; padding: 2px 5px;
border-radius: 8px; border-radius: 8px;
@@ -439,6 +434,7 @@ class BahmcloudStorePanel extends HTMLElement {
border-collapse: collapse; border-collapse: collapse;
overflow:auto; overflow:auto;
display:block; display:block;
max-width:100%;
} }
.md th, .md td{ .md th, .md td{
border: 1px solid var(--divider-color); border: 1px solid var(--divider-color);
@@ -457,30 +453,39 @@ class BahmcloudStorePanel extends HTMLElement {
</div> </div>
</div> </div>
<div class="right"> <div class="right">
<button id="refreshBtn" class="primary" style="border-radius:14px; padding:8px 12px;">Refresh</button> <div class="iconbtn" id="refreshBtn" title="Refresh">⟳</div>
</div> </div>
</div> </div>
<div class="wrap"> <div class="wrap">
<div class="tabs"> <div class="tabs">
<div class="tab" id="tabStore">Store</div> <div class="tab" id="tabStore">Store</div>
<div class="tab" id="tabManage">Manage repositories</div> <div class="tab" id="tabManage">Manage</div>
<div class="tab" id="tabAbout">Settings / About</div> <div class="tab" id="tabAbout">About</div>
</div> </div>
<div id="content"></div> <div id="content"></div>
</div> </div>
<div id="fabs"></div>
`; `;
root.getElementById("menuBtn").addEventListener("click", () => this._toggleMenu()); root.getElementById("menuBtn").addEventListener("click", () => this._toggleMenu());
root.getElementById("backBtn").addEventListener("click", () => this._goBack()); root.getElementById("backBtn").addEventListener("click", () => this._goBack());
root.getElementById("refreshBtn").addEventListener("click", () => this._refreshAll()); root.getElementById("refreshBtn").addEventListener("click", () => this._refreshAll());
root.getElementById("tabStore").addEventListener("click", () => { this._view = "store"; this._update(); }); root.getElementById("tabStore").addEventListener("click", () => {
root.getElementById("tabManage").addEventListener("click", () => { this._view = "manage"; this._update(); }); this._view = "store";
root.getElementById("tabAbout").addEventListener("click", () => { this._view = "about"; this._update(); }); this._update();
});
root.getElementById("tabManage").addEventListener("click", () => {
this._view = "manage";
this._update();
});
root.getElementById("tabAbout").addEventListener("click", () => {
this._view = "about";
this._update();
});
this._update(); this._update();
} }
@@ -502,21 +507,19 @@ class BahmcloudStorePanel extends HTMLElement {
setActive("tabAbout", this._view === "about"); setActive("tabAbout", this._view === "about");
const content = root.getElementById("content"); const content = root.getElementById("content");
const fabs = root.getElementById("fabs"); if (!content) return;
if (!content || !fabs) return;
const err = this._error ? `<div class="err"><strong>Error:</strong> ${this._esc(this._error)}</div>` : ""; const err = this._error
const status = this._status ? `<div class="muted small" style="margin:10px 0;">${this._esc(this._status)}</div>` : ""; ? `<div class="err"><strong>Error:</strong> ${this._esc(this._error)}</div>`
: "";
if (this._loading) { if (this._loading) {
content.innerHTML = `${err}${status}<div class="card">Loading…</div>`; content.innerHTML = `${err}<div class="card">Loading…</div>`;
fabs.innerHTML = "";
return; return;
} }
if (!this._data?.ok) { if (!this._data?.ok) {
content.innerHTML = `${err}${status}<div class="card">No data. Please refresh.</div>`; content.innerHTML = `${err}<div class="card">No data. Please refresh.</div>`;
fabs.innerHTML = "";
return; return;
} }
@@ -526,14 +529,12 @@ class BahmcloudStorePanel extends HTMLElement {
else if (this._view === "about") html = this._renderAbout(); else if (this._view === "about") html = this._renderAbout();
else if (this._view === "detail") html = this._renderDetail(); else if (this._view === "detail") html = this._renderDetail();
content.innerHTML = `${err}${status}${html}`; content.innerHTML = `${err}${html}`;
fabs.innerHTML = this._view === "detail" ? this._renderFabs() : "";
if (this._view === "store") this._wireStore(); if (this._view === "store") this._wireStore();
if (this._view === "manage") this._wireManage(); if (this._view === "manage") this._wireManage();
if (this._view === "detail") { if (this._view === "detail") {
this._wireDetail(); this._wireDetail(); // now always wires buttons
this._wireFabs();
} }
} }
@@ -556,19 +557,12 @@ class BahmcloudStorePanel extends HTMLElement {
} }
_asBoolStrict(v) { _asBoolStrict(v) {
// IMPORTANT: only treat literal true as installed
return v === true; return v === true;
} }
_renderStore() { _renderStore() {
const repos = Array.isArray(this._data.repos) ? this._data.repos : []; const repos = Array.isArray(this._data.repos) ? this._data.repos : [];
const categories = Array.from(
new Set(repos.map((r) => this._safeText(r?.category)).filter((c) => !!c))
).sort();
const providers = ["github", "gitlab", "gitea", "other"];
const filtered = repos const filtered = repos
.filter((r) => { .filter((r) => {
const name = (this._safeText(r?.name) || "").toLowerCase(); const name = (this._safeText(r?.name) || "").toLowerCase();
@@ -594,10 +588,17 @@ class BahmcloudStorePanel extends HTMLElement {
return an.localeCompare(bn); return an.localeCompare(bn);
}); });
const categories = Array.from(
new Set(repos.map((r) => this._safeText(r?.category)).filter((c) => !!c))
).sort();
const providers = ["github", "gitlab", "gitea", "other"];
const cards = filtered const cards = filtered
.map((r) => { .map((r) => {
const id = this._safeId(r?.id); const id = this._safeId(r?.id);
const name = this._safeText(r?.name) || "Unnamed repository"; const name = this._safeText(r?.name) || "Unnamed repository";
const url = this._safeText(r?.url) || "";
const desc = this._safeText(r?.description) || ""; const desc = this._safeText(r?.description) || "";
const latest = this._safeText(r?.latest_version); const latest = this._safeText(r?.latest_version);
@@ -620,9 +621,7 @@ class BahmcloudStorePanel extends HTMLElement {
<div> <div>
<div><strong>${this._esc(name)}</strong></div> <div><strong>${this._esc(name)}</strong></div>
<div class="muted">${this._esc(desc)}</div> <div class="muted">${this._esc(desc)}</div>
<div class="muted small" style="margin-top:8px;"> <div class="muted small" style="margin-top:8px;">${this._esc(url)}</div>
Creator: ${this._esc(this._safeText(r?.owner || "-"))} · Latest: ${this._esc(latest || "-")} · Meta: ${this._esc(this._safeText(r?.meta_source || "-"))}
</div>
</div> </div>
${badgeHtml} ${badgeHtml}
</div> </div>
@@ -633,7 +632,7 @@ class BahmcloudStorePanel extends HTMLElement {
return ` return `
<div class="filters"> <div class="filters">
<input id="q" placeholder="Search repositories…" value="${this._esc(this._search)}" /> <input id="q" placeholder="Search…" value="${this._esc(this._search)}" />
<select id="cat"> <select id="cat">
<option value="all">All categories</option> <option value="all">All categories</option>
${categories.map((c) => `<option value="${this._esc(c)}" ${this._category === c ? "selected" : ""}>${this._esc(c)}</option>`).join("")} ${categories.map((c) => `<option value="${this._esc(c)}" ${this._category === c ? "selected" : ""}>${this._esc(c)}</option>`).join("")}
@@ -645,7 +644,7 @@ class BahmcloudStorePanel extends HTMLElement {
</select> </select>
</div> </div>
<div class="muted small">BCS ${this._esc(this._data.version || "-")} · Repositories: ${repos.length}</div> <div class="muted small">Version: ${this._esc(this._data.version || "-")} · Repositories: ${repos.length}</div>
<div class="grid" style="margin-top:12px;"> <div class="grid" style="margin-top:12px;">
${cards || `<div class="card">No repositories found.</div>`} ${cards || `<div class="card">No repositories found.</div>`}
@@ -660,9 +659,24 @@ class BahmcloudStorePanel extends HTMLElement {
const cat = root.getElementById("cat"); const cat = root.getElementById("cat");
const prov = root.getElementById("prov"); const prov = root.getElementById("prov");
if (q) q.addEventListener("input", (e) => { this._search = e?.target?.value || ""; this._update(); }); if (q) {
if (cat) cat.addEventListener("change", (e) => { this._category = e?.target?.value || "all"; this._update(); }); q.addEventListener("input", (e) => {
if (prov) prov.addEventListener("change", (e) => { this._provider = e?.target?.value || "all"; this._update(); }); this._search = e?.target?.value || "";
this._update();
});
}
if (cat) {
cat.addEventListener("change", (e) => {
this._category = e?.target?.value || "all";
this._update();
});
}
if (prov) {
prov.addEventListener("change", (e) => {
this._provider = e?.target?.value || "all";
this._update();
});
}
root.querySelectorAll("[data-open]").forEach((el) => { root.querySelectorAll("[data-open]").forEach((el) => {
const id = el.getAttribute("data-open"); const id = el.getAttribute("data-open");
@@ -673,9 +687,9 @@ class BahmcloudStorePanel extends HTMLElement {
_renderAbout() { _renderAbout() {
return ` return `
<div class="card"> <div class="card">
<div><strong>Installation & Updates</strong></div> <div><strong>About</strong></div>
<div class="muted" style="margin-top:10px;"> <div class="muted" style="margin-top:10px;">
Installation and updates are now available via the Store UI. Bahmcloud Store is a provider-neutral repository index and UI for Home Assistant.
</div> </div>
<div class="muted small" style="margin-top:10px;"> <div class="muted small" style="margin-top:10px;">
Current integration version: <strong>${this._esc(this._data?.version || "-")}</strong> Current integration version: <strong>${this._esc(this._data?.version || "-")}</strong>
@@ -692,18 +706,15 @@ class BahmcloudStorePanel extends HTMLElement {
const url = this._safeText(r?.url) || ""; const url = this._safeText(r?.url) || "";
const desc = this._safeText(r?.description) || ""; const desc = this._safeText(r?.description) || "";
const repoId = this._safeId(r?.id); const infoBits = [
this._safeText(r?.owner) ? `Creator: ${this._safeText(r?.owner)}` : "Creator: -",
const installed = this._asBoolStrict(r?.installed); this._safeText(r?.latest_version) ? `Latest: ${this._safeText(r?.latest_version)}` : "Latest: -",
const installedVersion = this._safeText(r?.installed_version); this._safeText(r?.provider) ? `Provider: ${this._safeText(r?.provider)}` : null,
const installedDomains = Array.isArray(r?.installed_domains) ? r.installed_domains : []; this._safeText(r?.category) ? `Category: ${this._safeText(r?.category)}` : null,
const latestVersion = this._safeText(r?.latest_version); this._safeText(r?.meta_author) ? `Author: ${this._safeText(r?.meta_author)}` : null,
this._safeText(r?.meta_maintainer) ? `Maintainer: ${this._safeText(r?.meta_maintainer)}` : null,
const busyInstall = this._installingRepoId === repoId; this._safeText(r?.meta_source) ? `Meta: ${this._safeText(r?.meta_source)}` : null,
const busyUpdate = this._updatingRepoId === repoId; ].filter(Boolean);
const busy = busyInstall || busyUpdate;
const updateAvailable = installed && !!latestVersion && (!installedVersion || latestVersion !== installedVersion);
const readmeBlock = this._readmeLoading const readmeBlock = this._readmeLoading
? `<div class="card">Loading README…</div>` ? `<div class="card">Loading README…</div>`
@@ -732,8 +743,23 @@ class BahmcloudStorePanel extends HTMLElement {
</div> </div>
`; `;
const repoId = this._safeId(r?.id);
const installed = this._asBoolStrict(r?.installed);
const installedVersion = this._safeText(r?.installed_version);
const installedDomains = Array.isArray(r?.installed_domains) ? r.installed_domains : [];
const latestVersion = this._safeText(r?.latest_version);
const busyInstall = this._installingRepoId === repoId;
const busyUpdate = this._updatingRepoId === repoId;
const busyUninstall = this._uninstallingRepoId === repoId;
const busy = busyInstall || busyUpdate || busyUninstall;
const updateAvailable = installed && !!latestVersion && (!installedVersion || latestVersion !== installedVersion);
const installBtn = `<button class="primary" id="btnInstall" ${installed || busy ? "disabled" : ""}>${busyInstall ? "Installing…" : installed ? "Installed" : "Install"}</button>`; const installBtn = `<button class="primary" id="btnInstall" ${installed || busy ? "disabled" : ""}>${busyInstall ? "Installing…" : installed ? "Installed" : "Install"}</button>`;
const updateBtn = `<button class="primary" id="btnUpdate" ${!updateAvailable || busy ? "disabled" : ""}>${busyUpdate ? "Updating…" : updateAvailable ? "Update" : "Up to date"}</button>`; const updateBtn = `<button class="primary" id="btnUpdate" ${!updateAvailable || busy ? "disabled" : ""}>${busyUpdate ? "Updating…" : updateAvailable ? "Update" : "Up to date"}</button>`;
const uninstallBtn = `<button class="primary" id="btnUninstall" ${!installed || busy ? "disabled" : ""}>${busyUninstall ? "Uninstalling…" : "Uninstall"}</button>`;
const restartHint = this._restartRequired const restartHint = this._restartRequired
? ` ? `
@@ -757,12 +783,7 @@ class BahmcloudStorePanel extends HTMLElement {
<div> <div>
<div><strong style="font-size:16px;">${this._esc(name)}</strong></div> <div><strong style="font-size:16px;">${this._esc(name)}</strong></div>
<div class="muted">${this._esc(desc)}</div> <div class="muted">${this._esc(desc)}</div>
<div class="muted small" style="margin-top:8px;"> <div class="muted small" style="margin-top:8px;">${this._esc(infoBits.join(" · "))}</div>
Creator: ${this._esc(this._safeText(r?.owner || "-"))}
· Latest: ${this._esc(latestVersion || "-")}
· Provider: ${this._esc(this._safeText(r?.provider || "-"))}
· Meta: ${this._esc(this._safeText(r?.meta_source || "-"))}
</div>
<div class="muted small" style="margin-top:8px;"> <div class="muted small" style="margin-top:8px;">
<a href="${this._esc(url)}" target="_blank" rel="noreferrer">Open repository</a> <a href="${this._esc(url)}" target="_blank" rel="noreferrer">Open repository</a>
</div> </div>
@@ -790,6 +811,7 @@ class BahmcloudStorePanel extends HTMLElement {
<div class="row" style="margin-top:14px; gap:10px; flex-wrap:wrap;"> <div class="row" style="margin-top:14px; gap:10px; flex-wrap:wrap;">
${installBtn} ${installBtn}
${updateBtn} ${updateBtn}
${uninstallBtn}
</div> </div>
${restartHint} ${restartHint}
@@ -802,13 +824,36 @@ class BahmcloudStorePanel extends HTMLElement {
_wireDetail() { _wireDetail() {
const root = this.shadowRoot; const root = this.shadowRoot;
// Always wire action buttons (even if README is already loaded)
const btnInstall = root.getElementById("btnInstall"); const btnInstall = root.getElementById("btnInstall");
const btnUpdate = root.getElementById("btnUpdate"); const btnUpdate = root.getElementById("btnUpdate");
const btnUninstall = root.getElementById("btnUninstall");
const btnRestart = root.getElementById("btnRestart"); const btnRestart = root.getElementById("btnRestart");
if (btnInstall) btnInstall.addEventListener("click", () => { if (!btnInstall.disabled && this._detailRepoId) this._installRepo(this._detailRepoId); }); if (btnInstall) {
if (btnUpdate) btnUpdate.addEventListener("click", () => { if (!btnUpdate.disabled && this._detailRepoId) this._updateRepo(this._detailRepoId); }); btnInstall.addEventListener("click", () => {
if (btnRestart) btnRestart.addEventListener("click", () => this._restartHA()); if (btnInstall.disabled) return;
if (this._detailRepoId) this._installRepo(this._detailRepoId);
});
}
if (btnUpdate) {
btnUpdate.addEventListener("click", () => {
if (btnUpdate.disabled) return;
if (this._detailRepoId) this._updateRepo(this._detailRepoId);
});
}
if (btnUninstall) {
btnUninstall.addEventListener("click", () => {
if (btnUninstall.disabled) return;
if (this._detailRepoId) this._uninstallRepo(this._detailRepoId);
});
}
if (btnRestart) {
btnRestart.addEventListener("click", () => this._restartHA());
}
const mount = root.getElementById("readmePretty"); const mount = root.getElementById("readmePretty");
if (!mount) return; if (!mount) return;
@@ -836,54 +881,6 @@ class BahmcloudStorePanel extends HTMLElement {
} catch (_) {} } catch (_) {}
} }
_renderFabs() {
const r = this._detailRepo;
if (!r) return "";
const repoId = this._safeId(r?.id);
const installed = this._asBoolStrict(r?.installed);
const latest = this._safeText(r?.latest_version);
const installedVersion = this._safeText(r?.installed_version);
const busy = this._installingRepoId === repoId || this._updatingRepoId === repoId;
const updateAvailable = installed && !!latest && (!installedVersion || latest !== installedVersion);
const installDisabled = installed || busy;
const updateDisabled = !updateAvailable || busy;
return `
<div class="fabs">
<button class="fabbtn primary" id="fabOpen" title="Open repository">↗</button>
<button class="fabbtn" id="fabReload" title="Reload README">⟳</button>
<button class="fabbtn" id="fabInstall" title="${installDisabled ? (installed ? "Already installed" : "Installing…") : "Install"}" ${installDisabled ? "disabled" : ""}></button>
<button class="fabbtn" id="fabUpdate" title="${updateDisabled ? (!installed ? "Not installed" : "No update available") : "Update"}" ${updateDisabled ? "disabled" : ""}>↑</button>
<button class="fabbtn" id="fabInfo" title="About">i</button>
</div>
`;
}
_wireFabs() {
const root = this.shadowRoot;
const r = this._detailRepo;
if (!r) return;
const url = this._safeText(r?.url);
const repoId = this._safeId(r?.id);
const open = root.getElementById("fabOpen");
const reload = root.getElementById("fabReload");
const install = root.getElementById("fabInstall");
const update = root.getElementById("fabUpdate");
const info = root.getElementById("fabInfo");
if (open) open.addEventListener("click", () => url && window.open(url, "_blank", "noreferrer"));
if (reload) reload.addEventListener("click", () => this._detailRepoId && this._loadReadme(this._detailRepoId));
if (install) install.addEventListener("click", () => { if (!install.disabled) this._installRepo(repoId); });
if (update) update.addEventListener("click", () => { if (!update.disabled) this._updateRepo(repoId); });
if (info) info.addEventListener("click", () => { this._view = "about"; this._update(); });
}
_renderManage() { _renderManage() {
const repos = Array.isArray(this._data.repos) ? this._data.repos : []; const repos = Array.isArray(this._data.repos) ? this._data.repos : [];

View File

@@ -0,0 +1,55 @@
from __future__ import annotations
import logging
import voluptuous as vol
from homeassistant.components.repairs import RepairsFlow
from homeassistant.core import HomeAssistant
from homeassistant import data_entry_flow
from .core import RESTART_REQUIRED_ISSUE_ID
_LOGGER = logging.getLogger(__name__)
class BCSRestartRequiredFlow(RepairsFlow):
"""Repairs flow to restart Home Assistant after BCS install/update."""
def __init__(self, hass: HomeAssistant) -> None:
self.hass = hass
async def async_step_init(
self, user_input: dict[str, str] | None = None
) -> data_entry_flow.FlowResult:
return await self.async_step_confirm(user_input)
async def async_step_confirm(
self, user_input: dict[str, str] | None = None
) -> data_entry_flow.FlowResult:
if user_input is not None:
_LOGGER.info("BCS repairs flow: restarting Home Assistant (user confirmed)")
await self.hass.services.async_call(
"homeassistant",
"restart",
{},
blocking=False,
)
return self.async_create_entry(title="", data={})
return self.async_show_form(
step_id="confirm",
data_schema=vol.Schema({}),
)
async def async_create_fix_flow(
hass: HomeAssistant,
issue_id: str,
data: dict[str, str | int | float | None] | None,
) -> RepairsFlow:
"""Create a repairs flow for BCS fixable issues."""
if issue_id == RESTART_REQUIRED_ISSUE_ID:
return BCSRestartRequiredFlow(hass)
raise data_entry_flow.UnknownHandler

View File

@@ -0,0 +1,18 @@
{
"issues": {
"restart_required": {
"title": "Restart required",
"description": "One or more integrations were installed or updated by Bahmcloud Store. Restart Home Assistant to load the changes."
}
},
"repair_flow": {
"restart_required": {
"step": {
"confirm": {
"title": "Restart Home Assistant",
"description": "Bahmcloud Store installed or updated integrations. Restart Home Assistant now to apply the changes."
}
}
}
}
}

View File

@@ -1,11 +1,142 @@
from __future__ import annotations from __future__ import annotations
# NOTE: import logging
# Update entities will be implemented once installation/provider resolution is in place. from dataclasses import dataclass
# This stub prevents platform load errors and keeps the integration stable in 0.3.0. from typing import Any
from homeassistant.core import HomeAssistant from homeassistant.components.update import UpdateEntity, UpdateEntityFeature
from homeassistant.core import HomeAssistant, callback
from homeassistant.helpers.dispatcher import async_dispatcher_connect
from homeassistant.helpers.entity_platform import AddEntitiesCallback from homeassistant.helpers.entity_platform import AddEntitiesCallback
from homeassistant.helpers.entity import EntityCategory
from .core import DOMAIN, SIGNAL_UPDATED, BCSCore
_LOGGER = logging.getLogger(__name__)
def _pretty_repo_name(core: BCSCore, repo_id: str) -> str:
"""Return a human-friendly name for a repo update entity."""
try:
repo = core.get_repo(repo_id)
if repo and getattr(repo, "name", None):
name = str(repo.name).strip()
if name:
return name
except Exception:
pass
if repo_id.startswith("index:"):
return f"BCS Index {repo_id.split(':', 1)[1]}"
if repo_id.startswith("custom:"):
return f"BCS Custom {repo_id.split(':', 1)[1]}"
return f"BCS {repo_id}"
@dataclass(frozen=True)
class _RepoKey:
repo_id: str
class BCSRepoUpdateEntity(UpdateEntity):
"""Update entity representing a BCS-managed repository."""
_attr_entity_category = EntityCategory.DIAGNOSTIC
_attr_supported_features = UpdateEntityFeature.INSTALL
def __init__(self, core: BCSCore, repo_id: str) -> None:
self._core = core
self._repo_id = repo_id
self._in_progress = False
# Stable unique id (do NOT change)
self._attr_unique_id = f"{DOMAIN}:{repo_id}"
self._refresh_display_name()
def _refresh_display_name(self) -> None:
pretty = _pretty_repo_name(self._core, self._repo_id)
self._attr_name = pretty
self._attr_title = pretty
@property
def available(self) -> bool:
repo = self._core.get_repo(self._repo_id)
installed = self._core.get_installed(self._repo_id)
return repo is not None and installed is not None
@property
def in_progress(self) -> bool | None:
return self._in_progress
@property
def installed_version(self) -> str | None:
installed = self._core.get_installed(self._repo_id) or {}
v = installed.get("installed_version") or installed.get("ref")
return str(v) if v else None
@property
def latest_version(self) -> str | None:
repo = self._core.get_repo(self._repo_id)
if not repo:
return None
v = getattr(repo, "latest_version", None)
return str(v) if v else None
@property
def update_available(self) -> bool:
latest = self.latest_version
installed = self.installed_version
if not latest or not installed:
return False
return latest != installed
def version_is_newer(self, latest_version: str, installed_version: str) -> bool:
return latest_version != installed_version
@property
def release_url(self) -> str | None:
repo = self._core.get_repo(self._repo_id)
return getattr(repo, "url", None) if repo else None
async def async_install(self, version: str | None, backup: bool, **kwargs: Any) -> None:
if version is not None:
_LOGGER.debug("BCS update entity requested specific version=%s (ignored)", version)
self._in_progress = True
self.async_write_ha_state()
try:
await self._core.update_repo(self._repo_id)
finally:
self._in_progress = False
self.async_write_ha_state()
@callback
def _sync_entities(core: BCSCore, existing: dict[str, BCSRepoUpdateEntity], async_add_entities: AddEntitiesCallback) -> None:
"""Ensure there is one update entity per installed repo AND keep names in sync."""
installed_map = getattr(core, "_installed_cache", {}) or {}
new_entities: list[BCSRepoUpdateEntity] = []
for repo_id, data in installed_map.items():
if not isinstance(data, dict):
continue
if repo_id in existing:
# IMPORTANT: Update display name after refresh, when repo.name becomes available.
existing[repo_id]._refresh_display_name()
continue
ent = BCSRepoUpdateEntity(core, repo_id)
existing[repo_id] = ent
new_entities.append(ent)
if new_entities:
async_add_entities(new_entities)
for ent in existing.values():
ent.async_write_ha_state()
async def async_setup_platform( async def async_setup_platform(
@@ -14,4 +145,18 @@ async def async_setup_platform(
async_add_entities: AddEntitiesCallback, async_add_entities: AddEntitiesCallback,
discovery_info=None, discovery_info=None,
): ):
return """Set up BCS update entities."""
core: BCSCore | None = hass.data.get(DOMAIN)
if not core:
_LOGGER.debug("BCS core not available, skipping update platform setup")
return
entities: dict[str, BCSRepoUpdateEntity] = {}
_sync_entities(core, entities, async_add_entities)
@callback
def _handle_update() -> None:
_sync_entities(core, entities, async_add_entities)
async_dispatcher_connect(hass, SIGNAL_UPDATED, _handle_update)

View File

@@ -334,6 +334,27 @@ class BCSUpdateView(HomeAssistantView):
return web.json_response({"ok": False, "message": str(e) or "Update failed"}, status=500) return web.json_response({"ok": False, "message": str(e) or "Update failed"}, status=500)
class BCSUninstallView(HomeAssistantView):
url = "/api/bcs/uninstall"
name = "api:bcs_uninstall"
requires_auth = True
def __init__(self, core: Any) -> None:
self.core: BCSCore = core
async def post(self, request: web.Request) -> web.Response:
repo_id = request.query.get("repo_id")
if not repo_id:
return web.json_response({"ok": False, "message": "Missing repo_id"}, status=400)
try:
result = await self.core.uninstall_repo(repo_id)
return web.json_response(result, status=200)
except Exception as e:
_LOGGER.exception("BCS uninstall failed: %s", e)
return web.json_response({"ok": False, "message": str(e) or "Uninstall failed"}, status=500)
class BCSRestartView(HomeAssistantView): class BCSRestartView(HomeAssistantView):
url = "/api/bcs/restart" url = "/api/bcs/restart"
name = "api:bcs_restart" name = "api:bcs_restart"