From a4380618d0607e8d0a272ef75402bdacf316cac0 Mon Sep 17 00:00:00 2001 From: Juho Kettunen Date: Wed, 14 Aug 2024 15:52:17 +0300 Subject: [PATCH 1/2] properly split query parameter for email (#511) Service unit query parameter was previously sent as single string like "1,2,3,4", which is not a proper input for forms.ModelMultipleChoiceField. Synchronous reports already handled this query string properly, so now email reports use the same query parameter parsing for service unit. --- src/leaseStatisticReport/requests.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/leaseStatisticReport/requests.ts b/src/leaseStatisticReport/requests.ts index de73f1fc5..7acfe8028 100644 --- a/src/leaseStatisticReport/requests.ts +++ b/src/leaseStatisticReport/requests.ts @@ -23,10 +23,11 @@ export const fetchReportData = (payload: Record): Generator): Generator => { - return callApi(new Request(`${payload.url}?${payload.query}`)); + const parsedQuery = parseServiceUnitQuery(payload.query) || ''; + return callApi(new Request(`${payload.url}?${parsedQuery}`)); }; export const fetchOptions = (payload: any): Generator => { return callApi(new Request(payload, { method: 'OPTIONS' })); -}; \ No newline at end of file +}; From 434c868bd80a1802eb8d7266948520853d6510d2 Mon Sep 17 00:00:00 2001 From: Robert Rytovuori Date: Thu, 15 Aug 2024 08:35:19 +0300 Subject: [PATCH 2/2] fix icons in send email modal --- .../leaseSections/constructability/SendEmailModal.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/leases/components/leaseSections/constructability/SendEmailModal.tsx b/src/leases/components/leaseSections/constructability/SendEmailModal.tsx index 30f9935b4..fd540b2f6 100644 --- a/src/leases/components/leaseSections/constructability/SendEmailModal.tsx +++ b/src/leases/components/leaseSections/constructability/SendEmailModal.tsx @@ -127,7 +127,12 @@ class SendEmailModal extends PureComponent { } = this.state; return Valitse sähköpostin vastaanottajat - this.dualListBox = ref} canFilter filter={filter} filterPlaceholder='Hae vastaanottajia...' onChange={this.handleUserListChange} onFilterChange={this.handleFilterChange} options={userOptions} selected={selectedUsers} simpleValue={false} /> + ', + moveAllRight: '>>' + }} availableRef={ref => this.dualListBox = ref} canFilter filter={filter} filterPlaceholder='Hae vastaanottajia...' onChange={this.handleUserListChange} onFilterChange={this.handleFilterChange} options={userOptions} selected={selectedUsers} simpleValue={false} />