From 030f05b24b5c87caf92c98ebec17df7d9e3bb738 Mon Sep 17 00:00:00 2001 From: Yossi Hillali Date: Fri, 15 Mar 2024 10:00:43 +0200 Subject: [PATCH 01/28] fix: OMV 7 support (#1959) --- src/server/api/routers/openmediavault.ts | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/server/api/routers/openmediavault.ts b/src/server/api/routers/openmediavault.ts index 76b11ba92..3d42ad4fd 100644 --- a/src/server/api/routers/openmediavault.ts +++ b/src/server/api/routers/openmediavault.ts @@ -78,10 +78,17 @@ export const openmediavaultRouter = createTRPCRouter({ const cookies = authResponse.headers['set-cookie'] || []; sessionId = cookies - .find((cookie: any) => cookie.includes('X-OPENMEDIAVAULT-SESSIONID')) + .find( + (cookie: any) => + cookie.includes('X-OPENMEDIAVAULT-SESSIONID') || + cookie.includes('OPENMEDIAVAULT-SESSIONID') + ) ?.split(';')[0]; loginToken = cookies - .find((cookie: any) => cookie.includes('X-OPENMEDIAVAULT-LOGIN')) + .find( + (cookie: any) => + cookie.includes('X-OPENMEDIAVAULT-LOGIN') || cookie.includes('OPENMEDIAVAULT-LOGIN') + ) ?.split(';')[0]; } From 81e51d28774e5558d699c61b5c4a9fca93c18ee7 Mon Sep 17 00:00:00 2001 From: Tagaishi Date: Fri, 15 Mar 2024 13:51:25 +0100 Subject: [PATCH 02/28] feat: Apply translation automation from select option to multi-select option (#1963) --- .../Tiles/Widgets/WidgetsEditModal.tsx | 20 ++++++++++++++----- src/widgets/widgets.ts | 2 +- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/components/Dashboard/Tiles/Widgets/WidgetsEditModal.tsx b/src/components/Dashboard/Tiles/Widgets/WidgetsEditModal.tsx index 750231281..6b6e11e1a 100644 --- a/src/components/Dashboard/Tiles/Widgets/WidgetsEditModal.tsx +++ b/src/components/Dashboard/Tiles/Widgets/WidgetsEditModal.tsx @@ -170,6 +170,15 @@ const WidgetOptionTypeSwitch: FC<{ ); case 'multi-select': + const multiSelectItems = typeof option.data === 'function' ? option.data() : option.data; + const multiSelectData = multiSelectItems.map((dataType) => { + return !dataType.label + ? { + value: dataType.value, + label: t(`descriptor.settings.${key}.data.${dataType.value}`), + } + : dataType; + }); return ( @@ -179,9 +188,10 @@ const WidgetOptionTypeSwitch: FC<{ {info && } handleChange(key, v)} withinPortal {...option.inputProps} @@ -189,8 +199,8 @@ const WidgetOptionTypeSwitch: FC<{ ); case 'select': - const items = typeof option.data === 'function' ? option.data() : option.data; - const data = items.map((dataType) => { + const selectItems = typeof option.data === 'function' ? option.data() : option.data; + const selectData = selectItems.map((dataType) => { return !dataType.label ? { value: dataType.value, @@ -209,7 +219,7 @@ const WidgetOptionTypeSwitch: FC<{