Revert name change to ScoringData - we'll do that in one sweep later

Khan · Nov 19, 2024 · 70d8818 · 70d8818
1 parent 704e9db
commit 70d8818
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 22 deletions.
diff --git a/packages/perseus/src/validation.types.ts b/packages/perseus/src/validation.types.ts
@@ -179,7 +179,7 @@ export type PerseusSorterUserInput = {
     changed: boolean;
 };
 
-export type PerseusTableScoringData = {
+export type PerseusTableRubric = {
     // Translatable Text; A 2-dimensional array of text to populate the table with
     answers: ReadonlyArray<ReadonlyArray<string>>;
 };
@@ -207,7 +207,7 @@ export type Rubric =
     | PerseusPlotterRubric
     | PerseusRadioRubric
     | PerseusSorterRubric
-    | PerseusTableScoringData;
+    | PerseusTableRubric;
 
 export type UserInput =
     | PerseusCategorizerUserInput

diff --git a/packages/perseus/src/widgets/table/score-table.test.ts b/packages/perseus/src/widgets/table/score-table.test.ts
@@ -4,7 +4,7 @@ import scoreTable from "./score-table";
 import * as TableValidator from "./validate-table";
 
 import type {
-    PerseusTableScoringData,
+    PerseusTableRubric,
     PerseusTableUserInput,
 } from "../../validation.types";
 
@@ -20,15 +20,15 @@ describe("scoreTable", () => {
             ["3", "4"],
         ];
 
-        const scoringData: PerseusTableScoringData = {
+        const rubric: PerseusTableRubric = {
             answers: [
                 ["1", "2"],
                 ["3", "4"],
             ],
         };
 
         // Act
-        const score = scoreTable(userInput, scoringData, mockStrings);
+        const score = scoreTable(userInput, rubric, mockStrings);
 
         // Assert
         expect(mockValidator).toHaveBeenCalledWith(userInput);
@@ -46,15 +46,15 @@ describe("scoreTable", () => {
             ["3", "4"],
         ];
 
-        const scoringData: PerseusTableScoringData = {
+        const rubric: PerseusTableRubric = {
             answers: [
                 ["1", "2"],
                 ["3", "4"],
             ],
         };
 
         // Act
-        const score = scoreTable(userInput, scoringData, mockStrings);
+        const score = scoreTable(userInput, rubric, mockStrings);
 
         // Assert
         expect(mockValidator).toHaveBeenCalledWith(userInput);
@@ -68,15 +68,15 @@ describe("scoreTable", () => {
             ["3", "4"],
         ];
 
-        const scoringData: PerseusTableScoringData = {
+        const rubric: PerseusTableRubric = {
             answers: [
                 ["1", "2"],
                 ["3", "4"],
             ],
         };
 
         // Act
-        const result = scoreTable(userInput, scoringData, mockStrings);
+        const result = scoreTable(userInput, rubric, mockStrings);
 
         // Assert
         expect(result).toHaveInvalidInput();
@@ -90,15 +90,15 @@ describe("scoreTable", () => {
             ["5", "6"],
         ];
 
-        const scoringData: PerseusTableScoringData = {
+        const rubric: PerseusTableRubric = {
             answers: [
                 ["1", "2"],
                 ["3", "4"],
             ],
         };
 
         // Act
-        const result = scoreTable(userInput, scoringData, mockStrings);
+        const result = scoreTable(userInput, rubric, mockStrings);
 
         // Assert
         expect(result).toHaveBeenAnsweredIncorrectly();
@@ -111,15 +111,15 @@ describe("scoreTable", () => {
             ["3", "5"],
         ];
 
-        const scoringData: PerseusTableScoringData = {
+        const rubric: PerseusTableRubric = {
             answers: [
                 ["1", "2"],
                 ["3", "4"],
             ],
         };
 
         // Act
-        const result = scoreTable(userInput, scoringData, mockStrings);
+        const result = scoreTable(userInput, rubric, mockStrings);
 
         // Assert
         expect(result).toHaveBeenAnsweredIncorrectly();
@@ -132,15 +132,15 @@ describe("scoreTable", () => {
             ["3", "4"],
         ];
 
-        const scoringData: PerseusTableScoringData = {
+        const rubric: PerseusTableRubric = {
             answers: [
                 ["1", "2"],
                 ["3", "4"],
             ],
         };
 
         // Act
-        const result = scoreTable(userInput, scoringData, mockStrings);
+        const result = scoreTable(userInput, rubric, mockStrings);
 
         // Assert
         expect(result).toHaveBeenAnsweredCorrectly();
@@ -153,15 +153,15 @@ describe("scoreTable", () => {
             ["3.0", "4.0"],
         ];
 
-        const scoringData: PerseusTableScoringData = {
+        const rubric: PerseusTableRubric = {
             answers: [
                 ["1", "2"],
                 ["3", "4"],
             ],
         };
 
         // Act
-        const result = scoreTable(userInput, scoringData, mockStrings);
+        const result = scoreTable(userInput, rubric, mockStrings);
 
         // Assert
         expect(result).toHaveBeenAnsweredCorrectly();

diff --git a/packages/perseus/src/widgets/table/score-table.ts b/packages/perseus/src/widgets/table/score-table.ts
@@ -8,13 +8,13 @@ import validateTable from "./validate-table";
 import type {PerseusStrings} from "../../strings";
 import type {PerseusScore} from "../../types";
 import type {
-    PerseusTableScoringData,
+    PerseusTableRubric,
     PerseusTableUserInput,
 } from "../../validation.types";
 
 function scoreTable(
     userInput: PerseusTableUserInput,
-    rubric: PerseusTableScoringData,
+    rubric: PerseusTableRubric,
     strings: PerseusStrings,
 ): PerseusScore {
     const validationResult = validateTable(userInput);

diff --git a/packages/perseus/src/widgets/table/table.tsx b/packages/perseus/src/widgets/table/table.tsx
@@ -16,7 +16,7 @@ import type {ChangeableProps} from "../../mixins/changeable";
 import type {PerseusTableWidgetOptions} from "../../perseus-types";
 import type {Widget, WidgetExports, WidgetProps} from "../../types";
 import type {
-    PerseusTableScoringData,
+    PerseusTableRubric,
     PerseusTableUserInput,
 } from "../../validation.types";
 
@@ -27,8 +27,7 @@ type RenderProps = PerseusTableWidgetOptions & {
     Editor: any;
 };
 
-type Props = ChangeableProps &
-    WidgetProps<RenderProps, PerseusTableScoringData>;
+type Props = ChangeableProps & WidgetProps<RenderProps, PerseusTableRubric>;
 
 type DefaultProps = {
     apiOptions: Props["apiOptions"];