Modify preview-card styles #88
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| import { ExercisePreview } from './ExercisePreview'; | ||
| import renderer from 'react-test-renderer'; | ||
| import { ExerciseData } from 'src/types'; | ||
|
|
||
| describe('ExercisePreview', () => { | ||
| describe('using step data', () => { | ||
|
|
||
| let exercise: ExerciseData; | ||
|
|
||
| beforeEach(() => { | ||
| exercise = { | ||
| uid: '1@1', | ||
|
There was a problem hiding this comment. I think these are indented 4 but we use 2 in this repo (and most of the repos) |
||
| uuid: 'e4e27897-4abc-40d3-8565-5def31795edc', | ||
| group_uuid: '20e82bf6-232e-40c8-ba68-2d22c6498f69', | ||
| number: 1, | ||
| version: 1, | ||
| published_at: '2022-09-06T20:32:21.981Z', | ||
| context: 'Context', | ||
| stimulus_html: '<b>Stimulus HTML</b>', | ||
| tags: [], | ||
| authors: [{ user_id: 1, name: 'OpenStax' }], | ||
| copyright_holders: [{ user_id: 1, name: 'OpenStax' }], | ||
| derived_from: [], | ||
| is_vocab: false, | ||
| solutions_are_public: false, | ||
| versions: [1], | ||
| questions: [{ | ||
| id: '1234@5', | ||
| collaborator_solutions: [], | ||
| formats: ['true-false'], | ||
| stimulus_html: '', | ||
| stem_html: '', | ||
| is_answer_order_important: false, | ||
| answers: [{ | ||
| id: '1', | ||
| correctness: undefined, | ||
| content_html: 'True', | ||
| }, { | ||
| id: '2', | ||
| correctness: undefined, | ||
| content_html: 'False', | ||
| }], | ||
| }], | ||
| }; | ||
| }); | ||
|
|
||
| it.each` | ||
| enableOverlay | description | ||
| ${true} | ${'with overlay'} | ||
| ${false} | ${'without overlay'} | ||
| `('matches snapshot %description', ({ enableOverlay }: { enableOverlay: boolean }) => { | ||
| const selectedQuestionsMock: string[] = []; | ||
| const setQuestionsmock = jest.fn(); | ||
| const tree = renderer.create( | ||
| <ExercisePreview | ||
| exercise={exercise} | ||
| enableOverlay={enableOverlay} | ||
| selectedQuestions={selectedQuestionsMock} | ||
| setSelectedQuestions={setQuestionsmock} | ||
| /> | ||
| ).toJSON(); | ||
| expect(tree).toMatchSnapshot(); | ||
| }); | ||
| }); | ||
| }); | ||
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,98 @@ | ||
| import React, { useCallback } from "react"; | ||
| import { ExerciseData, ExerciseQuestionData, StepBase } from "src/types"; | ||
| import { IncludeRemoveQuestion } from "./IncludeRemoveQuestion"; | ||
| import { Exercise } from "./Exercise"; | ||
|
|
||
| export interface ExercisePreviewProps { | ||
| exercise: ExerciseData; | ||
| selectedQuestions: string[]; | ||
| setSelectedQuestions?: React.Dispatch<React.SetStateAction<string[]>>; | ||
| enableOverlay?: boolean; | ||
| } | ||
|
|
||
| /** | ||
| * An Exercise version with less interaction with card and grants an Overlay with Include/Remove component | ||
| */ | ||
| export const ExercisePreview = ( | ||
|
There was a problem hiding this comment. I'd prefer this to take |
||
| { | ||
| exercise, | ||
| selectedQuestions, | ||
| setSelectedQuestions, | ||
| enableOverlay = false, | ||
| }: ExercisePreviewProps) => { | ||
|
|
||
| const exercisePreviewProps = (exercise: ExerciseData) => { | ||
| const formatAnswerData = (questions: ExerciseQuestionData[]) => questions.map((q) => ( | ||
| { id: q.id, correct_answer_id: (q.answers.find((a) => a.correctness === '1.0')?.id || '') })); | ||
|
|
||
| const questionStateFields = { | ||
| available_points: '1.0', | ||
| is_completed: true, | ||
| answer_id: '1', | ||
| free_response: '', | ||
| feedback_html: '', | ||
| correct_answer_feedback_html: '', | ||
| attempts_remaining: 0, | ||
| attempt_number: 1, | ||
| incorrectAnswerId: 0 | ||
| } | ||
|
|
||
| const questionStates = formatAnswerData(exercise.questions).reduce((acc, answer) => { | ||
| const { id, correct_answer_id } = answer; | ||
| return { ...acc, [id]: { ...questionStateFields, correct_answer_id } }; | ||
| }, {}); | ||
|
|
||
| const step: StepBase = { | ||
| id: 1, | ||
| uid: exercise.uid, | ||
| available_points: '1.0', | ||
| }; | ||
|
|
||
| return { | ||
| canAnswer: true, | ||
| needsSaved: true, | ||
| hasMultipleAttempts: false, | ||
| onAnswerChange: () => undefined, | ||
| onAnswerSave: () => undefined, | ||
| onNextStep: () => undefined, | ||
| apiIsPending: false, | ||
| canUpdateCurrentStep: false, | ||
| step: step, | ||
| questionNumber: exercise.number as number, | ||
| numberOfQuestions: exercise.questions.length, | ||
| questionStates: questionStates, | ||
| show_all_feedback: false, // Hide all feedback | ||
| }; | ||
| }; | ||
|
|
||
| const includeQuestionHandler = React.useCallback(() => { | ||
| setSelectedQuestions?.(previous => previous.concat(exercise.uid)); | ||
| }, [exercise, setSelectedQuestions]); | ||
|
|
||
| const removeQuestionHandler = useCallback(() => { | ||
| setSelectedQuestions?.(previous => previous.filter((id) => id !== exercise.uid)); | ||
| }, [exercise, setSelectedQuestions]); | ||
|
|
||
| const includeRemoveQuestionComponent = React.useMemo(() => | ||
| <IncludeRemoveQuestion | ||
| buttonVariant={selectedQuestions.includes(exercise.uid) ? 'remove' : 'include'} | ||
| onIncludeHandler={includeQuestionHandler} | ||
| onRemoveHandler={removeQuestionHandler} | ||
| /> | ||
| , [selectedQuestions, exercise, includeQuestionHandler, removeQuestionHandler]); | ||
|
|
||
| return ( | ||
| <Exercise | ||
| exercise={exercise} | ||
| className={selectedQuestions.includes(exercise.uid) ? 'preview-card included-card' : 'preview-card'} | ||
| { | ||
| ...(enableOverlay | ||
| ? { | ||
| overlayChildren: includeRemoveQuestionComponent, | ||
| } | ||
| : {}) | ||
| } | ||
| {...exercisePreviewProps(exercise)} | ||
| /> | ||
| ); | ||
| }; | ||
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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this break any of the other stories? Seems alright, I just can't remember why it was undefined originally
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This marks a question as correct, I can keep it as undefined and create a new variable just for new stories