Skip to content

Commit

Permalink
fix(select-category): update Select Category terminology
Browse files Browse the repository at this point in the history
  • Loading branch information
NSUWAL123 committed Nov 8, 2024
1 parent 2011854 commit 22d7860
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion src/frontend/e2e/01-create-new-project.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ test('create new project', async ({ browserName, page }) => {

// 3. Select Category Step
await page.getByRole('button', { name: 'NEXT' }).click();
await expect(page.getByText('Form Category is Required.')).toBeVisible();
await expect(page.getByText('Survey Type is Required.')).toBeVisible();
await page.getByRole('combobox').click();
await page.getByLabel('buildings').click();
await page.getByRole('button', { name: 'NEXT' }).click();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ const FormUpdateTab = ({ projectId }) => {
<div className="fmtm-flex fmtm-flex-col fmtm-gap-10">
<div className="">
<CustomSelect
title="Select category"
placeholder="Select category"
title="Select Survey Type"
placeholder="Select Survey Type"
data={sortedFormCategoryList}
dataKey="id"
valueKey="title"
Expand All @@ -60,7 +60,7 @@ const FormUpdateTab = ({ projectId }) => {
/>
{error.categoryError && <p className="fmtm-text-primaryRed fmtm-text-base">{error.categoryError}</p>}
<p className="fmtm-text-base fmtm-mt-2">
The category will be used to set the OpenStreetMap{' '}
The survey type will be used to set the OpenStreetMap{' '}
<a
href="https://wiki.openstreetmap.org/wiki/Tags"
target="_"
Expand Down
10 changes: 5 additions & 5 deletions src/frontend/src/components/createnewproject/SelectForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import useDocumentTitle from '@/utilfunctions/useDocumentTitle';
import { Loader2 } from 'lucide-react';

const SelectForm = ({ flag, geojsonFile, customFormFile, setCustomFormFile }) => {
useDocumentTitle('Create Project: Select Category');
useDocumentTitle('Create Project: Select Form');
const dispatch = useDispatch();
const navigate = useNavigate();

Expand Down Expand Up @@ -86,7 +86,7 @@ const SelectForm = ({ flag, geojsonFile, customFormFile, setCustomFormFile }) =>
return (
<div className="fmtm-flex fmtm-gap-7 fmtm-flex-col lg:fmtm-flex-row fmtm-h-full">
<div className="fmtm-bg-white lg:fmtm-w-[20%] xl:fmtm-w-[17%] fmtm-px-5 fmtm-py-6 lg:fmtm-h-full lg:fmtm-overflow-y-scroll lg:scrollbar">
<h6 className="fmtm-text-xl fmtm-font-[600] fmtm-pb-2 lg:fmtm-pb-6">Select Category</h6>
<h6 className="fmtm-text-xl fmtm-font-[600] fmtm-pb-2 lg:fmtm-pb-6">Select Form</h6>
<p className="fmtm-text-gray-500 lg:fmtm-flex lg:fmtm-flex-col lg:fmtm-gap-3">
<span>
You may choose a pre-configured form, or upload a custom XLS form. Click{' '}
Expand Down Expand Up @@ -116,8 +116,8 @@ const SelectForm = ({ flag, geojsonFile, customFormFile, setCustomFormFile }) =>
<div className="fmtm-flex fmtm-flex-col fmtm-gap-6">
<div className="">
<CustomSelect
title="Select category"
placeholder="Select category"
title="Select Survey Type"
placeholder="Select Survey Type"
data={sortedFormCategoryList}
dataKey="id"
valueKey="title"
Expand All @@ -131,7 +131,7 @@ const SelectForm = ({ flag, geojsonFile, customFormFile, setCustomFormFile }) =>
className="fmtm-max-w-[13.5rem]"
/>
<p className="fmtm-text-base fmtm-mt-2">
The category will be used to set the OpenStreetMap{' '}
The survey type will be used to set the OpenStreetMap{' '}
<a
href="https://wiki.openstreetmap.org/wiki/Tags"
target="_"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ function SelectFormValidation(values: ProjectValues) {
const errors: ValidationErrors = {};

if (!values?.formCategorySelection) {
errors.formCategorySelection = 'Form Category is Required.';
errors.formCategorySelection = 'Survey Type is Required.';
}
if (values?.formWays === 'custom_form' && !values?.customFormUpload) {
errors.customFormUpload = 'Form needs to be Uploaded.';
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/constants/StepFormConstants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export const createProjectSteps: ICreateProjectSteps[] = [
url: '/select-category',
step: 3,
label: '03',
name: 'Select Category',
name: 'Select Form',
},
{
url: '/map-features',
Expand Down

0 comments on commit 22d7860

Please sign in to comment.