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

merge: update branch with latest dev #5803

Merged
merged 9 commits into from
Jul 22, 2024
Merged

merge: update branch with latest dev #5803

merged 9 commits into from
Jul 22, 2024

Conversation

avaek
Copy link
Contributor

@avaek avaek commented Jul 22, 2024

No description provided.

alexd-bes and others added 9 commits July 15, 2024 16:28
)

* Add default end date to params for querying data

* Set start date as beginning of selected date and end date as end of selected date

* Fix check on overlay query

* Make default dates work for map overlays

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
merge: release-2024-29 master->dev
…questions (#5641)

* WIP

* Styling

* Fix build error

* Update error handling

* Update TupaiaApi.js

* PR fixes

* Fix merge issue with error handling

* Include error extra fields in tooltip

* Fix config errors

* Fix modal buttons on error

* Handle error details for config questions

* Use close button on import error

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
* experiment: zero-dep component

* add dropzone

* use dropzone

* fix label styling

* remove unused code

* fix tooltip alignment

* icon colour

* default to single file again

* show errors when file rejected

* name and ID

* remove unused variable

* remove usages of retired props

* fix undefined var

* working implementation!

* fix spacing semantics

* dynamic clear selection button

* spacing & letterspacing tweaks

* add/remove files individually

* more consistent `transition-duration`

* remove `console.log`

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>

* remove use of `isDragReject`

* comment implementation idiosyncrasies

* clearer symbol name for icon

* simplify CSS

* fix `onDropAccepted` using old state

* fix `ImportModal`’s `onChange`

* fix file removal

* use new change handler signature

* update stories

* fix stories

* finish merge

* fix looks-like-file-is-selected mode

* fix supported files functionality

* add missing `name` prop

* fix component in review/response screens

* remove rougue console log

* initialise variable closer to usage

* no fractional bytes

* re-remove unused parameters

* workaround `TypeError` in Chromium

* fix import modal uploads

* unwrap redundant `Fragment`

* fix `accept` format for file picker

* echo fix in storybook

* fix typing (restore `labelProps`)

---------

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>
Co-authored-by: Andrew <vanbeekandrew@gmail.com>
fmt: avoid unnecessary template literals


* use `flatMap`

* use `Number` namespace

* remove redundant `?`

* remove redundant await

* use `const`

* Revert "use `Number` namespace"

This reverts commit 58a059c.

* remove redundancy

* educate quotes

* use optional chaining

* avoid unneeded template literal

* add missing export

imported by theme.js

* simplify use of `<Fragment>`

* remove redundant `?`

Co-authored-by: Tom Caiger <caigertom@gmail.com>

---------

Co-authored-by: Tom Caiger <caigertom@gmail.com>
@avaek avaek merged commit 2d7b687 into rn-1228-preview-surveys Jul 22, 2024
39 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants