-
Notifications
You must be signed in to change notification settings - Fork 362
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
Tsify mapColumn #6494
Tsify mapColumn #6494
Conversation
The last tag just before prettier v2 was run
Whoops. I messed up the post-prettier tag merge. Fixing it now. |
The tag immediately after prettier v2 was run in main
9170cf4
to
2684dbc
Compare
Hopefully fixed. Sorry about that. I was just testing some instructions I'm going to post to the discussions forum and missed a step. |
@staffordsmith83 to assess this and the time it will take this sprint |
@zoran995 Ill push this to a new branch on |
TODO: Manually patch ProgressBar.jsx, Splitter.jsx, and MapColumn.jsx
@staffordsmith83 of course, also feel free to push it directly to this branch if you want |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ProgressBar.tsx
ProgressBar.tsx is good, made a couple of small changes
- css wrapper on line 73
- mode:boolean on line 19
- added
terria.baseMapContrastColor
to dependencies array on line 40
MapColumn.tsx
You have removed chromeVersion
checking stuff. Is this no longer necessary?
customFeedbacks
declared in props but not used. Reimplement the section from MapColumn.jsx that is commented out in latest main?
MapColumn
now includes ProgressBar
- where was it before? In StandardUserInterface
- why is this moved?
// @ts-ignore on line 59, can we fix this?
Is this functionality retained somewhere? ln 67-69 in MapColumn.jsx in main
css={`
${this.props.viewState.explorerPanelIsVisible &&
"opacity: 0.3;"}
`}
FeedbackItem display has been removed
In MapColumn.jsx this was
terriajs/lib/ReactViews/StandardUserInterface/MapColumn.jsx
Lines 167 to 173 in f62bfaf
<For | |
each="feedbackItem" | |
of={this.props.customFeedbacks} | |
index="i" | |
> | |
<div key={i}>{feedbackItem}</div> | |
</For> |
Line 123 the condition used to be If condition={!this.props.viewState.hideMapUi}
Do we need to put this back in?
Compass.tsx
Improper find and replace?
"the way our compass is composed" became
"the way our compassbase is composed"
and in a few other places.
Other changes
Moves MapCredits
out of StandardUserInterface
and into MapColumn
- I think this is fine
SUMMARY
There is some great workhere Zoran to neaten up a lot of things, I have really noticed your work. Replacing passing viewstate and terria in props with hooks, restructuring the code, and the complex work of rewriting key files in TS. We are VERY grateful for your work and sorry that it has taken so long to review. Please have a look at these few things and we hope to merge soon!
|
Hi @zoran995 thanks again for your quick response! OK for points 1,2, and 4. @zoran995 would you like to implement the last two points, or should I? |
I have implemented those last two changes, I think this is ready to merge @steve9164 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All required changes implemented
@steve9164 to review before merging |
@steve9164 any luck with this? Keen to help if you need |
CHANGES.md
Outdated
- Move map credits to map column so it don't get hidden by chart panel | ||
- [The next improvement] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hey @steve9164 and @staffordsmith83
Before this is merged in can you please update the CHANGES
file here. Thanks!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done thanks @zoran995 !
URGENT: before merging this let me check that this is the right PR with the changes I made for Zoran |
All good, ready to merge |
What this PR does
Fixes #
Tsify
MapColumn
,TerriaViewerWrapper
,LocationBar
,DistanceLegend
,Splitter
.Test me
How should reviewers test this? (Hint: If you want to provide a test catalog item, create a Gist of its catalog JSON, add its url and your branch name to this url:
http://ci.terria.io/<branch name>/#clean&<raw url of your gist>
, and then paste that in the body of this PR)Checklist
doc/
.