diff --git a/e2e/applicationForm.spec.ts b/e2e/applicationForm.spec.ts
index 2dea0d6..1d8808d 100644
--- a/e2e/applicationForm.spec.ts
+++ b/e2e/applicationForm.spec.ts
@@ -24,12 +24,16 @@ test.describe("application form", () => {
await page.getByRole("button", { name: /^Sign in$/ }).click();
+ await page.waitForTimeout(2000);
+
await page.getByRole("link", { name: "Edit application form" }).click();
await expect(
page.getByRole("heading", { name: "Application Form Editor" })
).toBeVisible();
+ await page.waitForTimeout(2000);
+
await expect(page.getByText("General info")).toBeVisible();
// Creating and deleting steps
@@ -49,6 +53,8 @@ test.describe("application form", () => {
// Editing step
await page.getByText("Step #2").click();
+ await page.waitForTimeout(2000);
+
await expect(page.getByRole("heading", { name: "Step #2" })).toBeVisible();
await page.getByRole("button", { name: "Edit title" }).click();
@@ -75,7 +81,7 @@ test.describe("application form", () => {
await page.getByText("Select a field type").click();
await page.getByLabel("textarea").getByText("textarea").click();
await page.getByLabel("Required").check();
- await page.getByRole("button", { name: "Create new field" }).click();
+ await page.getByRole("button", { name: "Save new field" }).click();
await expect(
page.getByText("1. What is your experience with hackathons? (textarea)")
@@ -88,7 +94,7 @@ test.describe("application form", () => {
await page.getByLabel("Name").fill("hackathonsPast");
await page.getByText("Select a field type").click();
await page.getByLabel("checkbox").getByText("checkbox").click();
- await page.getByRole("button", { name: "Create new field" }).click();
+ await page.getByRole("button", { name: "Save new field" }).click();
await expect(
page.getByText("2. I have been at the hackathon in the past. (checkbox)")
@@ -99,7 +105,7 @@ test.describe("application form", () => {
await page.getByLabel("Name").fill("company");
await page.getByText("Select a field type").click();
await page.getByLabel("text", { exact: true }).getByText("text").click();
- await page.getByRole("button", { name: "Create new field" }).click();
+ await page.getByRole("button", { name: "Save new field" }).click();
await expect(
page.getByText("3. What company do you work for? (text)")
@@ -119,7 +125,7 @@ test.describe("application form", () => {
await page.getByLabel("Name").fill("hackathonsPast");
await page.getByText("Select a field type").click();
await page.getByLabel("checkbox").getByText("checkbox").click();
- await page.getByRole("button", { name: "Create new field" }).click();
+ await page.getByRole("button", { name: "Save new field" }).click();
await expect(
page.getByText("3. I have been at the hackathon in the past. (checkbox)")
diff --git a/package-lock.json b/package-lock.json
index 958b404..6f8cd63 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -38,7 +38,7 @@
"zod": "^3.22.4"
},
"devDependencies": {
- "@playwright/test": "^1.38.1",
+ "@playwright/test": "^1.39.0",
"@storybook/addon-essentials": "^7.4.6",
"@storybook/addon-interactions": "^7.4.6",
"@storybook/addon-links": "^7.4.6",
@@ -3913,12 +3913,12 @@
}
},
"node_modules/@playwright/test": {
- "version": "1.38.1",
- "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.1.tgz",
- "integrity": "sha512-NqRp8XMwj3AK+zKLbZShl0r/9wKgzqI/527bkptKXomtuo+dOjU9NdMASQ8DNC9z9zLOMbG53T4eihYr3XR+BQ==",
+ "version": "1.39.0",
+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.39.0.tgz",
+ "integrity": "sha512-3u1iFqgzl7zr004bGPYiN/5EZpRUSFddQBra8Rqll5N0/vfpqlP9I9EXqAoGacuAbX6c9Ulg/Cjqglp5VkK6UQ==",
"dev": true,
"dependencies": {
- "playwright": "1.38.1"
+ "playwright": "1.39.0"
},
"bin": {
"playwright": "cli.js"
@@ -17152,12 +17152,12 @@
}
},
"node_modules/playwright": {
- "version": "1.38.1",
- "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.1.tgz",
- "integrity": "sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow==",
+ "version": "1.39.0",
+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.39.0.tgz",
+ "integrity": "sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw==",
"dev": true,
"dependencies": {
- "playwright-core": "1.38.1"
+ "playwright-core": "1.39.0"
},
"bin": {
"playwright": "cli.js"
@@ -17170,9 +17170,9 @@
}
},
"node_modules/playwright-core": {
- "version": "1.38.1",
- "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.1.tgz",
- "integrity": "sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg==",
+ "version": "1.39.0",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.39.0.tgz",
+ "integrity": "sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==",
"dev": true,
"bin": {
"playwright-core": "cli.js"
@@ -23795,12 +23795,12 @@
}
},
"@playwright/test": {
- "version": "1.38.1",
- "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.38.1.tgz",
- "integrity": "sha512-NqRp8XMwj3AK+zKLbZShl0r/9wKgzqI/527bkptKXomtuo+dOjU9NdMASQ8DNC9z9zLOMbG53T4eihYr3XR+BQ==",
+ "version": "1.39.0",
+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.39.0.tgz",
+ "integrity": "sha512-3u1iFqgzl7zr004bGPYiN/5EZpRUSFddQBra8Rqll5N0/vfpqlP9I9EXqAoGacuAbX6c9Ulg/Cjqglp5VkK6UQ==",
"dev": true,
"requires": {
- "playwright": "1.38.1"
+ "playwright": "1.39.0"
}
},
"@pmmmwh/react-refresh-webpack-plugin": {
@@ -33481,19 +33481,19 @@
}
},
"playwright": {
- "version": "1.38.1",
- "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.38.1.tgz",
- "integrity": "sha512-oRMSJmZrOu1FP5iu3UrCx8JEFRIMxLDM0c/3o4bpzU5Tz97BypefWf7TuTNPWeCe279TPal5RtPPZ+9lW/Qkow==",
+ "version": "1.39.0",
+ "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.39.0.tgz",
+ "integrity": "sha512-naE5QT11uC/Oiq0BwZ50gDmy8c8WLPRTEWuSSFVG2egBka/1qMoSqYQcROMT9zLwJ86oPofcTH2jBY/5wWOgIw==",
"dev": true,
"requires": {
"fsevents": "2.3.2",
- "playwright-core": "1.38.1"
+ "playwright-core": "1.39.0"
}
},
"playwright-core": {
- "version": "1.38.1",
- "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.38.1.tgz",
- "integrity": "sha512-tQqNFUKa3OfMf4b2jQ7aGLB8o9bS3bOY0yMEtldtC2+spf8QXG9zvXLTXUeRsoNuxEYMgLYR+NXfAa1rjKRcrg==",
+ "version": "1.39.0",
+ "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.39.0.tgz",
+ "integrity": "sha512-+k4pdZgs1qiM+OUkSjx96YiKsXsmb59evFoqv8SKO067qBA+Z2s/dCzJij/ZhdQcs2zlTAgRKfeiiLm8PQ2qvw==",
"dev": true
},
"pnp-webpack-plugin": {
diff --git a/package.json b/package.json
index 5c4633e..8892080 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
"zod": "^3.22.4"
},
"devDependencies": {
- "@playwright/test": "^1.38.1",
+ "@playwright/test": "^1.39.0",
"@storybook/addon-essentials": "^7.4.6",
"@storybook/addon-interactions": "^7.4.6",
"@storybook/addon-links": "^7.4.6",
diff --git a/src/app/dashboard/application/[applicationId]/detail/page.tsx b/src/app/dashboard/application/[applicationId]/detail/page.tsx
index 9c54b33..89ab8e9 100644
--- a/src/app/dashboard/application/[applicationId]/detail/page.tsx
+++ b/src/app/dashboard/application/[applicationId]/detail/page.tsx
@@ -9,7 +9,7 @@ export const metadata: Metadata = {
title: "Application detail",
};
-const DashboardPage = async ({
+const ApplicationDetailPage = async ({
params,
}: {
params: { applicationId: string };
@@ -23,4 +23,4 @@ const DashboardPage = async ({
return ;
};
-export default DashboardPage;
+export default ApplicationDetailPage;
diff --git a/src/app/dashboard/form-editor/page.tsx b/src/app/dashboard/form-editor/page.tsx
index 8541629..e85bb4a 100644
--- a/src/app/dashboard/form-editor/page.tsx
+++ b/src/app/dashboard/form-editor/page.tsx
@@ -9,12 +9,13 @@ export const metadata: Metadata = {
title: "Edit application form",
};
-const DashboardPage = async () => {
+const FormEditorPage = async () => {
if (!(await requireOrganizerApp())) {
redirect("/application");
}
const applicationFormSteps = await getApplicationFormSteps();
+
return ;
};
-export default DashboardPage;
+export default FormEditorPage;
diff --git a/src/app/dashboard/form-editor/step/[stepId]/edit/page.tsx b/src/app/dashboard/form-editor/step/[stepId]/edit/page.tsx
index 75c3f42..fd18318 100644
--- a/src/app/dashboard/form-editor/step/[stepId]/edit/page.tsx
+++ b/src/app/dashboard/form-editor/step/[stepId]/edit/page.tsx
@@ -10,13 +10,18 @@ export const metadata: Metadata = {
title: "Edit application form step",
};
-const DashboardPage = async ({ params }: { params: { stepId: string } }) => {
+const FormEditorStepPage = async ({
+ params,
+}: {
+ params: { stepId: string };
+}) => {
if (!(await requireOrganizerApp())) {
redirect("/application");
}
const stepInfo = await getStepInfo(Number(params.stepId));
const formFieldTypes = await getFormFieldTypes();
+
return ;
};
-export default DashboardPage;
+export default FormEditorStepPage;
diff --git a/src/app/dashboard/page.tsx b/src/app/dashboard/page.tsx
index 34646ff..ea2716d 100644
--- a/src/app/dashboard/page.tsx
+++ b/src/app/dashboard/page.tsx
@@ -12,6 +12,7 @@ const DashboardPage = async () => {
if (!(await requireOrganizerApp())) {
redirect("/application");
}
+
return ;
};
diff --git a/src/scenes/Dashboard/ApplicationFormEditor/scenes/EditStepForm/components/NewFieldDialog.tsx b/src/scenes/Dashboard/ApplicationFormEditor/scenes/EditStepForm/components/NewFieldDialog.tsx
index 5c7f7cb..d89ed17 100644
--- a/src/scenes/Dashboard/ApplicationFormEditor/scenes/EditStepForm/components/NewFieldDialog.tsx
+++ b/src/scenes/Dashboard/ApplicationFormEditor/scenes/EditStepForm/components/NewFieldDialog.tsx
@@ -175,7 +175,7 @@ const NewFieldDialog = ({ stepId, formFieldTypes }: Props) => {
)}
/>
-
+