change type of instance config

pubpub · Jan 25, 2024 · c527129 · c527129
1 parent 445b6aa
commit c527129
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/integrations/evaluations/app/configure/actions.ts b/integrations/evaluations/app/configure/actions.ts
@@ -3,7 +3,7 @@
 import { setInstanceConfig } from "~/lib/instance";
 import { InstanceConfig } from "~/lib/types";
 
-export const configure = (instanceId: string, instanceConfig: Partial<InstanceConfig>) => {
+export const configure = (instanceId: string, instanceConfig: InstanceConfig) => {
 	try {
 		return setInstanceConfig(instanceId, instanceConfig);
 	} catch (error) {

diff --git a/integrations/evaluations/app/configure/configure.tsx b/integrations/evaluations/app/configure/configure.tsx
@@ -48,12 +48,7 @@ type RedirectProps = BaseProps & {
 
 type Props = BaseProps | RedirectProps;
 
-type FormDeadlineOffset = {
-	deadlineLength: number;
-	deadlineUnit: "weeks" | "days" | "months";
-};
-
-const schema: z.ZodType<Partial<InstanceConfig> & FormDeadlineOffset> = z.object({
+const schema: z.ZodType<InstanceConfig> = z.object({
 	pubTypeId: z.string().length(36),
 	evaluatorFieldSlug: z.string().min(1),
 	titleFieldSlug: z.string().min(1),
@@ -79,12 +74,13 @@ const defaultFormValues = {
 	evaluatorFieldSlug: "",
 	titleFieldSlug: "",
 	template: defaultEmailTemplate,
-	deadline: new Date(Date.now() + 3 * 7 * 24 * 60 * 60 * 1000),
 	deadlineLength: 3,
 	deadlineUnit: "weeks" as const,
 };
 
-function calculateDeadline(deadline: FormDeadlineOffset): void {
+function calculateDeadline(
+	deadline: Pick<InstanceConfig, "deadlineLength" | "deadlineUnit">
+): number {
 	let n: number;
 	switch (deadline.deadlineUnit) {
 		case "days":
@@ -103,7 +99,7 @@ function calculateDeadline(deadline: FormDeadlineOffset): void {
 			throw new Error('Invalid time unit. Use "days", "weeks", or "months".');
 	}
 
-	return;
+	return n;
 }
 
 export function Configure(props: Props) {
@@ -118,6 +114,11 @@ export function Configure(props: Props) {
 		defaultValues,
 	});
 	const onSubmit = async (values: z.infer<typeof schema>) => {
+		const deadline = calculateDeadline({
+			deadlineLength: values.deadlineLength,
+			deadlineUnit: values.deadlineUnit,
+		});
+		console.log(deadline);
 		const result = await configure(props.instanceId, values);
 		if ("error" in result) {
 			toast({

diff --git a/integrations/evaluations/lib/instance.ts b/integrations/evaluations/lib/instance.ts
@@ -9,7 +9,7 @@ export const getInstanceConfig = async (
 
 export const setInstanceConfig = async (
 	instanceId: string,
-	instanceConfig: Partial<InstanceConfig>
+	instanceConfig: InstanceConfig
 ): Promise<any> => {
 	return await client.setInstanceConfig(instanceId, instanceConfig);
 };

diff --git a/integrations/evaluations/lib/types.ts b/integrations/evaluations/lib/types.ts
@@ -95,7 +95,8 @@ export type InstanceConfig = {
 	evaluatorFieldSlug: string;
 	titleFieldSlug: string;
 	emailTemplate: EmailTemplate;
-	deadline: Date;
+	deadlineLength: number;
+	deadlineUnit: "weeks" | "days" | "months";
 };
 
 export type InstanceState = {