merge: dev -> rn-1409 #5897
Merged
merge: dev -> rn-1409 #5897
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
Update ReportPermissionsChecker.js
…resubmission (#5817) * Initial update * test updates * Update importSurveyResponses.js * Update importSurveyResponses.js * Update importSurveyResponses.js * Update SurveyResponseUpdatePersistor.js * Delete ~$nonPeriodicUpdates.xlsx * test updates * review comments * review updates * addition of tests --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com>
* WIP * Rearrange routes * Ability to resubmit * Ability to upload images in resubmission * Success screen * Loading state * Disable create new autocomplete abilities in resubmit (temp) * tidy ups * Remove unused import * Fix imports * Update SurveyResponsePage.tsx * Fix tests * Update packages/datatrak-web-server/src/routes/SingleSurveyResponseRoute.ts Co-authored-by: Rohan Port <59544282+rohan-bes@users.noreply.github.com> * feat(adminPanel): RN-1243: Resubmit survey response modal should link to Datatrak Web (#5640) * WIP * WIP * WIP * Styling * WIP * Error dismiss * WIP * Use updated entity country code if applicable * Don't update user project/country if in resubmit mode * Fix build * Add REACT_APP_DATATRAK_WEB_URL to .env.example * Build fixes * Apply primary entity answer to resubmit * Fix breaking data_time questions * Fix build * Fix survey responses with file uploads * Display file name for saved file questions and fix remove file value * Use dataTime for date questions * fix permissions * Send timezone through with resubmission * Open up permissions * feat(dataTrak): RN-1274: Keep 'outdated' historical survey responses when resubmitting (#5758) * RN-1274: change route to `surveyResponses/:id/resubmit` * RN-1274: Reworked ResubmitSurveyResponse route to create a new response and outdate the previous one * RN-1274: Added resubmitSurveyResponse to the CentralApi * RN-1274: Added ResubmitSurveyResponseRoute to datatrak-web-server * RN-1274: Reworked survey response resubmission in datatrak to use the new backend routes * Fix tests * Edit survey response metadata * Fix tests * Edit survey response metadata * Resubmit survey response with original data time and user ID * PR fixes * take 1 * feat(adminPanel): RN-1228: Link surveys to Datatrak Web (#5671) * Make links * Use projectId * Update user preferences if project id is in url * Add comment * Allow country codes to be fetched for surveys * Link directly to survey * Default to DL and alphabetise the country codes * Change tooltip text * Update copy * Hide button for surveys with no countries --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com> * Fix dataTime timezone change * Allow file questions to be viewed and changed * feat(tupaiaWeb): RN-1367: Multiphotograph viz captions + restyle (#5769) * Add `label` property to view data * Preview display * Display max 3 * WIP carousel * WIP * Working thumbnails * Working carousel * WiP * Styling * Add comments * Update schemas.ts * Adjust height and alignment * Make images contained * Fix responsive issue --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com> * Fix issue * Fix date of data * Add outdated column to survey responses in admin panel * Reset entity question values when filter questions change * fix(datatrakWeb): Fix country code selector in reports export * fix(adminPanel): RN-1375: update 'Add' project editor for consistency (#5816) update editor column for consistency * Handle existing file answers * Use existing entity id if present * Add pill styling for response status field * Handle file names * Change pill colours around * Handle survey response file names * Don't save file url in answer * Fix tests * Don't default dates on resubmit * Handle when photo answer is a url * Allow `null` default date for resubmission * Save previous metadata on tracked entity * Fix undefined models error * Update project.pbxproj * Hide survey resubmit button for outdated responses * tweak(tupaiaWeb): RN-1394: Update tool tip for visualisation export (#5824) Tool tip update * tweak(adminPanel): RN-1399: Update icon and color as per Figma layouts (#5825) Download Icon update * tweak(adminPanel): RN-1274: Remove outdated survey responses and associated answers from DHIS via sync queue (#5827) * Remove outdated survey responses and associated answers from dhis via sync queue * Add tests * Add answers back into queue when survey response is changed back to current * Handle answers for outdated->current tests * Fix tests * Revert change to filter * Ignore outdated surveys from exports * Code question should be code generator type * Fix tests * Fix timezone issues * Update processSurveyResponse.test.ts * Get all answers for survey response * Handle when photo includes a url * Fix tests * Fix crashing error * Concert jpeg to jpg * Keep existing survey response timezone * fix(tupaiaWeb): RN-1414: Fix dashboard item permission error (#5836) Update ReportPermissionsChecker.js * Timezones * fix(adminPanel): RN-1289: update the entity associated with a survey resubmission (#5817) * Initial update * test updates * Update importSurveyResponses.js * Update importSurveyResponses.js * Update importSurveyResponses.js * Update SurveyResponseUpdatePersistor.js * Delete ~$nonPeriodicUpdates.xlsx * test updates * review comments * review updates * addition of tests --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com> * Convert data_time to timezone date on server * Fix tests * Make dates/times zoneless so that they appear the same to everyone * Fix tests * Fix timezone offsets * Handle timezones with DST * Fixes --------- Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com> Co-authored-by: Salman <114740396+hrazasalman@users.noreply.github.com> Co-authored-by: Andrew <vanbeekandrew@gmail.com> Co-authored-by: Tom Caiger <caigertom@gmail.com> --------- Co-authored-by: Rohan Port <59544282+rohan-bes@users.noreply.github.com> Co-authored-by: Andrew <vanbeekandrew@gmail.com> Co-authored-by: Salman <114740396+hrazasalman@users.noreply.github.com> Co-authored-by: Tom Caiger <caigertom@gmail.com>
Release 2024-33
merge: release-2024-33 master -> dev
…ay records (#5846) Create 20240818212910-removeMapOverlayConfigFromPgNotify-modifies-schema.js
* Update json-web-token * Update jsonwebtoken in auth package
* Update xlsx * xlsx fixes * Handle xlsx blank rows and parsing
* Update config for entity type * Types update * Fix uses of EntityType
* 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
* 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
Throw an error and register bad requests on dhis sync queue
* Bumping react-query * Update render.tsx * fixing Reports.test.tsx * navigation bug fix * removed logging
* bumping to v4 * Update yarn.lock
* upgrade * Update yarn.lock
* upgrade * Update yarn.lock
* 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
* bugfix * update * updates
* Common download files component * PR fix
tcaiger
added a commit
that referenced
this pull request
Nov 27, 2024
…tity Hierarchy Export File (#5852) * inclusion of additional columns * Update fieldsAndFilters.test.ts * Review updates * merge: dev -> rn-1409 (#5897) * fix(tupaiaWeb): RN-1414: Fix dashboard item permission error (#5836) Update ReportPermissionsChecker.js * fix(adminPanel): RN-1289: update the entity associated with a survey resubmission (#5817) * Initial update * test updates * Update importSurveyResponses.js * Update importSurveyResponses.js * Update importSurveyResponses.js * Update SurveyResponseUpdatePersistor.js * Delete ~$nonPeriodicUpdates.xlsx * test updates * review comments * review updates * addition of tests --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com> * feat(datatrakWeb): RN-1243: resubmit surveys via Datatrak Web (#5638) * WIP * Rearrange routes * Ability to resubmit * Ability to upload images in resubmission * Success screen * Loading state * Disable create new autocomplete abilities in resubmit (temp) * tidy ups * Remove unused import * Fix imports * Update SurveyResponsePage.tsx * Fix tests * Update packages/datatrak-web-server/src/routes/SingleSurveyResponseRoute.ts Co-authored-by: Rohan Port <59544282+rohan-bes@users.noreply.github.com> * feat(adminPanel): RN-1243: Resubmit survey response modal should link to Datatrak Web (#5640) * WIP * WIP * WIP * Styling * WIP * Error dismiss * WIP * Use updated entity country code if applicable * Don't update user project/country if in resubmit mode * Fix build * Add REACT_APP_DATATRAK_WEB_URL to .env.example * Build fixes * Apply primary entity answer to resubmit * Fix breaking data_time questions * Fix build * Fix survey responses with file uploads * Display file name for saved file questions and fix remove file value * Use dataTime for date questions * fix permissions * Send timezone through with resubmission * Open up permissions * feat(dataTrak): RN-1274: Keep 'outdated' historical survey responses when resubmitting (#5758) * RN-1274: change route to `surveyResponses/:id/resubmit` * RN-1274: Reworked ResubmitSurveyResponse route to create a new response and outdate the previous one * RN-1274: Added resubmitSurveyResponse to the CentralApi * RN-1274: Added ResubmitSurveyResponseRoute to datatrak-web-server * RN-1274: Reworked survey response resubmission in datatrak to use the new backend routes * Fix tests * Edit survey response metadata * Fix tests * Edit survey response metadata * Resubmit survey response with original data time and user ID * PR fixes * take 1 * feat(adminPanel): RN-1228: Link surveys to Datatrak Web (#5671) * Make links * Use projectId * Update user preferences if project id is in url * Add comment * Allow country codes to be fetched for surveys * Link directly to survey * Default to DL and alphabetise the country codes * Change tooltip text * Update copy * Hide button for surveys with no countries --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com> * Fix dataTime timezone change * Allow file questions to be viewed and changed * feat(tupaiaWeb): RN-1367: Multiphotograph viz captions + restyle (#5769) * Add `label` property to view data * Preview display * Display max 3 * WIP carousel * WIP * Working thumbnails * Working carousel * WiP * Styling * Add comments * Update schemas.ts * Adjust height and alignment * Make images contained * Fix responsive issue --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com> * Fix issue * Fix date of data * Add outdated column to survey responses in admin panel * Reset entity question values when filter questions change * fix(datatrakWeb): Fix country code selector in reports export * fix(adminPanel): RN-1375: update 'Add' project editor for consistency (#5816) update editor column for consistency * Handle existing file answers * Use existing entity id if present * Add pill styling for response status field * Handle file names * Change pill colours around * Handle survey response file names * Don't save file url in answer * Fix tests * Don't default dates on resubmit * Handle when photo answer is a url * Allow `null` default date for resubmission * Save previous metadata on tracked entity * Fix undefined models error * Update project.pbxproj * Hide survey resubmit button for outdated responses * tweak(tupaiaWeb): RN-1394: Update tool tip for visualisation export (#5824) Tool tip update * tweak(adminPanel): RN-1399: Update icon and color as per Figma layouts (#5825) Download Icon update * tweak(adminPanel): RN-1274: Remove outdated survey responses and associated answers from DHIS via sync queue (#5827) * Remove outdated survey responses and associated answers from dhis via sync queue * Add tests * Add answers back into queue when survey response is changed back to current * Handle answers for outdated->current tests * Fix tests * Revert change to filter * Ignore outdated surveys from exports * Code question should be code generator type * Fix tests * Fix timezone issues * Update processSurveyResponse.test.ts * Get all answers for survey response * Handle when photo includes a url * Fix tests * Fix crashing error * Concert jpeg to jpg * Keep existing survey response timezone * fix(tupaiaWeb): RN-1414: Fix dashboard item permission error (#5836) Update ReportPermissionsChecker.js * Timezones * fix(adminPanel): RN-1289: update the entity associated with a survey resubmission (#5817) * Initial update * test updates * Update importSurveyResponses.js * Update importSurveyResponses.js * Update importSurveyResponses.js * Update SurveyResponseUpdatePersistor.js * Delete ~$nonPeriodicUpdates.xlsx * test updates * review comments * review updates * addition of tests --------- Co-authored-by: Andrew <vanbeekandrew@gmail.com> * Convert data_time to timezone date on server * Fix tests * Make dates/times zoneless so that they appear the same to everyone * Fix tests * Fix timezone offsets * Handle timezones with DST * Fixes --------- Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com> Co-authored-by: Salman <114740396+hrazasalman@users.noreply.github.com> Co-authored-by: Andrew <vanbeekandrew@gmail.com> Co-authored-by: Tom Caiger <caigertom@gmail.com> --------- Co-authored-by: Rohan Port <59544282+rohan-bes@users.noreply.github.com> Co-authored-by: Andrew <vanbeekandrew@gmail.com> Co-authored-by: Salman <114740396+hrazasalman@users.noreply.github.com> Co-authored-by: Tom Caiger <caigertom@gmail.com> * fix(datatrakWeb): RN-1274: Remove check on autocomplete question for resubmit * fix(adminPanel): RN-1424: Fix max payload error when saving map overlay records (#5846) Create 20240818212910-removeMapOverlayConfigFromPgNotify-modifies-schema.js * 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: Tom Caiger <caigertom@gmail.com> Co-authored-by: Salman <114740396+hrazasalman@users.noreply.github.com> Co-authored-by: Andrew <vanbeekandrew@gmail.com> Co-authored-by: Rohan Port <59544282+rohan-bes@users.noreply.github.com> * Update ExportEntityHierarchiesRoute.ts * reordering * Update yarn.lock * Update ExportEntityHierarchiesRoute.ts * Update ExportEntityHierarchiesRoute.ts * Update yarn.lock * refactor to improve performance --------- Co-authored-by: alexd-bes <129009580+alexd-bes@users.noreply.github.com> Co-authored-by: Tom Caiger <caigertom@gmail.com> Co-authored-by: Andrew <vanbeekandrew@gmail.com> Co-authored-by: Rohan Port <59544282+rohan-bes@users.noreply.github.com>
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.
Issue #:
Changes:
Screenshots: