Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/api/src/demo/demo.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import happinessQuestionnaire from '@opendatacapture/instrument-library/forms/DN
import breakoutTask from '@opendatacapture/instrument-library/interactive/DNP_BREAKOUT_TASK.js';
import happinessQuestionnaireWithConsent from '@opendatacapture/instrument-library/series/DNP_HAPPINESS_QUESTIONNAIRE_WITH_CONSENT.js';
import type { FormInstrument } from '@opendatacapture/runtime-core';
import type { Json, Language, WithID } from '@opendatacapture/schemas/core';
import type { Language, WithID } from '@opendatacapture/schemas/core';
import type { Group } from '@opendatacapture/schemas/group';
import { encodeScopedSubjectId, generateSubjectHash } from '@opendatacapture/subject-utils';

Expand Down
7 changes: 3 additions & 4 deletions apps/web/src/routes/_app/user.tsx
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/* eslint-disable perfectionist/sort-objects */
import { useMemo } from 'react';

import { estimatePasswordStrength } from '@douglasneuroinformatics/libpasswd';
Expand Down Expand Up @@ -63,10 +64,10 @@ const RouteComponent = () => {
.object({
email: z.union([z.literal(''), z.email()]).optional(),
firstName: z.string().min(1).optional(),
// eslint-disable-next-line perfectionist/sort-objects

dateOfBirth: z.date().optional(),
lastName: z.string().min(1).optional(),
// eslint-disable-next-line perfectionist/sort-objects

confirmPassword: z.string().min(1).optional(),
password: z.string().min(1).optional(),
phoneNumber: z.union([z.literal(''), z.string().regex(PHONE_REGEX)]).optional(),
Expand Down Expand Up @@ -129,13 +130,11 @@ const RouteComponent = () => {
label: t('common.password'),
variant: 'password'
},
// eslint-disable-next-line perfectionist/sort-objects
confirmPassword: {
kind: 'string',
label: t('common.confirmPassword'),
variant: 'password'
},
// eslint-disable-next-line perfectionist/sort-objects
email: {
kind: 'string',
label: t({
Expand Down
4 changes: 2 additions & 2 deletions apps/web/src/utils/upload.ts
Original file line number Diff line number Diff line change
Expand Up @@ -497,7 +497,7 @@ export namespace Zod3 {
date: z3.coerce.date(),
subjectID: z3.string().regex(SUBJECT_ID_REGEX)
});
shape = (instrumentSchemaWithInternal._def as z3.ZodObjectDef).shape() as { [key: string]: z3.ZodTypeAny };
shape = (instrumentSchemaWithInternal._def as z3.ZodObjectDef).shape();
} else {
instrumentSchemaWithInternal = instrumentSchema.extend({
date: z3.coerce.date(),
Expand Down Expand Up @@ -621,7 +621,7 @@ export namespace Zod3 {
})
);
}
result.push(zodCheck.data as FormTypes.Data);
result.push(zodCheck.data);
rowNumber++;
}
return resolve(result);
Expand Down
Loading