-
Notifications
You must be signed in to change notification settings - Fork 7
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
WAITP-1482: activity feed project filter #5196
Merged
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
* Added skeleton datatrak-server package * Added datatrak-server to CI/CD * wip datatrak front end app * Added api-client to datatrak-server * Added /projects route to datatrak-server * disable eslint and re-install dependencies * Added /entities route to datatrak-server * add base views and downgrade react * Update api.js * Disabled frozen-lockfile * Reverted yarn.lock * Re-enabled frozen lockfile * Add datatrak to CI/CD * Added /surveys and /surveyScreenComponents routes * Re-enabled exports of ui-components * Switched to using pre-existing build and start scripts for datatrak * add base form components * Fix datatrak build * format data to screens * Got login working * Added extra fields to FetchSurveyScreenComponents * Got project and country selection working * Upated yarn.lock * Got survey selection working * Got Survey page working * screen steps * add template styling * add admin route * Switched to using .env var for server url * add logout * Fixed up FetchUserRoute * Add submitSurveyResponse route * labels * Add entity question * add entity question to screen * survey submit * Update yarn.lock * Update package.json * remove anything not from fe * Merge branch 'dev' into datatrak-hackathon * Remove unused files * Add initial fetch example * Update README.md * Revert change * Remove unneeded change * Add back in datatrak-app * Add .env.example * Update files * Remove unnecessary code * Fixes * Test remove server setup * Remove test step * WAITP-1368: Basic page layout (#4890) * basic page layout * styles * use theme colours --------- Co-authored-by: Rohan Port <rohan@beyondessential.com.au> Co-authored-by: Tom Caiger <caigertom@gmail.com>
* WAITP-1367 Add datatrak_session table to db * WAITP-1367 Add request type for datatrak user request * WAITP-1367 Add datatrak-server package * WAITP-1367 Regenerate yarn.lock * WAITP-1367 Fix minor copy-paste errors * WAITP-1367 Add datatrak_session to ignored tables for hooks * WAITP-1367 Add datatrak-server to server startup script in datatrak-web * WAITP-1367 Add datatrak-server to CI/CD scripts * WAITP-1367 Reduce layer count in dockerfile * WAITP-1367 Regenerate types * WAITP-1367 Regnerate types (again) * WAITP-1367 Fixup clashing exports * WAITP-1367 Rebalance test batching
* find and replace * rename package * Update tupaia-ci-cd.Dockerfile * update types
This reverts commit 6fbbec6.
* Setup reusable login form * Working login * User menu * Fix versions * Comments and tidy ups * Fix build issue * Add verify email view * Update loginForm.stories.js * FIx export * Fix storybook * Fixes * Fix route names * Update private routes and fix build * Fix type errors * Fix types * Generate types * Revert "Generate types" This reverts commit de0fb64. * Create private route --------- Co-authored-by: Tom Caiger <caigertom@gmail.com>
* Setup reusable login form * Working login * User menu * Fix versions * Comments and tidy ups * Fix build issue * Add verify email view * Update loginForm.stories.js * FIx export * Update storybook * Fix storybook * Add pages to datatrak-web and mobile styling * Fixes * Fix route names * Update private routes and fix build * Fix height * Fix type errors * Fix types * Generate types * Revert "Generate types" This reverts commit de0fb64. * Create private route * Fix build * Fix casing * Fix build error --------- Co-authored-by: Tom Caiger <caigertom@gmail.com>
* Initial landing page * Working survey select * Fix type errors * WAITP-1411: Setup datatrak survey screens (#4920) * Setup reusable login form * Working login * User menu * Fix versions * Comments and tidy ups * Fix build issue * Add verify email view * Update loginForm.stories.js * FIx export * Fix storybook * Fixes * Fix route names * survey screens * save form data * routes * Update Routes.tsx * fix types * scrren layout * refactor context * tidy up css * resolve conflicts * Update merge * Update useSurveyScreenComponents.tsx --------- Co-authored-by: acdunham <alex@beyondessential.com.au> * Fix circular types error * Fix route * Test types generate * revert generate changes --------- Co-authored-by: Tom Caiger <caigertom@gmail.com>
* Started on progress bar commit * added more styling and changed logic * designed logic for progress bar * fixed progress bar colour * fixed pr * ready for retest * Added to survey page * cleaned a few things --------- Co-authored-by: acdunham <alex@beyondessential.com.au>
* Text question * Binary and radio questions * Update types * ƒix option parsing * Date question * Update question number logic * Instruction question * Update index.ts * Handle review screen * Fix date styles * Update text field width * Update line height * Add types * remove question number for now * Checkbox question and styling * Checkbox question * Add comment * DateTimeQuestion * Add controller around all questions * Add in question number * Reorder imports * Handle more than 26 questions on a screen * Update casing.ts * Fix imports * Fixes and generate types * Fix merge and question number logic * Fix props
* Auth updates part 1 * Auth view * Survey screen * Tooltip buttons * Use theme variable * Update theme variable for primary text * Auth layout * Move styles into common form files * Fix layout padding * Update layout * Update SurveySelectPage.tsx --------- Co-authored-by: Tom Caiger <caigertom@gmail.com>
* Setup reusable login form * Working login * User menu * Fix versions * Comments and tidy ups * Fix build issue * Add verify email view * Update loginForm.stories.js * FIx export * Fix storybook * Fixes * Fix route names * survey screens * save form data * routes * Update Routes.tsx * Initial landing page * fix types * scrren layout * refactor context * Working survey select * tidy up css * resolve conflicts * Fix type errors * Update merge * Update useSurveyScreenComponents.tsx * work in progress * need testing * quick fix * styling commit * few pr changes * changed folder locations * fixed imports and exports --------- Co-authored-by: acdunham <alex@beyondessential.com.au> Co-authored-by: Tom Caiger <caigertom@gmail.com>
* Working menu * Remove unused import * Fixes
* WIP on geolocation question * Pushing to remote for pairing * updates to map pin drop functionality and ui * tidying up unused imports and redundant components * Fixes part 1 * Updates * Fixes --------- Co-authored-by: wduncker <wduncker@LAPTOP-AFVENG10> Co-authored-by: acdunham <alex@beyondessential.com.au>
* almost done with routes * sorted, does need cleaning up * survey success commit * Tidy up files * Fix merge issues * Fixes * Fix types * remove questions url * Fix types --------- Co-authored-by: acdunham <alex@beyondessential.com.au>
* project select modal * save project id for a user * fix types * Update ProjectSelectPage.tsx * edit project * Update ProjectSelectPage.tsx * Update ProjectSelectModal.tsx * custom icons * pr changes * request access styles * request access on click * update types
* almost done with routes * sorted, does need cleaning up * survey success commit * Tidy up files * Fix merge issues * Review screen * Initial mutation * Tidy up files * Fixes * Update SurveyLayout.tsx --------- Co-authored-by: Chao Xin Nhin <chaon@missionreadyhq.com> Co-authored-by: Tom Caiger <caigertom@gmail.com>
* Working request access * Add access requested icon to project list * Add 'EditUserForMe' endpoint * Remove all countries requested view * Refactor select list * Fix on select issue * Don't have onClick if is not a button * Generate types * Fixes * Update types
* WIP * Finish styling and get working * Update styles * Update font size * Update hover colour * Update packages/datatrak-web/src/features/Questions/AutocompleteQuestion.tsx Co-authored-by: Tom Caiger <caigertom@gmail.com> --------- Co-authored-by: Tom Caiger <caigertom@gmail.com>
* setup entities question * searching * debounce * styles * close button * sorting search results * update filters * remove old entity route * fix filters * fix types * Update EntityList.js * Update EntitiesRoute.ts * refactor to match new list component * Update useUser.ts
* Toast messages * Remove buttons from landing page * Apply error handling by default * Fixes * Fix build errors and merge conflicts * Fix error * Fix broken test
* Update feed scraper to add all survey responses to feed items * Add access policy to Datatrak * Move endpoints over to using new model functions * Update yarn.lock * Update packages/datatrak-web-server/src/app/middleware/attachAccessPolicy.ts Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com> * Fix merge error * Update model to handle only some countries user has access to * Update methods * Move access policy logic to server-boilerplate * Fix tupaia-web-server tests * Revert "Fix tupaia-web-server tests" This reverts commit 0e64b50. * Fix tests * Fix tests * Remove unneeded fixtures --------- Co-authored-by: acdunham <129009580+acdunham@users.noreply.github.com> Co-authored-by: Jasper Lai <33956381+jaskfla@users.noreply.github.com>
merge latest dev before testing
merge latest dev before testing
merge latest dev before testing
merge latest dev in before testing
merge latest dev before testing
merge latest dev before testing
merge latest dev before testing
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 WAITP-1482: activity feed project filter
Changes: