Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move service unit filter next to basic search in leases view #477

Merged
merged 8 commits into from
May 16, 2024
Merged

move service unit filter next to basic search in leases view #477

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
fa4f9de
move service unit filter next to basic search in leases view
robertrytovuori May 3, 2024
868219b
move service unit filter to suodatus component
robertrytovuori May 10, 2024
33e3f52
move service unit filter into suodatus component
robertrytovuori May 14, 2024
b0255bd
rename componentToRenderNextToLabel to ...UnderLabel
robertrytovuori May 14, 2024
f237ac0
change palvelukokonaisuus in top navigation to oma palvelukokonaisuus
robertrytovuori May 14, 2024
c25f591
fix issue where detailed search is cleared when service unit filter c…
robertrytovuori May 14, 2024
2eb25dc
rename to componentToRenderUnderTitle
robertrytovuori May 15, 2024
8bc1fdb
detailed search view should not render when the service unit filter i…
robertrytovuori May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 21 additions & 22 deletions src/leases/components/search/Search.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,27 @@ class Search extends PureComponent<Props, State> {
/>
</Column>
</Row>
<SearchRow>
<SearchLabelColumn>
<SearchLabel>Palvelukokonaisuus</SearchLabel>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could this be something like Suodata palvelukokonaisuuden mukaan, to distinguish from the top nav bar filter. Should this label be put on a separate line above the field, just like in other fields?

You could also add a visible label for the search field above in the same way with text something like Hae hakusanalla or something else.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Headerissa voisi lukea Oma palvelukokonaisuus
Suodatuksessa voisi lukea Vuokrauspalvelu

</SearchLabelColumn>
<SearchInputColumn>
<FormField
autoBlur
disableDirty
fieldAttributes={{
label: 'Palvelukokonaisuus',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This label is repeated in many places, so it is recommended to use the enum in leases/enums.js

type: FieldTypes.CHOICE,
read_only: false,
}}
invisibleLabel
name='service_unit'
overrideValues={{
options: serviceUnitOptions,
}}
/>
</SearchInputColumn>
</SearchRow>
{!isBasicSearch &&
<Fragment>
<Row>
Expand Down Expand Up @@ -737,28 +758,6 @@ class Search extends PureComponent<Props, State> {
/>
</SearchInputColumn>
</SearchRow>

<SearchRow>
<SearchLabelColumn>
<SearchLabel>Palvelukokonaisuus</SearchLabel>
</SearchLabelColumn>
<SearchInputColumn>
<FormField
autoBlur
disableDirty
fieldAttributes={{
label: 'Palvelukokonaisuus',
type: FieldTypes.CHOICE,
read_only: false,
}}
invisibleLabel
name='service_unit'
overrideValues={{
options: serviceUnitOptions,
}}
/>
</SearchInputColumn>
</SearchRow>
</Column>
</Row>
</Fragment>
Expand Down