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

Jump to bottom

807 history tree with plotsearch #445

Merged
merged 31 commits into from
Nov 8, 2023
Merged

807 history tree with plotsearch #445

merged 31 commits into from
Nov 8, 2023

Conversation

NC-jsAhonen
Copy link
Contributor

@NC-jsAhonen NC-jsAhonen commented Nov 1, 2023 •
edited
Loading

Historiapuuhun sisällytetään tonttihaut, tonttihakemukset ja aluehakemukset. Ne näytetään, ja niitä voi manuaalisesti lisäillä ja poistaa. Automaattisesti lisätyt tiedot näytetään myös, mutta niitä ei voi poistaa.

Toimii yhdessä mvj backendin samannimisen 807-history-tree-with-plotsearch branchin kanssa.

henrinie-nc and others added 21 commits October 10, 2023 10:51
@henrinie-nc
Tmp testing
2ec898b
@NC-jsAhonen
refactor related leases into lease history
d8312ac 
except redux and css
@NC-jsAhonen
refactor lease history: re-usable render function
5e22afb
@NC-jsAhonen
lease history item:
75b7d7e 
active param can be set explicitly to false
@NC-jsAhonen
lease history item: truncate long titles
75b0c01
@NC-jsAhonen
lease history: add mock area search
7d3c041
@NC-jsAhonen
lease history: use plotsearch initial target
3f647c0
@NC-jsAhonen
misc small tweaks
0fec309
@NC-jsAhonen
lease history: add area search
e3c2d10 
with mock applicant name
@NC-jsAhonen
fix key of plot application UI component prop
c1dd623
@NC-jsAhonen
lease history: refactor edit view
b8e73dc
@NC-jsAhonen
lease history: misc changes
aad5099
@NC-jsAhonen
lease history: remove console logs
29c4922
@NC-jsAhonen
lease history tree: related plot applications
c53e071 
and area searches
@NC-jsAhonen
lease history tree: show related plot applications and
9fc59f4 
area searches and include them to dropdown search
@NC-jsAhonen
lease history: fix deletion for related leases
b747af5
@NC-jsAhonen
lease history: add and remove items with hardcoded content type numbers
3c6dfa2
@NC-jsAhonen
lease history: filter dropdown search results by
5e4b825
@NC-jsAhonen
lease history: add & remove plot searches manually
cb00e27
@NC-jsAhonen
lease history: sort items for each lease
42785c0 
and fix react key props
@NC-jsAhonen
Merge branch 'develop' into 807-history-tree-with-plotsearch
b31c317
henrinie-nc
henrinie-nc reviewed Nov 2, 2023
View reviewed changes
src/leases/enums.js Outdated Show resolved Hide resolved
@henrinie-nc
Copy link
Contributor

Looks good overall, pointed out some small improvements. Would be a good idea to format the files so the code style would be similar

henrinie-nc
henrinie-nc approved these changes Nov 7, 2023
View reviewed changes
Copy link
Contributor

@henrinie-nc henrinie-nc left a comment

Choose a reason for hiding this comment

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

Most things seem to have been fixed. I reposted my question about using Promise.all in getHistoryItems to get the response faster, would like to hear your thoughts on that.

@NC-jsAhonen NC-jsAhonen merged commit bc3c6cb into develop Nov 8, 2023
3 checks passed
@NC-jsAhonen NC-jsAhonen deleted the 807-history-tree-with-plotsearch branch November 8, 2023 08:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@henrinie-nc henrinie-nc henrinie-nc approved these changes

@EmiliaMakelaVincit EmiliaMakelaVincit Awaiting requested review from EmiliaMakelaVincit

@PasiVuohijoki PasiVuohijoki Awaiting requested review from PasiVuohijoki

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@NC-jsAhonen @henrinie-nc @EmiliaMakelaVincit