Add delete measure

Signed-off-by: Bryan Frimin <bryan@getprobo.com>

Author: gearnode

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+
+### Added
+
+- Add delete measure in the UI and GraphQL API
+
 ### Removed
 
 - Remove `importance` field from measure as it's not used anymore

apps/console/src/pages/organizations/mesures/MesureView.tsx

@@ -15,6 +15,7 @@ import {
   useMutation,
   fetchQuery,
   useRelayEnvironment,
+  ConnectionHandler,
 } from "react-relay";
 import {
   AlertTriangle,
@@ -106,6 +107,7 @@ import { MesureViewCreateControlMappingMutation } from "./__generated__/MesureVi
 import { MesureViewDeleteControlMappingMutation } from "./__generated__/MesureViewDeleteControlMappingMutation.graphql";
 import { MesureViewRisksQuery$data } from "./__generated__/MesureViewRisksQuery.graphql";
 import { MesureViewRisksQuery } from "./__generated__/MesureViewRisksQuery.graphql";
+import { MesureViewDeleteMesureMutation } from "./__generated__/MesureViewDeleteMesureMutation.graphql";
 
 // Function to format ISO8601 duration to human-readable format
 const formatDuration = (isoDuration: string): string => {
@@ -326,6 +328,17 @@ const updateMesureStateMutation = graphql`
   }
 `;
 
+const deleteMesureMutation = graphql`
+  mutation MesureViewDeleteMesureMutation(
+    $input: DeleteMesureInput!
+    $connections: [ID!]!
+  ) {
+    deleteMesure(input: $input) {
+      deletedMesureId @deleteEdge(connections: $connections)
+    }
+  }
+`;
+
 const organizationQuery = graphql`
   query MesureViewOrganizationQuery($organizationId: ID!) {
     organization: node(id: $organizationId) {
@@ -477,11 +490,17 @@ function MesureViewContent({
     mesureViewQuery,
     queryRef
   );
-  const { toast } = useToast();
-  const { organizationId, mesureId } = useParams();
   const navigate = useNavigate();
+  const { toast } = useToast();
+  const { organizationId, mesureId } = useParams<{
+    organizationId: string;
+    mesureId: string;
+  }>();
   const environment = useRelayEnvironment();
 
+  const [commitDeleteMesure, isDeletingMesure] = useMutation<MesureViewDeleteMesureMutation>(deleteMesureMutation);
+  const [isDeleteMesureOpen, setIsDeleteMesureOpen] = useState(false);
+
   // Add state for main content tabs
   const [mainContentTab, setMainContentTab] = useState<string>("tasks");
 
@@ -1815,32 +1834,70 @@ function MesureViewContent({
     return "Very High";
   };
 
+  const handleDeleteMesure = () => {
+    setIsDeleteMesureOpen(true);
+  };
+
+  const confirmDeleteMesure = () => {
+    const connectionId = ConnectionHandler.getConnectionID(
+      organizationId!,
+      "MesureListView_mesures"
+    );
+
+    commitDeleteMesure({
+      variables: {
+        connections: [connectionId],
+        input: {
+          mesureId: mesureId!,
+        },
+      },
+      onCompleted: () => {
+        toast({
+          title: "Mesure deleted",
+          description: "Mesure has been deleted successfully.",
+        });
+        navigate(`/organizations/${organizationId}/mesures`);
+      },
+      onError: (error) => {
+        toast({
+          title: "Error deleting mesure",
+          description: error.message,
+          variant: "destructive",
+        });
+      },
+    });
+  };
+
   return (
     <PageTemplate
-      title={data.mesure.name ?? ""}
+      title={data.mesure?.name || "Mesure"}
+      description={data.mesure?.description}
       actions={
-        <div className="flex items-center gap-2">
-          <Button onClick={handleEditMesure}>Edit Mesure</Button>
-          <Select
-            defaultValue={data.mesure.state}
-            onValueChange={handleMesureStateChange}
+        <div className="flex gap-2">
+          <Button
+            variant="outline"
+            onClick={handleEditMesure}
           >
-            <SelectTrigger className="w-[160px] h-10 text-sm">
-              <div
-                className={`${getStateColor(
-                  data.mesure.state
-                )} px-2 py-0.5 rounded-sm text-sm w-full text-center`}
-              >
-                {formatState(data.mesure.state)}
-              </div>
-            </SelectTrigger>
-            <SelectContent>
-              <SelectItem value="NOT_STARTED">Not Started</SelectItem>
-              <SelectItem value="IN_PROGRESS">In Progress</SelectItem>
-              <SelectItem value="IMPLEMENTED">Implemented</SelectItem>
-              <SelectItem value="NOT_APPLICABLE">Not Applicable</SelectItem>
-            </SelectContent>
-          </Select>
+            Edit
+          </Button>
+          <select
+            value={data.mesure?.state || ""}
+            onChange={(e) => handleMesureStateChange(e.target.value)}
+            className="rounded-full cursor-pointer inline-flex items-center justify-center gap-2 whitespace-nowrap text-sm font-medium transition-colors focus-visible:outline-hidden focus-visible:ring-1 focus-visible:ring-active-b disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 border border-low-b hover:bg-h-tertiary-bg active:bg-p-tertiary-bg focus:bg-tertiary-bg shadow-xs px-2"
+          >
+            <option value="">Select state</option>
+            <option value="NOT_STARTED">Not Started</option>
+            <option value="IN_PROGRESS">In Progress</option>
+            <option value="NOT_APPLICABLE">Not Applicable</option>
+            <option value="IMPLEMENTED">Implemented</option>
+          </select>
+          <Button
+            variant="destructive"
+            onClick={() => handleDeleteMesure()}
+            disabled={isDeletingMesure}
+          >
+            {isDeletingMesure ? "Deleting..." : "Delete"}
+          </Button>
         </div>
       }
     >
@@ -3598,6 +3655,33 @@ function MesureViewContent({
           </DialogFooter>
         </DialogContent>
       </Dialog>
+
+      {/* Delete Mesure Confirmation Dialog */}
+      <Dialog open={isDeleteMesureOpen} onOpenChange={setIsDeleteMesureOpen}>
+        <DialogContent>
+          <DialogHeader>
+            <DialogTitle>Delete Mesure</DialogTitle>
+            <DialogDescription>
+              Are you sure you want to delete this mesure? This action cannot be undone.
+            </DialogDescription>
+          </DialogHeader>
+          <DialogFooter>
+            <Button
+              variant="outline"
+              onClick={() => setIsDeleteMesureOpen(false)}
+            >
+              Cancel
+            </Button>
+            <Button
+              variant="destructive"
+              onClick={confirmDeleteMesure}
+              disabled={isDeletingMesure}
+            >
+              {isDeletingMesure ? "Deleting..." : "Delete"}
+            </Button>
+          </DialogFooter>
+        </DialogContent>
+      </Dialog>
     </PageTemplate>
   );
 }

apps/console/src/pages/organizations/mesures/__generated__/MesureViewDeleteMesureMutation.graphql.ts

@@ -433,3 +433,22 @@ WHERE %s
 	_, err := conn.Exec(ctx, q, args)
 	return err
 }
+
+func (m *Mesure) Delete(
+	ctx context.Context,
+	conn pg.Conn,
+	scope Scoper,
+) error {
+	q := `
+DELETE FROM mesures
+WHERE %s
+    AND id = @mesure_id
+`
+	q = fmt.Sprintf(q, scope.SQLFragment())
+
+	args := pgx.StrictNamedArgs{"mesure_id": m.ID}
+	maps.Copy(args, scope.SQLArguments())
+
+	_, err := conn.Exec(ctx, q, args)
+	return err
+}

pkg/coredata/mesure.go

@@ -0,0 +1,7 @@
+ALTER TABLE evidences DROP CONSTRAINT evidences_task_id_fkey;
+
+ALTER TABLE evidences
+  ADD CONSTRAINT evidences_task_id_fkey
+  FOREIGN KEY (task_id)
+  REFERENCES tasks(id)
+  ON DELETE CASCADE;

pkg/coredata/migrations/20250417T085900Z.sql

@@ -371,3 +371,18 @@ func (s MesureService) Create(
 
 	return mesure, nil
 }
+
+func (s MesureService) Delete(
+	ctx context.Context,
+	mesureID gid.GID,
+) error {
+	return s.svc.pg.WithTx(ctx, func(conn pg.Conn) error {
+		mesure := &coredata.Mesure{ID: mesureID}
+
+		if err := mesure.Delete(ctx, conn, s.svc.scope); err != nil {
+			return fmt.Errorf("cannot delete mesure: %w", err)
+		}
+
+		return nil
+	})
+}

pkg/probo/mesure_service.go

@@ -895,6 +895,7 @@ type Mutation {
   createMesure(input: CreateMesureInput!): CreateMesurePayload!
   updateMesure(input: UpdateMesureInput!): UpdateMesurePayload!
   importMesure(input: ImportMesureInput!): ImportMesurePayload!
+  deleteMesure(input: DeleteMesureInput!): DeleteMesurePayload!
 
   # Control mutations
   createControlMesureMapping(
@@ -1481,3 +1482,11 @@ input CreateVendorRiskAssessmentInput {
 type CreateVendorRiskAssessmentPayload {
   vendorRiskAssessmentEdge: VendorRiskAssessmentEdge!
 }
+
+input DeleteMesureInput {
+  mesureId: ID!
+}
+
+type DeleteMesurePayload {
+  deletedMesureId: ID!
+}