Label-image: Extract validation out of scoring #2016

Myranae · 2024-12-16T21:51:32Z

Summary:

To complete server-side scoring, we are separating out validation logic from scoring logic. This PR separates that logic and updates associated tests.

Issue: LEMS-2609

Test plan:

Confirm checks pass
Confirm widget still works as expected

PerseusLabelImageMarker was a duplicate type of InteractiveMarkerType. Copy over some of the comments that are still useful.

…ithout-rubric

Based on PR feedback

We are moving scoring data and user input to validation data only

We build the wanted object instead of remove the unneeded property. The removal method was used previously to change as little as possible from the incoming markers object.

Don't want to use the ScoringData type here. Would be widget options type if the parameter returns

…ithout-rubric # Conflicts: # packages/perseus/src/index.ts

Just confirms text from the question has been rendered on the page

github-actions · 2024-12-16T21:54:17Z

npm Snapshot: Published

Good news!! We've packaged up the latest commit from this PR (967c237) and published it to npm. You
can install it using the tag PR2016.

Example:

yarn add @khanacademy/perseus@PR2016

If you are working in Khan Academy's webapp, you can run:

./dev/tools/bump_perseus_version.sh -t PR2016

github-actions · 2024-12-16T21:54:20Z

Size Change: +54 B (0%)

Total Size: 1.27 MB

Filename	Size	Change
`packages/perseus/dist/es/index.js`	416 kB	+54 B (+0.01%)

ℹ️ View Unchanged

Filename	Size
`packages/kas/dist/es/index.js`	39 kB
`packages/keypad-context/dist/es/index.js`	760 B
`packages/kmath/dist/es/index.js`	4.27 kB
`packages/math-input/dist/es/index.js`	77.9 kB
`packages/math-input/dist/es/strings.js`	1.79 kB
`packages/perseus-core/dist/es/index.js`	1.48 kB
`packages/perseus-editor/dist/es/index.js`	688 kB
`packages/perseus-linter/dist/es/index.js`	22.2 kB
`packages/perseus/dist/es/strings.js`	4.12 kB
`packages/pure-markdown/dist/es/index.js`	3.66 kB
`packages/simple-markdown/dist/es/index.js`	12.5 kB

_{compressed-size-action}

Myranae · 2024-12-16T22:23:41Z

packages/perseus/src/widgets/label-image/validate-label-image.ts

+    for (let i = 0; i < userInput.markers.length; i++) {
+        const userSelection = userInput.markers[i].selected;
+        if (userSelection && userSelection.length > 0) {
+            numAnswered++;
+        }
+    }


I re-worked the logic a bit here so as not to need scoringData. This should be the same logic; it just doesn't use scoreMarker.

handeyeco

Looks good. I like how focused the tests become when splitting out logic by concern. It's nice to see.

handeyeco · 2024-12-17T20:54:39Z

packages/perseus/src/widgets/label-image/score-label-image.ts

+    const validationError = validateLabelImage(userInput);
+    if (validationError) {
+        return validationError;


I think this is going to need to be moved to the beginning of this function. It shouldn't have any impact on the code because we're iterating over the markers twice anyway.

Moved! Thanks for pointing this out :)

handeyeco · 2024-12-17T20:55:45Z

packages/perseus/src/widgets/label-image/validate-label-image.test.ts

