Move schema to separate types file

PrairieLearn · Jun 20, 2024 · 1ac38bb · 1ac38bb
1 parent 0613db4
commit 1ac38bb
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 18 deletions.
diff --git a/.../prairielearn/assets/scripts/instructorAssessmentManualGradingAssessmentQuestionClient.ts b/.../prairielearn/assets/scripts/instructorAssessmentManualGradingAssessmentQuestionClient.ts
@@ -4,7 +4,7 @@ import { html } from '@prairielearn/html';
 import { EditQuestionPointsScoreButton } from '../../src/components/EditQuestionPointsScore.html.js';
 import type { User } from '../../src/lib/db-types.js';
 import { formatPoints } from '../../src/lib/format.js';
-import type { InstanceQuestionRow } from '../../src/pages/instructorAssessmentManualGrading/assessmentQuestion/assessmentQuestion.html.js';
+import type { InstanceQuestionRow } from '../../src/pages/instructorAssessmentManualGrading/assessmentQuestion/assessmentQuestion.types.js';
 
 onDocumentReady(() => {
   const {

diff --git a/...src/pages/instructorAssessmentManualGrading/assessmentQuestion/assessmentQuestion.html.ts b/...src/pages/instructorAssessmentManualGrading/assessmentQuestion/assessmentQuestion.html.ts
@@ -1,5 +1,3 @@
-import { z } from 'zod';
-
 import { html } from '@prairielearn/html';
 import { renderEjs } from '@prairielearn/html-ejs';
 
@@ -9,22 +7,8 @@ import {
   compiledScriptTag,
   nodeModulesAssetPath,
 } from '../../../lib/assets.js';
-import { AssessmentQuestionSchema, InstanceQuestionSchema } from '../../../lib/db-types.js';
 import { AssessmentOpenInstancesAlert } from '../../partials/AssessmentOpenInstancesAlert.html.js';
 
-export const InstanceQuestionRowSchema = InstanceQuestionSchema.extend({
-  modified_at: z.string(),
-  assessment_open: z.boolean(),
-  uid: z.string().nullable(),
-  assigned_grader_name: z.string().nullable(),
-  last_grader_name: z.string().nullable(),
-  assessment_question: AssessmentQuestionSchema,
-  user_or_group_name: z.string().nullable(),
-  open_issue_count: z.number().nullable(),
-  index: z.number(),
-});
-export type InstanceQuestionRow = z.infer<typeof InstanceQuestionRowSchema>;
-
 export function AssessmentQuestion({ resLocals }: { resLocals: Record<string, any> }) {
   const {
     number_in_alternative_group,

diff --git a/...earn/src/pages/instructorAssessmentManualGrading/assessmentQuestion/assessmentQuestion.ts b/...earn/src/pages/instructorAssessmentManualGrading/assessmentQuestion/assessmentQuestion.ts
@@ -6,7 +6,8 @@ import { loadSqlEquiv, queryAsync, queryRows } from '@prairielearn/postgres';
 
 import * as manualGrading from '../../../lib/manualGrading.js';
 
-import { AssessmentQuestion, InstanceQuestionRowSchema } from './assessmentQuestion.html.js';
+import { AssessmentQuestion } from './assessmentQuestion.html.js';
+import { InstanceQuestionRowSchema } from './assessmentQuestion.types.js';
 
 const router = express.Router();
 const sql = loadSqlEquiv(import.meta.url);

diff --git a/...rc/pages/instructorAssessmentManualGrading/assessmentQuestion/assessmentQuestion.types.ts b/...rc/pages/instructorAssessmentManualGrading/assessmentQuestion/assessmentQuestion.types.ts
@@ -0,0 +1,16 @@
+import { z } from 'zod';
+
+import { AssessmentQuestionSchema, InstanceQuestionSchema } from '../../../lib/db-types.js';
+
+export const InstanceQuestionRowSchema = InstanceQuestionSchema.extend({
+  modified_at: z.string(),
+  assessment_open: z.boolean(),
+  uid: z.string().nullable(),
+  assigned_grader_name: z.string().nullable(),
+  last_grader_name: z.string().nullable(),
+  assessment_question: AssessmentQuestionSchema,
+  user_or_group_name: z.string().nullable(),
+  open_issue_count: z.number().nullable(),
+  index: z.number(),
+});
+export type InstanceQuestionRow = z.infer<typeof InstanceQuestionRowSchema>;