Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| e2dfa20789 | |||
| 8e8b58d2d2 | |||
| 76ecaabd98 | |||
| 3f14dc3bd9 | |||
| 50a78714cc | |||
| 3bf01c91f1 | |||
| 7aa14284dd | |||
| 24933e980d | |||
| e10624df6b | |||
| 1a1ebd3821 | |||
| d3d61067db | |||
| 23b605becf | |||
| c07f8615e4 | |||
| 9b209a15bf | |||
| 30258bd2c0 |
20
CHANGELOG.md
20
CHANGELOG.md
@@ -11,6 +11,26 @@ Sections:
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## [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
|
## [0.5.4] - 2026-01-16
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|||||||
@@ -38,6 +38,7 @@ async def async_setup(hass: HomeAssistant, config: dict) -> bool:
|
|||||||
BCSCustomRepoView,
|
BCSCustomRepoView,
|
||||||
BCSInstallView,
|
BCSInstallView,
|
||||||
BCSUpdateView,
|
BCSUpdateView,
|
||||||
|
BCSUninstallView,
|
||||||
BCSRestartView,
|
BCSRestartView,
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -47,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(
|
||||||
@@ -54,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,
|
||||||
|
|||||||
@@ -515,22 +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] = {
|
||||||
"installed": True,
|
"installed": True,
|
||||||
"domains": it.domains,
|
"domains": domains,
|
||||||
"installed_version": it.installed_version,
|
"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:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"domain": "bahmcloud_store",
|
"domain": "bahmcloud_store",
|
||||||
"name": "Bahmcloud Store",
|
"name": "Bahmcloud Store",
|
||||||
"version": "0.5.4",
|
"version": "0.5.6",
|
||||||
"documentation": "https://git.bahmcloud.de/bahmcloud/bahmcloud_store",
|
"documentation": "https://git.bahmcloud.de/bahmcloud/bahmcloud_store",
|
||||||
"platforms": ["update"],
|
"platforms": ["update"],
|
||||||
"requirements": [],
|
"requirements": [],
|
||||||
|
|||||||
@@ -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>
|
||||||
`;
|
`;
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
@@ -333,7 +351,6 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
.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; }
|
||||||
.muted{ color: var(--secondary-text-color); }
|
.muted{ color: var(--secondary-text-color); }
|
||||||
.small{ font-size: 12px; }
|
.small{ font-size: 12px; }
|
||||||
|
|
||||||
.badge{
|
.badge{
|
||||||
padding:6px 10px;
|
padding:6px 10px;
|
||||||
border-radius:999px;
|
border-radius:999px;
|
||||||
@@ -457,15 +474,15 @@ 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>
|
||||||
@@ -478,9 +495,18 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
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();
|
||||||
}
|
}
|
||||||
@@ -505,17 +531,18 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
const fabs = root.getElementById("fabs");
|
const fabs = root.getElementById("fabs");
|
||||||
if (!content || !fabs) 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 = "";
|
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 = "";
|
fabs.innerHTML = "";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -526,13 +553,13 @@ 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() : "";
|
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();
|
this._wireFabs();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -556,19 +583,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 +614,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 +647,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 +658,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 +670,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 +685,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 +713,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 +732,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 +769,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 +809,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 +837,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 +850,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;
|
||||||
@@ -845,11 +916,12 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
const latest = this._safeText(r?.latest_version);
|
const latest = this._safeText(r?.latest_version);
|
||||||
const installedVersion = this._safeText(r?.installed_version);
|
const installedVersion = this._safeText(r?.installed_version);
|
||||||
|
|
||||||
const busy = this._installingRepoId === repoId || this._updatingRepoId === repoId;
|
const busy = this._installingRepoId === repoId || this._updatingRepoId === repoId || this._uninstallingRepoId === repoId;
|
||||||
const updateAvailable = installed && !!latest && (!installedVersion || latest !== installedVersion);
|
const updateAvailable = installed && !!latest && (!installedVersion || latest !== installedVersion);
|
||||||
|
|
||||||
const installDisabled = installed || busy;
|
const installDisabled = installed || busy;
|
||||||
const updateDisabled = !updateAvailable || busy;
|
const updateDisabled = !updateAvailable || busy;
|
||||||
|
const uninstallDisabled = !installed || busy;
|
||||||
|
|
||||||
return `
|
return `
|
||||||
<div class="fabs">
|
<div class="fabs">
|
||||||
@@ -857,6 +929,7 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
<button class="fabbtn" id="fabReload" title="Reload README">⟳</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="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="fabUpdate" title="${updateDisabled ? (!installed ? "Not installed" : "No update available") : "Update"}" ${updateDisabled ? "disabled" : ""}>↑</button>
|
||||||
|
<button class="fabbtn" id="fabUninstall" title="${uninstallDisabled ? (!installed ? "Not installed" : "Busy") : "Uninstall"}" ${uninstallDisabled ? "disabled" : ""}>✕</button>
|
||||||
<button class="fabbtn" id="fabInfo" title="About">i</button>
|
<button class="fabbtn" id="fabInfo" title="About">i</button>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
@@ -874,13 +947,32 @@ class BahmcloudStorePanel extends HTMLElement {
|
|||||||
const reload = root.getElementById("fabReload");
|
const reload = root.getElementById("fabReload");
|
||||||
const install = root.getElementById("fabInstall");
|
const install = root.getElementById("fabInstall");
|
||||||
const update = root.getElementById("fabUpdate");
|
const update = root.getElementById("fabUpdate");
|
||||||
|
const uninstall = root.getElementById("fabUninstall");
|
||||||
const info = root.getElementById("fabInfo");
|
const info = root.getElementById("fabInfo");
|
||||||
|
|
||||||
if (open) open.addEventListener("click", () => url && window.open(url, "_blank", "noreferrer"));
|
if (open) open.addEventListener("click", () => url && window.open(url, "_blank", "noreferrer"));
|
||||||
if (reload) reload.addEventListener("click", () => this._detailRepoId && this._loadReadme(this._detailRepoId));
|
if (reload) reload.addEventListener("click", () => this._detailRepoId && this._loadReadme(this._detailRepoId));
|
||||||
|
|
||||||
if (install) install.addEventListener("click", () => { if (!install.disabled) this._installRepo(repoId); });
|
if (install) {
|
||||||
if (update) update.addEventListener("click", () => { if (!update.disabled) this._updateRepo(repoId); });
|
install.addEventListener("click", () => {
|
||||||
|
if (install.disabled) return;
|
||||||
|
this._installRepo(repoId);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (update) {
|
||||||
|
update.addEventListener("click", () => {
|
||||||
|
if (update.disabled) return;
|
||||||
|
this._updateRepo(repoId);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
if (uninstall) {
|
||||||
|
uninstall.addEventListener("click", () => {
|
||||||
|
if (uninstall.disabled) return;
|
||||||
|
this._uninstallRepo(repoId);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
if (info) info.addEventListener("click", () => { this._view = "about"; this._update(); });
|
if (info) info.addEventListener("click", () => { this._view = "about"; this._update(); });
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -26,7 +26,6 @@ def _pretty_repo_name(core: BCSCore, repo_id: str) -> str:
|
|||||||
except Exception:
|
except Exception:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
# Fallbacks
|
|
||||||
if repo_id.startswith("index:"):
|
if repo_id.startswith("index:"):
|
||||||
return f"BCS Index {repo_id.split(':', 1)[1]}"
|
return f"BCS Index {repo_id.split(':', 1)[1]}"
|
||||||
if repo_id.startswith("custom:"):
|
if repo_id.startswith("custom:"):
|
||||||
@@ -53,11 +52,11 @@ class BCSRepoUpdateEntity(UpdateEntity):
|
|||||||
# Stable unique id (do NOT change)
|
# Stable unique id (do NOT change)
|
||||||
self._attr_unique_id = f"{DOMAIN}:{repo_id}"
|
self._attr_unique_id = f"{DOMAIN}:{repo_id}"
|
||||||
|
|
||||||
# Human-friendly name in UI
|
self._refresh_display_name()
|
||||||
pretty = _pretty_repo_name(core, repo_id)
|
|
||||||
self._attr_name = pretty
|
|
||||||
|
|
||||||
# Title shown in the entity dialog
|
def _refresh_display_name(self) -> None:
|
||||||
|
pretty = _pretty_repo_name(self._core, self._repo_id)
|
||||||
|
self._attr_name = pretty
|
||||||
self._attr_title = pretty
|
self._attr_title = pretty
|
||||||
|
|
||||||
@property
|
@property
|
||||||
@@ -102,9 +101,7 @@ class BCSRepoUpdateEntity(UpdateEntity):
|
|||||||
|
|
||||||
async def async_install(self, version: str | None, backup: bool, **kwargs: Any) -> None:
|
async def async_install(self, version: str | None, backup: bool, **kwargs: Any) -> None:
|
||||||
if version is not None:
|
if version is not None:
|
||||||
_LOGGER.debug(
|
_LOGGER.debug("BCS update entity requested specific version=%s (ignored)", version)
|
||||||
"BCS update entity requested specific version=%s (ignored)", version
|
|
||||||
)
|
|
||||||
|
|
||||||
self._in_progress = True
|
self._in_progress = True
|
||||||
self.async_write_ha_state()
|
self.async_write_ha_state()
|
||||||
@@ -117,19 +114,18 @@ class BCSRepoUpdateEntity(UpdateEntity):
|
|||||||
|
|
||||||
|
|
||||||
@callback
|
@callback
|
||||||
def _sync_entities(
|
def _sync_entities(core: BCSCore, existing: dict[str, BCSRepoUpdateEntity], async_add_entities: AddEntitiesCallback) -> None:
|
||||||
core: BCSCore,
|
"""Ensure there is one update entity per installed repo AND keep names in sync."""
|
||||||
existing: dict[str, BCSRepoUpdateEntity],
|
|
||||||
async_add_entities: AddEntitiesCallback,
|
|
||||||
) -> None:
|
|
||||||
"""Ensure there is one update entity per installed repo."""
|
|
||||||
installed_map = getattr(core, "_installed_cache", {}) or {}
|
installed_map = getattr(core, "_installed_cache", {}) or {}
|
||||||
new_entities: list[BCSRepoUpdateEntity] = []
|
new_entities: list[BCSRepoUpdateEntity] = []
|
||||||
|
|
||||||
for repo_id, data in installed_map.items():
|
for repo_id, data in installed_map.items():
|
||||||
if not isinstance(data, dict):
|
if not isinstance(data, dict):
|
||||||
continue
|
continue
|
||||||
|
|
||||||
if repo_id in existing:
|
if repo_id in existing:
|
||||||
|
# IMPORTANT: Update display name after refresh, when repo.name becomes available.
|
||||||
|
existing[repo_id]._refresh_display_name()
|
||||||
continue
|
continue
|
||||||
|
|
||||||
ent = BCSRepoUpdateEntity(core, repo_id)
|
ent = BCSRepoUpdateEntity(core, repo_id)
|
||||||
|
|||||||
@@ -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"
|
||||||
|
|||||||
Reference in New Issue
Block a user