From 0254b68a1ae435906357af30d018d1250eb8fdcf Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Wed, 8 Nov 2023 14:15:58 +0100 Subject: [PATCH] fix(theming): Adjust app order settings for backend changes Signed-off-by: Ferdinand Thiessen --- apps/theming/src/components/AppOrderSelector.vue | 3 +-- apps/theming/src/components/UserAppMenuSection.vue | 10 ++++------ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/apps/theming/src/components/AppOrderSelector.vue b/apps/theming/src/components/AppOrderSelector.vue index d8238ea2282..b1fff45de78 100644 --- a/apps/theming/src/components/AppOrderSelector.vue +++ b/apps/theming/src/components/AppOrderSelector.vue @@ -37,8 +37,7 @@ export interface IApp { icon: string // path to the icon svg label: string // display name default?: boolean // force app as default app - app: string - key: number + app?: string } export default defineComponent({ diff --git a/apps/theming/src/components/UserAppMenuSection.vue b/apps/theming/src/components/UserAppMenuSection.vue index a3e023980d0..44ebd864fc6 100644 --- a/apps/theming/src/components/UserAppMenuSection.vue +++ b/apps/theming/src/components/UserAppMenuSection.vue @@ -58,13 +58,11 @@ interface INavigationEntry { /** Whether this is the default app */ default?: boolean /** App that registered this navigation entry (not necessarly the same as the id) */ - app: string - /** The key used to identify this entry in the navigations entries */ - key: number + app?: string } /** The app order user setting */ -type IAppOrder = Record> +type IAppOrder = Record /** OCS responses */ interface IOCSResponse { @@ -131,8 +129,8 @@ export default defineComponent({ */ const updateAppOrder = (value: IApp[]) => { const order: IAppOrder = {} - value.forEach(({ app, key }, index) => { - order[app] = { ...order[app], [key]: index } + value.forEach(({ app, id }, index) => { + order[id] = { order: index, app } }) saveSetting('apporder', order)