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.

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

UHF-9606 decisionmakers #43

Merged
merged 35 commits into from
Mar 28, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ee168a0
add a version to nvmrc which allows installing packages
rpnykanen Dec 8, 2023
61f6032
full width keyword search bar and submit button under search fields a…
rpnykanen Dec 8, 2023
5dc2b65
more submit button changes
rpnykanen Dec 8, 2023
1dcd591
working multiselect combobox
rpnykanen Dec 13, 2023
4d1c1f0
added decisionmakers to the dropdown, map the id with name
rpnykanen Dec 19, 2023
684b24b
properly set the data
rpnykanen Dec 19, 2023
457ce18
Merge branch 'develop' into UHF-8859
rpnykanen Dec 20, 2023
ef835a2
updated form container and dm select combobox
rpnykanen Dec 20, 2023
c339c83
add a version to nvmrc which allows installing packages
rpnykanen Dec 8, 2023
0977a0e
full width keyword search bar and submit button under search fields a…
rpnykanen Dec 8, 2023
eca3db6
more submit button changes
rpnykanen Dec 8, 2023
b6ae70d
working multiselect combobox
rpnykanen Dec 13, 2023
50c376f
added decisionmakers to the dropdown, map the id with name
rpnykanen Dec 19, 2023
49c7dd1
properly set the data
rpnykanen Dec 19, 2023
294454c
updated form container and dm select combobox
rpnykanen Dec 20, 2023
a478e86
Merge branch 'UHF-8859' of github.com:City-of-Helsinki/paatokset-sear…
rpnykanen Jan 16, 2024
5ab10be
Added reducer to filter duplicate entries from the list. Added types …
rpnykanen Jan 17, 2024
706f0f0
added ID to all duplicate dropdown labels
rpnykanen Jan 17, 2024
1e23327
sectors and special cases works
rpnykanen Jan 18, 2024
1d7cecc
sectors id to label from queryparameters
rpnykanen Jan 18, 2024
d0bacd0
sector search
rpnykanen Jan 19, 2024
2c5db26
Merge remote-tracking branch 'origin/UHF-8859' into UHF-9606_decision…
rpnykanen Mar 4, 2024
31f86cb
update set up instructions
rpnykanen Mar 4, 2024
0afb7a4
policymaker search, exclude if policymaker_existing is false
rpnykanen Mar 8, 2024
e27ddd0
removed two hardcoded dms and added sector data to dm dropdown title
rpnykanen Mar 8, 2024
cabc69e
remove commented code
rpnykanen Mar 8, 2024
72362b0
unused import
rpnykanen Mar 8, 2024
892957c
added policymaker index to the query. Get all the policymakers from p…
rpnykanen Mar 13, 2024
e744b6c
readded missing sectors, removed some or null types
rpnykanen Mar 13, 2024
c8a0fbb
fixed wrong type. removed commented out code
rpnykanen Mar 13, 2024
d896e62
useless todo comment removed
rpnykanen Mar 25, 2024
164c40d
conditionally render remove all button
rpnykanen Mar 26, 2024
f4d1d9c
added existing check to initial elastic query
rpnykanen Mar 26, 2024
69d5c4b
Fix policymakers existing check.
juho-lehmonen Mar 27, 2024
f375b6b
Skip empty decisionmaker data when building dropdown.
juho-lehmonen Mar 28, 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
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
lts/iron
v12.22.12
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ First, make sure you have installed the helfi-paatokset project and have set it
```console
foo@bar:~$ npm i
foo@bar:~$ npm start

# In case of ERR_OSSL_EVP_UNSUPPOERTED error, instead of 'npm start' run:
NODE_OPTIONS=--openssl-legacy-provider npm start
```

Make sure your elastic container is up and running.
Expand Down
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions src/common/components/form/SearchBarWrapper.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
.SearchBarWrapper {
flex: 1;

@media (min-width: 1248px) {
max-width: 894px;
}

label {
font-weight: bold;
display: inline-block;
Expand Down
13 changes: 4 additions & 9 deletions src/common/styles/Form.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -38,28 +38,23 @@
.FormContainer__lower-fields {
@media (min-width: 1248px) {
display: flex;
width: 894px;
align-items: flex-start;
margin-bottom: 16px;

.form-element {
width: 282px;
flex-basis: 282px;
margin-bottom: 0;

&:not(:first-child) {
margin-left: 24px;
}
&:last-of-type {
flex-grow:2;
}
}
}
}

.FormContainer__upper-fields {
display: flex;
align-items: flex-end;
justify-content: space-between;
flex-wrap: nowrap;
}

.FormContainer__description {
font-size: 18px;
margin-bottom: 1.2rem;
Expand Down
6 changes: 3 additions & 3 deletions src/modules/decisions/SearchContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ const SearchContainer = ({ url }: Props) => {
return (
<ReactiveBase
url={url}
app={Indices.PAATOKSET_DECISIONS}
app={`${Indices.PAATOKSET_DECISIONS},${Indices.PAATOKSET_POLICYMAKERS}`}
theme={baseTheme}
>
<FormContainer
langcode={t('SEARCH:langcode')}
formDescription={t('DECISIONS:form-description')}
searchTriggered={searchTriggered}
triggerSearch={triggerSearch}/>

triggerSearch={triggerSearch}
/>
<ResultsContainer />
</ReactiveBase>
)
Expand Down
Loading