From f8a04102826c99bbc555e57132d538745aae3d0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Ml=C3=A1dek?= Date: Fri, 4 Feb 2022 12:09:43 +0100 Subject: [PATCH] hide desktop features when desktop is disabled --- src/routes.rs | 3 ++- tools/upend_js/types.ts | 1 + webui/src/components/display/UpObject.svelte | 19 +++++++++++-------- webui/yarn.lock | 4 ++-- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/routes.rs b/src/routes.rs index 1482854..916e58b 100644 --- a/src/routes.rs +++ b/src/routes.rs @@ -494,6 +494,7 @@ pub async fn get_info(state: web::Data) -> Result { Ok(HttpResponse::Ok().json(json!({ "name": state.vault_name, "location": &*state.upend.vault_path, - "version": crate::common::PKG_VERSION + "version": crate::common::PKG_VERSION, + "desktop": state.desktop_enabled }))) } diff --git a/tools/upend_js/types.ts b/tools/upend_js/types.ts index 837bc42..b6ba0d7 100644 --- a/tools/upend_js/types.ts +++ b/tools/upend_js/types.ts @@ -50,4 +50,5 @@ export interface VaultInfo { name: string | null; location: string; version: string; + desktop: boolean; } diff --git a/webui/src/components/display/UpObject.svelte b/webui/src/components/display/UpObject.svelte index c22b80c..6936165 100644 --- a/webui/src/components/display/UpObject.svelte +++ b/webui/src/components/display/UpObject.svelte @@ -9,6 +9,7 @@ import { notify, UpNotification } from "../../notifications"; import IconButton from "../utils/IconButton.svelte"; import { useParams } from "svelte-navigator"; + import { vaultInfo } from "../../util/info"; const dispatch = createEventDispatcher(); const params = useParams(); @@ -99,14 +100,16 @@ {/if} - {#if banner && isFile} -
- -
+ {#if $vaultInfo?.desktop} + {#if banner && isFile} +
+ +
+ {/if} {/if} diff --git a/webui/yarn.lock b/webui/yarn.lock index 5bad53c..af0fe4f 100644 --- a/webui/yarn.lock +++ b/webui/yarn.lock @@ -4008,8 +4008,8 @@ __metadata: "upend@file:../tools/upend_js::locator=svelte-app%40workspace%3A.": version: 0.0.1 - resolution: "upend@file:../tools/upend_js#../tools/upend_js::hash=08bbf6&locator=svelte-app%40workspace%3A." - checksum: 1f19933b85edf9ade3a2b2bab296f70c0eb844fbfaa797d283cac269c040454e96443917f58432a4cea02f180acbbc46c5b3b63511ece5174bf1f993b28fba00 + resolution: "upend@file:../tools/upend_js#../tools/upend_js::hash=065315&locator=svelte-app%40workspace%3A." + checksum: d60e8503f734a109f51f817dcefa33d9650e282358e411c69b2457ee93fe8173e596277feb02b805a4489975a2fca2dc9892d343343cb1368152ab6deb3f93ff languageName: node linkType: hard