Merge changes from the dev branch into the stage branch #397
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
* feat: M2-5117 added data-testIds * M2-5007 Restart resume feature: Added restart/resume buttons to ActivityCard, ui updates, added translations * M2-5007 Restart resume feature: Added data-testIds * bug: M2-5043 updated conditional logic , ignoring all the skipped and hidden items when processing conditionals * bug: M2-5260 Fixed default answers for hidden activities, removing conditionally hidden item answers dynamically * bug: M2-5260 Code improvements * bug: M2-5043 Storing ids of conditionally hidden items to be used for removing answers of those hidden items * M2-5293: mapping time, date and timeRange answers to UserEventsDTO * M2-5293: validating date and time items values before passing to activityProgress, bug fixes * M2-5022: preventing user to skip the audio player if it is not skippable * Update year in the footer * Fix activityCard layout when loading status --------- Co-authored-by: Vardan Mkhitaryan <[email protected]> Co-authored-by: vmkhitaryanscn <[email protected]> Co-authored-by: Viktor Riabkov <[email protected]>
Co-authored-by: Viktor Riabkov <[email protected]>
Co-authored-by: Viktor Riabkov <[email protected]>
* feat: M2-5117 added data-testIds * M2-5007 Restart resume feature: Added restart/resume buttons to ActivityCard, ui updates, added translations * M2-5007 Restart resume feature: Added data-testIds * bug: M2-5043 updated conditional logic , ignoring all the skipped and hidden items when processing conditionals * bug: M2-5260 Fixed default answers for hidden activities, removing conditionally hidden item answers dynamically * bug: M2-5260 Code improvements * bug: M2-5043 Storing ids of conditionally hidden items to be used for removing answers of those hidden items * M2-5293: mapping time, date and timeRange answers to UserEventsDTO * M2-5293: validating date and time items values before passing to activityProgress, bug fixes * M2-5022: preventing user to skip the audio player if it is not skippable * Update year in the footer * Fix activityCard layout when loading status * M2-5308: Fixed DONE User-event is not being sent bug --------- Co-authored-by: Victor Ryabkov <[email protected]> Co-authored-by: Viktor Riabkov <[email protected]>
Co-authored-by: Paul Hoepfner-Homme <[email protected]>
* Set all overflow settings to auto * Long title break the layout on assessment page --------- Co-authored-by: Viktor Riabkov <[email protected]>
resolves: [M2-4835](https://mindlogger.atlassian.net/browse/M2-4835) # Objective This PR creates a GitHub Action to run linting tasks on pull requests submitted to the repository. As part of the ticket, I took the opportunity to update the ESlint rules on the project to be more in line with those on [mindlogger-admin](https://github.com/ChildMindInstitute/mindlogger-admin). These updates have raised a number of linting issues, but **won't block** the merging of pull requests. While I've addressed some of the smaller items (and any error ones), I expect that these will be addressed in the normal course of feature development so that we can eventually require linting checks to pass in order to merge PRs. ## Prettier Code Formatting Prettier has been configured in the project as the code formatter of choice, but it is currently conflicting with a number of code formatting ESLint rules. The prettier ESLint plugin disables these rules if it is placed as an inherited configuration at the end of the `extends` array, so I have made this change. The prettier ESLint plugin also enables Prettier as an ESLint rule, so that code formatting issues become errors. This should be okay, since Prettier fixes them for you.
### 📝 Description This PR redirects the user to the login page after successful password redirection and displays a success banner on that page. I've also removed the `backToLogin` button, and the form success message. I'm using `useRef` as an escape hatch in the `LoginPage` component to prevent the banner from showing twice in strict mode. This is arguably a hack and should be generalised, but I didn't think it should be part of this ticket
* Create base layout for assessment page * Apply base assessment layout to assessment welcome page * Remove notification center from loading screen * Eslint fixes --------- Co-authored-by: Viktor Riabkov <[email protected]>
Co-authored-by: Viktor Riabkov <[email protected]>
* Create MixEvents and MixProperties for analytics * Add appletId property for Transfer Ownership Accepted event * Add appletId props for AssessmentCompleted event * Add appletId props for AssessmentStarted event * Add appletId props for InvitationAccepted event * Add appletId props for Activity restarted and Activity resumed events --------- Co-authored-by: Viktor Riabkov <[email protected]>
Co-authored-by: Viktor Riabkov <[email protected]>
Co-authored-by: Viktor Riabkov <[email protected]>
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.