Upstream sync 2 #34
Merged
Upstream sync 2 #34
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
Co-authored-by: Kyle Montville <[email protected]>
…tions fix/Edit Administrations
…-reset Force legal doc sign reset Aug 1st
…nto enh/export-users-org
Co-authored-by: AryamanTaore <[email protected]> Co-authored-by: Emily Arteaga <[email protected]>
Co-authored-by: Adam Richie-Halford <[email protected]>
* Add archived: false to queries for users and orgs * Add archived: false to queries for users and orgs * Update roar-admin firestore indexes * Add indexes for groups and families * WIP: query users by archived status * Use assignment doc for administration info rather than seperate administration call * Add archived: false to queries for users and orgs * Update roar-admin firestore indexes * Add indexes for groups and families * WIP: query users by archived status * Change Clever signin back to redirect * Use assignment doc for administration info rather than seperate administration call * Remove data-cy from speed dial and use name in admin greeting * Use firekit method to get administrations * Remove unused computed properties * Update firekit * npm run lint * Refactor administrations fetcher to use cloud function that grabs only IDs * Remove console warning * Update firekit * Remove console.log statements * UpdateUserData should not use logged in user's ID * Update firestore rules * Use roarUid instead of uid for fetchDocById with collection = users * Add archived: false to queries for users and orgs * Update roar-admin firestore indexes * Add indexes for groups and families * WIP: query users by archived status * Change Clever signin back to redirect * Use assignment doc for administration info rather than seperate administration call * Remove data-cy from speed dial and use name in admin greeting * Use firekit method to get administrations * Update firekit * npm run lint * Refactor administrations fetcher to use cloud function that grabs only IDs * Remove console warning * Update firekit * Remove console.log statements * Update firestore rules * WIP: query users by archived status * UpdateUserData should not use logged in user's ID * Use roarUid instead of uid for fetchDocById with collection = users * Ensure fresh copy of assignment info * Update firestore indexes for admin project * Update firestore indexes * Fix administration query and ordering/filtering * Fix TOS race condition for administrators * Fix participant assent/consent * Remove default sort for score report * Add secondary sort for score report table * adding some minor error handling * fixing localeCompare on ScoreReport * Remove space between user display name and exclamation point * solving cypress test * making signInWIthcleverRedirect default * Add 'direct report' classes under districts in tree table orgs * Resolve legalDocs.some error * Add direct report classes to a special 'direct report' school * Add TODO comment --------- Co-authored-by: Elijah Kelly <[email protected]> Co-authored-by: emily-ejag <[email protected]>
* update firebase functions module * update roar-firekit and remove lines related to App Check
* update firebase functions module * build out component test for roar data table * reinstall roar-firebase-functions * add checks for filtering tests * build out FilterBar component * format and remove unncessary slots * add new directories for fixtures * update data randomizer to include schools * abstract some filtering logic into a composable * use composable to handle data filtering in RoarDataTable * rebase, lint, format * update FilterBar tests * update gitsubmodules path * update import path for FilterBar test
* playing with the combination of reports * adding format * progress on function migration * created the function to export both * completed score report and halfway of progress report * progress on progress report * creating the export to csv combined * correcting cypress * name of the exported csv * simplifying name * cypress tests * progress on exporting * firebase functions * commenting test that should be a compoenent test * adding not assined to progress of not assigned tasks * fixing the order on exporting * roar-firebase-functions * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * Update src/pages/ScoreReport.vue Co-authored-by: Maximilian Oertel <[email protected]> * fixing and testing export function --------- Co-authored-by: Maximilian Oertel <[email protected]>
* changing syntax name on game tabs * change Roar for ROAR
* just adding simple test until I can run local * Progress on Invite Users * completing test * uncommenting other orgs * modifying some comments * adding some try catch for the github actions * change to baseUrl * changing .env.example.test * Suggested changes for parent sign up e2e test (yeatmanlab#857) * suggested changes for parent sign up e2e test * update workflow with new secrets * remove unncessary then() * updating commands --------- Co-authored-by: Kyle Montville <[email protected]>
* Introduce useOrgUsersQuery composable * Add unit tests for useOrgUsersQuery * Fix linter offenses * Introduce useTasksQuery composable * Extend withSetup test util to accept app options * Add unit tests * Introduce useAddTaskMutation * Improve task addition error handling * Improve view model handling * Introduce useUpdateTaskMutation and add mutation keys * Add mutation unit tests * Introduce useAddTaskVariantMutation and useUpdateTaskVariantMutation composables * Fix useTasksQuery and implement on Manage Variants page * Renamed task variants query * Fix ref val usage in useTaskVariantsQuery * Add unit tests for useTaskVariantsQuery * Introduce useTasksQuery and optimise conditional task loading * Extend useUserType for super admin handling * Apply super admin user type check changes to HomeSelector * Introduce useAdministrationsQuery composable * Remove obsolete user claims query * Fix administrations loading spinner * Introduce useUpdateUserMutation * Cleanup and remove obsolete logging * Add unit tests for useUpdateUserMutation * Add useUserDataQuery unit tests * Leverage useUserType for isSuperAdmin status * Add missing import * Regenerate package-lock due to npm/cli#4828 * Prepare for composable queries * Replace user claims query with useUserClaimsQuery * Use userType composable * Introduce useAdministrationsQuery composable and apply on administrator homepage * Fix loading state * Fix linter offenses * Restore itemsPerPage to original value * Restore package files * Upgrade tanstack and install dev tools * Remove comment * Remove incorrect parameters * Introduce useUserAssignments composable * Fix reactivity and minor issues * Introduce revised useAdministrationsQuery composable * Extend useTasksQuery to fetch by task IDs * Move useTasksQuery function to helper * Fix tasks query fetching and constants * Update useTasksQuery unit tests * Fix loading & query reactivity * Introduce useSurveyReponsesQuery composable * Add useSurveyResponsesQuery unit tests * Add useUserAssignmentsQuery unit tests * Fix reactivity in query composables * Remove duplications in favour of computeQueryOverrides helper * Fix vue warning * Improve computeQueryOverride reactivity and testability * Add unit tests for useUserStudentDataQuery * Overhaul useUserDataQuery unit tests * Add useUserClaimsQuery unit tests * Overhaul useUserClaimsQuery unit tests * Simplify useTaskVariantsQuery unit tests * Align useTasksQuery unit test names * Overhaul useSurveyResponsesQuery unit tests * Add useAdministrationsQuery unit tests * Add useDsgfOrgQuery unit tests * Add useLegalDocsQuery unit tests * Add computeQueryOverrides unit tests * Switch from uid to roarUid for survey response querying * Migrate score report queries to existing query composables * Introduce useAdministrationAssignmentsQuery composable * Add useDistrictsQuery unit tests * Split district query into separate composables * Introduce useSchoolQuery composable * Introduce useClassQuery composable * Introduce useGroupQuery composable * Fix doc comments * Introduce useFamilyQuery composable * Fix useAdministrationsQuery unit tests * Introduce new fetchDocumentsById query helper * Replace useClassQuery with useClassesQuery composable * Restructure district queries * Replace useSchoolQuery with useSchoolsQuery composable * Replace useGroupQuery with useGroupsQuery composable * Replace useFamilyQuery with useFamiliesQuery * Extend useDistrictsListQuery tests * Replace manual administration query with useAdministrationsQuery * Introduce new useAdministrationsStatsQuery composable * Migrate ProgressReport to individual org queries * Introduce reusable useOrgQuery composable for dynamic org querying * Migrate remaining page queries to composables * Switch to router based report routing * Add unit tests * Renamed page to match naming * Adapt useUserDataQuery to optionally fetch by manual user ID * Introduce useUserAdministrationAssignmentsQuery composable * Replace manual query with useAdministrationsQuery * Introduce tempoary useUsrRunPageQuery composable * Add useUserAdministrationAssignmentsQuery unit tests * Fix linter offenses * Fix comment typos * Make TanStack dev tools load conditionally * Fix administration assignments query * Remove staging conditional in favour of env var * Temporarily disable progress and report filtering tests * Replace administrations query with useAdministrationsQuery composable * Replace districts and schools queries with composables * Align query omposables and fix reactivity issues * Replace classes query with useClassesQuery composable * Fix linter offenses * Fix query state reactivity * Replace groups query with useGroupsQuery composable * Replace families query with useFamiliesQuery composable * Refactor CreateAdminitration page data handling * Fix query state handling * Remove console logs and obsolete comments * Refactor consent handling for administrators * Apply Consent Modal changes to remaining pages * Fix query reactivity * Fix document path destructuring * Add markdown/html sanitization * Add remaining consent types * Add loop breaker * Remove obsolete import * Add useSignOutMutation * Fix and improve signout mutation * Apply signOut mutation across pages * Remove query key indexes from queries * Combine ClassLink and Clever into single SSO landing page * Refactor store sso source * Add (intentional) typos * Fix home selector routing for sso flow * Introduce useTasksDictionaryQuery composable * Replace authStore tasks dictionary in favour of query composable * Remove obsolete import * Remove onUpdated hook for task dictionary refresh * Use AUTH_SSO_PROVIDERS instead of string literals * Clear query data before sign-out redirect * Fix vue-query hook usage error * Improve error handling and logging * Add inline initStateFromRedirect comments * Add unit tests * Introduce useDeleteAdministrationMutation mutation * Improve administration loader * Fix error handling in fetchByDocId * Update JSDoc * Update src/components/auth/RegisterStudent.vue Co-authored-by: Kyle Montville <[email protected]> * Update src/components/auth/RegisterStudent.vue Co-authored-by: Kyle Montville <[email protected]> * Improve error handling * Updated copy to match form option * Revert "Improve error handling" This reverts commit 4fa5c46. * Fix post-signout firekit initialisation * Fix linter offenses * Fix SWR task loading * Fix Vocab task loading * Fix SRE task loading * Fix Ran task loading * Fix PA task loading * Fix Multichoice task loading * Fix MEP task loading * Fix Levante task loading * Fix Letter task loading * Fix Fluency task loading * Fix Crowding task loading * Fix tasks loading (yeatmanlab#883) * Fix SWR task loading * Fix Vocab task loading * Fix SRE task loading * Fix Ran task loading * Fix PA task loading * Fix Multichoice task loading * Fix MEP task loading * Fix Levante task loading * Fix Letter task loading * Fix Fluency task loading * Fix Crowding task loading * Fix administration selection * Fix administrations list rendering (yeatmanlab#888) * Fix participant homepage loading state (yeatmanlab#889) * Fix flashing loading states on participant homepage * Fix refs --------- Co-authored-by: Emily Arteaga <[email protected]> Co-authored-by: Kyle Montville <[email protected]> Co-authored-by: Adam Richie-Halford <[email protected]>
* change mentions of Fluency to ROAM * remove roam-fluency package with roam-apps package * update vite config with new roam-apps package * set firekit to 9.1.0
* Fix 'view by school' distribution graph * Fix 'view by school' distribution graph * Use assignment's assigningOrgs before falling back to user's current school
Co-authored-by: Emily-ejag <[email protected]>
* create computed property for schoolsOptions * cast user grade as a string before comparison to items in filterGrades * remove console logs, unused resetFilters prop, adjust updateFilters function * properly retrieve data table when returning the score reports without refreshing the page * Formatting and refactoring * change arrow function syntax * refactor composable function for clarity
|
Visit the preview URL for this PR (updated for commit 48a2a01): https://hs-levante-admin-dev--pr34-upstream-sync-2-8fcoa057.web.app (expires Fri, 01 Nov 2024 00:10:10 GMT) 🔥 via Firebase Hosting GitHub Action 🌎 Sign: 7889bff1da3bcc333d7422b9fc863c65b3962be7 |
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.
Proposed changes
Upstream changes
Types of changes
What types of changes does this pull request introduce?
Checklist
Justification of missing checklist items
Further comments