Merge branch 'develop'

City-of-Helsinki · Aug 15, 2024 · 4d64ce1 · 4d64ce1
2 parents fccd118 + dc30366
commit 4d64ce1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/leaseStatisticReport/requests.ts b/src/leaseStatisticReport/requests.ts
@@ -23,10 +23,11 @@ export const fetchReportData = (payload: Record<string, any>): Generator<any, an
  return callApi(new Request(`${payload.url}?${parsedQuery}`));
 };
 export const sendReportToMail = (payload: Record<string, any>): Generator<any, any, any> => {
- 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<any, any, any> => {
  return callApi(new Request(payload, {
  method: 'OPTIONS'
  }));
-};
+};
diff --git a/src/leases/components/leaseSections/constructability/SendEmailModal.tsx b/src/leases/components/leaseSections/constructability/SendEmailModal.tsx
@@ -127,7 +127,12 @@ class SendEmailModal extends PureComponent<Props, State> {
  } = this.state;
  return <Modal className='modal-autoheight' title='Lähetä sähköposti' isOpen={isOpen} onClose={onClose}>
  <FormText>Valitse sähköpostin vastaanottajat</FormText>
- <DualListBox availableRef={ref => this.dualListBox = ref} canFilter filter={filter} filterPlaceholder='Hae vastaanottajia...' onChange={this.handleUserListChange} onFilterChange={this.handleFilterChange} options={userOptions} selected={selectedUsers} simpleValue={false} />
+ <DualListBox icons={{
+ moveLeft: '<',
+ moveAllLeft: '<<',
+ moveRight: '>',
+ moveAllRight: '>>'
+ }} availableRef={ref => this.dualListBox = ref} canFilter filter={filter} filterPlaceholder='Hae vastaanottajia...' onChange={this.handleUserListChange} onFilterChange={this.handleFilterChange} options={userOptions} selected={selectedUsers} simpleValue={false} />
 
  <FormText><label htmlFor='send-email_text'> Sähköpostiin liittyvä kommentti</label></FormText>
  <TextAreaInput className="no-margin" id='send-email_text' onChange={this.handleTextChange} placeholder='' rows={4} value={text} />