= ({
case APPLICATION_ROUTES.CREATE_NEW_MODEL_TRAINING_SETTINGS:
// confirm that the user has selected at least an option
return formData.zoomLevels.length > 0;
+ case APPLICATION_ROUTES.CREATE_NEW_MODEL_TRAINING_AREA:
+ //@ts-expect-error bad type definition
+ const trainingAreas: TTrainingArea = formData.trainingAreas;
+ // Ensure that no geometry is null before they can proceed
+ return (
+ trainingAreas?.features?.filter((area) => area.geometry !== null)
+ .length > 0
+ );
default:
return true;
}
}, [formData, currentPath]);
+ // Handle model creation when on the last page
+
return (
{
+ updateTMSLayer();
+ updateGeoJSONLayer();
+ };
+ onStyleData();
+ // Attach the listener for style changes
+ map.on("styledata", onStyleData);
return () => {
if (map.getLayer(trainingAreasLayerId)) {
@@ -94,8 +99,10 @@ const TrainingAreaMap = ({
if (map.getSource(TMSSourceId)) {
map.removeSource(TMSSourceId);
}
+
+ map.off("styledata", onStyleData);
};
- }, [map, mapData]);
+ }, [map, mapData, tileJSONURL]);
return (
0
+ ? [
+ {
+ value: "Training Areas",
+ mapLayerId: trainingAreasLayerId,
+ },
+ ]
+ : []),
]}
/>
);
diff --git a/frontend/src/features/model-creation/components/training-area/training-area.tsx b/frontend/src/features/model-creation/components/training-area/training-area.tsx
index c77c2189..4ff52645 100644
--- a/frontend/src/features/model-creation/components/training-area/training-area.tsx
+++ b/frontend/src/features/model-creation/components/training-area/training-area.tsx
@@ -6,11 +6,14 @@ import {
import { StepHeading } from "@/features/model-creation/components/";
import TrainingAreaMap from "./training-area-map";
import { Button, ButtonWithIcon } from "@/components/ui/button";
-import { useModelFormContext } from "@/app/providers/model-creation-provider";
+import {
+ MODEL_CREATION_FORM_NAME,
+ useModelFormContext,
+} from "@/app/providers/model-creation-provider";
import { useGetTMSTileJSON } from "../../hooks/use-tms-tilejson";
import { useDialog } from "@/hooks/use-dialog";
import FileUploadDialog from "../dialogs/file-upload-dialog";
-import { useState } from "react";
+import { useEffect, useState } from "react";
import TrainingAreaList from "./training-area-list";
import { useGetTrainingAreas } from "../../hooks/use-training-areas";
import { useMap } from "@/app/providers/map-provider";
@@ -23,6 +26,7 @@ const TrainingAreaForm = () => {
const { isPending, data, isError } = useGetTMSTileJSON(tileJSONURL);
const { closeDialog, isOpened, toggle } = useDialog();
+ const { handleChange } = useModelFormContext();
const { map } = useMap();
@@ -38,6 +42,16 @@ const TrainingAreaForm = () => {
isPlaceholderData,
} = useGetTrainingAreas(Number(formData.selectedTrainingDatasetId), offset);
+ useEffect(() => {
+ if (!trainingAreasData) return;
+ // update the form data when the data changes
+ // @ts-expect-error bad type definition
+ handleChange(
+ MODEL_CREATION_FORM_NAME.TRAINING_AREAS,
+ trainingAreasData?.results,
+ );
+ }, [trainingAreasData]);
+
return (
<>
;
+};
+
+export const useCreateModel = ({ mutationConfig }: useCreateModelOptions) => {
+ const { onSuccess, ...restConfig } = mutationConfig || {};
+
+ return useMutation({
+ mutationFn: (args: TCreateModelArgs) => createModel(args),
+ onSuccess: (...args) => {
+ onSuccess?.(...args);
+ },
+ ...restConfig,
+ });
+};
+
+type useCreateModelTrainingOptions = {
+ mutationConfig?: MutationConfig;
+};
+
+export const useCreateModelTrainingRequest = ({
+ mutationConfig,
+}: useCreateModelTrainingOptions) => {
+ const { onSuccess, ...restConfig } = mutationConfig || {};
+
+ return useMutation({
+ mutationFn: (args: TCreateTrainingRequestArgs) =>
+ createTrainingRequest(args),
+ onSuccess: (...args) => {
+ onSuccess?.(...args);
+ },
+ ...restConfig,
+ });
+};
diff --git a/frontend/src/features/models/api/factory.ts b/frontend/src/features/models/api/factory.ts
index 8d941317..5ebf6549 100644
--- a/frontend/src/features/models/api/factory.ts
+++ b/frontend/src/features/models/api/factory.ts
@@ -89,6 +89,7 @@ export const getTrainingWorkspaceQueryOptions = (
return queryOptions({
queryKey: ["training-workspace", datasetId, trainingId, directory_name],
queryFn: () => getTrainingWorkspace(datasetId, trainingId, directory_name),
+ enabled: trainingId !== null,
});
};
diff --git a/frontend/src/features/models/components/directory-tree.tsx b/frontend/src/features/models/components/directory-tree.tsx
index 06d35867..65535afc 100644
--- a/frontend/src/features/models/components/directory-tree.tsx
+++ b/frontend/src/features/models/components/directory-tree.tsx
@@ -101,9 +101,11 @@ const DirectoryTree: React.FC = ({
const fetchDirectoryData = async (path: string = "") => {
try {
- return await queryClient.fetchQuery({
- ...getTrainingWorkspaceQueryOptions(datasetId, trainingId, path),
- });
+ if (trainingId !== null) {
+ return await queryClient.fetchQuery({
+ ...getTrainingWorkspaceQueryOptions(datasetId, trainingId, path),
+ });
+ }
} catch {
setHasError(true);
return null;
diff --git a/frontend/src/features/models/components/model-details-info.tsx b/frontend/src/features/models/components/model-details-info.tsx
index bc406e34..a829129e 100644
--- a/frontend/src/features/models/components/model-details-info.tsx
+++ b/frontend/src/features/models/components/model-details-info.tsx
@@ -39,6 +39,7 @@ const ModelDetailsInfo = ({