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 #5953

Merged
merged 28 commits into from
Oct 9, 2024
Merged

merge: update branch with latest dev #5953

merged 28 commits into from
Oct 9, 2024

Conversation

avaek
Copy link
Contributor

@avaek avaek commented Oct 9, 2024

No description provided.

alexd-bes and others added 28 commits September 26, 2024 08:58
* Projects search

* Sorting

* remove debug

* Fix colours

* Update country handling to always show all countries

* Hide unneeded countries

* No results message

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
* Update periodGranularities.js

* Update types

* Back and forward buttons working

* Single years

* WIP year ranges

* range year picker

* Fix labels

* Naming and labeling

* working period offsets

* Working date ranges

* Remove unsued var

* Generate types

* Fix issues with other single dates

* Update types descriptions

* Fix default date and year handling

* handle offsets in utils

* Add dateOffset types

* Update types

* tupaia web

* Update useDateRanges.ts

* Display correct values

* Working picker

* Single period change via arrows

* Tidy ups

* Fix merge conflicts

* Update DatePickerDialog.tsx

* Fix rounding of start dates

* Update to only support quarters and months

* Update types export

* Fix types

* Update periodGranularities.js

* Handle dates in the future

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
* Add archive button to admin panel

* Working archive

* Update filter

* Add tooltip to button

* Allow bes admins to delete

* FIx sortable action column

* PR fixes

* Handle outdated responses with dhis

* Check for outdated status with tasks

* Fix tests

* Update SurveyResponseOutdater.test.js

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
…lues on resubmit (#5926)

* Fix issue with code gen replacing values

* Update useSurveyResponseWithForm.ts
…#5920)

* Add ts watch scripts

* Add js watcher

* Ability to watch while running stack

* Add comments
* Request project access modal in ui components

* Move datatrak web to use new ui component

* WIP

* Fix build issue

* WIP

* Remove old files from tupaia web

* Styling fixes

* Tidy ups

* PR fixes

* Update RequestProjectAccess.tsx

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
… via the admin panel (#5904)

* Allow export of outdated responses

* Update timezone.test.js

* Change mode language

* Update exportResponsesToFile.js

* Reset values on close modal

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
)

* Update EditSurveyPage.jsx

* all file uploader updated

* updated

* updates

---------

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>
…s are not specified in import file (#5829)

* attribute updates

* slight update

* Update Entity.js

* exlude blank rows

* merge: dev -> rn-1396 (#5896)

* deps(security): RN-1096: Update version of `decode-uri-component` (#5850)

Update decide-uri-component

* deps(security): RN-1096: Update version of `jsonwebtoken` (#5851)

* Update json-web-token

* Update jsonwebtoken in auth package

* deps(security): RN-1096: Update XLSX version (#5849)

* Update xlsx

* xlsx fixes

* Handle xlsx blank rows and parsing

* tweak(types): RN-1418: Update EntityType type (#5871)

* Update config for entity type

* Types update

* Fix uses of EntityType

* tweak(adminPanel): RN-1393: Minor Admin panel updates (#5867)

* Scroll on profile pages

* Entity hierarchy export wording

* Handle single button action widths

* Bold active tabs

* Move survey questions to the top of add survey modal

* Fix input colours

* Fix sync logs tooltip

* PR fix

* deps(root): RN-1417: Update storybook version (#5878)

* Basic setup

* Add warmup script

* Update main.ts

* deps(uiChartComponents): RN-1417: Update storybook version PART 2 (#5879)

charts storybook

* deps(uiMapComponents): RN-1417: Update storybook version PART 3 (#5880)

* map components

* Fix tests

* deps(uiComponents): RN-1417: Update storybook version PART 4 (#5881)

* ui components storybook

* Fix tests

* deps(tupaiaWeb): RN-1417: Update storybook version PART 5 (#5882)

* tupaia web storybook

* Fix tests

* Fix build

* tweak(centralServer): RN-1351: Handle bad DHIS2 sync requests (#5887)

Throw an error and register bad requests on dhis sync queue

* tweak(datatrakWeb): RN-1438: Upgrade React Query to V4 (#5868)

* Bumping react-query

* Update render.tsx

* fixing Reports.test.tsx

* navigation bug fix

* removed logging

* tweak(adminPanel): RN-1439: Upgrade React Query to V4 (#5875)

* bumping to v4

* Update yarn.lock

* tweak(psss): RN-1442: Upgrade React Query to V4 (#5874)

* upgrade

* Update yarn.lock

* tweak(lesmis): RN-1441: Upgrade React Query to V4 (#5873)

* upgrade

* Update yarn.lock

* tweak(tupaiaWeb): RN-1440: Upgrade React Query to V4 (#5870)

* Bumping react-query

* Bumping react-query to v4

* Update render.tsx

* GitAction fix

* fixing Reports.test.tsx

* navigation bug fix

* review update

* removed logging

* Update yarn.lock

* Update yarn.lock

* Update VerifyEmailPage.tsx

* Update useReportPreview.js

* fix(adminPanel): Miscellaneous Bug fixes (Tiny) (#5891)

* bugfix

* update

* updates

* tweak(tupaiaWeb): RN-1437: Download files visual restyle (#5889)

* Common download files component

* PR fix

---------

Co-authored-by: Salman <114740396+hrazasalman@users.noreply.github.com>

* Update extractEntitiesByCountryName.js

---------

Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com>
Co-authored-by: Tom Caiger <caigertom@gmail.com>
* Send GA events for task creation

* Add generic task created event
…board export (#5894)

* setup controls

* Working exports

* Add page numbers

* Update DisplayOptionsSettings.tsx

* Only show format options on whole dashboard export

* Remove unused vars

* Fix logo height

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
* fix entity import

* Update updateCountryEntities.js

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
…5941)

* save last login date

* generate types

* Update setupNewDatabase.sh

* update auth tests

* Update packages/auth/src/Authenticator.js

Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>

---------

Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
* Button

* Reorganise files

* Working scanner

* Working scanner and types

* Types

* fixes

* update error handling

* Update EntitySearch.tsx

---------

Co-authored-by: Andrew <vanbeekandrew@gmail.com>
Co-authored-by: Tom Caiger <caigertom@gmail.com>
@avaek avaek merged commit 1a6d6ff into rn-1409-add-in-columns Oct 9, 2024
53 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.

4 participants