Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: issue on create project form #122

Merged
merged 2 commits into from
Aug 5, 2024
Merged

fix: issue on create project form #122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd410d3
fix(Project-creation): restrict to proceed unless the project area an…
suzit-10 Aug 5, 2024
1bc3c2d
fix(project-creation)-#119: trim input values
suzit-10 Aug 5, 2024
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
25 changes: 25 additions & 0 deletions src/frontend/src/components/CreateProject/CreateprojectLayout/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@ export default function CreateprojectLayout() {
const isTerrainFollow = useTypedSelector(
state => state.createproject.isTerrainFollow,
);
const isNoflyzonePresent = useTypedSelector(
state => state.createproject.isNoflyzonePresent,
);

const initialState: FieldValues = {
name: '',
Expand Down Expand Up @@ -155,6 +158,25 @@ export default function CreateprojectLayout() {
};

const onSubmit = (data: any) => {
if (activeStep === 2) {
if (
!data?.outline_geojson ||
(Array.isArray(data?.outline_geojson) &&
data?.outline_geojson?.length === 0)
) {
toast.error('Please upload or draw and save project area');
return;
}
if (
isNoflyzonePresent === 'yes' &&
(!data?.outline_no_fly_zones ||
data?.outline_no_fly_zones?.length === 0)
) {
toast.error('Please upload or draw and save No Fly zone area');
return;
}
}

if (activeStep === 4 && !splitGeojson) return;
if (activeStep !== 5) {
dispatch(setCreateProjectState({ activeStep: activeStep + 1 }));
Expand All @@ -164,6 +186,9 @@ export default function CreateprojectLayout() {
...data,
is_terrain_follow: isTerrainFollow === 'hilly',
};
// remove key
if (isNoflyzonePresent === 'no') delete payload?.outline_no_fly_zones;

createProject(payload);
};

Expand Down
2 changes: 2 additions & 0 deletions src/frontend/src/components/CreateProject/FormContents/BasicInformation/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ export default function BasicInformation({
placeholder="Enter Name of the Project"
{...register('name', {
required: 'Name of the project is required',
setValueAs: (value: string) => value.trim(),
})}
/>
<ErrorMessage message={errors?.name?.message as string} />
Expand All @@ -28,6 +29,7 @@ export default function BasicInformation({
placeholder="Description of the Project"
{...register('description', {
required: 'Description is Required',
setValueAs: (value: string) => value.trim(),
})}
/>
<ErrorMessage message={errors?.description?.message as string} />
Expand Down
1 change: 1 addition & 0 deletions src/frontend/src/components/CreateProject/FormContents/Contributions/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ export default function Conditions({
placeholder="Enter Instructions for Drone Operators"
{...register('per_task_instructions', {
required: 'Instructions are required',
setValueAs: (value: string) => value.trim(),
})}
/>
<ErrorMessage
Expand Down
Loading