Merges extensions into one page (#1656)
* Merged extensions into one page * Bundle files updated * Fixed install bug * feat: client side version compatibility check * fix: hide `Activated/Deactivated` toggle for non-admins * feat: translate labels to `EN` * feat: add other language translations * chore: update bundle for i18n * feat: check extension version server-side * feat: show warning message * refactor: nicer mapping Co-authored-by: dni ⚡ <office@dnilabs.com> * chore: code format * chore: extra log * feat: check_latest_version of ext * feat: show tooltip for new version * chore: `make bundle` * chore: `mypy` * chore: code clean-up * feat: show version in badge (spacing is fine) * chore: make bundle * feat: check `min_lnbits_version` and `warning` in `config.json` * chore: code formatting * chore: downgrade log level * fix: extract `ExtensionsInstallSettings` as readonly * fix: do not show installed and deactivated extensions * chore: format * fix: `Enable` button tooltip * fix: set installed release after installation * fix: hide deactivated extensions from regular users * bundle fundle * bundle fundle --------- Co-authored-by: Vlad Stan <stan.v.vlad@gmail.com> Co-authored-by: dni ⚡ <office@dnilabs.com>
This commit is contained in:
@@ -57,11 +57,13 @@ async def robots():
|
||||
|
||||
|
||||
@core_html_routes.get(
|
||||
"/extensions", name="core.extensions", response_class=HTMLResponse
|
||||
"/extensions", name="install.extensions", response_class=HTMLResponse
|
||||
)
|
||||
async def extensions(
|
||||
async def extensions_install(
|
||||
request: Request,
|
||||
user: User = Depends(check_user_exists),
|
||||
activate: str = Query(None),
|
||||
deactivate: str = Query(None),
|
||||
enable: str = Query(None),
|
||||
disable: str = Query(None),
|
||||
):
|
||||
@@ -69,24 +71,7 @@ async def extensions(
|
||||
|
||||
# Update user as his extensions have been updated
|
||||
if enable or disable:
|
||||
updated_user = await get_user(user.id)
|
||||
assert updated_user, "User does not exist."
|
||||
user = updated_user
|
||||
|
||||
return template_renderer().TemplateResponse(
|
||||
"core/extensions.html", {"request": request, "user": user.dict()}
|
||||
)
|
||||
|
||||
|
||||
@core_html_routes.get(
|
||||
"/install", name="install.extensions", response_class=HTMLResponse
|
||||
)
|
||||
async def extensions_install(
|
||||
request: Request,
|
||||
user: User = Depends(check_user_exists),
|
||||
activate: str = Query(None),
|
||||
deactivate: str = Query(None),
|
||||
):
|
||||
user = await get_user(user.id) # type: ignore
|
||||
try:
|
||||
installed_exts: List["InstallableExtension"] = await get_installed_extensions()
|
||||
installed_exts_ids = [e.id for e in installed_exts]
|
||||
@@ -153,7 +138,7 @@ async def extensions_install(
|
||||
)
|
||||
|
||||
return template_renderer().TemplateResponse(
|
||||
"core/install.html",
|
||||
"core/extensions.html",
|
||||
{
|
||||
"request": request,
|
||||
"user": user.dict(),
|
||||
|
||||
Reference in New Issue
Block a user