merge: update branch with latest dev #6003
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Release 2024-38
merge: release-2024-28
* 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
…an 2 recent surveys (#5923)
* 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>
Update timezone.test.js
… 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>
#5837) Update custom filters
…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>
…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>
Update ExportButton.jsx
…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>
Update ExportButton.jsx
bump app to version 144
* move project select form to ui components * move select list * label props * labelProps * Update SelectList.tsx * feat(tupaiaWeb): RN-1408: Update projects workflow (#5898) * show user project button * new login route * move project select form to ui components * add project select modal to tupaia web * request access * clean up types * Update LoginRoute.ts * remove list component * project landing page * Update ProjectCard.tsx * pr suggestions * Update userAuth.js * update styles * Update ProjectSelectModal.tsx * fix tooltip * add mobile support * fix test * Update DrawerMenu.tsx * fix request access link * Update Dashboard.tsx * Update ProjectSelectForm.tsx * Update ProjectCard.tsx * Update ProjectSelectModal.tsx * update request access modal * Update LoginRoute.ts * Update LoginRoute.ts * Update UserMenu.tsx * Update ProjectAccessForm.tsx --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com>
* update leader board * Update packages/database/src/__tests__/modelClasses/SurveyResponse.test.js Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com> --------- Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
Release 2024-43
merge: release-2024-43 master -> dev
Update ExportConfig.tsx
* Migration * Database record * Generate types * Server boilerplate model * Add entries to access table on login and send email * working login notifier * Add tests * Tests * Update yarn.lock * Fix build * Update yarn.lock * If we are in a production environment, send an email to the dev team instead of creating a support ticket * Update createSupportTicket.js * Update createSupportTicket.test.js * Update createSupportTicket.js --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com> Co-authored-by: Tom Caiger <caigertom@gmail.com>
* Frontend * Working hook * Remove other hook * Styling * Handle single images * Add comments * Error handling * PR fixes --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com> Co-authored-by: Tom Caiger <caigertom@gmail.com>
… current entity (#5888) * Disable map overlays when at a level ahead of current entity * Update MapOverlayList.tsx * Tidy ups * Generate types * Add comment * Update MapOverlayList.tsx * Update useDefaultMapOverlay.ts --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com> Co-authored-by: Tom Caiger <caigertom@gmail.com>
…om map overlay table (#5965) * hideFromTable * Update schemas.ts --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com>
Update utils.ts
Update DataTable.tsx Co-authored-by: Andrew <vanbeekandrew@gmail.com>
* set download file types * Update ExportButton.jsx
…le (#5905) * First Attempt * minor update * updates * update * Update Preview.tsx * Update PDFExportDashboardItem.tsx * description styles * fix description preview * Update ExportDashboard.tsx * Update PDFExportDashboardItem.tsx --------- Co-authored-by: Tom Caiger <caigertom@gmail.com>
…e_test) for PacMOSSI project (#5986) * pacmossi_insecticide_test entity type * schema and model update
Release 2024-45
* Update Tooltip.tsx * set delay on BaseTooltip --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com>
merge: release-2024-45 to dev
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.