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.

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

Download submissions as geojson #18

Merged
merged 1 commit into from
Feb 14, 2025
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
32 changes: 32 additions & 0 deletions src/frontend/src/api/SubmissionService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -151,3 +151,35 @@ export const DeleteGeometry = (url: string) => {
await deleteGeometry();
};
};

export const downloadSubmissionGeojson = (
url: string,
projectName: string,
params: { project_id: string; submitted_date_range: string | null },
) => {
return async (dispatch: AppDispatch) => {
dispatch(SubmissionActions.DownloadSubmissionGeojsonLoading(true));

const getProjectSubmission = async (url: string) => {
try {
const response = await CoreModules.axios.get(url, { params, responseType: 'blob' });
var a = document.createElement('a');
a.href = window.URL.createObjectURL(response.data);
a.download = `${projectName}.geojson`;
a.click();
} catch (error) {
dispatch(
CommonActions.SetSnackBar({
open: true,
message: JSON.parse(await error.response.data.text())?.detail || 'Something went wrong',
variant: 'error',
duration: 2000,
}),
);
} finally {
dispatch(SubmissionActions.DownloadSubmissionGeojsonLoading(false));
}
};
await getProjectSubmission(url);
};
};
83 changes: 52 additions & 31 deletions src/frontend/src/components/ProjectSubmissions/SubmissionsTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,11 @@ import { SubmissionActions } from '@/store/slices/SubmissionSlice';

import { CreateTaskEvent } from '@/api/TaskEvent';
import { ConvertXMLToJOSM, getDownloadProjectSubmission } from '@/api/task';
import { SubmissionFormFieldsService, SubmissionTableService } from '@/api/SubmissionService';
import {
downloadSubmissionGeojson,
SubmissionFormFieldsService,
SubmissionTableService,
} from '@/api/SubmissionService';

import filterParams from '@/utilfunctions/filterParams';
import { camelToFlat } from '@/utilfunctions/commonUtils';
Expand Down Expand Up @@ -59,6 +63,7 @@ const SubmissionsTable = ({ toggleView }) => {
const projectInfo = useAppSelector((state) => state.project.projectInfo);
const josmEditorError = useAppSelector((state) => state.task.josmEditorError);
const downloadSubmissionLoading = useAppSelector((state) => state.task.downloadSubmissionLoading);
const downloadSubmissionGeojsonLoading = useAppSelector((state) => state.submission.DownloadSubmissionGeojsonLoading);
const authDetails = CoreModules.useAppSelector((state) => state.login.authDetails);
const updateTaskStatusLoading = useAppSelector((state) => state.common.loading);

Expand All @@ -82,6 +87,20 @@ const SubmissionsTable = ({ toggleView }) => {
: null,
});

const submissionDownloadTypes: { type: 'csv' | 'json' | 'geojson'; label: string; loading: boolean }[] = [
{
type: 'csv',
label: 'Download as Csv',
loading: downloadSubmissionLoading.type === 'csv' && downloadSubmissionLoading.loading,
},
{
type: 'json',
label: 'Download as Json',
loading: downloadSubmissionLoading.type === 'json' && downloadSubmissionLoading.loading,
},
{ type: 'geojson', label: 'Download as GeoJson', loading: downloadSubmissionGeojsonLoading },
];