+
+import type {PerseusLabelImageUserInput} from "../../validation.types";
+
+describe("scoreLabelImage", function () {


Micro nit that's more personal taste than anything and I know it's just copied from the original, but in this context I prefer arrow functions.

Suggested change

describe("scoreLabelImage", function () {

describe("scoreLabelImage", () => {

Move validation check to top of scoring function Make test function an arrow function

…e-split-out-validation # Conflicts: # packages/perseus/src/widgets/label-image/score-label-image.test.ts # packages/perseus/src/widgets/label-image/score-label-image.ts

## Summary: This PR includes the following commits: - Swap out deprecated input-number with numeric-input in some tests (#1995) - SSS: Hook emptyWidgets() up to validation functions (#2000) - Add test to document empty expression can be a correct answer (#2003) - Remove unused rubric type for CS Program (#1997) - Remove unused rubric type for iFrame (#1996) - Refactor LabelImage to separate out answers from userInput into scoringData (#1965) - Label-image: Extract validation out of scoring (#2016) - Rename usages of rubric to scoringData (#2006) - SSS: Improve types for validation (#2002) ## Test plan: - Confirm all checks pass - Manual test widgets to confirm they act as expected by creating a webapp testing branch/PR - Confirm widgets all grade as expected Author: Myranae Reviewers: jeremywiebe, handeyeco Required Reviewers: Approved By: jeremywiebe Checks: ✅ Publish npm snapshot (ubuntu-latest, 20.x), ✅ Lint, Typecheck, Format, and Test (ubuntu-latest, 20.x), ✅ Check for .changeset entries for all changed files (ubuntu-latest, 20.x), ✅ Cypress (ubuntu-latest, 20.x), ✅ Publish Storybook to Chromatic (ubuntu-latest, 20.x), ✅ Check builds for changes in size (ubuntu-latest, 20.x), ✅ Prime node_modules cache for primary configuration (ubuntu-latest, 20.x) Pull Request URL: #2031

@Myranae

This PR was opened by the [Changesets release](https://github.com/changesets/action) GitHub action. When you're ready to do a release, you can merge this and the packages will be published to npm automatically. If you're not ready to do a release yet, that's fine, whenever you add more changesets to main, this PR will be updated. # Releases ## @khanacademy/perseus@52.0.0 ### Major Changes - [#1965](#1965) [`0f2bec314`](0f2bec3) Thanks [@Myranae](https://github.com/Myranae)! - Refactor the LabelImage widget to separate out answers from userInput into scoringData - [#2134](#2134) [`117e78d03`](117e78d) Thanks [@handeyeco](https://github.com/handeyeco)! - Move widget ID utils to perseus-core - [#2153](#2153) [`29a1c656e`](29a1c65) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Rename all instances of the term "ScoringData" back to "Rubric" - [#2135](#2135) [`7a984eba6`](7a984eb) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Expression WidgetOptions logic to core ### Minor Changes - [#2002](#2002) [`a1e22a4e3`](a1e22a4) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Add and improve types for scoring and validation - [#2155](#2155) [`0df0b1940`](0df0b19) Thanks [@benchristel](https://github.com/benchristel)! - Move `parsePerseusItem`, `parseAndMigratePerseusItem`, `parseAndMigratePerseusArticle`, `isSuccess`, and `isFailure` to the `perseus-core` package, and deprecate the equivalent exports from the `perseus` package. - [#2032](#2032) [`22d108fdc`](22d108f) Thanks [@anakaren-rojas](https://github.com/anakaren-rojas)! - adds aria labels to line segment - [#2038](#2038) [`e6f7cc91e`](e6f7cc9) Thanks [@Myranae](https://github.com/Myranae)! - Fix some naming discrepancies related to validation and simplify Matcher ScoringData type - [#2083](#2083) [`4c10af109`](4c10af1) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Use empty widgets check in scoring function - [#2000](#2000) [`0db68d222`](0db68d2) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Change empty widgets check in Renderer to depend only on data available (and not on scoring data) - [#2137](#2137) [`b4b3a3dbb`](b4b3a3d) Thanks [@Myranae](https://github.com/Myranae)! - Implement a widget export function to filter out rubric data from widget options for the orderer widget - [#2006](#2006) [`879d2a501`](879d2a5) Thanks [@Myranae](https://github.com/Myranae)! - Rename usages of rubric to scoringData - [#2139](#2139) [`32cc4a45b`](32cc4a4) Thanks [@Myranae](https://github.com/Myranae)! - Implement a widget export function to filter out rubric data from widget options for the Expression widget - [#2016](#2016) [`55ad836c6`](55ad836) Thanks [@Myranae](https://github.com/Myranae)! - Introduces a validation function for the label-image widget (extracted from label-image scoring function). ### Patch Changes - [#2142](#2142) [`d7bcb14c3`](d7bcb14) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Radio upgrade logic to Perseus Core - [#2122](#2122) [`1a75ca628`](1a75ca6) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Type and test fixes for new MockWidget (isolating to be seen only in tests) - [#2143](#2143) [`459c25074`](459c250) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Passage widgets upgrade logic to Perseus Core - [#1997](#1997) [`0464a760f`](0464a76) Thanks [@Myranae](https://github.com/Myranae)! - Remove unused CS Program rubric type - [#2110](#2110) [`e2f2cee9f`](e2f2cee) Thanks [@nishasy](https://github.com/nishasy)! - [SR] Linear - Add the interactive elements linear description to the whole graph container - [#2136](#2136) [`ffaa3904a`](ffaa390) Thanks [@nishasy](https://github.com/nishasy)! - [SR] Quadratic - add screen reader support for Quadratic interactive graph - [#1996](#1996) [`b6623bb56`](b6623bb) Thanks [@Myranae](https://github.com/Myranae)! - Remove unused iframe rubric type - [#2124](#2124) [`bdbdafe5d`](bdbdafe) Thanks [@dependabot](https://github.com/apps/dependabot)! - Updating wonder-blocks dependences. - [#2152](#2152) [`f8c9d3574`](f8c9d35) Thanks [@Myranae](https://github.com/Myranae)! - Move the categorizer, orderer, and expression public widget options functions from perseus package to their widget folders in perseus-core - [#1995](#1995) [`99cd254de`](99cd254) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - TESTS: swap input-number out of renderer tests as it is deprecated - [#2141](#2141) [`1355d6cfc`](1355d6c) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Measurer upgrade logic to Perseus Core - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`0df0b1940`](0df0b19), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`b4b3a3dbb`](b4b3a3d), [`117e78d03`](117e78d), [`29a1c656e`](29a1c65), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 - @khanacademy/perseus-score@2.0.0 - @khanacademy/kas@0.4.12 - @khanacademy/keypad-context@1.0.15 - @khanacademy/kmath@0.3.1 - @khanacademy/math-input@22.2.2 - @khanacademy/perseus-linter@1.2.14 - @khanacademy/pure-markdown@0.3.23 - @khanacademy/simple-markdown@0.13.16 ## @khanacademy/perseus-score@2.0.0 ### Major Changes - [#2153](#2153) [`29a1c656e`](29a1c65) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Rename all instances of the term "ScoringData" back to "Rubric" ### Patch Changes - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`0df0b1940`](0df0b19), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`b4b3a3dbb`](b4b3a3d), [`117e78d03`](117e78d), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 - @khanacademy/kas@0.4.12 - @khanacademy/kmath@0.3.1 ## @khanacademy/perseus-core@3.3.0 ### Minor Changes - [#2158](#2158) [`8f8955718`](8f89557) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Re-export widget id support function: addWidget - [#2142](#2142) [`d7bcb14c3`](d7bcb14) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Radio upgrade logic to Perseus Core - [#2148](#2148) [`685774f2e`](685774f) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Matcher upgrade logic to Perseus Core - [#2145](#2145) [`8a489600e`](8a48960) Thanks [@handeyeco](https://github.com/handeyeco)! - Move simple widget upgrade logic to Perseus Core (pt 2) - [#2143](#2143) [`459c25074`](459c250) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Passage widgets upgrade logic to Perseus Core - [#2155](#2155) [`0df0b1940`](0df0b19) Thanks [@benchristel](https://github.com/benchristel)! - Move `parsePerseusItem`, `parseAndMigratePerseusItem`, `parseAndMigratePerseusArticle`, `isSuccess`, and `isFailure` to the `perseus-core` package, and deprecate the equivalent exports from the `perseus` package. - [#2144](#2144) [`dc8118aa1`](dc8118a) Thanks [@handeyeco](https://github.com/handeyeco)! - Move simple widget upgrade logic to Perseus Core (pt 1) - [#2150](#2150) [`82fa90299`](82fa902) Thanks [@handeyeco](https://github.com/handeyeco)! - Move InteractiveGraph widget upgrade to Perseus Core - [#2134](#2134) [`117e78d03`](117e78d) Thanks [@handeyeco](https://github.com/handeyeco)! - Move widget ID utils to perseus-core - [#2135](#2135) [`7a984eba6`](7a984eb) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Expression WidgetOptions logic to core - [#2141](#2141) [`1355d6cfc`](1355d6c) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Measurer upgrade logic to Perseus Core - [#2149](#2149) [`75f43a8f4`](75f43a8) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Table upgrade logic to Perseus Core - [#2147](#2147) [`ebf3695b6`](ebf3695) Thanks [@handeyeco](https://github.com/handeyeco)! - Move upgrade logic for NumberLine to Perseus Core ### Patch Changes - [#2122](#2122) [`1a75ca628`](1a75ca6) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Type and test fixes for new MockWidget (isolating to be seen only in tests) - [#2137](#2137) [`b4b3a3dbb`](b4b3a3d) Thanks [@Myranae](https://github.com/Myranae)! - Move util files out of widget folder in perseus package to utils folder in perseus-core - [#2152](#2152) [`f8c9d3574`](f8c9d35) Thanks [@Myranae](https://github.com/Myranae)! - Move the categorizer, orderer, and expression public widget options functions from perseus package to their widget folders in perseus-core - [#2139](#2139) [`32cc4a45b`](32cc4a4) Thanks [@Myranae](https://github.com/Myranae)! - Move util files out of widget folder in perseus package to utils folder in perseus-core ## @khanacademy/perseus-editor@17.4.0 ### Minor Changes - [#2015](#2015) [`46623c8f1`](46623c8) Thanks [@mark-fitzgerald](https://github.com/mark-fitzgerald)! - [Numeric Input] Re-organize editor and improve its UI - [#2015](#2015) [`46623c8f1`](46623c8) Thanks [@mark-fitzgerald](https://github.com/mark-fitzgerald)! - [Numeric Input] - Adjust editor to organize settings more logically ### Patch Changes - [#2142](#2142) [`d7bcb14c3`](d7bcb14) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Radio upgrade logic to Perseus Core - [#2148](#2148) [`685774f2e`](685774f) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Matcher upgrade logic to Perseus Core - [#2145](#2145) [`8a489600e`](8a48960) Thanks [@handeyeco](https://github.com/handeyeco)! - Move simple widget upgrade logic to Perseus Core (pt 2) - [#2122](#2122) [`1a75ca628`](1a75ca6) Thanks [@jeremywiebe](https://github.com/jeremywiebe)! - Type and test fixes for new MockWidget (isolating to be seen only in tests) - [#2143](#2143) [`459c25074`](459c250) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Passage widgets upgrade logic to Perseus Core - [#2144](#2144) [`dc8118aa1`](dc8118a) Thanks [@handeyeco](https://github.com/handeyeco)! - Move simple widget upgrade logic to Perseus Core (pt 1) - [#2150](#2150) [`82fa90299`](82fa902) Thanks [@handeyeco](https://github.com/handeyeco)! - Move InteractiveGraph widget upgrade to Perseus Core - [#1965](#1965) [`0f2bec314`](0f2bec3) Thanks [@Myranae](https://github.com/Myranae)! - Refactor the LabelImage widget to separate out answers from userInput into scoringData - [#2124](#2124) [`bdbdafe5d`](bdbdafe) Thanks [@dependabot](https://github.com/apps/dependabot)! - Updating wonder-blocks dependences. - [#2135](#2135) [`7a984eba6`](7a984eb) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Expression WidgetOptions logic to core - [#2141](#2141) [`1355d6cfc`](1355d6c) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Measurer upgrade logic to Perseus Core - [#2149](#2149) [`75f43a8f4`](75f43a8) Thanks [@handeyeco](https://github.com/handeyeco)! - Move Table upgrade logic to Perseus Core - [#2147](#2147) [`ebf3695b6`](ebf3695) Thanks [@handeyeco](https://github.com/handeyeco)! - Move upgrade logic for NumberLine to Perseus Core - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`a1e22a4e3`](a1e22a4), [`0464a760f`](0464a76), [`0df0b1940`](0df0b19), [`22d108fdc`](22d108f), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`e2f2cee9f`](e2f2cee), [`ffaa3904a`](ffaa390), [`0f2bec314`](0f2bec3), [`b4b3a3dbb`](b4b3a3d), [`e6f7cc91e`](e6f7cc9), [`4c10af109`](4c10af1), [`b6623bb56`](b6623bb), [`0db68d222`](0db68d2), [`bdbdafe5d`](bdbdafe), [`117e78d03`](117e78d), [`b4b3a3dbb`](b4b3a3d), [`29a1c656e`](29a1c65), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`879d2a501`](879d2a5), [`32cc4a45b`](32cc4a4), [`99cd254de`](99cd254), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`55ad836c6`](55ad836), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 - @khanacademy/perseus@52.0.0 - @khanacademy/perseus-score@2.0.0 - @khanacademy/kas@0.4.12 - @khanacademy/keypad-context@1.0.15 - @khanacademy/kmath@0.3.1 - @khanacademy/math-input@22.2.2 - @khanacademy/pure-markdown@0.3.23 ## @khanacademy/kas@0.4.12 ### Patch Changes - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`0df0b1940`](0df0b19), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`b4b3a3dbb`](b4b3a3d), [`117e78d03`](117e78d), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 ## @khanacademy/keypad-context@1.0.15 ### Patch Changes - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`0df0b1940`](0df0b19), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`b4b3a3dbb`](b4b3a3d), [`117e78d03`](117e78d), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 ## @khanacademy/kmath@0.3.1 ### Patch Changes - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`0df0b1940`](0df0b19), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`b4b3a3dbb`](b4b3a3d), [`117e78d03`](117e78d), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 ## @khanacademy/math-input@22.2.2 ### Patch Changes - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`0df0b1940`](0df0b19), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`b4b3a3dbb`](b4b3a3d), [`117e78d03`](117e78d), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 - @khanacademy/keypad-context@1.0.15 ## @khanacademy/perseus-linter@1.2.14 ### Patch Changes - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`0df0b1940`](0df0b19), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`b4b3a3dbb`](b4b3a3d), [`117e78d03`](117e78d), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 ## @khanacademy/pure-markdown@0.3.23 ### Patch Changes - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`0df0b1940`](0df0b19), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`b4b3a3dbb`](b4b3a3d), [`117e78d03`](117e78d), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 - @khanacademy/simple-markdown@0.13.16 ## @khanacademy/simple-markdown@0.13.16 ### Patch Changes - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`0df0b1940`](0df0b19), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`b4b3a3dbb`](b4b3a3d), [`117e78d03`](117e78d), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 ## @khanacademy/perseus-dev-ui@5.1.2 ### Patch Changes - [#2124](#2124) [`bdbdafe5d`](bdbdafe) Thanks [@dependabot](https://github.com/apps/dependabot)! - Updating wonder-blocks dependences. - Updated dependencies \[[`8f8955718`](8f89557), [`d7bcb14c3`](d7bcb14), [`685774f2e`](685774f), [`8a489600e`](8a48960), [`1a75ca628`](1a75ca6), [`459c25074`](459c250), [`0df0b1940`](0df0b19), [`dc8118aa1`](dc8118a), [`82fa90299`](82fa902), [`b4b3a3dbb`](b4b3a3d), [`117e78d03`](117e78d), [`7a984eba6`](7a984eb), [`f8c9d3574`](f8c9d35), [`1355d6cfc`](1355d6c), [`75f43a8f4`](75f43a8), [`32cc4a45b`](32cc4a4), [`ebf3695b6`](ebf3695)]: - @khanacademy/perseus-core@3.3.0 - @khanacademy/kas@0.4.12 - @khanacademy/kmath@0.3.1 - @khanacademy/math-input@22.2.2 - @khanacademy/perseus-linter@1.2.14 - @khanacademy/pure-markdown@0.3.23 - @khanacademy/simple-markdown@0.13.16

Myranae added 30 commits December 6, 2024 11:49

Rename MarkerType to MarkerAnswers

ee7ad47

Rename rubric to scoringData

f36f767

Remove duplicate type

8a3db65

PerseusLabelImageMarker was a duplicate type of InteractiveMarkerType. Copy over some of the comments that are still useful.

Separate answers out to scoringData

4164ebc

Combine marker data to use with scoreMarker

7fc9de8

Update tests for scoring

e694b90

Merge branch 'main' into tb/LEMS-2440/label-image-review-validation-w…

c2d75b2

…ithout-rubric

Add changeset

6ae620f

Update changeset

e6e2d26

Update type

95467c8

Fix a type change that was incorrect

d6870b8

Return order to original order

b0d5329

Update type to not require answers

96af0c4

Update comment to look into how scoreMarker is used

883f9bc

Update changeset

c6f7d86

Update types based on PR feedback

1579702

Update scoreMarker to keep selected and answers separate

35c610b

Based on PR feedback

Add test confirming userInput does not contain answers

b7955c2

Update getUserInput to remove answers

7d8b0fe

Revert changes to perseus-types.ts

fb52876

Fixing linting

aae57e0

Revert all changes to widget types

52e7d26

We are moving scoring data and user input to validation data only

Expand types and remove old widget types

5fe1979

Change types from old widget types to validation types

64e7d4b

Change from old widget types to widget options

c83fef5

Refer to props type not validation type

0dd5f68

Remove reference to ScoringData type

b0ccaf3

Update getUserInput to build wanted object

e5b0d26

We build the wanted object instead of remove the unneeded property. The removal method was used previously to change as little as possible from the incoming markers object.

Removed parameter and updated comment

78a37df

Don't want to use the ScoringData type here. Would be widget options type if the parameter returns

Merge branch 'main' into tb/LEMS-2440/label-image-review-validation-w…

2925dc8

…ithout-rubric # Conflicts: # packages/perseus/src/index.ts

Myranae added 11 commits December 12, 2024 14:00

Update tests to not need a snapshot

0dc8936

Just confirms text from the question has been rendered on the page

Add a todo

42a5dc3

Revert unneeded const removal

9829693

Make test name more generic

a342a49

Update tests to reflect updated type

415f32a

Update tests

8dc45c1

Remove unneeded tests

e525b48

Add changeset

5ba4fda

Split out validation logic to its own function

228ce3c

Split out validation tests to new file

3c23179

Update separated tests to focus on validation

f4aea0d

Myranae self-assigned this Dec 16, 2024

Update test

25288ad

Myranae commented Dec 16, 2024

View reviewed changes

Myranae marked this pull request as ready for review December 16, 2024 22:24

Myranae requested review from jeremywiebe and handeyeco December 16, 2024 22:24

handeyeco approved these changes Dec 17, 2024

View reviewed changes

Address PR feedback

a6fdf94

Move validation check to top of scoring function Make test function an arrow function

Base automatically changed from tb/LEMS-2440/label-image-review-validation-without-rubric to feature/client-validation December 17, 2024 21:31

Myranae force-pushed the tb/LEMS-2609/label-image-split-out-validation branch from 3a19e37 to a6fdf94 Compare December 17, 2024 22:35

Merge branch 'feature/client-validation' into tb/LEMS-2609/label-imag…

967c237

…e-split-out-validation # Conflicts: # packages/perseus/src/widgets/label-image/score-label-image.test.ts # packages/perseus/src/widgets/label-image/score-label-image.ts

Myranae merged commit 55ad836 into feature/client-validation Dec 18, 2024
8 checks passed

Myranae deleted the tb/LEMS-2609/label-image-split-out-validation branch December 18, 2024 15:07

Myranae mentioned this pull request Dec 18, 2024

[Feature] Client Validation #2031

Merged

khan-actions-bot mentioned this pull request Jan 23, 2025

Version Packages #2140

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Label-image: Extract validation out of scoring #2016

Label-image: Extract validation out of scoring #2016

Myranae commented Dec 16, 2024 •

edited

Loading

github-actions bot commented Dec 16, 2024 •

edited

Loading

github-actions bot commented Dec 16, 2024 •

edited

Loading

Myranae Dec 16, 2024 •

edited

Loading

handeyeco left a comment

handeyeco Dec 17, 2024

Myranae Dec 17, 2024

handeyeco Dec 17, 2024

Myranae Dec 17, 2024


		import type {PerseusLabelImageUserInput} from "../../validation.types";

		describe("scoreLabelImage", function () {

	describe("scoreLabelImage", function () {
	describe("scoreLabelImage", () => {

Label-image: Extract validation out of scoring #2016

Label-image: Extract validation out of scoring #2016

Conversation

Myranae commented Dec 16, 2024 • edited Loading

Summary:

Test plan:

github-actions bot commented Dec 16, 2024 • edited Loading

npm Snapshot: Published

github-actions bot commented Dec 16, 2024 • edited Loading

Myranae Dec 16, 2024 • edited Loading

Choose a reason for hiding this comment

handeyeco left a comment

Choose a reason for hiding this comment

handeyeco Dec 17, 2024

Choose a reason for hiding this comment

Myranae Dec 17, 2024

Choose a reason for hiding this comment

handeyeco Dec 17, 2024

Choose a reason for hiding this comment

Myranae Dec 17, 2024

Choose a reason for hiding this comment

Myranae commented Dec 16, 2024 •

edited

Loading

github-actions bot commented Dec 16, 2024 •

edited

Loading

github-actions bot commented Dec 16, 2024 •

edited

Loading

Myranae Dec 16, 2024 •

edited

Loading