feat: finalized feedback popup logic:

|
hotosm · Nov 28, 2024 · 563aae1 · 563aae1
1 parent b0dfe2c
commit 563aae1
Show file tree

Hide file tree

Showing 9 changed files with 247 additions and 113 deletions.
diff --git a/frontend/src/components/map/legend.tsx b/frontend/src/components/map/legend.tsx
@@ -22,7 +22,7 @@ const FillLegendStyle = ({
 };
 
 const Legend = () => {
-  const [expandLegend, setExpandLegend] = useState<boolean>(true);
+  const [expandLegend, setExpandLegend] = useState<boolean>(false);
   const { map } = useMap();
 
   const activeLayers = map

diff --git a/frontend/src/contents/toast-notifications.ts b/frontend/src/contents/toast-notifications.ts
@@ -10,6 +10,9 @@ export const TOAST_NOTIFICATIONS = {
     approvedPrediction: {
       success: "Saved successfully.",
     },
+    resolved: {
+      success: "Action resolved successfully.",
+    },
     modelPrediction: {
       success: "Model predictions retrieved successfully.",
     },

diff --git a/frontend/src/features/model-creation/components/training-area/training-area-item.tsx b/frontend/src/features/model-creation/components/training-area/training-area-item.tsx
@@ -228,9 +228,9 @@ const TrainingAreaItem: React.FC<
               ? "Fetching labels..."
               : trainingArea.properties.label_fetched !== null
                 ? truncateString(
-                    `Fetched ${timeSinceLabelFetch === "0 sec" ? "just now" : `${timeSinceLabelFetch} ago`}`,
-                    20,
-                  )
+                  `Fetched ${timeSinceLabelFetch === "0 sec" ? "just now" : `${timeSinceLabelFetch} ago`}`,
+                  20,
+                )
                 : "No labels yet"}
           </p>
         </div>

diff --git a/frontend/src/features/start-mapping/api/create-feedbacks.ts b/frontend/src/features/start-mapping/api/create-feedbacks.ts
@@ -17,7 +17,7 @@ export const createFeedback = async ({
   source_imagery,
   zoom_level,
   training,
-}: TCreateFeedbackPayload): Promise<Feature> => {
+}: TCreateFeedbackPayload): Promise<Feature & { id: number }> => {
   return await (
     await apiClient.post(API_ENDPOINTS.CREATE_FEEDBACK, {
       comments,
@@ -42,7 +42,7 @@ export const createApprovedPrediction = async ({
   geom,
   training,
   user,
-}: TCreateApprovedPredictionPayload): Promise<Feature> => {
+}: TCreateApprovedPredictionPayload): Promise<Feature & { id: number }> => {
   return await (
     await apiClient.post(API_ENDPOINTS.CREATE_APPROVED_PREDICTION, {
       config,
@@ -52,3 +52,29 @@ export const createApprovedPrediction = async ({
     })
   ).data;
 };
+
+export type TDeleteModelPredictionFeedbackPayload = {
+  id: number;
+  approvePrediction?: boolean;
+};
+
+export const deleteModelPredictionFeedback = async ({
+  id,
+}: TDeleteModelPredictionFeedbackPayload) => {
+  return await (
+    await apiClient.delete(API_ENDPOINTS.DELETE_FEEDBACK(id))
+  ).data;
+};
+
+export type TDeleteApprovedModelPredictionPayload = {
+  id: number;
+  createFeedback?: boolean;
+};
+
+export const deleteApprovedModelPrediction = async ({
+  id,
+}: TDeleteApprovedModelPredictionPayload) => {
+  return await (
+    await apiClient.delete(API_ENDPOINTS.DELETE_APPROVED_PREDICTION(id))
+  ).data;
+};
diff --git a/frontend/src/features/start-mapping/components/model-action.tsx b/frontend/src/features/start-mapping/components/model-action.tsx
@@ -1,4 +1,4 @@
-import { Feature, TModelPredictions } from "@/types";
+import { TModelPredictions } from "@/types";
 import {
   MIN_ZOOM_LEVEL_FOR_PREDICTION,
   showErrorToast,