useEffect(() => {
if (!dateRange.start || !dateRange.end) return;

Expand Down Expand Up @@ -209,14 +228,24 @@ const SubmissionsTable = ({ toggleView }) => {
);
};

const handleDownload = (downloadType: 'csv' | 'json') => {
dispatch(
getDownloadProjectSubmission(`${import.meta.env.VITE_API_URL}/submission/download`, projectInfo.name!, {
project_id: projectId,
submitted_date_range: filter?.submitted_date_range,
export_json: downloadType === 'json',
}),
);
const handleDownload = (downloadType: 'csv' | 'json' | 'geojson') => {
if (downloadType === 'geojson') {
dispatch(
downloadSubmissionGeojson(
`${import.meta.env.VITE_API_URL}/submission/download-submission-geojson`,
projectInfo.name!,
{ project_id: projectId, submitted_date_range: filter?.submitted_date_range },
),
);
} else {
dispatch(
getDownloadProjectSubmission(`${import.meta.env.VITE_API_URL}/submission/download`, projectInfo.name!, {
project_id: projectId,
submitted_date_range: filter?.submitted_date_range,
export_json: downloadType === 'json',
}),
);
}
};

const handleTaskMap = async () => {
Expand Down Expand Up @@ -364,28 +393,20 @@ const SubmissionsTable = ({ toggleView }) => {
</button>
</DropdownMenuTrigger>
<DropdownMenuContent align="start" className="fmtm-z-[5000] fmtm-bg-white">
<DropdownMenuItem
disabled={downloadSubmissionLoading.type === 'csv' && downloadSubmissionLoading.loading}
onSelect={() => handleDownload('csv')}
>
<div className="fmtm-flex fmtm-gap-2 fmtm-items-center">
<p className="fmtm-text-base">Download as Csv</p>
{downloadSubmissionLoading.type === 'csv' && downloadSubmissionLoading.loading && (
<Loader2 className="fmtm-h-4 fmtm-w-4 fmtm-animate-spin fmtm-text-primaryRed" />
)}
</div>
</DropdownMenuItem>
<DropdownMenuItem
onSelect={() => handleDownload('json')}
disabled={downloadSubmissionLoading.type === 'json' && downloadSubmissionLoading.loading}
>
<div className="fmtm-flex fmtm-gap-2 fmtm-items-center">
<p className="fmtm-text-base">Download as Json</p>
{downloadSubmissionLoading.type === 'json' && downloadSubmissionLoading.loading && (
<Loader2 className="fmtm-h-4 fmtm-w-4 fmtm-animate-spin fmtm-text-primaryRed" />
)}
</div>{' '}
</DropdownMenuItem>
{submissionDownloadTypes?.map((submissionDownload) => (
<DropdownMenuItem
key={submissionDownload.type}
disabled={submissionDownload.loading}
onSelect={() => handleDownload(submissionDownload.type)}
>
<div className="fmtm-flex fmtm-gap-2 fmtm-items-center">
<p className="fmtm-text-base">{submissionDownload.label}</p>
{submissionDownload.loading && (
<Loader2 className="fmtm-h-4 fmtm-w-4 fmtm-animate-spin fmtm-text-primaryRed" />
)}
</div>
</DropdownMenuItem>
))}
</DropdownMenuContent>
</DropdownMenu>
<button
Expand Down
4 changes: 4 additions & 0 deletions src/frontend/src/store/slices/SubmissionSlice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const initialState: SubmissionStateTypes = {
mappedVsValidatedTaskLoading: false,
submissionPhotos: [],
submissionPhotosLoading: false,
DownloadSubmissionGeojsonLoading: false,
};

const SubmissionSlice = createSlice({
Expand Down Expand Up @@ -119,6 +120,9 @@ const SubmissionSlice = createSlice({
SetSubmissionPhotosLoading(state, action: PayloadAction<boolean>) {
state.submissionPhotosLoading = action.payload;
},
DownloadSubmissionGeojsonLoading(state, action: PayloadAction<boolean>) {
state.DownloadSubmissionGeojsonLoading = action.payload;
},
},
});

Expand Down
1 change: 1 addition & 0 deletions src/frontend/src/store/types/ISubmissions.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ export type SubmissionStateTypes = {
mappedVsValidatedTaskLoading: boolean;
submissionPhotos: string[];
submissionPhotosLoading: boolean;
DownloadSubmissionGeojsonLoading: boolean;
};

type updateReviewStatusModal = {
Expand Down
Loading